diff options
| -rw-r--r-- | po/TEAMS | 4 | ||||
| -rw-r--r-- | po/id.po | 9809 | ||||
| -rw-r--r-- | po/sv.po | 6876 | ||||
| -rw-r--r-- | po/tr.po | 6819 | ||||
| -rw-r--r-- | po/vi.po | 6887 |
5 files changed, 16391 insertions, 14004 deletions
@@ -80,6 +80,6 @@ Members: Ray Chen <oldsharp AT gmail.com> Fangyi Zhou <me AT fangyi.io> Language: zh_TW (Traditional Chinese) -Respository: https://github.com/l10n-tw/git-po -Leader: Yi-Jyun Pan <pan93412 AT gmail.com> +Repository: https://github.com/l10n-tw/git-po +Leader: Yi-Jyun Pan <pan93412 AT gmail.com> Members: Franklin Weng <franklin AT goodhorse.idv.tw> @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-03-04 22:41+0800\n" -"PO-Revision-Date: 2021-02-20 18:07+0700\n" +"POT-Creation-Date: 2021-05-17 16:02+0800\n" +"PO-Revision-Date: 2021-05-17 18:32+0700\n" "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n" "Language-Team: Indonesian\n" "Language: id\n" @@ -20,238 +20,240 @@ msgstr "" #: add-interactive.c:376 #, c-format msgid "Huh (%s)?" -msgstr "" +msgstr "Huh (%s)" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292 -#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538 -#: builtin/rebase.c:1963 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 +#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 +#: builtin/rebase.c:1953 msgid "could not read index" -msgstr "" +msgstr "tidak dapat membaca indeks" #: add-interactive.c:584 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" -msgstr "" +msgstr "biner" #: add-interactive.c:642 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" -msgstr "" +msgstr "tidak ada" #: add-interactive.c:643 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" -msgstr "" +msgstr "tak berubah" #: add-interactive.c:680 git-add--interactive.perl:641 msgid "Update" -msgstr "" +msgstr "Perbarui" #: add-interactive.c:697 add-interactive.c:885 #, c-format msgid "could not stage '%s'" -msgstr "" +msgstr "tidak dapat menggelar '%s'" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687 msgid "could not write index" -msgstr "" +msgstr "tidak dapat menulis indeks" #: add-interactive.c:706 git-add--interactive.perl:626 #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d jalur diperbarui\n" +msgstr[1] "%d jalur diperbarui\n" #: add-interactive.c:724 git-add--interactive.perl:676 #, c-format, perl-format msgid "note: %s is untracked now.\n" -msgstr "" +msgstr "catatan: %s sekarang tak terlacak.\n" -#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" -msgstr "" +msgstr "make_cache_entry gagal untuk jalur '%s'" #: add-interactive.c:759 git-add--interactive.perl:653 msgid "Revert" -msgstr "" +msgstr "Kembalikan" #: add-interactive.c:775 msgid "Could not parse HEAD^{tree}" -msgstr "" +msgstr "Tidak dapat menguraikan HEAD^{tree}" #: add-interactive.c:813 git-add--interactive.perl:629 #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d jalur dikembalikan\n" +msgstr[1] "%d jalur dikembalikan\n" #: add-interactive.c:864 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" -msgstr "" +msgstr "Tidak ada berkas tak terlacak.\n" #: add-interactive.c:868 git-add--interactive.perl:687 msgid "Add untracked" -msgstr "" +msgstr "Tambahkan tak terlacak" #: add-interactive.c:895 git-add--interactive.perl:623 #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d jalur ditambahkan\n" +msgstr[1] "%d jalur ditambahkan\n" #: add-interactive.c:925 #, c-format msgid "ignoring unmerged: %s" -msgstr "" +msgstr "mengabaikan tak tergabung: %s" #: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" -msgstr "" +msgstr "Hanya berkas biner yang berubah.\n" #: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" -msgstr "" +msgstr "Tidak ada perubahan.\n" #: add-interactive.c:943 git-add--interactive.perl:1379 msgid "Patch update" -msgstr "" +msgstr "Pembaruan tambalan" #: add-interactive.c:982 git-add--interactive.perl:1792 msgid "Review diff" -msgstr "" +msgstr "Tinjau diff" #: add-interactive.c:1010 msgid "show paths with changes" -msgstr "" +msgstr "perlihatkan jalur dengan perubahan" #: add-interactive.c:1012 msgid "add working tree state to the staged set of changes" -msgstr "" +msgstr "tambahkan keadaan pohon kerja ke set perubahan yang tergelar" #: add-interactive.c:1014 msgid "revert staged set of changes back to the HEAD version" -msgstr "" +msgstr "kembalikan set perubahan yang tergelar kembali ke versi HEAD" #: add-interactive.c:1016 msgid "pick hunks and update selectively" -msgstr "" +msgstr "ambil hunk dan perbarui secara selektif" #: add-interactive.c:1018 msgid "view diff between HEAD and index" -msgstr "" +msgstr "lihat diff antara HEAD dan indeks" #: add-interactive.c:1020 msgid "add contents of untracked files to the staged set of changes" -msgstr "" +msgstr "tambahkan isi berkas tak terlacak ke set perubahan yang tergelar" #: add-interactive.c:1028 add-interactive.c:1077 msgid "Prompt help:" -msgstr "" +msgstr "Permintaan bantuan:" #: add-interactive.c:1030 msgid "select a single item" -msgstr "" +msgstr "pilih satu item" #: add-interactive.c:1032 msgid "select a range of items" -msgstr "" +msgstr "pilih kisaran item" #: add-interactive.c:1034 msgid "select multiple ranges" -msgstr "" +msgstr "pilih banyak kisaran" #: add-interactive.c:1036 add-interactive.c:1081 msgid "select item based on unique prefix" -msgstr "" +msgstr "pilih item berdasarkan prefiks unik" #: add-interactive.c:1038 msgid "unselect specified items" -msgstr "" +msgstr "batal pilih item yang disebutkan" #: add-interactive.c:1040 msgid "choose all items" -msgstr "" +msgstr "pilih semua item" #: add-interactive.c:1042 msgid "(empty) finish selecting" -msgstr "" +msgstr "(kosong) sudah memilih" #: add-interactive.c:1079 msgid "select a numbered item" -msgstr "" +msgstr "pilih item bernomor" #: add-interactive.c:1083 msgid "(empty) select nothing" -msgstr "" +msgstr "(empty) tidak pilih apapun" #: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 msgid "*** Commands ***" -msgstr "" +msgstr "*** Perintah ***" #: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 msgid "What now" -msgstr "" +msgstr "Apa sekarang" #: add-interactive.c:1144 git-add--interactive.perl:213 msgid "staged" -msgstr "" +msgstr "tergelar" #: add-interactive.c:1144 git-add--interactive.perl:213 msgid "unstaged" -msgstr "" - -#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 -#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 -#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +msgstr "tak tergelar" + +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 +#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 +#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327 +#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 #: git-add--interactive.perl:213 msgid "path" -msgstr "" +msgstr "jalur" #: add-interactive.c:1151 msgid "could not refresh index" -msgstr "" +msgstr "tidak dapat menyegarkan indeks" #: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" -msgstr "" +msgstr "Sampai jumpa.\n" #: add-patch.c:34 git-add--interactive.perl:1431 #, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Gelar perubahan mode [y,n,q,a,d%s,?]? " #: add-patch.c:35 git-add--interactive.perl:1432 #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Gelar penghapusan [y,n,q,a,d%s,?]? " #: add-patch.c:36 git-add--interactive.perl:1433 #, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Gelar penambahan [y,n,q,a,d%s,?]? " #: add-patch.c:37 git-add--interactive.perl:1434 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Gelar hunk ini [y,n,q,a,d%s,?]? " #: add-patch.c:39 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "" +"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai " +"untuk digelar." #: add-patch.c:42 msgid "" @@ -261,32 +263,39 @@ msgid "" "a - stage this hunk and all later hunks in the file\n" "d - do not stage this hunk or any of the later hunks in the file\n" msgstr "" +"y - gelar hunk ini\n" +"n - jangan gelar hunk ini\n" +"q - keluar; jangan gelar hunk ini atau yang sisanya\n" +"a - gelar hunk ini dan semua hunk selanjutnya dalam berkas\n" +"d - jangan gelar hunk ini atau hunk selanjutnya dalam berkas\n" #: add-patch.c:56 git-add--interactive.perl:1437 #, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Stase perubahan mode [y,n,q,a,d%s,?]? " #: add-patch.c:57 git-add--interactive.perl:1438 #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Stase penghapusan [y,n,q,a,d%s,?]? " #: add-patch.c:58 git-add--interactive.perl:1439 #, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Stase penambahan [y,n,q,a,d%s,?]? " #: add-patch.c:59 git-add--interactive.perl:1440 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Stase hunk ini [y,n,q,a,d%s,?]? " #: add-patch.c:61 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." msgstr "" +"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai " +"untuk distase." #: add-patch.c:64 msgid "" @@ -296,32 +305,39 @@ msgid "" "a - stash this hunk and all later hunks in the file\n" "d - do not stash this hunk or any of the later hunks in the file\n" msgstr "" +"y - stase hunk ini\n" +"n - jangan stase hunk ini\n" +"q - keluar; jangan stase hunk ini atau yang sisanya\n" +"a - stase hunk ini dan semua hunk selanjutnya dalam berkas\n" +"d - jangan stase hunk ini atau hunk selanjutnya dalam berkas\n" #: add-patch.c:80 git-add--interactive.perl:1443 #, c-format, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Batal gelar perubahan mode [y,n,q,a,d%s,?]? " #: add-patch.c:81 git-add--interactive.perl:1444 #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Batal gelar penghapusan [y,n,q,a,d%s,?]? " #: add-patch.c:82 git-add--interactive.perl:1445 #, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Batal gelar penambahan [y,n,q,a,d%s,?]? " #: add-patch.c:83 git-add--interactive.perl:1446 #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Batal gelar hunk ini [y,n,q,a,d%s,?]? " #: add-patch.c:85 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." msgstr "" +"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai " +"untuk dibatalgelarkan." #: add-patch.c:88 msgid "" @@ -331,32 +347,39 @@ msgid "" "a - unstage this hunk and all later hunks in the file\n" "d - do not unstage this hunk or any of the later hunks in the file\n" msgstr "" +"y - batal gelar hunk ini\n" +"n - jangan batal gelar hunk ini\n" +"q - keluar; jangan batal gelar hunk ini atau yang sisanya\n" +"a - batal gelar hunk ini dan semua hunk selanjutnya dalam berkas\n" +"d - jangan batal gelar hunk ini atau hunk selanjutnya dalam berkas\n" #: add-patch.c:103 git-add--interactive.perl:1449 #, c-format, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Terapkan perubahan mode ke indeks [y,n,q,a,d%s,?]? " #: add-patch.c:104 git-add--interactive.perl:1450 #, c-format, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Terapkan penghapusan ke indeks [y,n,q,a,d%s,?]? " #: add-patch.c:105 git-add--interactive.perl:1451 #, c-format, perl-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Terapkan penambahan ke indeks [y,n,q,a,d%s,?]? " #: add-patch.c:106 git-add--interactive.perl:1452 #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Terapkan hunk ini ke indeks [y,n,q,a,d%s,?]? " #: add-patch.c:108 add-patch.c:176 add-patch.c:221 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." msgstr "" +"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai " +"untuk diterapkan." #: add-patch.c:111 msgid "" @@ -366,36 +389,43 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" +"y - terapkan hunk ini ke indeks\n" +"n - jangan terapkan hunk ini ke indeks\n" +"q - keluar; jangan terapkan hunk ini atau yang sisanya\n" +"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n" +"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n" #: add-patch.c:126 git-add--interactive.perl:1455 #: git-add--interactive.perl:1473 #, c-format, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Buang perubahan mode dari pohon kerja [y,n,q,a,d%s,?]? " #: add-patch.c:127 git-add--interactive.perl:1456 #: git-add--interactive.perl:1474 #, c-format, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Buang penghapusan dari pohon kerja [y,n,q,a,d%s,?]? " #: add-patch.c:128 git-add--interactive.perl:1457 #: git-add--interactive.perl:1475 #, c-format, perl-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Buang penambahan dari pohon kerja [y,n,q,a,d%s,?]? " #: add-patch.c:129 git-add--interactive.perl:1458 #: git-add--interactive.perl:1476 #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Buang hunk ini dari pohon kerja [y,n,q,a,d%s,?]? " #: add-patch.c:131 add-patch.c:154 add-patch.c:199 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." msgstr "" +"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai " +"untuk dibuang." #: add-patch.c:134 add-patch.c:202 msgid "" @@ -405,26 +435,31 @@ msgid "" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file\n" msgstr "" +"y - buang hunk ini dari pohon kerja\n" +"n - jangan buang hunk ini dari pohon kerja\n" +"q - keluar; jangan buang hunk ini atau yang sisanya\n" +"a - buang hunk ini dan semua hunk selanjutnya dalam berkas\n" +"d - jangan buang hunk ini atau hunk selanjutnya dalam berkas\n" #: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 #, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Buang perubahan mode dari indeks dan pohon kerja [y,n,q,a,d%s,?]? " #: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 #, c-format, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Buang penghapusan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? " #: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463 #, c-format, perl-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Buang penambahan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? " #: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Buang hunk ini dari indeks dan pohon kerja [y,n,q,a,d%s,?]? " #: add-patch.c:157 msgid "" @@ -434,26 +469,31 @@ msgid "" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file\n" msgstr "" +"y - buang hunk ini dari indeks dan pohon kerja\n" +"n - jangan buang hunk ini dari indeks dan pohon kerja\n" +"q - keluar; jangan buang hunk ini atau yang sisanya\n" +"a - buang hunk ini dan semua hunk selanjutnya dalam berkas\n" +"d - jangan buang hunk ini atau hunk selanjutnya dalam berkas\n" #: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 #, c-format, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Terapkan perubahan mode ke indeks dan pohon kerja [y,n,q,a,d%s,?]? " #: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 #, c-format, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Terapkan penghapusan ke indeks dan pohon kerja [y,n,q,a,d%s,?]? " #: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469 #, c-format, perl-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Terapkan penambahan ke indeks dan pohon kerja [y,n,q,a,d%s,?]? " #: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" +msgstr "Terapkan hunk ini ke indeks dan pohon kerja [y,n,q,a,d%s,?]? " #: add-patch.c:179 msgid "" @@ -463,6 +503,11 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" +"y - terapkan hunk ini ke indeks dan pohon kerja\n" +"n - jangan terapkan hunk ini ke indeks dan pohon kerja\n" +"q - keluar; jangan terapkan hunk ini atau yang sisanya\n" +"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n" +"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n" #: add-patch.c:224 msgid "" @@ -472,39 +517,46 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" +"y - terapkan hunk ini ke pohon kerja\n" +"n - jangan terapkan hunk ini ke pohon kerja\n" +"q - keluar; jangan terapkan hunk ini atau yang sisanya\n" +"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n" +"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n" #: add-patch.c:342 #, c-format msgid "could not parse hunk header '%.*s'" -msgstr "" +msgstr "tidak dapat menguraikan kepala hunk '%.*s'" #: add-patch.c:361 add-patch.c:365 #, c-format msgid "could not parse colored hunk header '%.*s'" -msgstr "" +msgstr "tidak dapat menguraikan kepala hunk berwarna '%.*s'" #: add-patch.c:419 msgid "could not parse diff" -msgstr "" +msgstr "tidak dapat menguraikan diff" #: add-patch.c:438 msgid "could not parse colored diff" -msgstr "" +msgstr "tidak dapat menguraikan diff berwarna" #: add-patch.c:452 #, c-format msgid "failed to run '%s'" -msgstr "" +msgstr "gagal menjalankan '%s'" #: add-patch.c:611 msgid "mismatched output from interactive.diffFilter" -msgstr "" +msgstr "keluaran tak cocok dari interactive.diffFilter" #: add-patch.c:612 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "" +"Saringan Anda haru menjaga korespondensi satu-satu antara masukannya\n" +"dan baris keluaran." #: add-patch.c:790 #, c-format @@ -512,6 +564,8 @@ msgid "" "expected context line #%d in\n" "%.*s" msgstr "" +"baris konteks #%d diharapkan dalam\n" +"%.*s" #: add-patch.c:805 #, c-format @@ -521,10 +575,14 @@ msgid "" "\tdoes not end with:\n" "%.*s" msgstr "" +"hunk tidak tumpang tindih:\n" +"%.*s\n" +"tidak berakhir dengan:\n" +"%.*s" #: add-patch.c:1081 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "" +msgstr "Mode sunting hunk manual -- lihat dibawah untuk panduan cepat.\n" #: add-patch.c:1085 #, c-format @@ -534,6 +592,10 @@ msgid "" "To remove '%c' lines, delete them.\n" "Lines starting with %c will be removed.\n" msgstr "" +"---\n" +"Untuk menghapus baris '%c', buatlah menjadi baris ' ' (konteks).\n" +"Untuk menghapus baris '%c', hapuslah itu.\n" +"Baris yang diawali dengan %c akan dihapus.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. #: add-patch.c:1099 git-add--interactive.perl:1129 @@ -542,14 +604,17 @@ msgid "" "edit again. If all lines of the hunk are removed, then the edit is\n" "aborted and the hunk is left unchanged.\n" msgstr "" +"Jika itu tidak diterapkan dengan bersih, Anda akan diberikan kesempatan\n" +"untuk menyunting lagi. Jika semua baris dalam hunk dihapus, suntingan\n" +"dibatalkan dan hunk tetap tidak berubah.\n" #: add-patch.c:1132 msgid "could not parse hunk header" -msgstr "" +msgstr "tidak dapat menguraikan kepala hunk" #: add-patch.c:1177 msgid "'git apply --cached' failed" -msgstr "" +msgstr "'git apply --cached' gagal" #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. @@ -567,18 +632,20 @@ msgstr "" msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" +"Hunk Anda tak diterapkan. Sunting lagi (bilang \"n\" untuk \"tidak\" buang!) " +"[y/n]?" #: add-patch.c:1289 msgid "The selected hunks do not apply to the index!" -msgstr "" +msgstr "Hunk yang dipilih tidak diterapkan ke indeks!" #: add-patch.c:1290 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " -msgstr "" +msgstr "Tetap terapkan itu ke pohon kerja? " #: add-patch.c:1297 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" -msgstr "" +msgstr "Tidak ada yang diterapkan.\n" #: add-patch.c:1354 msgid "" @@ -592,133 +659,155 @@ msgid "" "e - manually edit the current hunk\n" "? - print help\n" msgstr "" +"j - biarkan hunk ini ragu, lihat hunk ragu berikutnya\n" +"J - biarkan hunk ini ragu, lihat hunk berikutnya\n" +"k - biarkan hunk ini ragu, lihat hunk ragu sebelumnya\n" +"K - biarkan hunk ini ragu, lihat hunk sebelumnya\n" +"g - pilih satu hunk untuk dikunjungi\n" +"/ - cari satu hunk yang cocok dengan regex yang diberikan\n" +"s - belah hunk saat ini ke dalam hunk yang lebih kecil\n" +"e - sunting hunk saat ini secara manual\n" +"? - cetak bantuan\n" #: add-patch.c:1516 add-patch.c:1526 msgid "No previous hunk" -msgstr "" +msgstr "Tidak ada hunk sebelumnya" #: add-patch.c:1521 add-patch.c:1531 msgid "No next hunk" -msgstr "" +msgstr "Tidak ada hunk selanjutnya" #: add-patch.c:1537 msgid "No other hunks to goto" -msgstr "" +msgstr "Tidak ada hunk lainnya untuk dikunjungi" #: add-patch.c:1548 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " -msgstr "" +msgstr "pergi ke hunk yang mana (<ret> untuk lihat lebih)? " #: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk? " -msgstr "" +msgstr "pergi ke hunk yang mana?" #: add-patch.c:1560 #, c-format msgid "Invalid number: '%s'" -msgstr "" +msgstr "Angka tidak valid: '%s'" #: add-patch.c:1565 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Maaf, hanya %d hunk yang tersedia." +msgstr[1] "Maaf, hanya %d hunk yang tersedia." #: add-patch.c:1574 msgid "No other hunks to search" -msgstr "" +msgstr "Tidak ada hunk lainnya untuk dicari" #: add-patch.c:1580 git-add--interactive.perl:1661 msgid "search for regex? " -msgstr "" +msgstr "cari untuk regex? " #: add-patch.c:1595 #, c-format msgid "Malformed search regexp %s: %s" -msgstr "" +msgstr "regexp pencarian %s cacat: %s" #: add-patch.c:1612 msgid "No hunk matches the given pattern" -msgstr "" +msgstr "Tidak ada hunk yang cocok dengan pola yang diberikan" #: add-patch.c:1619 msgid "Sorry, cannot split this hunk" -msgstr "" +msgstr "Maaf, tidak dapat membelah hunk ini" #: add-patch.c:1623 #, c-format msgid "Split into %d hunks." -msgstr "" +msgstr "Terbelah ke dalam %d hunk." #: add-patch.c:1627 msgid "Sorry, cannot edit this hunk" -msgstr "" +msgstr "Maaf, tidak dapat menyunting hunk ini" #: add-patch.c:1679 msgid "'git apply' failed" -msgstr "" +msgstr "'git apply' gagal" -#: advice.c:143 +#: advice.c:145 #, c-format msgid "" "\n" "Disable this message with \"git config advice.%s false\"" msgstr "" -#: advice.c:159 +#: advice.c:161 #, c-format msgid "%shint: %.*s%s\n" msgstr "" -#: advice.c:250 +#: advice.c:252 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:252 +#: advice.c:254 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:254 +#: advice.c:256 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:256 +#: advice.c:258 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:258 +#: advice.c:260 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:260 +#: advice.c:262 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:268 +#: advice.c:270 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." msgstr "" -#: advice.c:276 +#: advice.c:278 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:281 builtin/merge.c:1370 +#: advice.c:283 builtin/merge.c:1374 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:283 +#: advice.c:285 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:284 +#: advice.c:286 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:290 +#: advice.c:296 +#, c-format +msgid "" +"The following pathspecs didn't match any eligible path, but they do match " +"index\n" +"entries outside the current sparse checkout:\n" +msgstr "" + +#: advice.c:303 +msgid "" +"Disable or modify the sparsity rules if you intend to update such entries." +msgstr "" + +#: advice.c:310 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -749,82 +838,78 @@ msgstr "" msgid "unclosed quote" msgstr "" -#: apply.c:69 +#: apply.c:70 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: apply.c:85 +#: apply.c:86 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: apply.c:135 +#: apply.c:136 msgid "--reject and --3way cannot be used together." msgstr "" -#: apply.c:137 -msgid "--cached and --3way cannot be used together." -msgstr "" - -#: apply.c:140 +#: apply.c:139 msgid "--3way outside a repository" msgstr "" -#: apply.c:151 +#: apply.c:150 msgid "--index outside a repository" msgstr "" -#: apply.c:154 +#: apply.c:153 msgid "--cached outside a repository" msgstr "" -#: apply.c:801 +#: apply.c:800 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: apply.c:810 +#: apply.c:809 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: apply.c:884 +#: apply.c:883 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: apply.c:922 +#: apply.c:921 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: apply.c:928 +#: apply.c:927 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: apply.c:929 +#: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: apply.c:934 +#: apply.c:933 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: apply.c:963 +#: apply.c:962 #, c-format msgid "invalid mode on line %d: %s" msgstr "" -#: apply.c:1282 +#: apply.c:1281 #, c-format msgid "inconsistent header lines %d and %d" msgstr "" -#: apply.c:1372 +#: apply.c:1371 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -835,524 +920,530 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apply.c:1385 +#: apply.c:1384 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -#: apply.c:1481 +#: apply.c:1480 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: apply.c:1550 +#: apply.c:1549 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "" -#: apply.c:2936 +#: apply.c:2935 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3057 +#: apply.c:3056 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: apply.c:3069 +#: apply.c:3068 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3075 +#: apply.c:3074 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3097 +#: apply.c:3096 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3105 +#: apply.c:3104 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: apply.c:3152 +#: apply.c:3151 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: apply.c:3163 +#: apply.c:3162 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: apply.c:3171 +#: apply.c:3170 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: apply.c:3189 +#: apply.c:3188 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: apply.c:3202 +#: apply.c:3201 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3209 +#: apply.c:3208 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3230 +#: apply.c:3229 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3353 +#: apply.c:3352 #, c-format msgid "cannot checkout %s" msgstr "" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213 +#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214 #: setup.c:308 #, c-format msgid "failed to read %s" msgstr "" -#: apply.c:3413 +#: apply.c:3412 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3442 apply.c:3685 +#: apply.c:3441 apply.c:3687 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3528 apply.c:3700 +#: apply.c:3527 apply.c:3702 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3537 apply.c:3708 apply.c:3952 +#: apply.c:3536 apply.c:3710 apply.c:3954 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3572 -msgid "repository lacks the necessary blob to fall back on 3-way merge." +#: apply.c:3571 +msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "" -#: apply.c:3575 +#: apply.c:3574 #, c-format -msgid "Falling back to three-way merge...\n" +msgid "Performing three-way merge...\n" msgstr "" -#: apply.c:3591 apply.c:3595 +#: apply.c:3590 apply.c:3594 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3607 +#: apply.c:3606 #, c-format -msgid "Failed to fall back on three-way merge...\n" +msgid "Failed to perform three-way merge...\n" msgstr "" -#: apply.c:3621 +#: apply.c:3620 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3626 +#: apply.c:3625 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3652 +#: apply.c:3642 +#, c-format +msgid "Falling back to direct application...\n" +msgstr "" + +#: apply.c:3654 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3725 +#: apply.c:3727 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3727 +#: apply.c:3729 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 -#: read-cache.c:1313 +#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 +#: read-cache.c:1351 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3950 +#: apply.c:3952 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3954 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3974 +#: apply.c:3976 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3979 +#: apply.c:3981 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3999 +#: apply.c:4001 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:4003 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:4018 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4110 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4117 +#: apply.c:4119 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4120 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4129 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4139 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4277 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4311 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4317 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4325 +#: apply.c:4327 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4331 apply.c:4476 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4374 builtin/bisect--helper.c:523 +#: apply.c:4376 builtin/bisect--helper.c:523 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4378 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4448 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4546 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4554 +#: apply.c:4556 msgid "internal error" msgstr "" -#: apply.c:4557 +#: apply.c:4559 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4568 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334 +#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4590 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4594 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4718 +#: apply.c:4725 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4726 +#: apply.c:4733 msgid "unrecognized input" msgstr "" -#: apply.c:4746 +#: apply.c:4753 msgid "unable to read index file" msgstr "" -#: apply.c:4903 +#: apply.c:4910 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4930 +#: apply.c:4937 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4936 apply.c:4951 +#: apply.c:4943 apply.c:4958 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4944 +#: apply.c:4951 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "" -#: apply.c:4988 +#: apply.c:4995 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4991 +#: apply.c:4998 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4993 builtin/am.c:2266 +#: apply.c:5000 builtin/am.c:2317 msgid "num" msgstr "" -#: apply.c:4994 +#: apply.c:5001 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: apply.c:4997 +#: apply.c:5004 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4999 +#: apply.c:5006 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:5003 +#: apply.c:5010 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:5005 +#: apply.c:5012 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:5007 +#: apply.c:5014 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:5009 +#: apply.c:5016 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:5011 +#: apply.c:5018 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:5013 +#: apply.c:5020 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:5015 +#: apply.c:5022 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:5018 +#: apply.c:5025 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:5020 -msgid "attempt three-way merge if a patch does not apply" +#: apply.c:5027 +msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "" -#: apply.c:5022 +#: apply.c:5029 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540 +#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:5027 +#: apply.c:5034 msgid "ensure at least <n> lines of context match" msgstr "" -#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 -#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3577 builtin/rebase.c:1352 +#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 +#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831 +#: builtin/rebase.c:1347 msgid "action" msgstr "" -#: apply.c:5029 +#: apply.c:5036 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:5032 apply.c:5035 +#: apply.c:5039 apply.c:5042 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:5038 +#: apply.c:5045 msgid "apply the patch in reverse" msgstr "" -#: apply.c:5040 +#: apply.c:5047 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:5042 +#: apply.c:5049 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5044 +#: apply.c:5051 msgid "allow overlapping hunks" msgstr "" -#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757 -#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 +#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 +#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "" -#: apply.c:5047 +#: apply.c:5054 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5050 +#: apply.c:5057 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5052 builtin/am.c:2254 +#: apply.c:5059 builtin/am.c:2305 msgid "root" msgstr "" -#: apply.c:5053 +#: apply.c:5060 msgid "prepend <root> to all filenames" msgstr "" @@ -1402,171 +1493,173 @@ msgstr "" #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" -msgstr "" +msgstr "git archive [<opsi>] <mirip pohon> [<jalur>...]" #: archive.c:15 msgid "git archive --list" -msgstr "" +msgstr "git archive --list" #: archive.c:16 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" +"git archive --remote <repo> [--exec <perintah>] [<opsi>] <mirip pohon> " +"[<jalur>...]" #: archive.c:17 msgid "git archive --remote <repo> [--exec <cmd>] --list" -msgstr "" +msgstr "git archive --remote <repo> [--exec <perintah>] --list" -#: archive.c:192 +#: archive.c:188 #, c-format msgid "cannot read %s" -msgstr "" +msgstr "Tidak dapat membaca %s" -#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894 -#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786 -#: builtin/merge.c:1139 +#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 +#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 +#: builtin/merge.c:1143 #, c-format msgid "could not read '%s'" -msgstr "" +msgstr "tidak dapat membaca '%s'" -#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315 +#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" -msgstr "" +msgstr "spek jalur '%s' tidak cocok dengan berkas apapun" -#: archive.c:454 +#: archive.c:451 #, c-format msgid "no such ref: %.*s" -msgstr "" +msgstr "tidak ada referensi seperti: %.*s" -#: archive.c:460 +#: archive.c:457 #, c-format msgid "not a valid object name: %s" -msgstr "" +msgstr "bukan nama objek valid: %s" -#: archive.c:473 +#: archive.c:470 #, c-format msgid "not a tree object: %s" -msgstr "" +msgstr "bukan objek pohon: %s" -#: archive.c:485 +#: archive.c:482 msgid "current working directory is untracked" -msgstr "" +msgstr "direktori kerja saat ini tak terlacak" -#: archive.c:526 +#: archive.c:523 #, c-format msgid "File not found: %s" -msgstr "" +msgstr "Berkas tidak ditemukan: %s" -#: archive.c:528 +#: archive.c:525 #, c-format msgid "Not a regular file: %s" -msgstr "" +msgstr "Bukan berkas reguler: %s" -#: archive.c:555 +#: archive.c:552 msgid "fmt" -msgstr "" +msgstr "fmt" -#: archive.c:555 +#: archive.c:552 msgid "archive format" -msgstr "" +msgstr "format arsip" -#: archive.c:556 builtin/log.c:1764 +#: archive.c:553 builtin/log.c:1772 msgid "prefix" -msgstr "" +msgstr "prefiks" -#: archive.c:557 +#: archive.c:554 msgid "prepend prefix to each pathname in the archive" -msgstr "" +msgstr "tambahkan prefiks di depan setiap nama jalur dalam arsip" -#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888 +#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105 -#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 +#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105 +#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" -msgstr "" +msgstr "berkas" -#: archive.c:559 +#: archive.c:556 msgid "add untracked file to archive" -msgstr "" +msgstr "tambahkan berkas tak terlacak ke arsip" -#: archive.c:562 builtin/archive.c:90 +#: archive.c:559 builtin/archive.c:90 msgid "write the archive to this file" -msgstr "" +msgstr "tulis arsip ke berkas ini" -#: archive.c:564 +#: archive.c:561 msgid "read .gitattributes in working directory" -msgstr "" +msgstr "baca .gitattributes dalam direktori kerja" -#: archive.c:565 +#: archive.c:562 msgid "report archived files on stderr" -msgstr "" +msgstr "laporkan berkas terarsip ke error standar" -#: archive.c:567 +#: archive.c:564 msgid "set compression level" -msgstr "" +msgstr "setel level kompresi" -#: archive.c:570 +#: archive.c:567 msgid "list supported archive formats" -msgstr "" +msgstr "daftar format arsip yang didukung" -#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 +#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 +#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 msgid "repo" -msgstr "" +msgstr "repositori" -#: archive.c:573 builtin/archive.c:92 +#: archive.c:570 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" -msgstr "" +msgstr "ambil arsip dari repositori remote <repo>" -#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 #: builtin/notes.c:498 msgid "command" -msgstr "" +msgstr "perintah" -#: archive.c:575 builtin/archive.c:94 +#: archive.c:572 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" -msgstr "" +msgstr "jalur ke perintah git-upload-archive remote" -#: archive.c:582 +#: archive.c:579 msgid "Unexpected option --remote" -msgstr "" +msgstr "Opsi --remote tak diharapkan" -#: archive.c:584 +#: archive.c:581 msgid "Option --exec can only be used together with --remote" -msgstr "" +msgstr "Opsi --exec hanya dapat digunakan bersamaan dengan --remote" -#: archive.c:586 +#: archive.c:583 msgid "Unexpected option --output" -msgstr "" +msgstr "Opsi --output tak diharapkan" -#: archive.c:588 +#: archive.c:585 msgid "Options --add-file and --remote cannot be used together" -msgstr "" +msgstr "Opsi --add-file dan --remote tidak dapat digunakan bersamaan" -#: archive.c:610 +#: archive.c:607 #, c-format msgid "Unknown archive format '%s'" -msgstr "" +msgstr "Format arsip tidak dikenal '%s'" -#: archive.c:619 +#: archive.c:616 #, c-format msgid "Argument not supported for format '%s': -%d" -msgstr "" +msgstr "Argumen tidak didukung untuk format '%s': -%d" #: attr.c:202 #, c-format msgid "%.*s is not a valid attribute name" msgstr "" -#: attr.c:359 +#: attr.c:363 #, c-format msgid "%s not allowed: %s:%d" msgstr "" -#: attr.c:399 +#: attr.c:403 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1634,7 +1727,7 @@ msgstr "" msgid "a %s revision is needed" msgstr "" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298 #, c-format msgid "could not create file '%s'" msgstr "" @@ -1677,37 +1770,37 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "" msgstr[1] "" -#: blame.c:2777 +#: blame.c:2776 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:2791 +#: blame.c:2790 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:2812 +#: blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146 -#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411 -#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335 -#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410 -#: builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 +#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 +#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 +#: builtin/pack-objects.c:3661 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "persiapan jalan revisi gagal" -#: blame.c:2839 +#: blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:2850 +#: blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:2861 +#: blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "" @@ -1826,12 +1919,12 @@ msgstr "" msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:365 +#: branch.c:366 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" -#: branch.c:388 +#: branch.c:389 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "" @@ -1856,8 +1949,8 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184 -#: builtin/commit.c:814 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "" @@ -1915,7 +2008,7 @@ msgstr "" msgid "cannot write bundle version %d with algorithm %s" msgstr "" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -1957,252 +2050,252 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit-graph.c:197 midx.c:46 +#: commit-graph.c:204 midx.c:47 msgid "invalid hash version" msgstr "" -#: commit-graph.c:255 +#: commit-graph.c:262 msgid "commit-graph file is too small" msgstr "" -#: commit-graph.c:348 +#: commit-graph.c:355 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" -#: commit-graph.c:355 +#: commit-graph.c:362 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "" -#: commit-graph.c:362 +#: commit-graph.c:369 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" -#: commit-graph.c:379 +#: commit-graph.c:386 #, c-format msgid "commit-graph file is too small to hold %u chunks" msgstr "" -#: commit-graph.c:472 +#: commit-graph.c:482 msgid "commit-graph has no base graphs chunk" msgstr "" -#: commit-graph.c:482 +#: commit-graph.c:492 msgid "commit-graph chain does not match" msgstr "" -#: commit-graph.c:530 +#: commit-graph.c:540 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" -#: commit-graph.c:554 +#: commit-graph.c:564 msgid "unable to find all commit-graph files" msgstr "" -#: commit-graph.c:735 commit-graph.c:772 +#: commit-graph.c:745 commit-graph.c:782 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" -#: commit-graph.c:756 +#: commit-graph.c:766 #, c-format msgid "could not find commit %s" msgstr "" -#: commit-graph.c:789 +#: commit-graph.c:799 msgid "commit-graph requires overflow generation data but has none" msgstr "" -#: commit-graph.c:1065 builtin/am.c:1292 +#: commit-graph.c:1075 builtin/am.c:1340 #, c-format msgid "unable to parse commit %s" msgstr "" -#: commit-graph.c:1327 builtin/pack-objects.c:2872 +#: commit-graph.c:1337 builtin/pack-objects.c:2897 #, c-format msgid "unable to get type of object %s" msgstr "" -#: commit-graph.c:1358 +#: commit-graph.c:1368 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:1375 +#: commit-graph.c:1385 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:1395 +#: commit-graph.c:1405 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:1414 +#: commit-graph.c:1424 msgid "Computing commit graph topological levels" msgstr "" -#: commit-graph.c:1467 +#: commit-graph.c:1477 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:1548 +#: commit-graph.c:1558 msgid "Computing commit changed paths Bloom filters" msgstr "" -#: commit-graph.c:1625 +#: commit-graph.c:1635 msgid "Collecting referenced commits" msgstr "" -#: commit-graph.c:1650 +#: commit-graph.c:1660 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1663 +#: commit-graph.c:1673 #, c-format msgid "error adding pack %s" msgstr "" -#: commit-graph.c:1667 +#: commit-graph.c:1677 #, c-format msgid "error opening index for %s" msgstr "" -#: commit-graph.c:1704 +#: commit-graph.c:1714 msgid "Finding commits for commit graph among packed objects" msgstr "" -#: commit-graph.c:1722 +#: commit-graph.c:1732 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:1771 +#: commit-graph.c:1781 msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1802 midx.c:794 +#: commit-graph.c:1812 midx.c:906 #, c-format msgid "unable to create leading directories of %s" msgstr "" -#: commit-graph.c:1815 +#: commit-graph.c:1825 msgid "unable to create temporary graph layer" msgstr "" -#: commit-graph.c:1820 +#: commit-graph.c:1830 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "" -#: commit-graph.c:1879 +#: commit-graph.c:1887 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1915 +#: commit-graph.c:1923 msgid "unable to open commit-graph chain file" msgstr "" -#: commit-graph.c:1931 +#: commit-graph.c:1939 msgid "failed to rename base commit-graph file" msgstr "" -#: commit-graph.c:1951 +#: commit-graph.c:1959 msgid "failed to rename temporary commit-graph file" msgstr "" -#: commit-graph.c:2084 +#: commit-graph.c:2092 msgid "Scanning merged commits" msgstr "" -#: commit-graph.c:2128 +#: commit-graph.c:2136 msgid "Merging commit-graph" msgstr "" -#: commit-graph.c:2235 +#: commit-graph.c:2244 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" -#: commit-graph.c:2342 +#: commit-graph.c:2351 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:2440 +#: commit-graph.c:2450 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:2450 +#: commit-graph.c:2460 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:2460 commit-graph.c:2475 +#: commit-graph.c:2470 commit-graph.c:2485 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:2467 +#: commit-graph.c:2477 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" -#: commit-graph.c:2485 +#: commit-graph.c:2495 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2500 +#: commit-graph.c:2510 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2507 +#: commit-graph.c:2517 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2517 +#: commit-graph.c:2527 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2526 +#: commit-graph.c:2536 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2540 +#: commit-graph.c:2550 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2545 +#: commit-graph.c:2555 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2549 +#: commit-graph.c:2559 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2566 +#: commit-graph.c:2576 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "" -#: commit-graph.c:2572 +#: commit-graph.c:2582 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" -#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416 +#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "" @@ -2224,27 +2317,27 @@ msgid "" "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1223 +#: commit.c:1237 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: commit.c:1227 +#: commit.c:1241 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: commit.c:1230 +#: commit.c:1244 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: commit.c:1233 +#: commit.c:1247 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: commit.c:1487 +#: commit.c:1501 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2264,336 +2357,345 @@ msgid "" "\t%s\n" "This might be due to circular includes." msgstr "" +"melebihi kedalaman include maksimum (%d) ketika memasukkan\n" +"\t%s\n" +"dari\n" +"\t%s\n" +"Ini mungkin disebabkan oleh include sirkular." #: config.c:142 #, c-format msgid "could not expand include path '%s'" -msgstr "" +msgstr "tidak dapat menjabarkan jalur include '%s'" #: config.c:153 msgid "relative config includes must come from files" -msgstr "" +msgstr "include konfigurasi relatif harus dari berkas" #: config.c:199 msgid "relative config include conditionals must come from files" -msgstr "" +msgstr "kondisional include konfigurasi relative harus dari berkas" #: config.c:396 +#, c-format msgid "invalid config format: %s" -msgstr "" +msgstr "format konfigurasi tidak valid: %s" #: config.c:400 #, c-format msgid "missing environment variable name for configuration '%.*s'" -msgstr "" +msgstr "nama variabel lingkungan untuk konfigurasi hilang '%.*s'" #: config.c:405 #, c-format msgid "missing environment variable '%s' for configuration '%.*s'" -msgstr "" +msgstr "variabel lingkungan '%s' untuk konfigurasi '%.*s'" #: config.c:442 #, c-format msgid "key does not contain a section: %s" -msgstr "" +msgstr "kunci tidak berisi bagian: %s" #: config.c:448 #, c-format msgid "key does not contain variable name: %s" -msgstr "" +msgstr "kunci tidak berisi nama variabel: %s" -#: config.c:472 sequencer.c:2588 +#: config.c:472 sequencer.c:2785 #, c-format msgid "invalid key: %s" -msgstr "" +msgstr "kunci tidak valid: %s" #: config.c:478 #, c-format msgid "invalid key (newline): %s" -msgstr "" +msgstr "kunci tidak valid (barisbaru): %s" #: config.c:511 msgid "empty config key" -msgstr "" +msgstr "kunci konfigurasi kosong" #: config.c:529 config.c:541 #, c-format msgid "bogus config parameter: %s" -msgstr "" +msgstr "parameter konfigurasi gadungan: %s" #: config.c:555 config.c:572 config.c:579 config.c:588 #, c-format msgid "bogus format in %s" -msgstr "" +msgstr "format gadungan dalam %s" #: config.c:622 #, c-format msgid "bogus count in %s" -msgstr "" +msgstr "hitungan gadungan dalam %s" #: config.c:626 #, c-format msgid "too many entries in %s" -msgstr "" +msgstr "terlalu banyak entri di %s" #: config.c:636 #, c-format msgid "missing config key %s" -msgstr "" +msgstr "kunci konfigurasi %s hilang" #: config.c:644 #, c-format msgid "missing config value %s" -msgstr "" +msgstr "nilai konfigurasi %s hilang" #: config.c:995 #, c-format msgid "bad config line %d in blob %s" -msgstr "" +msgstr "baris konfigurasi %d jelek dalam blob %s" #: config.c:999 #, c-format msgid "bad config line %d in file %s" -msgstr "" +msgstr "baris konfigurasi %d jelek dalam berkas %s" #: config.c:1003 #, c-format msgid "bad config line %d in standard input" -msgstr "" +msgstr "baris konfigurasi %d jelek pada masukan standar" #: config.c:1007 #, c-format msgid "bad config line %d in submodule-blob %s" -msgstr "" +msgstr "baris konfigurasi %d jelek dalam blob submodul %s" #: config.c:1011 #, c-format msgid "bad config line %d in command line %s" -msgstr "" +msgstr "baris konfigurasi %d jelek pada baris perintah %s" #: config.c:1015 #, c-format msgid "bad config line %d in %s" -msgstr "" +msgstr "baris konfigurasi %d jelek dalam %s" #: config.c:1152 msgid "out of range" -msgstr "" +msgstr "di luar rentang" #: config.c:1152 msgid "invalid unit" -msgstr "" +msgstr "satuan tidak valid" #: config.c:1153 #, c-format msgid "bad numeric config value '%s' for '%s': %s" -msgstr "" +msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s': %s" #: config.c:1163 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" -msgstr "" +msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam blob %s: %s" #: config.c:1166 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" -msgstr "" +msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam berkas %s: %s" #: config.c:1169 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" +"nilai konfigurasi numerik '%s' jelek untuk '%s' pada masukan standar: %s" #: config.c:1172 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" +"nilai konfigurasi numerik '%s' jelek untuk '%s' dalam blob submodul %s: %s" #: config.c:1175 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" +"nilai konfigurasi numerik '%s' jelek untuk '%s' pada baris perintah %s: %s" #: config.c:1178 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" -msgstr "" +msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam %s: %s" -#: config.c:1194 +#: config.c:1257 #, c-format msgid "bad boolean config value '%s' for '%s'" -msgstr "" +msgstr "nilai konfigurasi boolean '%s' jelek untuk '%s'" -#: config.c:1289 +#: config.c:1275 #, c-format msgid "failed to expand user dir in: '%s'" -msgstr "" +msgstr "gagal menjabarkan direktori pengguna di: '%s'" -#: config.c:1298 +#: config.c:1284 #, c-format msgid "'%s' for '%s' is not a valid timestamp" -msgstr "" +msgstr "'%s' untuk '%s' bukan stempel waktu valid" -#: config.c:1391 +#: config.c:1377 #, c-format msgid "abbrev length out of range: %d" -msgstr "" +msgstr "panjang singkatan di luar rentang: %d" -#: config.c:1405 config.c:1416 +#: config.c:1391 config.c:1402 #, c-format msgid "bad zlib compression level %d" -msgstr "" +msgstr "level kompresi zlib jelek %d" -#: config.c:1508 +#: config.c:1494 msgid "core.commentChar should only be one character" -msgstr "" +msgstr "core.commentChar harusnya hanya satu karakter" -#: config.c:1541 +#: config.c:1527 #, c-format msgid "invalid mode for object creation: %s" -msgstr "" +msgstr "mode tidak valid untuk pembuatan objek: %s" -#: config.c:1613 +#: config.c:1599 #, c-format msgid "malformed value for %s" -msgstr "" +msgstr "nilai rusak untuk %s" -#: config.c:1639 +#: config.c:1625 #, c-format msgid "malformed value for %s: %s" -msgstr "" +msgstr "nilai rusak untuk %s: %s" -#: config.c:1640 +#: config.c:1626 msgid "must be one of nothing, matching, simple, upstream or current" -msgstr "" +msgstr "harus salah satu dari nothing, matching, simple, upstream atau current" -#: config.c:1701 builtin/pack-objects.c:3666 +#: config.c:1687 builtin/pack-objects.c:3924 #, c-format msgid "bad pack compression level %d" -msgstr "" +msgstr "level kompresi pak jelek %d" -#: config.c:1823 +#: config.c:1809 #, c-format msgid "unable to load config blob object '%s'" -msgstr "" +msgstr "tidak dapat memuat objek blob konfigurasi '%s'" -#: config.c:1826 +#: config.c:1812 #, c-format msgid "reference '%s' does not point to a blob" -msgstr "" +msgstr "referensi '%s' tidak menunjuk pada sebuah blob" -#: config.c:1843 +#: config.c:1829 #, c-format msgid "unable to resolve config blob '%s'" -msgstr "" +msgstr "tidak dapat menguraikan blob konfigurasi '%s'" #: config.c:1873 #, c-format msgid "failed to parse %s" -msgstr "" +msgstr "gagal menguraikan %s" -#: config.c:1927 +#: config.c:1929 msgid "unable to parse command-line config" -msgstr "" +msgstr "gagal menguraikan konfigurasi baris perintah" -#: config.c:2290 +#: config.c:2293 msgid "unknown error occurred while reading the configuration files" -msgstr "" +msgstr "error tidak diketahui ketika membaca berkas konfigurasi" -#: config.c:2464 +#: config.c:2467 #, c-format msgid "Invalid %s: '%s'" -msgstr "" +msgstr "%s tidak valid: '%s'" -#: config.c:2509 +#: config.c:2512 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" -msgstr "" +msgstr "nilai splitIndex.maxPercentChange '%d' harusnya diantara 0 dan 100" -#: config.c:2555 +#: config.c:2558 #, c-format msgid "unable to parse '%s' from command-line config" -msgstr "" +msgstr "tidak dapat menguraikan '%s' dari konfigurasi baris perintah" -#: config.c:2557 +#: config.c:2560 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" -msgstr "" +msgstr "variabel konfigurasi '%s' jelek dalam berkas '%s' pada baris %d" -#: config.c:2641 +#: config.c:2644 #, c-format msgid "invalid section name '%s'" -msgstr "" +msgstr "nama bagian '%s' tidak valid" -#: config.c:2673 +#: config.c:2676 #, c-format msgid "%s has multiple values" -msgstr "" +msgstr "%s punya banyak nilai" -#: config.c:2702 +#: config.c:2705 #, c-format msgid "failed to write new configuration file %s" -msgstr "" +msgstr "gagal menulis berkas konfigurasi baru %s" -#: config.c:2954 config.c:3280 +#: config.c:2957 config.c:3283 #, c-format msgid "could not lock config file %s" -msgstr "" +msgstr "tidak dapat mengunci berkas konfigurasi %s" -#: config.c:2965 +#: config.c:2968 #, c-format msgid "opening %s" -msgstr "" +msgstr "membuka %s" -#: config.c:3002 builtin/config.c:361 +#: config.c:3005 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" -msgstr "" +msgstr "pola tidak valid: %s" -#: config.c:3027 +#: config.c:3030 #, c-format msgid "invalid config file %s" -msgstr "" +msgstr "berkas konfigurasi %s tidak valid" -#: config.c:3040 config.c:3293 +#: config.c:3043 config.c:3296 #, c-format msgid "fstat on %s failed" -msgstr "" +msgstr "fstat pada %s gagal" -#: config.c:3051 +#: config.c:3054 #, c-format msgid "unable to mmap '%s'" -msgstr "" +msgstr "tidak dapat me-mmap '%s'" -#: config.c:3060 config.c:3298 +#: config.c:3063 config.c:3301 #, c-format msgid "chmod on %s failed" -msgstr "" +msgstr "chmod pada %s gagal" -#: config.c:3145 config.c:3395 +#: config.c:3148 config.c:3398 #, c-format msgid "could not write config file %s" -msgstr "" +msgstr "tidak dapat menulis berkas konfigurasi %s" -#: config.c:3179 +#: config.c:3182 #, c-format msgid "could not set '%s' to '%s'" -msgstr "" +msgstr "tidak dapat menyetel '%s' ke '%s'" -#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" -msgstr "" +msgstr "tidak dapat mem-batal setel '%s'" -#: config.c:3271 +#: config.c:3274 #, c-format msgid "invalid section name: %s" -msgstr "" +msgstr "nama bagian tidak valid: %s" -#: config.c:3438 +#: config.c:3441 #, c-format msgid "missing value for '%s'" -msgstr "" +msgstr "nilai hilang untuk '%s'" #: connect.c:61 msgid "the remote end hung up upon initial contact" @@ -2759,7 +2861,7 @@ msgstr "" msgid "unable to fork" msgstr "" -#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45 msgid "Checking connectivity" msgstr "" @@ -2775,119 +2877,119 @@ msgstr "" msgid "failed to close rev-list's stdin" msgstr "" -#: convert.c:194 +#: convert.c:183 #, c-format msgid "illegal crlf_action %d" msgstr "" -#: convert.c:207 +#: convert.c:196 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "" -#: convert.c:209 +#: convert.c:198 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" -#: convert.c:217 +#: convert.c:206 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "" -#: convert.c:219 +#: convert.c:208 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" -#: convert.c:284 +#: convert.c:273 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" -#: convert.c:291 +#: convert.c:280 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " "working-tree-encoding." msgstr "" -#: convert.c:304 +#: convert.c:293 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "" -#: convert.c:306 +#: convert.c:295 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" "%sLE (depending on the byte order) as working-tree-encoding." msgstr "" -#: convert.c:419 convert.c:490 +#: convert.c:408 convert.c:479 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "" -#: convert.c:462 +#: convert.c:451 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" -#: convert.c:665 +#: convert.c:654 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "" -#: convert.c:685 +#: convert.c:674 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "" -#: convert.c:692 +#: convert.c:681 #, c-format msgid "external filter '%s' failed %d" msgstr "" -#: convert.c:727 convert.c:730 +#: convert.c:716 convert.c:719 #, c-format msgid "read from external filter '%s' failed" msgstr "" -#: convert.c:733 convert.c:788 +#: convert.c:722 convert.c:777 #, c-format msgid "external filter '%s' failed" msgstr "" -#: convert.c:837 +#: convert.c:826 msgid "unexpected filter type" msgstr "" -#: convert.c:848 +#: convert.c:837 msgid "path name too long for external filter" msgstr "" -#: convert.c:940 +#: convert.c:934 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -#: convert.c:1240 +#: convert.c:1234 msgid "true/false are no valid working-tree-encodings" msgstr "" -#: convert.c:1428 convert.c:1462 +#: convert.c:1414 convert.c:1447 #, c-format msgid "%s: clean filter '%s' failed" msgstr "" -#: convert.c:1508 +#: convert.c:1490 #, c-format msgid "%s: smudge filter %s failed" msgstr "" @@ -3012,28 +3114,28 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "" -#: diff-merges.c:70 +#: diff-merges.c:80 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "" -#: diff-lib.c:534 +#: diff-lib.c:538 msgid "--merge-base does not work with ranges" msgstr "" -#: diff-lib.c:536 +#: diff-lib.c:540 msgid "--merge-base only works with commits" msgstr "" -#: diff-lib.c:553 +#: diff-lib.c:557 msgid "unable to get HEAD" msgstr "" -#: diff-lib.c:560 +#: diff-lib.c:564 msgid "no merge base found" msgstr "" -#: diff-lib.c:562 +#: diff-lib.c:566 msgid "multiple merge bases found" msgstr "" @@ -3050,18 +3152,20 @@ msgstr "" #: diff.c:156 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" -msgstr "" +msgstr " Gagal mengurai persentase potongan dirstat '%s'\n" #: diff.c:161 #, c-format msgid " Unknown dirstat parameter '%s'\n" -msgstr "" +msgstr " Parameter dirstat tidak ditketahui '%s'\n" #: diff.c:297 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" msgstr "" +"Setelan warna berpindah harus salah satu dari 'no', 'default', 'blocks', " +"'dimmed-zebra', 'plain'" #: diff.c:325 #, c-format @@ -3069,17 +3173,22 @@ msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" msgstr "" +"mode color-moved-ws tidak dikenal '%s', nilai yang mungkin yaitu 'ignore-" +"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-" +"change'" #: diff.c:333 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" msgstr "" +"color-moved-ws: allow-indentation-change tidak dapat digabungkan dengan mode " +"spasi yang lainnya" #: diff.c:410 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" -msgstr "" +msgstr "Nilai tidak dikenal untuk variabel konfigurasi 'diff.submodule': '%s'" #: diff.c:470 #, c-format @@ -3087,556 +3196,583 @@ msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" +"Ditemukan error dalam variable konfigurasi 'diff.dirstat':\n" +"%s" -#: diff.c:4276 +#: diff.c:4278 #, c-format msgid "external diff died, stopping at %s" -msgstr "" +msgstr "diff eksternal mati, berhenti pada %s" -#: diff.c:4628 +#: diff.c:4630 msgid "--name-only, --name-status, --check and -s are mutually exclusive" -msgstr "" +msgstr "--name-only, --name-status, --check dan -s saling eksklusif" -#: diff.c:4631 +#: diff.c:4633 msgid "-G, -S and --find-object are mutually exclusive" -msgstr "" +msgstr "-G, -S dan --find-object saling eksklusif" -#: diff.c:4710 +#: diff.c:4712 msgid "--follow requires exactly one pathspec" -msgstr "" +msgstr "--follow butuh tepatnya satu spek jalur" -#: diff.c:4758 +#: diff.c:4760 #, c-format msgid "invalid --stat value: %s" -msgstr "" +msgstr "nilai --stat tidak valid: %s" -#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306 +#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" -msgstr "" +msgstr "%s harap nilai numerik" -#: diff.c:4795 +#: diff.c:4797 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" +"Gagal menguraikan parameter opsi --dirstat/-X:\n" +"%s" -#: diff.c:4880 +#: diff.c:4882 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" -msgstr "" +msgstr "kelas perubahan '%c' tidak dikenal dalam --diff-filter=%s" -#: diff.c:4904 +#: diff.c:4906 #, c-format msgid "unknown value after ws-error-highlight=%.*s" -msgstr "" +msgstr "nilai tidak dikenal setelah ws-error-highlight=%.*s" -#: diff.c:4918 +#: diff.c:4920 #, c-format msgid "unable to resolve '%s'" -msgstr "" +msgstr "tidak dapat menguraikan '%s'" -#: diff.c:4968 diff.c:4974 +#: diff.c:4970 diff.c:4976 #, c-format msgid "%s expects <n>/<m> form" -msgstr "" +msgstr "%s butuh bentuk <n>/<m>" -#: diff.c:4986 +#: diff.c:4988 #, c-format msgid "%s expects a character, got '%s'" -msgstr "" +msgstr "%s butuh sebuah karakter, dapat '%s'" -#: diff.c:5007 +#: diff.c:5009 #, c-format msgid "bad --color-moved argument: %s" -msgstr "" +msgstr "argumen --color-moved jelek: %s" -#: diff.c:5026 +#: diff.c:5028 #, c-format msgid "invalid mode '%s' in --color-moved-ws" -msgstr "" +msgstr "mode tidak valid '%s' dalam --color-moved-ws" -#: diff.c:5066 +#: diff.c:5068 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" +"opsi diff-algorithm terima \"myers\", \"minimal\", \"patience\" dan " +"\"histogram\"" -#: diff.c:5102 diff.c:5122 +#: diff.c:5104 diff.c:5124 #, c-format msgid "invalid argument to %s" -msgstr "" +msgstr "argumen tidak valid ke %s" -#: diff.c:5226 +#: diff.c:5228 #, c-format msgid "invalid regex given to -I: '%s'" -msgstr "" +msgstr "regex tidak valid diberikan ke -I: '%s'" -#: diff.c:5275 +#: diff.c:5277 #, c-format msgid "failed to parse --submodule option parameter: '%s'" -msgstr "" +msgstr "gagal menguraikan parameter opsi --submodule: '%s'" -#: diff.c:5331 +#: diff.c:5333 #, c-format msgid "bad --word-diff argument: %s" -msgstr "" +msgstr "argumen --word-diff jelek: %s" -#: diff.c:5367 +#: diff.c:5369 msgid "Diff output format options" -msgstr "" +msgstr "Opsi format keluaran diff" -#: diff.c:5369 diff.c:5375 +#: diff.c:5371 diff.c:5377 msgid "generate patch" -msgstr "" +msgstr "buat tambalan" -#: diff.c:5372 builtin/log.c:179 +#: diff.c:5374 builtin/log.c:179 msgid "suppress diff output" -msgstr "" +msgstr "sembunyikan keluaran diff" -#: diff.c:5377 diff.c:5491 diff.c:5498 +#: diff.c:5379 diff.c:5493 diff.c:5500 msgid "<n>" -msgstr "" +msgstr "<n>" -#: diff.c:5378 diff.c:5381 +#: diff.c:5380 diff.c:5383 msgid "generate diffs with <n> lines context" -msgstr "" +msgstr "buat diff dengan <n> baris konteks" -#: diff.c:5383 +#: diff.c:5385 msgid "generate the diff in raw format" -msgstr "" +msgstr "buat diff dalam format mentah" -#: diff.c:5386 +#: diff.c:5388 msgid "synonym for '-p --raw'" -msgstr "" +msgstr "sinonim untuk '-p --raw'" -#: diff.c:5390 +#: diff.c:5392 msgid "synonym for '-p --stat'" -msgstr "" +msgstr "sinonim untuk '-p --stat'" -#: diff.c:5394 +#: diff.c:5396 msgid "machine friendly --stat" -msgstr "" +msgstr "--stat yang ramah mesin" -#: diff.c:5397 +#: diff.c:5399 msgid "output only the last line of --stat" -msgstr "" +msgstr "keluarkan hanya baris terakhir --stat" -#: diff.c:5399 diff.c:5407 +#: diff.c:5401 diff.c:5409 msgid "<param1,param2>..." -msgstr "" +msgstr "<parameter 1,parameter 2>..." -#: diff.c:5400 +#: diff.c:5402 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" +"keluarkan distribusi jumlah perubahan relatif untuk setiap subdirektori" -#: diff.c:5404 +#: diff.c:5406 msgid "synonym for --dirstat=cumulative" -msgstr "" +msgstr "sinonim untuk --dirstat=cumulative" -#: diff.c:5408 +#: diff.c:5410 msgid "synonym for --dirstat=files,param1,param2..." -msgstr "" +msgstr "sinonim untuk --dirstat=files,param1,param2..." -#: diff.c:5412 +#: diff.c:5414 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" +"peringatkan bila perubahan memasukkan penanda konflik atau kesalahan spasi" -#: diff.c:5415 +#: diff.c:5417 msgid "condensed summary such as creations, renames and mode changes" msgstr "" +"ringkasan singkat seperti pembuatan, penggantian nama dan perubahan mode" -#: diff.c:5418 +#: diff.c:5420 msgid "show only names of changed files" -msgstr "" +msgstr "perlihatkan hanya nama berkas yang berubah" -#: diff.c:5421 +#: diff.c:5423 msgid "show only names and status of changed files" -msgstr "" +msgstr "perlihatkan hanya nama dan status berkas yang berubah" -#: diff.c:5423 +#: diff.c:5425 msgid "<width>[,<name-width>[,<count>]]" -msgstr "" +msgstr "<lebar>[,<nama lebar>[,<hitungan>]]" -#: diff.c:5424 +#: diff.c:5426 msgid "generate diffstat" -msgstr "" +msgstr "buat diffstat" -#: diff.c:5426 diff.c:5429 diff.c:5432 +#: diff.c:5428 diff.c:5431 diff.c:5434 msgid "<width>" -msgstr "" +msgstr "<lebar>" -#: diff.c:5427 +#: diff.c:5429 msgid "generate diffstat with a given width" -msgstr "" +msgstr "buat diffstat dengan lebar yang diberikan" -#: diff.c:5430 +#: diff.c:5432 msgid "generate diffstat with a given name width" -msgstr "" +msgstr "buat diffstat dengan nama lebar yang diberikan" -#: diff.c:5433 +#: diff.c:5435 msgid "generate diffstat with a given graph width" -msgstr "" +msgstr "buat diffstat dengan lebar grafik yang diberikan" -#: diff.c:5435 +#: diff.c:5437 msgid "<count>" -msgstr "" +msgstr "<hitungan>" -#: diff.c:5436 +#: diff.c:5438 msgid "generate diffstat with limited lines" -msgstr "" +msgstr "buat diffstat dengan baris yang terbatas" -#: diff.c:5439 +#: diff.c:5441 msgid "generate compact summary in diffstat" -msgstr "" +msgstr "buat ringkasan singkat dalam diffstat" -#: diff.c:5442 +#: diff.c:5444 msgid "output a binary diff that can be applied" -msgstr "" +msgstr "keluarkan diff biner yang dapat diterapkan" -#: diff.c:5445 +#: diff.c:5447 msgid "show full pre- and post-image object names on the \"index\" lines" -msgstr "" +msgstr "perlihatkan objek pra- dan pasca-citra penuh pada baris \"index\"" -#: diff.c:5447 +#: diff.c:5449 msgid "show colored diff" -msgstr "" +msgstr "perlihatkan diff berwarna" -#: diff.c:5448 +#: diff.c:5450 msgid "<kind>" -msgstr "" +msgstr "<tipe>" -#: diff.c:5449 +#: diff.c:5451 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" +"soroti kesalahan spasi dalam baris 'context', 'old' atau 'new' dalam diff" -#: diff.c:5452 +#: diff.c:5454 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" +"jangan tengkar jalur nama dan gunakan NUL sebagai pembatas bidang keluaran " +"pada --raw atau --numstat" -#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570 +#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572 msgid "<prefix>" -msgstr "" +msgstr "<prefiks>" -#: diff.c:5456 +#: diff.c:5458 msgid "show the given source prefix instead of \"a/\"" -msgstr "" +msgstr "perlihatkan prefiks sumber yang diberikan daripada \"a/\"" -#: diff.c:5459 +#: diff.c:5461 msgid "show the given destination prefix instead of \"b/\"" -msgstr "" +msgstr "perlihatkan prefiks tujuan daripada \"b/\"" -#: diff.c:5462 +#: diff.c:5464 msgid "prepend an additional prefix to every line of output" -msgstr "" +msgstr "tambah depan prefiks tambahan pada setiap baris keluaran" -#: diff.c:5465 +#: diff.c:5467 msgid "do not show any source or destination prefix" -msgstr "" +msgstr "jangan perlihatkan prefiks sumber atau tujuan apapun" -#: diff.c:5468 +#: diff.c:5470 msgid "show context between diff hunks up to the specified number of lines" msgstr "" +"perlihatkan konteks diantara hunk diff hingga jumlah baris yang disebutkan" -#: diff.c:5472 diff.c:5477 diff.c:5482 +#: diff.c:5474 diff.c:5479 diff.c:5484 msgid "<char>" -msgstr "" +msgstr "<karakter>" -#: diff.c:5473 +#: diff.c:5475 msgid "specify the character to indicate a new line instead of '+'" -msgstr "" +msgstr "sebutkan karakter yang menandai baris baru daripada '+'" -#: diff.c:5478 +#: diff.c:5480 msgid "specify the character to indicate an old line instead of '-'" -msgstr "" +msgstr "sebutkan karakter yang menandai baris lama daripada '-'" -#: diff.c:5483 +#: diff.c:5485 msgid "specify the character to indicate a context instead of ' '" -msgstr "" +msgstr "sebutkan karakter yang menandai konteks daripada ' '" -#: diff.c:5486 +#: diff.c:5488 msgid "Diff rename options" -msgstr "" +msgstr "Opsi penamaan ulang diff" -#: diff.c:5487 +#: diff.c:5489 msgid "<n>[/<m>]" -msgstr "" +msgstr "<n>[/<m>]" -#: diff.c:5488 +#: diff.c:5490 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" +"pisahkan perubahan penulisan ulang penuh kedalam pasangan penghapusan dan " +"pembuatan" -#: diff.c:5492 +#: diff.c:5494 msgid "detect renames" -msgstr "" +msgstr "deteksi penamaan ulang" -#: diff.c:5496 +#: diff.c:5498 msgid "omit the preimage for deletes" -msgstr "" +msgstr "lewati pracitra untuk penghapusan" -#: diff.c:5499 +#: diff.c:5501 msgid "detect copies" -msgstr "" +msgstr "deteksi penyalinan" -#: diff.c:5503 +#: diff.c:5505 msgid "use unmodified files as source to find copies" msgstr "" +"gunakan berkas tak termodifikasi sebagai sumber untuk menemukan salinan" -#: diff.c:5505 +#: diff.c:5507 msgid "disable rename detection" -msgstr "" +msgstr "nonaktifkan deteksi penamaan ulang" -#: diff.c:5508 +#: diff.c:5510 msgid "use empty blobs as rename source" -msgstr "" +msgstr "gunakan blob kosong sebagai sumber penamaan ulang" -#: diff.c:5510 +#: diff.c:5512 msgid "continue listing the history of a file beyond renames" -msgstr "" +msgstr "lanjutkan daftarkan riwayat berkas di luar penamaan ulang" -#: diff.c:5513 +#: diff.c:5515 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" +"cegah pendeteksian penamaan ulang/penyalinan jika jumlah target penamaan " +"ulang/penyalinan melebihi batas yang diberikan" -#: diff.c:5515 +#: diff.c:5517 msgid "Diff algorithm options" -msgstr "" +msgstr "Opsi algoritma diff" -#: diff.c:5517 +#: diff.c:5519 msgid "produce the smallest possible diff" -msgstr "" +msgstr "hasilkan diff yang paling kecil yang dimungkinkan" -#: diff.c:5520 +#: diff.c:5522 msgid "ignore whitespace when comparing lines" -msgstr "" +msgstr "abaikan spasi saat membandingkan baris" -#: diff.c:5523 +#: diff.c:5525 msgid "ignore changes in amount of whitespace" -msgstr "" +msgstr "abaikan perubahan dalam jumlah spasi" -#: diff.c:5526 +#: diff.c:5528 msgid "ignore changes in whitespace at EOL" -msgstr "" +msgstr "abaikan perubahan spasi pada EOL" -#: diff.c:5529 +#: diff.c:5531 msgid "ignore carrier-return at the end of line" -msgstr "" +msgstr "abaikan kembalian-kurir pada akhir baris" -#: diff.c:5532 +#: diff.c:5534 msgid "ignore changes whose lines are all blank" -msgstr "" +msgstr "abaikan perubahan yang semua baris kosong" -#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604 +#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606 msgid "<regex>" -msgstr "" +msgstr "<regex>" -#: diff.c:5535 +#: diff.c:5537 msgid "ignore changes whose all lines match <regex>" -msgstr "" +msgstr "abaikan perubahan yang semua baris cocok dengan <regex>" -#: diff.c:5538 +#: diff.c:5540 msgid "heuristic to shift diff hunk boundaries for easy reading" -msgstr "" +msgstr "heuristik untuk geser perbatasan hunk diff untuk pembacaan yang mudah" -#: diff.c:5541 +#: diff.c:5543 msgid "generate diff using the \"patience diff\" algorithm" -msgstr "" +msgstr "buat diff menggunakan algoritma \"diff sabar\"" -#: diff.c:5545 +#: diff.c:5547 msgid "generate diff using the \"histogram diff\" algorithm" -msgstr "" +msgstr "buat diff menggunakan algoritma \"diff histogram\"" -#: diff.c:5547 +#: diff.c:5549 msgid "<algorithm>" -msgstr "" +msgstr "<algoritma>" -#: diff.c:5548 +#: diff.c:5550 msgid "choose a diff algorithm" -msgstr "" +msgstr "pilih algoritma diff" -#: diff.c:5550 +#: diff.c:5552 msgid "<text>" -msgstr "" +msgstr "<teks>" -#: diff.c:5551 +#: diff.c:5553 msgid "generate diff using the \"anchored diff\" algorithm" -msgstr "" +msgstr "buat diff menggunakan algoritma \"diff terlabuh\"" -#: diff.c:5553 diff.c:5562 diff.c:5565 +#: diff.c:5555 diff.c:5564 diff.c:5567 msgid "<mode>" -msgstr "" +msgstr "<mode>" -#: diff.c:5554 +#: diff.c:5556 msgid "show word diff, using <mode> to delimit changed words" msgstr "" +"perlihatkan diff kata, menggunakan <mode> untuk batasi kata yang berubah" -#: diff.c:5557 +#: diff.c:5559 msgid "use <regex> to decide what a word is" -msgstr "" +msgstr "gunakan <regex> untuk menentukan apa itu kata" -#: diff.c:5560 +#: diff.c:5562 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" -msgstr "" +msgstr "sama dengan --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5563 +#: diff.c:5565 msgid "moved lines of code are colored differently" -msgstr "" +msgstr "baris kode yang berpindah diwarnai berbeda" -#: diff.c:5566 +#: diff.c:5568 msgid "how white spaces are ignored in --color-moved" -msgstr "" +msgstr "bagaimana spasi diabaikan di --color-moved" -#: diff.c:5569 +#: diff.c:5571 msgid "Other diff options" -msgstr "" +msgstr "Opsi diff yang lainnya" -#: diff.c:5571 +#: diff.c:5573 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" +"ketika dijalankan dari subdirektori, kecualikan perubahan diluar dan " +"perlihatkan jalur relatif" -#: diff.c:5575 +#: diff.c:5577 msgid "treat all files as text" -msgstr "" +msgstr "perlakukan semua berkas sebagai teks" -#: diff.c:5577 +#: diff.c:5579 msgid "swap two inputs, reverse the diff" -msgstr "" +msgstr "tukar dua masukkan, balikkan diff" -#: diff.c:5579 +#: diff.c:5581 msgid "exit with 1 if there were differences, 0 otherwise" -msgstr "" +msgstr "keluar dengan 1 jika ada perbedaan, selain itu 0" -#: diff.c:5581 +#: diff.c:5583 msgid "disable all output of the program" -msgstr "" +msgstr "nonaktifkan semua keluaran program" -#: diff.c:5583 +#: diff.c:5585 msgid "allow an external diff helper to be executed" -msgstr "" +msgstr "perbolehkan pembantu diff eksternal untuk dieksekusi" -#: diff.c:5585 +#: diff.c:5587 msgid "run external text conversion filters when comparing binary files" msgstr "" +"jalankan saringan konversi teks eksternal ketika membandingkan berkas biner" -#: diff.c:5587 +#: diff.c:5589 msgid "<when>" -msgstr "" +msgstr "<kapan>" -#: diff.c:5588 +#: diff.c:5590 msgid "ignore changes to submodules in the diff generation" -msgstr "" +msgstr "abaikan perubahan submodul dalam pembuatan diff" -#: diff.c:5591 +#: diff.c:5593 msgid "<format>" -msgstr "" +msgstr "<format>" -#: diff.c:5592 +#: diff.c:5594 msgid "specify how differences in submodules are shown" -msgstr "" +msgstr "sebutkan bagaimana perbedaan dalam submodul diperlihatkan" -#: diff.c:5596 +#: diff.c:5598 msgid "hide 'git add -N' entries from the index" -msgstr "" +msgstr "sembunyikan entri 'git add -N' dari indeks" -#: diff.c:5599 +#: diff.c:5601 msgid "treat 'git add -N' entries as real in the index" -msgstr "" +msgstr "perlakukan entri 'git add -N' sebagai nyata dalam indeks" -#: diff.c:5601 +#: diff.c:5603 msgid "<string>" -msgstr "" +msgstr "<untai>" -#: diff.c:5602 +#: diff.c:5604 msgid "" "look for differences that change the number of occurrences of the specified " "string" -msgstr "" +msgstr "cari perbedaan yang mengubah jumlah kemunculan untai yang disebutkan" -#: diff.c:5605 +#: diff.c:5607 msgid "" "look for differences that change the number of occurrences of the specified " "regex" -msgstr "" +msgstr "cari perbedaan yang mengubah jumlah kemunculan regex yang disebutkan" -#: diff.c:5608 +#: diff.c:5610 msgid "show all changes in the changeset with -S or -G" -msgstr "" +msgstr "perlihatkan semua perubahan dalam set perubahan dengan -S atau -G" -#: diff.c:5611 +#: diff.c:5613 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" +"perlakukan <string> di -S sebagai ekspresi reguler POSIX yang diperluas" -#: diff.c:5614 +#: diff.c:5616 msgid "control the order in which files appear in the output" -msgstr "" +msgstr "kontrol urutan berkas yang muncul dalam keluaran" -#: diff.c:5615 diff.c:5618 +#: diff.c:5617 diff.c:5620 msgid "<path>" -msgstr "" +msgstr "<jalur>" -#: diff.c:5616 +#: diff.c:5618 msgid "show the change in the specified path first" -msgstr "" +msgstr "perlihatkan perubahan dalam jalur yang disebutkan terlebih dahulu" -#: diff.c:5619 +#: diff.c:5621 msgid "skip the output to the specified path" -msgstr "" +msgstr "lewati keluaran ke jalur yang disebutkan" -#: diff.c:5621 +#: diff.c:5623 msgid "<object-id>" -msgstr "" +msgstr "<id objek>" -#: diff.c:5622 +#: diff.c:5624 msgid "" "look for differences that change the number of occurrences of the specified " "object" -msgstr "" +msgstr "cari perubahan yang mengubah jumlah kemunculan objek yang disebutkan" -#: diff.c:5624 +#: diff.c:5626 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" -msgstr "" +msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5625 +#: diff.c:5627 msgid "select files by diff type" -msgstr "" +msgstr "pilih berkas oleh tipe diff" -#: diff.c:5627 +#: diff.c:5629 msgid "<file>" -msgstr "" +msgstr "<berkas>" -#: diff.c:5628 +#: diff.c:5630 msgid "Output to a specific file" -msgstr "" +msgstr "Keluarkan ke berkas yang disebutkan" -#: diff.c:6285 +#: diff.c:6287 msgid "inexact rename detection was skipped due to too many files." msgstr "" +"deteksi penamaan ulang tak eksak dilewati karena terlalu banyak berkas." -#: diff.c:6288 +#: diff.c:6290 msgid "only found copies from modified paths due to too many files." msgstr "" +"hanya ditemukan salinan dari jalur yang berubah karena terlalu banyak berkas." -#: diff.c:6291 +#: diff.c:6293 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" +"mungkin Anda ingin menyetel variabel %s Anda ke setidaknya %d dan coba lagi " +"perintah." #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:786 +#: diffcore-rename.c:1418 msgid "Performing inexact rename detection" msgstr "" @@ -3669,35 +3805,35 @@ msgstr "" msgid "disabling cone pattern matching" msgstr "" -#: dir.c:1198 +#: dir.c:1206 #, c-format msgid "cannot use %s as an exclude file" msgstr "" -#: dir.c:2305 +#: dir.c:2314 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2605 +#: dir.c:2614 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2729 +#: dir.c:2738 msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3534 +#: dir.c:3543 #, c-format msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:3579 dir.c:3584 +#: dir.c:3590 dir.c:3595 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3613 +#: dir.c:3624 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" @@ -3707,11 +3843,11 @@ msgstr "" msgid "hint: Waiting for your editor to close the file...%c" msgstr "" -#: entry.c:177 +#: entry.c:179 msgid "Filtering content" msgstr "" -#: entry.c:478 +#: entry.c:500 #, c-format msgid "could not stat file '%s'" msgstr "" @@ -3731,249 +3867,257 @@ msgstr "" msgid "too many args to run %s" msgstr "" -#: fetch-pack.c:177 +#: fetch-pack.c:182 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:180 +#: fetch-pack.c:185 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" -#: fetch-pack.c:191 +#: fetch-pack.c:196 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" -#: fetch-pack.c:211 +#: fetch-pack.c:216 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:222 +#: fetch-pack.c:227 msgid "unable to write to remote" msgstr "" -#: fetch-pack.c:283 +#: fetch-pack.c:288 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:378 fetch-pack.c:1457 +#: fetch-pack.c:383 fetch-pack.c:1423 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:384 fetch-pack.c:1463 +#: fetch-pack.c:389 fetch-pack.c:1429 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:386 fetch-pack.c:1465 +#: fetch-pack.c:391 fetch-pack.c:1431 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:389 fetch-pack.c:1468 +#: fetch-pack.c:394 fetch-pack.c:1434 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:391 fetch-pack.c:1470 +#: fetch-pack.c:396 fetch-pack.c:1436 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:394 fetch-pack.c:1474 +#: fetch-pack.c:399 fetch-pack.c:1440 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:434 +#: fetch-pack.c:439 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:451 +#: fetch-pack.c:456 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:482 +#: fetch-pack.c:487 msgid "giving up" msgstr "" -#: fetch-pack.c:495 progress.c:339 +#: fetch-pack.c:500 progress.c:339 msgid "done" msgstr "" -#: fetch-pack.c:507 +#: fetch-pack.c:512 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:543 +#: fetch-pack.c:548 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:758 +#: fetch-pack.c:763 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:844 +#: fetch-pack.c:849 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:852 +#: fetch-pack.c:857 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:946 +#: fetch-pack.c:951 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:952 +#: fetch-pack.c:957 msgid "fetch-pack: invalid index-pack output" msgstr "" -#: fetch-pack.c:969 +#: fetch-pack.c:974 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:971 +#: fetch-pack.c:976 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:1031 +#: fetch-pack.c:1019 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054 -#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 -#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 -#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108 +#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042 +#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 +#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096 #, c-format msgid "Server supports %s" msgstr "" -#: fetch-pack.c:1041 +#: fetch-pack.c:1029 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:1101 +#: fetch-pack.c:1089 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:1106 +#: fetch-pack.c:1094 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:1110 +#: fetch-pack.c:1098 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1112 +#: fetch-pack.c:1100 msgid "Server does not support this repository's object format" msgstr "" -#: fetch-pack.c:1125 +#: fetch-pack.c:1113 msgid "no common commits" msgstr "" -#: fetch-pack.c:1138 fetch-pack.c:1682 +#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238 +msgid "source repository is shallow, reject to clone." +msgstr "" + +#: fetch-pack.c:1128 fetch-pack.c:1651 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1265 +#: fetch-pack.c:1242 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "" -#: fetch-pack.c:1269 +#: fetch-pack.c:1246 #, c-format msgid "the server does not support algorithm '%s'" msgstr "" -#: fetch-pack.c:1289 +#: fetch-pack.c:1279 msgid "Server does not support shallow requests" msgstr "" -#: fetch-pack.c:1296 +#: fetch-pack.c:1286 msgid "Server supports filter" msgstr "" -#: fetch-pack.c:1335 +#: fetch-pack.c:1329 fetch-pack.c:2034 msgid "unable to write request to remote" msgstr "" -#: fetch-pack.c:1353 +#: fetch-pack.c:1347 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1359 +#: fetch-pack.c:1353 #, c-format msgid "expected '%s', received '%s'" msgstr "" -#: fetch-pack.c:1420 +#: fetch-pack.c:1387 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1425 +#: fetch-pack.c:1392 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1435 +#: fetch-pack.c:1402 msgid "expected packfile to be sent after 'ready'" msgstr "" -#: fetch-pack.c:1437 +#: fetch-pack.c:1404 msgid "expected no other sections to be sent after no 'ready'" msgstr "" -#: fetch-pack.c:1479 +#: fetch-pack.c:1445 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1526 +#: fetch-pack.c:1494 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "" -#: fetch-pack.c:1531 +#: fetch-pack.c:1499 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "" -#: fetch-pack.c:1536 +#: fetch-pack.c:1504 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1566 +#: fetch-pack.c:1534 msgid "git fetch-pack: expected response end packet" msgstr "" -#: fetch-pack.c:1960 +#: fetch-pack.c:1930 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1983 builtin/clone.c:693 +#: fetch-pack.c:1953 builtin/clone.c:697 msgid "remote did not send all necessary objects" msgstr "" -#: fetch-pack.c:2010 +#: fetch-pack.c:2056 +msgid "unexpected 'ready' from remote" +msgstr "" + +#: fetch-pack.c:2079 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:2013 +#: fetch-pack.c:2082 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" @@ -3996,24 +4140,24 @@ msgstr "" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:543 +#: grep.c:531 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" msgstr "" -#: grep.c:1906 +#: grep.c:1893 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90 -#: builtin/rm.c:135 +#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:1934 +#: grep.c:1921 #, c-format msgid "'%s': short read" msgstr "" @@ -4215,47 +4359,52 @@ msgstr "" msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:454 builtin/commit.c:634 +#: ident.c:454 builtin/commit.c:647 #, c-format msgid "invalid date format: %s" msgstr "" -#: list-objects-filter-options.c:81 +#: list-objects-filter-options.c:83 msgid "expected 'tree:<depth>'" msgstr "" -#: list-objects-filter-options.c:96 +#: list-objects-filter-options.c:98 msgid "sparse:path filters support has been dropped" msgstr "" -#: list-objects-filter-options.c:109 +#: list-objects-filter-options.c:105 +#, c-format +msgid "'%s' for 'object:type=<type>' isnot a valid object type" +msgstr "" + +#: list-objects-filter-options.c:124 #, c-format msgid "invalid filter-spec '%s'" msgstr "" -#: list-objects-filter-options.c:125 +#: list-objects-filter-options.c:140 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "" -#: list-objects-filter-options.c:167 +#: list-objects-filter-options.c:182 msgid "expected something after combine:" msgstr "" -#: list-objects-filter-options.c:249 +#: list-objects-filter-options.c:264 msgid "multiple filter-specs cannot be combined" msgstr "" -#: list-objects-filter-options.c:361 +#: list-objects-filter-options.c:376 msgid "unable to upgrade repository format to support partial clone" msgstr "" -#: list-objects-filter.c:492 +#: list-objects-filter.c:532 #, c-format msgid "unable to access sparse blob in '%s'" msgstr "" -#: list-objects-filter.c:495 +#: list-objects-filter.c:535 #, c-format msgid "unable to parse sparse filter data in %s" msgstr "" @@ -4270,7 +4419,7 @@ msgstr "" msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "" -#: list-objects.c:375 +#: list-objects.c:395 #, c-format msgid "unable to load root tree for commit %s" msgstr "" @@ -4301,38 +4450,48 @@ msgstr "" msgid "expected flush after ls-refs arguments" msgstr "" -#: merge-ort.c:888 merge-recursive.c:1191 +#: mailinfo.c:1050 +msgid "quoted CRLF detected" +msgstr "" + +#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46 +#, c-format +msgid "bad action '%s' for '%s'" +msgstr "" + +#: merge-ort.c:1116 merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "" -#: merge-ort.c:897 merge-recursive.c:1198 +#: merge-ort.c:1125 merge-recursive.c:1212 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "" -#: merge-ort.c:906 merge-recursive.c:1205 +#: merge-ort.c:1134 merge-recursive.c:1219 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" -#: merge-ort.c:916 merge-ort.c:923 +#: merge-ort.c:1144 merge-ort.c:1151 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "" -#: merge-ort.c:944 +#: merge-ort.c:1172 +#, c-format msgid "Failed to merge submodule %s" msgstr "" -#: merge-ort.c:951 +#: merge-ort.c:1179 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" "%s\n" msgstr "" -#: merge-ort.c:955 merge-recursive.c:1259 +#: merge-ort.c:1183 merge-recursive.c:1273 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4343,42 +4502,42 @@ msgid "" "which will accept this suggestion.\n" msgstr "" -#: merge-ort.c:968 +#: merge-ort.c:1196 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" "%s" msgstr "" -#: merge-ort.c:1127 merge-recursive.c:1341 +#: merge-ort.c:1415 merge-recursive.c:1362 msgid "Failed to execute internal merge" msgstr "" -#: merge-ort.c:1132 merge-recursive.c:1346 +#: merge-ort.c:1420 merge-recursive.c:1367 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-ort.c:1139 merge-recursive.c:1378 +#: merge-ort.c:1427 merge-recursive.c:1400 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-ort.c:1278 merge-recursive.c:2100 +#: merge-ort.c:1566 merge-recursive.c:2122 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" -#: merge-ort.c:1288 merge-recursive.c:2110 +#: merge-ort.c:1576 merge-recursive.c:2132 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" -#: merge-ort.c:1471 +#: merge-ort.c:1634 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4386,47 +4545,47 @@ msgid "" "majority of the files." msgstr "" -#: merge-ort.c:1637 merge-recursive.c:2447 +#: merge-ort.c:1788 merge-recursive.c:2468 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "" -#: merge-ort.c:1781 merge-recursive.c:3215 +#: merge-ort.c:1932 merge-recursive.c:3244 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." msgstr "" -#: merge-ort.c:1788 merge-recursive.c:3222 +#: merge-ort.c:1939 merge-recursive.c:3251 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " "%s; moving it to %s." msgstr "" -#: merge-ort.c:1801 merge-recursive.c:3218 +#: merge-ort.c:1952 merge-recursive.c:3247 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " "in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-ort.c:1809 merge-recursive.c:3225 +#: merge-ort.c:1960 merge-recursive.c:3254 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " "was renamed in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-ort.c:1952 +#: merge-ort.c:2103 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" -#: merge-ort.c:2047 +#: merge-ort.c:2198 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4434,76 +4593,91 @@ msgid "" "markers." msgstr "" -#: merge-ort.c:2066 merge-ort.c:2090 +#: merge-ort.c:2217 merge-ort.c:2241 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" -#: merge-ort.c:2735 +#: merge-ort.c:2550 merge-recursive.c:3002 +#, c-format +msgid "cannot read object %s" +msgstr "" + +#: merge-ort.c:2553 merge-recursive.c:3005 +#, c-format +msgid "object %s is not a blob" +msgstr "" + +#: merge-ort.c:2981 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " "%s instead." msgstr "" -#: merge-ort.c:2808 +#: merge-ort.c:3055 #, c-format msgid "" -"CONFLICT (distinct types): %s had different types on each side; renamed %s " +"CONFLICT (distinct types): %s had different types on each side; renamed both " "of them so each can be recorded somewhere." msgstr "" -#: merge-ort.c:2812 -msgid "both" -msgstr "" - -#: merge-ort.c:2812 -msgid "one" +#: merge-ort.c:3062 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed one " +"of them so each can be recorded somewhere." msgstr "" -#: merge-ort.c:2907 merge-recursive.c:3052 +#: merge-ort.c:3162 merge-recursive.c:3081 msgid "content" msgstr "" -#: merge-ort.c:2909 merge-recursive.c:3056 +#: merge-ort.c:3164 merge-recursive.c:3085 msgid "add/add" msgstr "" -#: merge-ort.c:2911 merge-recursive.c:3101 +#: merge-ort.c:3166 merge-recursive.c:3130 msgid "submodule" msgstr "" -#: merge-ort.c:2913 merge-recursive.c:3102 +#: merge-ort.c:3168 merge-recursive.c:3131 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-ort.c:2938 +#: merge-ort.c:3198 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " "of %s left in tree." msgstr "" +#: merge-ort.c:3433 +#, c-format +msgid "" +"Note: %s not up to date and in way of checking out conflicted version; old " +"copy renamed to %s" +msgstr "" + #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:3406 +#: merge-ort.c:3730 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "" -#: merge-ort-wrappers.c:13 merge-recursive.c:3661 +#: merge-ort-wrappers.c:13 merge-recursive.c:3699 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" " %s" msgstr "" -#: merge-ort-wrappers.c:33 merge-recursive.c:3436 -#, c-format -msgid "Already up to date!" -msgstr "" +#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402 +msgid "Already up to date." +msgstr "Sudah terbaru." #: merge-recursive.c:356 msgid "(bad commit)\n" @@ -4519,162 +4693,162 @@ msgstr "" msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:874 +#: merge-recursive.c:876 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:885 +#: merge-recursive.c:887 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:901 merge-recursive.c:920 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:908 +#: merge-recursive.c:910 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:951 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:954 +#: merge-recursive.c:956 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:979 +#: merge-recursive.c:981 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:990 +#: merge-recursive.c:992 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:995 +#: merge-recursive.c:997 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1227 merge-recursive.c:1239 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1230 merge-recursive.c:1242 #, c-format msgid "Fast-forwarding submodule %s" msgstr "" -#: merge-recursive.c:1251 +#: merge-recursive.c:1265 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -#: merge-recursive.c:1255 +#: merge-recursive.c:1269 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "" -#: merge-recursive.c:1256 +#: merge-recursive.c:1270 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" -#: merge-recursive.c:1268 +#: merge-recursive.c:1282 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" -#: merge-recursive.c:1402 +#: merge-recursive.c:1424 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" -#: merge-recursive.c:1474 +#: merge-recursive.c:1496 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1479 +#: merge-recursive.c:1501 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "" -#: merge-recursive.c:1486 +#: merge-recursive.c:1508 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1491 +#: merge-recursive.c:1513 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "" -#: merge-recursive.c:1526 +#: merge-recursive.c:1548 msgid "rename" msgstr "" -#: merge-recursive.c:1526 +#: merge-recursive.c:1548 msgid "renamed" msgstr "" -#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 +#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "" -#: merge-recursive.c:1587 +#: merge-recursive.c:1609 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" -#: merge-recursive.c:1645 +#: merge-recursive.c:1667 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" -#: merge-recursive.c:1676 +#: merge-recursive.c:1698 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1681 +#: merge-recursive.c:1703 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" -#: merge-recursive.c:1708 +#: merge-recursive.c:1730 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1713 +#: merge-recursive.c:1735 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1805 +#: merge-recursive.c:1827 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:2068 +#: merge-recursive.c:2090 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4682,96 +4856,86 @@ msgid "" "getting a majority of the files." msgstr "" -#: merge-recursive.c:2202 +#: merge-recursive.c:2224 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" -#: merge-recursive.c:2973 -#, c-format -msgid "cannot read object %s" -msgstr "" - -#: merge-recursive.c:2976 -#, c-format -msgid "object %s is not a blob" -msgstr "" - -#: merge-recursive.c:3040 +#: merge-recursive.c:3069 msgid "modify" msgstr "" -#: merge-recursive.c:3040 +#: merge-recursive.c:3069 msgid "modified" msgstr "" -#: merge-recursive.c:3079 +#: merge-recursive.c:3108 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:3132 +#: merge-recursive.c:3161 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:3339 +#: merge-recursive.c:3368 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:3362 +#: merge-recursive.c:3391 msgid "file/directory" msgstr "" -#: merge-recursive.c:3367 +#: merge-recursive.c:3396 msgid "directory/file" msgstr "" -#: merge-recursive.c:3374 +#: merge-recursive.c:3403 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:3383 +#: merge-recursive.c:3412 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:3392 +#: merge-recursive.c:3421 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3445 +#: merge-recursive.c:3474 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:3539 +#: merge-recursive.c:3568 msgid "Merging:" msgstr "" -#: merge-recursive.c:3552 +#: merge-recursive.c:3581 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:3602 +#: merge-recursive.c:3631 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:3758 +#: merge-recursive.c:3796 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896 -#: builtin/stash.c:471 +#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900 +#: builtin/stash.c:473 msgid "Unable to write index." msgstr "" @@ -4779,176 +4943,195 @@ msgstr "" msgid "failed to read the cache" msgstr "" -#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917 -#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817 -#: builtin/stash.c:265 +#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965 +#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 +#: builtin/stash.c:267 msgid "unable to write new index file" msgstr "" -#: midx.c:62 +#: midx.c:74 msgid "multi-pack-index OID fanout is of the wrong size" msgstr "" -#: midx.c:93 +#: midx.c:105 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" -#: midx.c:109 +#: midx.c:121 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" -#: midx.c:114 +#: midx.c:126 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "" -#: midx.c:119 +#: midx.c:131 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "" -#: midx.c:136 +#: midx.c:148 msgid "multi-pack-index missing required pack-name chunk" msgstr "" -#: midx.c:138 +#: midx.c:150 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" -#: midx.c:140 +#: midx.c:152 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" -#: midx.c:142 +#: midx.c:154 msgid "multi-pack-index missing required object offsets chunk" msgstr "" -#: midx.c:158 +#: midx.c:170 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:202 +#: midx.c:214 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:252 +#: midx.c:264 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" -#: midx.c:467 +#: midx.c:490 #, c-format msgid "failed to add packfile '%s'" msgstr "" -#: midx.c:473 +#: midx.c:496 #, c-format msgid "failed to open pack-index '%s'" msgstr "" -#: midx.c:533 +#: midx.c:564 #, c-format msgid "failed to locate object %d in packfile" msgstr "" -#: midx.c:821 +#: midx.c:880 builtin/index-pack.c:1535 +msgid "cannot store reverse index file" +msgstr "tidak dapat menyimpan berkas indeks balik" + +#: midx.c:933 msgid "Adding packfiles to multi-pack-index" msgstr "" -#: midx.c:855 +#: midx.c:979 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:904 +#: midx.c:1024 +#, c-format +msgid "unknown preferred pack: '%s'" +msgstr "" + +#: midx.c:1029 +#, c-format +msgid "preferred pack '%s' is expired" +msgstr "" + +#: midx.c:1045 msgid "no pack files to index." msgstr "" -#: midx.c:965 +#: midx.c:1125 builtin/clean.c:37 +#, c-format +msgid "failed to remove %s" +msgstr "gagal menghapus %s" + +#: midx.c:1156 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "" -#: midx.c:1021 +#: midx.c:1214 msgid "multi-pack-index file exists, but failed to parse" msgstr "" -#: midx.c:1029 +#: midx.c:1222 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1044 +#: midx.c:1237 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" -#: midx.c:1049 +#: midx.c:1242 msgid "the midx contains no oid" msgstr "" -#: midx.c:1058 +#: midx.c:1251 msgid "Verifying OID order in multi-pack-index" msgstr "" -#: midx.c:1067 +#: midx.c:1260 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1087 +#: midx.c:1280 msgid "Sorting objects by packfile" msgstr "" -#: midx.c:1094 +#: midx.c:1287 msgid "Verifying object offsets" msgstr "" -#: midx.c:1110 +#: midx.c:1303 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "" -#: midx.c:1116 +#: midx.c:1309 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "" -#: midx.c:1125 +#: midx.c:1318 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" -#: midx.c:1150 +#: midx.c:1343 msgid "Counting referenced objects" msgstr "" -#: midx.c:1160 +#: midx.c:1353 msgid "Finding and deleting unreferenced packfiles" msgstr "" -#: midx.c:1351 +#: midx.c:1544 msgid "could not start pack-objects" msgstr "" -#: midx.c:1371 +#: midx.c:1564 msgid "could not finish pack-objects" msgstr "" -#: name-hash.c:538 +#: name-hash.c:542 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "" -#: name-hash.c:560 +#: name-hash.c:564 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "" -#: name-hash.c:566 +#: name-hash.c:570 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "" @@ -4989,256 +5172,256 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "" -#: object-file.c:480 +#: object-file.c:526 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" -#: object-file.c:531 +#: object-file.c:577 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "" -#: object-file.c:603 +#: object-file.c:649 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" -#: object-file.c:610 +#: object-file.c:656 #, c-format msgid "unable to normalize object directory: %s" msgstr "" -#: object-file.c:653 +#: object-file.c:699 msgid "unable to fdopen alternates lockfile" msgstr "" -#: object-file.c:671 +#: object-file.c:717 msgid "unable to read alternates file" msgstr "" -#: object-file.c:678 +#: object-file.c:724 msgid "unable to move new alternates file into place" msgstr "" -#: object-file.c:713 +#: object-file.c:759 #, c-format msgid "path '%s' does not exist" msgstr "" -#: object-file.c:734 +#: object-file.c:780 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: object-file.c:740 +#: object-file.c:786 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: object-file.c:746 +#: object-file.c:792 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: object-file.c:754 +#: object-file.c:800 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: object-file.c:814 +#: object-file.c:860 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "" -#: object-file.c:964 +#: object-file.c:1010 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "" -#: object-file.c:985 +#: object-file.c:1031 msgid "mmap failed" msgstr "" -#: object-file.c:1149 +#: object-file.c:1195 #, c-format msgid "object file %s is empty" msgstr "" -#: object-file.c:1284 object-file.c:2477 +#: object-file.c:1330 object-file.c:2524 #, c-format msgid "corrupt loose object '%s'" msgstr "" -#: object-file.c:1286 object-file.c:2481 +#: object-file.c:1332 object-file.c:2528 #, c-format msgid "garbage at end of loose object '%s'" msgstr "" -#: object-file.c:1328 +#: object-file.c:1374 msgid "invalid object type" msgstr "" -#: object-file.c:1412 +#: object-file.c:1458 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" -#: object-file.c:1415 +#: object-file.c:1461 #, c-format msgid "unable to unpack %s header" msgstr "" -#: object-file.c:1421 +#: object-file.c:1467 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" -#: object-file.c:1424 +#: object-file.c:1470 #, c-format msgid "unable to parse %s header" msgstr "" -#: object-file.c:1651 +#: object-file.c:1697 #, c-format msgid "failed to read object %s" msgstr "" -#: object-file.c:1655 +#: object-file.c:1701 #, c-format msgid "replacement %s not found for %s" msgstr "" -#: object-file.c:1659 +#: object-file.c:1705 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "" -#: object-file.c:1663 +#: object-file.c:1709 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "" -#: object-file.c:1768 +#: object-file.c:1814 #, c-format msgid "unable to write file %s" msgstr "" -#: object-file.c:1775 +#: object-file.c:1821 #, c-format msgid "unable to set permission to '%s'" msgstr "" -#: object-file.c:1782 +#: object-file.c:1828 msgid "file write error" msgstr "" -#: object-file.c:1802 +#: object-file.c:1848 msgid "error when closing loose object file" msgstr "" -#: object-file.c:1867 +#: object-file.c:1913 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -#: object-file.c:1869 +#: object-file.c:1915 msgid "unable to create temporary file" msgstr "" -#: object-file.c:1893 +#: object-file.c:1939 msgid "unable to write loose object file" msgstr "" -#: object-file.c:1899 +#: object-file.c:1945 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "" -#: object-file.c:1903 +#: object-file.c:1949 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "" -#: object-file.c:1907 +#: object-file.c:1953 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: object-file.c:1917 builtin/pack-objects.c:1097 +#: object-file.c:1963 builtin/pack-objects.c:1097 #, c-format msgid "failed utime() on %s" msgstr "" -#: object-file.c:1994 +#: object-file.c:2040 #, c-format msgid "cannot read object for %s" msgstr "" -#: object-file.c:2045 +#: object-file.c:2091 msgid "corrupt commit" msgstr "" -#: object-file.c:2053 +#: object-file.c:2099 msgid "corrupt tag" msgstr "" -#: object-file.c:2153 +#: object-file.c:2199 #, c-format msgid "read error while indexing %s" msgstr "" -#: object-file.c:2156 +#: object-file.c:2202 #, c-format msgid "short read while indexing %s" msgstr "" -#: object-file.c:2229 object-file.c:2239 +#: object-file.c:2275 object-file.c:2285 #, c-format msgid "%s: failed to insert into database" msgstr "" -#: object-file.c:2245 +#: object-file.c:2291 #, c-format msgid "%s: unsupported file type" msgstr "" -#: object-file.c:2269 +#: object-file.c:2315 #, c-format msgid "%s is not a valid object" msgstr "" -#: object-file.c:2271 +#: object-file.c:2317 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: object-file.c:2298 builtin/index-pack.c:192 +#: object-file.c:2344 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "tidak dapat membuka %s" -#: object-file.c:2488 object-file.c:2541 +#: object-file.c:2535 object-file.c:2588 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "" -#: object-file.c:2512 +#: object-file.c:2559 #, c-format msgid "unable to mmap %s" msgstr "" -#: object-file.c:2517 +#: object-file.c:2564 #, c-format msgid "unable to unpack header of %s" msgstr "" -#: object-file.c:2523 +#: object-file.c:2570 #, c-format msgid "unable to parse header of %s" msgstr "" -#: object-file.c:2534 +#: object-file.c:2581 #, c-format msgid "unable to unpack contents of %s" msgstr "" @@ -5335,69 +5518,71 @@ msgstr "" msgid "object %s is a %s, not a %s" msgstr "" -#: object.c:233 +#: object.c:232 #, c-format msgid "object %s has unknown type id %d" msgstr "" -#: object.c:246 +#: object.c:245 #, c-format msgid "unable to parse object: %s" msgstr "" -#: object.c:266 object.c:278 +#: object.c:265 object.c:277 #, c-format msgid "hash mismatch %s" msgstr "" -#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226 +#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251 #, c-format msgid "unable to get size of %s" msgstr "" -#: pack-bitmap.c:1489 builtin/rev-list.c:92 +#: pack-bitmap.c:1547 builtin/rev-list.c:92 +#, c-format msgid "unable to get disk usage of %s" msgstr "" -#: pack-revindex.c:220 +#: pack-revindex.c:221 #, c-format msgid "reverse-index file %s is too small" msgstr "" -#: pack-revindex.c:225 +#: pack-revindex.c:226 #, c-format msgid "reverse-index file %s is corrupt" msgstr "" -#: pack-revindex.c:233 +#: pack-revindex.c:234 #, c-format msgid "reverse-index file %s has unknown signature" msgstr "" -#: pack-revindex.c:237 +#: pack-revindex.c:238 #, c-format msgid "reverse-index file %s has unsupported version %<PRIu32>" msgstr "" -#: pack-revindex.c:242 +#: pack-revindex.c:243 #, c-format msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "" -#: pack-write.c:236 +#: pack-write.c:250 msgid "cannot both write and verify reverse index" msgstr "" -#: pack-write.c:257 +#: pack-write.c:271 +#, c-format msgid "could not stat: %s" msgstr "" -#: pack-write.c:269 +#: pack-write.c:283 #, c-format msgid "failed to make %s readable" msgstr "" -#: pack-write.c:508 +#: pack-write.c:522 #, c-format msgid "could not write '%s' promisor file" msgstr "" @@ -5406,12 +5591,12 @@ msgstr "" msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:1934 +#: packfile.c:1937 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1938 +#: packfile.c:1941 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -5476,31 +5661,31 @@ msgstr "" msgid "did you mean `--%s` (with two dashes)?" msgstr "" -#: parse-options.c:666 parse-options.c:971 +#: parse-options.c:668 parse-options.c:988 #, c-format msgid "alias of --%s" msgstr "" -#: parse-options.c:862 +#: parse-options.c:879 #, c-format msgid "unknown option `%s'" msgstr "" -#: parse-options.c:864 +#: parse-options.c:881 #, c-format msgid "unknown switch `%c'" msgstr "" -#: parse-options.c:866 +#: parse-options.c:883 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "" -#: parse-options.c:890 +#: parse-options.c:907 msgid "..." msgstr "" -#: parse-options.c:909 +#: parse-options.c:926 #, c-format msgid "usage: %s" msgstr "" @@ -5508,17 +5693,17 @@ msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:915 +#: parse-options.c:932 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:918 +#: parse-options.c:935 #, c-format msgid " %s" msgstr "" -#: parse-options.c:957 +#: parse-options.c:974 msgid "-NUM" msgstr "" @@ -5527,78 +5712,78 @@ msgstr "" msgid "Could not make %s writable by group" msgstr "" -#: pathspec.c:130 +#: pathspec.c:151 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" -#: pathspec.c:148 +#: pathspec.c:169 msgid "Only one 'attr:' specification is allowed." msgstr "" -#: pathspec.c:151 +#: pathspec.c:172 msgid "attr spec must not be empty" msgstr "" -#: pathspec.c:194 +#: pathspec.c:215 #, c-format msgid "invalid attribute name %s" msgstr "" -#: pathspec.c:259 +#: pathspec.c:280 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" -#: pathspec.c:266 +#: pathspec.c:287 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" -#: pathspec.c:306 +#: pathspec.c:327 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" -#: pathspec.c:327 +#: pathspec.c:348 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "" -#: pathspec.c:332 +#: pathspec.c:353 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "" -#: pathspec.c:370 +#: pathspec.c:391 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" -#: pathspec.c:429 +#: pathspec.c:450 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" -#: pathspec.c:445 +#: pathspec.c:466 #, c-format msgid "%s: '%s' is outside repository at '%s'" msgstr "" -#: pathspec.c:521 +#: pathspec.c:542 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "" -#: pathspec.c:531 +#: pathspec.c:552 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:598 +#: pathspec.c:619 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" -#: pathspec.c:643 +#: pathspec.c:664 #, c-format msgid "line is badly quoted: %s" msgstr "" @@ -5619,7 +5804,7 @@ msgstr "" msgid "flush packet write failed" msgstr "" -#: pkt-line.c:153 pkt-line.c:239 +#: pkt-line.c:153 pkt-line.c:265 msgid "protocol error: impossibly long line" msgstr "" @@ -5627,33 +5812,34 @@ msgstr "" msgid "packet write with format failed" msgstr "" -#: pkt-line.c:203 +#: pkt-line.c:204 msgid "packet write failed - data exceeds max packet size" msgstr "" -#: pkt-line.c:210 pkt-line.c:217 -msgid "packet write failed" +#: pkt-line.c:222 +#, c-format +msgid "packet write failed: %s" msgstr "" -#: pkt-line.c:302 +#: pkt-line.c:328 pkt-line.c:329 msgid "read error" msgstr "" -#: pkt-line.c:310 +#: pkt-line.c:339 pkt-line.c:340 msgid "the remote end hung up unexpectedly" msgstr "" -#: pkt-line.c:338 +#: pkt-line.c:369 pkt-line.c:371 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "" -#: pkt-line.c:352 pkt-line.c:357 +#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396 #, c-format msgid "protocol error: bad line length %d" msgstr "" -#: pkt-line.c:373 sideband.c:165 +#: pkt-line.c:413 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "" @@ -5667,7 +5853,7 @@ msgstr "" msgid "unable to create threaded lstat: %s" msgstr "" -#: pretty.c:984 +#: pretty.c:988 msgid "unable to parse --pretty format" msgstr "" @@ -5688,6 +5874,10 @@ msgstr "" msgid "promisor remote name cannot begin with '/': %s" msgstr "" +#: protocol-caps.c:103 +msgid "object-info: expected flush after arguments" +msgstr "" + #: prune-packed.c:35 msgid "Removing duplicate objects" msgstr "" @@ -5700,7 +5890,7 @@ msgstr "" msgid "could not read `log` output" msgstr "" -#: range-diff.c:101 sequencer.c:5318 +#: range-diff.c:101 sequencer.c:5551 #, c-format msgid "could not parse commit '%s'" msgstr "" @@ -5730,196 +5920,200 @@ msgstr "" msgid "could not parse log for '%s'" msgstr "" -#: read-cache.c:682 +#: read-cache.c:708 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" -#: read-cache.c:698 +#: read-cache.c:724 msgid "cannot create an empty blob in the object database" msgstr "" -#: read-cache.c:720 +#: read-cache.c:746 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" -#: read-cache.c:725 +#: read-cache.c:751 #, c-format msgid "'%s' does not have a commit checked out" msgstr "" -#: read-cache.c:777 +#: read-cache.c:803 #, c-format msgid "unable to index file '%s'" msgstr "" -#: read-cache.c:796 +#: read-cache.c:822 #, c-format msgid "unable to add '%s' to index" msgstr "" -#: read-cache.c:807 +#: read-cache.c:833 #, c-format msgid "unable to stat '%s'" msgstr "" -#: read-cache.c:1318 +#: read-cache.c:1356 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "" -#: read-cache.c:1532 +#: read-cache.c:1571 msgid "Refresh index" msgstr "" -#: read-cache.c:1657 +#: read-cache.c:1700 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1667 +#: read-cache.c:1710 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1723 +#: read-cache.c:1766 #, c-format msgid "bad signature 0x%08x" msgstr "" -#: read-cache.c:1726 +#: read-cache.c:1769 #, c-format msgid "bad index version %d" msgstr "" -#: read-cache.c:1735 +#: read-cache.c:1778 msgid "bad index file sha1 signature" msgstr "" -#: read-cache.c:1765 +#: read-cache.c:1812 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" -#: read-cache.c:1767 +#: read-cache.c:1814 #, c-format msgid "ignoring %.4s extension" msgstr "" -#: read-cache.c:1804 +#: read-cache.c:1851 #, c-format msgid "unknown index entry format 0x%08x" msgstr "" -#: read-cache.c:1820 +#: read-cache.c:1867 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "" -#: read-cache.c:1877 +#: read-cache.c:1924 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1880 +#: read-cache.c:1927 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "" -#: read-cache.c:1883 +#: read-cache.c:1930 #, c-format msgid "unordered stage entries for '%s'" msgstr "" -#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181 -#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991 +#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 #: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "" -#: read-cache.c:2133 +#: read-cache.c:2180 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2146 +#: read-cache.c:2193 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2179 +#: read-cache.c:2226 #, c-format msgid "%s: index file open failed" msgstr "" -#: read-cache.c:2183 +#: read-cache.c:2230 #, c-format msgid "%s: cannot stat the open index" msgstr "" -#: read-cache.c:2187 +#: read-cache.c:2234 #, c-format msgid "%s: index file smaller than expected" msgstr "" -#: read-cache.c:2191 +#: read-cache.c:2238 #, c-format msgid "%s: unable to map index file" msgstr "" -#: read-cache.c:2233 +#: read-cache.c:2280 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2260 +#: read-cache.c:2307 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2292 +#: read-cache.c:2345 #, c-format msgid "could not freshen shared index '%s'" msgstr "" -#: read-cache.c:2339 +#: read-cache.c:2392 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141 +#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239 +#: read-cache.c:3138 +msgid "failed to convert to a sparse-index" +msgstr "" + +#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:3151 +#: read-cache.c:3222 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:3163 +#: read-cache.c:3234 #, c-format msgid "unable to unlink: %s" msgstr "" -#: read-cache.c:3188 +#: read-cache.c:3263 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "" -#: read-cache.c:3337 +#: read-cache.c:3412 #, c-format msgid "%s: cannot drop to stage #0" msgstr "" @@ -5945,7 +6139,10 @@ msgid "" "r, reword <commit> = use commit, but edit the commit message\n" "e, edit <commit> = use commit, but stop for amending\n" "s, squash <commit> = use commit, but meld into previous commit\n" -"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n" +" commit's log message, unless -C is used, in which case\n" +" keep only this commit's message; -c is same as -C but\n" +" opens the editor\n" "x, exec <command> = run command (the rest of the line) using shell\n" "b, break = stop here (continue rebase later with 'git rebase --continue')\n" "d, drop <commit> = remove commit\n" @@ -5954,31 +6151,31 @@ msgid "" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" ". create a merge commit using the original merge commit's\n" ". message (or the oneline, if no original merge commit was\n" -". specified). Use -c <commit> to reword the commit message.\n" +". specified); use -c <commit> to reword the commit message\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" -#: rebase-interactive.c:63 +#: rebase-interactive.c:66 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "" msgstr[1] "" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 +#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" msgstr "" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 +#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5987,33 +6184,33 @@ msgid "" "\n" msgstr "" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 +#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" "\n" msgstr "" -#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615 -#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816 +#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271 #, c-format msgid "could not write '%s'" msgstr "" -#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230 -#: builtin/rebase.c:254 +#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229 +#: builtin/rebase.c:253 #, c-format msgid "could not write '%s'." msgstr "" -#: rebase-interactive.c:193 +#: rebase-interactive.c:196 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -#: rebase-interactive.c:200 +#: rebase-interactive.c:203 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -6024,14 +6221,14 @@ msgid "" "\n" msgstr "" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402 -#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241 -#: builtin/rebase.c:266 +#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597 +#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240 +#: builtin/rebase.c:265 #, c-format msgid "could not read '%s'." msgstr "" -#: ref-filter.c:42 wt-status.c:1975 +#: ref-filter.c:42 wt-status.c:1978 msgid "gone" msgstr "" @@ -6186,110 +6383,111 @@ msgstr "" msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:806 +#: ref-filter.c:807 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:808 +#: ref-filter.c:809 #, c-format msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:810 +#: ref-filter.c:811 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:838 +#: ref-filter.c:839 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:840 +#: ref-filter.c:841 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:842 +#: ref-filter.c:843 #, c-format msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:857 +#: ref-filter.c:858 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:914 +#: ref-filter.c:915 #, c-format msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1555 +#: ref-filter.c:1556 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: ref-filter.c:1558 +#: ref-filter.c:1559 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "" -#: ref-filter.c:1561 +#: ref-filter.c:1562 +#, c-format msgid "(no branch, bisect started on %s)" msgstr "" -#: ref-filter.c:1565 +#: ref-filter.c:1566 #, c-format msgid "(HEAD detached at %s)" msgstr "" -#: ref-filter.c:1568 +#: ref-filter.c:1569 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: ref-filter.c:1571 +#: ref-filter.c:1572 msgid "(no branch)" msgstr "" -#: ref-filter.c:1603 ref-filter.c:1812 +#: ref-filter.c:1604 ref-filter.c:1813 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1613 +#: ref-filter.c:1614 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:1996 +#: ref-filter.c:1997 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:2085 +#: ref-filter.c:2086 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:2090 refs.c:676 +#: ref-filter.c:2091 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:2430 +#: ref-filter.c:2431 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2529 +#: ref-filter.c:2525 #, c-format msgid "malformed object name %s" msgstr "" -#: ref-filter.c:2534 +#: ref-filter.c:2530 #, c-format msgid "option `%s' must point to a commit" msgstr "" @@ -6730,8 +6928,8 @@ msgstr "" msgid "Recorded preimage for '%s'" msgstr "" -#: rerere.c:865 submodule.c:2088 builtin/log.c:1991 -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 +#: rerere.c:865 submodule.c:2089 builtin/log.c:2000 +#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891 #, c-format msgid "could not create directory '%s'" msgstr "" @@ -6767,27 +6965,27 @@ msgstr "" #: reset.c:42 msgid "could not determine HEAD revision" -msgstr "" +msgstr "tidak dapat menentukan revisi HEAD" -#: reset.c:70 reset.c:76 sequencer.c:3468 +#: reset.c:70 reset.c:76 sequencer.c:3669 #, c-format msgid "failed to find tree of %s" -msgstr "" +msgstr "gagal menemukan pohon %s" -#: revision.c:2338 +#: revision.c:2343 msgid "--unpacked=<packfile> no longer supported" msgstr "" -#: revision.c:2668 +#: revision.c:2683 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2671 +#: revision.c:2686 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2877 +#: revision.c:2892 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" @@ -6795,140 +6993,148 @@ msgstr "" msgid "open /dev/null failed" msgstr "" -#: run-command.c:1274 +#: run-command.c:1275 #, c-format msgid "cannot create async thread: %s" msgstr "" -#: run-command.c:1338 +#: run-command.c:1345 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" -#: send-pack.c:146 +#: send-pack.c:150 msgid "unexpected flush packet while reading remote unpack status" msgstr "" -#: send-pack.c:148 +#: send-pack.c:152 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" -#: send-pack.c:150 +#: send-pack.c:154 #, c-format msgid "remote unpack failed: %s" msgstr "" -#: send-pack.c:374 +#: send-pack.c:378 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:467 +#: send-pack.c:433 +msgid "send-pack: unable to fork off fetch subprocess" +msgstr "" + +#: send-pack.c:455 +msgid "push negotiation failed; proceeding anyway with push" +msgstr "" + +#: send-pack.c:520 msgid "the receiving end does not support this repository's hash algorithm" msgstr "" -#: send-pack.c:476 +#: send-pack.c:529 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:478 +#: send-pack.c:531 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:490 +#: send-pack.c:543 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:495 +#: send-pack.c:548 msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:195 +#: sequencer.c:196 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "" -#: sequencer.c:323 +#: sequencer.c:324 #, c-format msgid "could not delete '%s'" msgstr "" -#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385 +#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402 #, c-format msgid "could not remove '%s'" msgstr "" -#: sequencer.c:353 +#: sequencer.c:354 msgid "revert" msgstr "" -#: sequencer.c:355 +#: sequencer.c:356 msgid "cherry-pick" msgstr "" -#: sequencer.c:357 +#: sequencer.c:358 msgid "rebase" msgstr "" -#: sequencer.c:359 +#: sequencer.c:360 #, c-format msgid "unknown action: %d" msgstr "" -#: sequencer.c:418 +#: sequencer.c:419 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:421 +#: sequencer.c:422 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:434 sequencer.c:3070 +#: sequencer.c:435 sequencer.c:3271 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088 -#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 +#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "" -#: sequencer.c:441 +#: sequencer.c:442 #, c-format msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090 -#: sequencer.c:3353 +#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 +#: sequencer.c:3554 #, c-format msgid "failed to finalize '%s'" msgstr "" -#: sequencer.c:485 +#: sequencer.c:486 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:489 +#: sequencer.c:490 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:521 +#: sequencer.c:522 #, c-format msgid "%s: fast-forward" msgstr "" -#: sequencer.c:560 builtin/tag.c:598 +#: sequencer.c:561 builtin/tag.c:609 #, c-format msgid "Invalid cleanup mode %s" msgstr "" @@ -6936,65 +7142,65 @@ msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:670 +#: sequencer.c:671 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:684 +#: sequencer.c:685 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:698 +#: sequencer.c:699 msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:778 +#: sequencer.c:779 #, c-format msgid "no key present in '%.*s'" msgstr "" -#: sequencer.c:789 +#: sequencer.c:790 #, c-format msgid "unable to dequote value of '%s'" msgstr "" -#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728 +#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: sequencer.c:836 +#: sequencer.c:837 msgid "'GIT_AUTHOR_NAME' already given" msgstr "" -#: sequencer.c:841 +#: sequencer.c:842 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "" -#: sequencer.c:846 +#: sequencer.c:847 msgid "'GIT_AUTHOR_DATE' already given" msgstr "" -#: sequencer.c:850 +#: sequencer.c:851 #, c-format msgid "unknown variable '%s'" msgstr "" -#: sequencer.c:855 +#: sequencer.c:856 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "" -#: sequencer.c:857 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "" -#: sequencer.c:859 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "" -#: sequencer.c:924 +#: sequencer.c:925 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -7011,11 +7217,11 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:1211 +#: sequencer.c:1212 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1217 +#: sequencer.c:1218 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7030,7 +7236,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1230 +#: sequencer.c:1231 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7044,354 +7250,358 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1272 +#: sequencer.c:1273 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:1274 +#: sequencer.c:1275 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1320 +#: sequencer.c:1321 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1322 +#: sequencer.c:1323 msgid "detached HEAD" msgstr "" -#: sequencer.c:1326 +#: sequencer.c:1327 msgid " (root-commit)" msgstr "" -#: sequencer.c:1347 +#: sequencer.c:1348 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1349 +#: sequencer.c:1350 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1409 sequencer.c:2108 +#: sequencer.c:1410 sequencer.c:2295 msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702 +#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1453 sequencer.c:1573 +#: sequencer.c:1454 sequencer.c:1574 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1484 sequencer.c:1516 +#: sequencer.c:1485 sequencer.c:1517 #, c-format msgid "invalid author identity '%s'" msgstr "" -#: sequencer.c:1490 +#: sequencer.c:1491 msgid "corrupt author: missing date information" msgstr "" -#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905 -#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909 +#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:1605 +#: sequencer.c:1606 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1610 +#: sequencer.c:1611 #, c-format msgid "could not parse parent commit %s" msgstr "" -#: sequencer.c:1693 sequencer.c:1804 +#: sequencer.c:1694 sequencer.c:1975 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:1751 sequencer.c:1776 +#: sequencer.c:1736 git-rebase--preserve-merges.sh:486 +msgid "This is the 1st commit message:" +msgstr "" + +#: sequencer.c:1737 #, c-format -msgid "This is a combination of %d commits." +msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1761 -msgid "need a HEAD to fixup" +#: sequencer.c:1738 +msgid "The 1st commit message will be skipped:" msgstr "" -#: sequencer.c:1763 sequencer.c:3380 -msgid "could not read HEAD" +#: sequencer.c:1739 +#, c-format +msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1765 -msgid "could not read HEAD's commit message" +#: sequencer.c:1740 +#, c-format +msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1771 +#: sequencer.c:1887 sequencer.c:1944 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1778 git-rebase--preserve-merges.sh:486 -msgid "This is the 1st commit message:" +#: sequencer.c:1934 +msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1786 -#, c-format -msgid "could not read commit message of %s" +#: sequencer.c:1936 sequencer.c:3581 +msgid "could not read HEAD" msgstr "" -#: sequencer.c:1793 -#, c-format -msgid "This is the commit message #%d:" +#: sequencer.c:1938 +msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1799 +#: sequencer.c:1962 #, c-format -msgid "The commit message #%d will be skipped:" +msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:1887 +#: sequencer.c:2072 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:1894 +#: sequencer.c:2079 msgid "cannot fixup root commit" msgstr "" -#: sequencer.c:1913 +#: sequencer.c:2098 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:1921 sequencer.c:1929 +#: sequencer.c:2106 sequencer.c:2114 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:1935 +#: sequencer.c:2120 #, c-format msgid "cannot get commit message for %s" msgstr "" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1954 +#: sequencer.c:2139 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:2019 +#: sequencer.c:2205 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:2079 +#: sequencer.c:2265 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:2080 +#: sequencer.c:2266 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:2100 +#: sequencer.c:2287 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "" -#: sequencer.c:2158 +#: sequencer.c:2345 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:2165 +#: sequencer.c:2352 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:2242 +#: sequencer.c:2425 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:2251 +#: sequencer.c:2434 #, c-format msgid "missing arguments for %s" msgstr "" -#: sequencer.c:2282 +#: sequencer.c:2477 #, c-format msgid "could not parse '%s'" msgstr "" -#: sequencer.c:2343 +#: sequencer.c:2538 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:2354 +#: sequencer.c:2549 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:2440 +#: sequencer.c:2635 msgid "cancelling a cherry picking in progress" msgstr "" -#: sequencer.c:2449 +#: sequencer.c:2644 msgid "cancelling a revert in progress" msgstr "" -#: sequencer.c:2493 +#: sequencer.c:2690 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:2495 +#: sequencer.c:2692 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:2500 +#: sequencer.c:2697 msgid "no commits parsed." msgstr "" -#: sequencer.c:2511 +#: sequencer.c:2708 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:2513 +#: sequencer.c:2710 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:2591 +#: sequencer.c:2788 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2698 +#: sequencer.c:2897 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2718 +#: sequencer.c:2917 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:2811 sequencer.c:4644 +#: sequencer.c:3012 sequencer.c:4869 msgid "empty commit set passed" msgstr "" -#: sequencer.c:2828 +#: sequencer.c:3029 msgid "revert is already in progress" msgstr "" -#: sequencer.c:2830 +#: sequencer.c:3031 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2833 +#: sequencer.c:3034 msgid "cherry-pick is already in progress" msgstr "" -#: sequencer.c:2835 +#: sequencer.c:3036 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2849 +#: sequencer.c:3050 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:2864 +#: sequencer.c:3065 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:2924 sequencer.c:4379 +#: sequencer.c:3125 sequencer.c:4582 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2926 sequencer.c:2937 +#: sequencer.c:3127 sequencer.c:3138 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:2928 sequencer.c:2972 +#: sequencer.c:3129 sequencer.c:3173 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:2958 builtin/grep.c:757 +#: sequencer.c:3159 builtin/grep.c:759 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:2960 +#: sequencer.c:3161 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:2961 +#: sequencer.c:3162 msgid "unexpected end of file" msgstr "" -#: sequencer.c:2967 +#: sequencer.c:3168 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:2978 +#: sequencer.c:3179 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:3019 +#: sequencer.c:3220 msgid "no revert in progress" msgstr "" -#: sequencer.c:3028 +#: sequencer.c:3229 msgid "no cherry-pick in progress" msgstr "" -#: sequencer.c:3038 +#: sequencer.c:3239 msgid "failed to skip the commit" msgstr "" -#: sequencer.c:3045 +#: sequencer.c:3246 msgid "there is nothing to skip" msgstr "" -#: sequencer.c:3048 +#: sequencer.c:3249 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:3210 sequencer.c:4271 +#: sequencer.c:3411 sequencer.c:4473 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:3227 +#: sequencer.c:3428 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "" -#: sequencer.c:3235 +#: sequencer.c:3436 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7403,27 +7613,27 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3245 +#: sequencer.c:3446 #, c-format msgid "Could not apply %s... %.*s" msgstr "" -#: sequencer.c:3252 +#: sequencer.c:3453 #, c-format msgid "Could not merge %.*s" msgstr "" -#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640 +#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:3282 +#: sequencer.c:3483 #, c-format msgid "Executing: %s\n" msgstr "" -#: sequencer.c:3297 +#: sequencer.c:3498 #, c-format msgid "" "execution failed: %s\n" @@ -7433,11 +7643,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3303 +#: sequencer.c:3504 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:3309 +#: sequencer.c:3510 #, c-format msgid "" "execution succeeded: %s\n" @@ -7448,90 +7658,90 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3370 +#: sequencer.c:3571 #, c-format msgid "illegal label name: '%.*s'" msgstr "" -#: sequencer.c:3424 +#: sequencer.c:3625 msgid "writing fake root commit" msgstr "" -#: sequencer.c:3429 +#: sequencer.c:3630 msgid "writing squash-onto" msgstr "" -#: sequencer.c:3513 +#: sequencer.c:3714 #, c-format msgid "could not resolve '%s'" msgstr "" -#: sequencer.c:3546 +#: sequencer.c:3747 msgid "cannot merge without a current revision" msgstr "" -#: sequencer.c:3568 +#: sequencer.c:3769 #, c-format msgid "unable to parse '%.*s'" msgstr "" -#: sequencer.c:3577 +#: sequencer.c:3778 #, c-format msgid "nothing to merge: '%.*s'" msgstr "" -#: sequencer.c:3589 +#: sequencer.c:3790 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3605 +#: sequencer.c:3806 #, c-format msgid "could not get commit message of '%s'" msgstr "" -#: sequencer.c:3788 +#: sequencer.c:3989 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "" -#: sequencer.c:3804 +#: sequencer.c:4005 msgid "merge: Unable to write new index file" msgstr "" -#: sequencer.c:3878 +#: sequencer.c:4079 msgid "Cannot autostash" msgstr "" -#: sequencer.c:3881 +#: sequencer.c:4082 #, c-format msgid "Unexpected stash response: '%s'" msgstr "" -#: sequencer.c:3887 +#: sequencer.c:4088 #, c-format msgid "Could not create directory for '%s'" msgstr "" -#: sequencer.c:3890 +#: sequencer.c:4091 #, c-format msgid "Created autostash: %s\n" msgstr "" -#: sequencer.c:3894 +#: sequencer.c:4095 msgid "could not reset --hard" msgstr "" -#: sequencer.c:3919 +#: sequencer.c:4120 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:3931 +#: sequencer.c:4132 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:3934 +#: sequencer.c:4135 #, c-format msgid "" "%s\n" @@ -7539,29 +7749,29 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:3939 +#: sequencer.c:4140 msgid "Applying autostash resulted in conflicts." msgstr "" -#: sequencer.c:3940 +#: sequencer.c:4141 msgid "Autostash exists; creating a new stash entry." msgstr "" -#: sequencer.c:4033 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4234 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "" -#: sequencer.c:4048 +#: sequencer.c:4249 #, c-format msgid "Stopped at HEAD\n" msgstr "" -#: sequencer.c:4050 +#: sequencer.c:4251 #, c-format msgid "Stopped at %s\n" msgstr "" -#: sequencer.c:4058 +#: sequencer.c:4259 #, c-format msgid "" "Could not execute the todo command\n" @@ -7574,108 +7784,108 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:4104 +#: sequencer.c:4305 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "" -#: sequencer.c:4149 +#: sequencer.c:4351 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:4220 +#: sequencer.c:4422 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:4279 +#: sequencer.c:4481 msgid "could not read orig-head" msgstr "" -#: sequencer.c:4284 +#: sequencer.c:4486 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:4298 +#: sequencer.c:4500 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:4358 +#: sequencer.c:4560 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "" -#: sequencer.c:4391 +#: sequencer.c:4612 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:4400 +#: sequencer.c:4621 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:4402 +#: sequencer.c:4623 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:4404 +#: sequencer.c:4625 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:4407 +#: sequencer.c:4628 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: sequencer.c:4443 sequencer.c:4482 +#: sequencer.c:4664 sequencer.c:4703 #, c-format msgid "could not write file: '%s'" msgstr "" -#: sequencer.c:4498 +#: sequencer.c:4719 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:4505 +#: sequencer.c:4726 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:4621 +#: sequencer.c:4846 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:4625 +#: sequencer.c:4850 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:4660 +#: sequencer.c:4885 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:5137 +#: sequencer.c:5362 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:5140 +#: sequencer.c:5365 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:5382 sequencer.c:5399 +#: sequencer.c:5615 sequencer.c:5632 msgid "nothing to do" msgstr "" -#: sequencer.c:5418 +#: sequencer.c:5651 msgid "could not skip unnecessary pick commands" msgstr "" -#: sequencer.c:5512 +#: sequencer.c:5751 msgid "the script was already rearranged." msgstr "" @@ -7808,63 +8018,76 @@ msgid "" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -#: setup.c:1362 +#: setup.c:1370 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: setup.c:1409 +#: setup.c:1417 msgid "open /dev/null or dup failed" msgstr "" -#: setup.c:1424 +#: setup.c:1432 msgid "fork failed" msgstr "" -#: setup.c:1429 +#: setup.c:1437 t/helper/test-simple-ipc.c:285 msgid "setsid failed" msgstr "" +#: sparse-index.c:151 +msgid "attempting to use sparse-index without cone mode" +msgstr "" + +#: sparse-index.c:156 +msgid "unable to update cache-tree, staying full" +msgstr "" + +#: sparse-index.c:239 +#, c-format +msgid "index entry is a directory, but not sparse (%08x)" +msgstr "" + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:848 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:850 +#: strbuf.c:852 #, c-format msgid "%u.%2.2u GiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:858 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:860 +#: strbuf.c:862 #, c-format msgid "%u.%2.2u MiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:867 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:869 +#: strbuf.c:871 #, c-format msgid "%u.%2.2u KiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:875 +#: strbuf.c:877 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7872,20 +8095,20 @@ msgstr[0] "" msgstr[1] "" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:877 +#: strbuf.c:879 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "" msgstr[1] "" -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737 #: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" msgstr "" -#: strbuf.c:1175 +#: strbuf.c:1177 #, c-format msgid "could not edit '%s'" msgstr "" @@ -7893,252 +8116,271 @@ msgstr "" #: submodule-config.c:237 #, c-format msgid "ignoring suspicious submodule name: %s" -msgstr "" +msgstr "abaikan nama submodul dicurigai: %s" #: submodule-config.c:304 msgid "negative values not allowed for submodule.fetchjobs" -msgstr "" +msgstr "nilai negatif tidak diperbolehkan untuk submodule.fetchjobs" #: submodule-config.c:402 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" -msgstr "" +msgstr "abaikan '%s' yang mungkin ditafsirkan sebagai opsi baris perintah: %s" #: submodule-config.c:499 #, c-format msgid "invalid value for %s" -msgstr "" +msgstr "nilai tidak valid untuk %s" #: submodule-config.c:766 #, c-format msgid "Could not update .gitmodules entry %s" -msgstr "" +msgstr "Tidak dapat memperbarui entri .gitmodules %s" #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" +"Tidak dapat mengubah .gitmodules yang tak tergabung, selesaikan konflik " +"penggabungan terlebih dahulu" #: submodule.c:118 submodule.c:147 #, c-format msgid "Could not find section in .gitmodules where path=%s" -msgstr "" +msgstr "Tidak dapat menemukan bagian .gitmodules dimana path=%s" #: submodule.c:154 #, c-format msgid "Could not remove .gitmodules entry for %s" -msgstr "" +msgstr "Tidak dapat menghapus entri .gitmodules untuk %s" #: submodule.c:165 msgid "staging updated .gitmodules failed" -msgstr "" +msgstr "gagal menggelar .gitmodules terbarui" -#: submodule.c:327 +#: submodule.c:328 #, c-format msgid "in unpopulated submodule '%s'" -msgstr "" +msgstr "dalam submodul tak terisi '%s'" -#: submodule.c:358 +#: submodule.c:359 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "" +msgstr "Spek jalur '%s' di dalam submodul '%.*s'" -#: submodule.c:435 +#: submodule.c:436 #, c-format msgid "bad --ignore-submodules argument: %s" -msgstr "" +msgstr "argumen --ignore-submodules jelek: %s" -#: submodule.c:817 +#: submodule.c:818 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " "same. Skipping it." msgstr "" +"Submodul dalam komit %s pada jalur '%s' bertabrakan dengan submodul yang " +"bernama sama. Melewati itu." -#: submodule.c:920 +#: submodule.c:921 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" -msgstr "" +msgstr "entri submodul '%s' (%s) adalah %s, bukan komit" -#: submodule.c:1005 +#: submodule.c:1006 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " "submodule %s" msgstr "" +"Tidak dapat menjalankan perintah 'git rev-list <komit> --not --remotes -n 1' " +"dalam submodul %s" -#: submodule.c:1128 +#: submodule.c:1129 #, c-format msgid "process for submodule '%s' failed" -msgstr "" +msgstr "proses untuk submodul '%s' gagal" -#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469 +#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470 msgid "Failed to resolve HEAD as a valid ref." -msgstr "" +msgstr "Gagal menguraikan HEAD sebagai referensi valid." -#: submodule.c:1168 +#: submodule.c:1169 #, c-format msgid "Pushing submodule '%s'\n" -msgstr "" +msgstr "Mendorong submodul '%s'\n" -#: submodule.c:1171 +#: submodule.c:1172 #, c-format msgid "Unable to push submodule '%s'\n" -msgstr "" +msgstr "Tidak dapat mendorong submodul '%s'\n" -#: submodule.c:1463 +#: submodule.c:1464 #, c-format msgid "Fetching submodule %s%s\n" -msgstr "" +msgstr "Mengambil submodul %s%s\n" -#: submodule.c:1497 +#: submodule.c:1498 #, c-format msgid "Could not access submodule '%s'\n" -msgstr "" +msgstr "Tidak dapat mengakses submodul '%s'\n" -#: submodule.c:1652 +#: submodule.c:1653 #, c-format msgid "" "Errors during submodule fetch:\n" "%s" msgstr "" +"Kesalahan saat pengambilan submodul:\n" +"%s" -#: submodule.c:1677 +#: submodule.c:1678 #, c-format msgid "'%s' not recognized as a git repository" -msgstr "" +msgstr "'%s' tak dikenal sebagai repositori git" -#: submodule.c:1694 +#: submodule.c:1695 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" -msgstr "" +msgstr "Tidak dapat menjalankan 'git status --porcelain=2' dalam submodul %s" -#: submodule.c:1735 +#: submodule.c:1736 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" -msgstr "" +msgstr "'git status --porcelain=2' gagal dalam submodul %s" -#: submodule.c:1810 +#: submodule.c:1811 #, c-format msgid "could not start 'git status' in submodule '%s'" -msgstr "" +msgstr "Tidak dalat memulai 'git status' dalam submodul '%s'" -#: submodule.c:1823 +#: submodule.c:1824 #, c-format msgid "could not run 'git status' in submodule '%s'" -msgstr "" +msgstr "tidak dapat menjalankan 'git status' dalam submodul '%s'" -#: submodule.c:1838 +#: submodule.c:1839 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" -msgstr "" +msgstr "Tidak dapat batal setel setelan core.worktree dalam submodul '%s'" -#: submodule.c:1865 submodule.c:2175 +#: submodule.c:1866 submodule.c:2176 #, c-format msgid "could not recurse into submodule '%s'" -msgstr "" +msgstr "tidak dapat rekursi ke dalam submodul '%s'" -#: submodule.c:1886 +#: submodule.c:1887 msgid "could not reset submodule index" -msgstr "" +msgstr "tidak dapat reset indeks submodul" -#: submodule.c:1928 +#: submodule.c:1929 #, c-format msgid "submodule '%s' has dirty index" -msgstr "" +msgstr "submodul '%s' punya indeks kotor" -#: submodule.c:1980 +#: submodule.c:1981 #, c-format msgid "Submodule '%s' could not be updated." -msgstr "" +msgstr "Submodul '%s' tidak dapat diperbarui." -#: submodule.c:2048 +#: submodule.c:2049 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" -msgstr "" +msgstr "direktori submodul git '%s' di dalam direktori git '%.*s'" -#: submodule.c:2069 +#: submodule.c:2070 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" +"relocate_gitdir untuk submodul '%s' dengan lebih dari satu pohon kerja tidak " +"didukung" -#: submodule.c:2081 submodule.c:2140 +#: submodule.c:2082 submodule.c:2141 #, c-format msgid "could not lookup name for submodule '%s'" -msgstr "" +msgstr "tidak dapat mencari nama untuk submodul '%s'" -#: submodule.c:2085 +#: submodule.c:2086 #, c-format msgid "refusing to move '%s' into an existing git dir" -msgstr "" +msgstr "menolak memindahkan '%s' ke dalam direktori git yang ada" -#: submodule.c:2092 +#: submodule.c:2093 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" "'%s' to\n" "'%s'\n" msgstr "" +"Memigrasikan direktori git '%s%s' dari\n" +"'%s' ke\n" +"'%s'\n" -#: submodule.c:2220 +#: submodule.c:2221 msgid "could not start ls-files in .." -msgstr "" +msgstr "tidak dapat memulai ls-files dalam .." -#: submodule.c:2260 +#: submodule.c:2261 #, c-format msgid "ls-tree returned unexpected return code %d" +msgstr "ls-tree kembalikan kode kembali %d yang tak diharapkan" + +#: symlinks.c:244 +#, c-format +msgid "failed to lstat '%s'" msgstr "" -#: trailer.c:236 +#: trailer.c:244 #, c-format msgid "running trailer command '%s' failed" msgstr "" -#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 -#: trailer.c:555 +#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566 +#: trailer.c:570 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 +#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299 +#: builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "" -#: trailer.c:728 +#: trailer.c:743 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "" -#: trailer.c:748 +#: trailer.c:763 #, c-format msgid "could not read input file '%s'" msgstr "" -#: trailer.c:751 builtin/mktag.c:91 +#: trailer.c:766 builtin/mktag.c:88 msgid "could not read from stdin" msgstr "" -#: trailer.c:1009 wrapper.c:676 +#: trailer.c:1024 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "" -#: trailer.c:1011 +#: trailer.c:1026 #, c-format msgid "file %s is not a regular file" msgstr "" -#: trailer.c:1013 +#: trailer.c:1028 #, c-format msgid "file %s is not writable by user" msgstr "" -#: trailer.c:1025 +#: trailer.c:1040 msgid "could not open temporary file" msgstr "" -#: trailer.c:1065 +#: trailer.c:1080 #, c-format msgid "could not rename temporary file to %s" msgstr "" @@ -8185,7 +8427,7 @@ msgstr "" msgid "error while running fast-import" msgstr "" -#: transport-helper.c:549 transport-helper.c:1237 +#: transport-helper.c:549 transport-helper.c:1247 #, c-format msgid "could not read ref %s" msgstr "" @@ -8203,7 +8445,7 @@ msgstr "" msgid "invalid remote service path" msgstr "" -#: transport-helper.c:661 transport.c:1447 +#: transport-helper.c:661 transport.c:1471 msgid "operation not supported by protocol" msgstr "" @@ -8212,120 +8454,124 @@ msgstr "" msgid "can't connect to subservice %s" msgstr "" -#: transport-helper.c:745 +#: transport-helper.c:693 transport.c:397 +msgid "--negotiate-only requires protocol v2" +msgstr "" + +#: transport-helper.c:755 msgid "'option' without a matching 'ok/error' directive" msgstr "" -#: transport-helper.c:788 +#: transport-helper.c:798 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "" -#: transport-helper.c:845 +#: transport-helper.c:855 #, c-format msgid "helper reported unexpected status of %s" msgstr "" -#: transport-helper.c:928 +#: transport-helper.c:938 #, c-format msgid "helper %s does not support dry-run" msgstr "" -#: transport-helper.c:931 +#: transport-helper.c:941 #, c-format msgid "helper %s does not support --signed" msgstr "" -#: transport-helper.c:934 +#: transport-helper.c:944 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "" -#: transport-helper.c:939 +#: transport-helper.c:949 #, c-format msgid "helper %s does not support --atomic" msgstr "" -#: transport-helper.c:943 +#: transport-helper.c:953 #, c-format msgid "helper %s does not support --%s" msgstr "" -#: transport-helper.c:950 +#: transport-helper.c:960 #, c-format msgid "helper %s does not support 'push-option'" msgstr "" -#: transport-helper.c:1050 +#: transport-helper.c:1060 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:1055 +#: transport-helper.c:1065 #, c-format msgid "helper %s does not support 'force'" msgstr "" -#: transport-helper.c:1102 +#: transport-helper.c:1112 msgid "couldn't run fast-export" msgstr "" -#: transport-helper.c:1107 +#: transport-helper.c:1117 msgid "error while running fast-export" msgstr "" -#: transport-helper.c:1132 +#: transport-helper.c:1142 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" "Perhaps you should specify a branch.\n" msgstr "" -#: transport-helper.c:1214 +#: transport-helper.c:1224 #, c-format msgid "unsupported object format '%s'" msgstr "" -#: transport-helper.c:1223 +#: transport-helper.c:1233 #, c-format msgid "malformed response in ref list: %s" msgstr "" -#: transport-helper.c:1375 +#: transport-helper.c:1385 #, c-format msgid "read(%s) failed" msgstr "" -#: transport-helper.c:1402 +#: transport-helper.c:1412 #, c-format msgid "write(%s) failed" msgstr "" -#: transport-helper.c:1451 +#: transport-helper.c:1461 #, c-format msgid "%s thread failed" msgstr "" -#: transport-helper.c:1455 +#: transport-helper.c:1465 #, c-format msgid "%s thread failed to join: %s" msgstr "" -#: transport-helper.c:1474 transport-helper.c:1478 +#: transport-helper.c:1484 transport-helper.c:1488 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1515 +#: transport-helper.c:1525 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1519 +#: transport-helper.c:1529 #, c-format msgid "%s process failed" msgstr "" -#: transport-helper.c:1537 transport-helper.c:1546 +#: transport-helper.c:1547 transport-helper.c:1556 msgid "can't start thread for copying data" msgstr "" @@ -8344,44 +8590,48 @@ msgstr "" msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:269 +#: transport.c:272 msgid "see protocol.version in 'git help config' for more details" msgstr "" -#: transport.c:270 +#: transport.c:273 msgid "server options require protocol version 2 or later" msgstr "" -#: transport.c:727 +#: transport.c:400 +msgid "server does not support wait-for-done" +msgstr "" + +#: transport.c:751 msgid "could not parse transport.color.* config" msgstr "" -#: transport.c:802 +#: transport.c:826 msgid "support for protocol v2 not implemented yet" msgstr "" -#: transport.c:936 +#: transport.c:960 #, c-format msgid "unknown value for config '%s': %s" msgstr "" -#: transport.c:1002 +#: transport.c:1026 #, c-format msgid "transport '%s' not allowed" msgstr "" -#: transport.c:1055 +#: transport.c:1079 msgid "git-over-rsync is no longer supported" msgstr "" -#: transport.c:1157 +#: transport.c:1181 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:1161 +#: transport.c:1185 #, c-format msgid "" "\n" @@ -8397,11 +8647,11 @@ msgid "" "\n" msgstr "" -#: transport.c:1169 +#: transport.c:1193 msgid "Aborting." msgstr "" -#: transport.c:1316 +#: transport.c:1340 msgid "failed to push all needed submodules" msgstr "" @@ -8421,98 +8671,98 @@ msgstr "" msgid "too-short tree file" msgstr "" -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" -#: unpack-trees.c:115 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" -#: unpack-trees.c:120 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" -#: unpack-trees.c:125 +#: unpack-trees.c:127 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:130 +#: unpack-trees.c:132 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:136 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:141 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:146 +#: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8520,7 +8770,7 @@ msgid "" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:154 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8528,47 +8778,47 @@ msgid "" "%%s" msgstr "" -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:159 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:164 +#: unpack-trees.c:166 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:172 +#: unpack-trees.c:174 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:175 +#: unpack-trees.c:177 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "" -#: unpack-trees.c:178 +#: unpack-trees.c:180 #, c-format msgid "" "The following paths are not up to date and were left despite sparse " @@ -8576,14 +8826,14 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:180 +#: unpack-trees.c:182 #, c-format msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -#: unpack-trees.c:182 +#: unpack-trees.c:184 #, c-format msgid "" "The following paths were already present and thus not updated despite sparse " @@ -8591,34 +8841,39 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:262 +#: unpack-trees.c:264 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:289 +#: unpack-trees.c:291 #, c-format msgid "" "After fixing the above paths, you may want to run `git sparse-checkout " "reapply`.\n" msgstr "" -#: unpack-trees.c:350 +#: unpack-trees.c:352 msgid "Updating files" msgstr "" -#: unpack-trees.c:382 +#: unpack-trees.c:384 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" "colliding group is in the working tree:\n" msgstr "" -#: unpack-trees.c:1498 +#: unpack-trees.c:1519 msgid "Updating index flags" msgstr "" -#: upload-pack.c:1543 +#: unpack-trees.c:2608 +#, c-format +msgid "worktree and untracked commit have duplicate entries: %s" +msgstr "" + +#: upload-pack.c:1548 msgid "expected flush after fetch arguments" msgstr "" @@ -8655,101 +8910,102 @@ msgstr "" msgid "Fetching objects" msgstr "" -#: worktree.c:238 builtin/am.c:2103 +#: worktree.c:238 builtin/am.c:2151 #, c-format msgid "failed to read '%s'" -msgstr "" +msgstr "gagal membaca '%s'" #: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" -msgstr "" +msgstr "'%s' pada pohon kerja utama bukan direktori repositori" #: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" -msgstr "" +msgstr "berkas '%s' tidak berisi jalur absolut ke lokasi pohon kerja" #: worktree.c:327 #, c-format msgid "'%s' does not exist" -msgstr "" +msgstr "'%s' tidak ada" #: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" -msgstr "" +msgstr "'%s' bukan berkas .git, kode error %d" #: worktree.c:342 #, c-format msgid "'%s' does not point back to '%s'" -msgstr "" +msgstr "'%s' tidak menunjuk kembali ke '%s'" #: worktree.c:608 msgid "not a directory" -msgstr "" +msgstr "bukan direktori" #: worktree.c:617 msgid ".git is not a file" -msgstr "" +msgstr ".git bukan berkas" #: worktree.c:619 msgid ".git file broken" -msgstr "" +msgstr "berkas .git rusak" #: worktree.c:621 msgid ".git file incorrect" -msgstr "" +msgstr "berkas .git salah" #: worktree.c:727 msgid "not a valid path" -msgstr "" +msgstr "bukan jalur valid" #: worktree.c:733 msgid "unable to locate repository; .git is not a file" -msgstr "" +msgstr "tidak dapat menempatkan repositori; .git bukan berkas" #: worktree.c:737 msgid "unable to locate repository; .git file does not reference a repository" msgstr "" +"tidak dapat menempatkan repositori; berkas .git tidak merujuk repositori" #: worktree.c:741 msgid "unable to locate repository; .git file broken" -msgstr "" +msgstr "tidak dapat menempatkan repositori; berkas .git rusak" #: worktree.c:747 msgid "gitdir unreadable" -msgstr "" +msgstr "gitdir tidak dapat dibaca" #: worktree.c:751 msgid "gitdir incorrect" -msgstr "" +msgstr "gitdir salah" #: worktree.c:776 msgid "not a valid directory" -msgstr "" +msgstr "bukan direktori valid" #: worktree.c:782 msgid "gitdir file does not exist" -msgstr "" +msgstr "berkas gitdir tidak ada" #: worktree.c:787 worktree.c:796 #, c-format msgid "unable to read gitdir file (%s)" -msgstr "" +msgstr "tidak dapat membaca berkas gitdir (%s)" #: worktree.c:806 #, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" -msgstr "" +msgstr "baca singkat (diharapkan %<PRIuMAX> bita, terbaca %<PRIuMAX>)" #: worktree.c:814 msgid "invalid gitdir file" -msgstr "" +msgstr "berkas gitdir tidak valid" #: worktree.c:822 msgid "gitdir file points to non-existent location" -msgstr "" +msgstr "berkas gitdir menunjuk ke lokasi yang tidak ada" #: wrapper.c:197 wrapper.c:367 #, c-format @@ -8798,11 +9054,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (gunakan \"git rm <berkas>\" untuk menandai penyelesaian)" -#: wt-status.c:211 wt-status.c:1072 +#: wt-status.c:211 wt-status.c:1075 msgid "Changes to be committed:" msgstr "Perubahan yang akan dikomit:" -#: wt-status.c:234 wt-status.c:1081 +#: wt-status.c:234 wt-status.c:1084 msgid "Changes not staged for commit:" msgstr "Perubahan yang tidak digelar untuk komit:" @@ -8906,22 +9162,22 @@ msgstr "konten yang dimodifikasi, " msgid "untracked content, " msgstr "konten yang tak dilacak, " -#: wt-status.c:905 +#: wt-status.c:908 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Simpanan Anda saat ini ada %d entri" msgstr[1] "Simpanan Anda saat ini ada %d entri" -#: wt-status.c:936 +#: wt-status.c:939 msgid "Submodules changed but not updated:" msgstr "Submodul berubah tapi tak diperbarui:" -#: wt-status.c:938 +#: wt-status.c:941 msgid "Submodule changes to be committed:" msgstr "Perubahan submodul yang akan dikomit:" -#: wt-status.c:1020 +#: wt-status.c:1023 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -8929,7 +9185,7 @@ msgstr "" "Jangan ubah atau hapus baris diatas.\n" "Semua dibawahnya akan diabaikan." -#: wt-status.c:1112 +#: wt-status.c:1115 #, c-format msgid "" "\n" @@ -8940,262 +9196,262 @@ msgstr "" "Butuh %.2f detik untuk menghitung cabang di depan/di belakang nilai.\n" "Anda bisa gunakan '--no-ahead-behind' untuk menghindari hal tersebut.\n" -#: wt-status.c:1142 +#: wt-status.c:1145 msgid "You have unmerged paths." msgstr "Anda punya jalur yang tak tergabung." -#: wt-status.c:1145 +#: wt-status.c:1148 msgid " (fix conflicts and run \"git commit\")" msgstr " (selesaikan konflik dan jalankan \"git commit\")" -#: wt-status.c:1147 +#: wt-status.c:1150 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (gunakan \"git merge --abort\" untuk membatalkan penggabungan)" -#: wt-status.c:1151 +#: wt-status.c:1154 msgid "All conflicts fixed but you are still merging." msgstr "Semua konflik sudah selesai tapi Anda masih menggabungkan." -#: wt-status.c:1154 +#: wt-status.c:1157 msgid " (use \"git commit\" to conclude merge)" msgstr " (gunakan \"git commit\" untuk mengakhiri penggabungan)" -#: wt-status.c:1163 +#: wt-status.c:1166 msgid "You are in the middle of an am session." msgstr "Anda berada ditengah-tengah sesi am." -#: wt-status.c:1166 +#: wt-status.c:1169 msgid "The current patch is empty." msgstr "Jalur saat ini kosong" -#: wt-status.c:1170 +#: wt-status.c:1173 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (selesaikan konflik lalu jalankan \"git am --continue\")" -#: wt-status.c:1172 +#: wt-status.c:1175 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (gunakan \"git am --skip\" untuk lewati tambalan ini)" -#: wt-status.c:1174 +#: wt-status.c:1177 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (gunakan \"git am --abort\" untuk mengembalikan cabang asal)" -#: wt-status.c:1307 +#: wt-status.c:1310 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo hilang." -#: wt-status.c:1309 +#: wt-status.c:1312 msgid "No commands done." msgstr "Tidak ada perintah selesai." -#: wt-status.c:1312 +#: wt-status.c:1315 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Perintah yang selesai (%d perintah):" msgstr[1] "Perintah yang selesai (%d perintah):" -#: wt-status.c:1323 +#: wt-status.c:1326 #, c-format msgid " (see more in file %s)" msgstr " (lihat lebih lanjut di berkas %s)" -#: wt-status.c:1328 +#: wt-status.c:1331 msgid "No commands remaining." msgstr "Tidak ada perintah yang tersisa." -#: wt-status.c:1331 +#: wt-status.c:1334 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Perintah berikutnya (%d perintah tersisa):" msgstr[1] "Perintah berikutnya (%d perintah tersisa):" -#: wt-status.c:1339 +#: wt-status.c:1342 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (gunakan \"git rebase --edit-todo\" untuk lihat dan sunting)" -#: wt-status.c:1351 +#: wt-status.c:1354 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Anda sedang mendasarkan ulang cabang '%s' pada '%s'." -#: wt-status.c:1356 +#: wt-status.c:1359 msgid "You are currently rebasing." msgstr "Anda sedang mendasarkan ulang." -#: wt-status.c:1369 +#: wt-status.c:1372 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (selesaikan konflik lalu jalankan \"git rebase --continue\")" -#: wt-status.c:1371 +#: wt-status.c:1374 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (gunakan \"git rebase --skip\" untuk lewati tambalan ini)" -#: wt-status.c:1373 +#: wt-status.c:1376 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (gunakan \"git rebase --abort\" untuk check out cabang asal)" -#: wt-status.c:1380 +#: wt-status.c:1383 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (semua konflik sudah selesai: jalankan \"git rebase --continue\")" -#: wt-status.c:1384 +#: wt-status.c:1387 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" "Anda sedang membelah komit saat mendasarkan ulang cabang '%s' pada '%s'." -#: wt-status.c:1389 +#: wt-status.c:1392 msgid "You are currently splitting a commit during a rebase." msgstr "Anda sedang membelah komit saat mendasarkan ulang." -#: wt-status.c:1392 +#: wt-status.c:1395 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Setelah direktori kerja Anda bersih, jalankan \"git rebase --continue\")" -#: wt-status.c:1396 +#: wt-status.c:1399 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Anda sedang menyunting komit saat mendasarkan ulang cabang '%s' pada '%s'." -#: wt-status.c:1401 +#: wt-status.c:1404 msgid "You are currently editing a commit during a rebase." msgstr "Anda sedang menyunting komit saat mendasarkan ulang." -#: wt-status.c:1404 +#: wt-status.c:1407 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (gunakan \"git commit --amend\" untuk mengubah komit saat ini)" -#: wt-status.c:1406 +#: wt-status.c:1409 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (gunakan \"git rebase --continue\" begitu Anda puas dengan perubahan Anda)" -#: wt-status.c:1417 +#: wt-status.c:1420 msgid "Cherry-pick currently in progress." msgstr "Petik ceri sedang berjalan." -#: wt-status.c:1420 +#: wt-status.c:1423 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Anda sedang memetik ceri komit %s." -#: wt-status.c:1427 +#: wt-status.c:1430 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (selesaikan konflik dan jalankan \"git cherry-pick --continue\")" -#: wt-status.c:1430 +#: wt-status.c:1433 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (jalankan \"git cherry-pick --continue\" untuk melanjutkan)" -#: wt-status.c:1433 +#: wt-status.c:1436 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (semua konflik sudah selesai: jalankan \"git cherry-pick --continue\")" -#: wt-status.c:1435 +#: wt-status.c:1438 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (gunakan \"git cherry-pick --skip\" untuk lewati tambalan ini)" -#: wt-status.c:1437 +#: wt-status.c:1440 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (gunakan \"git cherry-pick --abort\" untuk membatalkan operasi petik ceri)" -#: wt-status.c:1447 +#: wt-status.c:1450 msgid "Revert currently in progress." msgstr "Pengembalian sedang berjalang." -#: wt-status.c:1450 +#: wt-status.c:1453 #, c-format msgid "You are currently reverting commit %s." msgstr "Anda sedang mengembalikan komit %s." -#: wt-status.c:1456 +#: wt-status.c:1459 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (selesaikan konflik dan jalankan \"git revert --continue\")" -#: wt-status.c:1459 +#: wt-status.c:1462 msgid " (run \"git revert --continue\" to continue)" msgstr " (jalankan \"git revert --continue\" untuk melanjutkan)" -#: wt-status.c:1462 +#: wt-status.c:1465 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (semua konflik sudah selesai: jalankan \"git revert --continue\")" -#: wt-status.c:1464 +#: wt-status.c:1467 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (gunakan \"git revert --skip\" untuk lewati tambalan ini)" -#: wt-status.c:1466 +#: wt-status.c:1469 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (gunakan \"git revert --abort\" untuk membatalkan operasi pengembalian)" -#: wt-status.c:1476 +#: wt-status.c:1479 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Anda sedang membagi dua, dimulai dari cabang '%s'." -#: wt-status.c:1480 +#: wt-status.c:1483 msgid "You are currently bisecting." msgstr "Anda sedang membagi dua." -#: wt-status.c:1483 +#: wt-status.c:1486 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (gunakan \"git bisect reset\" untuk kembali ke cabang asal)" -#: wt-status.c:1494 +#: wt-status.c:1497 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "Anda berada dalam checkout tipis dengan %d%% berkas terlacak ada." -#: wt-status.c:1733 +#: wt-status.c:1736 msgid "On branch " msgstr "Pada cabang " -#: wt-status.c:1740 +#: wt-status.c:1743 msgid "interactive rebase in progress; onto " msgstr "sedang mendasarkan ulang interaktif; ke " -#: wt-status.c:1742 +#: wt-status.c:1745 msgid "rebase in progress; onto " msgstr "sedang mendasarkan ulang; ke " -#: wt-status.c:1747 +#: wt-status.c:1750 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1749 +#: wt-status.c:1752 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1752 +#: wt-status.c:1755 msgid "Not currently on any branch." msgstr "Tidak sedang berada pada cabang apapun." -#: wt-status.c:1769 +#: wt-status.c:1772 msgid "Initial commit" msgstr "Komit awal" -#: wt-status.c:1770 +#: wt-status.c:1773 msgid "No commits yet" msgstr "Tidak ada komit" -#: wt-status.c:1784 +#: wt-status.c:1787 msgid "Untracked files" msgstr "Berkas tak terlacak" -#: wt-status.c:1786 +#: wt-status.c:1789 msgid "Ignored files" msgstr "Berkas yang diabaikan" -#: wt-status.c:1790 +#: wt-status.c:1793 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9206,32 +9462,32 @@ msgstr "" "mungkin bisa mempercepat, tapi Anda harus berhati-hati jangan sampai lupa\n" "untuk tambahkan berkas baru sendiri (lihat 'git help status')." -#: wt-status.c:1796 +#: wt-status.c:1799 #, c-format msgid "Untracked files not listed%s" msgstr "Berkas tak terlacak yang tak disebutkan%s" -#: wt-status.c:1798 +#: wt-status.c:1801 msgid " (use -u option to show untracked files)" msgstr " (gunakan opsi -u untuk melihat berkas yang tak terlacak)" -#: wt-status.c:1804 +#: wt-status.c:1807 msgid "No changes" msgstr "Tidak ada perubahan" -#: wt-status.c:1809 +#: wt-status.c:1812 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "tidak ada perubahan untuk dikomit (gunakan \"git add\" dan/atau \"git commit " "-a\")\n" -#: wt-status.c:1813 +#: wt-status.c:1816 #, c-format msgid "no changes added to commit\n" msgstr "tidak ada perubahan untuk dikomit\n" -#: wt-status.c:1817 +#: wt-status.c:1820 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9240,201 +9496,220 @@ msgstr "" "tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada(gunakan " "\"git add\" untuk lacak)\n" -#: wt-status.c:1821 +#: wt-status.c:1824 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada\n" -#: wt-status.c:1825 +#: wt-status.c:1828 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "tidak ada yang dikomit (buat/salin berkas dan gunakan \"git add\" untuk " "lacak)\n" -#: wt-status.c:1829 wt-status.c:1835 +#: wt-status.c:1832 wt-status.c:1838 #, c-format msgid "nothing to commit\n" msgstr "tidak ada yang dikomit\n" -#: wt-status.c:1832 +#: wt-status.c:1835 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "tidak ada yang dikomit (gunakan -u untuk lihat berkas tak terlacak)\n" -#: wt-status.c:1837 +#: wt-status.c:1840 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "tidak ada yang dikomit, pohon kerja bersih\n" -#: wt-status.c:1942 +#: wt-status.c:1945 msgid "No commits yet on " msgstr "Tidak ada komit apapun pada " -#: wt-status.c:1946 +#: wt-status.c:1949 msgid "HEAD (no branch)" msgstr "HEAD (tanpa cabang)" -#: wt-status.c:1977 +#: wt-status.c:1980 msgid "different" msgstr "berbeda" -#: wt-status.c:1979 wt-status.c:1987 +#: wt-status.c:1982 wt-status.c:1990 msgid "behind " msgstr "di belakang " -#: wt-status.c:1982 wt-status.c:1985 +#: wt-status.c:1985 wt-status.c:1988 msgid "ahead " msgstr "di depan " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2507 +#: wt-status.c:2511 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "tidak dapat %s: Anda punya perubahan yang tidak digelar." -#: wt-status.c:2513 +#: wt-status.c:2517 msgid "additionally, your index contains uncommitted changes." msgstr "juga indeks Anda berisi perubahan yang belum dikomit." -#: wt-status.c:2515 +#: wt-status.c:2519 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "tidak dapat %s: indeks Anda berisi perubahan yang belum dikomit." -#: compat/precompose_utf8.c:58 builtin/clone.c:457 +#: compat/simple-ipc/ipc-unix-socket.c:178 +msgid "could not send IPC command" +msgstr "" + +#: compat/simple-ipc/ipc-unix-socket.c:185 +msgid "could not read IPC response" +msgstr "" + +#: compat/simple-ipc/ipc-unix-socket.c:862 +#, c-format +msgid "could not start accept_thread '%s'" +msgstr "" + +#: compat/simple-ipc/ipc-unix-socket.c:874 +#, c-format +msgid "could not start worker[0] for '%s'" +msgstr "" + +#: compat/precompose_utf8.c:58 builtin/clone.c:461 #, c-format msgid "failed to unlink '%s'" msgstr "" #: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." -msgstr "" +msgstr "git add [<opsi>] [--] <pathspec>..." -#: builtin/add.c:58 +#: builtin/add.c:61 +#, c-format msgid "cannot chmod %cx '%s'" -msgstr "" +msgstr "tidak dapat chmod %cx '%s'" -#: builtin/add.c:96 +#: builtin/add.c:99 #, c-format msgid "unexpected diff status %c" -msgstr "" +msgstr "status diff tak diharapkan %c" -#: builtin/add.c:101 builtin/commit.c:285 +#: builtin/add.c:104 builtin/commit.c:297 msgid "updating files failed" -msgstr "" +msgstr "gagal memperbarui berkas" -#: builtin/add.c:111 +#: builtin/add.c:114 #, c-format msgid "remove '%s'\n" -msgstr "" +msgstr "hapus '%s'\n" -#: builtin/add.c:186 +#: builtin/add.c:198 msgid "Unstaged changes after refreshing the index:" -msgstr "" +msgstr "Perubahan tak tergelar setelah menyegarkan indeks:" -#: builtin/add.c:280 builtin/rev-parse.c:991 +#: builtin/add.c:307 builtin/rev-parse.c:991 msgid "Could not read the index" -msgstr "" +msgstr "Tidak dapat membaca indeks" -#: builtin/add.c:291 +#: builtin/add.c:318 #, c-format msgid "Could not open '%s' for writing." -msgstr "" +msgstr "Tidak dapat membuka '%s' untuk ditulis." -#: builtin/add.c:295 +#: builtin/add.c:322 msgid "Could not write patch" -msgstr "" +msgstr "Tidak dapat menulis tambalan" -#: builtin/add.c:298 +#: builtin/add.c:325 msgid "editing patch failed" -msgstr "" +msgstr "Gagal menyunting tambalan" -#: builtin/add.c:301 +#: builtin/add.c:328 #, c-format msgid "Could not stat '%s'" -msgstr "" +msgstr "Tidak dapat men-stat '%s'" -#: builtin/add.c:303 +#: builtin/add.c:330 msgid "Empty patch. Aborted." -msgstr "" +msgstr "Tambalan kosong. Dibatalkan." -#: builtin/add.c:308 +#: builtin/add.c:335 #, c-format msgid "Could not apply '%s'" -msgstr "" +msgstr "Tidak dapat terapkan '%s'" -#: builtin/add.c:316 +#: builtin/add.c:343 msgid "The following paths are ignored by one of your .gitignore files:\n" -msgstr "" +msgstr "Jalur berikut diabaikan oleh salah satu dari berkas .gitignore Anda:\n" -#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124 +#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124 #: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 -#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 +#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 msgid "dry run" msgstr "latihan" -#: builtin/add.c:339 +#: builtin/add.c:366 msgid "interactive picking" -msgstr "" +msgstr "pengambilan interaktif" -#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 msgid "select hunks interactively" -msgstr "" +msgstr "pilih bingkah secara interaktif" -#: builtin/add.c:341 +#: builtin/add.c:368 msgid "edit current diff and apply" -msgstr "" +msgstr "sunting diff saat ini dan terapkan" -#: builtin/add.c:342 +#: builtin/add.c:369 msgid "allow adding otherwise ignored files" -msgstr "" +msgstr "perbolehkan tambah berkas yang diabaikan" -#: builtin/add.c:343 +#: builtin/add.c:370 msgid "update tracked files" -msgstr "" +msgstr "perbarui berkas terlacak" -#: builtin/add.c:344 +#: builtin/add.c:371 msgid "renormalize EOL of tracked files (implies -u)" -msgstr "" +msgstr "normalisasi ulang EOL berkas terlacak (menyiratkan -u)" -#: builtin/add.c:345 +#: builtin/add.c:372 msgid "record only the fact that the path will be added later" -msgstr "" +msgstr "rekam hanya fakta bahwa jalur akan ditambahkan nanti" -#: builtin/add.c:346 +#: builtin/add.c:373 msgid "add changes from all tracked and untracked files" -msgstr "" +msgstr "tambahkan perubahan dari semua berkas terlacak dan tak terlacak" -#: builtin/add.c:349 +#: builtin/add.c:376 msgid "ignore paths removed in the working tree (same as --no-all)" -msgstr "" +msgstr "abaikan jalur yang terhapus dari pohon kerja (sama dengan --no-all)" -#: builtin/add.c:351 +#: builtin/add.c:378 msgid "don't add, only refresh the index" -msgstr "" +msgstr "jangan tambahkan, hanya segarkan indeks" -#: builtin/add.c:352 +#: builtin/add.c:379 msgid "just skip files which cannot be added because of errors" -msgstr "" +msgstr "hanya lewatkan berkas yang tidak dapat ditambah karena error" -#: builtin/add.c:353 +#: builtin/add.c:380 msgid "check if - even missing - files are ignored in dry run" -msgstr "" +msgstr "periksa bahwa berkas yang - bahkan hilang - diabaikan dalam latihan" -#: builtin/add.c:355 builtin/update-index.c:1004 +#: builtin/add.c:382 builtin/update-index.c:1006 msgid "override the executable bit of the listed files" -msgstr "" +msgstr "timpa bit yang dapat dieksekusi dari berkas terdaftar" -#: builtin/add.c:357 +#: builtin/add.c:384 msgid "warn when adding an embedded repository" -msgstr "" +msgstr "peringatkan ketika menambahkan repositori tertanam" -#: builtin/add.c:359 +#: builtin/add.c:386 msgid "backend for `git stash -p`" -msgstr "" +msgstr "tulang belakang untuk `git stash -p`" -#: builtin/add.c:377 +#: builtin/add.c:404 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9451,188 +9726,211 @@ msgid "" "\n" "See \"git help submodule\" for more information." msgstr "" +"Anda telah menambahkan repositori git yang lain di dalam repositori Anda\n" +"saat ini. Kloningan repositori luar tidak akan berisi isi repositori\n" +"tertanam dan tidak akan tahu bagaimana cara mendapatkannya.\n" +"Jika maksud anda menambahkan submodul, gunakan:\n" +"\n" +"\tgit submodule add <url> %s\n" +"\n" +"Jika Anda menambahkan jalur itu sebagai kesengajaan, Anda dapat menghapus\n" +"itu dari indeks dengan:\n" +"\n" +"\tgit rm --cached %s\n" +"\n" +"Lihat \"git help submodule\" untuk selengkapnya." -#: builtin/add.c:405 +#: builtin/add.c:432 #, c-format msgid "adding embedded git repository: %s" -msgstr "" +msgstr "menambahkan repositori git tertanam: %s" -#: builtin/add.c:424 +#: builtin/add.c:451 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" "\"git config advice.addIgnoredFile false\"" msgstr "" +"Gunakan -f jika Anda benar-benar ingin tambahkan itu.\n" +"Matikan pesan ini dengan menjalankan\n" +"\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:433 +#: builtin/add.c:460 msgid "adding files failed" -msgstr "" +msgstr "gagal menambahkan berkas" + +#: builtin/add.c:488 +msgid "--dry-run is incompatible with --interactive/--patch" +msgstr "--dry-run tidak kompatibel dengan --interactive/--patch" -#: builtin/add.c:461 builtin/commit.c:345 +#: builtin/add.c:490 builtin/commit.c:357 msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "" +msgstr "--pathspec-from-file tidak kompatibel dengan --interactive/--patch" -#: builtin/add.c:478 +#: builtin/add.c:507 msgid "--pathspec-from-file is incompatible with --edit" -msgstr "" +msgstr "--pathspec-from-file tidak kompatibel dengan --edit" -#: builtin/add.c:490 +#: builtin/add.c:519 msgid "-A and -u are mutually incompatible" -msgstr "" +msgstr "-A dan -u saling tak kompatibel" -#: builtin/add.c:493 +#: builtin/add.c:522 msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "" +msgstr "Opsi --ignore-missing hanya dapat digunakan bersama dengan --dry-run" -#: builtin/add.c:497 +#: builtin/add.c:526 #, c-format msgid "--chmod param '%s' must be either -x or +x" -msgstr "" +msgstr "--chmod param '%s' harus berupa -x atau +x" -#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569 +#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 +#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637 msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "" +msgstr "--pathspec-from-file tidak kompatibel dengan argumen pathspec" -#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575 +#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 +#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643 msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "" +msgstr "--pathspec-file-nul butuh --pathspec-from-file" -#: builtin/add.c:526 +#: builtin/add.c:555 #, c-format msgid "Nothing specified, nothing added.\n" -msgstr "" +msgstr "Tidak ada yang disebutkan, tidak ada yang ditambahkan.\n" -#: builtin/add.c:528 +#: builtin/add.c:557 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" "\"git config advice.addEmptyPathspec false\"" msgstr "" +"Mungkin Anda ingin bilang 'git add .'?\n" +"Matikan pesan ini dengan menjalankan\n" +"\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:352 +#: builtin/am.c:364 msgid "could not parse author script" msgstr "" -#: builtin/am.c:436 +#: builtin/am.c:454 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:478 +#: builtin/am.c:496 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:516 +#: builtin/am.c:534 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:542 +#: builtin/am.c:560 msgid "fseek failed" msgstr "" -#: builtin/am.c:730 +#: builtin/am.c:748 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:795 +#: builtin/am.c:813 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:843 +#: builtin/am.c:861 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:866 builtin/am.c:878 msgid "invalid Date line" msgstr "" -#: builtin/am.c:855 +#: builtin/am.c:873 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:948 +#: builtin/am.c:966 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:953 builtin/clone.c:410 +#: builtin/am.c:971 builtin/clone.c:414 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:958 +#: builtin/am.c:976 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1089 +#: builtin/am.c:1125 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1090 +#: builtin/am.c:1126 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1091 +#: builtin/am.c:1127 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1174 +#: builtin/am.c:1222 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -#: builtin/am.c:1202 +#: builtin/am.c:1250 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1267 +#: builtin/am.c:1315 #, c-format msgid "missing author line in commit %s" msgstr "" -#: builtin/am.c:1270 +#: builtin/am.c:1318 #, c-format msgid "invalid ident line: %.*s" msgstr "" -#: builtin/am.c:1489 +#: builtin/am.c:1537 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1491 +#: builtin/am.c:1539 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1510 +#: builtin/am.c:1558 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1516 +#: builtin/am.c:1564 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1542 +#: builtin/am.c:1590 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1574 +#: builtin/am.c:1622 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1626 builtin/am.c:1630 +#: builtin/am.c:1674 builtin/am.c:1678 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1648 +#: builtin/am.c:1696 msgid "Commit Body is:" msgstr "" @@ -9640,46 +9938,46 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1658 +#: builtin/am.c:1706 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1704 builtin/commit.c:395 +#: builtin/am.c:1752 builtin/commit.c:408 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1708 +#: builtin/am.c:1756 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1748 builtin/am.c:1816 +#: builtin/am.c:1796 builtin/am.c:1864 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1765 +#: builtin/am.c:1813 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1771 +#: builtin/am.c:1819 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1775 +#: builtin/am.c:1823 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -#: builtin/am.c:1819 +#: builtin/am.c:1867 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: builtin/am.c:1826 +#: builtin/am.c:1874 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9687,197 +9985,201 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 +#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Tidak dapat mengurai objek '%s'." -#: builtin/am.c:1985 +#: builtin/am.c:2033 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2029 +#: builtin/am.c:2077 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2136 +#: builtin/am.c:2184 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2178 +#: builtin/am.c:2226 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "" -#: builtin/am.c:2182 +#: builtin/am.c:2230 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "" -#: builtin/am.c:2213 +#: builtin/am.c:2261 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "" -#: builtin/am.c:2214 +#: builtin/am.c:2262 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2220 +#: builtin/am.c:2268 msgid "run interactively" msgstr "" -#: builtin/am.c:2222 +#: builtin/am.c:2270 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2224 +#: builtin/am.c:2272 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 -#: builtin/repack.c:334 builtin/stash.c:882 +#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16 +#: builtin/repack.c:472 builtin/stash.c:948 msgid "be quiet" msgstr "" -#: builtin/am.c:2227 +#: builtin/am.c:2275 msgid "add a Signed-off-by trailer to the commit message" msgstr "" -#: builtin/am.c:2230 +#: builtin/am.c:2278 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2232 +#: builtin/am.c:2280 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2234 +#: builtin/am.c:2282 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2236 +#: builtin/am.c:2284 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2238 +#: builtin/am.c:2286 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2241 +#: builtin/am.c:2289 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2244 +#: builtin/am.c:2292 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2273 +#: builtin/am.c:2294 +msgid "pass it through git-mailinfo" +msgstr "" + +#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 +#: builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 +#: builtin/am.c:2324 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261 +#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349 -#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172 -#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175 -#: parse-options.h:316 +#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 +#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176 +#: parse-options.h:317 msgid "n" msgstr "" -#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136 -#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470 +#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137 +#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 #: builtin/verify-tag.c:38 msgid "format" msgstr "" -#: builtin/am.c:2270 +#: builtin/am.c:2321 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2276 +#: builtin/am.c:2327 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2278 +#: builtin/am.c:2329 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2281 +#: builtin/am.c:2332 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2284 +#: builtin/am.c:2335 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2287 +#: builtin/am.c:2338 msgid "restore the original branch and abort the patching operation" msgstr "" -#: builtin/am.c:2290 +#: builtin/am.c:2341 msgid "abort the patching operation but keep HEAD where it is" msgstr "" -#: builtin/am.c:2294 +#: builtin/am.c:2345 msgid "show the patch being applied" msgstr "" -#: builtin/am.c:2299 +#: builtin/am.c:2350 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2301 +#: builtin/am.c:2352 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 -#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538 -#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451 +#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630 +#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 +#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 msgid "key-id" msgstr "" -#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401 +#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2307 +#: builtin/am.c:2358 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2325 +#: builtin/am.c:2376 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" -#: builtin/am.c:2332 +#: builtin/am.c:2383 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2347 +#: builtin/am.c:2398 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2371 +#: builtin/am.c:2422 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2377 +#: builtin/am.c:2428 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: builtin/am.c:2387 +#: builtin/am.c:2438 msgid "interactive mode requires patches on the command line" msgstr "" @@ -10067,7 +10369,7 @@ msgid "" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "" -#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014 +#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021 msgid "revision walk setup failed\n" msgstr "" @@ -10133,85 +10435,91 @@ msgstr "" msgid "'git bisect %s' can take only one argument." msgstr "" -#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878 +#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880 #, c-format msgid "Bad rev input: %s" msgstr "" -#: builtin/bisect--helper.c:912 +#: builtin/bisect--helper.c:887 +#, c-format +msgid "Bad rev input (not a commit): %s" +msgstr "" + +#: builtin/bisect--helper.c:919 msgid "We are not bisecting." msgstr "" -#: builtin/bisect--helper.c:962 +#: builtin/bisect--helper.c:969 #, c-format msgid "'%s'?? what are you talking about?" msgstr "" -#: builtin/bisect--helper.c:974 +#: builtin/bisect--helper.c:981 +#, c-format msgid "cannot read file '%s' for replaying" msgstr "" -#: builtin/bisect--helper.c:1047 +#: builtin/bisect--helper.c:1054 msgid "reset the bisection state" msgstr "" -#: builtin/bisect--helper.c:1049 +#: builtin/bisect--helper.c:1056 msgid "check whether bad or good terms exist" msgstr "" -#: builtin/bisect--helper.c:1051 +#: builtin/bisect--helper.c:1058 msgid "print out the bisect terms" msgstr "" -#: builtin/bisect--helper.c:1053 +#: builtin/bisect--helper.c:1060 msgid "start the bisect session" msgstr "" -#: builtin/bisect--helper.c:1055 +#: builtin/bisect--helper.c:1062 msgid "find the next bisection commit" msgstr "" -#: builtin/bisect--helper.c:1057 +#: builtin/bisect--helper.c:1064 msgid "mark the state of ref (or refs)" msgstr "" -#: builtin/bisect--helper.c:1059 +#: builtin/bisect--helper.c:1066 msgid "list the bisection steps so far" msgstr "" -#: builtin/bisect--helper.c:1061 +#: builtin/bisect--helper.c:1068 msgid "replay the bisection process from the given file" msgstr "" -#: builtin/bisect--helper.c:1063 +#: builtin/bisect--helper.c:1070 msgid "skip some commits for checkout" msgstr "" -#: builtin/bisect--helper.c:1065 +#: builtin/bisect--helper.c:1072 msgid "no log for BISECT_WRITE" msgstr "" -#: builtin/bisect--helper.c:1080 +#: builtin/bisect--helper.c:1087 msgid "--bisect-reset requires either no argument or a commit" msgstr "" -#: builtin/bisect--helper.c:1085 +#: builtin/bisect--helper.c:1092 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "" -#: builtin/bisect--helper.c:1091 +#: builtin/bisect--helper.c:1098 msgid "--bisect-terms requires 0 or 1 argument" msgstr "" -#: builtin/bisect--helper.c:1100 +#: builtin/bisect--helper.c:1107 msgid "--bisect-next requires 0 arguments" msgstr "" -#: builtin/bisect--helper.c:1111 +#: builtin/bisect--helper.c:1118 msgid "--bisect-log requires 0 arguments" msgstr "" -#: builtin/bisect--helper.c:1116 +#: builtin/bisect--helper.c:1123 msgid "no logfile given" msgstr "" @@ -10262,9 +10570,9 @@ msgstr "" msgid "show work cost statistics" msgstr "" -#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92 -#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175 -#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119 +#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 +#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 +#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 #: builtin/push.c:575 builtin/send-pack.c:198 msgid "force progress reporting" msgstr "paksa laporkan perkembangan" @@ -10313,7 +10621,7 @@ msgstr "" msgid "ignore whitespace differences" msgstr "" -#: builtin/blame.c:883 builtin/log.c:1812 +#: builtin/blame.c:883 builtin/log.c:1820 msgid "rev" msgstr "" @@ -10394,31 +10702,31 @@ msgstr "" #: builtin/branch.c:29 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" -msgstr "" +msgstr "git branch [<opsi>] [-r | -a] [--merged] [--no-merged]" #: builtin/branch.c:30 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" -msgstr "" +msgstr "git branch [<opsi>] [-l] [-f] <nama-cabang> [<titik-awal>]" #: builtin/branch.c:31 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." -msgstr "" +msgstr "git branch [<opsi> [-r] (-d | -D) <nama-cabang>...]" #: builtin/branch.c:32 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" -msgstr "" +msgstr "git branch [<opsi>] (-m | -M) [<cabang-lama>] <cabang-baru>" #: builtin/branch.c:33 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" -msgstr "" +msgstr "git branch [<opsi>] (-c | -C) [<cabang-lama>] <cabang-baru>" #: builtin/branch.c:34 msgid "git branch [<options>] [-r | -a] [--points-at]" -msgstr "" +msgstr "git branch [<opsi>] [-r | -a] [--points-at]" #: builtin/branch.c:35 msgid "git branch [<options>] [-r | -a] [--format]" -msgstr "" +msgstr "git branch [<opsi>] [-r | -a] [--format]" #: builtin/branch.c:154 #, c-format @@ -10426,6 +10734,8 @@ msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" +"menghapus cabang '%s' yang sudah digabungkan ke\n" +" '%s', tapi belum digabungkan ke HEAD." #: builtin/branch.c:158 #, c-format @@ -10433,11 +10743,13 @@ msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" +"tidak menghapus cabang '%s' yang belum digabungkan ke\n" +" '%s', walaupun tergabung ke HEAD." #: builtin/branch.c:172 #, c-format msgid "Couldn't look up commit object for '%s'" -msgstr "" +msgstr "Tidak dapat mencari objek komit untuk '%s'" #: builtin/branch.c:176 #, c-format @@ -10445,332 +10757,345 @@ msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" +"Cabang '%s' belum sepenuhnya tergabung.\n" +"Kalau Anda yakin ingin menghapus itu, jalankan 'git branch -D %s'." #: builtin/branch.c:189 msgid "Update of config-file failed" -msgstr "" +msgstr "Pembaruan berkas konfigurasi gagal" #: builtin/branch.c:223 msgid "cannot use -a with -d" -msgstr "" +msgstr "tidak dapat gunakan -a dengan -d" #: builtin/branch.c:230 msgid "Couldn't look up commit object for HEAD" -msgstr "" +msgstr "Tidak dapat mencari objek komit untuk HEAD" #: builtin/branch.c:244 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" -msgstr "" +msgstr "Tidak dapat menghapus cabang '%s' yang ter-checkout pada '%s'" #: builtin/branch.c:259 #, c-format msgid "remote-tracking branch '%s' not found." -msgstr "" +msgstr "cabang pelacak remote '%s' tidak ditemukan." #: builtin/branch.c:260 #, c-format msgid "branch '%s' not found." -msgstr "" +msgstr "cabang '%s' tidak ditemukan." #: builtin/branch.c:291 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" -msgstr "" +msgstr "Cabang pelacak remote %s (yaitu %s) dihapus.\n" #: builtin/branch.c:292 #, c-format msgid "Deleted branch %s (was %s).\n" -msgstr "" +msgstr "Cabang %s (yaitu %s) dihapus.\n" -#: builtin/branch.c:438 builtin/tag.c:61 +#: builtin/branch.c:440 builtin/tag.c:63 msgid "unable to parse format string" -msgstr "" +msgstr "tidak dapat menguraikan untai format" -#: builtin/branch.c:469 +#: builtin/branch.c:471 msgid "could not resolve HEAD" -msgstr "" +msgstr "tidak dapat menguraikan HEAD" -#: builtin/branch.c:475 +#: builtin/branch.c:477 #, c-format msgid "HEAD (%s) points outside of refs/heads/" -msgstr "" +msgstr "HEAD (%s) merujuk diluar refs/heads/" -#: builtin/branch.c:490 +#: builtin/branch.c:492 #, c-format msgid "Branch %s is being rebased at %s" -msgstr "" +msgstr "Cabang %s sedang didasarkan ulang pada %s" -#: builtin/branch.c:494 +#: builtin/branch.c:496 #, c-format msgid "Branch %s is being bisected at %s" -msgstr "" +msgstr "Cabang %s sedang dibagi dua pada %s" -#: builtin/branch.c:511 +#: builtin/branch.c:513 msgid "cannot copy the current branch while not on any." -msgstr "" +msgstr "tidak dapat menyalin cabang saat ini ketika tidak ada." -#: builtin/branch.c:513 +#: builtin/branch.c:515 msgid "cannot rename the current branch while not on any." -msgstr "" +msgstr "tidak dapat mengganti nama cabang saat ini ketika tidak ada." -#: builtin/branch.c:524 +#: builtin/branch.c:526 #, c-format msgid "Invalid branch name: '%s'" -msgstr "" +msgstr "Nama cabang tidak valid: '%s'" -#: builtin/branch.c:553 +#: builtin/branch.c:555 msgid "Branch rename failed" -msgstr "" +msgstr "Penggantian nama cabang gagal" -#: builtin/branch.c:555 +#: builtin/branch.c:557 msgid "Branch copy failed" -msgstr "" +msgstr "Penyalinan cabang gagal" -#: builtin/branch.c:559 +#: builtin/branch.c:561 #, c-format msgid "Created a copy of a misnamed branch '%s'" -msgstr "" +msgstr "Salinan cabang salah nama '%s' dibuat" -#: builtin/branch.c:562 +#: builtin/branch.c:564 #, c-format msgid "Renamed a misnamed branch '%s' away" -msgstr "" +msgstr "Cabang salah nama '%s' berganti nama" -#: builtin/branch.c:568 +#: builtin/branch.c:570 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" -msgstr "" +msgstr "Cabang berganti nama ke %s, tapi HEAD tidak diperbarui!" -#: builtin/branch.c:577 +#: builtin/branch.c:579 msgid "Branch is renamed, but update of config-file failed" -msgstr "" +msgstr "Cabang berganti nama, tapi pembaruan berkas konfigurasi gagal" -#: builtin/branch.c:579 +#: builtin/branch.c:581 msgid "Branch is copied, but update of config-file failed" -msgstr "" +msgstr "Cabang disalin, tapi pembaruan berkas konfigurasi gagal" -#: builtin/branch.c:595 +#: builtin/branch.c:597 #, c-format msgid "" "Please edit the description for the branch\n" " %s\n" "Lines starting with '%c' will be stripped.\n" msgstr "" +"Mohon sunting deskripsi untuk cabang\n" +" %s\n" +"Baris yang diawali dengan '%c' akan dicopot.\n" -#: builtin/branch.c:629 +#: builtin/branch.c:631 msgid "Generic options" -msgstr "" +msgstr "Opsi generik" -#: builtin/branch.c:631 +#: builtin/branch.c:633 msgid "show hash and subject, give twice for upstream branch" -msgstr "" +msgstr "perlihatkan hash dan subjek, berikan dua kali untuk cabang hulu" -#: builtin/branch.c:632 +#: builtin/branch.c:634 msgid "suppress informational messages" -msgstr "" +msgstr "sembunyikan pesan informasi" -#: builtin/branch.c:633 +#: builtin/branch.c:635 msgid "set up tracking mode (see git-pull(1))" -msgstr "" +msgstr "pasang mode pelacakan (lihat git-pull(1))" -#: builtin/branch.c:635 +#: builtin/branch.c:637 msgid "do not use" -msgstr "" +msgstr "jangan gunakan" -#: builtin/branch.c:637 builtin/rebase.c:534 +#: builtin/branch.c:639 builtin/rebase.c:533 msgid "upstream" -msgstr "" +msgstr "hulu" -#: builtin/branch.c:637 +#: builtin/branch.c:639 msgid "change the upstream info" -msgstr "" +msgstr "ubah info hulu" -#: builtin/branch.c:638 +#: builtin/branch.c:640 msgid "unset the upstream info" -msgstr "" +msgstr "batal-setel info hulu" -#: builtin/branch.c:639 +#: builtin/branch.c:641 msgid "use colored output" -msgstr "" +msgstr "gunakan keluaran berwarna" -#: builtin/branch.c:640 +#: builtin/branch.c:642 msgid "act on remote-tracking branches" -msgstr "" +msgstr "lakukan pada cabang pelacak remote" -#: builtin/branch.c:642 builtin/branch.c:644 +#: builtin/branch.c:644 builtin/branch.c:646 msgid "print only branches that contain the commit" -msgstr "" +msgstr "cetak hanya cabang yang berisi komit" -#: builtin/branch.c:643 builtin/branch.c:645 +#: builtin/branch.c:645 builtin/branch.c:647 msgid "print only branches that don't contain the commit" -msgstr "" +msgstr "cetak hanya cabang yang tak berisi komit" -#: builtin/branch.c:648 +#: builtin/branch.c:650 msgid "Specific git-branch actions:" -msgstr "" +msgstr "Aksi git-branch spesifik:" -#: builtin/branch.c:649 +#: builtin/branch.c:651 msgid "list both remote-tracking and local branches" -msgstr "" +msgstr "sebut baik cabang pelacak remote dan cabang lokal" -#: builtin/branch.c:651 +#: builtin/branch.c:653 msgid "delete fully merged branch" -msgstr "" +msgstr "hapus cabang yang tergabung sepenuhnya" -#: builtin/branch.c:652 +#: builtin/branch.c:654 msgid "delete branch (even if not merged)" -msgstr "" +msgstr "hapus cabang (walaupun tak tergabung)" -#: builtin/branch.c:653 +#: builtin/branch.c:655 msgid "move/rename a branch and its reflog" -msgstr "" +msgstr "pindah/ganti nama cabang dan reflog-nya" -#: builtin/branch.c:654 +#: builtin/branch.c:656 msgid "move/rename a branch, even if target exists" -msgstr "" +msgstr "pindah/ganti nama cabang, walaupun target ada" -#: builtin/branch.c:655 +#: builtin/branch.c:657 msgid "copy a branch and its reflog" -msgstr "" +msgstr "salin cabang dan reflog-nya" -#: builtin/branch.c:656 +#: builtin/branch.c:658 msgid "copy a branch, even if target exists" -msgstr "" +msgstr "salin cabang, walapun target ada" -#: builtin/branch.c:657 +#: builtin/branch.c:659 msgid "list branch names" -msgstr "" +msgstr "sebut nama cabang" -#: builtin/branch.c:658 +#: builtin/branch.c:660 msgid "show current branch name" -msgstr "" +msgstr "perlihatkan nama cabang saat ini" -#: builtin/branch.c:659 +#: builtin/branch.c:661 msgid "create the branch's reflog" -msgstr "" +msgstr "buat reflog cabang" -#: builtin/branch.c:661 +#: builtin/branch.c:663 msgid "edit the description for the branch" -msgstr "" +msgstr "sunting deskripsi cabang" -#: builtin/branch.c:662 +#: builtin/branch.c:664 msgid "force creation, move/rename, deletion" -msgstr "" +msgstr "paksa buat, pindah/ganti nama, hapus" -#: builtin/branch.c:663 +#: builtin/branch.c:665 msgid "print only branches that are merged" -msgstr "" +msgstr "cetak hanya cabang yang tergabung" -#: builtin/branch.c:664 +#: builtin/branch.c:666 msgid "print only branches that are not merged" -msgstr "" +msgstr "cetak hanya cabang yang tak tergabung" -#: builtin/branch.c:665 +#: builtin/branch.c:667 msgid "list branches in columns" -msgstr "" +msgstr "sebut cabang dalam kolom" -#: builtin/branch.c:667 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:466 +#: builtin/tag.c:477 msgid "object" -msgstr "" +msgstr "objek" -#: builtin/branch.c:668 +#: builtin/branch.c:670 msgid "print only branches of the object" -msgstr "" +msgstr "cetak hanya cabang objek" -#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473 +#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484 msgid "sorting and filtering are case insensitive" -msgstr "" +msgstr "pengurutan dan penyaringan tak peka kapital" -#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471 +#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482 #: builtin/verify-tag.c:38 msgid "format to use for the output" -msgstr "" +msgstr "format yang digunakan untuk keluaran" -#: builtin/branch.c:693 builtin/clone.c:790 +#: builtin/branch.c:695 builtin/clone.c:794 msgid "HEAD not found below refs/heads!" -msgstr "" +msgstr "HEAD tidak ditemukan di bawah refs/heads!" -#: builtin/branch.c:717 +#: builtin/branch.c:719 msgid "--column and --verbose are incompatible" -msgstr "" +msgstr "--column dan --verbose tidak kompatibel" -#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797 +#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799 msgid "branch name required" -msgstr "" +msgstr "nama cabang diperlukan" -#: builtin/branch.c:764 +#: builtin/branch.c:766 msgid "Cannot give description to detached HEAD" -msgstr "" +msgstr "Tidak dapat memberikan deskripsi ke HEAD terpisah" -#: builtin/branch.c:769 +#: builtin/branch.c:771 msgid "cannot edit description of more than one branch" -msgstr "" +msgstr "tidak dapat menyunting deskripsi lebih dari satu cabang" -#: builtin/branch.c:776 +#: builtin/branch.c:778 #, c-format msgid "No commit on branch '%s' yet." -msgstr "" +msgstr "Belum ada komit pada cabang '%s'." -#: builtin/branch.c:779 +#: builtin/branch.c:781 #, c-format msgid "No branch named '%s'." -msgstr "" +msgstr "Tidak ada cabang bernama '%s'." -#: builtin/branch.c:794 +#: builtin/branch.c:796 msgid "too many branches for a copy operation" -msgstr "" +msgstr "terlalu banyak cabang untuk operasi penyalinan" -#: builtin/branch.c:803 +#: builtin/branch.c:805 msgid "too many arguments for a rename operation" -msgstr "" +msgstr "terlalu banyak argumen untuk operasi penggantian nama" -#: builtin/branch.c:808 +#: builtin/branch.c:810 msgid "too many arguments to set new upstream" -msgstr "" +msgstr "terlalu banyak argumen untuk menyetel hulu baru" -#: builtin/branch.c:812 +#: builtin/branch.c:814 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" +"tidak dapat menyetel hulu HEAD ke %s ketika itu tak menunjuk pada cabang " +"apapun." -#: builtin/branch.c:815 builtin/branch.c:838 +#: builtin/branch.c:817 builtin/branch.c:840 #, c-format msgid "no such branch '%s'" -msgstr "" +msgstr "tidak ada cabang '%s'" -#: builtin/branch.c:819 +#: builtin/branch.c:821 #, c-format msgid "branch '%s' does not exist" -msgstr "" +msgstr "cabang '%s' tidak ada" -#: builtin/branch.c:832 +#: builtin/branch.c:834 msgid "too many arguments to unset upstream" -msgstr "" +msgstr "terlalu banyak argumen untuk batal-setel hulu" -#: builtin/branch.c:836 +#: builtin/branch.c:838 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" +"tidak dapat membatal-setel hulu HEAD ketika itu tak menunjuk pada cabang " +"apapun." -#: builtin/branch.c:842 +#: builtin/branch.c:844 #, c-format msgid "Branch '%s' has no upstream information" -msgstr "" +msgstr "Cabang '%s' tidak ada informasi hulu" -#: builtin/branch.c:852 +#: builtin/branch.c:854 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" msgstr "" +"Opsi -a dan -r tidak mengambil nama cabang.\n" +"Mungkin maksud Anda gunakan: -a|-r --list <pola>?" -#: builtin/branch.c:856 +#: builtin/branch.c:858 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "" +"opsi '--set-upstream' tidak lagi didukung. Mohon gunakan '--track' atau '--" +"set-upstream-to' sebagai gantinya." #: builtin/bugreport.c:15 msgid "git version:\n" @@ -10816,38 +11141,38 @@ msgid "" "You can delete any lines you don't wish to share.\n" msgstr "" -#: builtin/bugreport.c:135 +#: builtin/bugreport.c:136 msgid "specify a destination for the bugreport file" msgstr "" -#: builtin/bugreport.c:137 +#: builtin/bugreport.c:138 msgid "specify a strftime format suffix for the filename" msgstr "" -#: builtin/bugreport.c:159 +#: builtin/bugreport.c:160 #, c-format msgid "could not create leading directories for '%s'" msgstr "" -#: builtin/bugreport.c:166 +#: builtin/bugreport.c:167 msgid "System Info" msgstr "" -#: builtin/bugreport.c:169 +#: builtin/bugreport.c:170 msgid "Enabled Hooks" msgstr "" -#: builtin/bugreport.c:176 +#: builtin/bugreport.c:177 #, c-format msgid "couldn't create a new file at '%s'" msgstr "" -#: builtin/bugreport.c:179 +#: builtin/bugreport.c:180 #, c-format msgid "unable to write to %s" msgstr "" -#: builtin/bugreport.c:189 +#: builtin/bugreport.c:190 #, c-format msgid "Created new report at '%s'.\n" msgstr "" @@ -10868,19 +11193,19 @@ msgstr "" msgid "git bundle unbundle <file> [<refname>...]" msgstr "" -#: builtin/bundle.c:67 builtin/pack-objects.c:3495 +#: builtin/bundle.c:67 builtin/pack-objects.c:3747 msgid "do not show progress meter" msgstr "" -#: builtin/bundle.c:69 builtin/pack-objects.c:3497 +#: builtin/bundle.c:69 builtin/pack-objects.c:3749 msgid "show progress meter" msgstr "" -#: builtin/bundle.c:71 builtin/pack-objects.c:3499 +#: builtin/bundle.c:71 builtin/pack-objects.c:3751 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/bundle.c:74 builtin/pack-objects.c:3502 +#: builtin/bundle.c:74 builtin/pack-objects.c:3754 msgid "similar to --all-progress when progress meter is shown" msgstr "" @@ -11018,8 +11343,8 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549 -#: builtin/worktree.c:489 +#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 +#: builtin/worktree.c:491 msgid "suppress progress reporting" msgstr "" @@ -11031,27 +11356,27 @@ msgstr "" msgid "ignore index when checking" msgstr "" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:165 msgid "cannot specify pathnames with --stdin" msgstr "" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:168 msgid "-z only makes sense with --stdin" msgstr "" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:170 msgid "no path specified" msgstr "" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:174 msgid "--quiet is only valid with a single pathname" msgstr "" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:176 msgid "cannot have both --quiet and --verbose" msgstr "" -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:179 msgid "--non-matching is only valid with --verbose" msgstr "" @@ -11072,6 +11397,21 @@ msgstr "" msgid "no contacts specified" msgstr "" +#: builtin/checkout--worker.c:110 +msgid "git checkout--worker [<options>]" +msgstr "" + +#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 +#: builtin/column.c:31 builtin/submodule--helper.c:1825 +#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836 +#: builtin/submodule--helper.c:2334 builtin/worktree.c:719 +msgid "string" +msgstr "" + +#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202 +msgid "when creating files, prepend <string>" +msgstr "" + #: builtin/checkout-index.c:152 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "" @@ -11080,159 +11420,148 @@ msgstr "" msgid "stage should be between 1 and 3 or all" msgstr "" -#: builtin/checkout-index.c:186 +#: builtin/checkout-index.c:187 msgid "check out all files in the index" msgstr "" -#: builtin/checkout-index.c:187 +#: builtin/checkout-index.c:188 msgid "force overwrite of existing files" msgstr "" -#: builtin/checkout-index.c:189 +#: builtin/checkout-index.c:190 msgid "no warning for existing files and files not in index" msgstr "" -#: builtin/checkout-index.c:191 +#: builtin/checkout-index.c:192 msgid "don't checkout new files" msgstr "" -#: builtin/checkout-index.c:193 +#: builtin/checkout-index.c:194 msgid "update stat information in the index file" msgstr "" -#: builtin/checkout-index.c:197 +#: builtin/checkout-index.c:198 msgid "read list of paths from the standard input" msgstr "" -#: builtin/checkout-index.c:199 +#: builtin/checkout-index.c:200 msgid "write the content to temporary files" msgstr "" -#: builtin/checkout-index.c:200 builtin/column.c:31 -#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 -#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:717 -msgid "string" -msgstr "" - -#: builtin/checkout-index.c:201 -msgid "when creating files, prepend <string>" -msgstr "" - -#: builtin/checkout-index.c:203 +#: builtin/checkout-index.c:204 msgid "copy out the files from named stage" msgstr "" -#: builtin/checkout.c:31 +#: builtin/checkout.c:33 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<opsi>] <cabang>" -#: builtin/checkout.c:32 +#: builtin/checkout.c:34 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<opsi>] [<cabang>] -- <berkas>..." -#: builtin/checkout.c:37 +#: builtin/checkout.c:39 msgid "git switch [<options>] [<branch>]" msgstr "git switch [<opsi>] [<cabang>]" -#: builtin/checkout.c:42 +#: builtin/checkout.c:44 msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<opsi>] [--source=<cabang>] <berkas>..." -#: builtin/checkout.c:188 builtin/checkout.c:227 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have our version" msgstr "jalur '%s' tidak punya versi kami" -#: builtin/checkout.c:190 builtin/checkout.c:229 +#: builtin/checkout.c:192 builtin/checkout.c:231 #, c-format msgid "path '%s' does not have their version" msgstr "jalur '%s' tidak punya versi mereka" -#: builtin/checkout.c:206 +#: builtin/checkout.c:208 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "jalur '%s' tidak punya semua versi yang diperlukan" -#: builtin/checkout.c:258 +#: builtin/checkout.c:261 #, c-format msgid "path '%s' does not have necessary versions" msgstr "jalur '%s' tidak punya versi yang diperlukan" -#: builtin/checkout.c:275 +#: builtin/checkout.c:278 #, c-format msgid "path '%s': cannot merge" msgstr "jalur '%s': tidak dapat gabung" -#: builtin/checkout.c:291 +#: builtin/checkout.c:294 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Tidak dapat menambahkan hasil penggabungan untuk '%s'" -#: builtin/checkout.c:396 +#: builtin/checkout.c:414 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Konflik penggabungan %d dibuat ulang" msgstr[1] "Konflik penggabungan %d dibuat ulang" -#: builtin/checkout.c:401 +#: builtin/checkout.c:419 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "%d jalur diperbarui dari %s" msgstr[1] "%d jalur diperbarui dari %s" -#: builtin/checkout.c:408 +#: builtin/checkout.c:426 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "%d jalur diperbarui dari indeks" msgstr[1] "%d jalur diperbarui dari indeks" -#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 -#: builtin/checkout.c:441 +#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 +#: builtin/checkout.c:459 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' tidak dapat digunakan untuk memperbarui jalur" -#: builtin/checkout.c:444 builtin/checkout.c:447 +#: builtin/checkout.c:462 builtin/checkout.c:465 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' tidak dapat digunakan untuk %s" -#: builtin/checkout.c:451 +#: builtin/checkout.c:469 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Tidak dapat memperbarui jalur dan mengganti ke cabang '%s' dalam waktu yang " "bersamaan." -#: builtin/checkout.c:455 +#: builtin/checkout.c:473 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "baik '%s' atau '%s' tidak disebutkan" -#: builtin/checkout.c:459 +#: builtin/checkout.c:477 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' harus disebutkan ketika '%s' tidak disebutkan" -#: builtin/checkout.c:464 builtin/checkout.c:469 +#: builtin/checkout.c:482 builtin/checkout.c:487 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' atau '%s' tidak dapat digunakan untuk %s" -#: builtin/checkout.c:543 builtin/checkout.c:550 +#: builtin/checkout.c:563 builtin/checkout.c:570 #, c-format msgid "path '%s' is unmerged" msgstr "jalur '%s' tak tergabung" -#: builtin/checkout.c:718 +#: builtin/checkout.c:739 msgid "you need to resolve your current index first" msgstr "Anda perlu selesaikan dulu indeks Anda saat ini" -#: builtin/checkout.c:772 +#: builtin/checkout.c:793 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11242,50 +11571,50 @@ msgstr "" "berikut:\n" "%s" -#: builtin/checkout.c:865 +#: builtin/checkout.c:886 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Tidak dapat melakukan reflog untuk '%s': %s\n" -#: builtin/checkout.c:907 +#: builtin/checkout.c:928 msgid "HEAD is now at" msgstr "HEAD sekarang berada di" -#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "tidak dapat memperbarui HEAD" -#: builtin/checkout.c:915 +#: builtin/checkout.c:936 #, c-format msgid "Reset branch '%s'\n" msgstr "Ganti ulang cabang '%s'\n" -#: builtin/checkout.c:918 +#: builtin/checkout.c:939 #, c-format msgid "Already on '%s'\n" msgstr "Sudah berada pada '%s'\n" -#: builtin/checkout.c:922 +#: builtin/checkout.c:943 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Ganti ke dan ganti cabang '%s'\n" -#: builtin/checkout.c:924 builtin/checkout.c:1355 +#: builtin/checkout.c:945 builtin/checkout.c:1376 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Ganti ke cabang baru '%s'\n" -#: builtin/checkout.c:926 +#: builtin/checkout.c:947 #, c-format msgid "Switched to branch '%s'\n" msgstr "Ganti ke cabang '%s'\n" -#: builtin/checkout.c:977 +#: builtin/checkout.c:998 #, c-format msgid " ... and %d more.\n" msgstr "... dan %d lainnya.\n" -#: builtin/checkout.c:983 +#: builtin/checkout.c:1004 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11308,7 +11637,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1002 +#: builtin/checkout.c:1023 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11331,19 +11660,19 @@ msgstr[1] "" "saat yang tepat untuk dilakukan dengan:\n" "git branch <nama-cabang-baru> %s\n" -#: builtin/checkout.c:1037 +#: builtin/checkout.c:1058 msgid "internal error in revision walk" msgstr "kesalahan internal dalam jalan revisi" -#: builtin/checkout.c:1041 +#: builtin/checkout.c:1062 msgid "Previous HEAD position was" msgstr "Posisi HEAD sebelumnya adalah" -#: builtin/checkout.c:1081 builtin/checkout.c:1350 +#: builtin/checkout.c:1102 builtin/checkout.c:1371 msgid "You are on a branch yet to be born" msgstr "Anda berada pada cabang yang belum lahir" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1184 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11352,7 +11681,7 @@ msgstr "" "'%s' bisa jadi berkas lokal dan cabang pelacak.\n" "Mohon gunakan -- (dan secara opsional --no-guess) untuk disambiguasi" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1191 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -11372,51 +11701,51 @@ msgstr "" "seperti remote 'origin', pertimbangkan untuk menyetel\n" "checkout.defaultRemote=origin di konfigurasi Anda" -#: builtin/checkout.c:1180 +#: builtin/checkout.c:1201 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' cocok dengan banyak (%d) cabang pelacak remote" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1267 msgid "only one reference expected" msgstr "hanya satu referensi yang diharapkan" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1284 #, c-format msgid "only one reference expected, %d given." msgstr "hanya satu referensi yang diharapkan, %d diberikan" -#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438 +#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438 #, c-format msgid "invalid reference: %s" msgstr "referensi tidak valid: %s" -#: builtin/checkout.c:1322 builtin/checkout.c:1688 +#: builtin/checkout.c:1343 builtin/checkout.c:1709 #, c-format msgid "reference is not a tree: %s" msgstr "referensi bukan pohon: %s" -#: builtin/checkout.c:1369 +#: builtin/checkout.c:1390 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "sebuah cabang diharapkan, dapat tag '%s'" -#: builtin/checkout.c:1371 +#: builtin/checkout.c:1392 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "sebuah cabang diharapkan, dapat cabang remote '%s'" -#: builtin/checkout.c:1372 builtin/checkout.c:1380 +#: builtin/checkout.c:1393 builtin/checkout.c:1401 #, c-format msgid "a branch is expected, got '%s'" msgstr "sebuah cabang diharapkan, dapat '%s'" -#: builtin/checkout.c:1375 +#: builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "sebuah cabang diharapkan, dapat komit '%s'" -#: builtin/checkout.c:1391 +#: builtin/checkout.c:1412 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11425,7 +11754,7 @@ msgstr "" "Pertimbangkan untuk menggunakan \"git merge --quit\" atau \"git worktree add" "\"." -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1416 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11433,7 +11762,7 @@ msgstr "" "tidak dapat mengganti cabang di tengah sesi am\n" "Pertimbangkan untuk menggunakan \"git am --quit\" atau \"git worktree add\"." -#: builtin/checkout.c:1399 +#: builtin/checkout.c:1420 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11442,7 +11771,7 @@ msgstr "" "Pertimbangkan untuk menggunakan \"git rebase --quit\" atau \"git worktree add" "\"." -#: builtin/checkout.c:1403 +#: builtin/checkout.c:1424 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11451,7 +11780,7 @@ msgstr "" "Pertimbangkan untuk menggunakan \"git cherry-pick --quit\" atau \"git " "worktree add\"." -#: builtin/checkout.c:1407 +#: builtin/checkout.c:1428 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11460,138 +11789,138 @@ msgstr "" "Pertimbangkan untuk menggunakan \"git cherry-pick --quit\" atau \"git " "worktree add\"." -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1432 msgid "you are switching branch while bisecting" msgstr "Anda mengganti cabang saat pembagian dua" -#: builtin/checkout.c:1418 +#: builtin/checkout.c:1439 msgid "paths cannot be used with switching branches" msgstr "jalur tidak dapat digunakan dengan mengganti cabang" -#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429 +#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' tidak dapat digunakan dengan mengganti cabang" -#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439 -#: builtin/checkout.c:1444 builtin/checkout.c:1449 +#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 +#: builtin/checkout.c:1465 builtin/checkout.c:1470 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' tidak dapat digunakan dengan '%s'" -#: builtin/checkout.c:1446 +#: builtin/checkout.c:1467 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' tidak bisa mengambil <titik-awal>" -#: builtin/checkout.c:1454 +#: builtin/checkout.c:1475 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Tidak dapat mengganti cabang ke bukan komit '%s'" -#: builtin/checkout.c:1461 +#: builtin/checkout.c:1482 msgid "missing branch or commit argument" msgstr "kehilangan argumen cabang atau komit" -#: builtin/checkout.c:1504 +#: builtin/checkout.c:1525 msgid "perform a 3-way merge with the new branch" msgstr "lakukan penggabungan 3 arah dengan cabang baru" -#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322 +#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323 msgid "style" msgstr "gaya" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1527 msgid "conflict style (merge or diff3)" msgstr "gaya konflik (merge atau diff3)" -#: builtin/checkout.c:1518 builtin/worktree.c:486 +#: builtin/checkout.c:1539 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "lepas HEAD pada komit bernama" -#: builtin/checkout.c:1519 +#: builtin/checkout.c:1540 msgid "set upstream info for new branch" msgstr "setel info hulu untuk cabang baru" -#: builtin/checkout.c:1521 +#: builtin/checkout.c:1542 msgid "force checkout (throw away local modifications)" msgstr "paksa checkout (buang modifikasi lokal)" -#: builtin/checkout.c:1523 +#: builtin/checkout.c:1544 msgid "new-branch" msgstr "cabang baru" -#: builtin/checkout.c:1523 +#: builtin/checkout.c:1544 msgid "new unparented branch" msgstr "cabang baru tanpa induk" -#: builtin/checkout.c:1525 builtin/merge.c:301 +#: builtin/checkout.c:1546 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "perbarui berkas yang diabaikan (default)" -#: builtin/checkout.c:1528 +#: builtin/checkout.c:1549 msgid "do not check if another worktree is holding the given ref" msgstr "" "jangan periksa jika pohon kerja yang lain mempunyai referensi yang diberikan" -#: builtin/checkout.c:1541 +#: builtin/checkout.c:1562 msgid "checkout our version for unmerged files" msgstr "checkout versi kami untuk berkas yang tak tergabung" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1565 msgid "checkout their version for unmerged files" msgstr "checkout versi mereka untuk berkas yang tak tergabung" -#: builtin/checkout.c:1548 +#: builtin/checkout.c:1569 msgid "do not limit pathspecs to sparse entries only" msgstr "jangan batasi jalur spek hanya ke entri tipis" -#: builtin/checkout.c:1603 +#: builtin/checkout.c:1624 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c dan --orphan saling eksklusif" -#: builtin/checkout.c:1607 +#: builtin/checkout.c:1628 msgid "-p and --overlay are mutually exclusive" msgstr "-p dan --overlay saling eksklusif" -#: builtin/checkout.c:1644 +#: builtin/checkout.c:1665 msgid "--track needs a branch name" msgstr "--track butuh nama cabang" -#: builtin/checkout.c:1649 +#: builtin/checkout.c:1670 #, c-format msgid "missing branch name; try -%c" msgstr "kehilangan nama cabang; coba -%c" -#: builtin/checkout.c:1681 +#: builtin/checkout.c:1702 #, c-format msgid "could not resolve %s" msgstr "tidak dapat menyelesaikan %s" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1718 msgid "invalid path specification" msgstr "spesifikasi jalur tidak valid" -#: builtin/checkout.c:1704 +#: builtin/checkout.c:1725 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' bukanlah commit dan cabang '%s' tidak dapat dibuat dari itu" -#: builtin/checkout.c:1708 +#: builtin/checkout.c:1729 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach tidak mengambil argumen jalur '%s'" -#: builtin/checkout.c:1717 +#: builtin/checkout.c:1738 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file tidak kompatible dengan --detach" -#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566 +#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file tidak kompatibel dengan --patch" -#: builtin/checkout.c:1733 +#: builtin/checkout.c:1754 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -11599,70 +11928,70 @@ msgstr "" "git checkout: --ours/theirs, --force dan --merge tidak kompatibel saat\n" "men-checkout index" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1759 msgid "you must specify path(s) to restore" msgstr "Anda harus sebutkan jalur untuk dipulihkan" -#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815 -#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482 -#: builtin/worktree.c:484 +#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 +#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484 +#: builtin/worktree.c:486 msgid "branch" msgstr "cabang" -#: builtin/checkout.c:1765 +#: builtin/checkout.c:1786 msgid "create and checkout a new branch" msgstr "buat dan checkout cabang baru" -#: builtin/checkout.c:1767 +#: builtin/checkout.c:1788 msgid "create/reset and checkout a branch" msgstr "buat/setel ulang dan checkout cabang" -#: builtin/checkout.c:1768 +#: builtin/checkout.c:1789 msgid "create reflog for new branch" msgstr "buat reflog untuk cabang baru" -#: builtin/checkout.c:1770 +#: builtin/checkout.c:1791 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "tebakan kedua 'git checkout <tidak-ada-cabang-seperti-itu>' (default)" -#: builtin/checkout.c:1771 +#: builtin/checkout.c:1792 msgid "use overlay mode (default)" msgstr "gunakan mode hamparan (default)" -#: builtin/checkout.c:1816 +#: builtin/checkout.c:1837 msgid "create and switch to a new branch" msgstr "buat dan ganti ke cabang baru" -#: builtin/checkout.c:1818 +#: builtin/checkout.c:1839 msgid "create/reset and switch to a branch" msgstr "buat/setel ulang dan ganti ke cabang" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1841 msgid "second guess 'git switch <no-such-branch>'" msgstr "tebakan kedua 'git switch <tidak-ada-cabang-seperti-itu>'" -#: builtin/checkout.c:1822 +#: builtin/checkout.c:1843 msgid "throw away local modifications" msgstr "buang modifikasi lokal" -#: builtin/checkout.c:1856 +#: builtin/checkout.c:1877 msgid "which tree-ish to checkout from" msgstr "mana mirip-cabang untuk di-checkout" -#: builtin/checkout.c:1858 +#: builtin/checkout.c:1879 msgid "restore the index" msgstr "pulihkan indeks" -#: builtin/checkout.c:1860 +#: builtin/checkout.c:1881 msgid "restore the working tree (default)" msgstr "pulihkan pohon kerja (default)" -#: builtin/checkout.c:1862 +#: builtin/checkout.c:1883 msgid "ignore unmerged entries" msgstr "abaikan entri yang tak tergabung" -#: builtin/checkout.c:1863 +#: builtin/checkout.c:1884 msgid "use overlay mode" msgstr "gunakan mode hamparan" @@ -11670,36 +11999,32 @@ msgstr "gunakan mode hamparan" msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pola>] [-x | -X] [--] <jalur>..." #: builtin/clean.c:33 #, c-format msgid "Removing %s\n" -msgstr "" +msgstr "Menghapus %s\n" #: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" -msgstr "" +msgstr "Akan hapus %s\n" #: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" -msgstr "" +msgstr "Melewatkan repositori %s\n" #: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" -msgstr "" - -#: builtin/clean.c:37 -#, c-format -msgid "failed to remove %s" -msgstr "" +msgstr "Akan melewatkan repositori %s\n" #: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" -msgstr "" +msgstr "tidak dapat me-lstat %s\n" #: builtin/clean.c:302 git-add--interactive.perl:593 #, c-format @@ -11709,6 +12034,10 @@ msgid "" "foo - select item based on unique prefix\n" " - (empty) select nothing\n" msgstr "" +"Bisik bantuan:\n" +"1 - pilih item bernomor\n" +"foo - pilih item berdasarkan prefiks unik\n" +" - (kosong) tidak pilih apa-apa\n" #: builtin/clean.c:306 git-add--interactive.perl:602 #, c-format @@ -11722,32 +12051,40 @@ msgid "" "* - choose all items\n" " - (empty) finish selecting\n" msgstr "" +"Bisik bantuan:\n" +"1 - pilih item tunggal\n" +"3-5 - pilih satu rentang item\n" +"2-3,6-9 - pilih banyak rentang\n" +"foo - pilih item berdasarkan prefiks unik\n" +"-... - batal pilih item yang disebutkan\n" +"* - pilih semua item\n" +" - (kosong) selesai memilih\n" #: builtin/clean.c:521 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" -msgstr "" +msgstr "Huh (%s)?\n" #: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " -msgstr "" +msgstr "Masukkan pola pengabaian>> " #: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" -msgstr "" +msgstr "PERINGATAN: Tidak dapat menemukan item yang cocok dengan: %s" #: builtin/clean.c:717 msgid "Select items to delete" -msgstr "" +msgstr "Pilih item untuk dihapus" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " -msgstr "" +msgstr "Hapus %s [y/N]? " #: builtin/clean.c:789 msgid "" @@ -11759,229 +12096,245 @@ msgid "" "help - this screen\n" "? - help for prompt selection" msgstr "" +"clean - mulai membersihkan\n" +"filter by pattern - kecualikan item dari penghapusan\n" +"select by numbers - pilih item untuk dihapus oleh nomor\n" +"ask each - konfirmasi setiap penghapusan (seperti \"rm -i\")\n" +"quit - berhenti membersihkan\n" +"help - layar ini\n" +"? - bantuan untuk bisik pemilihan" #: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Akan menghapus item berikut:" +msgstr[1] "Akan menghapus item berikut:" #: builtin/clean.c:841 msgid "No more files to clean, exiting." -msgstr "" +msgstr "Tidak ada lagi berkas untuk dibersihkan, keluar." #: builtin/clean.c:903 msgid "do not print names of files removed" -msgstr "" +msgstr "jangan cetak nama berkas yang dihapus" #: builtin/clean.c:905 msgid "force" -msgstr "" +msgstr "paksa" #: builtin/clean.c:906 msgid "interactive cleaning" -msgstr "" +msgstr "pembersihan interaktif" #: builtin/clean.c:908 msgid "remove whole directories" -msgstr "" +msgstr "hapus keseluruhan direktori" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186 -#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" -msgstr "" +msgstr "pola" #: builtin/clean.c:910 msgid "add <pattern> to ignore rules" -msgstr "" +msgstr "tambahkan <pola> ke aturan pengabaian" #: builtin/clean.c:911 msgid "remove ignored files, too" -msgstr "" +msgstr "juga hapus berkas terabaikan" #: builtin/clean.c:913 msgid "remove only ignored files" -msgstr "" +msgstr "hanya hapus berkas terabaikan" #: builtin/clean.c:929 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" +"clean.requireForce disetel ke true dan baik -i, -n, atau -f tidak diberikan; " +"menolak membersihkan" #: builtin/clean.c:932 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" +"clean.requireForce asal ke true dan baik -i, -n, atau -f tidak diberikan; " +"menolak membersihkan" #: builtin/clean.c:944 msgid "-x and -X cannot be used together" -msgstr "" +msgstr "-x dan -X tidak dapat digunakan bersamaan" #: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opsi>] [--] <repo> [<direktori>]" -#: builtin/clone.c:94 +#: builtin/clone.c:96 +msgid "don't clone shallow repository" +msgstr "jangan kloning repositori dangkal" + +#: builtin/clone.c:98 msgid "don't create a checkout" msgstr "jangan buat checkout" -#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541 msgid "create a bare repository" msgstr "buat repositori bare" -#: builtin/clone.c:99 +#: builtin/clone.c:103 msgid "create a mirror repository (implies bare)" msgstr "buat repositori cermin (implikasikan bare)" -#: builtin/clone.c:101 +#: builtin/clone.c:105 msgid "to clone from a local repository" msgstr "kloning dari repositori lokal" -#: builtin/clone.c:103 +#: builtin/clone.c:107 msgid "don't use local hardlinks, always copy" msgstr "jangan gunakan tautan keras lokal, selalu salin" -#: builtin/clone.c:105 +#: builtin/clone.c:109 msgid "setup as shared repository" msgstr "siapkan sebagai repositori berbagi" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "pathspec" msgstr "spek jalur" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "initialize submodules in the clone" msgstr "inisialisasi submodul dalam klon" -#: builtin/clone.c:111 +#: builtin/clone.c:115 msgid "number of submodules cloned in parallel" msgstr "jumlah submodul yang diklon secara paralel" -#: builtin/clone.c:112 builtin/init-db.c:552 +#: builtin/clone.c:116 builtin/init-db.c:538 msgid "template-directory" msgstr "direktori templat" -#: builtin/clone.c:113 builtin/init-db.c:553 +#: builtin/clone.c:117 builtin/init-db.c:539 msgid "directory from which templates will be used" msgstr "direktori dimana templat akan digunakan" -#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 -#: builtin/submodule--helper.c:2336 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832 +#: builtin/submodule--helper.c:2337 msgid "reference repository" msgstr "repositori rujukan" -#: builtin/clone.c:119 builtin/submodule--helper.c:1833 -#: builtin/submodule--helper.c:2338 +#: builtin/clone.c:123 builtin/submodule--helper.c:1834 +#: builtin/submodule--helper.c:2339 msgid "use --reference only while cloning" msgstr "gunakan --reference hanya pada saat kloning" -#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357 +#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495 +#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 msgid "name" msgstr "nama" -#: builtin/clone.c:121 +#: builtin/clone.c:125 msgid "use <name> instead of 'origin' to track upstream" msgstr "gunakan <nama> daripada 'origin' untuk lacak hulu" -#: builtin/clone.c:123 +#: builtin/clone.c:127 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checkout <cabang> daripada HEAD remote" -#: builtin/clone.c:125 +#: builtin/clone.c:129 msgid "path to git-upload-pack on the remote" msgstr "jalur ke git-upload-pack pada remote" -#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863 #: builtin/pull.c:208 msgid "depth" msgstr "kedalaman" -#: builtin/clone.c:127 +#: builtin/clone.c:131 msgid "create a shallow clone of that depth" msgstr "buat klon dangkal sedalam kedalaman tersebut" -#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804 #: builtin/pull.c:211 msgid "time" msgstr "waktu" -#: builtin/clone.c:129 +#: builtin/clone.c:133 msgid "create a shallow clone since a specific time" msgstr "buat klon dangkal sejak waktu yang disebutkan" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323 +#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318 msgid "revision" msgstr "revisi" -#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215 +#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "perdalam riwayat klon dangkal, tidak termasuk rev" -#: builtin/clone.c:133 builtin/submodule--helper.c:1843 -#: builtin/submodule--helper.c:2352 +#: builtin/clone.c:137 builtin/submodule--helper.c:1844 +#: builtin/submodule--helper.c:2353 msgid "clone only one branch, HEAD or --branch" msgstr "klon hanya satu cabang, HEAD atau --branch" -#: builtin/clone.c:135 +#: builtin/clone.c:139 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "jangan klon tag apapun, dan buat pengambilan nanti tidak mengikutinya" -#: builtin/clone.c:137 +#: builtin/clone.c:141 msgid "any cloned submodules will be shallow" msgstr "submodul yang diklon akan dangkal" -#: builtin/clone.c:138 builtin/init-db.c:561 +#: builtin/clone.c:142 builtin/init-db.c:547 msgid "gitdir" msgstr "direktori git" -#: builtin/clone.c:139 builtin/init-db.c:562 +#: builtin/clone.c:143 builtin/init-db.c:548 msgid "separate git dir from working tree" msgstr "pisahkan direktori git dari pohon kerja" -#: builtin/clone.c:140 +#: builtin/clone.c:144 msgid "key=value" msgstr "kunci=nilai" -#: builtin/clone.c:141 +#: builtin/clone.c:145 msgid "set config inside the new repository" msgstr "setel konfigurasi di dalam repositori baru" -#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 #: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "spesifik ke server" -#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 #: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "opsi untuk transmisi" -#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234 +#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 #: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "gunakan hanya alamat IPv4" -#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237 +#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 #: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "gunakan hanya alamat IPv6" -#: builtin/clone.c:150 +#: builtin/clone.c:154 msgid "any cloned submodules will use their remote-tracking branch" msgstr "submodul yang diklon akan menggunakan cabang yang melacak remotenya" -#: builtin/clone.c:152 +#: builtin/clone.c:156 msgid "initialize sparse-checkout file to include only files at root" msgstr "" "inisialisasi berkas checkout tipis agar memasukkan hanya berkas pada akar" -#: builtin/clone.c:288 +#: builtin/clone.c:292 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11989,42 +12342,42 @@ msgstr "" "Nama direktori tidak dapat ditebak.\n" "Mohon sebutkan direktori pada baris perintah" -#: builtin/clone.c:341 +#: builtin/clone.c:345 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Tidak dapat menambahkan alternatif untuk '%s': %s\n" -#: builtin/clone.c:414 +#: builtin/clone.c:418 #, c-format msgid "%s exists and is not a directory" msgstr "%s ada dan bukan direktori" -#: builtin/clone.c:432 +#: builtin/clone.c:436 #, c-format msgid "failed to start iterator over '%s'" msgstr "gagal memulai iterator pada '%s'" -#: builtin/clone.c:463 +#: builtin/clone.c:467 #, c-format msgid "failed to create link '%s'" msgstr "gagal membuat tautan '%s'" -#: builtin/clone.c:467 +#: builtin/clone.c:471 #, c-format msgid "failed to copy file to '%s'" msgstr "gagal menyalin berkas ke '%s'" -#: builtin/clone.c:472 +#: builtin/clone.c:476 #, c-format msgid "failed to iterate over '%s'" msgstr "gagal iterasi pada '%s'" -#: builtin/clone.c:499 +#: builtin/clone.c:503 #, c-format msgid "done.\n" msgstr "selesai.\n" -#: builtin/clone.c:513 +#: builtin/clone.c:517 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12034,105 +12387,105 @@ msgstr "" "Anda dapat periksa apa yang dicheckout dengan 'git status'\n" "dan coba lagi dengan 'git restore --source=HEAD :/'\n" -#: builtin/clone.c:590 +#: builtin/clone.c:594 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Tidak dapat menemukan cabang remote %s untuk diklon." -#: builtin/clone.c:709 +#: builtin/clone.c:713 #, c-format msgid "unable to update %s" msgstr "tidak dapat memperbarui %s" -#: builtin/clone.c:757 +#: builtin/clone.c:761 msgid "failed to initialize sparse-checkout" msgstr "gagal menginisalisasi checkout tipis" -#: builtin/clone.c:780 +#: builtin/clone.c:784 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD remote merujuk pada ref yang tidak ada, tidak dapat men-checkout.\n" -#: builtin/clone.c:812 +#: builtin/clone.c:816 msgid "unable to checkout working tree" msgstr "tidak dapat men-checkout pohon kerja" -#: builtin/clone.c:887 +#: builtin/clone.c:894 msgid "unable to write parameters to config file" msgstr "tidak dapat menulis parameter ke berkas konfigurasi" -#: builtin/clone.c:950 +#: builtin/clone.c:957 msgid "cannot repack to clean up" msgstr "tidak dapat memaket ulang untuk pembersihan" -#: builtin/clone.c:952 +#: builtin/clone.c:959 msgid "cannot unlink temporary alternates file" msgstr "tidak dapat batal-taut berkas alternatif sementara" -#: builtin/clone.c:993 builtin/receive-pack.c:2493 +#: builtin/clone.c:1001 builtin/receive-pack.c:2491 msgid "Too many arguments." msgstr "Terlalu banyak argumen." -#: builtin/clone.c:997 +#: builtin/clone.c:1005 msgid "You must specify a repository to clone." msgstr "Anda harus sebutkan repositori untuk diklon." -#: builtin/clone.c:1010 +#: builtin/clone.c:1018 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare dan --origin %s tidak kompatibel." -#: builtin/clone.c:1013 +#: builtin/clone.c:1021 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare dan --separate-git-dir tidak kompatibel." -#: builtin/clone.c:1026 +#: builtin/clone.c:1035 #, c-format msgid "repository '%s' does not exist" msgstr "repositori '%s' tidak ada" -#: builtin/clone.c:1030 builtin/fetch.c:1951 +#: builtin/clone.c:1039 builtin/fetch.c:2011 #, c-format msgid "depth %s is not a positive number" msgstr "kedalaman %s bukan bilangan positif" -#: builtin/clone.c:1040 +#: builtin/clone.c:1049 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "jalur tujuan '%s' sudah ada dan bukan direktori kosong" -#: builtin/clone.c:1046 +#: builtin/clone.c:1055 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "jalur repositori '%s' sudah ada dan bukan direktori kosong" -#: builtin/clone.c:1060 +#: builtin/clone.c:1069 #, c-format msgid "working tree '%s' already exists." msgstr "pohon kerja '%s' sudah ada." -#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271 -#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 +#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314 #, c-format msgid "could not create leading directories of '%s'" msgstr "tidak dapat membuat direktori pendahulu '%s'" -#: builtin/clone.c:1080 +#: builtin/clone.c:1089 #, c-format msgid "could not create work tree dir '%s'" msgstr "tidak dapat membuat direktori pohon kerja '%s'" -#: builtin/clone.c:1100 +#: builtin/clone.c:1109 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Kloning ke repositori bare '%s'...\n" -#: builtin/clone.c:1102 +#: builtin/clone.c:1111 #, c-format msgid "Cloning into '%s'...\n" msgstr "Kloning ke '%s'...\n" -#: builtin/clone.c:1126 +#: builtin/clone.c:1135 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -12140,43 +12493,43 @@ msgstr "" "clone --recursive tidak kompatibel dengan baik --reference dan --reference-" "if-able" -#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705 +#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' bukan nama remote yang valid" -#: builtin/clone.c:1211 +#: builtin/clone.c:1229 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth diabaikan di klon lokal; gunakan file:// sebagai gantinya." -#: builtin/clone.c:1213 +#: builtin/clone.c:1231 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since diabaikan di klon lokal; gunakan file:// sebagai gantinya." -#: builtin/clone.c:1215 +#: builtin/clone.c:1233 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude diabaikan di klon lokal; gunakan file:// sebagai gantinya." -#: builtin/clone.c:1217 +#: builtin/clone.c:1235 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter diabaikan di klon lokal; gunakan file:// sebagai gantinya." -#: builtin/clone.c:1220 +#: builtin/clone.c:1240 msgid "source repository is shallow, ignoring --local" msgstr "repositori sumber dangkal, abaikan --local" -#: builtin/clone.c:1225 +#: builtin/clone.c:1245 msgid "--local is ignored" msgstr "--local diabaikan" -#: builtin/clone.c:1315 builtin/clone.c:1323 +#: builtin/clone.c:1337 builtin/clone.c:1345 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Cabang remote %s tidak ditemukan di hulu %s" -#: builtin/clone.c:1326 +#: builtin/clone.c:1348 msgid "You appear to have cloned an empty repository." msgstr "Anda tampaknya mengklon repositori kosong." @@ -12193,19 +12546,19 @@ msgid "layout to use" msgstr "" #: builtin/column.c:30 -msgid "Maximum width" +msgid "maximum width" msgstr "" #: builtin/column.c:31 -msgid "Padding space on left border" +msgid "padding space on left border" msgstr "" #: builtin/column.c:32 -msgid "Padding space on right border" +msgid "padding space on right border" msgstr "" #: builtin/column.c:33 -msgid "Padding space between columns" +msgid "padding space between columns" msgstr "" #: builtin/column.c:51 @@ -12230,7 +12583,7 @@ msgid "could not find object directory matching %s" msgstr "" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768 +#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776 msgid "dir" msgstr "" @@ -12322,7 +12675,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559 #, c-format msgid "not a valid object name %s" msgstr "" @@ -12350,13 +12703,13 @@ msgstr "" msgid "id of a parent commit object" msgstr "" -#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537 -#: builtin/tag.c:445 +#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605 +#: builtin/tag.c:456 msgid "message" msgstr "" -#: builtin/commit-tree.c:115 builtin/commit.c:1504 +#: builtin/commit-tree.c:115 builtin/commit.c:1614 msgid "commit message" msgstr "" @@ -12364,7 +12717,7 @@ msgstr "" msgid "read commit log message from file" msgstr "" -#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299 +#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "" @@ -12379,11 +12732,11 @@ msgstr "" #: builtin/commit.c:41 msgid "git commit [<options>] [--] <pathspec>..." -msgstr "" +msgstr "git commit [<opsi>] [--] <spek jalur>..." #: builtin/commit.c:46 msgid "git status [<options>] [--] <pathspec>..." -msgstr "" +msgstr "git status [<opsi>] [--] <spek jalur>..." #: builtin/commit.c:51 msgid "" @@ -12391,6 +12744,10 @@ msgid "" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" +"Anda diminta untuk mengubah komit terkini, tetapi melakukan\n" +"hal itu akan membuat komit kosong. Anda dapat mengulangi perintah\n" +"dengan --allow-empty, atau Anda dapat menghapus keseluruhan komit\n" +"dengan \"git reset HEAD^\".\n" #: builtin/commit.c:56 msgid "" @@ -12400,14 +12757,19 @@ msgid "" " git commit --allow-empty\n" "\n" msgstr "" +"Petik ceri sebelumnya sekarang kosong, kemungkinan karena resolusi konflik.\n" +"Jika Anda ingin komit, gunakan:\n" +"\n" +" git commit --allow-empty\n" +"\n" #: builtin/commit.c:63 msgid "Otherwise, please use 'git rebase --skip'\n" -msgstr "" +msgstr "Selain itu, gunakan 'git rebase --skip'\n" #: builtin/commit.c:66 msgid "Otherwise, please use 'git cherry-pick --skip'\n" -msgstr "" +msgstr "Selain itu, gunakan 'git cherry-pick --skip'\n" #: builtin/commit.c:69 msgid "" @@ -12421,111 +12783,126 @@ msgid "" " git cherry-pick --skip\n" "\n" msgstr "" +"dan gunakan:\n" +"\n" +" git cherry-pick --continue\n" +"\n" +"untuk melanjutkan pemetikan ceri sisa komit.\n" +"Jika Anda ingin melewatkan komit ini, gunakan:\n" +" git cherry-pick --skip\n" +"\n" -#: builtin/commit.c:312 +#: builtin/commit.c:324 msgid "failed to unpack HEAD tree object" -msgstr "" +msgstr "gagal membuka objek pohon HEAD" -#: builtin/commit.c:348 +#: builtin/commit.c:360 msgid "--pathspec-from-file with -a does not make sense" -msgstr "" +msgstr "--pathspec-from-file dengan -a tidak masuk akal" -#: builtin/commit.c:361 +#: builtin/commit.c:374 msgid "No paths with --include/--only does not make sense." -msgstr "" +msgstr "Tanpa jalur dengan --include/--only tidak masuk akal." -#: builtin/commit.c:373 +#: builtin/commit.c:386 msgid "unable to create temporary index" -msgstr "" +msgstr "tidak dapat membuat indeks sementara" -#: builtin/commit.c:382 +#: builtin/commit.c:395 msgid "interactive add failed" -msgstr "" +msgstr "penambahan interaktif gagal" -#: builtin/commit.c:397 +#: builtin/commit.c:410 msgid "unable to update temporary index" -msgstr "" +msgstr "tidak dapat memperbarui indeks sementara" -#: builtin/commit.c:399 +#: builtin/commit.c:412 msgid "Failed to update main cache tree" -msgstr "" +msgstr "gagal memperbarui tembolok pohon utama" -#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 +#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508 msgid "unable to write new_index file" -msgstr "" +msgstr "tidak dapat menulis berkas indeks baru" -#: builtin/commit.c:476 +#: builtin/commit.c:489 msgid "cannot do a partial commit during a merge." -msgstr "" +msgstr "tidak dapat melakukan komit sebagian selama penggabungan." -#: builtin/commit.c:478 +#: builtin/commit.c:491 msgid "cannot do a partial commit during a cherry-pick." -msgstr "" +msgstr "tidak dapat melakukan komit sebagian selama pemetikan ceri." -#: builtin/commit.c:480 +#: builtin/commit.c:493 msgid "cannot do a partial commit during a rebase." -msgstr "" +msgstr "tidak dapat melakukan komit sebagian selama pendasaran ulang." -#: builtin/commit.c:488 +#: builtin/commit.c:501 msgid "cannot read the index" -msgstr "" +msgstr "tidak dapat membaca indeks" -#: builtin/commit.c:507 +#: builtin/commit.c:520 msgid "unable to write temporary index file" -msgstr "" +msgstr "tidak dapat menulis berkas indeks sementara" -#: builtin/commit.c:605 +#: builtin/commit.c:618 #, c-format msgid "commit '%s' lacks author header" -msgstr "" +msgstr "komit '%s' kurang kepala pengarang" -#: builtin/commit.c:607 +#: builtin/commit.c:620 #, c-format msgid "commit '%s' has malformed author line" -msgstr "" +msgstr "komit '%s' ada baris pengarang cacat" -#: builtin/commit.c:626 +#: builtin/commit.c:639 msgid "malformed --author parameter" -msgstr "" +msgstr "parameter --author cacat" -#: builtin/commit.c:679 +#: builtin/commit.c:692 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" +"tidak dapat memilih karakter komentar yang tidak terpakai\n" +"dalam pesan komit saat ini" -#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 +#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158 #, c-format msgid "could not lookup commit %s" -msgstr "" +msgstr "tidak dapat mencari komit %s" -#: builtin/commit.c:729 builtin/shortlog.c:413 +#: builtin/commit.c:758 builtin/shortlog.c:413 #, c-format msgid "(reading log message from standard input)\n" -msgstr "" +msgstr "(baca pesan log dari standar masukan)\n" -#: builtin/commit.c:731 +#: builtin/commit.c:760 msgid "could not read log from standard input" -msgstr "" +msgstr "tidak dapat membaca log dari standar masukan" -#: builtin/commit.c:735 +#: builtin/commit.c:764 #, c-format msgid "could not read log file '%s'" -msgstr "" +msgstr "tidak dapat membaca berkas log '%s'" + +#: builtin/commit.c:801 +#, c-format +msgid "cannot combine -m with --fixup:%s" +msgstr "tidak dapat menggabungkan -m dengan --fixup:%s" -#: builtin/commit.c:766 builtin/commit.c:782 +#: builtin/commit.c:813 builtin/commit.c:829 msgid "could not read SQUASH_MSG" -msgstr "" +msgstr "tidak dapat membaca SQUASH_MSG" -#: builtin/commit.c:773 +#: builtin/commit.c:820 msgid "could not read MERGE_MSG" -msgstr "" +msgstr "tidak dapat membaca MERGE_MSG" -#: builtin/commit.c:833 +#: builtin/commit.c:880 msgid "could not write commit template" -msgstr "" +msgstr "tidak dapat menulis templat komit" -#: builtin/commit.c:853 +#: builtin/commit.c:900 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -12533,8 +12910,13 @@ msgid "" "\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" +"\n" +"Sepertinya Anda mungkin mengkomit penggabungan.\n" +"Jika itu salah, mohon jalankan\n" +"\tgit update-ref -d MERGE_HEAD\n" +"dan coba lagi.\n" -#: builtin/commit.c:858 +#: builtin/commit.c:905 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -12542,555 +12924,631 @@ msgid "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" +"\n" +"Sepertinya Anda mungkin mengkomit petik ceri.\n" +"Jika it salah, mohon jalankan\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" +"dan coba lagi.\n" -#: builtin/commit.c:868 +#: builtin/commit.c:915 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" +"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n" +"dengan '%c' akan diabaikan, dan pesan kosong batalkan komit.\n" -#: builtin/commit.c:876 +#: builtin/commit.c:923 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" +"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n" +"dengan '%c' akan tetap; Anda dapat menghapus itu jika Anda mau.\n" +"Pesan kosong batalkan komit.\n" -#: builtin/commit.c:893 +#: builtin/commit.c:940 #, c-format msgid "%sAuthor: %.*s <%.*s>" -msgstr "" +msgstr "%sPengarang: %.*s <%.*s>" -#: builtin/commit.c:901 +#: builtin/commit.c:948 #, c-format msgid "%sDate: %s" -msgstr "" +msgstr "%sTanggal: %s" -#: builtin/commit.c:908 +#: builtin/commit.c:955 #, c-format msgid "%sCommitter: %.*s <%.*s>" -msgstr "" +msgstr "%sPengkomit: %.*s <%.*s>" -#: builtin/commit.c:926 +#: builtin/commit.c:973 msgid "Cannot read index" -msgstr "" +msgstr "Tidak dapat membaca indeks" -#: builtin/commit.c:997 +#: builtin/commit.c:1018 +msgid "unable to pass trailers to --trailers" +msgstr "tidak dapat melewatkan trailer ke --trailers" + +#: builtin/commit.c:1058 msgid "Error building trees" -msgstr "" +msgstr "Kesalahan membangun pohon" -#: builtin/commit.c:1011 builtin/tag.c:308 +#: builtin/commit.c:1072 builtin/tag.c:319 #, c-format msgid "Please supply the message using either -m or -F option.\n" -msgstr "" +msgstr "Mohon berikan pesan baik dengan opsi -m atau -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1116 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" +"--author '%s' bukan 'Nama <email>' dan tidak cocok dengan pengarang yang ada" -#: builtin/commit.c:1069 +#: builtin/commit.c:1130 #, c-format msgid "Invalid ignored mode '%s'" -msgstr "" +msgstr "Mode terabaikan '%s' tidak valid" -#: builtin/commit.c:1087 builtin/commit.c:1331 +#: builtin/commit.c:1148 builtin/commit.c:1441 #, c-format msgid "Invalid untracked files mode '%s'" -msgstr "" +msgstr "Mode berkas tak terlacak '%s' tidak valid" -#: builtin/commit.c:1127 +#: builtin/commit.c:1188 msgid "--long and -z are incompatible" +msgstr "--long dan -z tidak kompatibel" + +#: builtin/commit.c:1219 +msgid "You are in the middle of a merge -- cannot reword." +msgstr "Anda berada di tengah penggabungan -- tidak dapat menulis ulang." + +#: builtin/commit.c:1221 +msgid "You are in the middle of a cherry-pick -- cannot reword." +msgstr "Anda berada di tengah pemetikan ceri -- tidak dapat menulis ulang." + +#: builtin/commit.c:1224 +#, c-format +msgid "cannot combine reword option of --fixup with path '%s'" msgstr "" +"tidak dapat menggabungkan opsi penulisan ulang --fixup dengan jalur '%s'" -#: builtin/commit.c:1171 -msgid "Using both --reset-author and --author does not make sense" +#: builtin/commit.c:1226 +msgid "" +"reword option of --fixup is mutually exclusive with --patch/--interactive/--" +"all/--include/--only" msgstr "" -#: builtin/commit.c:1180 +#: builtin/commit.c:1245 +msgid "Using both --reset-author and --author does not make sense" +msgstr "Menggunakan baik --reset-author dan --author tidak masuk akal" + +#: builtin/commit.c:1254 msgid "You have nothing to amend." -msgstr "" +msgstr "Anda tidak punya apapun untuk diubah." -#: builtin/commit.c:1183 +#: builtin/commit.c:1257 msgid "You are in the middle of a merge -- cannot amend." -msgstr "" +msgstr "Anda berada di tengah penggabungan -- tidak dapat mengubah." -#: builtin/commit.c:1185 +#: builtin/commit.c:1259 msgid "You are in the middle of a cherry-pick -- cannot amend." -msgstr "" +msgstr "Anda berada di tengah pemetikan ceri -- tidak dapat mengubah." -#: builtin/commit.c:1187 +#: builtin/commit.c:1261 msgid "You are in the middle of a rebase -- cannot amend." -msgstr "" +msgstr "Anda berada di tengah pendasaran ulang -- tidak dapat mengubah." -#: builtin/commit.c:1190 +#: builtin/commit.c:1264 msgid "Options --squash and --fixup cannot be used together" -msgstr "" +msgstr "Opsi --squash dan --fixup tidak dapat digunakan bersamaan" -#: builtin/commit.c:1200 +#: builtin/commit.c:1274 msgid "Only one of -c/-C/-F/--fixup can be used." -msgstr "" +msgstr "Hanya salah satu dari -c/-C/-F/--fixup yang dapat digunakan." -#: builtin/commit.c:1202 +#: builtin/commit.c:1276 msgid "Option -m cannot be combined with -c/-C/-F." -msgstr "" +msgstr "Opsi -m tidak dapat digabung dengan -c/-C/-F." -#: builtin/commit.c:1211 +#: builtin/commit.c:1285 msgid "--reset-author can be used only with -C, -c or --amend." -msgstr "" +msgstr "--reset-author hanya dapat digunakan dengan -C, -c atau --amend." -#: builtin/commit.c:1229 +#: builtin/commit.c:1303 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" +"Hanya salah satu dari --include/--only/--all/--interactive/--patch yang " +"dapat digunakan." -#: builtin/commit.c:1235 +#: builtin/commit.c:1331 #, c-format -msgid "paths '%s ...' with -a does not make sense" +msgid "unknown option: --fixup=%s:%s" msgstr "" -#: builtin/commit.c:1366 builtin/commit.c:1527 +#: builtin/commit.c:1345 +#, c-format +msgid "paths '%s ...' with -a does not make sense" +msgstr "jalur '%s ...' dengan -a tidak masuk akal" + +#: builtin/commit.c:1476 builtin/commit.c:1642 msgid "show status concisely" -msgstr "" +msgstr "perlihatkan status dengan ringkas" -#: builtin/commit.c:1368 builtin/commit.c:1529 +#: builtin/commit.c:1478 builtin/commit.c:1644 msgid "show branch information" -msgstr "" +msgstr "perlihatkan informasi cabang" -#: builtin/commit.c:1370 +#: builtin/commit.c:1480 msgid "show stash information" -msgstr "" +msgstr "perlihatkan informasi stase" -#: builtin/commit.c:1372 builtin/commit.c:1531 +#: builtin/commit.c:1482 builtin/commit.c:1646 msgid "compute full ahead/behind values" -msgstr "" +msgstr "hitung nilai didepan/dibelakang penuh" -#: builtin/commit.c:1374 +#: builtin/commit.c:1484 msgid "version" -msgstr "" +msgstr "versi" -#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 -#: builtin/worktree.c:679 +#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560 +#: builtin/worktree.c:681 msgid "machine-readable output" msgstr "keluaran yang dapat dibaca mesin" -#: builtin/commit.c:1377 builtin/commit.c:1535 +#: builtin/commit.c:1487 builtin/commit.c:1650 msgid "show status in long format (default)" -msgstr "" +msgstr "perlihatkan status dalam format panjang (asali)" -#: builtin/commit.c:1380 builtin/commit.c:1538 +#: builtin/commit.c:1490 builtin/commit.c:1653 msgid "terminate entries with NUL" -msgstr "" +msgstr "akhiri entri dengan NUL" -#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656 #: builtin/fast-export.c:1198 builtin/fast-export.c:1201 -#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336 +#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 msgid "mode" -msgstr "" +msgstr "mode" -#: builtin/commit.c:1383 builtin/commit.c:1541 +#: builtin/commit.c:1493 builtin/commit.c:1656 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" +"perlihatkan berkas tak terlacak, mode opsional: all, normal, no. (Asali: all)" -#: builtin/commit.c:1387 +#: builtin/commit.c:1497 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" +"perlihatkan berkas terabaikan, mode opsional: traditional, matching, no. " +"(Asali: traditional)" -#: builtin/commit.c:1389 parse-options.h:192 +#: builtin/commit.c:1499 parse-options.h:193 msgid "when" -msgstr "" +msgstr "bila" -#: builtin/commit.c:1390 +#: builtin/commit.c:1500 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" +"abaikan perubahan submodul, bila opsional: all, dirty, untracked. (Asali: " +"all)" -#: builtin/commit.c:1392 +#: builtin/commit.c:1502 msgid "list untracked files in columns" -msgstr "" +msgstr "sebut berkas tak terlacak dalam kolom" -#: builtin/commit.c:1393 +#: builtin/commit.c:1503 msgid "do not detect renames" -msgstr "" +msgstr "jangan deteksi penggantian nama" -#: builtin/commit.c:1395 +#: builtin/commit.c:1505 msgid "detect renames, optionally set similarity index" -msgstr "" +msgstr "deteksi penggantian nama, setel indeks kemiripan secara opsional" -#: builtin/commit.c:1415 +#: builtin/commit.c:1525 msgid "Unsupported combination of ignored and untracked-files arguments" -msgstr "" +msgstr "Kombinasi argumen berkas terabaikan dan tak terlacak tidak didukung" -#: builtin/commit.c:1497 +#: builtin/commit.c:1607 msgid "suppress summary after successful commit" -msgstr "" +msgstr "sembunyikan rangkuman setelah komit berhasil" -#: builtin/commit.c:1498 +#: builtin/commit.c:1608 msgid "show diff in commit message template" -msgstr "" +msgstr "perlihatkan diff dalam templat pesan komit" -#: builtin/commit.c:1500 +#: builtin/commit.c:1610 msgid "Commit message options" -msgstr "" +msgstr "Opsi pesan komit" -#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447 +#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458 msgid "read message from file" -msgstr "" +msgstr "Baca pesan dari berkas" -#: builtin/commit.c:1502 +#: builtin/commit.c:1612 msgid "author" -msgstr "" +msgstr "pengarang" -#: builtin/commit.c:1502 +#: builtin/commit.c:1612 msgid "override author for commit" -msgstr "" +msgstr "timpa pengarang komit" -#: builtin/commit.c:1503 builtin/gc.c:550 +#: builtin/commit.c:1613 builtin/gc.c:550 msgid "date" -msgstr "" +msgstr "tangal" -#: builtin/commit.c:1503 +#: builtin/commit.c:1613 msgid "override date for commit" -msgstr "" +msgstr "timpa tanggal komit" -#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 -#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90 +#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622 +#: parse-options.h:329 ref-filter.h:90 msgid "commit" -msgstr "" +msgstr "komit" -#: builtin/commit.c:1505 +#: builtin/commit.c:1615 msgid "reuse and edit message from specified commit" -msgstr "" +msgstr "gunakan kembali dan sunting pesan dari komit tersebut" -#: builtin/commit.c:1506 +#: builtin/commit.c:1616 msgid "reuse message from specified commit" -msgstr "" +msgstr "gunakan kembali pesan dari komit tersebut" + +#. TRANSLATORS: Leave "[(amend|reword):]" as-is, +#. and only translate <commit>. +#. +#: builtin/commit.c:1621 +msgid "[(amend|reword):]commit" +msgstr "[(amend|reword):]komit" -#: builtin/commit.c:1507 -msgid "use autosquash formatted message to fixup specified commit" +#: builtin/commit.c:1621 +msgid "" +"use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" +"gunakan pesan terformat autosquash untuk perbaiki atau ubah/tulis ulang " +"komit yang disebutkan" -#: builtin/commit.c:1508 +#: builtin/commit.c:1622 msgid "use autosquash formatted message to squash specified commit" -msgstr "" +msgstr "gunakan pesan terformat autosquash untuk lumat komit tersebut" -#: builtin/commit.c:1509 +#: builtin/commit.c:1623 msgid "the commit is authored by me now (used with -C/-c/--amend)" +msgstr "komit sekarang dikarang olehku (gunakan dengan -C/-c/--amend)" + +#: builtin/commit.c:1624 builtin/interpret-trailers.c:111 +msgid "trailer" +msgstr "" + +#: builtin/commit.c:1624 +msgid "add custom trailer(s)" msgstr "" -#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302 +#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" -msgstr "" +msgstr "tambahkan trailer Signed-off-by" -#: builtin/commit.c:1511 +#: builtin/commit.c:1626 msgid "use specified template file" -msgstr "" +msgstr "gunakan templat berkas tersebut" -#: builtin/commit.c:1512 +#: builtin/commit.c:1627 msgid "force edit of commit" -msgstr "" +msgstr "paksa sunting komit" -#: builtin/commit.c:1514 +#: builtin/commit.c:1629 msgid "include status in commit message template" -msgstr "" +msgstr "masukkan status dalam templat pesaan komit" -#: builtin/commit.c:1519 +#: builtin/commit.c:1634 msgid "Commit contents options" -msgstr "" +msgstr "Opsi isi komit" -#: builtin/commit.c:1520 +#: builtin/commit.c:1635 msgid "commit all changed files" -msgstr "" +msgstr "komit semua berkas terubah" -#: builtin/commit.c:1521 +#: builtin/commit.c:1636 msgid "add specified files to index for commit" -msgstr "" +msgstr "tambahakn berkas tersebut ke indeks untuk dikomit" -#: builtin/commit.c:1522 +#: builtin/commit.c:1637 msgid "interactively add files" -msgstr "" +msgstr "tambah berkas secara interaktif" -#: builtin/commit.c:1523 +#: builtin/commit.c:1638 msgid "interactively add changes" -msgstr "" +msgstr "tambah perubahan secara interaktif" -#: builtin/commit.c:1524 +#: builtin/commit.c:1639 msgid "commit only specified files" -msgstr "" +msgstr "hanya komit berkas tersebut" -#: builtin/commit.c:1525 +#: builtin/commit.c:1640 msgid "bypass pre-commit and commit-msg hooks" -msgstr "" +msgstr "lewati hook pre-commit dan commit-msg" -#: builtin/commit.c:1526 +#: builtin/commit.c:1641 msgid "show what would be committed" -msgstr "" +msgstr "perlihatkan apa yang akan dikomit" -#: builtin/commit.c:1539 +#: builtin/commit.c:1654 msgid "amend previous commit" -msgstr "" +msgstr "ubah komit sebelumnya" -#: builtin/commit.c:1540 +#: builtin/commit.c:1655 msgid "bypass post-rewrite hook" -msgstr "" +msgstr "lewati hook post-rewrite" -#: builtin/commit.c:1547 +#: builtin/commit.c:1662 msgid "ok to record an empty change" -msgstr "" +msgstr "ok merekam perubahan kosong" -#: builtin/commit.c:1549 +#: builtin/commit.c:1664 msgid "ok to record a change with an empty message" -msgstr "" +msgstr "ok merekam perubahan dengan pesan kosong" -#: builtin/commit.c:1622 +#: builtin/commit.c:1737 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" -msgstr "" +msgstr "Berkas MERGE_HEAD (%s) rusak" -#: builtin/commit.c:1629 +#: builtin/commit.c:1744 msgid "could not read MERGE_MODE" -msgstr "" +msgstr "tidak dapat membaca MERGE_MODE" -#: builtin/commit.c:1650 +#: builtin/commit.c:1765 #, c-format msgid "could not read commit message: %s" -msgstr "" +msgstr "tidak dapat membaca pesan komit: %s" -#: builtin/commit.c:1657 +#: builtin/commit.c:1772 #, c-format msgid "Aborting commit due to empty commit message.\n" -msgstr "" +msgstr "Batalkan komit karena pesan komit kosong.\n" -#: builtin/commit.c:1662 +#: builtin/commit.c:1777 #, c-format msgid "Aborting commit; you did not edit the message.\n" -msgstr "" +msgstr "Batalkan komit; Anda tidak menyunting pesan.\n" -#: builtin/commit.c:1696 +#: builtin/commit.c:1788 +#, c-format +msgid "Aborting commit due to empty commit message body.\n" +msgstr "Batalkan komit karena badan pesan komit kosong.\n" + +#: builtin/commit.c:1824 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" +"repositori sudah diperbarui, tetapi tidak dapat menulis\n" +"berkas indeks baru. Periksa bahwa disk tidak penuh dan kuota\n" +"tidak terlampaui, lalu \"git restore --staged :/\" untuk pulihkan." #: builtin/config.c:11 msgid "git config [<options>]" -msgstr "" +msgstr "git config [<opsi>]" #: builtin/config.c:109 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" -msgstr "" +msgstr "argumen --type tidak dikenal %s" #: builtin/config.c:121 msgid "only one type at a time" -msgstr "" +msgstr "hanya satu tipe pada suatu saat" #: builtin/config.c:130 msgid "Config file location" -msgstr "" +msgstr "Lokasi berkas konfigurasi" #: builtin/config.c:131 msgid "use global config file" -msgstr "" +msgstr "gunakan berkas konfigurasi global" #: builtin/config.c:132 msgid "use system config file" -msgstr "" +msgstr "gunakan berkas konfigurasi sistem" #: builtin/config.c:133 msgid "use repository config file" -msgstr "" +msgstr "gunakan berkas konfigurasi repositori" #: builtin/config.c:134 msgid "use per-worktree config file" -msgstr "" +msgstr "gunakan berkas konfigurasi per pohon kerja" #: builtin/config.c:135 msgid "use given config file" -msgstr "" +msgstr "gunakan berkas konfigurasi yang diberikan" #: builtin/config.c:136 msgid "blob-id" -msgstr "" +msgstr "id blob" #: builtin/config.c:136 msgid "read config from given blob object" -msgstr "" +msgstr "baca konfigurasi dari objek blob yang diberikan" #: builtin/config.c:137 msgid "Action" -msgstr "" +msgstr "Tindakan" #: builtin/config.c:138 msgid "get value: name [value-pattern]" -msgstr "" +msgstr "dapatkan nilai: name [pola nilai]" #: builtin/config.c:139 msgid "get all values: key [value-pattern]" -msgstr "" +msgstr "dapatkan semua nilai: key [pola nilai]" #: builtin/config.c:140 msgid "get values for regexp: name-regex [value-pattern]" -msgstr "" +msgstr "dapatkan nilai dari regexp: name-regex [pola nilai]" #: builtin/config.c:141 msgid "get value specific for the URL: section[.var] URL" -msgstr "" +msgstr "dapatkan nilai spesifik untuk URL: section[.var] URL" #: builtin/config.c:142 msgid "replace all matching variables: name value [value-pattern]" -msgstr "" +msgstr "ganti semua variabel yang cocok: name value [pola nilai]" #: builtin/config.c:143 msgid "add a new variable: name value" -msgstr "" +msgstr "tambahkan variabel baru: name value" #: builtin/config.c:144 msgid "remove a variable: name [value-pattern]" -msgstr "" +msgstr "hapus variabel: name [pola nilai]" #: builtin/config.c:145 msgid "remove all matches: name [value-pattern]" -msgstr "" +msgstr "hapus semua cocokan: name [pola nilai]" #: builtin/config.c:146 msgid "rename section: old-name new-name" -msgstr "" +msgstr "ganti nama bagian: old-name new-name" #: builtin/config.c:147 msgid "remove a section: name" -msgstr "" +msgstr "hapus bagian: name" #: builtin/config.c:148 msgid "list all" -msgstr "" +msgstr "daftar semua" #: builtin/config.c:149 msgid "use string equality when comparing values to 'value-pattern'" -msgstr "" +msgstr "gunakan kesamaan untai ketika membandingkan nilai ke 'pola nilai'" #: builtin/config.c:150 msgid "open an editor" -msgstr "" +msgstr "buka penyunting" #: builtin/config.c:151 msgid "find the color configured: slot [default]" -msgstr "" +msgstr "temukan warna terkonfigurasi: slot [asali]" #: builtin/config.c:152 msgid "find the color setting: slot [stdout-is-tty]" -msgstr "" +msgstr "temukan setelan warna: slot [stdout-is-tty]" #: builtin/config.c:153 msgid "Type" -msgstr "" +msgstr "Tipe" #: builtin/config.c:154 builtin/env--helper.c:43 msgid "value is given this type" -msgstr "" +msgstr "Nilai diberikan tipe ini" #: builtin/config.c:155 msgid "value is \"true\" or \"false\"" -msgstr "" +msgstr "Nilai adala \"true\" atau \"false\"" #: builtin/config.c:156 msgid "value is decimal number" -msgstr "" +msgstr "nilai adalah angka desimal" #: builtin/config.c:157 msgid "value is --bool or --int" -msgstr "" +msgstr "nilai adalah --bool atau --int" #: builtin/config.c:158 msgid "value is --bool or string" -msgstr "" +msgstr "nilai adalah --bool atau untai" #: builtin/config.c:159 msgid "value is a path (file or directory name)" -msgstr "" +msgstr "nilai adalah jalur (nama berkas atau direktori)" #: builtin/config.c:160 msgid "value is an expiry date" -msgstr "" +msgstr "nilai adalah tanggal kadaluarsa" #: builtin/config.c:161 msgid "Other" -msgstr "" +msgstr "Lainnya" #: builtin/config.c:162 msgid "terminate values with NUL byte" -msgstr "" +msgstr "Akhiri nilai dengan bita NUL" #: builtin/config.c:163 msgid "show variable names only" -msgstr "" +msgstr "perlihatkan hanya nama variabel" #: builtin/config.c:164 msgid "respect include directives on lookup" -msgstr "" +msgstr "segani arahan masukkan pada pencarian" #: builtin/config.c:165 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" +"perlihatkan asal konfigurasi (berkas, masukan standar, blob, baris perintah)" #: builtin/config.c:166 msgid "show scope of config (worktree, local, global, system, command)" msgstr "" +"perlihatkan cakupan konfigurasi (pohon kerja, lokal, global, sistem, " +"perintah)" #: builtin/config.c:167 builtin/env--helper.c:45 msgid "value" -msgstr "" +msgstr "nilai" #: builtin/config.c:167 msgid "with --get, use default value when missing entry" -msgstr "" +msgstr "dengan --get, gunakan nilai asali ketika kehilangan entri" #: builtin/config.c:181 #, c-format msgid "wrong number of arguments, should be %d" -msgstr "" +msgstr "jumlah argumen salah, seharusnya %d" #: builtin/config.c:183 #, c-format msgid "wrong number of arguments, should be from %d to %d" -msgstr "" +msgstr "jumlah argumen salah, seharusnya dari %d ke %d" #: builtin/config.c:339 #, c-format msgid "invalid key pattern: %s" -msgstr "" +msgstr "pola kunci tidak valid: %s" #: builtin/config.c:377 #, c-format msgid "failed to format default config value: %s" -msgstr "" +msgstr "gagal memformat nilai konfigurasi asali: %s" #: builtin/config.c:441 #, c-format msgid "cannot parse color '%s'" -msgstr "" +msgstr "tidak dapat menguraikan warna '%s'" #: builtin/config.c:483 msgid "unable to parse default color value" -msgstr "" +msgstr "tidak dapat menguraikan nilai warna asali" #: builtin/config.c:536 builtin/config.c:833 msgid "not in a git directory" -msgstr "" +msgstr "bukan di dalam direktori git" #: builtin/config.c:539 msgid "writing to stdin is not supported" -msgstr "" +msgstr "menulis ke stdin tidak didukung" #: builtin/config.c:542 msgid "writing config blobs is not supported" -msgstr "" +msgstr "menulis blob konfigurasi tidak didukung" #: builtin/config.c:627 #, c-format @@ -13101,26 +13559,31 @@ msgid "" "#\tname = %s\n" "#\temail = %s\n" msgstr "" +"# Ini adalah berkas konfigurasi Git per pengguna.\n" +"[user]\n" +"# Mohon sesuaikan dan batal komen baris berikut:\n" +"#\tname = %s\n" +"#\temail = %s\n" #: builtin/config.c:652 msgid "only one config file at a time" -msgstr "" +msgstr "hanya satu berkas konfigurasi pada suatu saat" #: builtin/config.c:658 msgid "--local can only be used inside a git repository" -msgstr "" +msgstr "--local hanya dapat digunakan di dalam repositori git" #: builtin/config.c:660 msgid "--blob can only be used inside a git repository" -msgstr "" +msgstr "--blob hanya dapat digunakan di dalam repositori git" #: builtin/config.c:662 msgid "--worktree can only be used inside a git repository" -msgstr "" +msgstr "--worktree hanya dapat digunakan di dalam repositori git" #: builtin/config.c:684 msgid "$HOME not set" -msgstr "" +msgstr "$HOME tak disetel" #: builtin/config.c:708 msgid "" @@ -13128,54 +13591,59 @@ msgid "" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" "section in \"git help worktree\" for details" msgstr "" +"--worktree tidak dapat digunakan dengan banyak pohon kerja kecuali\n" +"konfigurasi ekstensi worktreeConfig diaktifkan. Mohon baca bagian\n" +"\"CONFIGURATION FILE\" di \"git help worktree\" untuk selengkapnya" #: builtin/config.c:743 msgid "--get-color and variable type are incoherent" -msgstr "" +msgstr "--get-color dan tipe variabel raban" #: builtin/config.c:748 msgid "only one action at a time" -msgstr "" +msgstr "hanya satu tindakan pada suatu saat" #: builtin/config.c:761 msgid "--name-only is only applicable to --list or --get-regexp" -msgstr "" +msgstr "--name-only hanya dapat diterapkan pada --list atau --get-regexp" #: builtin/config.c:767 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" +"--show-origin hanya dapat diterapkan pada --get, --get-all, --get-regexp, " +"dan --list" #: builtin/config.c:773 msgid "--default is only applicable to --get" -msgstr "" +msgstr "--default hanya dapat diterapkan pada --get" #: builtin/config.c:806 msgid "--fixed-value only applies with 'value-pattern'" -msgstr "" +msgstr "--fixed-value hanya diterapkan dengan 'pola nilai'" #: builtin/config.c:822 #, c-format msgid "unable to read config file '%s'" -msgstr "" +msgstr "tidak dapat membaca berkas konfigurasi '%s'" #: builtin/config.c:825 msgid "error processing config file(s)" -msgstr "" +msgstr "kesalahan memproses berkas konfigurasi" #: builtin/config.c:835 msgid "editing stdin is not supported" -msgstr "" +msgstr "menyunting stdin tidak didukung" #: builtin/config.c:837 msgid "editing blobs is not supported" -msgstr "" +msgstr "menyunting blob tidak didukung" #: builtin/config.c:851 #, c-format msgid "cannot create configuration file %s" -msgstr "" +msgstr "tidak dapat membuat berkas konfigurasi %s" #: builtin/config.c:864 #, c-format @@ -13183,11 +13651,13 @@ msgid "" "cannot overwrite multiple values with a single value\n" " Use a regexp, --add or --replace-all to change %s." msgstr "" +"tidak dapat menimpa banyak nilai dengan nilai tunggal\n" +" Gunakan regexp, --add atau --replace-all untuk mengubah %s." #: builtin/config.c:943 builtin/config.c:954 #, c-format msgid "no such section: %s" -msgstr "" +msgstr "tidak ada bagian seperti: %s" #: builtin/count-objects.c:90 msgid "git count-objects [-v] [-H | --human-readable]" @@ -13197,7 +13667,7 @@ msgstr "" msgid "print sizes in human readable format" msgstr "" -#: builtin/credential-cache--daemon.c:226 +#: builtin/credential-cache--daemon.c:227 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -13206,11 +13676,11 @@ msgid "" "\tchmod 0700 %s" msgstr "" -#: builtin/credential-cache--daemon.c:275 +#: builtin/credential-cache--daemon.c:276 msgid "print debugging messages to stderr" msgstr "" -#: builtin/credential-cache--daemon.c:315 +#: builtin/credential-cache--daemon.c:316 msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "" @@ -13408,7 +13878,7 @@ msgstr "" msgid "Not a git repository" msgstr "" -#: builtin/diff.c:532 builtin/grep.c:682 +#: builtin/diff.c:532 builtin/grep.c:684 #, c-format msgid "invalid object '%s' given." msgstr "" @@ -13428,113 +13898,113 @@ msgstr "" msgid "%s...%s: multiple merge bases, using %s" msgstr "" -#: builtin/difftool.c:30 +#: builtin/difftool.c:31 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" -#: builtin/difftool.c:260 +#: builtin/difftool.c:261 #, c-format msgid "failed: %d" msgstr "" -#: builtin/difftool.c:302 +#: builtin/difftool.c:303 #, c-format msgid "could not read symlink %s" msgstr "" -#: builtin/difftool.c:304 +#: builtin/difftool.c:305 #, c-format msgid "could not read symlink file %s" msgstr "" -#: builtin/difftool.c:312 +#: builtin/difftool.c:313 #, c-format msgid "could not read object %s for symlink %s" msgstr "" -#: builtin/difftool.c:412 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "" -#: builtin/difftool.c:633 +#: builtin/difftool.c:637 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "" -#: builtin/difftool.c:635 +#: builtin/difftool.c:639 msgid "working tree file has been left." msgstr "" -#: builtin/difftool.c:646 +#: builtin/difftool.c:650 #, c-format msgid "temporary files exist in '%s'." msgstr "" -#: builtin/difftool.c:647 +#: builtin/difftool.c:651 msgid "you may want to cleanup or recover these." msgstr "" -#: builtin/difftool.c:696 +#: builtin/difftool.c:700 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "" -#: builtin/difftool.c:698 +#: builtin/difftool.c:702 msgid "perform a full-directory diff" msgstr "" -#: builtin/difftool.c:700 +#: builtin/difftool.c:704 msgid "do not prompt before launching a diff tool" msgstr "" -#: builtin/difftool.c:705 +#: builtin/difftool.c:709 msgid "use symlinks in dir-diff mode" msgstr "" -#: builtin/difftool.c:706 +#: builtin/difftool.c:710 msgid "tool" msgstr "" -#: builtin/difftool.c:707 +#: builtin/difftool.c:711 msgid "use the specified diff tool" msgstr "" -#: builtin/difftool.c:709 +#: builtin/difftool.c:713 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" -#: builtin/difftool.c:712 +#: builtin/difftool.c:716 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" -#: builtin/difftool.c:715 +#: builtin/difftool.c:719 msgid "specify a custom command for viewing diffs" msgstr "" -#: builtin/difftool.c:716 +#: builtin/difftool.c:720 msgid "passed to `diff`" msgstr "" -#: builtin/difftool.c:731 +#: builtin/difftool.c:735 msgid "difftool requires worktree or --no-index" msgstr "" -#: builtin/difftool.c:738 +#: builtin/difftool.c:742 msgid "--dir-diff is incompatible with --no-index" msgstr "" -#: builtin/difftool.c:741 +#: builtin/difftool.c:745 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "" -#: builtin/difftool.c:749 +#: builtin/difftool.c:753 msgid "no <tool> given for --tool=<tool>" msgstr "" -#: builtin/difftool.c:756 +#: builtin/difftool.c:760 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "" @@ -13622,7 +14092,7 @@ msgstr "" msgid "skip output of blob data" msgstr "" -#: builtin/fast-export.c:1222 builtin/log.c:1815 +#: builtin/fast-export.c:1222 builtin/log.c:1823 msgid "refspec" msgstr "" @@ -13712,96 +14182,100 @@ msgstr "git fetch --multiple [<opsi>] [(<repositori> | <grup>)]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opsi>]" -#: builtin/fetch.c:120 +#: builtin/fetch.c:122 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel tidak dapat bernilai negatif" -#: builtin/fetch.c:143 builtin/pull.c:185 +#: builtin/fetch.c:145 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "ambil dari semua remote" -#: builtin/fetch.c:145 builtin/pull.c:245 +#: builtin/fetch.c:147 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "setel hulu untuk git pull/fetch" -#: builtin/fetch.c:147 builtin/pull.c:188 +#: builtin/fetch.c:149 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "tambah ke .git/FETCH_HEAD daripada timpa" -#: builtin/fetch.c:149 +#: builtin/fetch.c:151 msgid "use atomic transaction to update references" msgstr "" -#: builtin/fetch.c:151 builtin/pull.c:191 +#: builtin/fetch.c:153 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "jalur ke paket unggah pada sisi remote" -#: builtin/fetch.c:152 +#: builtin/fetch.c:154 msgid "force overwrite of local reference" msgstr "paksa timpa referensi lokal" -#: builtin/fetch.c:154 +#: builtin/fetch.c:156 msgid "fetch from multiple remotes" msgstr "ambil dari banyak remote" -#: builtin/fetch.c:156 builtin/pull.c:195 +#: builtin/fetch.c:158 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "ambil semua tag dan objek yang bersesuaian" -#: builtin/fetch.c:158 +#: builtin/fetch.c:160 msgid "do not fetch all tags (--no-tags)" msgstr "jangan ambil semua tag (--no-tags)" -#: builtin/fetch.c:160 +#: builtin/fetch.c:162 msgid "number of submodules fetched in parallel" msgstr "jumlah submodul yang diambil secara bersamaan" -#: builtin/fetch.c:162 builtin/pull.c:198 +#: builtin/fetch.c:164 +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "" + +#: builtin/fetch.c:166 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "buang cabang pelacak remote yang tidak ada pada remote" -#: builtin/fetch.c:164 +#: builtin/fetch.c:168 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "buang tag lokal yang tidak ada pada remote dan klob tag yang berubah" -#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122 +#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122 msgid "on-demand" msgstr "sesuai permintaan" -#: builtin/fetch.c:166 +#: builtin/fetch.c:170 msgid "control recursive fetching of submodules" msgstr "kontrol pengambilan submodul rekursif" -#: builtin/fetch.c:171 +#: builtin/fetch.c:175 msgid "write fetched references to the FETCH_HEAD file" msgstr "tulis referensi yang diambil ke berkas FETCH_HEAD" -#: builtin/fetch.c:172 builtin/pull.c:206 +#: builtin/fetch.c:176 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "simpan paket yang diunduh" -#: builtin/fetch.c:174 +#: builtin/fetch.c:178 msgid "allow updating of HEAD ref" msgstr "bolehkan perbarui referensi HEAD" -#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209 +#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "perdalam riwayat klon dangkal" -#: builtin/fetch.c:179 builtin/pull.c:212 +#: builtin/fetch.c:183 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "perdalam riwayat repositori dangkal berdasarkan waktu" -#: builtin/fetch.c:185 builtin/pull.c:221 +#: builtin/fetch.c:189 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "ubah ke repositori penuh" -#: builtin/fetch.c:188 +#: builtin/fetch.c:192 msgid "prepend this to submodule path output" msgstr "tambahkan ini ke jalur keluaran submodul" -#: builtin/fetch.c:191 +#: builtin/fetch.c:195 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -13809,99 +14283,103 @@ msgstr "" "default untuk ambil submodul secara rekursif (prioritas lebih rendah " "dariberkas konfigurasi)" -#: builtin/fetch.c:195 builtin/pull.c:224 +#: builtin/fetch.c:199 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "terima referensi yang memperbarui .git/shallow" -#: builtin/fetch.c:196 builtin/pull.c:226 +#: builtin/fetch.c:200 builtin/pull.c:226 msgid "refmap" msgstr "peta referensi" -#: builtin/fetch.c:197 builtin/pull.c:227 +#: builtin/fetch.c:201 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "sebutkan ambil peta referensi" -#: builtin/fetch.c:204 builtin/pull.c:240 +#: builtin/fetch.c:208 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "" "laporkan bahwa kami hanya punya object yang bisa dicapai dari objek ini" -#: builtin/fetch.c:207 builtin/fetch.c:209 +#: builtin/fetch.c:210 +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "" + +#: builtin/fetch.c:213 builtin/fetch.c:215 msgid "run 'maintenance --auto' after fetching" msgstr "lakukan 'maintenance --auto' setelah pengambilan" -#: builtin/fetch.c:211 builtin/pull.c:243 +#: builtin/fetch.c:217 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "periksa pembaruan terpaksa pada semua cabang" -#: builtin/fetch.c:213 +#: builtin/fetch.c:219 msgid "write the commit-graph after fetching" msgstr "tulis grafik komit setelah pengambilan" -#: builtin/fetch.c:215 +#: builtin/fetch.c:221 msgid "accept refspecs from stdin" msgstr "terima spek referensi dari masukan standar" -#: builtin/fetch.c:526 +#: builtin/fetch.c:586 msgid "Couldn't find remote ref HEAD" msgstr "tidak dapat menemukan referensi remote HEAD" -#: builtin/fetch.c:697 +#: builtin/fetch.c:757 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "konfigurasi fetch.output berisi nilai tidak valid %s" -#: builtin/fetch.c:796 +#: builtin/fetch.c:856 #, c-format msgid "object %s not found" msgstr "objek %s tidak ditemukan" -#: builtin/fetch.c:800 +#: builtin/fetch.c:860 msgid "[up to date]" msgstr "[terkini]" -#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901 +#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961 msgid "[rejected]" msgstr "[tertolak]" -#: builtin/fetch.c:814 +#: builtin/fetch.c:874 msgid "can't fetch in current branch" msgstr "tidak dapat mengambil di cabang saat ini" -#: builtin/fetch.c:824 +#: builtin/fetch.c:884 msgid "[tag update]" msgstr "[pembaruan tag]" -#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884 -#: builtin/fetch.c:896 +#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944 +#: builtin/fetch.c:956 msgid "unable to update local ref" msgstr "tidak dapat memperbarui referensi lokal" -#: builtin/fetch.c:829 +#: builtin/fetch.c:889 msgid "would clobber existing tag" msgstr "akan klob tag yang ada" -#: builtin/fetch.c:851 +#: builtin/fetch.c:911 msgid "[new tag]" msgstr "[tag baru]" -#: builtin/fetch.c:854 +#: builtin/fetch.c:914 msgid "[new branch]" msgstr "[cabang baru]" -#: builtin/fetch.c:857 +#: builtin/fetch.c:917 msgid "[new ref]" msgstr "[referensi baru]" -#: builtin/fetch.c:896 +#: builtin/fetch.c:956 msgid "forced update" msgstr "pembaruan terpaksa" -#: builtin/fetch.c:901 +#: builtin/fetch.c:961 msgid "non-fast-forward" msgstr "bukan-maju-cepat" -#: builtin/fetch.c:1005 +#: builtin/fetch.c:1065 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -13912,7 +14390,7 @@ msgstr "" "'--show-forced-updates' atau jalankan 'git config fetch.showForcedUpdates " "true'." -#: builtin/fetch.c:1009 +#: builtin/fetch.c:1069 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -13925,22 +14403,22 @@ msgstr "" "'git config fetch.showForcedUpdates false'\n" " untuk menghindari pemeriksaan ini.\n" -#: builtin/fetch.c:1041 +#: builtin/fetch.c:1101 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s tidak mengirim semua objek yang diperlukan\n" -#: builtin/fetch.c:1069 +#: builtin/fetch.c:1129 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "tolak %s karena akar dangkal tidak diperkenankan untuk diperbarui" -#: builtin/fetch.c:1146 builtin/fetch.c:1297 +#: builtin/fetch.c:1206 builtin/fetch.c:1357 #, c-format msgid "From %.*s\n" msgstr "Dari %.*s\n" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1228 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13949,56 +14427,56 @@ msgstr "" "beberapa referensi lokal tidak dapat diperbarui; coba jalankan\n" " 'git remote prune %s' untuk hapus cabang yang lama dan berkonflik" -#: builtin/fetch.c:1267 +#: builtin/fetch.c:1327 #, c-format msgid " (%s will become dangling)" msgstr " (%s akan menjadi terjuntai)" -#: builtin/fetch.c:1268 +#: builtin/fetch.c:1328 #, c-format msgid " (%s has become dangling)" msgstr " (%s telah menjadi terjuntai)" -#: builtin/fetch.c:1300 +#: builtin/fetch.c:1360 msgid "[deleted]" msgstr "[dihapus]" -#: builtin/fetch.c:1301 builtin/remote.c:1118 +#: builtin/fetch.c:1361 builtin/remote.c:1118 msgid "(none)" msgstr "(tidak ada)" -#: builtin/fetch.c:1324 +#: builtin/fetch.c:1384 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Tolak mengambil ke cabang saat ini %s dari repositori non-bare" -#: builtin/fetch.c:1343 +#: builtin/fetch.c:1403 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Opsi \"%s\" nilai \"%s\" tidak valid untuk %s" -#: builtin/fetch.c:1346 +#: builtin/fetch.c:1406 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Opsi \"%s\" diabaikan untuk %s\n" -#: builtin/fetch.c:1558 +#: builtin/fetch.c:1618 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "banyak cabang terdeteksi, tidak kompatibel dengan --set-upstream" -#: builtin/fetch.c:1573 +#: builtin/fetch.c:1633 msgid "not setting upstream for a remote remote-tracking branch" msgstr "tidak setel hulu untuk cabang remote pelacak remote" -#: builtin/fetch.c:1575 +#: builtin/fetch.c:1635 msgid "not setting upstream for a remote tag" msgstr "tidak setel hulu untuk tag remote" -#: builtin/fetch.c:1577 +#: builtin/fetch.c:1637 msgid "unknown branch type" msgstr "tipe cabang tidak diketahui" -#: builtin/fetch.c:1579 +#: builtin/fetch.c:1639 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -14006,22 +14484,22 @@ msgstr "" "cabang sumber tidak ditemukan.\n" "Anda harus sebutkan tepat satu cabang dengan opsi --set-upstream." -#: builtin/fetch.c:1708 builtin/fetch.c:1771 +#: builtin/fetch.c:1768 builtin/fetch.c:1831 #, c-format msgid "Fetching %s\n" msgstr "Mengambil %s\n" -#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101 +#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Tidak dapat mengambil %s" -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1790 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "tidak dapat mengambil '%s' (kode keluar: %d)\n" -#: builtin/fetch.c:1834 +#: builtin/fetch.c:1894 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14029,44 +14507,52 @@ msgstr "" "Repositori remot tidak disebutkan. Mohon sebutkan baik URL atau nama\n" "cabang yang mana revisi baru sebaiknya diambil." -#: builtin/fetch.c:1870 +#: builtin/fetch.c:1930 msgid "You need to specify a tag name." msgstr "Anda perlu sebutkan nama tag" -#: builtin/fetch.c:1935 +#: builtin/fetch.c:1995 msgid "Negative depth in --deepen is not supported" msgstr "Kedalaman negatif di --deepen tidak didukung" -#: builtin/fetch.c:1937 +#: builtin/fetch.c:1997 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen dan --depth saling eksklusif" -#: builtin/fetch.c:1942 +#: builtin/fetch.c:2002 msgid "--depth and --unshallow cannot be used together" msgstr "--depth dan --unshallow tidak dapat digunakan bersamaan" -#: builtin/fetch.c:1944 +#: builtin/fetch.c:2004 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow pada repositori penuh tidak masuk akal" -#: builtin/fetch.c:1961 +#: builtin/fetch.c:2021 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tidak mengambil argumen repositori" -#: builtin/fetch.c:1963 +#: builtin/fetch.c:2023 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all tidak masuk akal dengan spek referensi" -#: builtin/fetch.c:1972 +#: builtin/fetch.c:2032 #, c-format msgid "No such remote or remote group: %s" msgstr "tidak ada remote atau grup remote seperti itu: %s" -#: builtin/fetch.c:1979 +#: builtin/fetch.c:2039 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Ambil grup dan sebutkan spek referensi tidak masuk akal" -#: builtin/fetch.c:1997 +#: builtin/fetch.c:2055 +msgid "must supply remote when using --negotiate-only" +msgstr "" + +#: builtin/fetch.c:2060 +msgid "Protocol does not support --negotiate-only, exiting." +msgstr "" + +#: builtin/fetch.c:2079 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -14074,11 +14560,11 @@ msgstr "" "--filter hanya dapat digunakan dengan remote yang terkonfigurasi di " "extensions.partialclone" -#: builtin/fetch.c:2001 +#: builtin/fetch.c:2083 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic hanya dapat digunakan saat mengambil dari satu remote" -#: builtin/fetch.c:2005 +#: builtin/fetch.c:2087 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin hanya dapat digunakan saat mengambil dari satu remote" @@ -14123,47 +14609,47 @@ msgstr "" msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "" -#: builtin/for-each-ref.c:28 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:30 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:32 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:34 +#: builtin/for-each-ref.c:36 msgid "quote placeholders suitably for Tcl" msgstr "" -#: builtin/for-each-ref.c:37 +#: builtin/for-each-ref.c:39 msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:39 builtin/tag.c:472 +#: builtin/for-each-ref.c:41 builtin/tag.c:483 msgid "respect format colors" msgstr "" -#: builtin/for-each-ref.c:42 +#: builtin/for-each-ref.c:44 msgid "print only refs which points at the given object" msgstr "" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:46 msgid "print only refs that are merged" msgstr "" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:47 msgid "print only refs that are not merged" msgstr "" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:48 msgid "print only refs which contain the commit" msgstr "" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:49 msgid "print only refs which don't contain the commit" msgstr "" @@ -14183,243 +14669,243 @@ msgstr "" msgid "missing --config=<config>" msgstr "" -#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131 +#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128 msgid "unknown" msgstr "" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:83 builtin/fsck.c:103 +#: builtin/fsck.c:78 builtin/fsck.c:100 #, c-format msgid "error in %s %s: %s" msgstr "" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:97 +#: builtin/fsck.c:94 #, c-format msgid "warning in %s %s: %s" msgstr "" -#: builtin/fsck.c:126 builtin/fsck.c:129 +#: builtin/fsck.c:123 builtin/fsck.c:126 #, c-format msgid "broken link from %7s %s" msgstr "" -#: builtin/fsck.c:138 +#: builtin/fsck.c:135 msgid "wrong object type in link" msgstr "" -#: builtin/fsck.c:154 +#: builtin/fsck.c:151 #, c-format msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" -#: builtin/fsck.c:265 +#: builtin/fsck.c:263 #, c-format msgid "missing %s %s" msgstr "" -#: builtin/fsck.c:292 +#: builtin/fsck.c:290 #, c-format msgid "unreachable %s %s" msgstr "" -#: builtin/fsck.c:312 +#: builtin/fsck.c:310 #, c-format msgid "dangling %s %s" msgstr "" -#: builtin/fsck.c:322 +#: builtin/fsck.c:320 msgid "could not create lost-found" msgstr "" -#: builtin/fsck.c:333 +#: builtin/fsck.c:331 #, c-format msgid "could not finish '%s'" msgstr "" -#: builtin/fsck.c:350 +#: builtin/fsck.c:348 #, c-format msgid "Checking %s" msgstr "" -#: builtin/fsck.c:388 +#: builtin/fsck.c:386 #, c-format msgid "Checking connectivity (%d objects)" msgstr "" -#: builtin/fsck.c:407 +#: builtin/fsck.c:405 #, c-format msgid "Checking %s %s" msgstr "" -#: builtin/fsck.c:412 +#: builtin/fsck.c:410 msgid "broken links" msgstr "" -#: builtin/fsck.c:421 +#: builtin/fsck.c:419 #, c-format msgid "root %s" msgstr "" -#: builtin/fsck.c:429 +#: builtin/fsck.c:427 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "" -#: builtin/fsck.c:458 +#: builtin/fsck.c:456 #, c-format msgid "%s: object corrupt or missing" msgstr "" -#: builtin/fsck.c:483 +#: builtin/fsck.c:481 #, c-format msgid "%s: invalid reflog entry %s" msgstr "" -#: builtin/fsck.c:497 +#: builtin/fsck.c:495 #, c-format msgid "Checking reflog %s->%s" msgstr "" -#: builtin/fsck.c:531 +#: builtin/fsck.c:529 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "" -#: builtin/fsck.c:538 +#: builtin/fsck.c:536 #, c-format msgid "%s: not a commit" msgstr "" -#: builtin/fsck.c:592 +#: builtin/fsck.c:590 msgid "notice: No default references" msgstr "" -#: builtin/fsck.c:607 +#: builtin/fsck.c:605 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "" -#: builtin/fsck.c:620 +#: builtin/fsck.c:618 #, c-format msgid "%s: object could not be parsed: %s" msgstr "" -#: builtin/fsck.c:640 +#: builtin/fsck.c:638 #, c-format msgid "bad sha1 file: %s" msgstr "" -#: builtin/fsck.c:655 +#: builtin/fsck.c:653 msgid "Checking object directory" msgstr "" -#: builtin/fsck.c:658 +#: builtin/fsck.c:656 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:673 +#: builtin/fsck.c:671 #, c-format msgid "Checking %s link" msgstr "" -#: builtin/fsck.c:678 builtin/index-pack.c:865 +#: builtin/fsck.c:676 builtin/index-pack.c:866 #, c-format msgid "invalid %s" msgstr "%s tidak valid" -#: builtin/fsck.c:685 +#: builtin/fsck.c:683 #, c-format msgid "%s points to something strange (%s)" msgstr "" -#: builtin/fsck.c:691 +#: builtin/fsck.c:689 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "" -#: builtin/fsck.c:695 +#: builtin/fsck.c:693 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "" -#: builtin/fsck.c:707 +#: builtin/fsck.c:705 msgid "Checking cache tree" msgstr "" -#: builtin/fsck.c:712 +#: builtin/fsck.c:710 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "" -#: builtin/fsck.c:721 +#: builtin/fsck.c:719 msgid "non-tree in cache-tree" msgstr "" -#: builtin/fsck.c:752 +#: builtin/fsck.c:750 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:758 +#: builtin/fsck.c:756 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:759 +#: builtin/fsck.c:757 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:760 +#: builtin/fsck.c:758 msgid "report tags" msgstr "" -#: builtin/fsck.c:761 +#: builtin/fsck.c:759 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:762 +#: builtin/fsck.c:760 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:763 +#: builtin/fsck.c:761 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:764 +#: builtin/fsck.c:762 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:765 +#: builtin/fsck.c:763 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:766 builtin/mktag.c:78 +#: builtin/fsck.c:764 builtin/mktag.c:75 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:768 +#: builtin/fsck.c:766 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:769 builtin/prune.c:134 +#: builtin/fsck.c:767 builtin/prune.c:134 msgid "show progress" msgstr "" -#: builtin/fsck.c:770 +#: builtin/fsck.c:768 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:829 builtin/index-pack.c:261 +#: builtin/fsck.c:827 builtin/index-pack.c:262 msgid "Checking objects" msgstr "Memeriksa objek" -#: builtin/fsck.c:857 +#: builtin/fsck.c:855 #, c-format msgid "%s: object missing" msgstr "" -#: builtin/fsck.c:868 +#: builtin/fsck.c:866 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "" @@ -14438,12 +14924,12 @@ msgstr "" msgid "failed to parse '%s' value '%s'" msgstr "" -#: builtin/gc.c:487 builtin/init-db.c:58 +#: builtin/gc.c:487 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562 +#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573 #, c-format msgid "cannot read '%s'" msgstr "" @@ -14532,140 +15018,143 @@ msgstr "" msgid "failed to write commit-graph" msgstr "" -#: builtin/gc.c:914 -msgid "failed to fill remotes" +#: builtin/gc.c:905 +msgid "failed to prefetch remotes" msgstr "" -#: builtin/gc.c:1037 +#: builtin/gc.c:1022 msgid "failed to start 'git pack-objects' process" msgstr "" -#: builtin/gc.c:1054 +#: builtin/gc.c:1039 msgid "failed to finish 'git pack-objects' process" msgstr "" -#: builtin/gc.c:1106 +#: builtin/gc.c:1091 msgid "failed to write multi-pack-index" msgstr "" -#: builtin/gc.c:1124 +#: builtin/gc.c:1109 msgid "'git multi-pack-index expire' failed" msgstr "" -#: builtin/gc.c:1185 +#: builtin/gc.c:1170 msgid "'git multi-pack-index repack' failed" msgstr "" -#: builtin/gc.c:1194 +#: builtin/gc.c:1179 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" -#: builtin/gc.c:1298 +#: builtin/gc.c:1283 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "" -#: builtin/gc.c:1328 +#: builtin/gc.c:1313 #, c-format msgid "task '%s' failed" msgstr "" -#: builtin/gc.c:1410 +#: builtin/gc.c:1395 #, c-format msgid "'%s' is not a valid task" msgstr "" -#: builtin/gc.c:1415 +#: builtin/gc.c:1400 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "" -#: builtin/gc.c:1430 +#: builtin/gc.c:1415 msgid "run tasks based on the state of the repository" msgstr "" -#: builtin/gc.c:1431 +#: builtin/gc.c:1416 msgid "frequency" msgstr "" -#: builtin/gc.c:1432 +#: builtin/gc.c:1417 msgid "run tasks based on frequency" msgstr "" -#: builtin/gc.c:1435 +#: builtin/gc.c:1420 msgid "do not report progress or other information over stderr" msgstr "" -#: builtin/gc.c:1436 +#: builtin/gc.c:1421 msgid "task" msgstr "" -#: builtin/gc.c:1437 +#: builtin/gc.c:1422 msgid "run a specific task" msgstr "" -#: builtin/gc.c:1454 +#: builtin/gc.c:1439 msgid "use at most one of --auto and --schedule=<frequency>" msgstr "" -#: builtin/gc.c:1497 +#: builtin/gc.c:1482 msgid "failed to run 'git config'" msgstr "" -#: builtin/gc.c:1562 +#: builtin/gc.c:1547 +#, c-format msgid "failed to expand path '%s'" msgstr "" -#: builtin/gc.c:1591 +#: builtin/gc.c:1576 msgid "failed to start launchctl" msgstr "" -#: builtin/gc.c:1628 +#: builtin/gc.c:1613 +#, c-format msgid "failed to create directories for '%s'" msgstr "" -#: builtin/gc.c:1689 +#: builtin/gc.c:1674 +#, c-format msgid "failed to bootstrap service %s" msgstr "" -#: builtin/gc.c:1760 +#: builtin/gc.c:1745 msgid "failed to create temp xml file" msgstr "" -#: builtin/gc.c:1850 +#: builtin/gc.c:1835 msgid "failed to start schtasks" msgstr "" -#: builtin/gc.c:1894 +#: builtin/gc.c:1879 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" -#: builtin/gc.c:1911 +#: builtin/gc.c:1896 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" -#: builtin/gc.c:1915 +#: builtin/gc.c:1900 msgid "failed to open stdin of 'crontab'" msgstr "" -#: builtin/gc.c:1956 +#: builtin/gc.c:1942 msgid "'crontab' died" msgstr "" -#: builtin/gc.c:1990 +#: builtin/gc.c:1976 msgid "another process is scheduling background maintenance" msgstr "" -#: builtin/gc.c:2009 +#: builtin/gc.c:2000 msgid "failed to add repo to global config" msgstr "" -#: builtin/gc.c:2019 +#: builtin/gc.c:2010 msgid "git maintenance <subcommand> [<options>]" msgstr "" -#: builtin/gc.c:2038 +#: builtin/gc.c:2029 #, c-format msgid "invalid subcommand: %s" msgstr "" @@ -14688,258 +15177,258 @@ msgstr "" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808 -#: builtin/pack-objects.c:2944 +#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793 +#: builtin/pack-objects.c:2969 #, c-format msgid "no threads support, ignoring %s" msgstr "tidak ada dukungan utas, abaikan %s" -#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641 +#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:656 +#: builtin/grep.c:658 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:737 +#: builtin/grep.c:739 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:836 +#: builtin/grep.c:838 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:838 +#: builtin/grep.c:840 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:840 +#: builtin/grep.c:842 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:842 +#: builtin/grep.c:844 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:844 +#: builtin/grep.c:846 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:847 +#: builtin/grep.c:849 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:851 +#: builtin/grep.c:853 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:853 +#: builtin/grep.c:855 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:858 +#: builtin/grep.c:860 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "search in subdirectories (default)" msgstr "" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:866 +#: builtin/grep.c:868 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:869 +#: builtin/grep.c:871 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:872 +#: builtin/grep.c:874 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:875 +#: builtin/grep.c:877 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:878 +#: builtin/grep.c:880 msgid "show line numbers" msgstr "" -#: builtin/grep.c:879 +#: builtin/grep.c:881 msgid "show column number of first match" msgstr "" -#: builtin/grep.c:880 +#: builtin/grep.c:882 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:881 +#: builtin/grep.c:883 msgid "show filenames" msgstr "" -#: builtin/grep.c:883 +#: builtin/grep.c:885 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:885 +#: builtin/grep.c:887 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:890 +#: builtin/grep.c:892 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:892 +#: builtin/grep.c:894 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:895 +#: builtin/grep.c:897 msgid "show only matching parts of a line" msgstr "" -#: builtin/grep.c:897 +#: builtin/grep.c:899 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:898 +#: builtin/grep.c:900 msgid "highlight matches" msgstr "" -#: builtin/grep.c:900 +#: builtin/grep.c:902 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:902 +#: builtin/grep.c:904 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:905 +#: builtin/grep.c:907 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:908 +#: builtin/grep.c:910 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:910 +#: builtin/grep.c:912 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:912 +#: builtin/grep.c:914 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:913 +#: builtin/grep.c:915 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:916 +#: builtin/grep.c:918 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:918 +#: builtin/grep.c:920 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:921 +#: builtin/grep.c:923 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:923 +#: builtin/grep.c:925 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:925 +#: builtin/grep.c:927 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:937 +#: builtin/grep.c:939 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:939 +#: builtin/grep.c:941 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:942 +#: builtin/grep.c:944 msgid "pager" msgstr "" -#: builtin/grep.c:942 +#: builtin/grep.c:944 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:946 +#: builtin/grep.c:948 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:1012 +#: builtin/grep.c:1014 msgid "no pattern given" msgstr "" -#: builtin/grep.c:1048 +#: builtin/grep.c:1050 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:1056 +#: builtin/grep.c:1058 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1086 +#: builtin/grep.c:1088 msgid "--untracked not supported with --recurse-submodules" msgstr "" -#: builtin/grep.c:1090 +#: builtin/grep.c:1092 msgid "invalid option combination, ignoring --threads" msgstr "" -#: builtin/grep.c:1093 builtin/pack-objects.c:3672 +#: builtin/grep.c:1095 builtin/pack-objects.c:3930 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941 +#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966 #, c-format msgid "invalid number of threads specified (%d)" msgstr "jumlah utas tersebut (%d) tidak valid" -#: builtin/grep.c:1130 +#: builtin/grep.c:1132 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1156 +#: builtin/grep.c:1158 msgid "--cached or --untracked cannot be used with --no-index" msgstr "" -#: builtin/grep.c:1159 +#: builtin/grep.c:1161 msgid "--untracked cannot be used with --cached" msgstr "" -#: builtin/grep.c:1165 +#: builtin/grep.c:1167 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" -#: builtin/grep.c:1173 +#: builtin/grep.c:1175 msgid "both --cached and trees are given" msgstr "" @@ -14980,62 +15469,62 @@ msgstr "" #: builtin/help.c:47 msgid "print all available commands" -msgstr "" +msgstr "cetak semua perintah yang tersedia" #: builtin/help.c:48 msgid "exclude guides" -msgstr "" +msgstr "kecualikan panduan" #: builtin/help.c:49 msgid "print list of useful guides" -msgstr "" +msgstr "cetak daftar panduan berguna" #: builtin/help.c:50 msgid "print all configuration variable names" -msgstr "" +msgstr "cetak semua nama variabel konfigurasi" #: builtin/help.c:52 msgid "show man page" -msgstr "" +msgstr "perlihatkan halaman man" #: builtin/help.c:53 msgid "show manual in web browser" -msgstr "" +msgstr "perlihatkan manual dalam penjelajah web" #: builtin/help.c:55 msgid "show info page" -msgstr "" +msgstr "perlihatkan halaman info" #: builtin/help.c:57 msgid "print command description" -msgstr "" +msgstr "perlihatkan deskripsi perintah" #: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" -msgstr "" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<command>]" #: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" -msgstr "" +msgstr "format bantuan tidak dikenal '%s'" #: builtin/help.c:190 msgid "Failed to start emacsclient." -msgstr "" +msgstr "gagal menjalankan emacsclient." #: builtin/help.c:203 msgid "Failed to parse emacsclient version." -msgstr "" +msgstr "gagal menguraikan versi emacsclient." #: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." -msgstr "" +msgstr "versi emacsclient '%d' terlalu usang (< 22)." #: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" -msgstr "" +msgstr "gagal menjalankan '%s'" #: builtin/help.c:307 #, c-format @@ -15043,6 +15532,8 @@ msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" +"'%s': jalur untuk pembaca man yang tidak didukung.\n" +"Mohon gunakan 'man.<tool>.cmd' sebagai gantinya." #: builtin/help.c:319 #, c-format @@ -15050,429 +15541,427 @@ msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" +"'%s': cmd untuk pembaca man yang didukung.\n" +"Mohon gunakan 'man.<tool>.path' sebagai gantinya." #: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." -msgstr "" +msgstr "'%s': pembaca man tidak dikenal" #: builtin/help.c:453 msgid "no man viewer handled the request" -msgstr "" +msgstr "tidak ada pembaca man yang menangani permintaan" #: builtin/help.c:461 msgid "no info viewer handled the request" -msgstr "" +msgstr "tidak ada pembaca info yang menangani permintaan" -#: builtin/help.c:520 builtin/help.c:531 git.c:340 +#: builtin/help.c:520 builtin/help.c:531 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" -msgstr "" +msgstr "'%s' dialiaskan ke '%s'" -#: builtin/help.c:534 git.c:372 +#: builtin/help.c:534 git.c:380 #, c-format msgid "bad alias.%s string: %s" -msgstr "" +msgstr "untai alias.%s jelek: %s" #: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" -msgstr "" +msgstr "penggunaan: %s%s" #: builtin/help.c:577 msgid "'git help config' for more information" -msgstr "" +msgstr "'git help config' untuk informasi lebih lanjut" -#: builtin/index-pack.c:221 +#: builtin/index-pack.c:222 #, c-format msgid "object type mismatch at %s" msgstr "tipe objek tidak cocok pada %s" -#: builtin/index-pack.c:241 +#: builtin/index-pack.c:242 #, c-format msgid "did not receive expected object %s" msgstr "tidak menerima objek yang diharapkan %s" -#: builtin/index-pack.c:244 +#: builtin/index-pack.c:245 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objek %s: yang diharapkan %s, yang didapat %s" -#: builtin/index-pack.c:294 +#: builtin/index-pack.c:295 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:304 +#: builtin/index-pack.c:305 msgid "early EOF" msgstr "EOF awal" -#: builtin/index-pack.c:305 +#: builtin/index-pack.c:306 msgid "read error on input" msgstr "kesalahan baca pada masukan" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:318 msgid "used more bytes than were available" msgstr "gunakan lebih banyak pita dari pada yang tersedia" -#: builtin/index-pack.c:324 builtin/pack-objects.c:624 +#: builtin/index-pack.c:325 builtin/pack-objects.c:624 msgid "pack too large for current definition of off_t" msgstr "paket terlalu besar untuk definisi off_t saat ini" -#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:328 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "paket melebihi ukuran maksimum yang diperbolehkan" -#: builtin/index-pack.c:342 +#: builtin/index-pack.c:343 #, c-format msgid "unable to create '%s'" msgstr "tidak dapat membuat '%s'" -#: builtin/index-pack.c:348 +#: builtin/index-pack.c:349 #, c-format msgid "cannot open packfile '%s'" msgstr "tidak dapat membuka berkas paket '%s'" -#: builtin/index-pack.c:362 +#: builtin/index-pack.c:363 msgid "pack signature mismatch" msgstr "tanda tangan paket tidak cocok" -#: builtin/index-pack.c:364 +#: builtin/index-pack.c:365 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "versi paket %<PRIu32> tidak didukung" -#: builtin/index-pack.c:382 +#: builtin/index-pack.c:383 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paket ada objek jelek pada offset %<PRIuMAX>: %s" -#: builtin/index-pack.c:488 +#: builtin/index-pack.c:489 #, c-format msgid "inflate returned %d" msgstr "inflate mengembalikan %d" -#: builtin/index-pack.c:537 +#: builtin/index-pack.c:538 msgid "offset value overflow for delta base object" msgstr "nilai offset meluap untuk objek basis delta" -#: builtin/index-pack.c:545 +#: builtin/index-pack.c:546 msgid "delta base offset is out of bound" msgstr "offset basis delta di luar jangkauan" -#: builtin/index-pack.c:553 +#: builtin/index-pack.c:554 #, c-format msgid "unknown object type %d" msgstr "tipe objek tidak diketahui %d" -#: builtin/index-pack.c:584 +#: builtin/index-pack.c:585 msgid "cannot pread pack file" msgstr "tidak dapat pread berkas paket" -#: builtin/index-pack.c:586 +#: builtin/index-pack.c:587 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:612 +#: builtin/index-pack.c:613 msgid "serious inflate inconsistency" msgstr "inkonsistensi inflate serius" -#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 -#: builtin/index-pack.c:826 builtin/index-pack.c:835 +#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788 +#: builtin/index-pack.c:827 builtin/index-pack.c:836 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "TUMBUKAN SHA1 DITEMUKAN DENGAN %s !" -#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/index-pack.c:761 builtin/pack-objects.c:171 #: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "tidak dapat membaca %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:825 #, c-format msgid "cannot read existing object info %s" msgstr "tidak dapat membaca info objek yang ada %s" -#: builtin/index-pack.c:832 +#: builtin/index-pack.c:833 #, c-format msgid "cannot read existing object %s" msgstr "tidak dapat membaca objek yang ada %s" -#: builtin/index-pack.c:846 +#: builtin/index-pack.c:847 #, c-format msgid "invalid blob object %s" msgstr "objek blob tidak valid %s" -#: builtin/index-pack.c:849 builtin/index-pack.c:868 +#: builtin/index-pack.c:850 builtin/index-pack.c:869 msgid "fsck error in packed object" msgstr "kesalahan fsck dalam objek terpaket" -#: builtin/index-pack.c:870 +#: builtin/index-pack.c:871 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Tidak semua objek anak dari %s bisa dicapai" -#: builtin/index-pack.c:931 builtin/index-pack.c:978 +#: builtin/index-pack.c:932 builtin/index-pack.c:979 msgid "failed to apply delta" msgstr "gagal menerapkan delta" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1162 msgid "Receiving objects" msgstr "Menerima objek" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1162 msgid "Indexing objects" msgstr "Mengindeks objek" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1196 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paket rusak (SHA1 tidak cocok)" -#: builtin/index-pack.c:1200 +#: builtin/index-pack.c:1201 msgid "cannot fstat packfile" msgstr "tidak dapat fstat berkas paket" -#: builtin/index-pack.c:1203 +#: builtin/index-pack.c:1204 msgid "pack has junk at the end" msgstr "paket memiliki sampah pada ujung" -#: builtin/index-pack.c:1215 +#: builtin/index-pack.c:1216 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "bingung di luar kegilaan di parse_pack_objects()" -#: builtin/index-pack.c:1238 +#: builtin/index-pack.c:1239 msgid "Resolving deltas" msgstr "Menguraikan delta" -#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707 +#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732 #, c-format msgid "unable to create thread: %s" msgstr "tidak dapat membuat utas: %s" -#: builtin/index-pack.c:1282 +#: builtin/index-pack.c:1283 msgid "confusion beyond insanity" msgstr "bingung di luar kegilaan" -#: builtin/index-pack.c:1288 +#: builtin/index-pack.c:1289 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1300 +#: builtin/index-pack.c:1301 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Checksum ekor tidak diharapkan untuk %s (kerusakan disk?)" -#: builtin/index-pack.c:1304 +#: builtin/index-pack.c:1305 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1328 +#: builtin/index-pack.c:1329 #, c-format msgid "unable to deflate appended object (%d)" msgstr "tidak dapat menggemboskan objek tertambah (%d)" -#: builtin/index-pack.c:1424 +#: builtin/index-pack.c:1425 #, c-format msgid "local object %s is corrupt" msgstr "objek lokal %s rusak" -#: builtin/index-pack.c:1445 +#: builtin/index-pack.c:1446 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "nama berkas paket '%s' tidak diakhiri dengan '.%s'" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1470 #, c-format msgid "cannot write %s file '%s'" msgstr "tidak dapat menulis %s berkas '%s'" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1478 #, c-format msgid "cannot close written %s file '%s'" msgstr "tidak dapat menutup %s berkas tertulis '%s'" -#: builtin/index-pack.c:1503 +#: builtin/index-pack.c:1504 msgid "error while closing pack file" msgstr "kesalahan menutup berkas paket" -#: builtin/index-pack.c:1517 +#: builtin/index-pack.c:1518 msgid "cannot store pack file" msgstr "tidak dapat menyimpan berkas paket" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1526 msgid "cannot store index file" msgstr "tidak dapat menyimpan berkas indeks" -#: builtin/index-pack.c:1534 -msgid "cannot store reverse index file" -msgstr "tidak dapat menyimpan berkas indeks balik" - -#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952 +#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> jelek" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1651 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "tidak dapat membuka berkas paket yang ada '%s'" -#: builtin/index-pack.c:1652 +#: builtin/index-pack.c:1653 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "tidak dapat membuka berkas indeks paket untuk '%s'" -#: builtin/index-pack.c:1700 +#: builtin/index-pack.c:1701 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1707 +#: builtin/index-pack.c:1708 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1765 +#: builtin/index-pack.c:1750 msgid "Cannot come back to cwd" msgstr "tidak dapat kembali ke direktori kerja saat ini" -#: builtin/index-pack.c:1819 builtin/index-pack.c:1822 -#: builtin/index-pack.c:1838 builtin/index-pack.c:1842 +#: builtin/index-pack.c:1804 builtin/index-pack.c:1807 +#: builtin/index-pack.c:1823 builtin/index-pack.c:1827 #, c-format msgid "bad %s" msgstr "%s jelek" -#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625 +#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613 #, c-format msgid "unknown hash algorithm '%s'" msgstr "algoritma hash tak dikenal '%s'" -#: builtin/index-pack.c:1867 +#: builtin/index-pack.c:1852 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin tidak dapat digunakan tanpa --stdin" -#: builtin/index-pack.c:1869 +#: builtin/index-pack.c:1854 msgid "--stdin requires a git repository" msgstr "--stdin memerlukan repositori git" -#: builtin/index-pack.c:1871 +#: builtin/index-pack.c:1856 msgid "--object-format cannot be used with --stdin" msgstr "--object-format tidak dapat digunakan dengan --stdin" -#: builtin/index-pack.c:1886 +#: builtin/index-pack.c:1871 msgid "--verify with no packfile name given" msgstr "--verify tanpa nama berkas paket diberikan" -#: builtin/index-pack.c:1956 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "kesalahan fsck dalam objek paket" -#: builtin/init-db.c:64 +#: builtin/init-db.c:63 #, c-format msgid "cannot stat template '%s'" msgstr "tidak dapat men-stat templat '%s'" -#: builtin/init-db.c:69 +#: builtin/init-db.c:68 #, c-format msgid "cannot opendir '%s'" msgstr "tidak dapat membuka direktori '%s'" -#: builtin/init-db.c:81 +#: builtin/init-db.c:80 #, c-format msgid "cannot readlink '%s'" msgstr "tidak dapat membaca tautan '%s'" -#: builtin/init-db.c:83 +#: builtin/init-db.c:82 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "tidak dapat menautkan simbolik '%s' '%s'" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "tidak dapat menyalin '%s' ke '%s'" -#: builtin/init-db.c:93 +#: builtin/init-db.c:92 #, c-format msgid "ignoring template %s" msgstr "mengabaikan templat %s" -#: builtin/init-db.c:124 +#: builtin/init-db.c:123 #, c-format msgid "templates not found in %s" msgstr "templat tidak ditemukan di %s" -#: builtin/init-db.c:139 +#: builtin/init-db.c:138 #, c-format msgid "not copying templates from '%s': %s" msgstr "tidak menyalin templat dari '%s': %s" -#: builtin/init-db.c:275 +#: builtin/init-db.c:262 #, c-format msgid "invalid initial branch name: '%s'" msgstr "nama cabang asal salah: '%s'" -#: builtin/init-db.c:367 +#: builtin/init-db.c:353 #, c-format msgid "unable to handle file type %d" msgstr "tidak dapat menangani tipe berkas %d" -#: builtin/init-db.c:370 +#: builtin/init-db.c:356 #, c-format msgid "unable to move %s to %s" msgstr "tidak dapat memindahkan %s ke %s" -#: builtin/init-db.c:386 +#: builtin/init-db.c:372 msgid "attempt to reinitialize repository with different hash" msgstr "mencoba menginisialisasi ulang repositori dengan hash yang berbeda" -#: builtin/init-db.c:410 builtin/init-db.c:413 +#: builtin/init-db.c:396 builtin/init-db.c:399 #, c-format msgid "%s already exists" msgstr "%s sudah ada" -#: builtin/init-db.c:445 +#: builtin/init-db.c:431 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: --initial-branch=%s diabaikan" -#: builtin/init-db.c:476 +#: builtin/init-db.c:462 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Repositori berbagi Git yang sudah ada diinisialisasi ulang di %s%s\n" -#: builtin/init-db.c:477 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Repositori Git diinisialisasi ulang di %s%s\n" -#: builtin/init-db.c:481 +#: builtin/init-db.c:467 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Repositori berbagi Git kosong diinisialisasi di %s%s\n" -#: builtin/init-db.c:482 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Repositori Git kosong dinisialisasi di %s%s\n" -#: builtin/init-db.c:531 +#: builtin/init-db.c:517 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -15480,42 +15969,42 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<direktori-templat>][--" "shared[=<perizinan>]] [<direktori>]" -#: builtin/init-db.c:557 +#: builtin/init-db.c:543 msgid "permissions" msgstr "perizinan" -#: builtin/init-db.c:558 +#: builtin/init-db.c:544 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "tentukan bahwa repositori git untuk dibagikan di antara beberapa pengguna" -#: builtin/init-db.c:564 +#: builtin/init-db.c:550 msgid "override the name of the initial branch" msgstr "timpa nama cabang asal" -#: builtin/init-db.c:565 builtin/verify-pack.c:74 +#: builtin/init-db.c:551 builtin/verify-pack.c:74 msgid "hash" msgstr "" -#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "tentukan algoritma hash yang akan digunakan" -#: builtin/init-db.c:573 +#: builtin/init-db.c:559 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "--separate-git-dir dan --bare saling eksklusif" -#: builtin/init-db.c:602 builtin/init-db.c:607 +#: builtin/init-db.c:590 builtin/init-db.c:595 #, c-format msgid "cannot mkdir %s" msgstr "tidak dapat membuat direktori %s" -#: builtin/init-db.c:611 builtin/init-db.c:666 +#: builtin/init-db.c:599 builtin/init-db.c:654 #, c-format msgid "cannot chdir to %s" msgstr "tidak dapat mengganti direktori ke %s" -#: builtin/init-db.c:638 +#: builtin/init-db.c:626 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -15524,12 +16013,12 @@ msgstr "" "%s (atau --work-tree=<direktori>) tidak diperbolehkan tanpa sebutkan %s " "(atau--git-dir=<direktori>)" -#: builtin/init-db.c:690 +#: builtin/init-db.c:678 #, c-format msgid "Cannot access work tree '%s'" msgstr "Tidak dapat mengakses pohon kerja '%s'" -#: builtin/init-db.c:695 +#: builtin/init-db.c:683 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir tidak kompatibel dengan repositori bare" @@ -15579,10 +16068,6 @@ msgstr "" msgid "do not treat --- specially" msgstr "" -#: builtin/interpret-trailers.c:111 -msgid "trailer" -msgstr "" - #: builtin/interpret-trailers.c:112 msgid "trailer(s) to add" msgstr "" @@ -15597,520 +16082,537 @@ msgstr "" #: builtin/log.c:59 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" -msgstr "" +msgstr "git log [<opsi>] [<rentang revisi>] [[--] <jalur>...]" #: builtin/log.c:60 msgid "git show [<options>] <object>..." -msgstr "" +msgstr "git show [<opsi>] <objek>..." #: builtin/log.c:113 #, c-format msgid "invalid --decorate option: %s" -msgstr "" +msgstr "opsi --decorate tidak valid: %s" #: builtin/log.c:180 msgid "show source" -msgstr "" +msgstr "perlihatkan sumber" #: builtin/log.c:181 msgid "use mail map file" -msgstr "" +msgstr "gunakan berkas peta surat" #: builtin/log.c:184 msgid "only decorate refs that match <pattern>" -msgstr "" +msgstr "hanya dekorasi referensi yang cocok dengan <pola>" #: builtin/log.c:186 msgid "do not decorate refs that match <pattern>" -msgstr "" +msgstr "jangan dekorasi referensi yang cocok dengan <pola>" #: builtin/log.c:187 msgid "decorate options" -msgstr "" +msgstr "opsi dekorasi" #: builtin/log.c:190 msgid "" "trace the evolution of line range <start>,<end> or function :<funcname> in " "<file>" msgstr "" +"lacak evolusi rentang baris <awal>,<akhir> atau fungsi :<nama fungsi> dalam " +"<berkas>" #: builtin/log.c:213 msgid "-L<range>:<file> cannot be used with pathspec" -msgstr "" +msgstr "-L<rentang>:<berkas> tidak dapat digunakan dengan spek jalur" #: builtin/log.c:303 #, c-format msgid "Final output: %d %s\n" -msgstr "" +msgstr "Keluaran terakhir: %d %s\n" -#: builtin/log.c:566 +#: builtin/log.c:568 #, c-format msgid "git show %s: bad file" -msgstr "" +msgstr "git show %s: berkas jelek" -#: builtin/log.c:581 builtin/log.c:671 +#: builtin/log.c:583 builtin/log.c:673 #, c-format msgid "could not read object %s" -msgstr "" +msgstr "tidak dapat membaca objek %s" -#: builtin/log.c:696 +#: builtin/log.c:698 #, c-format msgid "unknown type: %d" -msgstr "" +msgstr "tipe tidak dikenal: %d" -#: builtin/log.c:841 +#: builtin/log.c:843 #, c-format msgid "%s: invalid cover from description mode" -msgstr "" +msgstr "%s: sampul tidak valid dari mode deskripsi" -#: builtin/log.c:848 +#: builtin/log.c:850 msgid "format.headers without value" -msgstr "" +msgstr "format.headers tanpa nilai" -#: builtin/log.c:977 +#: builtin/log.c:979 #, c-format msgid "cannot open patch file %s" -msgstr "" +msgstr "tidak dapat membuka berkas tambalan %s" -#: builtin/log.c:994 +#: builtin/log.c:996 msgid "need exactly one range" -msgstr "" +msgstr "butuh tepatnya satu rentang" -#: builtin/log.c:1004 +#: builtin/log.c:1006 msgid "not a range" -msgstr "" +msgstr "bukan sebuah rentang" -#: builtin/log.c:1168 +#: builtin/log.c:1170 msgid "cover letter needs email format" -msgstr "" +msgstr "sampul surat butuh format email" -#: builtin/log.c:1174 +#: builtin/log.c:1176 msgid "failed to create cover-letter file" -msgstr "" +msgstr "gagal membuat berkas sampul surat" -#: builtin/log.c:1261 +#: builtin/log.c:1263 #, c-format msgid "insane in-reply-to: %s" -msgstr "" +msgstr "in-reply-to gila: %s" -#: builtin/log.c:1288 +#: builtin/log.c:1290 msgid "git format-patch [<options>] [<since> | <revision-range>]" -msgstr "" +msgstr "git format-patch [<opsi>] [<sejak> | <rentang revisi>]" -#: builtin/log.c:1346 +#: builtin/log.c:1348 msgid "two output directories?" -msgstr "" +msgstr "dua direktori keluaran?" -#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331 +#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340 #, c-format msgid "unknown commit %s" -msgstr "" +msgstr "komit tidak dikenal %s" -#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" -msgstr "" +msgstr "gagal menguraikan '%s' sebagai referensi valid" -#: builtin/log.c:1517 +#: builtin/log.c:1519 msgid "could not find exact merge base" -msgstr "" +msgstr "tidak dapat menemukan dasar penggabungan eksak" -#: builtin/log.c:1527 +#: builtin/log.c:1529 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base=<base-commit-id> manually" msgstr "" +"gagal mendapatkan hulu, jika Anda ingin merekam dasar komit secara " +"otomatis,\n" +"mohon gunakan git branch --set-upstream-to untuk melacak cabang remote.\n" +"Atau Anda dapat menyebutkan dasar komit secara manual dengan --base=<id " +"dasar komit>" -#: builtin/log.c:1550 +#: builtin/log.c:1552 msgid "failed to find exact merge base" -msgstr "" +msgstr "tidak dapat menemukan dasar penggabungan eksak" -#: builtin/log.c:1567 +#: builtin/log.c:1569 msgid "base commit should be the ancestor of revision list" -msgstr "" +msgstr "dasar komit seharusnya menjadi leluhur daftar revisi" -#: builtin/log.c:1577 +#: builtin/log.c:1579 msgid "base commit shouldn't be in revision list" -msgstr "" +msgstr "dasar komit tidak seharusnya dalam daftar revisi" -#: builtin/log.c:1635 +#: builtin/log.c:1637 msgid "cannot get patch id" -msgstr "" +msgstr "tidak dapat mendapatkan id tambalan" -#: builtin/log.c:1692 +#: builtin/log.c:1700 msgid "failed to infer range-diff origin of current series" -msgstr "" +msgstr "gagal menduga asal range-diff dari seri saat ini" -#: builtin/log.c:1694 +#: builtin/log.c:1702 #, c-format msgid "using '%s' as range-diff origin of current series" -msgstr "" +msgstr "menggunakan '%s' sebagai asal range-diff dari seri saat ini" -#: builtin/log.c:1738 +#: builtin/log.c:1746 msgid "use [PATCH n/m] even with a single patch" -msgstr "" +msgstr "gunakan [PATCH n/m] bahkan dengan satu tambalan" -#: builtin/log.c:1741 +#: builtin/log.c:1749 msgid "use [PATCH] even with multiple patches" -msgstr "" +msgstr "gunakan [PATCH] bahkan dengan banyak tambalan" -#: builtin/log.c:1745 +#: builtin/log.c:1753 msgid "print patches to standard out" -msgstr "" +msgstr "cetak tambalan ke keluaran standar" -#: builtin/log.c:1747 +#: builtin/log.c:1755 msgid "generate a cover letter" -msgstr "" +msgstr "buat sampul surat" -#: builtin/log.c:1749 +#: builtin/log.c:1757 msgid "use simple number sequence for output file names" -msgstr "" +msgstr "gunakan urutan bilangan sederhana untuk keluarkan nama berkas" -#: builtin/log.c:1750 +#: builtin/log.c:1758 msgid "sfx" -msgstr "" +msgstr "sfx" -#: builtin/log.c:1751 +#: builtin/log.c:1759 msgid "use <sfx> instead of '.patch'" -msgstr "" +msgstr "gunakan <akhiran> daripada '.patch'" -#: builtin/log.c:1753 +#: builtin/log.c:1761 msgid "start numbering patches at <n> instead of 1" +msgstr "mulai menomorkan tambalan pada <n> daripada 1" + +#: builtin/log.c:1762 +msgid "reroll-count" msgstr "" -#: builtin/log.c:1755 +#: builtin/log.c:1763 msgid "mark the series as Nth re-roll" -msgstr "" +msgstr "tandai seri sebagai gulung ulang ke-N" -#: builtin/log.c:1757 +#: builtin/log.c:1765 msgid "max length of output filename" -msgstr "" +msgstr "panjang nama berkas keluaran maksimum" -#: builtin/log.c:1759 +#: builtin/log.c:1767 msgid "use [RFC PATCH] instead of [PATCH]" -msgstr "" +msgstr "gunakan [RFC PATCH] daripada [PATCH]" -#: builtin/log.c:1762 +#: builtin/log.c:1770 msgid "cover-from-description-mode" -msgstr "" +msgstr "cover-from-description-mode" -#: builtin/log.c:1763 +#: builtin/log.c:1771 msgid "generate parts of a cover letter based on a branch's description" -msgstr "" +msgstr "buat bagian dari sampul surat berdasarkan deskripsi cabang" -#: builtin/log.c:1765 +#: builtin/log.c:1773 msgid "use [<prefix>] instead of [PATCH]" -msgstr "" +msgstr "gunakan [<prefix>] daripada [PATCH]" -#: builtin/log.c:1768 +#: builtin/log.c:1776 msgid "store resulting files in <dir>" -msgstr "" +msgstr "simpan hasil berkas di <direktori>" -#: builtin/log.c:1771 +#: builtin/log.c:1779 msgid "don't strip/add [PATCH]" -msgstr "" +msgstr "jangan copot/tambah [PATCH]" -#: builtin/log.c:1774 +#: builtin/log.c:1782 msgid "don't output binary diffs" -msgstr "" +msgstr "jangan keluarkan diff biner" -#: builtin/log.c:1776 +#: builtin/log.c:1784 msgid "output all-zero hash in From header" -msgstr "" +msgstr "keluarkan hash semua-nol di kepala From" -#: builtin/log.c:1778 +#: builtin/log.c:1786 msgid "don't include a patch matching a commit upstream" -msgstr "" +msgstr "jangan termasuk tambalan yang cocok dengan komit hulu" -#: builtin/log.c:1780 +#: builtin/log.c:1788 msgid "show patch format instead of default (patch + stat)" -msgstr "" +msgstr "perlihatkan format tambalan daripada asali (tambalan + stat)" -#: builtin/log.c:1782 +#: builtin/log.c:1790 msgid "Messaging" -msgstr "" +msgstr "Perpesanan" -#: builtin/log.c:1783 +#: builtin/log.c:1791 msgid "header" -msgstr "" +msgstr "kepala" -#: builtin/log.c:1784 +#: builtin/log.c:1792 msgid "add email header" -msgstr "" +msgstr "tambahkan kepala email" -#: builtin/log.c:1785 builtin/log.c:1786 +#: builtin/log.c:1793 builtin/log.c:1794 msgid "email" -msgstr "" +msgstr "email" -#: builtin/log.c:1785 +#: builtin/log.c:1793 msgid "add To: header" -msgstr "" +msgstr "tambahkan kepala To:" -#: builtin/log.c:1786 +#: builtin/log.c:1794 msgid "add Cc: header" -msgstr "" +msgstr "tambahkan kepala Cc:" -#: builtin/log.c:1787 +#: builtin/log.c:1795 msgid "ident" -msgstr "" +msgstr "ident" -#: builtin/log.c:1788 +#: builtin/log.c:1796 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" +"setel alamat From ke <identitas> (atau identitas pengkomit jika tidak ada)" -#: builtin/log.c:1790 +#: builtin/log.c:1798 msgid "message-id" -msgstr "" +msgstr "message-id" -#: builtin/log.c:1791 +#: builtin/log.c:1799 msgid "make first mail a reply to <message-id>" -msgstr "" +msgstr "buat surat pertama balasan ke <id pesan>" -#: builtin/log.c:1792 builtin/log.c:1795 +#: builtin/log.c:1800 builtin/log.c:1803 msgid "boundary" -msgstr "" +msgstr "perbatasan" -#: builtin/log.c:1793 +#: builtin/log.c:1801 msgid "attach the patch" -msgstr "" +msgstr "lampirkan tambalan" -#: builtin/log.c:1796 +#: builtin/log.c:1804 msgid "inline the patch" -msgstr "" +msgstr "bariskan tambalan" -#: builtin/log.c:1800 +#: builtin/log.c:1808 msgid "enable message threading, styles: shallow, deep" -msgstr "" +msgstr "aktifkan utasan pesan, gaya: shallow, deep" -#: builtin/log.c:1802 +#: builtin/log.c:1810 msgid "signature" -msgstr "" +msgstr "tanda tangan" -#: builtin/log.c:1803 +#: builtin/log.c:1811 msgid "add a signature" -msgstr "" +msgstr "tambah tanda tangan" -#: builtin/log.c:1804 +#: builtin/log.c:1812 msgid "base-commit" -msgstr "" +msgstr "dasar komit" -#: builtin/log.c:1805 +#: builtin/log.c:1813 msgid "add prerequisite tree info to the patch series" -msgstr "" +msgstr "tambahkan info pohon prasyarat ke seri tambalan" -#: builtin/log.c:1808 +#: builtin/log.c:1816 msgid "add a signature from a file" -msgstr "" +msgstr "tambahkan tandatangan dari berkas" -#: builtin/log.c:1809 +#: builtin/log.c:1817 msgid "don't print the patch filenames" -msgstr "" +msgstr "jangan cetak nama berkas tambalan" -#: builtin/log.c:1811 +#: builtin/log.c:1819 msgid "show progress while generating patches" -msgstr "" +msgstr "perlihatkan perkembangan ketika membuat tambalan" -#: builtin/log.c:1813 +#: builtin/log.c:1821 msgid "show changes against <rev> in cover letter or single patch" msgstr "" +"perlihatkan perubahan terhadap <revisi> di sampul surat atau satu tambalan" -#: builtin/log.c:1816 +#: builtin/log.c:1824 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" +"perlihatkan perubahan terhadap <spek referensi> di sampul surat atau satu " +"tambalan" -#: builtin/log.c:1818 +#: builtin/log.c:1826 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" -msgstr "" +msgstr "persentase dimana pembuatan tertimbang" -#: builtin/log.c:1904 +#: builtin/log.c:1913 #, c-format msgid "invalid ident line: %s" -msgstr "" +msgstr "baris identitas tidak valid: %s" -#: builtin/log.c:1919 +#: builtin/log.c:1928 msgid "-n and -k are mutually exclusive" -msgstr "" +msgstr "-n dan -k saling eksklusif" -#: builtin/log.c:1921 +#: builtin/log.c:1930 msgid "--subject-prefix/--rfc and -k are mutually exclusive" -msgstr "" +msgstr "--subject-prefix/--rfc dan -k saling eksklusif" -#: builtin/log.c:1929 +#: builtin/log.c:1938 msgid "--name-only does not make sense" -msgstr "" +msgstr "--name-only tidak masuk akal" -#: builtin/log.c:1931 +#: builtin/log.c:1940 msgid "--name-status does not make sense" -msgstr "" +msgstr "--name-status tidak masuk akal" -#: builtin/log.c:1933 +#: builtin/log.c:1942 msgid "--check does not make sense" -msgstr "" +msgstr "--check tidak masuk akal" -#: builtin/log.c:1955 +#: builtin/log.c:1964 msgid "--stdout, --output, and --output-directory are mutually exclusive" -msgstr "" +msgstr "--stdout, --output, dan --output-directory saling eksklusif" -#: builtin/log.c:2078 +#: builtin/log.c:2087 msgid "--interdiff requires --cover-letter or single patch" -msgstr "" +msgstr "--interdiff butuh --cover-letter atau satu tambalan" -#: builtin/log.c:2082 +#: builtin/log.c:2091 msgid "Interdiff:" -msgstr "" +msgstr "Interdiff:" -#: builtin/log.c:2083 +#: builtin/log.c:2092 #, c-format msgid "Interdiff against v%d:" -msgstr "" +msgstr "Interdiff terhadap v%d:" -#: builtin/log.c:2089 +#: builtin/log.c:2098 msgid "--creation-factor requires --range-diff" -msgstr "" +msgstr "--creation-factor butuh --range-diff" -#: builtin/log.c:2093 +#: builtin/log.c:2102 msgid "--range-diff requires --cover-letter or single patch" -msgstr "" +msgstr "--range-diff butuh --cover-letter atau satu tambalan" -#: builtin/log.c:2101 +#: builtin/log.c:2110 msgid "Range-diff:" -msgstr "" +msgstr "Range-diff:" -#: builtin/log.c:2102 +#: builtin/log.c:2111 #, c-format msgid "Range-diff against v%d:" -msgstr "" +msgstr "Range-diff terhadap v%d:" -#: builtin/log.c:2113 +#: builtin/log.c:2122 #, c-format msgid "unable to read signature file '%s'" -msgstr "" +msgstr "tidak dapat membaca berkas tanda tangan '%s'" -#: builtin/log.c:2149 +#: builtin/log.c:2158 msgid "Generating patches" -msgstr "" +msgstr "Membuat tambalan" -#: builtin/log.c:2193 +#: builtin/log.c:2202 msgid "failed to create output files" -msgstr "" +msgstr "tidak dapat membuat berkas keluaran" -#: builtin/log.c:2252 +#: builtin/log.c:2261 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" -msgstr "" +msgstr "git cherry [-v] [<hulu> [<kepala> [<batas>]]]" -#: builtin/log.c:2306 +#: builtin/log.c:2315 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" +"Tidak dapat menemukan cabang remote terlacak, mohon sebutkan <hulu>\n" +"secara manual.\n" -#: builtin/ls-files.c:486 +#: builtin/ls-files.c:563 msgid "git ls-files [<options>] [<file>...]" msgstr "" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:619 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:544 +#: builtin/ls-files.c:621 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:623 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:625 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:627 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:629 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:631 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:633 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:636 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:638 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:640 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:642 msgid "show line endings of files" msgstr "" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:644 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:647 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:572 +#: builtin/ls-files.c:649 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:574 +#: builtin/ls-files.c:651 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:654 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:580 +#: builtin/ls-files.c:657 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:582 +#: builtin/ls-files.c:659 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:586 +#: builtin/ls-files.c:663 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:589 +#: builtin/ls-files.c:666 msgid "recurse through submodules" msgstr "" -#: builtin/ls-files.c:591 +#: builtin/ls-files.c:668 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:592 +#: builtin/ls-files.c:669 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:593 +#: builtin/ls-files.c:670 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:595 +#: builtin/ls-files.c:672 msgid "show debugging data" msgstr "" -#: builtin/ls-files.c:597 +#: builtin/ls-files.c:674 msgid "suppress duplicate entries" msgstr "" @@ -16125,7 +16627,7 @@ msgstr "" msgid "do not print remote URL" msgstr "" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399 msgid "exec" msgstr "" @@ -16193,6 +16695,55 @@ msgstr "" msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" +#. TRANSLATORS: keep <> in "<" mail ">" info. +#: builtin/mailinfo.c:14 +msgid "git mailinfo [<options>] <msg> <patch> < mail >info" +msgstr "" + +#: builtin/mailinfo.c:58 +msgid "keep subject" +msgstr "" + +#: builtin/mailinfo.c:60 +msgid "keep non patch brackets in subject" +msgstr "" + +#: builtin/mailinfo.c:62 +msgid "copy Message-ID to the end of commit message" +msgstr "" + +#: builtin/mailinfo.c:64 +msgid "re-code metadata to i18n.commitEncoding" +msgstr "" + +#: builtin/mailinfo.c:67 +msgid "disable charset re-coding of metadata" +msgstr "" + +#: builtin/mailinfo.c:69 +msgid "encoding" +msgstr "" + +#: builtin/mailinfo.c:70 +msgid "re-code metadata to this encoding" +msgstr "" + +#: builtin/mailinfo.c:72 +msgid "use scissors" +msgstr "" + +#: builtin/mailinfo.c:73 +msgid "<action>" +msgstr "" + +#: builtin/mailinfo.c:74 +msgid "action when quoted CR is found" +msgstr "" + +#: builtin/mailinfo.c:77 +msgid "use headers in message's body" +msgstr "" + #: builtin/mailsplit.c:241 #, c-format msgid "empty mbox: '%s'" @@ -16309,412 +16860,420 @@ msgstr "" #: builtin/merge.c:58 msgid "git merge [<options>] [<commit>...]" -msgstr "" +msgstr "git merge [<opsi>] [<komit>...]" #: builtin/merge.c:59 msgid "git merge --abort" -msgstr "" +msgstr "git merge --abort" #: builtin/merge.c:60 msgid "git merge --continue" -msgstr "" +msgstr "git merge --continue" #: builtin/merge.c:123 msgid "switch `m' requires a value" -msgstr "" +msgstr "tombol `m' butuh sebuah nilai" #: builtin/merge.c:146 #, c-format msgid "option `%s' requires a value" -msgstr "" +msgstr "opsi `%s' butuh sebuah nilai" #: builtin/merge.c:199 #, c-format msgid "Could not find merge strategy '%s'.\n" -msgstr "" +msgstr "Tidak dapat menemukan strategi penggabungan '%s'.\n" #: builtin/merge.c:200 #, c-format msgid "Available strategies are:" -msgstr "" +msgstr "Strategi yang tersedia:" #: builtin/merge.c:205 #, c-format msgid "Available custom strategies are:" -msgstr "" +msgstr "Strategi kustom yang tersedia:" #: builtin/merge.c:256 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" -msgstr "" +msgstr "jangan perlihatkan diffstat pada akhir penggabungan" #: builtin/merge.c:259 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" -msgstr "" +msgstr "perlihatkan diffstat pada akhir penggabungan" #: builtin/merge.c:260 builtin/pull.c:139 msgid "(synonym to --stat)" -msgstr "" +msgstr "(sinonim untuk --stat)" #: builtin/merge.c:262 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" +"tambah (paling banyak <n>) entri dari log pendek ke pesan komit penggabungan" #: builtin/merge.c:265 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" -msgstr "" +msgstr "buat satu komit daripada melakukan penggabungan" #: builtin/merge.c:267 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" -msgstr "" +msgstr "lakukan komit jika penggabungan sukses (asali)" #: builtin/merge.c:269 builtin/pull.c:154 msgid "edit message before committing" -msgstr "" +msgstr "sunting pesan sebelum komit" #: builtin/merge.c:271 msgid "allow fast-forward (default)" -msgstr "" +msgstr "perbolehkan maju cepat (asali)" #: builtin/merge.c:273 builtin/pull.c:161 msgid "abort if fast-forward is not possible" -msgstr "" +msgstr "batalkan jika maju cepat tidak dimungkinkan" #: builtin/merge.c:277 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" -msgstr "" +msgstr "periksa bahwa komit bernama punya tandatangan GPG yang valid" #: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114 +#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114 msgid "strategy" -msgstr "" +msgstr "strategi" #: builtin/merge.c:279 builtin/pull.c:169 msgid "merge strategy to use" -msgstr "" +msgstr "strategi penggabungan yang digunakan" #: builtin/merge.c:280 builtin/pull.c:172 msgid "option=value" -msgstr "" +msgstr "opsi=nilai" #: builtin/merge.c:281 builtin/pull.c:173 msgid "option for selected merge strategy" -msgstr "" +msgstr "opsi untuk strategi penggabungan yang dipilih" #: builtin/merge.c:283 msgid "merge commit message (for a non-fast-forward merge)" -msgstr "" +msgstr "pesan komit penggabungan (untuk penggabungan bukan maju cepat)" #: builtin/merge.c:290 msgid "abort the current in-progress merge" -msgstr "" +msgstr "batalkan penggabungan yang sedang berlangsung saat ini" #: builtin/merge.c:292 msgid "--abort but leave index and working tree alone" -msgstr "" +msgstr "--abort tapi biarkan indeks dan pohon kerja" #: builtin/merge.c:294 msgid "continue the current in-progress merge" -msgstr "" +msgstr "lanjutkan penggabungan yang sedang berlangsung saat ini" #: builtin/merge.c:296 builtin/pull.c:180 msgid "allow merging unrelated histories" -msgstr "" +msgstr "perbolehkan penggabungan riwayat yang tak terkait" #: builtin/merge.c:303 msgid "bypass pre-merge-commit and commit-msg hooks" -msgstr "" +msgstr "lewati hook pre-merge-commit dan commit-msg" #: builtin/merge.c:320 msgid "could not run stash." -msgstr "" +msgstr "tidak dapat menjalankan stase." #: builtin/merge.c:325 msgid "stash failed" -msgstr "" +msgstr "stase gagal" #: builtin/merge.c:330 #, c-format msgid "not a valid object: %s" -msgstr "" +msgstr "bukan objek valid: %s" #: builtin/merge.c:352 builtin/merge.c:369 msgid "read-tree failed" -msgstr "" +msgstr "read-tree gagal" -#: builtin/merge.c:399 -msgid " (nothing to squash)" -msgstr "" +#: builtin/merge.c:400 +msgid "Already up to date. (nothing to squash)" +msgstr "Sudah diperbarui. (tidak ada yang bisa dilumat)" -#: builtin/merge.c:410 +#: builtin/merge.c:414 #, c-format msgid "Squash commit -- not updating HEAD\n" -msgstr "" +msgstr "Lumat komit -- tak perbarui HEAD\n" -#: builtin/merge.c:460 +#: builtin/merge.c:464 #, c-format msgid "No merge message -- not updating HEAD\n" -msgstr "" +msgstr "Tidak ada pesan komit -- tak perbarui HEAD\n" -#: builtin/merge.c:511 +#: builtin/merge.c:515 #, c-format msgid "'%s' does not point to a commit" -msgstr "" +msgstr "'%s' tidak menunjuk pada sebuah komit" -#: builtin/merge.c:598 +#: builtin/merge.c:602 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" -msgstr "" +msgstr "Untai branch.%s.mergeoptions jelek: %s" -#: builtin/merge.c:724 +#: builtin/merge.c:728 msgid "Not handling anything other than two heads merge." -msgstr "" +msgstr "Tak tangani apapun selain penggabungan dua kepala." -#: builtin/merge.c:737 +#: builtin/merge.c:741 #, c-format msgid "Unknown option for merge-recursive: -X%s" -msgstr "" +msgstr "Opsi merge-recursive tak dikenal: -X%s" -#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" -msgstr "" +msgstr "tidak dapat menulis %s" -#: builtin/merge.c:808 +#: builtin/merge.c:812 #, c-format msgid "Could not read from '%s'" -msgstr "" +msgstr "Tidak dapat membaca dari '%s'" -#: builtin/merge.c:817 +#: builtin/merge.c:821 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" +"Tak mengkomit penggabungan; gunakan 'git commit' untuk menyelesaikan " +"penggabungan.\n" -#: builtin/merge.c:823 +#: builtin/merge.c:827 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" msgstr "" +"Mohon masukkan pesan komit untuk jelaskan mengapa penggabungan ini\n" +"diperlukan, khususnya jika itu menggabungkan hulu terbarui ke cabang\n" +"topik.\n" -#: builtin/merge.c:828 +#: builtin/merge.c:832 msgid "An empty message aborts the commit.\n" -msgstr "" +msgstr "Pesan kosong membatalkan komit.\n" -#: builtin/merge.c:831 +#: builtin/merge.c:835 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" +"Baris yang diawali dengan '%c' akan diabaikan, dan pesan kosong batalkan\n" +"komit.\n" -#: builtin/merge.c:884 +#: builtin/merge.c:888 msgid "Empty commit message." -msgstr "" +msgstr "Pesan komit kosong" -#: builtin/merge.c:899 +#: builtin/merge.c:903 #, c-format msgid "Wonderful.\n" -msgstr "" +msgstr "Luar biasa.\n" -#: builtin/merge.c:960 +#: builtin/merge.c:964 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" -msgstr "" +msgstr "Penggabungan otomatis gagal; selesaikan konflik lalu komit hasilnya.\n" -#: builtin/merge.c:999 +#: builtin/merge.c:1003 msgid "No current branch." -msgstr "" +msgstr "Tidak ada cabang saat ini." -#: builtin/merge.c:1001 +#: builtin/merge.c:1005 msgid "No remote for the current branch." -msgstr "" +msgstr "Tidak ada remote untuk cabang saat ini." -#: builtin/merge.c:1003 +#: builtin/merge.c:1007 msgid "No default upstream defined for the current branch." -msgstr "" +msgstr "Tidak ada hulu asali yang ditentukan untuk cabang saat ini." -#: builtin/merge.c:1008 +#: builtin/merge.c:1012 #, c-format msgid "No remote-tracking branch for %s from %s" -msgstr "" +msgstr "Tidak ada cabang pelacak remote untuk %s dari %s" -#: builtin/merge.c:1065 +#: builtin/merge.c:1069 #, c-format msgid "Bad value '%s' in environment '%s'" -msgstr "" +msgstr "Nilai jelek '%s' dalam lingkungan '%s'" -#: builtin/merge.c:1168 +#: builtin/merge.c:1172 #, c-format msgid "not something we can merge in %s: %s" -msgstr "" +msgstr "bukan sesuatu yang kami bisa gabungkan di %s: %s" -#: builtin/merge.c:1202 +#: builtin/merge.c:1206 msgid "not something we can merge" -msgstr "" +msgstr "bukan sesuatu yang kami bisa gabungkan" -#: builtin/merge.c:1312 +#: builtin/merge.c:1316 msgid "--abort expects no arguments" -msgstr "" +msgstr "--abort harap tanpa argumen" -#: builtin/merge.c:1316 +#: builtin/merge.c:1320 msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "" +msgstr "Tidak ada penggabungan yang bisa dibatalkan (MERGE_HEAD hilang)." -#: builtin/merge.c:1334 +#: builtin/merge.c:1338 msgid "--quit expects no arguments" -msgstr "" +msgstr "--quit harap tanpa argumen" -#: builtin/merge.c:1347 +#: builtin/merge.c:1351 msgid "--continue expects no arguments" -msgstr "" +msgstr "--continue harap tanpa argumen" -#: builtin/merge.c:1351 +#: builtin/merge.c:1355 msgid "There is no merge in progress (MERGE_HEAD missing)." -msgstr "" +msgstr "Tidak ada penggabungan yang sedang berlangsung (MERGE_HEAD hilang)." -#: builtin/merge.c:1367 +#: builtin/merge.c:1371 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" +"Anda belum mengakhiri penggabungan Anda (MERGE_HEAD ada).\n" +"Mohon komit perubahan Anda sebelum Anda gabungkan." -#: builtin/merge.c:1374 +#: builtin/merge.c:1378 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" +"Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada).\n" +"Mohon komit perubahan Anda sebelum Anda gabungkan." -#: builtin/merge.c:1377 +#: builtin/merge.c:1381 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." -msgstr "" +msgstr "Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada)." -#: builtin/merge.c:1391 +#: builtin/merge.c:1395 msgid "You cannot combine --squash with --no-ff." -msgstr "" +msgstr "Anda tidak dapat menggabungkan --squash dengan --no-ff." -#: builtin/merge.c:1393 +#: builtin/merge.c:1397 msgid "You cannot combine --squash with --commit." -msgstr "" +msgstr "Anda tidak dapat menggabungkan --squash dengan --commit" -#: builtin/merge.c:1409 +#: builtin/merge.c:1413 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" +"Tidak ada komit yang disebutkan dan merge.defaultToUpstream tidak disetel." -#: builtin/merge.c:1426 +#: builtin/merge.c:1430 msgid "Squash commit into empty head not supported yet" -msgstr "" +msgstr "Lumat komit ke kepala kosong belum didukung" -#: builtin/merge.c:1428 +#: builtin/merge.c:1432 msgid "Non-fast-forward commit does not make sense into an empty head" -msgstr "" +msgstr "Komit nir maju cepat tidak masuk akal ke kepala kosong" -#: builtin/merge.c:1433 +#: builtin/merge.c:1437 #, c-format msgid "%s - not something we can merge" -msgstr "" +msgstr "%s - bukan sesuatu yang kami bisa gabungkan" -#: builtin/merge.c:1435 +#: builtin/merge.c:1439 msgid "Can merge only exactly one commit into empty head" -msgstr "" +msgstr "Hanya bisa menggabungkan tepantnya satu komit ke kepala kosong" -#: builtin/merge.c:1516 +#: builtin/merge.c:1520 msgid "refusing to merge unrelated histories" -msgstr "" +msgstr "menolak menggabungkan riwayat tak terkait" -#: builtin/merge.c:1525 -msgid "Already up to date." -msgstr "" - -#: builtin/merge.c:1535 +#: builtin/merge.c:1539 #, c-format msgid "Updating %s..%s\n" -msgstr "" +msgstr "Memperbarui %s..%s\n" -#: builtin/merge.c:1581 +#: builtin/merge.c:1585 #, c-format msgid "Trying really trivial in-index merge...\n" -msgstr "" +msgstr "Mencoba penggabungan dalam indeks yang sangat sepele\n" -#: builtin/merge.c:1588 +#: builtin/merge.c:1592 #, c-format msgid "Nope.\n" -msgstr "" +msgstr "Tidak.\n" -#: builtin/merge.c:1613 -msgid "Already up to date. Yeeah!" -msgstr "" - -#: builtin/merge.c:1619 +#: builtin/merge.c:1623 msgid "Not possible to fast-forward, aborting." -msgstr "" +msgstr "Tidak mungkin untuk maju cepat, batalkan." -#: builtin/merge.c:1647 builtin/merge.c:1712 +#: builtin/merge.c:1651 builtin/merge.c:1716 #, c-format msgid "Rewinding the tree to pristine...\n" -msgstr "" +msgstr "Memutar ulang pohon ke asli...\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1655 #, c-format msgid "Trying merge strategy %s...\n" -msgstr "" +msgstr "Mencoba strategi penggabungan %s...\n" -#: builtin/merge.c:1703 +#: builtin/merge.c:1707 #, c-format msgid "No merge strategy handled the merge.\n" -msgstr "" +msgstr "Tidak ada strategi yang menangani penggabungan.\n" -#: builtin/merge.c:1705 +#: builtin/merge.c:1709 #, c-format msgid "Merge with strategy %s failed.\n" -msgstr "" +msgstr "Penggabungan dengan strategi %s gagal.\n" -#: builtin/merge.c:1714 +#: builtin/merge.c:1718 #, c-format msgid "Using the %s to prepare resolving by hand.\n" -msgstr "" +msgstr "Menggunakan %s untuk menyiapkan penyelesaian dengan tangan.\n" -#: builtin/merge.c:1728 +#: builtin/merge.c:1732 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" +"Penggabungan otomatis berjalan baik; berhenti sebelum mengkomit seperti yang " +"diminta\n" #: builtin/mktag.c:10 msgid "git mktag" msgstr "" -#: builtin/mktag.c:30 +#: builtin/mktag.c:27 #, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "" -#: builtin/mktag.c:41 +#: builtin/mktag.c:38 #, c-format msgid "error: tag input does not pass fsck: %s" msgstr "" -#: builtin/mktag.c:44 +#: builtin/mktag.c:41 #, c-format msgid "%d (FSCK_IGNORE?) should never trigger this callback" msgstr "" -#: builtin/mktag.c:59 +#: builtin/mktag.c:56 +#, c-format msgid "could not read tagged object '%s'" msgstr "" -#: builtin/mktag.c:62 +#: builtin/mktag.c:59 #, c-format msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "" -#: builtin/mktag.c:99 +#: builtin/mktag.c:97 msgid "tag on stdin did not pass our strict fsck check" msgstr "" -#: builtin/mktag.c:102 +#: builtin/mktag.c:100 msgid "tag on stdin did not refer to a valid object" msgstr "" -#: builtin/mktag.c:105 builtin/tag.c:232 +#: builtin/mktag.c:103 builtin/tag.c:243 msgid "unable to write tag file" msgstr "" @@ -16734,133 +17293,141 @@ msgstr "" msgid "allow creation of more than one tree" msgstr "" -#: builtin/multi-pack-index.c:9 -msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" +#: builtin/multi-pack-index.c:10 +msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]" msgstr "" -#: builtin/multi-pack-index.c:26 -msgid "object directory containing set of packfile and pack-index pairs" +#: builtin/multi-pack-index.c:13 +msgid "git multi-pack-index [<options>] verify" msgstr "" -#: builtin/multi-pack-index.c:29 -msgid "" -"during repack, collect pack-files of smaller size into a batch that is " -"larger than this size" +#: builtin/multi-pack-index.c:16 +msgid "git multi-pack-index [<options>] expire" msgstr "" -#: builtin/multi-pack-index.c:50 builtin/notes.c:376 builtin/notes.c:431 -#: builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598 -#: builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963 -#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:575 -msgid "too many arguments" +#: builtin/multi-pack-index.c:19 +msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" msgstr "" -#: builtin/multi-pack-index.c:60 -msgid "--batch-size option is only for 'repack' subcommand" +#: builtin/multi-pack-index.c:54 +msgid "object directory containing set of packfile and pack-index pairs" msgstr "" #: builtin/multi-pack-index.c:69 +msgid "preferred-pack" +msgstr "" + +#: builtin/multi-pack-index.c:70 +msgid "pack for reuse when computing a multi-pack bitmap" +msgstr "" + +#: builtin/multi-pack-index.c:128 +msgid "" +"during repack, collect pack-files of smaller size into a batch that is " +"larger than this size" +msgstr "" + +#: builtin/multi-pack-index.c:180 #, c-format msgid "unrecognized subcommand: %s" msgstr "" #: builtin/mv.c:18 msgid "git mv [<options>] <source>... <destination>" -msgstr "" +msgstr "git mv [<opsi>] <sumber>... <tujuan>" #: builtin/mv.c:83 #, c-format msgid "Directory %s is in index and no submodule?" -msgstr "" +msgstr "Direktori %s di dalam indeks dan tidak ada submodul?" #: builtin/mv.c:85 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" +"Mohon gelar perubahan Anda ke .gitmodules atau stase itu untuk melanjutkan" #: builtin/mv.c:103 #, c-format msgid "%.*s is in index" -msgstr "" +msgstr "%.*s di dalam indeks" #: builtin/mv.c:125 msgid "force move/rename even if target exists" -msgstr "" +msgstr "paksa pindah/ganti nama bahkan jika target ada" #: builtin/mv.c:127 msgid "skip move/rename errors" -msgstr "" +msgstr "lewati kesalahan pindah/ganti nama" #: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" -msgstr "" +msgstr "tujuan '%s' bukan direktori" #: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" -msgstr "" +msgstr "Memeriksa penamaan ulang '%s' ke '%s'\n" #: builtin/mv.c:185 msgid "bad source" -msgstr "" +msgstr "sumber jelek" #: builtin/mv.c:188 msgid "can not move directory into itself" -msgstr "" +msgstr "tidak dapat memindahkan direktori ke dirinya sendiri" #: builtin/mv.c:191 msgid "cannot move directory over file" -msgstr "" +msgstr "tidak dapat memindahkan direktori ke berkas" #: builtin/mv.c:200 msgid "source directory is empty" -msgstr "" +msgstr "direktori asal kosong" #: builtin/mv.c:225 msgid "not under version control" -msgstr "" +msgstr "bukan dalam kontrol versi" #: builtin/mv.c:227 msgid "conflicted" -msgstr "" +msgstr "terkonflik" #: builtin/mv.c:230 msgid "destination exists" -msgstr "" +msgstr "tujuan ada" #: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" -msgstr "" +msgstr "menimpa '%s'" #: builtin/mv.c:241 msgid "Cannot overwrite" -msgstr "" +msgstr "Tidak dapat menimpa" #: builtin/mv.c:244 msgid "multiple sources for the same target" -msgstr "" +msgstr "banyak asal untuk target yang sama" #: builtin/mv.c:246 msgid "destination directory does not exist" -msgstr "" +msgstr "direktori tujuan tidak ada" #: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" -msgstr "" +msgstr "%s, source=%s, destination=%s" #: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" -msgstr "" +msgstr "Mengganti nama %s ke %s\n" -#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667 #, c-format msgid "renaming '%s' failed" -msgstr "" +msgstr "gagal mengganti nama '%s'" #: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." @@ -17042,7 +17609,7 @@ msgstr "" msgid "the note contents have been left in %s" msgstr "" -#: builtin/notes.c:242 builtin/tag.c:565 +#: builtin/notes.c:242 builtin/tag.c:576 #, c-format msgid "could not open or read '%s'" msgstr "" @@ -17082,6 +17649,13 @@ msgstr "" msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "" +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 +#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 +#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 +#: builtin/prune-packed.c:25 builtin/tag.c:586 +msgid "too many arguments" +msgstr "" + #: builtin/notes.c:389 builtin/notes.c:678 #, c-format msgid "no note found for object %s." @@ -17257,7 +17831,7 @@ msgid "" "abort'.\n" msgstr "" -#: builtin/notes.c:897 builtin/tag.c:578 +#: builtin/notes.c:897 builtin/tag.c:589 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" @@ -17291,7 +17865,7 @@ msgstr "" msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1034 builtin/stash.c:1671 +#: builtin/notes.c:1034 builtin/stash.c:1739 #, c-format msgid "unknown subcommand: %s" msgstr "" @@ -17356,317 +17930,339 @@ msgstr "" msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:1358 +#: builtin/pack-objects.c:1383 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:1806 +#: builtin/pack-objects.c:1831 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "" -#: builtin/pack-objects.c:1815 +#: builtin/pack-objects.c:1840 #, c-format msgid "delta base offset out of bound for %s" msgstr "" -#: builtin/pack-objects.c:2096 +#: builtin/pack-objects.c:2121 msgid "Counting objects" msgstr "" -#: builtin/pack-objects.c:2241 +#: builtin/pack-objects.c:2266 #, c-format msgid "unable to parse object header of %s" msgstr "" -#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327 -#: builtin/pack-objects.c:2337 +#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352 +#: builtin/pack-objects.c:2362 #, c-format msgid "object %s cannot be read" msgstr "" -#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341 +#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" -#: builtin/pack-objects.c:2351 +#: builtin/pack-objects.c:2376 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2691 #, c-format msgid "Delta compression using up to %d threads" msgstr "" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:2830 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2916 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2922 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:2976 +#: builtin/pack-objects.c:3001 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" "hash> <uri>' (got '%s')" msgstr "" -#: builtin/pack-objects.c:2979 +#: builtin/pack-objects.c:3004 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "" -#: builtin/pack-objects.c:3008 +#: builtin/pack-objects.c:3039 +#, c-format +msgid "could not get type of object %s in pack %s" +msgstr "" + +#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175 +#, c-format +msgid "could not find pack '%s'" +msgstr "" + +#: builtin/pack-objects.c:3218 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:3014 +#: builtin/pack-objects.c:3224 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:3112 +#: builtin/pack-objects.c:3322 msgid "invalid value for --missing" msgstr "" -#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279 +#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490 msgid "cannot open pack index" msgstr "" -#: builtin/pack-objects.c:3202 +#: builtin/pack-objects.c:3412 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3498 msgid "unable to force loose object" msgstr "" -#: builtin/pack-objects.c:3380 +#: builtin/pack-objects.c:3628 #, c-format msgid "not a rev '%s'" msgstr "" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3631 #, c-format msgid "bad revision '%s'" msgstr "" -#: builtin/pack-objects.c:3408 +#: builtin/pack-objects.c:3659 msgid "unable to add recent objects" msgstr "" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3712 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:3465 +#: builtin/pack-objects.c:3716 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:3503 +#: builtin/pack-objects.c:3755 msgid "<version>[,<offset>]" msgstr "" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3756 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:3507 +#: builtin/pack-objects.c:3759 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:3509 +#: builtin/pack-objects.c:3761 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:3511 +#: builtin/pack-objects.c:3763 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:3513 +#: builtin/pack-objects.c:3765 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:3515 +#: builtin/pack-objects.c:3767 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:3517 +#: builtin/pack-objects.c:3769 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:3519 +#: builtin/pack-objects.c:3771 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:3521 +#: builtin/pack-objects.c:3773 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:3523 +#: builtin/pack-objects.c:3775 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:3525 +#: builtin/pack-objects.c:3777 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3779 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:3529 +#: builtin/pack-objects.c:3781 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:3531 +#: builtin/pack-objects.c:3783 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3786 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3537 +#: builtin/pack-objects.c:3789 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3540 +#: builtin/pack-objects.c:3792 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:3543 +#: builtin/pack-objects.c:3795 +msgid "read packs from stdin" +msgstr "" + +#: builtin/pack-objects.c:3797 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3545 +#: builtin/pack-objects.c:3799 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3547 +#: builtin/pack-objects.c:3801 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:3549 +#: builtin/pack-objects.c:3803 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3805 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:3554 +#: builtin/pack-objects.c:3808 msgid "use the sparse reachability algorithm" msgstr "" -#: builtin/pack-objects.c:3556 +#: builtin/pack-objects.c:3810 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3812 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:3560 +#: builtin/pack-objects.c:3814 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:3562 +#: builtin/pack-objects.c:3816 msgid "ignore this pack" msgstr "" -#: builtin/pack-objects.c:3564 +#: builtin/pack-objects.c:3818 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:3566 +#: builtin/pack-objects.c:3820 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:3568 +#: builtin/pack-objects.c:3822 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:3570 +#: builtin/pack-objects.c:3824 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:3574 +#: builtin/pack-objects.c:3828 msgid "write a bitmap index if possible" msgstr "" -#: builtin/pack-objects.c:3578 +#: builtin/pack-objects.c:3832 msgid "handling for missing objects" msgstr "" -#: builtin/pack-objects.c:3581 +#: builtin/pack-objects.c:3835 msgid "do not pack objects in promisor packfiles" msgstr "" -#: builtin/pack-objects.c:3583 +#: builtin/pack-objects.c:3837 msgid "respect islands during delta compression" msgstr "" -#: builtin/pack-objects.c:3585 +#: builtin/pack-objects.c:3839 msgid "protocol" msgstr "" -#: builtin/pack-objects.c:3586 +#: builtin/pack-objects.c:3840 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" -#: builtin/pack-objects.c:3617 +#: builtin/pack-objects.c:3873 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "" -#: builtin/pack-objects.c:3622 +#: builtin/pack-objects.c:3878 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "" -#: builtin/pack-objects.c:3676 +#: builtin/pack-objects.c:3934 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" -#: builtin/pack-objects.c:3678 +#: builtin/pack-objects.c:3936 msgid "minimum pack size limit is 1 MiB" msgstr "" -#: builtin/pack-objects.c:3683 +#: builtin/pack-objects.c:3941 msgid "--thin cannot be used to build an indexable pack" msgstr "" -#: builtin/pack-objects.c:3686 +#: builtin/pack-objects.c:3944 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "" -#: builtin/pack-objects.c:3692 +#: builtin/pack-objects.c:3950 msgid "cannot use --filter without --stdout" msgstr "" -#: builtin/pack-objects.c:3752 +#: builtin/pack-objects.c:3952 +msgid "cannot use --filter with --stdin-packs" +msgstr "" + +#: builtin/pack-objects.c:3956 +msgid "cannot use internal rev list with --stdin-packs" +msgstr "" + +#: builtin/pack-objects.c:4015 msgid "Enumerating objects" msgstr "" -#: builtin/pack-objects.c:3783 +#: builtin/pack-objects.c:4052 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -17721,65 +18317,71 @@ msgstr "" #: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" -msgstr "" +msgstr "Nilai tidak valid untuk %s: %s" #: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" -msgstr "" +msgstr "git pull [<opsi>] [<repositori> [<spek referensi>]]" #: builtin/pull.c:123 msgid "control for recursive fetching of submodules" -msgstr "" +msgstr "kontrol pengambilan rekursif submodul" #: builtin/pull.c:127 msgid "Options related to merging" -msgstr "" +msgstr "Opsi yang berkaitan dengan penggabungan" #: builtin/pull.c:130 msgid "incorporate changes by rebasing rather than merging" -msgstr "" +msgstr "masukkan perubahan dengan pendasaran ulang daripada penggabungan" -#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126 msgid "allow fast-forward" -msgstr "" +msgstr "perbolehkan maju cepat" -#: builtin/pull.c:167 parse-options.h:339 +#: builtin/pull.c:167 parse-options.h:340 msgid "automatically stash/stash pop before and after" -msgstr "" +msgstr "stash/stash pop otomatis sebelum dan sesudah" #: builtin/pull.c:183 msgid "Options related to fetching" -msgstr "" +msgstr "Opsi yang berkaitan dengan pengambilan" #: builtin/pull.c:193 msgid "force overwrite of local branch" -msgstr "" +msgstr "paksa timpa cabang lokal" #: builtin/pull.c:201 msgid "number of submodules pulled in parallel" -msgstr "" +msgstr "nomor submodul ditarik dalam paralel" #: builtin/pull.c:317 #, c-format msgid "Invalid value for pull.ff: %s" -msgstr "" +msgstr "Nilai tidak valid untuk pull.ff: %s" #: builtin/pull.c:445 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" +"Tidak ada kandidat untuk didasarkan ulang diantara referensi yang baru saja " +"Anda ambil." #: builtin/pull.c:447 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" +"Tidak ada kandidat untuk digabungkan diantara referensi yang baru sajaAnda " +"ambil." #: builtin/pull.c:448 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" +"Umumnya itu berarti Anda memberikan spek referensi wildcard yang tidak\n" +"cocok pada ujung remote." #: builtin/pull.c:451 #, c-format @@ -17788,40 +18390,45 @@ msgid "" "a branch. Because this is not the default configured remote\n" "for your current branch, you must specify a branch on the command line." msgstr "" +"Anda minta untuk tarik dari remote '%s', tapi tidak menyebutkan\n" +"satu cabang. Oleh karena ini bukan remote terkonfigurasi asali untuk\n" +"cabang Anda saat ini, Anda harus sebutkan satu cabang pada baris perintah." -#: builtin/pull.c:456 builtin/rebase.c:1253 +#: builtin/pull.c:456 builtin/rebase.c:1248 msgid "You are not currently on a branch." -msgstr "" +msgstr "Anda tidak berada pada sebuah cabang." #: builtin/pull.c:458 builtin/pull.c:473 msgid "Please specify which branch you want to rebase against." -msgstr "" +msgstr "Mohon sebutkan cabang mana yang Anda ingin didasarkan ulang." #: builtin/pull.c:460 builtin/pull.c:475 msgid "Please specify which branch you want to merge with." -msgstr "" +msgstr "Mohon sebutkan cabang mana yang Anda ingin digabungkan." #: builtin/pull.c:461 builtin/pull.c:476 msgid "See git-pull(1) for details." -msgstr "" +msgstr "Lihat git-pull(1) untuk selengkapnya." #: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 -#: builtin/rebase.c:1259 +#: builtin/rebase.c:1254 msgid "<remote>" -msgstr "" +msgstr "<remote>" #: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483 msgid "<branch>" -msgstr "" +msgstr "<cabang>" -#: builtin/pull.c:471 builtin/rebase.c:1251 +#: builtin/pull.c:471 builtin/rebase.c:1246 msgid "There is no tracking information for the current branch." -msgstr "" +msgstr "Tidak ada informasi pelacakan untuk cabang saat ini." #: builtin/pull.c:480 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" +"Jika Anda ingin menyetel informasi pelacakan untuk cabang ini Anda bisa " +"melakukannya dengan:" #: builtin/pull.c:485 #, c-format @@ -17829,15 +18436,17 @@ msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "" +"Konfigurasi Anda menyebutkan untuk menggabungkan dengan referensi '%s'\n" +"dari remote, tapi tidak ada referensi seperti itu yang diambil." #: builtin/pull.c:596 #, c-format msgid "unable to access commit %s" -msgstr "" +msgstr "Tidak dapat mengakses komit %s" #: builtin/pull.c:902 msgid "ignoring --verify-signatures for rebase" -msgstr "" +msgstr "mengabaikan --verify-signatures untuk pendasaran ulang" #: builtin/pull.c:930 msgid "" @@ -17855,18 +18464,32 @@ msgid "" "or --ff-only on the command line to override the configured default per\n" "invocation.\n" msgstr "" +"Menarik tanpa menyebutkan cara merujukkan cabang yang berlainan tidak\n" +"disarankan. Anda dapat mematikan pesan ini dengan menjalankan salah\n" +"satu perintah berikut sebelum penarikan berikutnya:\n" +"\n" +" git config pull.rebase false # penggabungan (strategi asali)\n" +" git config pull.rebase true # pendasaran ulang\n" +" git config pull.ff only # hanya maju cepat\n" +"\n" +"Anda dapat mengganti \"git config\" dengan \"git config --global\" untuk\n" +"menyetel pilihan asali untuk semua repositori. Anda juga dapat melewatkan\n" +"--rebase, --no-rebase, atau --ff-only pada baris perintah untuk menimpa\n" +"asali terkonfigurasi untuk setiap invokasi.\n" #: builtin/pull.c:991 msgid "Updating an unborn branch with changes added to the index." msgstr "" +"Memperbarui cabang yang belum lahir dengan perubahan yang ditambahkan ke " +"indeks." #: builtin/pull.c:995 msgid "pull with rebase" -msgstr "" +msgstr "tarik dengan pendasaran ulang" #: builtin/pull.c:996 msgid "please commit or stash them." -msgstr "" +msgstr "mohon komit atau stase itu." #: builtin/pull.c:1021 #, c-format @@ -17875,6 +18498,8 @@ msgid "" "fast-forwarding your working tree from\n" "commit %s." msgstr "" +"fetch memperbarui kepala cabang saat ini.\n" +"memajukan-cepat pohon kerja Anda dari komit %s." #: builtin/pull.c:1027 #, c-format @@ -17886,18 +18511,25 @@ msgid "" "$ git reset --hard\n" "to recover." msgstr "" +"Tidak dapat maju-cepat pohon kerja Anda.\n" +"Setelah Anda yakin Anda simpan apapun yang penting dari keluaran\n" +"$ git diff %s,\n" +"jalankan\n" +"$ git reset --hard\n" +"untuk memulihkan." #: builtin/pull.c:1042 msgid "Cannot merge multiple branches into empty head." -msgstr "" +msgstr "Tidak dapat menggabungkan banyak cabang ke kepala kosong." #: builtin/pull.c:1046 msgid "Cannot rebase onto multiple branches." -msgstr "" +msgstr "Tidak dapat mendasarkan ulang pada banyak cabang." #: builtin/pull.c:1067 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" +"tidak dapat mendasarkan ulang dengan modifikasi submodul yang terekam lokal." #: builtin/push.c:19 msgid "git push [<options>] [<repository> [<refspec>...]]" @@ -18214,10 +18846,6 @@ msgstr "" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "" -#: builtin/range-diff.c:28 -msgid "Percentage by which creation is weighted" -msgstr "" - #: builtin/range-diff.c:30 msgid "use simple diff colors" msgstr "" @@ -18335,201 +18963,205 @@ msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " "[<upstream> [<branch>]]" msgstr "" +"git rebase [-i] [opsi] [--exec <perintah>] [--onto <basis baru> | --keep-" +"base][<hulu> [<cabang>]]" #: builtin/rebase.c:37 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" +"git rebase [-i] [opsi] [--exec <perintah>] [--onto <basis baru>] --root " +"[<cabang>]" #: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" -msgstr "" +msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246 +#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245 #, c-format msgid "unusable todo list: '%s'" -msgstr "" +msgstr "daftar todo tidak dapat digunakan: '%s'" -#: builtin/rebase.c:312 +#: builtin/rebase.c:311 #, c-format msgid "could not create temporary %s" -msgstr "" +msgstr "tidak dapat membuat %s sementara" -#: builtin/rebase.c:318 +#: builtin/rebase.c:317 msgid "could not mark as interactive" -msgstr "" +msgstr "tidak dapat menandai sebagai interaktif" -#: builtin/rebase.c:371 +#: builtin/rebase.c:370 msgid "could not generate todo list" -msgstr "" +msgstr "tidak dapat membuat daftar todo" -#: builtin/rebase.c:413 +#: builtin/rebase.c:412 msgid "a base commit must be provided with --upstream or --onto" -msgstr "" +msgstr "basis komit harus diberikan dengan --upstream atau --onto" -#: builtin/rebase.c:482 +#: builtin/rebase.c:481 msgid "git rebase--interactive [<options>]" -msgstr "" +msgstr "git rebase--interactive [<opsi>]" -#: builtin/rebase.c:495 builtin/rebase.c:1394 +#: builtin/rebase.c:494 builtin/rebase.c:1389 msgid "keep commits which start empty" -msgstr "" +msgstr "simpan komit yang dimulai kosong" -#: builtin/rebase.c:499 builtin/revert.c:128 +#: builtin/rebase.c:498 builtin/revert.c:128 msgid "allow commits with empty messages" -msgstr "" +msgstr "perbolehkan komit dengan pesan kosong" -#: builtin/rebase.c:501 +#: builtin/rebase.c:500 msgid "rebase merge commits" -msgstr "" +msgstr "dasarkan ulang komit penggabungan" -#: builtin/rebase.c:503 +#: builtin/rebase.c:502 msgid "keep original branch points of cousins" -msgstr "" +msgstr "simpan titik cabang sepupu asal " -#: builtin/rebase.c:505 +#: builtin/rebase.c:504 msgid "move commits that begin with squash!/fixup!" -msgstr "" +msgstr "pindahkan komit yang diawali dengan squash!/fixup!" -#: builtin/rebase.c:506 +#: builtin/rebase.c:505 msgid "sign commits" -msgstr "" +msgstr "tandatangani komit" -#: builtin/rebase.c:508 builtin/rebase.c:1333 +#: builtin/rebase.c:507 builtin/rebase.c:1328 msgid "display a diffstat of what changed upstream" -msgstr "" +msgstr "perlihatkan diffstat apa yang berubah di hulu" -#: builtin/rebase.c:510 +#: builtin/rebase.c:509 msgid "continue rebase" -msgstr "" +msgstr "lanjutkan pendasaran ulang" -#: builtin/rebase.c:512 +#: builtin/rebase.c:511 msgid "skip commit" -msgstr "" +msgstr "lewatkan komit" -#: builtin/rebase.c:513 +#: builtin/rebase.c:512 msgid "edit the todo list" -msgstr "" +msgstr "sunting daftar todo" -#: builtin/rebase.c:515 +#: builtin/rebase.c:514 msgid "show the current patch" -msgstr "" +msgstr "perlihatkan tambalan saat ini" -#: builtin/rebase.c:518 +#: builtin/rebase.c:517 msgid "shorten commit ids in the todo list" -msgstr "" +msgstr "pendekkan id komit dalam daftar todo" -#: builtin/rebase.c:520 +#: builtin/rebase.c:519 msgid "expand commit ids in the todo list" -msgstr "" +msgstr "jabarkan id komit dalam daftar todo" -#: builtin/rebase.c:522 +#: builtin/rebase.c:521 msgid "check the todo list" -msgstr "" +msgstr "periksa daftar todo" -#: builtin/rebase.c:524 +#: builtin/rebase.c:523 msgid "rearrange fixup/squash lines" -msgstr "" +msgstr "susun ulang baris fixup/squash" -#: builtin/rebase.c:526 +#: builtin/rebase.c:525 msgid "insert exec commands in todo list" -msgstr "" +msgstr "masukkan perintah exec ke dalam daftar todo" -#: builtin/rebase.c:527 +#: builtin/rebase.c:526 msgid "onto" -msgstr "" +msgstr "ke" -#: builtin/rebase.c:530 +#: builtin/rebase.c:529 msgid "restrict-revision" -msgstr "" +msgstr "restrict-revision" -#: builtin/rebase.c:530 +#: builtin/rebase.c:529 msgid "restrict revision" -msgstr "" +msgstr "batasi revisi" -#: builtin/rebase.c:532 +#: builtin/rebase.c:531 msgid "squash-onto" -msgstr "" +msgstr "squash-onto" -#: builtin/rebase.c:533 +#: builtin/rebase.c:532 msgid "squash onto" -msgstr "" +msgstr "lumat ke" -#: builtin/rebase.c:535 +#: builtin/rebase.c:534 msgid "the upstream commit" -msgstr "" +msgstr "komit hulu" -#: builtin/rebase.c:537 +#: builtin/rebase.c:536 msgid "head-name" -msgstr "" +msgstr "head-name" -#: builtin/rebase.c:537 +#: builtin/rebase.c:536 msgid "head name" -msgstr "" +msgstr "nama kepala" -#: builtin/rebase.c:542 +#: builtin/rebase.c:541 msgid "rebase strategy" -msgstr "" +msgstr "strategi pendasaran" -#: builtin/rebase.c:543 +#: builtin/rebase.c:542 msgid "strategy-opts" -msgstr "" +msgstr "strategy-opts" -#: builtin/rebase.c:544 +#: builtin/rebase.c:543 msgid "strategy options" -msgstr "" +msgstr "opsi strategi" -#: builtin/rebase.c:545 +#: builtin/rebase.c:544 msgid "switch-to" -msgstr "" +msgstr "switch-to" -#: builtin/rebase.c:546 +#: builtin/rebase.c:545 msgid "the branch or commit to checkout" -msgstr "" +msgstr "cabang atau komit untuk di-checkout" -#: builtin/rebase.c:547 +#: builtin/rebase.c:546 msgid "onto-name" -msgstr "" +msgstr "onto-name" -#: builtin/rebase.c:547 +#: builtin/rebase.c:546 msgid "onto name" -msgstr "" +msgstr "nama ke" -#: builtin/rebase.c:548 +#: builtin/rebase.c:547 msgid "cmd" -msgstr "" +msgstr "cmd" -#: builtin/rebase.c:548 +#: builtin/rebase.c:547 msgid "the command to run" -msgstr "" +msgstr "perintah untuk dijalankan" -#: builtin/rebase.c:551 builtin/rebase.c:1427 +#: builtin/rebase.c:550 builtin/rebase.c:1422 msgid "automatically re-schedule any `exec` that fails" -msgstr "" +msgstr "jadwal ulang otomatis `exec` apa saja yang gagal" -#: builtin/rebase.c:567 +#: builtin/rebase.c:566 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" -msgstr "" +msgstr "--[no-]rebase-cousins tidak ada efek tanpa --rebase-merges" -#: builtin/rebase.c:583 +#: builtin/rebase.c:582 #, c-format msgid "%s requires the merge backend" -msgstr "" +msgstr "%s butuh tulang belakang penggabungan" -#: builtin/rebase.c:626 +#: builtin/rebase.c:625 #, c-format msgid "could not get 'onto': '%s'" -msgstr "" +msgstr "tidak dapat mendapatkan 'ke': '%s'" -#: builtin/rebase.c:643 +#: builtin/rebase.c:642 #, c-format msgid "invalid orig-head: '%s'" -msgstr "" +msgstr "orig-head tidak valid: '%s'" -#: builtin/rebase.c:668 +#: builtin/rebase.c:667 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" -msgstr "" +msgstr "abaikan allow_rerere_autoupdate yang tak valid: '%s'" #: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81 msgid "" @@ -18539,6 +19171,12 @@ msgid "" "To abort and get back to the state before \"git rebase\", run \"git rebase --" "abort\"." msgstr "" +"Selesaikan semua konflik secara manual, tandai sebagai terselesaikan\n" +"dengan \"git add/rm <berkas terkonflik>\", lalu jalankan\n" +"\"git rebase --continue\".\n" +"Anda juga bisa melewatkan komit ini: jalankan \"git rebase --skip\".\n" +"Untuk membatalkan dan kembali ke kondisi sebelum \"git rebase\",jalankan " +"\"git rebase --abort\"." #: builtin/rebase.c:896 #, c-format @@ -18551,15 +19189,24 @@ msgid "" "\n" "As a result, git cannot rebase them." msgstr "" +"\n" +"git menemui kesalahan ketika menyiapan tambalan untuk memainkan ulang\n" +"revisi berikut:\n" +"\n" +" %s\n" +"\n" +"Hasilnya git tidak dapat mendasarkan ulang itu." -#: builtin/rebase.c:1227 +#: builtin/rebase.c:1222 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" "\"." msgstr "" +"tipe kosong tak dikenali '%s'; nilai yang valid adalah \"drop\", \"keep\", " +"dan \"ask\"." -#: builtin/rebase.c:1245 +#: builtin/rebase.c:1240 #, c-format msgid "" "%s\n" @@ -18569,8 +19216,14 @@ msgid "" " git rebase '<branch>'\n" "\n" msgstr "" +"%s\n" +"Mohon sebutkan cabang mana yang Anda ingin dasarkan ulang.\n" +"Lihat git-rebase(1) untuk selengkapnya.\n" +"\n" +" git rebase '<cabang>'.\n" +"\n" -#: builtin/rebase.c:1261 +#: builtin/rebase.c:1256 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -18578,202 +19231,205 @@ msgid "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" msgstr "" +"Kalau Anda ingin menyetel informasi pelacakan untuk cabang ini Anda\n" +"dapat melakukan hal itu dengan:\n" +" git branch --set-upstream-to=%s/<cabang> %s\n" +"\n" -#: builtin/rebase.c:1291 +#: builtin/rebase.c:1286 msgid "exec commands cannot contain newlines" -msgstr "" +msgstr "perintah exec tidak dapat berisi baris baru" -#: builtin/rebase.c:1295 +#: builtin/rebase.c:1290 msgid "empty exec command" -msgstr "" +msgstr "perintah exec kosong" -#: builtin/rebase.c:1324 +#: builtin/rebase.c:1319 msgid "rebase onto given branch instead of upstream" -msgstr "" +msgstr "dasarkan ulang kepada cabang yang diberikan daripada hulu" -#: builtin/rebase.c:1326 +#: builtin/rebase.c:1321 msgid "use the merge-base of upstream and branch as the current base" -msgstr "" +msgstr "gunakan merge-base hulu dan cabang sebagai dasar saat ini" -#: builtin/rebase.c:1328 +#: builtin/rebase.c:1323 msgid "allow pre-rebase hook to run" -msgstr "" +msgstr "perbolehkan hook pre-rebase untuk dijalankan" -#: builtin/rebase.c:1330 +#: builtin/rebase.c:1325 msgid "be quiet. implies --no-stat" -msgstr "" +msgstr "diam. menyiratkan --no-stat" -#: builtin/rebase.c:1336 +#: builtin/rebase.c:1331 msgid "do not show diffstat of what changed upstream" -msgstr "" +msgstr "jangan perlihatkan diffstat apa yang berubah di hulu" -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1334 msgid "add a Signed-off-by trailer to each commit" -msgstr "" +msgstr "tambahkan trailer Signed-off-by ke setiap komit" -#: builtin/rebase.c:1342 +#: builtin/rebase.c:1337 msgid "make committer date match author date" -msgstr "" +msgstr "jadikan tanggal pengkomit sama dengan tanggal pengarang" -#: builtin/rebase.c:1344 +#: builtin/rebase.c:1339 msgid "ignore author date and use current date" -msgstr "" +msgstr "abaikan tanggal pengarang dan gunakan tanggal saat ini" -#: builtin/rebase.c:1346 +#: builtin/rebase.c:1341 msgid "synonym of --reset-author-date" -msgstr "" +msgstr "sinonim dari --reset-author-date" -#: builtin/rebase.c:1348 builtin/rebase.c:1352 +#: builtin/rebase.c:1343 builtin/rebase.c:1347 msgid "passed to 'git apply'" -msgstr "" +msgstr "lewatkan ke 'git apply'" -#: builtin/rebase.c:1350 +#: builtin/rebase.c:1345 msgid "ignore changes in whitespace" -msgstr "" +msgstr "abaikan perubahan spasi" -#: builtin/rebase.c:1354 builtin/rebase.c:1357 +#: builtin/rebase.c:1349 builtin/rebase.c:1352 msgid "cherry-pick all commits, even if unchanged" -msgstr "" +msgstr "petik ceri semua komit, bahkan jika tak berubah" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1354 msgid "continue" -msgstr "" +msgstr "lanjutkan" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1357 msgid "skip current patch and continue" -msgstr "" +msgstr "lewatkan tambalan saat ini dan lanjutkan" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1359 msgid "abort and check out the original branch" -msgstr "" +msgstr "hentikan dan check out cabang asli" -#: builtin/rebase.c:1367 +#: builtin/rebase.c:1362 msgid "abort but keep HEAD where it is" -msgstr "" +msgstr "hentikan tapi simpan HEAD dimana itu berada" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1363 msgid "edit the todo list during an interactive rebase" -msgstr "" +msgstr "sunting daftar todo selama pendasaran ulang interaktif" -#: builtin/rebase.c:1371 +#: builtin/rebase.c:1366 msgid "show the patch file being applied or merged" -msgstr "" +msgstr "perlihatkan berkas tambalan yang sedang diterapkan atau digabungkan" -#: builtin/rebase.c:1374 +#: builtin/rebase.c:1369 msgid "use apply strategies to rebase" -msgstr "" +msgstr "gunakan strategi penerapan ke pendasaran ulang" -#: builtin/rebase.c:1378 +#: builtin/rebase.c:1373 msgid "use merging strategies to rebase" -msgstr "" +msgstr "gunakan strategi penggabungan ke pendasaran ulang" -#: builtin/rebase.c:1382 +#: builtin/rebase.c:1377 msgid "let the user edit the list of commits to rebase" -msgstr "" +msgstr "biarkan pengguna menyunting daftar komit untuk didasarkan ulang" -#: builtin/rebase.c:1386 +#: builtin/rebase.c:1381 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" -msgstr "" +msgstr "(USANG) coba buat ulang penggabungan daripada abaikan itu" -#: builtin/rebase.c:1391 +#: builtin/rebase.c:1386 msgid "how to handle commits that become empty" -msgstr "" +msgstr "bagaimana cara menangani komit yang menjadi kosong" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1393 msgid "move commits that begin with squash!/fixup! under -i" -msgstr "" +msgstr "pindahakan komit yang diawali dengan squash!/fixup! di bawah -i" -#: builtin/rebase.c:1405 +#: builtin/rebase.c:1400 msgid "add exec lines after each commit of the editable list" msgstr "" +"tambahkan baris exec setelah setiap komit dari daftar yang bisa disunting" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1404 msgid "allow rebasing commits with empty messages" -msgstr "" +msgstr "perbolehkan mendasarkan ulang komit dengan pesan kosong" -#: builtin/rebase.c:1413 +#: builtin/rebase.c:1408 msgid "try to rebase merges instead of skipping them" -msgstr "" +msgstr "coba mendasarkan ulang penggabungan daripada melewatkan itu" -#: builtin/rebase.c:1416 +#: builtin/rebase.c:1411 msgid "use 'merge-base --fork-point' to refine upstream" -msgstr "" +msgstr "gunakan 'merge-base --fork-point' untuk menyaring hulu" -#: builtin/rebase.c:1418 +#: builtin/rebase.c:1413 msgid "use the given merge strategy" -msgstr "" +msgstr "gunakan strategi penggabungan yang diberikan" -#: builtin/rebase.c:1420 builtin/revert.c:115 +#: builtin/rebase.c:1415 builtin/revert.c:115 msgid "option" -msgstr "" +msgstr "opsi" -#: builtin/rebase.c:1421 +#: builtin/rebase.c:1416 msgid "pass the argument through to the merge strategy" -msgstr "" +msgstr "lewatkan argumen ke strategi penggabungan" -#: builtin/rebase.c:1424 +#: builtin/rebase.c:1419 msgid "rebase all reachable commits up to the root(s)" -msgstr "" +msgstr "dasarkan ulang semua komit yang bisa dicapai hingga ke akar" -#: builtin/rebase.c:1429 +#: builtin/rebase.c:1424 msgid "apply all changes, even those already present upstream" -msgstr "" +msgstr "terapkan semua perubahan, bahkan yang sudah ada di hulu" -#: builtin/rebase.c:1446 -msgid "" -"the rebase.useBuiltin support has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" - -#: builtin/rebase.c:1452 +#: builtin/rebase.c:1442 msgid "It looks like 'git am' is in progress. Cannot rebase." -msgstr "" +msgstr "Sepertinya 'git am' sedang berjalan. Tidak dapat mendasarkan ulang" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1483 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" +"git rebase --preserve-merges usang. Gunakan --rebase-merges sebagai gantinya." -#: builtin/rebase.c:1498 +#: builtin/rebase.c:1488 msgid "cannot combine '--keep-base' with '--onto'" -msgstr "" +msgstr "tidak dapat menggabungkan '--keep-base' dengan '--onto'" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1490 msgid "cannot combine '--keep-base' with '--root'" -msgstr "" +msgstr "tidak dapat menggabungkan '--keep-base' dengan '--root'" -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1494 msgid "cannot combine '--root' with '--fork-point'" -msgstr "" +msgstr "tidak dapat menggabungkan '--root' dengan '--fork-point'" -#: builtin/rebase.c:1507 +#: builtin/rebase.c:1497 msgid "No rebase in progress?" -msgstr "" +msgstr "Tidak ada pendasaran ulang yang sedang berjalan?" -#: builtin/rebase.c:1511 +#: builtin/rebase.c:1501 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" +"Aksi --edit-todo hanya dapat digunakan selama pendasaran ulang interaktif." -#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" -msgstr "" +msgstr "Tidak dapat membaca HEAD" -#: builtin/rebase.c:1546 +#: builtin/rebase.c:1536 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" +"Anda harus menyunting semua konflik penggabungan lalu\n" +"tandai itu sebagai terselesaikan menggunakan git add" -#: builtin/rebase.c:1565 +#: builtin/rebase.c:1555 msgid "could not discard worktree changes" -msgstr "" +msgstr "tidak dapat menyingkirkan perubahan pohon kerja" -#: builtin/rebase.c:1584 +#: builtin/rebase.c:1574 #, c-format msgid "could not move back to %s" -msgstr "" +msgstr "tidak dapt memindahkan kembali ke %s" -#: builtin/rebase.c:1630 +#: builtin/rebase.c:1620 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18785,135 +19441,147 @@ msgid "" "and run me again. I am stopping in case you still have something\n" "valuable there.\n" msgstr "" +"Sepertinya sudah ada direktori %s, dan saya ingin tahu kalau Anda\n" +"berada di tengah-tengah pendasaran ulang yang lain. Jika itu maksudnya,\n" +"mohon coba \n" +"\t%s\n" +"Jika itu bukan, mohon\n" +"\t%s\n" +"dan jalankan saya lagi. Saya berhenti seandainya Anda masih punya\n" +"sesuatu yang berharga di sana.\n" -#: builtin/rebase.c:1658 +#: builtin/rebase.c:1648 msgid "switch `C' expects a numerical value" -msgstr "" +msgstr "tombol `C' harap nilai numerik" -#: builtin/rebase.c:1700 +#: builtin/rebase.c:1690 #, c-format msgid "Unknown mode: %s" -msgstr "" +msgstr "Mode tidak dikenal: %s" -#: builtin/rebase.c:1739 +#: builtin/rebase.c:1729 msgid "--strategy requires --merge or --interactive" -msgstr "" +msgstr "--strategy butuh --merge atau --interactive" -#: builtin/rebase.c:1769 +#: builtin/rebase.c:1759 msgid "cannot combine apply options with merge options" -msgstr "" +msgstr "tidak dapat menggabungkan opsi penerapan dengan opsi penggabungan" -#: builtin/rebase.c:1782 +#: builtin/rebase.c:1772 #, c-format msgid "Unknown rebase backend: %s" -msgstr "" +msgstr "Tulang belakang pendasaran ulang tidak dikenal: %s" -#: builtin/rebase.c:1812 +#: builtin/rebase.c:1802 msgid "--reschedule-failed-exec requires --exec or --interactive" -msgstr "" +msgstr "--reschedule-failed-exec butuh --exec atau --interactive" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1822 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" -msgstr "" +msgstr "tidak dapat menggabungkan '--preserve-merges' dengan '--rebase-merges'" -#: builtin/rebase.c:1836 +#: builtin/rebase.c:1826 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" +"error: tidak dapat menggabungkan '--preserve-merges' dengan '--reschedule-" +"failed-exec'" -#: builtin/rebase.c:1860 +#: builtin/rebase.c:1850 #, c-format msgid "invalid upstream '%s'" -msgstr "" +msgstr "hulu tidak valid '%s'" -#: builtin/rebase.c:1866 +#: builtin/rebase.c:1856 msgid "Could not create new root commit" -msgstr "" +msgstr "tidak dapat membuat komit akar baru" -#: builtin/rebase.c:1892 +#: builtin/rebase.c:1882 #, c-format msgid "'%s': need exactly one merge base with branch" -msgstr "" +msgstr "'%s': butuh tepatnya satu dasar penggabungan dengan cabang" -#: builtin/rebase.c:1895 +#: builtin/rebase.c:1885 #, c-format msgid "'%s': need exactly one merge base" -msgstr "" +msgstr "'%s': butuh tepatnya satu dasar penggabungan" -#: builtin/rebase.c:1903 +#: builtin/rebase.c:1893 #, c-format msgid "Does not point to a valid commit '%s'" -msgstr "" +msgstr "Tidak menunjuk pada komit yang valid '%s'" -#: builtin/rebase.c:1931 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" -msgstr "" +msgstr "fatal: tidak ada cabang/komit seperti '%s'" -#: builtin/rebase.c:1939 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:2414 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2415 #, c-format msgid "No such ref: %s" -msgstr "" +msgstr "Tidak ada referensi seperti: %s" -#: builtin/rebase.c:1950 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" -msgstr "" +msgstr "Tidak dapat menguraikan HEAD ke sebuah revisi" -#: builtin/rebase.c:1971 +#: builtin/rebase.c:1961 msgid "Please commit or stash them." -msgstr "" +msgstr "Mohon komit atau stase itu." -#: builtin/rebase.c:2007 +#: builtin/rebase.c:1997 #, c-format msgid "could not switch to %s" -msgstr "" +msgstr "tidak dapat mengganti ke %s" -#: builtin/rebase.c:2018 +#: builtin/rebase.c:2008 msgid "HEAD is up to date." -msgstr "" +msgstr "HEAD terbaru." -#: builtin/rebase.c:2020 +#: builtin/rebase.c:2010 #, c-format msgid "Current branch %s is up to date.\n" -msgstr "" +msgstr "Cabang saat ini %s terbaru.\n" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:2018 msgid "HEAD is up to date, rebase forced." -msgstr "" +msgstr "HEAD terbaru, pendasaran ulang dipaksa." -#: builtin/rebase.c:2030 +#: builtin/rebase.c:2020 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" -msgstr "" +msgstr "Cabang saat ini %s terbaru, pendasaran ulang dipaksa.\n" -#: builtin/rebase.c:2038 +#: builtin/rebase.c:2028 msgid "The pre-rebase hook refused to rebase." -msgstr "" +msgstr "Hook pre-rebase menolak mendasarkan ulang." -#: builtin/rebase.c:2045 +#: builtin/rebase.c:2035 #, c-format msgid "Changes to %s:\n" -msgstr "" +msgstr "Perubahan unuk %s:\n" -#: builtin/rebase.c:2048 +#: builtin/rebase.c:2038 #, c-format msgid "Changes from %s to %s:\n" -msgstr "" +msgstr "Perubahan dari %s ke %s:\n" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:2063 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" +"Pertama, memutar ulang kepala untuk memainkan ulang karya Anda diatas " +"itu...\n" -#: builtin/rebase.c:2082 +#: builtin/rebase.c:2072 msgid "Could not detach HEAD" -msgstr "" +msgstr "Tidak dapat melepas HEAD" -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2081 #, c-format msgid "Fast-forwarded %s to %s.\n" -msgstr "" +msgstr "Maju-cepat %s ke %s.\n" #: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" @@ -18948,11 +19616,11 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" -#: builtin/receive-pack.c:2481 +#: builtin/receive-pack.c:2479 msgid "quiet" msgstr "" -#: builtin/receive-pack.c:2495 +#: builtin/receive-pack.c:2493 msgid "You must specify a directory." msgstr "" @@ -19013,158 +19681,163 @@ msgstr "" #: builtin/remote.c:17 msgid "git remote [-v | --verbose]" -msgstr "" +msgstr "git remote [-v | --verbose]" #: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" +"git remote add [-t <cabang>] [-m <master>] [-f] [--tags | --no-tags] [--" +"mirror=<fetch|push>] <nama> <url>" #: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" -msgstr "" +msgstr "git remote rename <lama> <baru>" #: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" -msgstr "" +msgstr "git remote remove <nama>" #: builtin/remote.c:21 builtin/remote.c:49 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" -msgstr "" +msgstr "git remote set-head <nama> (-a | --auto | -d | --delete | <cabang>)" #: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" -msgstr "" +msgstr "git remote [-v | --verbose] show [-n] <nama>" #: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" -msgstr "" +msgstr "git remote prune [-n | --dry-run] <nama>" #: builtin/remote.c:24 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" +"git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remote>)...]" #: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." -msgstr "" +msgstr "git remote set-branches [--add] <nama> <cabang>..." #: builtin/remote.c:26 builtin/remote.c:75 msgid "git remote get-url [--push] [--all] <name>" -msgstr "" +msgstr "git remote get-url [--push] [--all] <nama>" #: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" -msgstr "" +msgstr "git remote set-url [--push] <nama> <url baru> [<url lama>]" #: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --add <name> <newurl>" -msgstr "" +msgstr "git remote set-url --add <nama> <url baru>" #: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --delete <name> <url>" -msgstr "" +msgstr "git remote set-url --delete <nama> <url>" #: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" -msgstr "" +msgstr "git remote add [<opsi>] <nama> <url>" #: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." -msgstr "" +msgstr "git remote set-branches <nama> <cabang>" #: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." -msgstr "" +msgstr "git remote set-branches --add <nama> <cabang>" #: builtin/remote.c:60 msgid "git remote show [<options>] <name>" -msgstr "" +msgstr "git remote show [<opsi>] <nama>" #: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" -msgstr "" +msgstr "git remote prune [<opsi>] <nama>" #: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." -msgstr "" +msgstr "git remote update [<opsi>] [<group> | <remote>]..." #: builtin/remote.c:99 #, c-format msgid "Updating %s" -msgstr "" +msgstr "Memperbarui %s" #: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" +"--mirror berbahaya dan usang; mohon gunakan --mirror=fetch\n" +"\t atau --mirror=push sebagai gantinya" #: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" -msgstr "" +msgstr "argumen mirror tidak dikenal: %s" #: builtin/remote.c:164 msgid "fetch the remote branches" -msgstr "" +msgstr "ambil cabang remote" #: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" -msgstr "" +msgstr "impor semua tag dan objek yang terkait ketika mengambil" #: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" -msgstr "" +msgstr "atau jangan mengambil tag apapun (--no-tags)" #: builtin/remote.c:171 msgid "branch(es) to track" -msgstr "" +msgstr "cabang untuk dilacak" #: builtin/remote.c:172 msgid "master branch" -msgstr "" +msgstr "cabang master" #: builtin/remote.c:174 msgid "set up remote as a mirror to push to or fetch from" -msgstr "" +msgstr "atur remote sebagai cermin untuk didorong atau diambil" #: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" -msgstr "" +msgstr "menyebutkan cabang master tidak masuk akal dengan --mirror" #: builtin/remote.c:188 msgid "specifying branches to track makes sense only with fetch mirrors" -msgstr "" +msgstr "menyebutkan cabang untuk dilacak hanya masuk akal dengan cermin ambil" #: builtin/remote.c:195 builtin/remote.c:700 #, c-format msgid "remote %s already exists." -msgstr "" +msgstr "remote %s sudah ada" #: builtin/remote.c:240 #, c-format msgid "Could not setup master '%s'" -msgstr "" +msgstr "Tidak dapat mengatur master '%s'" #: builtin/remote.c:355 #, c-format msgid "Could not get fetch map for refspec %s" -msgstr "" +msgstr "Tidak dapat mendapatkan peta pengambilan untuk spek referensi %s" #: builtin/remote.c:454 builtin/remote.c:462 msgid "(matching)" -msgstr "" +msgstr "(sepadan)" #: builtin/remote.c:466 msgid "(delete)" -msgstr "" +msgstr "(hapus)" #: builtin/remote.c:655 #, c-format msgid "could not set '%s'" -msgstr "" +msgstr "tidak dapat menyetel '%s'" #: builtin/remote.c:660 #, c-format @@ -19173,16 +19846,19 @@ msgid "" "\t%s:%d\n" "now names the non-existent remote '%s'" msgstr "" +"Konfigurasi %s remote.pushDefault di:\n" +"\t%s:%d\n" +"sekarang menamai remote yang tiada '%s'" -#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 +#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943 #, c-format msgid "No such remote: '%s'" -msgstr "" +msgstr "Tidak ada remote seperti: '%s'" #: builtin/remote.c:710 #, c-format msgid "Could not rename config section '%s' to '%s'" -msgstr "" +msgstr "Tidak dapat menamai ulang bagian konfigurasi '%s' ke '%s'" #: builtin/remote.c:730 #, c-format @@ -19191,16 +19867,19 @@ msgid "" "\t%s\n" "\tPlease update the configuration manually if necessary." msgstr "" +"Tidak memperbarui spek referensi pengambilan bukan asali\n" +"\t%s\n" +"\tMohon perbarui konfigurasi secara manual bila diperlukan." #: builtin/remote.c:770 #, c-format msgid "deleting '%s' failed" -msgstr "" +msgstr "menghapus '%s' gagal" #: builtin/remote.c:804 #, c-format msgid "creating '%s' failed" -msgstr "" +msgstr "membuat '%s' gagal" #: builtin/remote.c:882 msgid "" @@ -19210,122 +19889,128 @@ msgid_plural "" "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" "to delete them, use:" msgstr[0] "" +"Catatan: Sebuah cabang diluar hierarki refs/remotes tidak dihapus;\n" +"untuk menghapus itu, gunakan:" msgstr[1] "" +"Catatan: Beberapa cabang diluar hierarki refs/remotes tidak dihapus;\n" +"untuk menghapus itu, gunakan:" #: builtin/remote.c:896 #, c-format msgid "Could not remove config section '%s'" -msgstr "" +msgstr "Tidak dapat menghapus bagian konfigurasi '%s'" #: builtin/remote.c:999 #, c-format msgid " new (next fetch will store in remotes/%s)" -msgstr "" +msgstr " baru (pengambilan berikutnya akan simpan di remotes/%s)" #: builtin/remote.c:1002 msgid " tracked" -msgstr "" +msgstr " dilacak" #: builtin/remote.c:1004 msgid " stale (use 'git remote prune' to remove)" -msgstr "" +msgstr " basi (gunakan 'git remote prune' untuk hapus)" #: builtin/remote.c:1006 msgid " ???" -msgstr "" +msgstr " ???" #: builtin/remote.c:1047 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" +"branch.%s.merge tidak valid; tidak dapat mendasarkan ulang ke lebih dari " +"satu cabang" #: builtin/remote.c:1056 #, c-format msgid "rebases interactively onto remote %s" -msgstr "" +msgstr "dasarkan ulang secara interaktif ke remote %s" #: builtin/remote.c:1058 #, c-format msgid "rebases interactively (with merges) onto remote %s" -msgstr "" +msgstr "dasarkan ulang secara interaktif (dengan penggabungan) ke remote %s" #: builtin/remote.c:1061 #, c-format msgid "rebases onto remote %s" -msgstr "" +msgstr "dasarkan ulang ke remote %s" #: builtin/remote.c:1065 #, c-format msgid " merges with remote %s" -msgstr "" +msgstr " gabungkan dengan remote %s" #: builtin/remote.c:1068 #, c-format msgid "merges with remote %s" -msgstr "" +msgstr "gabungkan dengan remote %s" #: builtin/remote.c:1071 #, c-format msgid "%-*s and with remote %s\n" -msgstr "" +msgstr "%-*s dan dengan remote %s\n" #: builtin/remote.c:1114 msgid "create" -msgstr "" +msgstr "buat" #: builtin/remote.c:1117 msgid "delete" -msgstr "" +msgstr "hapus" #: builtin/remote.c:1121 msgid "up to date" -msgstr "" +msgstr "terbaru" #: builtin/remote.c:1124 msgid "fast-forwardable" -msgstr "" +msgstr "bisa dimaju cepat" #: builtin/remote.c:1127 msgid "local out of date" -msgstr "" +msgstr "lokal kuno" #: builtin/remote.c:1134 #, c-format msgid " %-*s forces to %-*s (%s)" -msgstr "" +msgstr " %-*s memaksa untuk %-*s (%s)" #: builtin/remote.c:1137 #, c-format msgid " %-*s pushes to %-*s (%s)" -msgstr "" +msgstr " %-*s mendorong ke %-*s (%s)" #: builtin/remote.c:1141 #, c-format msgid " %-*s forces to %s" -msgstr "" +msgstr " %-*s memaksa untuk %s" #: builtin/remote.c:1144 #, c-format msgid " %-*s pushes to %s" -msgstr "" +msgstr " %-*s mendorong ke %s" #: builtin/remote.c:1212 msgid "do not query remotes" -msgstr "" +msgstr "jangan tanyakan remote" #: builtin/remote.c:1239 #, c-format msgid "* remote %s" -msgstr "" +msgstr "* remote %s" #: builtin/remote.c:1240 #, c-format msgid " Fetch URL: %s" -msgstr "" +msgstr " URL pengambilan: %s" #: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396 msgid "(no URL)" -msgstr "" +msgstr "(tidak ada URL)" #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" @@ -19334,175 +20019,176 @@ msgstr "" #: builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " Push URL: %s" -msgstr "" +msgstr " URL pendorongan: %s" #: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263 #, c-format msgid " HEAD branch: %s" -msgstr "" +msgstr " Cabang HEAD: %s" #: builtin/remote.c:1259 msgid "(not queried)" -msgstr "" +msgstr "(tidak ditanyakan)" #: builtin/remote.c:1261 msgid "(unknown)" -msgstr "" +msgstr "(tidak diketahui)" #: builtin/remote.c:1265 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" +" Cabang HEAD (HEAD remote ambigu, bisa jadi salah satu dari yang berikut):\n" #: builtin/remote.c:1277 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" -msgstr[0] "" -msgstr[1] "" +msgstr[0] " Cabang remote:%s" +msgstr[1] " Cabang remote:%s" #: builtin/remote.c:1280 builtin/remote.c:1306 msgid " (status not queried)" -msgstr "" +msgstr " (status tidak ditanyakan)" #: builtin/remote.c:1289 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" -msgstr[0] "" -msgstr[1] "" +msgstr[0] " Cabang lokal dikonfigurasi untuk 'git pull':" +msgstr[1] " Cabang lokal dikonfigurasi untuk 'git pull':" #: builtin/remote.c:1297 msgid " Local refs will be mirrored by 'git push'" -msgstr "" +msgstr " Referensi lokal yang akan dicerminkan oleh 'git push'" #: builtin/remote.c:1303 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] " Referensi lokal dikonfigurasi untuk 'git push'%s:" +msgstr[1] " Referensi lokal dikonfigurasi untuk 'git push'%s:" #: builtin/remote.c:1324 msgid "set refs/remotes/<name>/HEAD according to remote" -msgstr "" +msgstr "setel refs/remotes/<nama>/HEAD tergantung remote" #: builtin/remote.c:1326 msgid "delete refs/remotes/<name>/HEAD" -msgstr "" +msgstr "hapus refs/remotes/<nama>/HEAD" #: builtin/remote.c:1341 msgid "Cannot determine remote HEAD" -msgstr "" +msgstr "Tidak dapat menentukan HEAD remote" #: builtin/remote.c:1343 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" -msgstr "" +msgstr "Banyak cabang HEAD remote. Mohon pilih satu secara eksplisit dengan:" #: builtin/remote.c:1353 #, c-format msgid "Could not delete %s" -msgstr "" +msgstr "Tidak dapat menghapus %s" #: builtin/remote.c:1361 #, c-format msgid "Not a valid ref: %s" -msgstr "" +msgstr "Bukan referensi valid: %s" #: builtin/remote.c:1363 #, c-format msgid "Could not setup %s" -msgstr "" +msgstr "Tidak dapat mengatur %s" #: builtin/remote.c:1381 #, c-format msgid " %s will become dangling!" -msgstr "" +msgstr " %s akan menjadi teruntai!" #: builtin/remote.c:1382 #, c-format msgid " %s has become dangling!" -msgstr "" +msgstr " %s telah menjadi teruntai!" #: builtin/remote.c:1392 #, c-format msgid "Pruning %s" -msgstr "" +msgstr "Memangkas %s" #: builtin/remote.c:1393 #, c-format msgid "URL: %s" -msgstr "" +msgstr "URL: %s" #: builtin/remote.c:1409 #, c-format msgid " * [would prune] %s" -msgstr "" +msgstr " * [akan pangkas] %s" #: builtin/remote.c:1412 #, c-format msgid " * [pruned] %s" -msgstr "" +msgstr " * [dipangkas] %s" #: builtin/remote.c:1457 msgid "prune remotes after fetching" -msgstr "" +msgstr "pangkas remote setelah pengambilan" #: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647 #, c-format msgid "No such remote '%s'" -msgstr "" +msgstr "Tidak ada remote seperti '%s'" #: builtin/remote.c:1539 msgid "add branch" -msgstr "" +msgstr "tambah cabang" #: builtin/remote.c:1546 msgid "no remote specified" -msgstr "" +msgstr "tidak ada remote yang disebutkan" #: builtin/remote.c:1563 msgid "query push URLs rather than fetch URLs" -msgstr "" +msgstr "tanyakan URL pendorongan daripada URL pengambilan" #: builtin/remote.c:1565 msgid "return all URLs" -msgstr "" +msgstr "kembalikan semua URL" #: builtin/remote.c:1595 #, c-format msgid "no URLs configured for remote '%s'" -msgstr "" +msgstr "tidak ada URL yang dikonfigurasi untuk remote '%s'" #: builtin/remote.c:1621 msgid "manipulate push URLs" -msgstr "" +msgstr "manipulasi URL pendorongan" #: builtin/remote.c:1623 msgid "add URL" -msgstr "" +msgstr "tambah URL" #: builtin/remote.c:1625 msgid "delete URLs" -msgstr "" +msgstr "hapus URL" #: builtin/remote.c:1632 msgid "--add --delete doesn't make sense" -msgstr "" +msgstr "--add --delete tidak masuk akal" #: builtin/remote.c:1673 #, c-format msgid "Invalid old URL pattern: %s" -msgstr "" +msgstr "pola URL lama tidak valid: %s" #: builtin/remote.c:1681 #, c-format msgid "No such URL found: %s" -msgstr "" +msgstr "Tidak ada URL yang ditemukan seperti: %s" #: builtin/remote.c:1683 msgid "Will not delete all non-push URLs" -msgstr "" +msgstr "Tidak akan hapus semua URL non-dorong" #: builtin/repack.c:26 msgid "git repack [<options>]" @@ -19518,7 +20204,7 @@ msgstr "" msgid "could not start pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:270 builtin/repack.c:446 +#: builtin/repack.c:270 builtin/repack.c:630 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" @@ -19526,104 +20212,127 @@ msgstr "" msgid "could not finish pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:322 +#: builtin/repack.c:309 +#, c-format +msgid "cannot open index for %s" +msgstr "" + +#: builtin/repack.c:368 +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "" + +#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413 +#, c-format +msgid "pack %s too large to roll up" +msgstr "" + +#: builtin/repack.c:460 msgid "pack everything in a single pack" msgstr "" -#: builtin/repack.c:324 +#: builtin/repack.c:462 msgid "same as -a, and turn unreachable objects loose" msgstr "" -#: builtin/repack.c:327 +#: builtin/repack.c:465 msgid "remove redundant packs, and run git-prune-packed" msgstr "" -#: builtin/repack.c:329 +#: builtin/repack.c:467 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "" -#: builtin/repack.c:331 +#: builtin/repack.c:469 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" -#: builtin/repack.c:333 +#: builtin/repack.c:471 msgid "do not run git-update-server-info" msgstr "" -#: builtin/repack.c:336 +#: builtin/repack.c:474 msgid "pass --local to git-pack-objects" msgstr "" -#: builtin/repack.c:338 +#: builtin/repack.c:476 msgid "write bitmap index" msgstr "" -#: builtin/repack.c:340 +#: builtin/repack.c:478 msgid "pass --delta-islands to git-pack-objects" msgstr "" -#: builtin/repack.c:341 +#: builtin/repack.c:479 msgid "approxidate" msgstr "" -#: builtin/repack.c:342 +#: builtin/repack.c:480 msgid "with -A, do not loosen objects older than this" msgstr "" -#: builtin/repack.c:344 +#: builtin/repack.c:482 msgid "with -a, repack unreachable objects" msgstr "" -#: builtin/repack.c:346 +#: builtin/repack.c:484 msgid "size of the window used for delta compression" msgstr "" -#: builtin/repack.c:347 builtin/repack.c:353 +#: builtin/repack.c:485 builtin/repack.c:491 msgid "bytes" msgstr "" -#: builtin/repack.c:348 +#: builtin/repack.c:486 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -#: builtin/repack.c:350 +#: builtin/repack.c:488 msgid "limits the maximum delta depth" msgstr "" -#: builtin/repack.c:352 +#: builtin/repack.c:490 msgid "limits the maximum number of threads" msgstr "" -#: builtin/repack.c:354 +#: builtin/repack.c:492 msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:356 +#: builtin/repack.c:494 msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:358 +#: builtin/repack.c:496 msgid "do not repack this pack" msgstr "" -#: builtin/repack.c:368 +#: builtin/repack.c:498 +msgid "find a geometric progression with factor <N>" +msgstr "" + +#: builtin/repack.c:508 msgid "cannot delete packs in a precious-objects repo" msgstr "" -#: builtin/repack.c:372 +#: builtin/repack.c:512 msgid "--keep-unreachable and -A are incompatible" msgstr "" -#: builtin/repack.c:455 +#: builtin/repack.c:527 +msgid "--geometric is incompatible with -A, -a" +msgstr "" + +#: builtin/repack.c:639 msgid "Nothing new to pack." msgstr "" -#: builtin/repack.c:485 +#: builtin/repack.c:669 #, c-format msgid "missing required file: %s" msgstr "" -#: builtin/repack.c:487 +#: builtin/repack.c:671 #, c-format msgid "could not unlink: %s" msgstr "" @@ -19947,8 +20656,8 @@ msgstr "HEAD sekarang pada %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "Tidak dapat lakukan reset %s di tengah-tengah penggabungan." -#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661 -#: builtin/stash.c:685 +#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663 +#: builtin/stash.c:687 msgid "be quiet, only report errors" msgstr "diam, hanya laporkan kesalahan" @@ -20031,19 +20740,19 @@ msgstr "Tidak dapat menyetel ulang berkas indeks ke revisi '%s'." msgid "Could not write new index file." msgstr "Tidak dapat menulis berkas indeks baru." -#: builtin/rev-list.c:534 +#: builtin/rev-list.c:538 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "" -#: builtin/rev-list.c:595 +#: builtin/rev-list.c:599 msgid "object filtering requires --objects" msgstr "" -#: builtin/rev-list.c:651 +#: builtin/rev-list.c:659 msgid "rev-list does not support display of notes" msgstr "" -#: builtin/rev-list.c:656 +#: builtin/rev-list.c:664 msgid "marked counting is incompatible with --objects" msgstr "" @@ -20150,19 +20859,19 @@ msgstr "" msgid "keep redundant, empty commits" msgstr "" -#: builtin/revert.c:239 +#: builtin/revert.c:237 msgid "revert failed" msgstr "" -#: builtin/revert.c:252 +#: builtin/revert.c:250 msgid "cherry-pick failed" msgstr "" -#: builtin/rm.c:19 +#: builtin/rm.c:20 msgid "git rm [<options>] [--] <file>..." -msgstr "" +msgstr "git rm [<opsi>] [--] <berkas>..." -#: builtin/rm.c:207 +#: builtin/rm.c:208 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -20170,69 +20879,79 @@ msgid_plural "" "the following files have staged content different from both the\n" "file and the HEAD:" msgstr[0] "" +"berkas berikut punya konten tergelar yang berbeda dengan baik\n" +"berkas dan HEAD:" msgstr[1] "" +"berkas berikut punya konten tergelar yang berbeda dengan baik\n" +"berkas dan HEAD:" -#: builtin/rm.c:212 +#: builtin/rm.c:213 msgid "" "\n" "(use -f to force removal)" msgstr "" +"\n" +"(gunakan -f untuk paksa hapus)" -#: builtin/rm.c:216 +#: builtin/rm.c:217 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "berkas berikut punya perubahan tergelar dalam indeks:" +msgstr[1] "berkas berikut punya perubahan tergelar dalam indeks:" -#: builtin/rm.c:220 builtin/rm.c:229 +#: builtin/rm.c:221 builtin/rm.c:230 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" +"\n" +"(gunakan --cached untuk jaga berkas, atau -f untuk paksa hapus)" -#: builtin/rm.c:226 +#: builtin/rm.c:227 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "berkas berikut punya modifikasi lokal:" +msgstr[1] "berkas berikut punya modifikasi lokal:" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "do not list removed files" -msgstr "" +msgstr "jangan daftar berkas terhapus" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "only remove from the index" -msgstr "" +msgstr "hanya hapus dari indeks" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "override the up-to-date check" -msgstr "" +msgstr "timpa pemeriksaan terbaru" -#: builtin/rm.c:246 +#: builtin/rm.c:247 msgid "allow recursive removal" -msgstr "" +msgstr "perbolehkan penghapusan rekursif" -#: builtin/rm.c:248 +#: builtin/rm.c:249 msgid "exit with a zero status even if nothing matched" -msgstr "" +msgstr "keluar dengan nol bahkan jika tidak ada yang cocok" -#: builtin/rm.c:282 +#: builtin/rm.c:283 msgid "No pathspec was given. Which files should I remove?" msgstr "" +"Tidak ada spek jalur yang diberikan. Berkas mana yang harusnya saya hapus?" -#: builtin/rm.c:305 +#: builtin/rm.c:310 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" +"mohon gelar perubahan Anda ke .gitmodules atau stase itu untuk melanjutkan" -#: builtin/rm.c:323 +#: builtin/rm.c:331 #, c-format msgid "not removing '%s' recursively without -r" -msgstr "" +msgstr "tidak menghapus '%s' secara rekursif tanpa -r" -#: builtin/rm.c:362 +#: builtin/rm.c:379 #, c-format msgid "git rm: unable to remove %s" -msgstr "" +msgstr "git rm: tidak dapat menghapus %s" #: builtin/send-pack.c:20 msgid "" @@ -20495,313 +21214,354 @@ msgstr "" msgid "show refs from stdin that aren't in local repository" msgstr "" -#: builtin/sparse-checkout.c:21 +#: builtin/sparse-checkout.c:22 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "" -#: builtin/sparse-checkout.c:45 +#: builtin/sparse-checkout.c:46 msgid "git sparse-checkout list" msgstr "" -#: builtin/sparse-checkout.c:71 +#: builtin/sparse-checkout.c:72 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" -#: builtin/sparse-checkout.c:223 +#: builtin/sparse-checkout.c:227 msgid "failed to create directory for sparse-checkout file" msgstr "" -#: builtin/sparse-checkout.c:264 +#: builtin/sparse-checkout.c:268 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "" -#: builtin/sparse-checkout.c:266 +#: builtin/sparse-checkout.c:270 msgid "failed to set extensions.worktreeConfig setting" msgstr "" -#: builtin/sparse-checkout.c:283 -msgid "git sparse-checkout init [--cone]" +#: builtin/sparse-checkout.c:290 +msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" msgstr "" -#: builtin/sparse-checkout.c:302 +#: builtin/sparse-checkout.c:310 msgid "initialize the sparse-checkout in cone mode" msgstr "" -#: builtin/sparse-checkout.c:339 +#: builtin/sparse-checkout.c:312 +msgid "toggle the use of a sparse index" +msgstr "" + +#: builtin/sparse-checkout.c:340 +msgid "failed to modify sparse-index config" +msgstr "" + +#: builtin/sparse-checkout.c:361 #, c-format msgid "failed to open '%s'" msgstr "" -#: builtin/sparse-checkout.c:396 +#: builtin/sparse-checkout.c:419 #, c-format msgid "could not normalize path %s" msgstr "" -#: builtin/sparse-checkout.c:408 +#: builtin/sparse-checkout.c:431 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "" -#: builtin/sparse-checkout.c:433 +#: builtin/sparse-checkout.c:456 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "" -#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511 +#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 msgid "unable to load existing sparse-checkout patterns" msgstr "" -#: builtin/sparse-checkout.c:556 +#: builtin/sparse-checkout.c:579 msgid "read patterns from standard in" msgstr "" -#: builtin/sparse-checkout.c:571 +#: builtin/sparse-checkout.c:594 msgid "git sparse-checkout reapply" msgstr "" -#: builtin/sparse-checkout.c:590 +#: builtin/sparse-checkout.c:613 msgid "git sparse-checkout disable" msgstr "" -#: builtin/sparse-checkout.c:618 +#: builtin/sparse-checkout.c:644 msgid "error while refreshing working directory" msgstr "" -#: builtin/stash.c:22 builtin/stash.c:38 +#: builtin/stash.c:24 builtin/stash.c:40 msgid "git stash list [<options>]" -msgstr "" +msgstr "git stash list [<opsi>]" -#: builtin/stash.c:23 builtin/stash.c:43 +#: builtin/stash.c:25 builtin/stash.c:45 msgid "git stash show [<options>] [<stash>]" -msgstr "" +msgstr "git stash show [<opsi>] [<stase>]" -#: builtin/stash.c:24 builtin/stash.c:48 +#: builtin/stash.c:26 builtin/stash.c:50 msgid "git stash drop [-q|--quiet] [<stash>]" -msgstr "" +msgstr "git stash drop [-q|--quiet] [<stase>]" -#: builtin/stash.c:25 +#: builtin/stash.c:27 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -msgstr "" +msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stase>]" -#: builtin/stash.c:26 builtin/stash.c:63 +#: builtin/stash.c:28 builtin/stash.c:65 msgid "git stash branch <branchname> [<stash>]" -msgstr "" +msgstr "git stash branch <nama cabang> [<stase>]" -#: builtin/stash.c:27 builtin/stash.c:68 +#: builtin/stash.c:29 builtin/stash.c:70 msgid "git stash clear" -msgstr "" +msgstr "git stash clear" -#: builtin/stash.c:28 +#: builtin/stash.c:30 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <pesan>]\n" +" [--pathspec-from-file=<berkas> [--pathspec-file-nul]]\n" +" [--] [<spek jalur>...]]" -#: builtin/stash.c:32 builtin/stash.c:85 +#: builtin/stash.c:34 builtin/stash.c:87 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" msgstr "" +"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [<pesan>]" -#: builtin/stash.c:53 +#: builtin/stash.c:55 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" -msgstr "" +msgstr "git stash pop [--index] [-q|--quiet] [<stase>]" -#: builtin/stash.c:58 +#: builtin/stash.c:60 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" -msgstr "" +msgstr "git stash apply [--index] [-q|--quiet] [<stase>]" -#: builtin/stash.c:73 +#: builtin/stash.c:75 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" -msgstr "" +msgstr "git stash store [-m|--message <pesan>] [-q|--quiet] <komit>" -#: builtin/stash.c:78 +#: builtin/stash.c:80 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" " [--] [<pathspec>...]]" msgstr "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <pesan>]\n" +" [--] [<spek jalur>...]" -#: builtin/stash.c:128 +#: builtin/stash.c:130 #, c-format msgid "'%s' is not a stash-like commit" -msgstr "" +msgstr "'%s' bukan komit mirip stase" -#: builtin/stash.c:148 +#: builtin/stash.c:150 #, c-format msgid "Too many revisions specified:%s" -msgstr "" +msgstr "Terlalu banyak revisi disebutkan:%s" -#: builtin/stash.c:162 +#: builtin/stash.c:164 msgid "No stash entries found." -msgstr "" +msgstr "Tidak ada entri stase ditemukan." -#: builtin/stash.c:176 +#: builtin/stash.c:178 #, c-format msgid "%s is not a valid reference" -msgstr "" +msgstr "%s bukan referensi valid" -#: builtin/stash.c:225 +#: builtin/stash.c:227 msgid "git stash clear with arguments is unimplemented" -msgstr "" +msgstr "git stash clear dengan argument tak diimplementasikan" -#: builtin/stash.c:429 +#: builtin/stash.c:431 #, c-format msgid "" "WARNING: Untracked file in way of tracked file! Renaming\n" " %s -> %s\n" " to make room.\n" msgstr "" +"PERINGATAN: Berkas tak terlacak dengan cara berkas terlacak! Menamakan " +"ulang\n" +" %s -> %s\n" +" untuk buat ruang.\n" -#: builtin/stash.c:490 +#: builtin/stash.c:492 msgid "cannot apply a stash in the middle of a merge" -msgstr "" +msgstr "tidak dapat menerapkan stase di tengah-tengah penggabungan" -#: builtin/stash.c:501 +#: builtin/stash.c:503 #, c-format msgid "could not generate diff %s^!." -msgstr "" +msgstr "tidak dapat membuat diff %s^!." -#: builtin/stash.c:508 +#: builtin/stash.c:510 msgid "conflicts in index. Try without --index." -msgstr "" +msgstr "konflik dalam indeks. Coba tanpa --index." -#: builtin/stash.c:514 +#: builtin/stash.c:516 msgid "could not save index tree" -msgstr "" +msgstr "tidak dapat menyimpan pohon indeks" -#: builtin/stash.c:523 +#: builtin/stash.c:525 msgid "could not restore untracked files from stash" -msgstr "" +msgstr "tidak dapat mengembalikan berkas tak terlacak dari stase" -#: builtin/stash.c:537 +#: builtin/stash.c:539 #, c-format msgid "Merging %s with %s" -msgstr "" +msgstr "Menggabungkan %s dengan %s" -#: builtin/stash.c:547 +#: builtin/stash.c:549 msgid "Index was not unstashed." -msgstr "" +msgstr "Indeks tak dibatal-stasekan." -#: builtin/stash.c:589 builtin/stash.c:687 +#: builtin/stash.c:591 builtin/stash.c:689 msgid "attempt to recreate the index" -msgstr "" +msgstr "coba membuat ulang indeks" -#: builtin/stash.c:633 +#: builtin/stash.c:635 #, c-format msgid "Dropped %s (%s)" -msgstr "" +msgstr "%s (%s) dijatuhkan" -#: builtin/stash.c:636 +#: builtin/stash.c:638 #, c-format msgid "%s: Could not drop stash entry" -msgstr "" +msgstr "%s: Tidak dapat menjatuhkan entri stase" -#: builtin/stash.c:649 +#: builtin/stash.c:651 #, c-format msgid "'%s' is not a stash reference" -msgstr "" +msgstr "'%s' bukan referensi stase" -#: builtin/stash.c:699 +#: builtin/stash.c:701 msgid "The stash entry is kept in case you need it again." -msgstr "" +msgstr "Entri stase disimpan jika Anda butuh itu lagi." -#: builtin/stash.c:722 +#: builtin/stash.c:724 msgid "No branch name specified" -msgstr "" +msgstr "Tidak ada nama cabang yang disebutkan" -#: builtin/stash.c:866 builtin/stash.c:903 +#: builtin/stash.c:808 +msgid "failed to parse tree" +msgstr "gagal menguraikan pohon" + +#: builtin/stash.c:819 +msgid "failed to unpack trees" +msgstr "gagal membongkar pohon" + +#: builtin/stash.c:839 +msgid "include untracked files in the stash" +msgstr "masukkan berkas tak terlacak ke dalam stase" + +#: builtin/stash.c:842 +msgid "only show untracked files in the stash" +msgstr "hanya perlihatkan berkas tak terlacak dalam stase" + +#: builtin/stash.c:932 builtin/stash.c:969 #, c-format msgid "Cannot update %s with %s" -msgstr "" +msgstr "Tidak dapat memperbarui %s dengan %s" -#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603 +#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671 msgid "stash message" -msgstr "" +msgstr "pesan stase" -#: builtin/stash.c:894 +#: builtin/stash.c:960 msgid "\"git stash store\" requires one <commit> argument" -msgstr "" +msgstr "\"git stash store\" butuh satu argumen <komit>" -#: builtin/stash.c:1109 +#: builtin/stash.c:1175 msgid "No changes selected" -msgstr "" +msgstr "Tidak ada perubahan yang dipilih" -#: builtin/stash.c:1209 +#: builtin/stash.c:1275 msgid "You do not have the initial commit yet" -msgstr "" +msgstr "Anda belum punya komit awal" -#: builtin/stash.c:1236 +#: builtin/stash.c:1302 msgid "Cannot save the current index state" -msgstr "" +msgstr "Tidak dapat menyimpan keadaan indeks saat ini" -#: builtin/stash.c:1245 +#: builtin/stash.c:1311 msgid "Cannot save the untracked files" -msgstr "" +msgstr "Tidak dapat menyimpan berkas tak terlacak" -#: builtin/stash.c:1256 builtin/stash.c:1265 +#: builtin/stash.c:1322 builtin/stash.c:1331 msgid "Cannot save the current worktree state" -msgstr "" +msgstr "Tidak dapat menyimpang keadaan pohon kerja saat ini" -#: builtin/stash.c:1293 +#: builtin/stash.c:1359 msgid "Cannot record working tree state" -msgstr "" +msgstr "Tidak dapat merekam keadaan pohon kerja" -#: builtin/stash.c:1342 +#: builtin/stash.c:1408 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" +"Tidak dapat menggunakan --patch dan --include-untracked atau --all pada " +"waktu yang bersamaan" -#: builtin/stash.c:1358 +#: builtin/stash.c:1426 msgid "Did you forget to 'git add'?" -msgstr "" +msgstr "Anda lupa untuk 'git add'?" -#: builtin/stash.c:1373 +#: builtin/stash.c:1441 msgid "No local changes to save" -msgstr "" +msgstr "Tidak ada perubahan lokal untuk disimpan" -#: builtin/stash.c:1380 +#: builtin/stash.c:1448 msgid "Cannot initialize stash" -msgstr "" +msgstr "Tidak dapat menginisialisasi stase" -#: builtin/stash.c:1395 +#: builtin/stash.c:1463 msgid "Cannot save the current status" -msgstr "" +msgstr "Tidak dapat menyimpan status saat ini" -#: builtin/stash.c:1400 +#: builtin/stash.c:1468 #, c-format msgid "Saved working directory and index state %s" -msgstr "" +msgstr "Direktori kerja dan keadaan indeks %s disimpan" -#: builtin/stash.c:1490 +#: builtin/stash.c:1558 msgid "Cannot remove worktree changes" -msgstr "" +msgstr "Tidak dapat menghapus perubahaan pohon kerja" -#: builtin/stash.c:1529 builtin/stash.c:1594 +#: builtin/stash.c:1597 builtin/stash.c:1662 msgid "keep index" -msgstr "" +msgstr "jaga indeks" -#: builtin/stash.c:1531 builtin/stash.c:1596 +#: builtin/stash.c:1599 builtin/stash.c:1664 msgid "stash in patch mode" -msgstr "" +msgstr "stase dalam mode tambalan" -#: builtin/stash.c:1532 builtin/stash.c:1597 +#: builtin/stash.c:1600 builtin/stash.c:1665 msgid "quiet mode" -msgstr "" +msgstr "mode hening" -#: builtin/stash.c:1534 builtin/stash.c:1599 +#: builtin/stash.c:1602 builtin/stash.c:1667 msgid "include untracked files in stash" -msgstr "" +msgstr "masukkan berkas tak terlacak ke dalam stase" -#: builtin/stash.c:1536 builtin/stash.c:1601 +#: builtin/stash.c:1604 builtin/stash.c:1669 msgid "include ignore files" -msgstr "" +msgstr "masukkan berkas ignore" -#: builtin/stash.c:1636 +#: builtin/stash.c:1704 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." msgstr "" +"Dukungan untuk stash.useBuiltin sudah dihapus!\n" +"Lihat entri itu di 'git help config' untuk selengkapnya." #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" @@ -20819,503 +21579,532 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424 #, c-format msgid "Expecting a full ref name, got %s" -msgstr "" +msgstr "Mengharapkan nama referensi penuh, dapat %s" #: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" -msgstr "" +msgstr "submodule--helper print-default-remote tidak membutuhkan argumen" #: builtin/submodule--helper.c:102 #, c-format msgid "cannot strip one component off url '%s'" -msgstr "" +msgstr "tidak dapat mencopot satu komponen dari url '%s'" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820 msgid "alternative anchor for relative paths" -msgstr "" +msgstr "jangkar alternatif untuk jalur relatif" #: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -msgstr "" +msgstr "git submodule--helper list [--prefix=<jalur>] [<jalur>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:652 +#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:653 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "" +"Tidak ada url yang ditemukan untuk jalur submodul '%s' dalam .gitmodules" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:525 #, c-format msgid "Entering '%s'\n" -msgstr "" +msgstr "Memasuki '%s'\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:528 #, c-format msgid "" "run_command returned non-zero status for %s\n" "." msgstr "" +"run_command mengembalikan status bukan nol untuk %s\n" +"." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:550 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " "submodules of %s\n" "." msgstr "" +"run_command mengembalikan status bukan nol ketika merekursi dalam submodul " +"bersarang %s\n" +"." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:566 msgid "suppress output of entering each submodule command" -msgstr "" +msgstr "sembunyikan keluaran memasuki setiap perintah submodul" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 -#: builtin/submodule--helper.c:1487 +#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:1488 msgid "recurse into nested submodules" -msgstr "" +msgstr "rekursi ke dalam submodul bersarang" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:573 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "" +"git submodule--helper foreach [--quiet] [--recursive] [--] [<perintah>]" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:600 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "" +"tidak dapat mencari konfigurasi '%s'. Asumsi bahwa repositori ini adalah " +"hulu otoritatif tersendiri." -#: builtin/submodule--helper.c:666 +#: builtin/submodule--helper.c:667 #, c-format msgid "Failed to register url for submodule path '%s'" -msgstr "" +msgstr "Gagal mendaftarkan url untuk jalur submodul '%s'" -#: builtin/submodule--helper.c:670 +#: builtin/submodule--helper.c:671 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" -msgstr "" +msgstr "Submodul '%s' (%s) didaftarkan untuk jalur '%s'\n" -#: builtin/submodule--helper.c:680 +#: builtin/submodule--helper.c:681 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" -msgstr "" +msgstr "peringatan: perintah mode pembaruan disarankan untuk submodul '%s'\n" -#: builtin/submodule--helper.c:687 +#: builtin/submodule--helper.c:688 #, c-format msgid "Failed to register update mode for submodule path '%s'" -msgstr "" +msgstr "Gagal mendaftarkan mode pembaruan untuk jalur submodul '%s'" -#: builtin/submodule--helper.c:709 +#: builtin/submodule--helper.c:710 msgid "suppress output for initializing a submodule" -msgstr "" +msgstr "sembunyikan keluaran menginisialisasi submodul" -#: builtin/submodule--helper.c:714 +#: builtin/submodule--helper.c:715 msgid "git submodule--helper init [<options>] [<path>]" -msgstr "" +msgstr "git submodule--helper init [<opsi>] [<jalur>]" -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 +#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" -msgstr "" +msgstr "tidak ada pemetaan submodul ditemukan di .gitmodules untuk jalur '%s'" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:836 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" -msgstr "" +msgstr "tidak dapat menguraikan referensi HEAD di dalam submodul '%s'" -#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458 #, c-format msgid "failed to recurse into submodule '%s'" -msgstr "" +msgstr "gagal merekursi ke dalam submodul '%s'" -#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 +#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624 msgid "suppress submodule status output" -msgstr "" +msgstr "sembunyikan keluaran status submodul" -#: builtin/submodule--helper.c:887 +#: builtin/submodule--helper.c:888 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" +"gunakan komit yang disimpan di dalam indeks daripada yang disimpan di dalam " +"HEAD" -#: builtin/submodule--helper.c:893 +#: builtin/submodule--helper.c:894 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" -msgstr "" +msgstr "git submodule status [--quiet] [--cached] [--recursive] [<jalur>...]" -#: builtin/submodule--helper.c:917 +#: builtin/submodule--helper.c:918 msgid "git submodule--helper name <path>" -msgstr "" +msgstr "git submodule==helper name <jalur>" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:990 #, c-format msgid "* %s %s(blob)->%s(submodule)" -msgstr "" +msgstr "* %s %s(blob)->%s(submodul)" -#: builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:993 #, c-format msgid "* %s %s(submodule)->%s(blob)" -msgstr "" +msgstr "* %s %s(submodul)->%s(blob)" -#: builtin/submodule--helper.c:1005 +#: builtin/submodule--helper.c:1006 #, c-format msgid "%s" -msgstr "" +msgstr "%s" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1056 #, c-format msgid "couldn't hash object from '%s'" -msgstr "" +msgstr "tidak dapat hash objek dari '%s'" -#: builtin/submodule--helper.c:1059 +#: builtin/submodule--helper.c:1060 #, c-format msgid "unexpected mode %o\n" -msgstr "" +msgstr "mode tidak diharapkan %o\n" -#: builtin/submodule--helper.c:1300 +#: builtin/submodule--helper.c:1301 msgid "use the commit stored in the index instead of the submodule HEAD" -msgstr "" +msgstr "gunakan komit yang disimpan di dalam indeks daripada HEAD submodul" -#: builtin/submodule--helper.c:1302 +#: builtin/submodule--helper.c:1303 msgid "to compare the commit in the index with that in the submodule HEAD" msgstr "" +"untuk membandingkan komit di dalam indeks dengan yang di dalam HEAD submodul" -#: builtin/submodule--helper.c:1304 +#: builtin/submodule--helper.c:1305 msgid "skip submodules with 'ignore_config' value set to 'all'" -msgstr "" +msgstr "lewatkan submodul dengan nilai 'ignore_config' disetel ke 'all'" -#: builtin/submodule--helper.c:1306 +#: builtin/submodule--helper.c:1307 msgid "limit the summary size" -msgstr "" +msgstr "batasi ukuran ringkasan" -#: builtin/submodule--helper.c:1311 +#: builtin/submodule--helper.c:1312 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" -msgstr "" +msgstr "git submodule--helper summary [<opsi>] [<commit>] -- [<jalur>]" -#: builtin/submodule--helper.c:1335 +#: builtin/submodule--helper.c:1336 msgid "could not fetch a revision for HEAD" -msgstr "" +msgstr "tidak dapat mengambil revisi untuk HEAD" -#: builtin/submodule--helper.c:1340 +#: builtin/submodule--helper.c:1341 msgid "--cached and --files are mutually exclusive" -msgstr "" +msgstr "--cached dan --files saling eksklusif" -#: builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1408 #, c-format msgid "Synchronizing submodule url for '%s'\n" -msgstr "" +msgstr "Mensinkronisasi url submodul untuk '%s'\n" -#: builtin/submodule--helper.c:1413 +#: builtin/submodule--helper.c:1414 #, c-format msgid "failed to register url for submodule path '%s'" -msgstr "" +msgstr "gagal mendaftarkan url untuk jalur submodul '%s'" -#: builtin/submodule--helper.c:1427 +#: builtin/submodule--helper.c:1428 #, c-format msgid "failed to get the default remote for submodule '%s'" -msgstr "" +msgstr "gagal mendapatkan remote asali untuk submodul '%s'" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1439 #, c-format msgid "failed to update remote for submodule '%s'" -msgstr "" +msgstr "gagal memperbarui remote untuk submodul '%s'" -#: builtin/submodule--helper.c:1485 +#: builtin/submodule--helper.c:1486 msgid "suppress output of synchronizing submodule url" -msgstr "" +msgstr "sembunyikan keluaran mensinkronisasi url submodul" -#: builtin/submodule--helper.c:1492 +#: builtin/submodule--helper.c:1493 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" -msgstr "" +msgstr "git submodule--helper sync [--quiet] [--recursive] [<jalur>]" -#: builtin/submodule--helper.c:1546 +#: builtin/submodule--helper.c:1547 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " "really want to remove it including all of its history)" msgstr "" +"Pohon kerja submodul '%s' berisi direktori .git (gunakan 'rm -rf' bila Anda " +"benar-benar ingin menghapus itu termasuk semua riwayatnya)" -#: builtin/submodule--helper.c:1558 +#: builtin/submodule--helper.c:1559 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "" +"Pohon kerja submodul '%s' berisi modifikasi lokal; gunakan '-f' untuk " +"menyingkirkan itu" -#: builtin/submodule--helper.c:1566 +#: builtin/submodule--helper.c:1567 #, c-format msgid "Cleared directory '%s'\n" -msgstr "" +msgstr "Direktori '%s' dibersihkan\n" -#: builtin/submodule--helper.c:1568 +#: builtin/submodule--helper.c:1569 #, c-format msgid "Could not remove submodule work tree '%s'\n" -msgstr "" +msgstr "Tidak dapat menghapus pohon kerja submodul '%s'\n" -#: builtin/submodule--helper.c:1579 +#: builtin/submodule--helper.c:1580 #, c-format msgid "could not create empty submodule directory %s" -msgstr "" +msgstr "tidak dapat membuat direktori submodul kosong %s" -#: builtin/submodule--helper.c:1595 +#: builtin/submodule--helper.c:1596 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" -msgstr "" +msgstr "Submodul '%s' (%s) tak terdaftar untuk jalur '%s'\n" -#: builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:1625 msgid "remove submodule working trees even if they contain local changes" -msgstr "" +msgstr "hapus pohon kerja submodul bahkan jika itu berisi perubahan lokal" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1626 msgid "unregister all submodules" -msgstr "" +msgstr "batal daftar semua submodul" -#: builtin/submodule--helper.c:1630 +#: builtin/submodule--helper.c:1631 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<jalur>...]]" -#: builtin/submodule--helper.c:1644 +#: builtin/submodule--helper.c:1645 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" +"Gunakan '--all' jika Anda benar-benar ingin deinisialisasi semua submodul" -#: builtin/submodule--helper.c:1713 +#: builtin/submodule--helper.c:1714 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" "submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" "'--reference-if-able' instead of '--reference'." msgstr "" +"Sebuah pengganti yang dihitung dari pengganti proyek super tidak valid.\n" +"Untuk memperbolehkan Git untuk kloning tanpa pengganti dalam kasus seperti\n" +" itu, setel submodule.alternateErrorStrategy ke 'info' atau yang sama,\n" +"kloning degan '--reference-if-able' daripada '--reference'." -#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 +#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756 #, c-format msgid "submodule '%s' cannot add alternate: %s" -msgstr "" +msgstr "submodul '%s' tidak dapat menambahkan pengganti: %s" -#: builtin/submodule--helper.c:1791 +#: builtin/submodule--helper.c:1792 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" -msgstr "" +msgstr "Nilai '%s' untuk submodule.alternateErrorStrategy tidak dikenal" -#: builtin/submodule--helper.c:1798 +#: builtin/submodule--helper.c:1799 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" -msgstr "" +msgstr "Nilai '%s' untuk submodule.alternateLocation tidak dikenal" -#: builtin/submodule--helper.c:1822 +#: builtin/submodule--helper.c:1823 msgid "where the new submodule will be cloned to" -msgstr "" +msgstr "di mana submodul baru akan dikloning" -#: builtin/submodule--helper.c:1825 +#: builtin/submodule--helper.c:1826 msgid "name of the new submodule" -msgstr "" +msgstr "nama submodul baru" -#: builtin/submodule--helper.c:1828 +#: builtin/submodule--helper.c:1829 msgid "url where to clone the submodule from" -msgstr "" +msgstr "url di mana submodul dikloning" -#: builtin/submodule--helper.c:1836 +#: builtin/submodule--helper.c:1837 msgid "depth for shallow clones" -msgstr "" +msgstr "kedalaman untuk kloning dangkal" -#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 +#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349 msgid "force cloning progress" -msgstr "" +msgstr "paksa perkembangan kloning" -#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351 msgid "disallow cloning into non-empty directory" -msgstr "" +msgstr "tak perbolehkan kloning ke dalam direktori bukan kosong" -#: builtin/submodule--helper.c:1848 +#: builtin/submodule--helper.c:1849 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " "<url> --path <path>" msgstr "" +"git submodule--helper clone [--prefix=<jalur>] [--quiet] [--reference " +"<repositori>] [--name <nama>] [--depth <kedalaman>] [--single-branch] --url " +"<url> --path <jalur>" -#: builtin/submodule--helper.c:1873 +#: builtin/submodule--helper.c:1874 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "" +"menolak membuat/menggunakan '%s' di dalam direktori git submodul yang lain" -#: builtin/submodule--helper.c:1884 +#: builtin/submodule--helper.c:1885 #, c-format msgid "clone of '%s' into submodule path '%s' failed" -msgstr "" +msgstr "gagal mengkloning '%s' ke dalam jalur submodul '%s'" -#: builtin/submodule--helper.c:1888 +#: builtin/submodule--helper.c:1889 #, c-format msgid "directory not empty: '%s'" -msgstr "" +msgstr "direktori tidak kosong: '%s'" -#: builtin/submodule--helper.c:1900 +#: builtin/submodule--helper.c:1901 #, c-format msgid "could not get submodule directory for '%s'" -msgstr "" +msgstr "tidak dapat mendapatkan direktori submodul untuk '%s'" -#: builtin/submodule--helper.c:1936 +#: builtin/submodule--helper.c:1937 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "" +msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'" -#: builtin/submodule--helper.c:1940 +#: builtin/submodule--helper.c:1941 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" -msgstr "" +msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'" -#: builtin/submodule--helper.c:2041 +#: builtin/submodule--helper.c:2042 #, c-format msgid "Submodule path '%s' not initialized" -msgstr "" +msgstr "Jalur submodul '%s' tidak diinisialisasi" -#: builtin/submodule--helper.c:2045 +#: builtin/submodule--helper.c:2046 msgid "Maybe you want to use 'update --init'?" -msgstr "" +msgstr "Mungkin Anda ingin menggunakan 'update --init'?" -#: builtin/submodule--helper.c:2075 +#: builtin/submodule--helper.c:2076 #, c-format msgid "Skipping unmerged submodule %s" -msgstr "" +msgstr "Melewati submodul tak tergabung %s" -#: builtin/submodule--helper.c:2104 +#: builtin/submodule--helper.c:2105 #, c-format msgid "Skipping submodule '%s'" -msgstr "" +msgstr "Melewati submodul '%s'" -#: builtin/submodule--helper.c:2254 +#: builtin/submodule--helper.c:2255 #, c-format msgid "Failed to clone '%s'. Retry scheduled" -msgstr "" +msgstr "Gagal mengkloning '%s'. Percobaan ulang dijadwalkan" -#: builtin/submodule--helper.c:2265 +#: builtin/submodule--helper.c:2266 #, c-format msgid "Failed to clone '%s' a second time, aborting" -msgstr "" +msgstr "Gagal mengkloning '%s' untuk kedua kalinya, batalkan" -#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574 msgid "path into the working tree" -msgstr "" +msgstr "jalur ke dalam pohon kerja" -#: builtin/submodule--helper.c:2330 +#: builtin/submodule--helper.c:2331 msgid "path into the working tree, across nested submodule boundaries" -msgstr "" +msgstr "jalur ke dalam pohon kerja, melintasi perbatasan submodul bersarang" -#: builtin/submodule--helper.c:2334 +#: builtin/submodule--helper.c:2335 msgid "rebase, merge, checkout or none" -msgstr "" +msgstr "dasarkan ulang, gabungkan, checkout atau tidak sama sekali" -#: builtin/submodule--helper.c:2340 +#: builtin/submodule--helper.c:2341 msgid "create a shallow clone truncated to the specified number of revisions" -msgstr "" +msgstr "buat klon dangkal terpotong hingga sejumlah revisi yang disebutkan" -#: builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2344 msgid "parallel jobs" -msgstr "" +msgstr "pekerjaan paralel" -#: builtin/submodule--helper.c:2345 +#: builtin/submodule--helper.c:2346 msgid "whether the initial clone should follow the shallow recommendation" -msgstr "" +msgstr "apakah klon awal seharusnya mengikuti rekomendasi dangkal" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2347 msgid "don't print cloning progress" -msgstr "" +msgstr "jangan cetak perkembangan pengkloningan" -#: builtin/submodule--helper.c:2357 +#: builtin/submodule--helper.c:2358 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" -msgstr "" +msgstr "git submodule--helper update-clone [--prefix=<jalur>] [<jalur>...]" -#: builtin/submodule--helper.c:2370 +#: builtin/submodule--helper.c:2371 msgid "bad value for update parameter" -msgstr "" +msgstr "nilai jelek untuk parameter pembaruan" -#: builtin/submodule--helper.c:2418 +#: builtin/submodule--helper.c:2419 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "" +"Cabang submodul (%s) dikonfigurasikan untuk mewarisi cabang dari proyek " +"super, tapi proyek super tidak pada cabang apapun" -#: builtin/submodule--helper.c:2541 +#: builtin/submodule--helper.c:2542 #, c-format msgid "could not get a repository handle for submodule '%s'" -msgstr "" +msgstr "tidak dapat mendapat pegangan repositori untuk submodul '%s'" -#: builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2575 msgid "recurse into submodules" -msgstr "" +msgstr "rekursi ke dalam submodul" -#: builtin/submodule--helper.c:2580 +#: builtin/submodule--helper.c:2581 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "" +msgstr "giit submodule--helper absorb-git-dirs [<opsi>] [<jalur>...]" -#: builtin/submodule--helper.c:2636 +#: builtin/submodule--helper.c:2637 msgid "check if it is safe to write to the .gitmodules file" -msgstr "" +msgstr "periksa apakah itu aman untuk menulis ke berkas .gitmodules" -#: builtin/submodule--helper.c:2639 +#: builtin/submodule--helper.c:2640 msgid "unset the config in the .gitmodules file" -msgstr "" +msgstr "batal setel konfigurasi dalam berkas .gitmodules" -#: builtin/submodule--helper.c:2644 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config <name> [<value>]" -msgstr "" +msgstr "git submodule--helper config <nama> [<nilai>]" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --unset <name>" -msgstr "" +msgstr "git submodule--helper config --unset <nama>" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2647 msgid "git submodule--helper config --check-writeable" -msgstr "" +msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2665 git-submodule.sh:150 +#: builtin/submodule--helper.c:2666 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" -msgstr "" +msgstr "mohom pastikan berkas .gitmodules di dalam pohon kerja" -#: builtin/submodule--helper.c:2681 +#: builtin/submodule--helper.c:2682 msgid "suppress output for setting url of a submodule" -msgstr "" +msgstr "sembunyikan keluaran penyetelan url submodule" -#: builtin/submodule--helper.c:2685 +#: builtin/submodule--helper.c:2686 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" -msgstr "" +msgstr "git submodule--helper set-url [--quiet] <jalur> <url baru>" -#: builtin/submodule--helper.c:2718 +#: builtin/submodule--helper.c:2719 msgid "set the default tracking branch to master" -msgstr "" +msgstr "setel cabang pelacak asali ke master" -#: builtin/submodule--helper.c:2720 +#: builtin/submodule--helper.c:2721 msgid "set the default tracking branch" -msgstr "" +msgstr "setel cabang pelacak asali" -#: builtin/submodule--helper.c:2724 +#: builtin/submodule--helper.c:2725 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -msgstr "" +msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <jalur>" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2726 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <cabang> <jalur>" -#: builtin/submodule--helper.c:2732 +#: builtin/submodule--helper.c:2733 msgid "--branch or --default required" -msgstr "" +msgstr "--branch atau --default dibutuhkan" -#: builtin/submodule--helper.c:2735 +#: builtin/submodule--helper.c:2736 msgid "--branch and --default are mutually exclusive" -msgstr "" +msgstr "--branch dan --default saling eksklusif" -#: builtin/submodule--helper.c:2792 git.c:441 git.c:714 +#: builtin/submodule--helper.c:2793 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" -msgstr "" +msgstr "%s tidak mendukung --super-prefix" -#: builtin/submodule--helper.c:2798 +#: builtin/submodule--helper.c:2799 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "" +msgstr "'%s' bukan subperintah submodule--helper valid" #: builtin/symbolic-ref.c:8 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -21325,23 +22114,23 @@ msgstr "" msgid "git symbolic-ref -d [-q] <name>" msgstr "" -#: builtin/symbolic-ref.c:40 +#: builtin/symbolic-ref.c:42 msgid "suppress error message for non-symbolic (detached) refs" msgstr "" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:43 msgid "delete symbolic ref" msgstr "" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:44 msgid "shorten ref output" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 msgid "reason" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 msgid "reason of the update" msgstr "" @@ -21350,10 +22139,12 @@ msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" "\t\t<tagname> [<head>]" msgstr "" +"git tag [-a | -s | -u <id kunci>] [-f] [-m <pesan | -F <berkas>]\n" +"\t\t<nama tag> [<kepala>]" #: builtin/tag.c:27 msgid "git tag -d <tagname>..." -msgstr "" +msgstr "git tag -d <nama tag>..." #: builtin/tag.c:28 msgid "" @@ -21362,22 +22153,25 @@ msgid "" "\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " "[<pattern>...]" msgstr "" +"git tag -l [-n[<angka>]] [--contains <komit>] [--no-contains <komit>] [--" +"points-at <objek>]\n" +"\t\t[--format=<format>] [--merged <komit>] [--no-merged <komit>] [<pola>...]" #: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." -msgstr "" +msgstr "git tag -v [--format]<format>] <nama tag>..." -#: builtin/tag.c:89 +#: builtin/tag.c:100 #, c-format msgid "tag '%s' not found." -msgstr "" +msgstr "tag '%s' tidak ditemukan." -#: builtin/tag.c:124 +#: builtin/tag.c:135 #, c-format msgid "Deleted tag '%s' (was %s)\n" -msgstr "" +msgstr "Tag '%s' (yaitu %s) dihapus\n" -#: builtin/tag.c:159 +#: builtin/tag.c:170 #, c-format msgid "" "\n" @@ -21385,8 +22179,12 @@ msgid "" " %s\n" "Lines starting with '%c' will be ignored.\n" msgstr "" +"\n" +"Tulis pesan untuk tag:\n" +" %s\n" +"Baris yang diawali dengan '%c' akan diabaikan.\n" -#: builtin/tag.c:163 +#: builtin/tag.c:174 #, c-format msgid "" "\n" @@ -21395,12 +22193,17 @@ msgid "" "Lines starting with '%c' will be kept; you may remove them yourself if you " "want to.\n" msgstr "" +"\n" +"Tulis pesan untuk tag:\n" +" %s\n" +"Baris yang diawali dengan '%c' akan disimpan; Anda dapat menghapus itu bila " +"Anda mau.\n" -#: builtin/tag.c:230 +#: builtin/tag.c:241 msgid "unable to sign the tag" -msgstr "" +msgstr "tidak dapat menandatangani tag" -#: builtin/tag.c:248 +#: builtin/tag.c:259 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -21408,140 +22211,145 @@ msgid "" "\n" "\tgit tag -f %s %s^{}" msgstr "" +"Anda telah membuat tag bersarang. Objek yang dirujuk oleh tag baru Anda\n" +"sudah menjadi tag. Jika maksud Anda men-tag objek yang ditunjukkannya,\n" +"gunakan:\n" +"\n" +"\tgit tag -f %s %s^{}" -#: builtin/tag.c:264 +#: builtin/tag.c:275 msgid "bad object type." -msgstr "" +msgstr "tipe objek jelek." -#: builtin/tag.c:317 +#: builtin/tag.c:328 msgid "no tag message?" -msgstr "" +msgstr "tidak ada pesan tag?" -#: builtin/tag.c:324 +#: builtin/tag.c:335 #, c-format msgid "The tag message has been left in %s\n" -msgstr "" +msgstr "Pesan tag dibiarkan di %s\n" -#: builtin/tag.c:435 +#: builtin/tag.c:446 msgid "list tag names" -msgstr "" +msgstr "daftarkan nama tag" -#: builtin/tag.c:437 +#: builtin/tag.c:448 msgid "print <n> lines of each tag message" -msgstr "" +msgstr "cetak <n> baris dari setiap pesan tag" -#: builtin/tag.c:439 +#: builtin/tag.c:450 msgid "delete tags" -msgstr "" +msgstr "hapus tag" -#: builtin/tag.c:440 +#: builtin/tag.c:451 msgid "verify tags" -msgstr "" +msgstr "verifikasi tag" -#: builtin/tag.c:442 +#: builtin/tag.c:453 msgid "Tag creation options" -msgstr "" +msgstr "Opsi pembuatan tag" -#: builtin/tag.c:444 +#: builtin/tag.c:455 msgid "annotated tag, needs a message" -msgstr "" +msgstr "tag bercatat, butuh sebuah pesan" -#: builtin/tag.c:446 +#: builtin/tag.c:457 msgid "tag message" -msgstr "" +msgstr "pesan tag" -#: builtin/tag.c:448 +#: builtin/tag.c:459 msgid "force edit of tag message" -msgstr "" +msgstr "paksa sunting pesan tag" -#: builtin/tag.c:449 +#: builtin/tag.c:460 msgid "annotated and GPG-signed tag" -msgstr "" +msgstr "tag bercatat dan bertandatangan GPG" -#: builtin/tag.c:452 +#: builtin/tag.c:463 msgid "use another key to sign the tag" -msgstr "" +msgstr "gunakan kunci yang lain untuk menandatangani tag" -#: builtin/tag.c:453 +#: builtin/tag.c:464 msgid "replace the tag if exists" -msgstr "" +msgstr "ganti tag jika ada" -#: builtin/tag.c:454 builtin/update-ref.c:505 +#: builtin/tag.c:465 builtin/update-ref.c:505 msgid "create a reflog" -msgstr "" +msgstr "buat log referensi" -#: builtin/tag.c:456 +#: builtin/tag.c:467 msgid "Tag listing options" -msgstr "" +msgstr "Opsi daftar tag" -#: builtin/tag.c:457 +#: builtin/tag.c:468 msgid "show tag list in columns" -msgstr "" +msgstr "perlihatkan daftar tag dalam kolom" -#: builtin/tag.c:458 builtin/tag.c:460 +#: builtin/tag.c:469 builtin/tag.c:471 msgid "print only tags that contain the commit" -msgstr "" +msgstr "hanya cetak tag yang berisi komit" -#: builtin/tag.c:459 builtin/tag.c:461 +#: builtin/tag.c:470 builtin/tag.c:472 msgid "print only tags that don't contain the commit" -msgstr "" +msgstr "hanya cetak tag yang tidak berisi komit" -#: builtin/tag.c:462 +#: builtin/tag.c:473 msgid "print only tags that are merged" -msgstr "" +msgstr "hanya cetak tag yang tergabung" -#: builtin/tag.c:463 +#: builtin/tag.c:474 msgid "print only tags that are not merged" -msgstr "" +msgstr "hanya cetak tag yang tak tergabung" -#: builtin/tag.c:467 +#: builtin/tag.c:478 msgid "print only tags of the object" -msgstr "" +msgstr "hanya cetak tag dari objek" -#: builtin/tag.c:515 +#: builtin/tag.c:526 msgid "--column and -n are incompatible" -msgstr "" +msgstr "--column dan -n tidak kompatibel" -#: builtin/tag.c:537 +#: builtin/tag.c:548 msgid "-n option is only allowed in list mode" -msgstr "" +msgstr "opsi -n hanya diperbolehkan dalam mode daftar" -#: builtin/tag.c:539 +#: builtin/tag.c:550 msgid "--contains option is only allowed in list mode" -msgstr "" +msgstr "opsi --contains hanya diperbolehkan dalam mode daftar" -#: builtin/tag.c:541 +#: builtin/tag.c:552 msgid "--no-contains option is only allowed in list mode" -msgstr "" +msgstr "opsi --no-contains hanya diperbolehkan dalam mode daftar" -#: builtin/tag.c:543 +#: builtin/tag.c:554 msgid "--points-at option is only allowed in list mode" -msgstr "" +msgstr "opsi --points-at hanya diperbolehkan dalam mode daftar" -#: builtin/tag.c:545 +#: builtin/tag.c:556 msgid "--merged and --no-merged options are only allowed in list mode" -msgstr "" +msgstr "opsi --merged dan --no-merged hanya diperbolehkan dalam mode daftar" -#: builtin/tag.c:556 +#: builtin/tag.c:567 msgid "only one -F or -m option is allowed." -msgstr "" +msgstr "hanya satu opsi -F atau -m yang diperbolehkan." -#: builtin/tag.c:581 +#: builtin/tag.c:592 #, c-format msgid "'%s' is not a valid tag name." -msgstr "" +msgstr "'%s' bukan nama tag yang valid." -#: builtin/tag.c:586 +#: builtin/tag.c:597 #, c-format msgid "tag '%s' already exists" -msgstr "" +msgstr "tag '%s' sudah ada" -#: builtin/tag.c:617 +#: builtin/tag.c:628 #, c-format msgid "Updated tag '%s' (was %s)\n" -msgstr "" +msgstr "Tag '%s' diperbarui (yaitu %s)\n" -#: builtin/unpack-objects.c:502 +#: builtin/unpack-objects.c:504 msgid "Unpacking objects" msgstr "" @@ -21602,189 +22410,189 @@ msgstr "" msgid "git update-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:974 +#: builtin/update-index.c:976 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:977 +#: builtin/update-index.c:979 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:980 +#: builtin/update-index.c:982 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:982 +#: builtin/update-index.c:984 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:984 +#: builtin/update-index.c:986 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:986 +#: builtin/update-index.c:988 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:989 +#: builtin/update-index.c:991 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:993 +#: builtin/update-index.c:995 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:997 +#: builtin/update-index.c:999 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1000 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1010 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1013 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1016 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1019 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1022 msgid "do not touch index-only entries" msgstr "" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1024 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1026 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1028 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1030 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1034 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1038 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1042 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1046 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1049 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1051 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1055 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1057 msgid "enable or disable split index" msgstr "" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1059 msgid "enable/disable untracked cache" msgstr "" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1061 msgid "test if the filesystem supports untracked cache" msgstr "" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1063 msgid "enable untracked cache without testing the filesystem" msgstr "" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1065 msgid "write out the index even if is not flagged as changed" msgstr "" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1067 msgid "enable or disable file system monitor" msgstr "" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1069 msgid "mark files as fsmonitor valid" msgstr "" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1072 msgid "clear fsmonitor valid bit" msgstr "" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1175 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1184 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1196 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "" -#: builtin/update-index.c:1198 +#: builtin/update-index.c:1200 msgid "Untracked cache disabled" msgstr "" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1208 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" msgstr "" -#: builtin/update-index.c:1210 +#: builtin/update-index.c:1212 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1220 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" -#: builtin/update-index.c:1222 +#: builtin/update-index.c:1224 msgid "fsmonitor enabled" msgstr "" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1227 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" -#: builtin/update-index.c:1229 +#: builtin/update-index.c:1231 msgid "fsmonitor disabled" msgstr "" @@ -21904,7 +22712,7 @@ msgstr "" msgid "git worktree unlock <path>" msgstr "" -#: builtin/worktree.c:61 builtin/worktree.c:933 +#: builtin/worktree.c:61 builtin/worktree.c:935 #, c-format msgid "failed to delete '%s'" msgstr "" @@ -21971,167 +22779,167 @@ msgstr "" msgid "Preparing worktree (detached HEAD %s)" msgstr "" -#: builtin/worktree.c:480 +#: builtin/worktree.c:482 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:483 +#: builtin/worktree.c:485 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:485 +#: builtin/worktree.c:487 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:487 +#: builtin/worktree.c:489 msgid "populate the new working tree" msgstr "" -#: builtin/worktree.c:488 +#: builtin/worktree.c:490 msgid "keep the new working tree locked" msgstr "" -#: builtin/worktree.c:491 +#: builtin/worktree.c:493 msgid "set up tracking mode (see git-branch(1))" msgstr "" -#: builtin/worktree.c:494 +#: builtin/worktree.c:496 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" -#: builtin/worktree.c:502 +#: builtin/worktree.c:504 msgid "-b, -B, and --detach are mutually exclusive" msgstr "" -#: builtin/worktree.c:563 +#: builtin/worktree.c:565 msgid "--[no-]track can only be used if a new branch is created" msgstr "" -#: builtin/worktree.c:680 +#: builtin/worktree.c:682 msgid "show extended annotations and reasons, if available" msgstr "" -#: builtin/worktree.c:682 +#: builtin/worktree.c:684 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "" -#: builtin/worktree.c:691 +#: builtin/worktree.c:693 msgid "--verbose and --porcelain are mutually exclusive" msgstr "" -#: builtin/worktree.c:718 +#: builtin/worktree.c:720 msgid "reason for locking" msgstr "" -#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837 -#: builtin/worktree.c:961 +#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839 +#: builtin/worktree.c:963 #, c-format msgid "'%s' is not a working tree" msgstr "" -#: builtin/worktree.c:732 builtin/worktree.c:765 +#: builtin/worktree.c:734 builtin/worktree.c:767 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:737 +#: builtin/worktree.c:739 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:739 +#: builtin/worktree.c:741 #, c-format msgid "'%s' is already locked" msgstr "" -#: builtin/worktree.c:767 +#: builtin/worktree.c:769 #, c-format msgid "'%s' is not locked" msgstr "" -#: builtin/worktree.c:808 +#: builtin/worktree.c:810 msgid "working trees containing submodules cannot be moved or removed" msgstr "" -#: builtin/worktree.c:816 +#: builtin/worktree.c:818 msgid "force move even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:839 builtin/worktree.c:963 +#: builtin/worktree.c:841 builtin/worktree.c:965 #, c-format msgid "'%s' is a main working tree" msgstr "" -#: builtin/worktree.c:844 +#: builtin/worktree.c:846 #, c-format msgid "could not figure out destination name from '%s'" msgstr "" -#: builtin/worktree.c:857 +#: builtin/worktree.c:859 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:859 +#: builtin/worktree.c:861 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:862 +#: builtin/worktree.c:864 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" -#: builtin/worktree.c:867 +#: builtin/worktree.c:869 #, c-format msgid "failed to move '%s' to '%s'" msgstr "" -#: builtin/worktree.c:913 +#: builtin/worktree.c:915 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "" -#: builtin/worktree.c:917 +#: builtin/worktree.c:919 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -#: builtin/worktree.c:922 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "" -#: builtin/worktree.c:945 +#: builtin/worktree.c:947 msgid "force removal even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:968 +#: builtin/worktree.c:970 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:970 +#: builtin/worktree.c:972 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:973 +#: builtin/worktree.c:975 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" -#: builtin/worktree.c:997 +#: builtin/worktree.c:999 #, c-format msgid "repair: %s: %s" msgstr "" -#: builtin/worktree.c:1000 +#: builtin/worktree.c:1002 #, c-format msgid "error: %s: %s" msgstr "" @@ -22152,48 +22960,6 @@ msgstr "" msgid "only useful for debugging" msgstr "" -#: http-fetch.c:118 -#, c-format -msgid "argument to --packfile must be a valid hash (got '%s')" -msgstr "" - -#: http-fetch.c:128 -msgid "not a git repository" -msgstr "" - -#: http-fetch.c:134 -msgid "--packfile requires --index-pack-args" -msgstr "" - -#: http-fetch.c:143 -msgid "--index-pack-args can only be used with --packfile" -msgstr "" - -#: t/helper/test-fast-rebase.c:141 -msgid "unhandled options" -msgstr "" - -#: t/helper/test-fast-rebase.c:146 -msgid "error preparing revisions" -msgstr "" - -#: t/helper/test-reach.c:154 -#, c-format -msgid "commit %s is not marked reachable" -msgstr "" - -#: t/helper/test-reach.c:164 -msgid "too many commits marked reachable" -msgstr "" - -#: t/helper/test-serve-v2.c:7 -msgid "test-tool serve-v2 [<options>]" -msgstr "" - -#: t/helper/test-serve-v2.c:19 -msgid "exit immediately after advertising capabilities" -msgstr "" - #: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" @@ -22238,77 +23004,228 @@ msgstr "" msgid "-c expects a configuration string\n" msgstr "" -#: git.c:292 +#: git.c:260 +#, c-format +msgid "no config key given for --config-env\n" +msgstr "" + +#: git.c:300 #, c-format msgid "no directory given for -C\n" msgstr "" -#: git.c:318 +#: git.c:326 #, c-format msgid "unknown option: %s\n" msgstr "" -#: git.c:367 +#: git.c:375 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "" -#: git.c:376 +#: git.c:384 #, c-format msgid "" "alias '%s' changes environment variables.\n" "You can use '!git' in the alias to do this" msgstr "" -#: git.c:383 +#: git.c:391 #, c-format msgid "empty alias for %s" msgstr "" -#: git.c:386 +#: git.c:394 #, c-format msgid "recursive alias: %s" msgstr "" -#: git.c:468 +#: git.c:476 msgid "write failure on standard output" msgstr "" -#: git.c:470 +#: git.c:478 msgid "unknown write failure on standard output" msgstr "" -#: git.c:472 +#: git.c:480 msgid "close failed on standard output" msgstr "" -#: git.c:823 +#: git.c:833 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "" -#: git.c:873 +#: git.c:883 #, c-format msgid "cannot handle %s as a builtin" msgstr "" -#: git.c:886 +#: git.c:896 #, c-format msgid "" "usage: %s\n" "\n" msgstr "" -#: git.c:906 +#: git.c:916 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" -#: git.c:918 +#: git.c:928 #, c-format msgid "failed to run command '%s': %s\n" msgstr "" +#: http-fetch.c:118 +#, c-format +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "" + +#: http-fetch.c:128 +msgid "not a git repository" +msgstr "" + +#: http-fetch.c:134 +msgid "--packfile requires --index-pack-args" +msgstr "" + +#: http-fetch.c:143 +msgid "--index-pack-args can only be used with --packfile" +msgstr "" + +#: t/helper/test-fast-rebase.c:141 +msgid "unhandled options" +msgstr "" + +#: t/helper/test-fast-rebase.c:146 +msgid "error preparing revisions" +msgstr "" + +#: t/helper/test-reach.c:154 +#, c-format +msgid "commit %s is not marked reachable" +msgstr "" + +#: t/helper/test-reach.c:164 +msgid "too many commits marked reachable" +msgstr "" + +#: t/helper/test-serve-v2.c:7 +msgid "test-tool serve-v2 [<options>]" +msgstr "" + +#: t/helper/test-serve-v2.c:19 +msgid "exit immediately after advertising capabilities" +msgstr "" + +#: t/helper/test-simple-ipc.c:262 +#, c-format +msgid "socket/pipe already in use: '%s'" +msgstr "" + +#: t/helper/test-simple-ipc.c:264 +#, c-format +msgid "could not start server on: '%s'" +msgstr "" + +#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331 +msgid "could not spawn daemon in the background" +msgstr "" + +#: t/helper/test-simple-ipc.c:356 +msgid "waitpid failed" +msgstr "" + +#: t/helper/test-simple-ipc.c:376 +msgid "daemon not online yet" +msgstr "" + +#: t/helper/test-simple-ipc.c:406 +msgid "daemon failed to start" +msgstr "" + +#: t/helper/test-simple-ipc.c:410 +msgid "waitpid is confused" +msgstr "" + +#: t/helper/test-simple-ipc.c:541 +msgid "daemon has not shutdown yet" +msgstr "" + +#: t/helper/test-simple-ipc.c:682 +msgid "test-helper simple-ipc is-active [<name>] [<options>]" +msgstr "" + +#: t/helper/test-simple-ipc.c:683 +msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]" +msgstr "" + +#: t/helper/test-simple-ipc.c:684 +msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" +msgstr "" + +#: t/helper/test-simple-ipc.c:685 +msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" +msgstr "" + +#: t/helper/test-simple-ipc.c:686 +msgid "test-helper simple-ipc send [<name>] [<token>]" +msgstr "" + +#: t/helper/test-simple-ipc.c:687 +msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" +msgstr "" + +#: t/helper/test-simple-ipc.c:688 +msgid "" +"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " +"[<batchsize>]" +msgstr "" + +#: t/helper/test-simple-ipc.c:696 +msgid "name or pathname of unix domain socket" +msgstr "" + +#: t/helper/test-simple-ipc.c:698 +msgid "named-pipe name" +msgstr "" + +#: t/helper/test-simple-ipc.c:700 +msgid "number of threads in server thread pool" +msgstr "" + +#: t/helper/test-simple-ipc.c:701 +msgid "seconds to wait for daemon to start or stop" +msgstr "" + +#: t/helper/test-simple-ipc.c:703 +msgid "number of bytes" +msgstr "" + +#: t/helper/test-simple-ipc.c:704 +msgid "number of requests per thread" +msgstr "" + +#: t/helper/test-simple-ipc.c:706 +msgid "byte" +msgstr "" + +#: t/helper/test-simple-ipc.c:706 +msgid "ballast character" +msgstr "" + +#: t/helper/test-simple-ipc.c:707 +msgid "token" +msgstr "" + +#: t/helper/test-simple-ipc.c:707 +msgid "command token to send to the server" +msgstr "" + #: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" @@ -22345,7 +23262,7 @@ msgstr "" msgid "Could not set SSL backend to '%s': already set" msgstr "" -#: http.c:2025 +#: http.c:2035 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -22493,43 +23410,43 @@ msgstr "" msgid "no libc information available\n" msgstr "" -#: list-objects-filter-options.h:91 +#: list-objects-filter-options.h:94 msgid "args" msgstr "" -#: list-objects-filter-options.h:92 +#: list-objects-filter-options.h:95 msgid "object filtering" msgstr "" -#: parse-options.h:183 +#: parse-options.h:184 msgid "expiry-date" msgstr "" -#: parse-options.h:197 +#: parse-options.h:198 msgid "no-op (backward compatibility)" msgstr "" -#: parse-options.h:309 +#: parse-options.h:310 msgid "be more verbose" msgstr "" -#: parse-options.h:311 +#: parse-options.h:312 msgid "be more quiet" msgstr "" -#: parse-options.h:317 +#: parse-options.h:318 msgid "use <n> digits to display object names" msgstr "" -#: parse-options.h:336 +#: parse-options.h:337 msgid "how to strip spaces and #comments from message" msgstr "" -#: parse-options.h:337 +#: parse-options.h:338 msgid "read pathspec from file" msgstr "" -#: parse-options.h:338 +#: parse-options.h:339 msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "" @@ -24031,73 +24948,78 @@ msgstr "" msgid "local time offset greater than or equal to 24 hours\n" msgstr "" -#: git-send-email.perl:223 git-send-email.perl:229 +#: git-send-email.perl:222 +#, perl-format +msgid "fatal: command '%s' died with exit code %d" +msgstr "" + +#: git-send-email.perl:235 msgid "the editor exited uncleanly, aborting everything" msgstr "" -#: git-send-email.perl:312 +#: git-send-email.perl:321 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" -#: git-send-email.perl:317 +#: git-send-email.perl:326 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "" -#: git-send-email.perl:410 +#: git-send-email.perl:419 msgid "--dump-aliases incompatible with other options\n" msgstr "" -#: git-send-email.perl:484 +#: git-send-email.perl:493 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" "Set sendemail.forbidSendmailVariables to false to disable this check.\n" msgstr "" -#: git-send-email.perl:489 git-send-email.perl:691 +#: git-send-email.perl:498 git-send-email.perl:700 msgid "Cannot run git format-patch from outside a repository\n" msgstr "" -#: git-send-email.perl:492 +#: git-send-email.perl:501 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "" -#: git-send-email.perl:505 +#: git-send-email.perl:514 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "" -#: git-send-email.perl:536 +#: git-send-email.perl:545 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "" -#: git-send-email.perl:564 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" -#: git-send-email.perl:566 +#: git-send-email.perl:575 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "" -#: git-send-email.perl:568 +#: git-send-email.perl:577 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "" -#: git-send-email.perl:573 +#: git-send-email.perl:582 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "" -#: git-send-email.perl:657 +#: git-send-email.perl:666 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -24107,36 +25029,29 @@ msgid "" " * Giving --format-patch option if you mean a range.\n" msgstr "" -#: git-send-email.perl:678 +#: git-send-email.perl:687 #, perl-format msgid "Failed to opendir %s: %s" msgstr "" -#: git-send-email.perl:702 -#, perl-format -msgid "" -"fatal: %s: %s\n" -"warning: no patches were sent\n" -msgstr "" - -#: git-send-email.perl:713 +#: git-send-email.perl:720 msgid "" "\n" "No patch files specified!\n" "\n" msgstr "" -#: git-send-email.perl:726 +#: git-send-email.perl:733 #, perl-format msgid "No subject line in %s?" msgstr "" -#: git-send-email.perl:736 +#: git-send-email.perl:743 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "" -#: git-send-email.perl:747 +#: git-send-email.perl:754 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -24145,37 +25060,37 @@ msgid "" "Clear the body content if you don't wish to send a summary.\n" msgstr "" -#: git-send-email.perl:771 +#: git-send-email.perl:778 #, perl-format msgid "Failed to open %s: %s" msgstr "" -#: git-send-email.perl:788 +#: git-send-email.perl:795 #, perl-format msgid "Failed to open %s.final: %s" msgstr "" -#: git-send-email.perl:831 +#: git-send-email.perl:838 msgid "Summary email is empty, skipping it\n" msgstr "" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:866 +#: git-send-email.perl:873 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "" -#: git-send-email.perl:921 +#: git-send-email.perl:928 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" -#: git-send-email.perl:926 +#: git-send-email.perl:933 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "" -#: git-send-email.perl:934 +#: git-send-email.perl:941 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -24184,20 +25099,20 @@ msgid "" "want to send.\n" msgstr "" -#: git-send-email.perl:953 +#: git-send-email.perl:960 msgid "To whom should the emails be sent (if anyone)?" msgstr "" -#: git-send-email.perl:971 +#: git-send-email.perl:978 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "" -#: git-send-email.perl:983 +#: git-send-email.perl:990 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" -#: git-send-email.perl:1041 git-send-email.perl:1049 +#: git-send-email.perl:1048 git-send-email.perl:1056 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "" @@ -24205,16 +25120,16 @@ msgstr "" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1053 +#: git-send-email.perl:1060 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" -#: git-send-email.perl:1370 +#: git-send-email.perl:1377 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "" -#: git-send-email.perl:1453 +#: git-send-email.perl:1460 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -24231,128 +25146,148 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1468 +#: git-send-email.perl:1475 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "" -#: git-send-email.perl:1471 +#: git-send-email.perl:1478 msgid "Send this email reply required" msgstr "" -#: git-send-email.perl:1499 +#: git-send-email.perl:1506 msgid "The required SMTP server is not properly defined." msgstr "" -#: git-send-email.perl:1546 +#: git-send-email.perl:1553 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "" -#: git-send-email.perl:1551 git-send-email.perl:1555 +#: git-send-email.perl:1558 git-send-email.perl:1562 #, perl-format msgid "STARTTLS failed! %s" msgstr "" -#: git-send-email.perl:1564 +#: git-send-email.perl:1571 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" -#: git-send-email.perl:1582 +#: git-send-email.perl:1589 #, perl-format msgid "Failed to send %s\n" msgstr "" -#: git-send-email.perl:1585 +#: git-send-email.perl:1592 #, perl-format msgid "Dry-Sent %s\n" msgstr "" -#: git-send-email.perl:1585 +#: git-send-email.perl:1592 #, perl-format msgid "Sent %s\n" msgstr "" -#: git-send-email.perl:1587 +#: git-send-email.perl:1594 msgid "Dry-OK. Log says:\n" msgstr "" -#: git-send-email.perl:1587 +#: git-send-email.perl:1594 msgid "OK. Log says:\n" msgstr "" -#: git-send-email.perl:1599 +#: git-send-email.perl:1606 msgid "Result: " msgstr "" -#: git-send-email.perl:1602 +#: git-send-email.perl:1609 msgid "Result: OK\n" msgstr "" -#: git-send-email.perl:1620 +#: git-send-email.perl:1627 #, perl-format msgid "can't open file %s" msgstr "" -#: git-send-email.perl:1667 git-send-email.perl:1687 +#: git-send-email.perl:1674 git-send-email.perl:1694 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1673 +#: git-send-email.perl:1680 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1730 +#: git-send-email.perl:1737 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1765 +#: git-send-email.perl:1772 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1876 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "" -#: git-send-email.perl:1883 +#: git-send-email.perl:1890 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "" -#: git-send-email.perl:1887 +#: git-send-email.perl:1894 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "" -#: git-send-email.perl:1917 +#: git-send-email.perl:1924 msgid "cannot send message as 7bit" msgstr "" -#: git-send-email.perl:1925 +#: git-send-email.perl:1932 msgid "invalid transfer encoding" msgstr "" -#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 +#: git-send-email.perl:1966 +#, perl-format +msgid "" +"fatal: %s: rejected by sendemail-validate hook\n" +"%s\n" +"warning: no patches were sent\n" +msgstr "" + +#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039 #, perl-format msgid "unable to open %s: %s\n" msgstr "" -#: git-send-email.perl:1969 +#: git-send-email.perl:1979 #, perl-format -msgid "%s: patch contains a line longer than 998 characters" +msgid "" +"fatal: %s:%d is longer than 998 characters\n" +"warning: no patches were sent\n" msgstr "" -#: git-send-email.perl:1986 +#: git-send-email.perl:1997 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1990 +#: git-send-email.perl:2001 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "" + +#~ msgid "Already up to date. Yeeah!" +#~ msgstr "Sudah terbaru. Ya!" + +#~ msgid "" +#~ "the rebase.useBuiltin support has been removed!\n" +#~ "See its entry in 'git help config' for details." +#~ msgstr "" +#~ "dukungan untuk rebase.useBuiltin sudah dihapus!\n" +#~ "Lihat entri itu di 'git help config' untuk selengkapnya." @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.31.0\n" +"Project-Id-Version: git 2.32.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-03-04 22:41+0800\n" -"PO-Revision-Date: 2021-03-04 19:06+0100\n" +"POT-Creation-Date: 2021-05-17 16:02+0800\n" +"PO-Revision-Date: 2021-05-20 13:31+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -23,9 +23,9 @@ msgstr "" msgid "Huh (%s)?" msgstr "Vadå (%s)?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292 -#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538 -#: builtin/rebase.c:1963 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 +#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 +#: builtin/rebase.c:1953 msgid "could not read index" msgstr "kunde inte läsa indexet" @@ -53,7 +53,7 @@ msgstr "Uppdatera" msgid "could not stage '%s'" msgstr "kunde inte köa \"%s\"" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687 msgid "could not write index" msgstr "kunde inte skriva indexet" @@ -69,7 +69,7 @@ msgstr[1] "uppdaterade %d sökvägar\n" msgid "note: %s is untracked now.\n" msgstr "observera: %s spåras inte längre.\n" -#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" @@ -209,12 +209,12 @@ msgstr "köad" msgid "unstaged" msgstr "ej köad" -#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 -#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 -#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 +#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 +#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327 +#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 #: git-add--interactive.perl:213 msgid "path" msgstr "sökväg" @@ -736,7 +736,7 @@ msgstr "Beklagar, kan inte redigera stycket" msgid "'git apply' failed" msgstr "\"git apply\" misslyckades" -#: advice.c:143 +#: advice.c:145 #, c-format msgid "" "\n" @@ -745,47 +745,47 @@ msgstr "" "\n" "Slå av meddelandet med \"git config advice.%s false\"" -#: advice.c:159 +#: advice.c:161 #, c-format msgid "%shint: %.*s%s\n" msgstr "%stips: %.*s%s\n" -#: advice.c:250 +#: advice.c:252 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits " "samman." -#: advice.c:252 +#: advice.c:254 msgid "Committing is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en incheckning eftersom du har filer som inte slagits " "samman." -#: advice.c:254 +#: advice.c:256 msgid "Merging is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits " "samman." -#: advice.c:256 +#: advice.c:258 msgid "Pulling is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman." -#: advice.c:258 +#: advice.c:260 msgid "Reverting is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits " "samman." -#: advice.c:260 +#: advice.c:262 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" "Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman." -#: advice.c:268 +#: advice.c:270 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -793,23 +793,41 @@ msgstr "" "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n" "som lämpligt för att ange lösning och checka in." -#: advice.c:276 +#: advice.c:278 msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:281 builtin/merge.c:1370 +#: advice.c:283 builtin/merge.c:1374 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: advice.c:283 +#: advice.c:285 msgid "Please, commit your changes before merging." msgstr "Checka in dina ändringar innan du utför sammanslagningen." -#: advice.c:284 +#: advice.c:286 msgid "Exiting because of unfinished merge." msgstr "Avslutar på grund av ofullbordad sammanslagning." -#: advice.c:290 +#: advice.c:296 +#, c-format +msgid "" +"The following pathspecs didn't match any eligible path, but they do match " +"index\n" +"entries outside the current sparse checkout:\n" +msgstr "" +"Följande sökvägsangivelser motsvarar inte någon kvalificerad sökväg, men " +"motsvarar\n" +"indexposter utanför den nuvarande glesa utcheckningen:\n" + +#: advice.c:303 +msgid "" +"Disable or modify the sparsity rules if you intend to update such entries." +msgstr "" +"Du måste ta bort eller ändra glesningsreglerna för att uppdatera sådana " +"poster." + +#: advice.c:310 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -860,82 +878,78 @@ msgstr "kommandorad avslutas med \\" msgid "unclosed quote" msgstr "citat ej stängt" -#: apply.c:69 +#: apply.c:70 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "okänt alternativ för whitespace: \"%s\"" -#: apply.c:85 +#: apply.c:86 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: apply.c:135 +#: apply.c:136 msgid "--reject and --3way cannot be used together." msgstr "--reject och --3way kan inte användas samtidigt." -#: apply.c:137 -msgid "--cached and --3way cannot be used together." -msgstr "--cached och --3way kan inte användas samtidigt." - -#: apply.c:140 +#: apply.c:139 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: apply.c:151 +#: apply.c:150 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: apply.c:154 +#: apply.c:153 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: apply.c:801 +#: apply.c:800 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: apply.c:810 +#: apply.c:809 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: apply.c:884 +#: apply.c:883 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen på rad %d" -#: apply.c:922 +#: apply.c:921 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d" -#: apply.c:928 +#: apply.c:927 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d" -#: apply.c:929 +#: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" -#: apply.c:934 +#: apply.c:933 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d" -#: apply.c:963 +#: apply.c:962 #, c-format msgid "invalid mode on line %d: %s" msgstr "ogiltigt läge på rad %d: %s" -#: apply.c:1282 +#: apply.c:1281 #, c-format msgid "inconsistent header lines %d and %d" msgstr "huvudet är inkonsekvent mellan rad %d och %d" -#: apply.c:1372 +#: apply.c:1371 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -951,92 +965,92 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: apply.c:1385 +#: apply.c:1384 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)" -#: apply.c:1481 +#: apply.c:1480 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: oväntad rad: %.*s" -#: apply.c:1550 +#: apply.c:1549 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** varning: filen %s blir tom men har inte tagits bort" -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: apply.c:2936 +#: apply.c:2935 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: apply.c:3057 +#: apply.c:3056 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Stycke %d lyckades på %d (offset %d rad)." msgstr[1] "Stycke %d lyckades på %d (offset %d rader)." -#: apply.c:3069 +#: apply.c:3068 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" -#: apply.c:3075 +#: apply.c:3074 #, c-format msgid "" "while searching for:\n" @@ -1045,25 +1059,25 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: apply.c:3097 +#: apply.c:3096 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: apply.c:3105 +#: apply.c:3104 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s" "\"" -#: apply.c:3152 +#: apply.c:3151 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden" -#: apply.c:3163 +#: apply.c:3162 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -1071,413 +1085,419 @@ msgstr "" "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande " "innehållet." -#: apply.c:3171 +#: apply.c:3170 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "patchen appliceras på en tom \"%s\", men den är inte tom" -#: apply.c:3189 +#: apply.c:3188 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas" -#: apply.c:3202 +#: apply.c:3201 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: apply.c:3209 +#: apply.c:3208 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" -#: apply.c:3230 +#: apply.c:3229 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3353 +#: apply.c:3352 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213 +#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214 #: setup.c:308 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: apply.c:3413 +#: apply.c:3412 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk" -#: apply.c:3442 apply.c:3685 +#: apply.c:3441 apply.c:3687 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: apply.c:3528 apply.c:3700 +#: apply.c:3527 apply.c:3702 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3537 apply.c:3708 apply.c:3952 +#: apply.c:3536 apply.c:3710 apply.c:3954 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3572 -msgid "repository lacks the necessary blob to fall back on 3-way merge." -msgstr "" -"arkivet saknar objekt som behövs för att falla tillbaka på 3-" -"vägssammanslagning." +#: apply.c:3571 +msgid "repository lacks the necessary blob to perform 3-way merge." +msgstr "arkivet saknar objekt som behövs för att utföra 3-vägssammanslagning." -#: apply.c:3575 +#: apply.c:3574 #, c-format -msgid "Falling back to three-way merge...\n" -msgstr "Faller tillbaka på trevägssammanslagning...\n" +msgid "Performing three-way merge...\n" +msgstr "Utför trevägssammanslagning...\n" -#: apply.c:3591 apply.c:3595 +#: apply.c:3590 apply.c:3594 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kunde inte läsa aktuellt innehåll i \"%s\"" -#: apply.c:3607 +#: apply.c:3606 #, c-format -msgid "Failed to fall back on three-way merge...\n" -msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n" +msgid "Failed to perform three-way merge...\n" +msgstr "Misslyckades utföra trevägssammanslagning...\n" -#: apply.c:3621 +#: apply.c:3620 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen på \"%s\" med konflikter.\n" -#: apply.c:3626 +#: apply.c:3625 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillämpade patchen på \"%s\" rent.\n" -#: apply.c:3652 +#: apply.c:3642 +#, c-format +msgid "Falling back to direct application...\n" +msgstr "Faller tillbaka på direkt tillämpning...\n" + +#: apply.c:3654 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: apply.c:3725 +#: apply.c:3727 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3727 +#: apply.c:3729 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 -#: read-cache.c:1313 +#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 +#: read-cache.c:1351 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg \"%s\"" -#: apply.c:3950 +#: apply.c:3952 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3954 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3974 +#: apply.c:3976 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)" -#: apply.c:3979 +#: apply.c:3981 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s" -#: apply.c:3999 +#: apply.c:4001 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk" -#: apply.c:4003 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:4018 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4110 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s" -#: apply.c:4117 +#: apply.c:4119 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "nytt läge för %s, som inte finns i nuvarande HEAD" -#: apply.c:4120 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4129 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4139 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4277 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4311 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4317 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4325 +#: apply.c:4327 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" -#: apply.c:4331 apply.c:4476 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4374 builtin/bisect--helper.c:523 +#: apply.c:4376 builtin/bisect--helper.c:523 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4378 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4448 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4546 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4554 +#: apply.c:4556 msgid "internal error" msgstr "internt fel" -#: apply.c:4557 +#: apply.c:4559 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Tillämpade patchen %%s med %d refuserad..." msgstr[1] "Tillämpade patchen %%s med %d refuserade..." -#: apply.c:4568 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334 +#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4590 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4594 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4718 +#: apply.c:4725 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4726 +#: apply.c:4733 msgid "unrecognized input" msgstr "indata känns inte igen" -#: apply.c:4746 +#: apply.c:4753 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4903 +#: apply.c:4910 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4930 +#: apply.c:4937 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "undertryckte %d fel i blanksteg" msgstr[1] "undertryckte %d fel i blanksteg" -#: apply.c:4936 apply.c:4951 +#: apply.c:4943 apply.c:4958 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d rad lägger till fel i blanksteg." msgstr[1] "%d rader lägger till fel i blanksteg." -#: apply.c:4944 +#: apply.c:4951 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg." msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg." -#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4988 +#: apply.c:4995 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4991 +#: apply.c:4998 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4993 builtin/am.c:2266 +#: apply.c:5000 builtin/am.c:2317 msgid "num" msgstr "antal" -#: apply.c:4994 +#: apply.c:5001 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4997 +#: apply.c:5004 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4999 +#: apply.c:5006 msgid "instead of applying the patch, output diffstat for the input" msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata" -#: apply.c:5003 +#: apply.c:5010 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:5005 +#: apply.c:5012 msgid "instead of applying the patch, output a summary for the input" msgstr "istället för att tillämpa patchen, skriv ut en summering av indata" -#: apply.c:5007 +#: apply.c:5014 msgid "instead of applying the patch, see if the patch is applicable" msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas" -#: apply.c:5009 +#: apply.c:5016 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:5011 +#: apply.c:5018 msgid "mark new files with `git add --intent-to-add`" msgstr "markera nya filer med \"git add --intent-to-add\"" -#: apply.c:5013 +#: apply.c:5020 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:5015 +#: apply.c:5022 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:5018 +#: apply.c:5025 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:5020 -msgid "attempt three-way merge if a patch does not apply" -msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" +#: apply.c:5027 +msgid "attempt three-way merge, fall back on normal patch if that fails" +msgstr "" +"försök en trevägssammanslagning, fall tillbaka på normal patch om det " +"misslyckas" -#: apply.c:5022 +#: apply.c:5029 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540 +#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:5027 +#: apply.c:5034 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 -#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3577 builtin/rebase.c:1352 +#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 +#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831 +#: builtin/rebase.c:1347 msgid "action" msgstr "åtgärd" -#: apply.c:5029 +#: apply.c:5036 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:5032 apply.c:5035 +#: apply.c:5039 apply.c:5042 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:5038 +#: apply.c:5045 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:5040 +#: apply.c:5047 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:5042 +#: apply.c:5049 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:5044 +#: apply.c:5051 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757 -#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 +#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 +#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "var pratsam" -#: apply.c:5047 +#: apply.c:5054 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:5050 +#: apply.c:5057 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:5052 builtin/am.c:2254 +#: apply.c:5059 builtin/am.c:2305 msgid "root" msgstr "rot" -#: apply.c:5053 +#: apply.c:5060 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" @@ -1544,141 +1564,141 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:192 +#: archive.c:188 #, c-format msgid "cannot read %s" msgstr "kan inte läsa %s" -#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894 -#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786 -#: builtin/merge.c:1139 +#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 +#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 +#: builtin/merge.c:1143 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315 +#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" -#: archive.c:454 +#: archive.c:451 #, c-format msgid "no such ref: %.*s" msgstr "ingen sådan referens: %.*s" -#: archive.c:460 +#: archive.c:457 #, c-format msgid "not a valid object name: %s" msgstr "objektnamnet är inte giltigt: %s" -#: archive.c:473 +#: archive.c:470 #, c-format msgid "not a tree object: %s" msgstr "inte ett trädobjekt: %s" -#: archive.c:485 +#: archive.c:482 msgid "current working directory is untracked" msgstr "aktuell arbetskatalog är inte spårad" -#: archive.c:526 +#: archive.c:523 #, c-format msgid "File not found: %s" msgstr "Hittar inte filen: %s" -#: archive.c:528 +#: archive.c:525 #, c-format msgid "Not a regular file: %s" msgstr "Inte en vanlig fil: %s" -#: archive.c:555 +#: archive.c:552 msgid "fmt" msgstr "fmt" -#: archive.c:555 +#: archive.c:552 msgid "archive format" msgstr "arkivformat" -#: archive.c:556 builtin/log.c:1764 +#: archive.c:553 builtin/log.c:1772 msgid "prefix" msgstr "prefix" -#: archive.c:557 +#: archive.c:554 msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888 +#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105 -#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 +#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105 +#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" msgstr "fil" -#: archive.c:559 +#: archive.c:556 msgid "add untracked file to archive" msgstr "ta med ospårade filer i arkivet" -#: archive.c:562 builtin/archive.c:90 +#: archive.c:559 builtin/archive.c:90 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:564 +#: archive.c:561 msgid "read .gitattributes in working directory" msgstr "läs .gitattributes i arbetskatalogen" -#: archive.c:565 +#: archive.c:562 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer på standard fel" -#: archive.c:567 +#: archive.c:564 msgid "set compression level" msgstr "välj komprimeringsgrad" -#: archive.c:570 +#: archive.c:567 msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 +#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 +#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 msgid "repo" msgstr "arkiv" -#: archive.c:573 builtin/archive.c:92 +#: archive.c:570 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 #: builtin/notes.c:498 msgid "command" msgstr "kommando" -#: archive.c:575 builtin/archive.c:94 +#: archive.c:572 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "sökväg till kommandot git-upload-archive på fjärren" -#: archive.c:582 +#: archive.c:579 msgid "Unexpected option --remote" msgstr "Oväntad flagga --remote" -#: archive.c:584 +#: archive.c:581 msgid "Option --exec can only be used together with --remote" msgstr "Flaggan --exec kan endast användas tillsammans med --remote" -#: archive.c:586 +#: archive.c:583 msgid "Unexpected option --output" msgstr "Oväntad flagga --output" -#: archive.c:588 +#: archive.c:585 msgid "Options --add-file and --remote cannot be used together" msgstr "Flaggorna --add-file och --remote kan inte användas samtidigt" -#: archive.c:610 +#: archive.c:607 #, c-format msgid "Unknown archive format '%s'" msgstr "Okänt arkivformat \"%s\"" -#: archive.c:619 +#: archive.c:616 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumentet stöd inte för formatet \"%s\": -%d" @@ -1688,12 +1708,12 @@ msgstr "Argumentet stöd inte för formatet \"%s\": -%d" msgid "%.*s is not a valid attribute name" msgstr "%-*s är inte ett giltigt namn på attribut" -#: attr.c:359 +#: attr.c:363 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s inte tillåtet: %s:%d" -#: attr.c:399 +#: attr.c:403 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1776,7 +1796,7 @@ msgstr "Bisect: en sammanslagningsbas måste testas\n" msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" @@ -1821,41 +1841,41 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n" msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n" -#: blame.c:2777 +#: blame.c:2776 msgid "--contents and --reverse do not blend well." msgstr "--contents och --reverse fungerar inte så bra tillsammans." -#: blame.c:2791 +#: blame.c:2790 msgid "cannot use --contents with final commit object name" msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt" -#: blame.c:2812 +#: blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146 -#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411 -#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335 -#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410 -#: builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 +#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 +#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 +#: builtin/pack-objects.c:3661 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" -#: blame.c:2839 +#: blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent tillsammans kräver ett intervall på första-förälder-" "kedjan" -#: blame.c:2850 +#: blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "sökvägen %s i %s finns inte" -#: blame.c:2861 +#: blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "kan inte läsa objektet %s för sökvägen %s" @@ -1993,12 +2013,12 @@ msgstr "Objektnamnet är tvetydigt: \"%s\"." msgid "Not a valid branch point: '%s'." msgstr "Avgreningspunkten är inte giltig: \"%s\"." -#: branch.c:365 +#: branch.c:366 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "\"%s\" är redan utcheckad på \"%s\"" -#: branch.c:388 +#: branch.c:389 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD i arbetskatalogen %s har inte uppdaterats" @@ -2023,8 +2043,8 @@ msgstr "'%s' ser inte ut som en v2- eller v3-paket-fil (bundle)" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184 -#: builtin/commit.c:814 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -2082,7 +2102,7 @@ msgstr "version %d för paket (bundle) stöds ej" msgid "cannot write bundle version %d with algorithm %s" msgstr "kan inte skriva paket (bundle) med version %d med algoritmen %s" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -2124,234 +2144,234 @@ msgstr "avslutande stycke har id %<PRIx32> som inte är noll" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit-graph.c:197 midx.c:46 +#: commit-graph.c:204 midx.c:47 msgid "invalid hash version" msgstr "felaktig hashnings-version" -#: commit-graph.c:255 +#: commit-graph.c:262 msgid "commit-graph file is too small" msgstr "incheckningsgraffilen %s är för liten" -#: commit-graph.c:348 +#: commit-graph.c:355 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X" -#: commit-graph.c:355 +#: commit-graph.c:362 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "incheckningsgrafens version %X stämmer inte med versionen %X" -#: commit-graph.c:362 +#: commit-graph.c:369 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X" -#: commit-graph.c:379 +#: commit-graph.c:386 #, c-format msgid "commit-graph file is too small to hold %u chunks" msgstr "incheckningsgraffilen är för liten för att innehålla %u stycken" -#: commit-graph.c:472 +#: commit-graph.c:482 msgid "commit-graph has no base graphs chunk" msgstr "incheckningsgrafen har inga bas-graf-stycken" -#: commit-graph.c:482 +#: commit-graph.c:492 msgid "commit-graph chain does not match" msgstr "incheckningsgrafens kedja stämmer inte" -#: commit-graph.c:530 +#: commit-graph.c:540 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde" -#: commit-graph.c:554 +#: commit-graph.c:564 msgid "unable to find all commit-graph files" msgstr "kan inte hitta alla incheckingsgraffiler" -#: commit-graph.c:735 commit-graph.c:772 +#: commit-graph.c:745 commit-graph.c:782 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig" -#: commit-graph.c:756 +#: commit-graph.c:766 #, c-format msgid "could not find commit %s" msgstr "kunde inte hitta incheckningen %s" -#: commit-graph.c:789 +#: commit-graph.c:799 msgid "commit-graph requires overflow generation data but has none" msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen" -#: commit-graph.c:1065 builtin/am.c:1292 +#: commit-graph.c:1075 builtin/am.c:1340 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: commit-graph.c:1327 builtin/pack-objects.c:2872 +#: commit-graph.c:1337 builtin/pack-objects.c:2897 #, c-format msgid "unable to get type of object %s" msgstr "kunde inte hämta typ för objektet %s" -#: commit-graph.c:1358 +#: commit-graph.c:1368 msgid "Loading known commits in commit graph" msgstr "Läser in kända incheckningar i incheckningsgraf" -#: commit-graph.c:1375 +#: commit-graph.c:1385 msgid "Expanding reachable commits in commit graph" msgstr "Expanderar nåbara incheckningar i incheckningsgraf" -#: commit-graph.c:1395 +#: commit-graph.c:1405 msgid "Clearing commit marks in commit graph" msgstr "Rensar incheckningsmärken i incheckningsgraf" -#: commit-graph.c:1414 +#: commit-graph.c:1424 msgid "Computing commit graph topological levels" msgstr "Beräknar topografiska nivåer för incheckningsgraf" -#: commit-graph.c:1467 +#: commit-graph.c:1477 msgid "Computing commit graph generation numbers" msgstr "Beräknar generationsvärden för incheckningsgraf" -#: commit-graph.c:1548 +#: commit-graph.c:1558 msgid "Computing commit changed paths Bloom filters" msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen" -#: commit-graph.c:1625 +#: commit-graph.c:1635 msgid "Collecting referenced commits" msgstr "Samlar refererade incheckningar" -#: commit-graph.c:1650 +#: commit-graph.c:1660 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket" msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket" -#: commit-graph.c:1663 +#: commit-graph.c:1673 #, c-format msgid "error adding pack %s" msgstr "fel vid tillägg av paketet %s" -#: commit-graph.c:1667 +#: commit-graph.c:1677 #, c-format msgid "error opening index for %s" msgstr "fel vid öppning av indexet för %s" -#: commit-graph.c:1704 +#: commit-graph.c:1714 msgid "Finding commits for commit graph among packed objects" msgstr "Söker incheckningar för incheckingsgraf i packade objekt" -#: commit-graph.c:1722 +#: commit-graph.c:1732 msgid "Finding extra edges in commit graph" msgstr "Söker ytterligare kanter i incheckingsgraf" -#: commit-graph.c:1771 +#: commit-graph.c:1781 msgid "failed to write correct number of base graph ids" msgstr "kunde inte skriva korrekt antal bas-graf-id:n" -#: commit-graph.c:1802 midx.c:794 +#: commit-graph.c:1812 midx.c:906 #, c-format msgid "unable to create leading directories of %s" msgstr "kunde inte skapa inledande kataloger för %s" -#: commit-graph.c:1815 +#: commit-graph.c:1825 msgid "unable to create temporary graph layer" msgstr "kan inte skapa temporärt graflager" -#: commit-graph.c:1820 +#: commit-graph.c:1830 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "kan inte justera delade behörigheter för \"%s\"" -#: commit-graph.c:1879 +#: commit-graph.c:1887 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Skriver ut incheckningsgraf i %d pass" msgstr[1] "Skriver ut incheckningsgraf i %d pass" -#: commit-graph.c:1915 +#: commit-graph.c:1923 msgid "unable to open commit-graph chain file" msgstr "Kunde inte öppna incheckningsgrafkedjefilen" -#: commit-graph.c:1931 +#: commit-graph.c:1939 msgid "failed to rename base commit-graph file" msgstr "kunde inte byta namn på bas-incheckingsgraffilen" -#: commit-graph.c:1951 +#: commit-graph.c:1959 msgid "failed to rename temporary commit-graph file" msgstr "kunde inte byta namn på temporär incheckningsgraffil" -#: commit-graph.c:2084 +#: commit-graph.c:2092 msgid "Scanning merged commits" msgstr "Söker sammanslagna incheckningar" -#: commit-graph.c:2128 +#: commit-graph.c:2136 msgid "Merging commit-graph" msgstr "Slår ihop incheckningsgraf" -#: commit-graph.c:2235 +#: commit-graph.c:2244 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" "försöker skriva en incheckningsgraf, men \"core.commitGraph\" är inaktiverad" -#: commit-graph.c:2342 +#: commit-graph.c:2351 msgid "too many commits to write graph" msgstr "för många incheckningar för att skriva graf" -#: commit-graph.c:2440 +#: commit-graph.c:2450 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig" -#: commit-graph.c:2450 +#: commit-graph.c:2460 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s" -#: commit-graph.c:2460 commit-graph.c:2475 +#: commit-graph.c:2470 commit-graph.c:2485 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u" -#: commit-graph.c:2467 +#: commit-graph.c:2477 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "kunde inte tolka incheckning %s från incheckningsgraf" -#: commit-graph.c:2485 +#: commit-graph.c:2495 msgid "Verifying commits in commit graph" msgstr "Bekräftar incheckningar i incheckningsgrafen" -#: commit-graph.c:2500 +#: commit-graph.c:2510 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf" -#: commit-graph.c:2507 +#: commit-graph.c:2517 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s" -#: commit-graph.c:2517 +#: commit-graph.c:2527 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång" -#: commit-graph.c:2526 +#: commit-graph.c:2536 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "incheckningsgrafens förälder för %s är %s != %s" -#: commit-graph.c:2540 +#: commit-graph.c:2550 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt" -#: commit-graph.c:2545 +#: commit-graph.c:2555 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2359,7 +2379,7 @@ msgstr "" "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-" "noll på annan plats" -#: commit-graph.c:2549 +#: commit-graph.c:2559 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2367,22 +2387,22 @@ msgstr "" "incheckningsgrafen har generationsnummer skilt från noll för incheckningen " "%s, men noll på annan plats" -#: commit-graph.c:2566 +#: commit-graph.c:2576 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "" "incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < " "%<PRIuMAX>" -#: commit-graph.c:2572 +#: commit-graph.c:2582 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !" "= %<PRIuMAX>" -#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416 +#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -2412,29 +2432,29 @@ msgstr "" "Slå av detta meddelande genom att skriva\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1223 +#: commit.c:1237 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s." -#: commit.c:1227 +#: commit.c:1241 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s." -#: commit.c:1230 +#: commit.c:1244 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: commit.c:1233 +#: commit.c:1247 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" -#: commit.c:1487 +#: commit.c:1501 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2501,7 +2521,7 @@ msgstr "nyckeln innehåller inte ett stycke: %s" msgid "key does not contain variable name: %s" msgstr "nyckeln innehåller inte variabelnamn: %s" -#: config.c:472 sequencer.c:2588 +#: config.c:472 sequencer.c:2785 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" @@ -2625,70 +2645,70 @@ msgstr "" msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s" -#: config.c:1194 +#: config.c:1257 #, c-format msgid "bad boolean config value '%s' for '%s'" msgstr "felaktigt booleskt konfigurationsvärde \"%s\" för \"%s\"" -#: config.c:1289 +#: config.c:1275 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:1298 +#: config.c:1284 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" -#: config.c:1391 +#: config.c:1377 #, c-format msgid "abbrev length out of range: %d" msgstr "förkortningslängd utanför intervallet: %d" -#: config.c:1405 config.c:1416 +#: config.c:1391 config.c:1402 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:1508 +#: config.c:1494 msgid "core.commentChar should only be one character" msgstr "core.commentChar kan bara vara ett tecken" -#: config.c:1541 +#: config.c:1527 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1613 +#: config.c:1599 #, c-format msgid "malformed value for %s" msgstr "felformat värde för %s" -#: config.c:1639 +#: config.c:1625 #, c-format msgid "malformed value for %s: %s" msgstr "felformat värde för %s: %s" -#: config.c:1640 +#: config.c:1626 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "måste vara en av nothing, matching, simple, upstream eller current" -#: config.c:1701 builtin/pack-objects.c:3666 +#: config.c:1687 builtin/pack-objects.c:3924 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1823 +#: config.c:1809 #, c-format msgid "unable to load config blob object '%s'" msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\"" -#: config.c:1826 +#: config.c:1812 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referensen \"%s\" pekar inte på en blob" -#: config.c:1843 +#: config.c:1829 #, c-format msgid "unable to resolve config blob '%s'" msgstr "kan inte slå upp konfigurerings-bloben \"%s\"" @@ -2698,105 +2718,105 @@ msgstr "kan inte slå upp konfigurerings-bloben \"%s\"" msgid "failed to parse %s" msgstr "kunde inte tolka %s" -#: config.c:1927 +#: config.c:1929 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:2290 +#: config.c:2293 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2464 +#: config.c:2467 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2509 +#: config.c:2512 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100" -#: config.c:2555 +#: config.c:2558 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2557 +#: config.c:2560 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d" -#: config.c:2641 +#: config.c:2644 #, c-format msgid "invalid section name '%s'" msgstr "felaktigt sektionsnamn \"%s\"" -#: config.c:2673 +#: config.c:2676 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2702 +#: config.c:2705 #, c-format msgid "failed to write new configuration file %s" msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" -#: config.c:2954 config.c:3280 +#: config.c:2957 config.c:3283 #, c-format msgid "could not lock config file %s" msgstr "kunde inte låsa konfigurationsfilen %s" -#: config.c:2965 +#: config.c:2968 #, c-format msgid "opening %s" msgstr "öppnar %s" -#: config.c:3002 builtin/config.c:361 +#: config.c:3005 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "ogiltigt mönster: %s" -#: config.c:3027 +#: config.c:3030 #, c-format msgid "invalid config file %s" msgstr "ogiltig konfigurationsfil: \"%s\"" -#: config.c:3040 config.c:3293 +#: config.c:3043 config.c:3296 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:3051 +#: config.c:3054 #, c-format msgid "unable to mmap '%s'" msgstr "kunde inte utföra mmap på \"%s\"" -#: config.c:3060 config.c:3298 +#: config.c:3063 config.c:3301 #, c-format msgid "chmod on %s failed" msgstr "chmod misslyckades på %s" -#: config.c:3145 config.c:3395 +#: config.c:3148 config.c:3398 #, c-format msgid "could not write config file %s" msgstr "kunde inte skriva konfigurationsfilen %s" -#: config.c:3179 +#: config.c:3182 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" -#: config.c:3271 +#: config.c:3274 #, c-format msgid "invalid section name: %s" msgstr "felaktigt namn på stycke: %s" -#: config.c:3438 +#: config.c:3441 #, c-format msgid "missing value for '%s'" msgstr "värde saknas för \"%s\"" @@ -2975,7 +2995,7 @@ msgstr "kunde inte grena (fork)" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" @@ -2991,17 +3011,17 @@ msgstr "kunde inte skriva till rev-list" msgid "failed to close rev-list's stdin" msgstr "kunde inte stänga rev-list:s standard in" -#: convert.c:194 +#: convert.c:183 #, c-format msgid "illegal crlf_action %d" msgstr "felaktig crlf_action %d" -#: convert.c:207 +#: convert.c:196 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF skulle ersättas av LF i %s" -#: convert.c:209 +#: convert.c:198 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -3010,12 +3030,12 @@ msgstr "" "CRLF kommer att ersättas av LF i %s.\n" "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog" -#: convert.c:217 +#: convert.c:206 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF skulle ersättas av CRLF i %s" -#: convert.c:219 +#: convert.c:208 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -3024,12 +3044,12 @@ msgstr "" "LF kommer att ersättas av CRLF i %s.\n" "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog" -#: convert.c:284 +#: convert.c:273 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "BOM är förbjudet i \"%s\" om kodat som %s" -#: convert.c:291 +#: convert.c:280 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " @@ -3038,12 +3058,12 @@ msgstr "" "Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%.*s som " "teckenkodning i arbetskatalogen." -#: convert.c:304 +#: convert.c:293 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "BOM krävs om \"%s\" kodas som %s" -#: convert.c:306 +#: convert.c:295 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -3052,51 +3072,51 @@ msgstr "" "Filen \"%s\" saknar byte order mark (BOM). Använd UTF-%sBE eller UTF-%sLE " "(beroende på byteordning) som teckenkodning i arbetskatalogen." -#: convert.c:419 convert.c:490 +#: convert.c:408 convert.c:479 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "misslyckades omkoda \"%s\" från %s till %s" -#: convert.c:462 +#: convert.c:451 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" "omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat" -#: convert.c:665 +#: convert.c:654 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "kan inte grena (fork) för att köra externt filter \"%s\"" -#: convert.c:685 +#: convert.c:674 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "kunde inte skicka indata till externt filter \"%s\"" -#: convert.c:692 +#: convert.c:681 #, c-format msgid "external filter '%s' failed %d" msgstr "externt filter \"%s\" misslyckades %d" -#: convert.c:727 convert.c:730 +#: convert.c:716 convert.c:719 #, c-format msgid "read from external filter '%s' failed" msgstr "läsning från externt filter \"%s\" misslyckades" -#: convert.c:733 convert.c:788 +#: convert.c:722 convert.c:777 #, c-format msgid "external filter '%s' failed" msgstr "externt filter \"%s\" misslyckades" -#: convert.c:837 +#: convert.c:826 msgid "unexpected filter type" msgstr "oväntad filtertyp" -#: convert.c:848 +#: convert.c:837 msgid "path name too long for external filter" msgstr "sökvägen för lång för externt filter" -#: convert.c:940 +#: convert.c:934 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3105,16 +3125,16 @@ msgstr "" "externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar " "inte har filtrerats" -#: convert.c:1240 +#: convert.c:1234 msgid "true/false are no valid working-tree-encodings" msgstr "true/false är inte giltig teckenkodning för arbetskatalogen" -#: convert.c:1428 convert.c:1462 +#: convert.c:1414 convert.c:1447 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: \"clean\"-filtret \"%s\" misslyckades" -#: convert.c:1508 +#: convert.c:1490 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades" @@ -3239,28 +3259,28 @@ msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)" msgid "Marked %d islands, done.\n" msgstr "Markerade %d öar, klar.\n" -#: diff-merges.c:70 +#: diff-merges.c:80 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "okänt värde för --diff-merges: %s" -#: diff-lib.c:534 +#: diff-lib.c:538 msgid "--merge-base does not work with ranges" msgstr "--merge-base fungerar inte med intervall" -#: diff-lib.c:536 +#: diff-lib.c:540 msgid "--merge-base only works with commits" msgstr "--merge-base fungerar bara med incheckningar" -#: diff-lib.c:553 +#: diff-lib.c:557 msgid "unable to get HEAD" msgstr "kan inte hämta HEAD" -#: diff-lib.c:560 +#: diff-lib.c:564 msgid "no merge base found" msgstr "ingen sammanslagningsbas hittades" -#: diff-lib.c:562 +#: diff-lib.c:566 msgid "multiple merge bases found" msgstr "flera sammanslagningsbaser hittades" @@ -3326,35 +3346,35 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:4276 +#: diff.c:4278 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4628 +#: diff.c:4630 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:4631 +#: diff.c:4633 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S och --find-object är ömsesidigt uteslutande" -#: diff.c:4710 +#: diff.c:4712 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:4758 +#: diff.c:4760 #, c-format msgid "invalid --stat value: %s" msgstr "ogiltigt värde för --stat: %s" -#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306 +#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s förväntar ett numeriskt värde" -#: diff.c:4795 +#: diff.c:4797 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3363,42 +3383,42 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4880 +#: diff.c:4882 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s" -#: diff.c:4904 +#: diff.c:4906 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "okänt värde efter ws-error-highlight=%.*s" -#: diff.c:4918 +#: diff.c:4920 #, c-format msgid "unable to resolve '%s'" msgstr "kunde inte slå upp \"%s\"" -#: diff.c:4968 diff.c:4974 +#: diff.c:4970 diff.c:4976 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s förväntar formen <n>/<m>" -#: diff.c:4986 +#: diff.c:4988 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s förväntar ett tecken, fick \"%s\"" -#: diff.c:5007 +#: diff.c:5009 #, c-format msgid "bad --color-moved argument: %s" msgstr "felaktigt argument till --color-moved: %s" -#: diff.c:5026 +#: diff.c:5028 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "ogiltigt läge %s\" i --color-moved-ws" -#: diff.c:5066 +#: diff.c:5068 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3406,154 +3426,154 @@ msgstr "" "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och " "\"histogram\"" -#: diff.c:5102 diff.c:5122 +#: diff.c:5104 diff.c:5124 #, c-format msgid "invalid argument to %s" msgstr "ogiltigt argument för %s" -#: diff.c:5226 +#: diff.c:5228 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\"" -#: diff.c:5275 +#: diff.c:5277 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:5331 +#: diff.c:5333 #, c-format msgid "bad --word-diff argument: %s" msgstr "felaktigt argument --word-diff: %s" -#: diff.c:5367 +#: diff.c:5369 msgid "Diff output format options" msgstr "Formatflaggor för diff-utdata" -#: diff.c:5369 diff.c:5375 +#: diff.c:5371 diff.c:5377 msgid "generate patch" msgstr "skapar patch" -#: diff.c:5372 builtin/log.c:179 +#: diff.c:5374 builtin/log.c:179 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: diff.c:5377 diff.c:5491 diff.c:5498 +#: diff.c:5379 diff.c:5493 diff.c:5500 msgid "<n>" msgstr "<n>" -#: diff.c:5378 diff.c:5381 +#: diff.c:5380 diff.c:5383 msgid "generate diffs with <n> lines context" msgstr "skapa diffar med <n> rader sammanhang" -#: diff.c:5383 +#: diff.c:5385 msgid "generate the diff in raw format" msgstr "generera diff i råformat" -#: diff.c:5386 +#: diff.c:5388 msgid "synonym for '-p --raw'" msgstr "synonym till \"-p --raw\"" -#: diff.c:5390 +#: diff.c:5392 msgid "synonym for '-p --stat'" msgstr "synonym till \"-p --stat\"" -#: diff.c:5394 +#: diff.c:5396 msgid "machine friendly --stat" msgstr "maskinläsbar --stat" -#: diff.c:5397 +#: diff.c:5399 msgid "output only the last line of --stat" msgstr "skriv bara ut den sista raden för --stat" -#: diff.c:5399 diff.c:5407 +#: diff.c:5401 diff.c:5409 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5400 +#: diff.c:5402 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "skriv ut distributionen av relativa mängder ändringar för varje underkatalog" -#: diff.c:5404 +#: diff.c:5406 msgid "synonym for --dirstat=cumulative" msgstr "synonym för --dirstat=cumulative" -#: diff.c:5408 +#: diff.c:5410 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonym för --dirstat=filer,param1,param2..." -#: diff.c:5412 +#: diff.c:5414 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel" -#: diff.c:5415 +#: diff.c:5417 msgid "condensed summary such as creations, renames and mode changes" msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen" -#: diff.c:5418 +#: diff.c:5420 msgid "show only names of changed files" msgstr "visa endast namnen på ändrade filer" -#: diff.c:5421 +#: diff.c:5423 msgid "show only names and status of changed files" msgstr "visa endast namn och status för ändrade filer" -#: diff.c:5423 +#: diff.c:5425 msgid "<width>[,<name-width>[,<count>]]" msgstr "<bredd>[,<namn-bredd>[,<antal>]]" -#: diff.c:5424 +#: diff.c:5426 msgid "generate diffstat" msgstr "skapa diffstat" -#: diff.c:5426 diff.c:5429 diff.c:5432 +#: diff.c:5428 diff.c:5431 diff.c:5434 msgid "<width>" msgstr "<bredd>" -#: diff.c:5427 +#: diff.c:5429 msgid "generate diffstat with a given width" msgstr "generera en diffstat med given bredd" -#: diff.c:5430 +#: diff.c:5432 msgid "generate diffstat with a given name width" msgstr "generera en diffstat med given namnbredd" -#: diff.c:5433 +#: diff.c:5435 msgid "generate diffstat with a given graph width" msgstr "generera en diffstat med given grafbredd" -#: diff.c:5435 +#: diff.c:5437 msgid "<count>" msgstr "<antal>" -#: diff.c:5436 +#: diff.c:5438 msgid "generate diffstat with limited lines" msgstr "generera diffstat med begränsade rader" -#: diff.c:5439 +#: diff.c:5441 msgid "generate compact summary in diffstat" msgstr "skapa kompakt översikt i diffstat" -#: diff.c:5442 +#: diff.c:5444 msgid "output a binary diff that can be applied" msgstr "skapa en binärdiff som kan appliceras" -#: diff.c:5445 +#: diff.c:5447 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "visa fullständiga objektnamn i \"index\"-rader för läget både före och efter" -#: diff.c:5447 +#: diff.c:5449 msgid "show colored diff" msgstr "visa färgad diff" -#: diff.c:5448 +#: diff.c:5450 msgid "<kind>" msgstr "<typ>" -#: diff.c:5449 +#: diff.c:5451 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3561,7 +3581,7 @@ msgstr "" "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller " "\"new\" (nya) rader i diffen" -#: diff.c:5452 +#: diff.c:5454 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3569,87 +3589,87 @@ msgstr "" "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw " "eller --numstat" -#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570 +#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572 msgid "<prefix>" msgstr "<prefix>" -#: diff.c:5456 +#: diff.c:5458 msgid "show the given source prefix instead of \"a/\"" msgstr "visa givet källprefix istället för \"a/\"" -#: diff.c:5459 +#: diff.c:5461 msgid "show the given destination prefix instead of \"b/\"" msgstr "visa givet målprefix istället för \"b/\"" -#: diff.c:5462 +#: diff.c:5464 msgid "prepend an additional prefix to every line of output" msgstr "lägg till ytterligare prefix på alla rader i utdata" -#: diff.c:5465 +#: diff.c:5467 msgid "do not show any source or destination prefix" msgstr "visa inte käll- eller målprefix" -#: diff.c:5468 +#: diff.c:5470 msgid "show context between diff hunks up to the specified number of lines" msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader" -#: diff.c:5472 diff.c:5477 diff.c:5482 +#: diff.c:5474 diff.c:5479 diff.c:5484 msgid "<char>" msgstr "<tecken>" -#: diff.c:5473 +#: diff.c:5475 msgid "specify the character to indicate a new line instead of '+'" msgstr "ange tecken för att ange ny rad istället för \"+\"" -#: diff.c:5478 +#: diff.c:5480 msgid "specify the character to indicate an old line instead of '-'" msgstr "ange tecken för att ange gammal rad istället för \"-\"" -#: diff.c:5483 +#: diff.c:5485 msgid "specify the character to indicate a context instead of ' '" msgstr "ange tecken för att ange sammanhang istället för \" \"" -#: diff.c:5486 +#: diff.c:5488 msgid "Diff rename options" msgstr "Diff-namnbytesflaggor" -#: diff.c:5487 +#: diff.c:5489 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5488 +#: diff.c:5490 msgid "break complete rewrite changes into pairs of delete and create" msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par" -#: diff.c:5492 +#: diff.c:5494 msgid "detect renames" msgstr "detektera namnändringar" -#: diff.c:5496 +#: diff.c:5498 msgid "omit the preimage for deletes" msgstr "ta bort för-version för borttagningar" -#: diff.c:5499 +#: diff.c:5501 msgid "detect copies" msgstr "detektera kopior" -#: diff.c:5503 +#: diff.c:5505 msgid "use unmodified files as source to find copies" msgstr "använd oförändrade som källa för att hitta kopior" -#: diff.c:5505 +#: diff.c:5507 msgid "disable rename detection" msgstr "inaktivera detektering av namnbyten" -#: diff.c:5508 +#: diff.c:5510 msgid "use empty blobs as rename source" msgstr "använd tomma blob:ar som namnändringskälla" -#: diff.c:5510 +#: diff.c:5512 msgid "continue listing the history of a file beyond renames" msgstr "fortsätt lista historiken för en fil bortom namnändringar" -#: diff.c:5513 +#: diff.c:5515 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3657,163 +3677,163 @@ msgstr "" "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver " "given gräns" -#: diff.c:5515 +#: diff.c:5517 msgid "Diff algorithm options" msgstr "Alternativ för diff-algoritm" -#: diff.c:5517 +#: diff.c:5519 msgid "produce the smallest possible diff" msgstr "skapa minsta möjliga diff" -#: diff.c:5520 +#: diff.c:5522 msgid "ignore whitespace when comparing lines" msgstr "ignorera blanktecken vid radjämförelse" -#: diff.c:5523 +#: diff.c:5525 msgid "ignore changes in amount of whitespace" msgstr "ignorera ändringar i antal blanktecken vid radjämförelse" -#: diff.c:5526 +#: diff.c:5528 msgid "ignore changes in whitespace at EOL" msgstr "ignorera blanktecken vid radslut" -#: diff.c:5529 +#: diff.c:5531 msgid "ignore carrier-return at the end of line" msgstr "ignorera CR-tecken vid radslut" -#: diff.c:5532 +#: diff.c:5534 msgid "ignore changes whose lines are all blank" msgstr "ignorera ändringar i rader som är helt blanka" -#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604 +#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606 msgid "<regex>" msgstr "<reguttr>" -#: diff.c:5535 +#: diff.c:5537 msgid "ignore changes whose all lines match <regex>" msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>" -#: diff.c:5538 +#: diff.c:5540 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "heuristik för att flytta diff-gränser för lättare läsning" -#: diff.c:5541 +#: diff.c:5543 msgid "generate diff using the \"patience diff\" algorithm" msgstr "skapa diffar med algoritmen \"patience diff\"" -#: diff.c:5545 +#: diff.c:5547 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "skapa diffar med algoritmen \"histogram diff\"" -#: diff.c:5547 +#: diff.c:5549 msgid "<algorithm>" msgstr "<algoritm>" -#: diff.c:5548 +#: diff.c:5550 msgid "choose a diff algorithm" msgstr "välj en diff-algoritm" -#: diff.c:5550 +#: diff.c:5552 msgid "<text>" msgstr "<text>" -#: diff.c:5551 +#: diff.c:5553 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "skapa diffar med algoritmen \"anchored diff\"" -#: diff.c:5553 diff.c:5562 diff.c:5565 +#: diff.c:5555 diff.c:5564 diff.c:5567 msgid "<mode>" msgstr "<läge>" -#: diff.c:5554 +#: diff.c:5556 msgid "show word diff, using <mode> to delimit changed words" msgstr "visa orddiff, där <läge> avgränsar ändrade ord" -#: diff.c:5557 +#: diff.c:5559 msgid "use <regex> to decide what a word is" msgstr "använd <reguttr> för att bestämma vad som är ett ord" -#: diff.c:5560 +#: diff.c:5562 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>" -#: diff.c:5563 +#: diff.c:5565 msgid "moved lines of code are colored differently" msgstr "flyttade kodrader färgas på annat sätt" -#: diff.c:5566 +#: diff.c:5568 msgid "how white spaces are ignored in --color-moved" msgstr "hur blanktecken ignoreras i --color-moved" -#: diff.c:5569 +#: diff.c:5571 msgid "Other diff options" msgstr "Andra diff-flaggor" -#: diff.c:5571 +#: diff.c:5573 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "vid start från underkatalog, uteslut ändringar utanför och visa relativa " "sökvägar" -#: diff.c:5575 +#: diff.c:5577 msgid "treat all files as text" msgstr "hantera alla filer som text" -#: diff.c:5577 +#: diff.c:5579 msgid "swap two inputs, reverse the diff" msgstr "växla två indatafiler, vänd diffen" -#: diff.c:5579 +#: diff.c:5581 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "avsluta med 1 vid ändringar, annars 0" -#: diff.c:5581 +#: diff.c:5583 msgid "disable all output of the program" msgstr "slå av alla utdata från programmet" -#: diff.c:5583 +#: diff.c:5585 msgid "allow an external diff helper to be executed" msgstr "tillåt köra en extern diff-hjälpare" -#: diff.c:5585 +#: diff.c:5587 msgid "run external text conversion filters when comparing binary files" msgstr "kör externt textkonverteringsfiler när binärfiler jämförs" -#: diff.c:5587 +#: diff.c:5589 msgid "<when>" msgstr "<när>" -#: diff.c:5588 +#: diff.c:5590 msgid "ignore changes to submodules in the diff generation" msgstr "ignorera ändringar i undermoduler när diffen skapas" -#: diff.c:5591 +#: diff.c:5593 msgid "<format>" msgstr "<format>" -#: diff.c:5592 +#: diff.c:5594 msgid "specify how differences in submodules are shown" msgstr "ange hur ändringar i undermoduler visas" -#: diff.c:5596 +#: diff.c:5598 msgid "hide 'git add -N' entries from the index" msgstr "dölj \"git add -N\"-poster från indexet" -#: diff.c:5599 +#: diff.c:5601 msgid "treat 'git add -N' entries as real in the index" msgstr "tolka \"git add -N\"-poster som äkta i indexet" -#: diff.c:5601 +#: diff.c:5603 msgid "<string>" msgstr "<sträng>" -#: diff.c:5602 +#: diff.c:5604 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng" -#: diff.c:5605 +#: diff.c:5607 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3821,66 +3841,66 @@ msgstr "" "se efter ändringar som ändrar antalet förekomster av angivet reguljärt " "uttryck" -#: diff.c:5608 +#: diff.c:5610 msgid "show all changes in the changeset with -S or -G" msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G" -#: diff.c:5611 +#: diff.c:5613 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck" -#: diff.c:5614 +#: diff.c:5616 msgid "control the order in which files appear in the output" msgstr "styr ordningen i vilken filer visas i utdata" -#: diff.c:5615 diff.c:5618 +#: diff.c:5617 diff.c:5620 msgid "<path>" msgstr "<sökväg>" -#: diff.c:5616 +#: diff.c:5618 msgid "show the change in the specified path first" msgstr "visa ändringen i angiven sökväg först" -#: diff.c:5619 +#: diff.c:5621 msgid "skip the output to the specified path" msgstr "hoppa över utdata fram till angiven sökväg" -#: diff.c:5621 +#: diff.c:5623 msgid "<object-id>" msgstr "<objekt-id>" -#: diff.c:5622 +#: diff.c:5624 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt" -#: diff.c:5624 +#: diff.c:5626 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5625 +#: diff.c:5627 msgid "select files by diff type" msgstr "välj filter efter diff-typ" -#: diff.c:5627 +#: diff.c:5629 msgid "<file>" msgstr "<fil>" -#: diff.c:5628 +#: diff.c:5630 msgid "Output to a specific file" msgstr "Skriv utdata till en specifik fil" -#: diff.c:6285 +#: diff.c:6287 msgid "inexact rename detection was skipped due to too many files." msgstr "" "onöjaktig namnbytesdetektering utfördes inte på grund av för många filer." -#: diff.c:6288 +#: diff.c:6290 msgid "only found copies from modified paths due to too many files." msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer." -#: diff.c:6291 +#: diff.c:6293 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3892,7 +3912,7 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:786 +#: diffcore-rename.c:1418 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" @@ -3927,35 +3947,35 @@ msgstr "" msgid "disabling cone pattern matching" msgstr "inaktiverar konmönstermatchning" -#: dir.c:1198 +#: dir.c:1206 #, c-format msgid "cannot use %s as an exclude file" msgstr "kan inte använda %s som exkluderingsfil" -#: dir.c:2305 +#: dir.c:2314 #, c-format msgid "could not open directory '%s'" msgstr "kunde inte öppna katalogen \"%s\"" -#: dir.c:2605 +#: dir.c:2614 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2729 +#: dir.c:2738 msgid "untracked cache is disabled on this system or location" msgstr "ospårad cache är inaktiverad på systemet eller platsen" -#: dir.c:3534 +#: dir.c:3543 #, c-format msgid "index file corrupt in repo %s" msgstr "indexfilen trasig i arkivet %s" -#: dir.c:3579 dir.c:3584 +#: dir.c:3590 dir.c:3595 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:3613 +#: dir.c:3624 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" @@ -3965,11 +3985,11 @@ msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" msgid "hint: Waiting for your editor to close the file...%c" msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c" -#: entry.c:177 +#: entry.c:179 msgid "Filtering content" msgstr "Filtrerar innehåll" -#: entry.c:478 +#: entry.c:500 #, c-format msgid "could not stat file '%s'" msgstr "kunde inte ta status på filen \"%s\"" @@ -3989,250 +4009,258 @@ msgstr "kunde inte ställa in GIT_DIR till \"%s\"" msgid "too many args to run %s" msgstr "för många flaggor för att köra %s" -#: fetch-pack.c:177 +#: fetch-pack.c:182 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: förväntade grund lista" -#: fetch-pack.c:180 +#: fetch-pack.c:185 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista" -#: fetch-pack.c:191 +#: fetch-pack.c:196 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket" -#: fetch-pack.c:211 +#: fetch-pack.c:216 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\"" -#: fetch-pack.c:222 +#: fetch-pack.c:227 msgid "unable to write to remote" msgstr "kunde inte skriva till fjärren" -#: fetch-pack.c:283 +#: fetch-pack.c:288 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc kräver \"multi_ack_detailed\"" -#: fetch-pack.c:378 fetch-pack.c:1457 +#: fetch-pack.c:383 fetch-pack.c:1423 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:384 fetch-pack.c:1463 +#: fetch-pack.c:389 fetch-pack.c:1429 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:386 fetch-pack.c:1465 +#: fetch-pack.c:391 fetch-pack.c:1431 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:389 fetch-pack.c:1468 +#: fetch-pack.c:394 fetch-pack.c:1434 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:391 fetch-pack.c:1470 +#: fetch-pack.c:396 fetch-pack.c:1436 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:394 fetch-pack.c:1474 +#: fetch-pack.c:399 fetch-pack.c:1440 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "förväntade shallow/unshallow, fick %s" -#: fetch-pack.c:434 +#: fetch-pack.c:439 #, c-format msgid "got %s %d %s" msgstr "fick %s %d %s" -#: fetch-pack.c:451 +#: fetch-pack.c:456 #, c-format msgid "invalid commit %s" msgstr "ogiltig incheckning %s" -#: fetch-pack.c:482 +#: fetch-pack.c:487 msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:495 progress.c:339 +#: fetch-pack.c:500 progress.c:339 msgid "done" msgstr "klart" -#: fetch-pack.c:507 +#: fetch-pack.c:512 #, c-format msgid "got %s (%d) %s" msgstr "fick %s (%d) %s" -#: fetch-pack.c:543 +#: fetch-pack.c:548 #, c-format msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:758 +#: fetch-pack.c:763 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:844 +#: fetch-pack.c:849 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:852 +#: fetch-pack.c:857 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:946 +#: fetch-pack.c:951 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:952 +#: fetch-pack.c:957 msgid "fetch-pack: invalid index-pack output" msgstr "fetch-patch: ogiltig utdata från index-pack" -#: fetch-pack.c:969 +#: fetch-pack.c:974 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:971 +#: fetch-pack.c:976 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:1031 +#: fetch-pack.c:1019 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054 -#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 -#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 -#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108 +#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042 +#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 +#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096 #, c-format msgid "Server supports %s" msgstr "Servern stöder %s" -#: fetch-pack.c:1041 +#: fetch-pack.c:1029 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:1101 +#: fetch-pack.c:1089 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:1106 +#: fetch-pack.c:1094 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:1110 +#: fetch-pack.c:1098 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:1112 +#: fetch-pack.c:1100 msgid "Server does not support this repository's object format" msgstr "Servern stöder inte det här arkivets objektformat" -#: fetch-pack.c:1125 +#: fetch-pack.c:1113 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1138 fetch-pack.c:1682 +#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238 +msgid "source repository is shallow, reject to clone." +msgstr "källarkivet är grunt, tillåter inte kloning." + +#: fetch-pack.c:1128 fetch-pack.c:1651 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1265 +#: fetch-pack.c:1242 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "omaka algoritmer: klient %s; server %s" -#: fetch-pack.c:1269 +#: fetch-pack.c:1246 #, c-format msgid "the server does not support algorithm '%s'" msgstr "servern stöder inte algoritmen \"%s\"" -#: fetch-pack.c:1289 +#: fetch-pack.c:1279 msgid "Server does not support shallow requests" msgstr "Servern stöder inte grunda förfrågningar" -#: fetch-pack.c:1296 +#: fetch-pack.c:1286 msgid "Server supports filter" msgstr "Servern stöder filter" -#: fetch-pack.c:1335 +#: fetch-pack.c:1329 fetch-pack.c:2034 msgid "unable to write request to remote" msgstr "kunde inte skriva anrop till fjärren" -#: fetch-pack.c:1353 +#: fetch-pack.c:1347 #, c-format msgid "error reading section header '%s'" msgstr "fel vid läsning av styckehuvudet \"%s\"" -#: fetch-pack.c:1359 +#: fetch-pack.c:1353 #, c-format msgid "expected '%s', received '%s'" msgstr "förväntade \"%s\", tog emot \"%s\"" -#: fetch-pack.c:1420 +#: fetch-pack.c:1387 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "oväntad bekräftelserad: \"%s\"" -#: fetch-pack.c:1425 +#: fetch-pack.c:1392 #, c-format msgid "error processing acks: %d" msgstr "fel vid hantering av bekräftelser: %d" -#: fetch-pack.c:1435 +#: fetch-pack.c:1402 msgid "expected packfile to be sent after 'ready'" msgstr "väntade att paketfil skulle sändas efter \"ready\"" -#: fetch-pack.c:1437 +#: fetch-pack.c:1404 msgid "expected no other sections to be sent after no 'ready'" msgstr "" "väntade inte att några ytterligare sektioner skulle sändas efter \"ready\"" -#: fetch-pack.c:1479 +#: fetch-pack.c:1445 #, c-format msgid "error processing shallow info: %d" msgstr "fel vid hantering av grund (\"shallow\") info: %d" -#: fetch-pack.c:1526 +#: fetch-pack.c:1494 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "förväntade wanted-ref, fick %s" -#: fetch-pack.c:1531 +#: fetch-pack.c:1499 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "oväntad wanted-ref: \"%s\"" -#: fetch-pack.c:1536 +#: fetch-pack.c:1504 #, c-format msgid "error processing wanted refs: %d" msgstr "fel vid hantering av önskade referenser: %d" -#: fetch-pack.c:1566 +#: fetch-pack.c:1534 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: förväntade svarsavslutningspaket" -#: fetch-pack.c:1960 +#: fetch-pack.c:1930 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1983 builtin/clone.c:693 +#: fetch-pack.c:1953 builtin/clone.c:697 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: fetch-pack.c:2010 +#: fetch-pack.c:2056 +msgid "unexpected 'ready' from remote" +msgstr "oväntat \"ready\" från fjärr" + +#: fetch-pack.c:2079 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:2013 +#: fetch-pack.c:2082 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s" @@ -4255,7 +4283,7 @@ msgstr "gpg misslyckades signera data" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors" -#: grep.c:543 +#: grep.c:531 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4263,18 +4291,18 @@ msgstr "" "angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -" "P under PCRE v2" -#: grep.c:1906 +#: grep.c:1893 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90 -#: builtin/rm.c:135 +#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:1934 +#: grep.c:1921 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" @@ -4498,47 +4526,52 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet" msgid "name consists only of disallowed characters: %s" msgstr "namnet består enbart av ej tillåtna tecken: %s" -#: ident.c:454 builtin/commit.c:634 +#: ident.c:454 builtin/commit.c:647 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: list-objects-filter-options.c:81 +#: list-objects-filter-options.c:83 msgid "expected 'tree:<depth>'" msgstr "förväntade \"tree:<djup>\"" -#: list-objects-filter-options.c:96 +#: list-objects-filter-options.c:98 msgid "sparse:path filters support has been dropped" msgstr "sparse:sökväg-filter stöds inte längre" -#: list-objects-filter-options.c:109 +#: list-objects-filter-options.c:105 +#, c-format +msgid "'%s' for 'object:type=<type>' isnot a valid object type" +msgstr "\"%s\" för \"object:type=<typ>\" är inte en giltig objekttyp" + +#: list-objects-filter-options.c:124 #, c-format msgid "invalid filter-spec '%s'" msgstr "felaktig filterspecifikation: \"%s\"" -#: list-objects-filter-options.c:125 +#: list-objects-filter-options.c:140 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "måste använda specialsekvens i delfilter-spec: \"%c\"" -#: list-objects-filter-options.c:167 +#: list-objects-filter-options.c:182 msgid "expected something after combine:" msgstr "förväntade någonting efter combine:" -#: list-objects-filter-options.c:249 +#: list-objects-filter-options.c:264 msgid "multiple filter-specs cannot be combined" msgstr "flera filterspecifikationer kan inte kombineras" -#: list-objects-filter-options.c:361 +#: list-objects-filter-options.c:376 msgid "unable to upgrade repository format to support partial clone" msgstr "kunde inte uppgradera arkivformat till att stöda delvis klon" -#: list-objects-filter.c:492 +#: list-objects-filter.c:532 #, c-format msgid "unable to access sparse blob in '%s'" msgstr "kunde inte nå gles blob på \"%s\"" -#: list-objects-filter.c:495 +#: list-objects-filter.c:535 #, c-format msgid "unable to parse sparse filter data in %s" msgstr "kunde inte tolka gles filterdata i %s" @@ -4553,7 +4586,7 @@ msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd" msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob" -#: list-objects.c:375 +#: list-objects.c:395 #, c-format msgid "unable to load root tree for commit %s" msgstr "kunde inte läsa in rot-trädet för incheckningen %s" @@ -4592,34 +4625,43 @@ msgstr "ogiltigt värde \"%s\" för lsrefs.unborn" msgid "expected flush after ls-refs arguments" msgstr "förväntade \"flush\" efter ls-refs-argument" -#: merge-ort.c:888 merge-recursive.c:1191 +#: mailinfo.c:1050 +msgid "quoted CRLF detected" +msgstr "citerad CRLF upptäcktes" + +#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46 +#, c-format +msgid "bad action '%s' for '%s'" +msgstr "felaktig funktion \"%s\" för \"%s\"" + +#: merge-ort.c:1116 merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)" -#: merge-ort.c:897 merge-recursive.c:1198 +#: merge-ort.c:1125 merge-recursive.c:1212 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)" -#: merge-ort.c:906 merge-recursive.c:1205 +#: merge-ort.c:1134 merge-recursive.c:1219 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Misslyckades slå ihop undermodulen %s (incheckningar följer inte " "sammanslagningsbasen)" -#: merge-ort.c:916 merge-ort.c:923 +#: merge-ort.c:1144 merge-ort.c:1151 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "Obs: Snabbspolar undermodulen %s till %s" -#: merge-ort.c:944 +#: merge-ort.c:1172 #, c-format msgid "Failed to merge submodule %s" msgstr "Misslyckades slå ihop undermodulen %s" -#: merge-ort.c:951 +#: merge-ort.c:1179 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4628,7 +4670,7 @@ msgstr "" "Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n" "%s\n" -#: merge-ort.c:955 merge-recursive.c:1259 +#: merge-ort.c:1183 merge-recursive.c:1273 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4645,7 +4687,7 @@ msgstr "" "\n" "vilket godtar lösningen.\n" -#: merge-ort.c:968 +#: merge-ort.c:1196 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4655,21 +4697,21 @@ msgstr "" "finns:\n" "%s" -#: merge-ort.c:1127 merge-recursive.c:1341 +#: merge-ort.c:1415 merge-recursive.c:1362 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-ort.c:1132 merge-recursive.c:1346 +#: merge-ort.c:1420 merge-recursive.c:1367 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-ort.c:1139 merge-recursive.c:1378 +#: merge-ort.c:1427 merge-recursive.c:1400 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-ort.c:1278 merge-recursive.c:2100 +#: merge-ort.c:1566 merge-recursive.c:2122 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4678,7 +4720,7 @@ msgstr "" "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för " "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s." -#: merge-ort.c:1288 merge-recursive.c:2110 +#: merge-ort.c:1576 merge-recursive.c:2132 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4687,7 +4729,7 @@ msgstr "" "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till " "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s" -#: merge-ort.c:1471 +#: merge-ort.c:1634 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4698,7 +4740,7 @@ msgstr "" "den har namnbytts till flera andra kataloger, utan att någon destination " "fick en majoritet av filerna." -#: merge-ort.c:1637 merge-recursive.c:2447 +#: merge-ort.c:1788 merge-recursive.c:2468 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4707,7 +4749,7 @@ msgstr "" "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har " "bytt namn." -#: merge-ort.c:1781 merge-recursive.c:3215 +#: merge-ort.c:1932 merge-recursive.c:3244 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4716,7 +4758,7 @@ msgstr "" "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; " "flyttar den till %s." -#: merge-ort.c:1788 merge-recursive.c:3222 +#: merge-ort.c:1939 merge-recursive.c:3251 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4725,7 +4767,7 @@ msgstr "" "Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte " "namn i %s; flyttar den till %s." -#: merge-ort.c:1801 merge-recursive.c:3218 +#: merge-ort.c:1952 merge-recursive.c:3247 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4734,7 +4776,7 @@ msgstr "" "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i " "%s, föreslår att den bör flyttas till%s." -#: merge-ort.c:1809 merge-recursive.c:3225 +#: merge-ort.c:1960 merge-recursive.c:3254 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4743,13 +4785,13 @@ msgstr "" "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som " "bytte namn i %s; flyttar den till %s." -#: merge-ort.c:1952 +#: merge-ort.c:2103 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "KONFLIKT (namnbyte/namnbyte): %s namnbytt till %s i %s och till %s i %s." -#: merge-ort.c:2047 +#: merge-ort.c:2198 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4760,13 +4802,23 @@ msgstr "" "innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till " "nästlade konfliktmarkörer." -#: merge-ort.c:2066 merge-ort.c:2090 +#: merge-ort.c:2217 merge-ort.c:2241 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" "KONFLIKT (namnbyte/radera): %s namnbytt till %s i %s, men borttagen i %s." -#: merge-ort.c:2735 +#: merge-ort.c:2550 merge-recursive.c:3002 +#, c-format +msgid "cannot read object %s" +msgstr "kan inte läsa objektet %s" + +#: merge-ort.c:2553 merge-recursive.c:3005 +#, c-format +msgid "object %s is not a blob" +msgstr "objektet %s är inte en blob" + +#: merge-ort.c:2981 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " @@ -4775,41 +4827,42 @@ msgstr "" "KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den " "till %s istället." -#: merge-ort.c:2808 +#: merge-ort.c:3055 #, c-format msgid "" -"CONFLICT (distinct types): %s had different types on each side; renamed %s " +"CONFLICT (distinct types): %s had different types on each side; renamed both " "of them so each can be recorded somewhere." msgstr "" -"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte %s så " -"att de kan protokollföras någonstans." +"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte bägge " +"så att de kan protokollföras någonstans." -#: merge-ort.c:2812 -msgid "both" -msgstr "båda" - -#: merge-ort.c:2812 -msgid "one" -msgstr "en" +#: merge-ort.c:3062 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed one " +"of them so each can be recorded somewhere." +msgstr "" +"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte den ena " +"så att de kan protokollföras någonstans." -#: merge-ort.c:2907 merge-recursive.c:3052 +#: merge-ort.c:3162 merge-recursive.c:3081 msgid "content" msgstr "innehåll" -#: merge-ort.c:2909 merge-recursive.c:3056 +#: merge-ort.c:3164 merge-recursive.c:3085 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-ort.c:2911 merge-recursive.c:3101 +#: merge-ort.c:3166 merge-recursive.c:3130 msgid "submodule" msgstr "undermodul" -#: merge-ort.c:2913 merge-recursive.c:3102 +#: merge-ort.c:3168 merge-recursive.c:3131 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-ort.c:2938 +#: merge-ort.c:3198 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4818,15 +4871,24 @@ msgstr "" "KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s " "lämnad i trädet." +#: merge-ort.c:3433 +#, c-format +msgid "" +"Note: %s not up to date and in way of checking out conflicted version; old " +"copy renamed to %s" +msgstr "" +"Observera: %s är inte à jour och i vägen för att checka ut version i " +"konflikt; gammal upplaga har nytt namn %s" + #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:3406 +#: merge-ort.c:3730 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s" -#: merge-ort-wrappers.c:13 merge-recursive.c:3661 +#: merge-ort-wrappers.c:13 merge-recursive.c:3699 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4836,10 +4898,9 @@ msgstr "" "sammanslagning:\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3436 -#, c-format -msgid "Already up to date!" -msgstr "Redan à jour!" +#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402 +msgid "Already up to date." +msgstr "Redan à jour." #: merge-recursive.c:356 msgid "(bad commit)\n" @@ -4858,88 +4919,88 @@ msgstr "" "add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar " "sammanslagningen." -#: merge-recursive.c:874 +#: merge-recursive.c:876 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:885 +#: merge-recursive.c:887 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Tar bort %s för att göra plats för underkatalog\n" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:901 merge-recursive.c:920 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:908 +#: merge-recursive.c:910 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:951 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:954 +#: merge-recursive.c:956 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:979 +#: merge-recursive.c:981 #, c-format msgid "failed to open '%s': %s" msgstr "misslyckades öppna \"%s\": %s" -#: merge-recursive.c:990 +#: merge-recursive.c:992 #, c-format msgid "failed to symlink '%s': %s" msgstr "misslyckades skapa symboliska länken \"%s\": %s" -#: merge-recursive.c:995 +#: merge-recursive.c:997 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" ska hanteras" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1227 merge-recursive.c:1239 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Snabbspolar undermodulen %s till följande incheckning:" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1230 merge-recursive.c:1242 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Snabbspolar undermodulen %s" -#: merge-recursive.c:1251 +#: merge-recursive.c:1265 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar " "hittades inte)" -#: merge-recursive.c:1255 +#: merge-recursive.c:1269 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)" -#: merge-recursive.c:1256 +#: merge-recursive.c:1270 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n" -#: merge-recursive.c:1268 +#: merge-recursive.c:1282 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)" -#: merge-recursive.c:1402 +#: merge-recursive.c:1424 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället." -#: merge-recursive.c:1474 +#: merge-recursive.c:1496 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4948,7 +5009,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet." -#: merge-recursive.c:1479 +#: merge-recursive.c:1501 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4957,7 +5018,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet." -#: merge-recursive.c:1486 +#: merge-recursive.c:1508 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4966,7 +5027,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet vid %s." -#: merge-recursive.c:1491 +#: merge-recursive.c:1513 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4975,40 +5036,40 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet vid %s." -#: merge-recursive.c:1526 +#: merge-recursive.c:1548 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1526 +#: merge-recursive.c:1548 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 +#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Vägrar förlora lortig fil vid \"%s\"" -#: merge-recursive.c:1587 +#: merge-recursive.c:1609 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen." -#: merge-recursive.c:1645 +#: merge-recursive.c:1667 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s" -#: merge-recursive.c:1676 +#: merge-recursive.c:1698 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s är en katalog i %s lägger till som %s istället" -#: merge-recursive.c:1681 +#: merge-recursive.c:1703 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället" -#: merge-recursive.c:1708 +#: merge-recursive.c:1730 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5017,17 +5078,17 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1735 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1805 +#: merge-recursive.c:1827 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s" -#: merge-recursive.c:2068 +#: merge-recursive.c:2090 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5038,7 +5099,7 @@ msgstr "" "katalogen %s bytte namn till flera andra kataloger, utan att någon " "destination fick en majoritet av filerna." -#: merge-recursive.c:2202 +#: merge-recursive.c:2224 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5047,90 +5108,80 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog " "%s->%s i %s" -#: merge-recursive.c:2973 -#, c-format -msgid "cannot read object %s" -msgstr "kan inte läsa objektet %s" - -#: merge-recursive.c:2976 -#, c-format -msgid "object %s is not a blob" -msgstr "objektet %s är inte en blob" - -#: merge-recursive.c:3040 +#: merge-recursive.c:3069 msgid "modify" msgstr "ändra" -#: merge-recursive.c:3040 +#: merge-recursive.c:3069 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:3079 +#: merge-recursive.c:3108 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:3132 +#: merge-recursive.c:3161 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:3339 +#: merge-recursive.c:3368 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:3362 +#: merge-recursive.c:3391 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:3367 +#: merge-recursive.c:3396 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:3374 +#: merge-recursive.c:3403 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s" -#: merge-recursive.c:3383 +#: merge-recursive.c:3412 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:3392 +#: merge-recursive.c:3421 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3445 +#: merge-recursive.c:3474 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:3539 +#: merge-recursive.c:3568 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:3552 +#: merge-recursive.c:3581 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "hittade %u gemensam förfader:" msgstr[1] "hittade %u gemensamma förfäder:" -#: merge-recursive.c:3602 +#: merge-recursive.c:3631 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:3758 +#: merge-recursive.c:3796 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896 -#: builtin/stash.c:471 +#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900 +#: builtin/stash.c:473 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -5138,177 +5189,196 @@ msgstr "Kunde inte skriva indexet." msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917 -#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817 -#: builtin/stash.c:265 +#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965 +#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 +#: builtin/stash.c:267 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: midx.c:62 +#: midx.c:74 msgid "multi-pack-index OID fanout is of the wrong size" msgstr "multi-pack-indexets OID-utbredning har fel storlek" -#: midx.c:93 +#: midx.c:105 #, c-format msgid "multi-pack-index file %s is too small" msgstr "multi-pack-indexfilen %s är för liten" -#: midx.c:109 +#: midx.c:121 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x" -#: midx.c:114 +#: midx.c:126 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-indexversionen %d stöds inte" -#: midx.c:119 +#: midx.c:131 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "multi-pack-index-hashversionen %u stämmer inte med versionen %u" -#: midx.c:136 +#: midx.c:148 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index saknar krävd paketnamn-stycke" -#: midx.c:138 +#: midx.c:150 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index saknar krävt OID-utbredningsstycke" -#: midx.c:140 +#: midx.c:152 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke" -#: midx.c:142 +#: midx.c:154 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index saknar krävt objekt-offsetstycke" -#: midx.c:158 +#: midx.c:170 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\"" -#: midx.c:202 +#: midx.c:214 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "bad pack-int-id: %u (%u paket totalt)" -#: midx.c:252 +#: midx.c:264 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten" -#: midx.c:467 +#: midx.c:490 #, c-format msgid "failed to add packfile '%s'" msgstr "misslyckades läsa paketfilen \"%s\"" -#: midx.c:473 +#: midx.c:496 #, c-format msgid "failed to open pack-index '%s'" msgstr "misslyckades öppna paketindexet \"%s\"" -#: midx.c:533 +#: midx.c:564 #, c-format msgid "failed to locate object %d in packfile" msgstr "misslyckades hitta objekt %d i paketfilen" -#: midx.c:821 +#: midx.c:880 builtin/index-pack.c:1535 +msgid "cannot store reverse index file" +msgstr "kan inte spara reverse-index-fil" + +#: midx.c:933 msgid "Adding packfiles to multi-pack-index" msgstr "Lägger till paketfiler till multi-pack-index" -#: midx.c:855 +#: midx.c:979 #, c-format msgid "did not see pack-file %s to drop" msgstr "såg inte paketfilen %s som skulle kastas" -#: midx.c:904 +#: midx.c:1024 +#, c-format +msgid "unknown preferred pack: '%s'" +msgstr "okänt föredraget paket: %s" + +#: midx.c:1029 +#, c-format +msgid "preferred pack '%s' is expired" +msgstr "föredraget paket \"%s\" har löpt ut" + +#: midx.c:1045 msgid "no pack files to index." msgstr "inga paketfiler att indexera." -#: midx.c:965 +#: midx.c:1125 builtin/clean.c:37 +#, c-format +msgid "failed to remove %s" +msgstr "misslyckades ta bort %s" + +#: midx.c:1156 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "misslyckades städa multi-pack-index på %s" -#: midx.c:1021 +#: midx.c:1214 msgid "multi-pack-index file exists, but failed to parse" msgstr "multi-pack-indexfilen finns, men kunde inte tolkas" -#: midx.c:1029 +#: midx.c:1222 msgid "Looking for referenced packfiles" msgstr "Ser efter refererade packfiler" -#: midx.c:1044 +#: midx.c:1237 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1049 +#: midx.c:1242 msgid "the midx contains no oid" msgstr "midx saknar oid" -#: midx.c:1058 +#: midx.c:1251 msgid "Verifying OID order in multi-pack-index" msgstr "Bekräftar OID-ordning i multi-pack-index" -#: midx.c:1067 +#: midx.c:1260 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1087 +#: midx.c:1280 msgid "Sorting objects by packfile" msgstr "Sorterar objekt efter packfil" -#: midx.c:1094 +#: midx.c:1287 msgid "Verifying object offsets" msgstr "Bekräftar offset för objekt" -#: midx.c:1110 +#: midx.c:1303 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "misslyckades läsa paketpost för oid[%d] = %s" -#: midx.c:1116 +#: midx.c:1309 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "misslyckades läsa paketindex för paketfil %s" -#: midx.c:1125 +#: midx.c:1318 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1150 +#: midx.c:1343 msgid "Counting referenced objects" msgstr "Räknar refererade objekt" -#: midx.c:1160 +#: midx.c:1353 msgid "Finding and deleting unreferenced packfiles" msgstr "Ser efter och tar bort orefererade packfiler" -#: midx.c:1351 +#: midx.c:1544 msgid "could not start pack-objects" msgstr "kunde inte starta pack-objects" -#: midx.c:1371 +#: midx.c:1564 msgid "could not finish pack-objects" msgstr "kunde inte avsluta pack-objects" -#: name-hash.c:538 +#: name-hash.c:542 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "misslyckades skapa lazy_dir-tråd: %s" -#: name-hash.c:560 +#: name-hash.c:564 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "misslyckades skapa lazy_name-tråd: %s" -#: name-hash.c:566 +#: name-hash.c:570 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "misslyckades utföra join på lazy_name-tråd: %s" @@ -5353,257 +5423,257 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" -#: object-file.c:480 +#: object-file.c:526 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates" -#: object-file.c:531 +#: object-file.c:577 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "kunde inte normalisera supplerande objektsökväg: %s" -#: object-file.c:603 +#: object-file.c:649 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: ignorerar supplerande objektlager, för djup nästling" -#: object-file.c:610 +#: object-file.c:656 #, c-format msgid "unable to normalize object directory: %s" msgstr "kan inte normalisera objektkatalogen: %s" -#: object-file.c:653 +#: object-file.c:699 msgid "unable to fdopen alternates lockfile" msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil" -#: object-file.c:671 +#: object-file.c:717 msgid "unable to read alternates file" msgstr "kan inte läsa \"alternates\"-filen" -#: object-file.c:678 +#: object-file.c:724 msgid "unable to move new alternates file into place" msgstr "kan inte flytta ny \"alternates\"-fil på plats" -#: object-file.c:713 +#: object-file.c:759 #, c-format msgid "path '%s' does not exist" msgstr "sökvägen \"%s\" finns inte" -#: object-file.c:734 +#: object-file.c:780 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu." -#: object-file.c:740 +#: object-file.c:786 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: object-file.c:746 +#: object-file.c:792 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: object-file.c:754 +#: object-file.c:800 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: object-file.c:814 +#: object-file.c:860 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "felaktig rad vid tolkning av supplerande referenser: %s" -#: object-file.c:964 +#: object-file.c:1010 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>" -#: object-file.c:985 +#: object-file.c:1031 msgid "mmap failed" msgstr "mmap misslyckades" -#: object-file.c:1149 +#: object-file.c:1195 #, c-format msgid "object file %s is empty" msgstr "objektfilen %s är tom" -#: object-file.c:1284 object-file.c:2477 +#: object-file.c:1330 object-file.c:2524 #, c-format msgid "corrupt loose object '%s'" msgstr "trasigt löst objekt \"%s\"" -#: object-file.c:1286 object-file.c:2481 +#: object-file.c:1332 object-file.c:2528 #, c-format msgid "garbage at end of loose object '%s'" msgstr "skräp i slutet av löst objekt \"%s\"" -#: object-file.c:1328 +#: object-file.c:1374 msgid "invalid object type" msgstr "felaktig objekttyp" -#: object-file.c:1412 +#: object-file.c:1458 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "kan inte packa upp %s-huvud med --allow-unknown-type" -#: object-file.c:1415 +#: object-file.c:1461 #, c-format msgid "unable to unpack %s header" msgstr "kan inte packa upp %s-huvudet" -#: object-file.c:1421 +#: object-file.c:1467 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "kan inte tolka %s-huvud med --allow-unknown-type" -#: object-file.c:1424 +#: object-file.c:1470 #, c-format msgid "unable to parse %s header" msgstr "kan inte tolka %s-huvud" -#: object-file.c:1651 +#: object-file.c:1697 #, c-format msgid "failed to read object %s" msgstr "misslyckades läsa objektet %s" -#: object-file.c:1655 +#: object-file.c:1701 #, c-format msgid "replacement %s not found for %s" msgstr "ersättningen %s hittades inte för %s" -#: object-file.c:1659 +#: object-file.c:1705 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "löst objekt %s (lagrat i %s) är trasigt" -#: object-file.c:1663 +#: object-file.c:1709 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "packat objekt %s (lagrat i %s) är trasigt" -#: object-file.c:1768 +#: object-file.c:1814 #, c-format msgid "unable to write file %s" msgstr "kunde inte skriva filen %s" -#: object-file.c:1775 +#: object-file.c:1821 #, c-format msgid "unable to set permission to '%s'" msgstr "kan inte sätta behörigheten till \"%s\"" -#: object-file.c:1782 +#: object-file.c:1828 msgid "file write error" msgstr "fel vid skrivning av fil" -#: object-file.c:1802 +#: object-file.c:1848 msgid "error when closing loose object file" msgstr "fel vid stängning av fil för löst objekt" -#: object-file.c:1867 +#: object-file.c:1913 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s" -#: object-file.c:1869 +#: object-file.c:1915 msgid "unable to create temporary file" msgstr "kan inte skapa temporär fil" -#: object-file.c:1893 +#: object-file.c:1939 msgid "unable to write loose object file" msgstr "kunde inte skriva fil för löst objekt" -#: object-file.c:1899 +#: object-file.c:1945 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)" -#: object-file.c:1903 +#: object-file.c:1949 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "\"deflateend\" på objektet %s misslyckades (%d)" -#: object-file.c:1907 +#: object-file.c:1953 #, c-format msgid "confused by unstable object source data for %s" msgstr "förvirrad av instabil objektkälldata för %s" -#: object-file.c:1917 builtin/pack-objects.c:1097 +#: object-file.c:1963 builtin/pack-objects.c:1097 #, c-format msgid "failed utime() on %s" msgstr "\"utime()\" misslyckades på %s" -#: object-file.c:1994 +#: object-file.c:2040 #, c-format msgid "cannot read object for %s" msgstr "kan inte läsa objekt för %s" -#: object-file.c:2045 +#: object-file.c:2091 msgid "corrupt commit" msgstr "trasik incheckning" -#: object-file.c:2053 +#: object-file.c:2099 msgid "corrupt tag" msgstr "trasig tagg" -#: object-file.c:2153 +#: object-file.c:2199 #, c-format msgid "read error while indexing %s" msgstr "läsfel vid indexering av %s" -#: object-file.c:2156 +#: object-file.c:2202 #, c-format msgid "short read while indexing %s" msgstr "för lite lästes vid indexering av %s" -#: object-file.c:2229 object-file.c:2239 +#: object-file.c:2275 object-file.c:2285 #, c-format msgid "%s: failed to insert into database" msgstr "%s: misslyckades lägga in i databasen" -#: object-file.c:2245 +#: object-file.c:2291 #, c-format msgid "%s: unsupported file type" msgstr "%s: filtypen stöds ej" -#: object-file.c:2269 +#: object-file.c:2315 #, c-format msgid "%s is not a valid object" msgstr "%s är inte ett giltigt objekt" -#: object-file.c:2271 +#: object-file.c:2317 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: object-file.c:2298 builtin/index-pack.c:192 +#: object-file.c:2344 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "kan inte öppna %s" -#: object-file.c:2488 object-file.c:2541 +#: object-file.c:2535 object-file.c:2588 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash stämmer inte för %s (förväntade %s)" -#: object-file.c:2512 +#: object-file.c:2559 #, c-format msgid "unable to mmap %s" msgstr "kan inte utföra \"mmap\" för %s" -#: object-file.c:2517 +#: object-file.c:2564 #, c-format msgid "unable to unpack header of %s" msgstr "kan inte packa upp huvud för %s" -#: object-file.c:2523 +#: object-file.c:2570 #, c-format msgid "unable to parse header of %s" msgstr "kan inte tolka huvud för %s" -#: object-file.c:2534 +#: object-file.c:2581 #, c-format msgid "unable to unpack contents of %s" msgstr "kan inte tolka innehåll i %s" @@ -5715,71 +5785,71 @@ msgstr "ogiltig objekttyp \"%s\"" msgid "object %s is a %s, not a %s" msgstr "objektet %s är en %s, inte en %s" -#: object.c:233 +#: object.c:232 #, c-format msgid "object %s has unknown type id %d" msgstr "objektet %s har okänd typ-id %d" -#: object.c:246 +#: object.c:245 #, c-format msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" -#: object.c:266 object.c:278 +#: object.c:265 object.c:277 #, c-format msgid "hash mismatch %s" msgstr "hashvärde stämmer inte överens %s" -#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226 +#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251 #, c-format msgid "unable to get size of %s" msgstr "kan inte hämta storlek på %s" -#: pack-bitmap.c:1489 builtin/rev-list.c:92 +#: pack-bitmap.c:1547 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "kan inte hämta diskanvändning för %s" -#: pack-revindex.c:220 +#: pack-revindex.c:221 #, c-format msgid "reverse-index file %s is too small" msgstr "reverse-index-filen %s är för liten" -#: pack-revindex.c:225 +#: pack-revindex.c:226 #, c-format msgid "reverse-index file %s is corrupt" msgstr "reverse-index-filen %s är trasig" -#: pack-revindex.c:233 +#: pack-revindex.c:234 #, c-format msgid "reverse-index file %s has unknown signature" msgstr "reverse-index-filen %s har okänd signatur" -#: pack-revindex.c:237 +#: pack-revindex.c:238 #, c-format msgid "reverse-index file %s has unsupported version %<PRIu32>" msgstr "reverse-index-filen %s har versionen %<PRIu32> som inte stöds" -#: pack-revindex.c:242 +#: pack-revindex.c:243 #, c-format msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "reverse-index-filen %s har hash-ID %<PRIu32> som inte stöds" -#: pack-write.c:236 +#: pack-write.c:250 msgid "cannot both write and verify reverse index" msgstr "kan inte både skriva och bekräfta reverse-index" -#: pack-write.c:257 +#: pack-write.c:271 #, c-format msgid "could not stat: %s" msgstr "kunde inte ta status: %s" -#: pack-write.c:269 +#: pack-write.c:283 #, c-format msgid "failed to make %s readable" msgstr "kunde inte göra %s läsbar" -#: pack-write.c:508 +#: pack-write.c:522 #, c-format msgid "could not write '%s' promisor file" msgstr "kunde inte skriva kontraktsfilen \"%s\"" @@ -5788,12 +5858,12 @@ msgstr "kunde inte skriva kontraktsfilen \"%s\"" msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: packfile.c:1934 +#: packfile.c:1937 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset före slutet av packindex för %s (trasigt index?)" -#: packfile.c:1938 +#: packfile.c:1941 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" @@ -5859,31 +5929,31 @@ msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)" msgid "did you mean `--%s` (with two dashes)?" msgstr "menade du \"--%s\" (med två bindestreck)?" -#: parse-options.c:666 parse-options.c:971 +#: parse-options.c:668 parse-options.c:988 #, c-format msgid "alias of --%s" msgstr "alias för --%s" -#: parse-options.c:862 +#: parse-options.c:879 #, c-format msgid "unknown option `%s'" msgstr "okänd flagga \"%s\"" -#: parse-options.c:864 +#: parse-options.c:881 #, c-format msgid "unknown switch `%c'" msgstr "okänd flagga \"%c\"" -#: parse-options.c:866 +#: parse-options.c:883 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "okänd icke-ascii-flagga i strängen: \"%s\"" -#: parse-options.c:890 +#: parse-options.c:907 msgid "..." msgstr "..." -#: parse-options.c:909 +#: parse-options.c:926 #, c-format msgid "usage: %s" msgstr "användning: %s" @@ -5891,17 +5961,17 @@ msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:915 +#: parse-options.c:932 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:918 +#: parse-options.c:935 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:957 +#: parse-options.c:974 msgid "-NUM" msgstr "-TAL" @@ -5910,29 +5980,29 @@ msgstr "-TAL" msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" -#: pathspec.c:130 +#: pathspec.c:151 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde" -#: pathspec.c:148 +#: pathspec.c:169 msgid "Only one 'attr:' specification is allowed." msgstr "Endast en \"attr:\"-angivelse tillåten." -#: pathspec.c:151 +#: pathspec.c:172 msgid "attr spec must not be empty" msgstr "attr-angivelse kan inte vara tom" -#: pathspec.c:194 +#: pathspec.c:215 #, c-format msgid "invalid attribute name %s" msgstr "ogiltigt attributnamn %s" -#: pathspec.c:259 +#: pathspec.c:280 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla" -#: pathspec.c:266 +#: pathspec.c:287 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -5940,51 +6010,51 @@ msgstr "" "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra " "globala sökvägsinställningar" -#: pathspec.c:306 +#: pathspec.c:327 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\"" -#: pathspec.c:327 +#: pathspec.c:348 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Felaktigt sökvägsuttryck \"%.*s\" i \"%s\"" -#: pathspec.c:332 +#: pathspec.c:353 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\"" -#: pathspec.c:370 +#: pathspec.c:391 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\"" -#: pathspec.c:429 +#: pathspec.c:450 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: \"literal\" och \"glob\" är inkompatibla" -#: pathspec.c:445 +#: pathspec.c:466 #, c-format msgid "%s: '%s' is outside repository at '%s'" msgstr "%s: \"%s\" är utanför arkivet på \"%s\"" -#: pathspec.c:521 +#: pathspec.c:542 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "\"%s\" (minnesstöd: \"%c\")" -#: pathspec.c:531 +#: pathspec.c:552 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s" -#: pathspec.c:598 +#: pathspec.c:619 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" -#: pathspec.c:643 +#: pathspec.c:664 #, c-format msgid "line is badly quoted: %s" msgstr "linjen er felaktigt citerad: %s" @@ -6005,7 +6075,7 @@ msgstr "kan inte skriva tillståndslöst avdelarpaket" msgid "flush packet write failed" msgstr "fel vid skrivning av \"flush\"-paket" -#: pkt-line.c:153 pkt-line.c:239 +#: pkt-line.c:153 pkt-line.c:265 msgid "protocol error: impossibly long line" msgstr "protokollfel: omöjligt lång rad" @@ -6013,33 +6083,34 @@ msgstr "protokollfel: omöjligt lång rad" msgid "packet write with format failed" msgstr "paketskrivning med format misslyckades" -#: pkt-line.c:203 +#: pkt-line.c:204 msgid "packet write failed - data exceeds max packet size" msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek" -#: pkt-line.c:210 pkt-line.c:217 -msgid "packet write failed" -msgstr "paketskrivning misslyckades" +#: pkt-line.c:222 +#, c-format +msgid "packet write failed: %s" +msgstr "paketskrivning misslyckades: %s" -#: pkt-line.c:302 +#: pkt-line.c:328 pkt-line.c:329 msgid "read error" msgstr "läsfel" -#: pkt-line.c:310 +#: pkt-line.c:339 pkt-line.c:340 msgid "the remote end hung up unexpectedly" msgstr "fjärren lade på oväntat" -#: pkt-line.c:338 +#: pkt-line.c:369 pkt-line.c:371 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "protokollfel: felaktig radlängdstecken: %.4s" -#: pkt-line.c:352 pkt-line.c:357 +#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396 #, c-format msgid "protocol error: bad line length %d" msgstr "protokollfel: felaktig radlängd: %d" -#: pkt-line.c:373 sideband.c:165 +#: pkt-line.c:413 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "fjärrfel: %s" @@ -6053,7 +6124,7 @@ msgstr "Uppdaterar indexet" msgid "unable to create threaded lstat: %s" msgstr "kunde inte skapa trådad lstat: %s" -#: pretty.c:984 +#: pretty.c:988 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" @@ -6075,6 +6146,10 @@ msgstr "" msgid "promisor remote name cannot begin with '/': %s" msgstr "kontraktsfjärr kan inte börja med \"/\": %s" +#: protocol-caps.c:103 +msgid "object-info: expected flush after arguments" +msgstr "object-info: förväntade \"flush\" efter argument" + #: prune-packed.c:35 msgid "Removing duplicate objects" msgstr "Tar bort duplicerade objekt" @@ -6087,7 +6162,7 @@ msgstr "kunde inte starta \"log\"" msgid "could not read `log` output" msgstr "kunde inte läsa utdata från \"log\"" -#: range-diff.c:101 sequencer.c:5318 +#: range-diff.c:101 sequencer.c:5551 #, c-format msgid "could not parse commit '%s'" msgstr "kunde inte tolka incheckningen \"%s\"" @@ -6119,51 +6194,51 @@ msgstr "--left-only och --right-only är ömsesidigt uteslutande" msgid "could not parse log for '%s'" msgstr "kunde inte tolka loggen för \"%s\"" -#: read-cache.c:682 +#: read-cache.c:708 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)" -#: read-cache.c:698 +#: read-cache.c:724 msgid "cannot create an empty blob in the object database" msgstr "kan inte skapa tom blob i objektdatabasen" -#: read-cache.c:720 +#: read-cache.c:746 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger" -#: read-cache.c:725 +#: read-cache.c:751 #, c-format msgid "'%s' does not have a commit checked out" msgstr "\"%s\" har inte någon utcheckad incheckning" -#: read-cache.c:777 +#: read-cache.c:803 #, c-format msgid "unable to index file '%s'" msgstr "kan inte indexera filen \"%s\"" -#: read-cache.c:796 +#: read-cache.c:822 #, c-format msgid "unable to add '%s' to index" msgstr "kan inte lägga till \"%s\" till indexet" -#: read-cache.c:807 +#: read-cache.c:833 #, c-format msgid "unable to stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: read-cache.c:1318 +#: read-cache.c:1356 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "\"%s\" finns både som en fil och en katalog" -#: read-cache.c:1532 +#: read-cache.c:1571 msgid "Refresh index" msgstr "Uppdatera indexet" -#: read-cache.c:1657 +#: read-cache.c:1700 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6172,7 +6247,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1667 +#: read-cache.c:1710 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6181,139 +6256,143 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1723 +#: read-cache.c:1766 #, c-format msgid "bad signature 0x%08x" msgstr "felaktig signatur 0x%08x" -#: read-cache.c:1726 +#: read-cache.c:1769 #, c-format msgid "bad index version %d" msgstr "felaktig indexversion %d" -#: read-cache.c:1735 +#: read-cache.c:1778 msgid "bad index file sha1 signature" msgstr "felaktig sha1-signatur för indexfil" -#: read-cache.c:1765 +#: read-cache.c:1812 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "index använder filtillägget %.4s, vilket vi inte förstår" -#: read-cache.c:1767 +#: read-cache.c:1814 #, c-format msgid "ignoring %.4s extension" msgstr "ignorerar filtillägget %.4s" -#: read-cache.c:1804 +#: read-cache.c:1851 #, c-format msgid "unknown index entry format 0x%08x" msgstr "okänt format 0x%08x på indexpost" -#: read-cache.c:1820 +#: read-cache.c:1867 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "felformat namnfält i indexet, nära sökvägen \"%s\"" -#: read-cache.c:1877 +#: read-cache.c:1924 msgid "unordered stage entries in index" msgstr "osorterade köposter i index" -#: read-cache.c:1880 +#: read-cache.c:1927 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "flera köposter för den sammanslagna filen \"%s\"" -#: read-cache.c:1883 +#: read-cache.c:1930 #, c-format msgid "unordered stage entries for '%s'" msgstr "osorterade köposter för \"%s\"" -#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181 -#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991 +#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 #: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "indexfilen trasig" -#: read-cache.c:2133 +#: read-cache.c:2180 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "kunde inte läsa in cache_entries-tråden: %s" -#: read-cache.c:2146 +#: read-cache.c:2193 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "kunde inte utföra join på cache_entries-tråden: %s" -#: read-cache.c:2179 +#: read-cache.c:2226 #, c-format msgid "%s: index file open failed" msgstr "%s: öppning av indexfilen misslyckades" -#: read-cache.c:2183 +#: read-cache.c:2230 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: kan inte ta startus på det öppna indexet" -#: read-cache.c:2187 +#: read-cache.c:2234 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: indexfilen mindre än förväntat" -#: read-cache.c:2191 +#: read-cache.c:2238 #, c-format msgid "%s: unable to map index file" msgstr "%s: kan inte koppla indexfilen" -#: read-cache.c:2233 +#: read-cache.c:2280 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "kunde inte skapa load_index_extensions-tråden: %s" -#: read-cache.c:2260 +#: read-cache.c:2307 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "kunde inte utföra join på load_index_extensions-tråden: %s" -#: read-cache.c:2292 +#: read-cache.c:2345 #, c-format msgid "could not freshen shared index '%s'" msgstr "kunde inte uppdatera delat index \"%s\"" -#: read-cache.c:2339 +#: read-cache.c:2392 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "trasigt index, förväntade %s i %s, fick %s" -#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141 +#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239 +#: read-cache.c:3138 +msgid "failed to convert to a sparse-index" +msgstr "misslyckades omvandla till glest index" + +#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:3151 +#: read-cache.c:3222 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:3163 +#: read-cache.c:3234 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: read-cache.c:3188 +#: read-cache.c:3263 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "kan inte rätta behörighetsbitar på \"%s\"" -#: read-cache.c:3337 +#: read-cache.c:3412 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: kan inte återgå till kö 0" @@ -6343,7 +6422,10 @@ msgid "" "r, reword <commit> = use commit, but edit the commit message\n" "e, edit <commit> = use commit, but stop for amending\n" "s, squash <commit> = use commit, but meld into previous commit\n" -"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n" +" commit's log message, unless -C is used, in which case\n" +" keep only this commit's message; -c is same as -C but\n" +" opens the editor\n" "x, exec <command> = run command (the rest of the line) using shell\n" "b, break = stop here (continue rebase later with 'git rebase --continue')\n" "d, drop <commit> = remove commit\n" @@ -6352,7 +6434,7 @@ msgid "" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" ". create a merge commit using the original merge commit's\n" ". message (or the oneline, if no original merge commit was\n" -". specified). Use -c <commit> to reword the commit message.\n" +". specified); use -c <commit> to reword the commit message\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -6364,6 +6446,13 @@ msgstr "" "e, edit <incheckning> = använd incheckning, men stanna för tillägg\n" "s, squash <incheckning> = använd incheckning, men infoga i föregående " "incheckning\n" +"f, fixup [-C | -c] <incheckning> = som \"squash\" men behåll bara " +"loggmeddelandet\n" +" från föregående incheckning, såvida inte -C används, då " +"används\n" +" istället bara den här incheckningens meddelande; -c är " +"samma\n" +" som -C, men öppnar redigeringsprogrammet\n" "f, fixup <incheckning> = som \"squash\", men förkasta " "incheckningsmeddelandet\n" "x, exec <kommando> = kör kommando (resten av raden) i skalet\n" @@ -6374,19 +6463,19 @@ msgstr "" "t, reset <etikett> = återställ HEAD till en etikett\n" "m, merge [-C <incheckning> | -c <incheckning>] <etikett> [# <enrads>]\n" ". skapa en sammanslagning med ursprungligt meddelande (eller\n" -". enrads, om inget incheckningsmeddelande angavs). Använd\n" -". -v <incheckning> för att skriva om meddelandet.\n" +". enrads, om inget incheckningsmeddelande angavs); använd\n" +". -c <incheckning> för att skriva om meddelandet.\n" "\n" "Du kan byta ordning på raderna; de utförs uppifrån och ned.\n" -#: rebase-interactive.c:63 +#: rebase-interactive.c:66 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Ombasera %s på %s (%d kommando)" msgstr[1] "Ombasera %s på %s (%d kommandon)" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -6395,7 +6484,7 @@ msgstr "" "Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en " "incheckning.\n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 +#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -6403,7 +6492,7 @@ msgstr "" "\n" "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 +#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -6417,7 +6506,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 +#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -6427,19 +6516,19 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615 -#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816 +#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271 #, c-format msgid "could not write '%s'" msgstr "kunde inte skriva \"%s\"" -#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230 -#: builtin/rebase.c:254 +#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229 +#: builtin/rebase.c:253 #, c-format msgid "could not write '%s'." msgstr "kunde inte skriva \"%s\"." -#: rebase-interactive.c:193 +#: rebase-interactive.c:196 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -6448,7 +6537,7 @@ msgstr "" "Varning: vissa incheckningar kan av misstag ha tappats.\n" "Tappade incheckningar (nyaste först):\n" -#: rebase-interactive.c:200 +#: rebase-interactive.c:203 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -6468,14 +6557,14 @@ msgstr "" "\" (fel).\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402 -#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241 -#: builtin/rebase.c:266 +#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597 +#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240 +#: builtin/rebase.c:265 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." -#: ref-filter.c:42 wt-status.c:1975 +#: ref-filter.c:42 wt-status.c:1978 msgid "gone" msgstr "försvunnen" @@ -6631,111 +6720,111 @@ msgstr "" msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: atomen %%(if) använd utan en %%(then)-atom" -#: ref-filter.c:806 +#: ref-filter.c:807 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: atomen %%(then) använd utan en %%(if)-atom" -#: ref-filter.c:808 +#: ref-filter.c:809 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: atomen %%(then) använd mer än en gång" -#: ref-filter.c:810 +#: ref-filter.c:811 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atomen %%(then) använd efter %%(else)" -#: ref-filter.c:838 +#: ref-filter.c:839 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: atomen %%(else) använd utan en %%(if)-atom" -#: ref-filter.c:840 +#: ref-filter.c:841 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: atomen %%(else) använd utan en %%(then)-atom" -#: ref-filter.c:842 +#: ref-filter.c:843 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: atomen %%(else) använd mer än en gång" -#: ref-filter.c:857 +#: ref-filter.c:858 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) använd utan motsvarande atom" -#: ref-filter.c:914 +#: ref-filter.c:915 #, c-format msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:1555 +#: ref-filter.c:1556 #, c-format msgid "(no branch, rebasing %s)" msgstr "(ingen gren, ombaserar %s)" -#: ref-filter.c:1558 +#: ref-filter.c:1559 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)" -#: ref-filter.c:1561 +#: ref-filter.c:1562 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(ingen gren, \"bisect\" startad på %s)" -#: ref-filter.c:1565 +#: ref-filter.c:1566 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD frånkopplat vid %s)" -#: ref-filter.c:1568 +#: ref-filter.c:1569 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD frånkopplat från %s)" -#: ref-filter.c:1571 +#: ref-filter.c:1572 msgid "(no branch)" msgstr "(ingen gren)" -#: ref-filter.c:1603 ref-filter.c:1812 +#: ref-filter.c:1604 ref-filter.c:1813 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1613 +#: ref-filter.c:1614 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:1996 +#: ref-filter.c:1997 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:2085 +#: ref-filter.c:2086 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:2090 refs.c:676 +#: ref-filter.c:2091 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: ref-filter.c:2430 +#: ref-filter.c:2431 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2529 +#: ref-filter.c:2525 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: ref-filter.c:2534 +#: ref-filter.c:2530 #, c-format msgid "option `%s' must point to a commit" msgstr "flaggan \"%s\" måste peka på en incheckning" @@ -7191,8 +7280,8 @@ msgstr "kan inte ta bort lös länk \"%s\"" msgid "Recorded preimage for '%s'" msgstr "Sparade förhandsbild för \"%s\"" -#: rerere.c:865 submodule.c:2088 builtin/log.c:1991 -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 +#: rerere.c:865 submodule.c:2089 builtin/log.c:2000 +#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" @@ -7230,25 +7319,25 @@ msgstr "kan inte uppdatera katalogen rr-cache" msgid "could not determine HEAD revision" msgstr "kunde inte bestämma HEAD-revision" -#: reset.c:70 reset.c:76 sequencer.c:3468 +#: reset.c:70 reset.c:76 sequencer.c:3669 #, c-format msgid "failed to find tree of %s" msgstr "kunde inte hitta trädet för %s." -#: revision.c:2338 +#: revision.c:2343 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<paketfil> stöds inte längre" -#: revision.c:2668 +#: revision.c:2683 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2671 +#: revision.c:2686 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar" -#: revision.c:2877 +#: revision.c:2892 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L stöder ännu inte andra diff-format än -p och -s" @@ -7256,12 +7345,12 @@ msgstr "-L stöder ännu inte andra diff-format än -p och -s" msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: run-command.c:1274 +#: run-command.c:1275 #, c-format msgid "cannot create async thread: %s" msgstr "kan inte skapa asynkron tråd: %s" -#: run-command.c:1338 +#: run-command.c:1345 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -7270,33 +7359,41 @@ msgstr "" "Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n" "Du kan inaktivera varningen med \"git config advice.ignoredHook false\"." -#: send-pack.c:146 +#: send-pack.c:150 msgid "unexpected flush packet while reading remote unpack status" msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus" -#: send-pack.c:148 +#: send-pack.c:152 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "kunde inte tolka fjärruppackningsstatus: %s" -#: send-pack.c:150 +#: send-pack.c:154 #, c-format msgid "remote unpack failed: %s" msgstr "fjärruppackning misslyckades: %s" -#: send-pack.c:374 +#: send-pack.c:378 msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:467 +#: send-pack.c:433 +msgid "send-pack: unable to fork off fetch subprocess" +msgstr "send-pack: kunde inte starta (fork) underprocessen för fetch" + +#: send-pack.c:455 +msgid "push negotiation failed; proceeding anyway with push" +msgstr "sänd-förhandling misslyckades; fortsätter ändå med sändningen" + +#: send-pack.c:520 msgid "the receiving end does not support this repository's hash algorithm" msgstr "mottagarsidan stöder inte arkivets hashningsalgoritm" -#: send-pack.c:476 +#: send-pack.c:529 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" -#: send-pack.c:478 +#: send-pack.c:531 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -7304,47 +7401,47 @@ msgstr "" "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --" "signed" -#: send-pack.c:490 +#: send-pack.c:543 msgid "the receiving end does not support --atomic push" msgstr "mottagarsidan stöder inte push med --atomic" -#: send-pack.c:495 +#: send-pack.c:548 msgid "the receiving end does not support push options" msgstr "mottagarsidan stöder inte push-flaggor" -#: sequencer.c:195 +#: sequencer.c:196 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\"" -#: sequencer.c:323 +#: sequencer.c:324 #, c-format msgid "could not delete '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385 +#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402 #, c-format msgid "could not remove '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:353 +#: sequencer.c:354 msgid "revert" msgstr "revert" -#: sequencer.c:355 +#: sequencer.c:356 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:357 +#: sequencer.c:358 msgid "rebase" msgstr "rebase" -#: sequencer.c:359 +#: sequencer.c:360 #, c-format msgid "unknown action: %d" msgstr "okänd funktion: %d" -#: sequencer.c:418 +#: sequencer.c:419 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -7352,7 +7449,7 @@ msgstr "" "efter att ha löst konflikterna, markera de rättade sökvägarna\n" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"" -#: sequencer.c:421 +#: sequencer.c:422 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -7362,43 +7459,43 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:434 sequencer.c:3070 +#: sequencer.c:435 sequencer.c:3271 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088 -#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 +#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" -#: sequencer.c:441 +#: sequencer.c:442 #, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090 -#: sequencer.c:3353 +#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 +#: sequencer.c:3554 #, c-format msgid "failed to finalize '%s'" msgstr "misslyckades färdigställa \"%s\"" -#: sequencer.c:485 +#: sequencer.c:486 #, c-format msgid "your local changes would be overwritten by %s." msgstr "dina lokala ändringar skulle skrivas över av %s." -#: sequencer.c:489 +#: sequencer.c:490 msgid "commit your changes or stash them to proceed." msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta." -#: sequencer.c:521 +#: sequencer.c:522 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" -#: sequencer.c:560 builtin/tag.c:598 +#: sequencer.c:561 builtin/tag.c:609 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" @@ -7406,65 +7503,65 @@ msgstr "Felaktigt städningsläge %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:670 +#: sequencer.c:671 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:684 +#: sequencer.c:685 msgid "unable to update cache tree" msgstr "kan inte uppdatera cacheträd" -#: sequencer.c:698 +#: sequencer.c:699 msgid "could not resolve HEAD commit" msgstr "kunde inte bestämma HEAD:s incheckning" -#: sequencer.c:778 +#: sequencer.c:779 #, c-format msgid "no key present in '%.*s'" msgstr "ingen nyckel i \"%.*s\"" -#: sequencer.c:789 +#: sequencer.c:790 #, c-format msgid "unable to dequote value of '%s'" msgstr "kan inte ta bort citering av värdet \"%s\"" -#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728 +#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: sequencer.c:836 +#: sequencer.c:837 msgid "'GIT_AUTHOR_NAME' already given" msgstr "\"GIT_AUTHOR_NAME\" har redan angivits" -#: sequencer.c:841 +#: sequencer.c:842 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits" -#: sequencer.c:846 +#: sequencer.c:847 msgid "'GIT_AUTHOR_DATE' already given" msgstr "\"GIT_AUTHOR_DATE\" har redan angivits" -#: sequencer.c:850 +#: sequencer.c:851 #, c-format msgid "unknown variable '%s'" msgstr "okänd variabel \"%s\"" -#: sequencer.c:855 +#: sequencer.c:856 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "\"GIT_AUTHOR_NAME\" saknas" -#: sequencer.c:857 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "\"GIT_AUTHOR_EMAIL\" saknas" -#: sequencer.c:859 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "\"GIT_AUTHOR_DATE\" saknas" -#: sequencer.c:924 +#: sequencer.c:925 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -7493,11 +7590,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1211 +#: sequencer.c:1212 msgid "'prepare-commit-msg' hook failed" msgstr "kroken \"prepare-commit-msg\" misslyckades" -#: sequencer.c:1217 +#: sequencer.c:1218 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7524,7 +7621,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1230 +#: sequencer.c:1231 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7549,340 +7646,344 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1272 +#: sequencer.c:1273 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: sequencer.c:1274 +#: sequencer.c:1275 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: sequencer.c:1320 +#: sequencer.c:1321 msgid "unable to resolve HEAD after creating commit" msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning" -#: sequencer.c:1322 +#: sequencer.c:1323 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: sequencer.c:1326 +#: sequencer.c:1327 msgid " (root-commit)" msgstr " (rotincheckning)" -#: sequencer.c:1347 +#: sequencer.c:1348 msgid "could not parse HEAD" msgstr "kunde inte tolka HEAD" -#: sequencer.c:1349 +#: sequencer.c:1350 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s är inte en incheckning!" -#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: sequencer.c:1409 sequencer.c:2108 +#: sequencer.c:1410 sequencer.c:2295 msgid "unable to parse commit author" msgstr "kunde inte tolka incheckningens författare" -#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702 +#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: sequencer.c:1453 sequencer.c:1573 +#: sequencer.c:1454 sequencer.c:1574 #, c-format msgid "unable to read commit message from '%s'" msgstr "kunde inte läsa incheckningsmeddelande från \"%s\"" -#: sequencer.c:1484 sequencer.c:1516 +#: sequencer.c:1485 sequencer.c:1517 #, c-format msgid "invalid author identity '%s'" msgstr "ogiltig författar-identitet \"%s\"" -#: sequencer.c:1490 +#: sequencer.c:1491 msgid "corrupt author: missing date information" msgstr "trasig författare: saknar datuminformation" -#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905 -#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909 +#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:1605 +#: sequencer.c:1606 #, c-format msgid "could not parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: sequencer.c:1610 +#: sequencer.c:1611 #, c-format msgid "could not parse parent commit %s" msgstr "kunde inte tolka föräldraincheckningen %s" -#: sequencer.c:1693 sequencer.c:1804 +#: sequencer.c:1694 sequencer.c:1975 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:1751 sequencer.c:1776 +#: sequencer.c:1736 git-rebase--preserve-merges.sh:486 +msgid "This is the 1st commit message:" +msgstr "Det här är 1:a incheckningsmeddelandet:" + +#: sequencer.c:1737 +#, c-format +msgid "This is the commit message #%d:" +msgstr "Det här är incheckningsmeddelande %d:" + +#: sequencer.c:1738 +msgid "The 1st commit message will be skipped:" +msgstr "1:a incheckningsmeddelandet kommer hoppas över:" + +#: sequencer.c:1739 +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "Incheckningsmeddelande %d kommer hoppas över:" + +#: sequencer.c:1740 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:1761 +#: sequencer.c:1887 sequencer.c:1944 +#, c-format +msgid "cannot write '%s'" +msgstr "kan inte skriva \"%s\"" + +#: sequencer.c:1934 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:1763 sequencer.c:3380 +#: sequencer.c:1936 sequencer.c:3581 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:1765 +#: sequencer.c:1938 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:1771 -#, c-format -msgid "cannot write '%s'" -msgstr "kan inte skriva \"%s\"" - -#: sequencer.c:1778 git-rebase--preserve-merges.sh:486 -msgid "This is the 1st commit message:" -msgstr "Det här är 1:a incheckningsmeddelandet:" - -#: sequencer.c:1786 +#: sequencer.c:1962 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:1793 -#, c-format -msgid "This is the commit message #%d:" -msgstr "Det här är incheckningsmeddelande %d:" - -#: sequencer.c:1799 -#, c-format -msgid "The commit message #%d will be skipped:" -msgstr "Incheckningsmeddelande %d kommer hoppas över:" - -#: sequencer.c:1887 +#: sequencer.c:2072 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:1894 +#: sequencer.c:2079 msgid "cannot fixup root commit" msgstr "kan inte göra \"fixup\" på rotincheckning" -#: sequencer.c:1913 +#: sequencer.c:2098 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte." -#: sequencer.c:1921 sequencer.c:1929 +#: sequencer.c:2106 sequencer.c:2114 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:1935 +#: sequencer.c:2120 #, c-format msgid "cannot get commit message for %s" msgstr "kan inte hämta incheckningsmeddelande för %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1954 +#: sequencer.c:2139 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:2019 +#: sequencer.c:2205 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:2079 +#: sequencer.c:2265 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:2080 +#: sequencer.c:2266 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:2100 +#: sequencer.c:2287 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "utelämnar %s %s -- patchinnehållet finns redan uppströms\n" -#: sequencer.c:2158 +#: sequencer.c:2345 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:2165 +#: sequencer.c:2352 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:2242 +#: sequencer.c:2425 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tar inte argument: \"%s\"" -#: sequencer.c:2251 +#: sequencer.c:2434 #, c-format msgid "missing arguments for %s" msgstr "argument saknas för %s" -#: sequencer.c:2282 +#: sequencer.c:2477 #, c-format msgid "could not parse '%s'" msgstr "kunde inte tolka \"%s\"" -#: sequencer.c:2343 +#: sequencer.c:2538 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:2354 +#: sequencer.c:2549 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:2440 +#: sequencer.c:2635 msgid "cancelling a cherry picking in progress" msgstr "avbryter pågående \"cherry-pick\"" -#: sequencer.c:2449 +#: sequencer.c:2644 msgid "cancelling a revert in progress" msgstr "avbryter pågående \"revert\"" -#: sequencer.c:2493 +#: sequencer.c:2690 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:2495 +#: sequencer.c:2692 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: \"%s\"" -#: sequencer.c:2500 +#: sequencer.c:2697 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:2511 +#: sequencer.c:2708 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:2513 +#: sequencer.c:2710 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:2591 +#: sequencer.c:2788 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:2698 +#: sequencer.c:2897 msgid "unusable squash-onto" msgstr "oanvändbar squash-onto" -#: sequencer.c:2718 +#: sequencer.c:2917 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: \"%s\"" -#: sequencer.c:2811 sequencer.c:4644 +#: sequencer.c:3012 sequencer.c:4869 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:2828 +#: sequencer.c:3029 msgid "revert is already in progress" msgstr "en \"revert\" pågår redan" -#: sequencer.c:2830 +#: sequencer.c:3031 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "testa \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2833 +#: sequencer.c:3034 msgid "cherry-pick is already in progress" msgstr "en \"cherry-pick\" pågår redan" -#: sequencer.c:2835 +#: sequencer.c:3036 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2849 +#: sequencer.c:3050 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:2864 +#: sequencer.c:3065 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:2924 sequencer.c:4379 +#: sequencer.c:3125 sequencer.c:4582 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:2926 sequencer.c:2937 +#: sequencer.c:3127 sequencer.c:3138 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:2928 sequencer.c:2972 +#: sequencer.c:3129 sequencer.c:3173 msgid "cannot abort from a branch yet to be born" msgstr "kan inte avbryta från en gren som ännu inte är född" -#: sequencer.c:2958 builtin/grep.c:757 +#: sequencer.c:3159 builtin/grep.c:759 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:2960 +#: sequencer.c:3161 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:2961 +#: sequencer.c:3162 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:2967 +#: sequencer.c:3168 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig" -#: sequencer.c:2978 +#: sequencer.c:3179 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Du verkar ha flyttat HEAD.\n" "Spolar inte tillbaka, kontrollera HEAD!" -#: sequencer.c:3019 +#: sequencer.c:3220 msgid "no revert in progress" msgstr "ingen \"revers\" pågår" -#: sequencer.c:3028 +#: sequencer.c:3229 msgid "no cherry-pick in progress" msgstr "ingen \"cherry-pick\" pågår" -#: sequencer.c:3038 +#: sequencer.c:3239 msgid "failed to skip the commit" msgstr "kunde inte hoppa över incheckningen" -#: sequencer.c:3045 +#: sequencer.c:3246 msgid "there is nothing to skip" msgstr "ingenting att hoppa över" -#: sequencer.c:3048 +#: sequencer.c:3249 #, c-format msgid "" "have you committed already?\n" @@ -7891,16 +7992,16 @@ msgstr "" "har du redan checkat in?\n" "testa \"git %s --continue\"" -#: sequencer.c:3210 sequencer.c:4271 +#: sequencer.c:3411 sequencer.c:4473 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:3227 +#: sequencer.c:3428 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "kan inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3235 +#: sequencer.c:3436 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7919,27 +8020,27 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3245 +#: sequencer.c:3446 #, c-format msgid "Could not apply %s... %.*s" msgstr "Kunde inte tillämpa %s... %.*s" -#: sequencer.c:3252 +#: sequencer.c:3453 #, c-format msgid "Could not merge %.*s" msgstr "Kunde inte slå ihop %.*s" -#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640 +#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3282 +#: sequencer.c:3483 #, c-format msgid "Executing: %s\n" msgstr "Kör: %s\n" -#: sequencer.c:3297 +#: sequencer.c:3498 #, c-format msgid "" "execution failed: %s\n" @@ -7954,11 +8055,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3303 +#: sequencer.c:3504 msgid "and made changes to the index and/or the working tree\n" msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n" -#: sequencer.c:3309 +#: sequencer.c:3510 #, c-format msgid "" "execution succeeded: %s\n" @@ -7975,90 +8076,90 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3370 +#: sequencer.c:3571 #, c-format msgid "illegal label name: '%.*s'" msgstr "ogiltigt etikettnamn: \"%.*s\"" -#: sequencer.c:3424 +#: sequencer.c:3625 msgid "writing fake root commit" msgstr "skriver fejkad rotincheckning" -#: sequencer.c:3429 +#: sequencer.c:3630 msgid "writing squash-onto" msgstr "skriver squash-onto" -#: sequencer.c:3513 +#: sequencer.c:3714 #, c-format msgid "could not resolve '%s'" msgstr "kunde inte upplösa \"%s\"" -#: sequencer.c:3546 +#: sequencer.c:3747 msgid "cannot merge without a current revision" msgstr "kan inte slå ihop utan en aktuell incheckning" -#: sequencer.c:3568 +#: sequencer.c:3769 #, c-format msgid "unable to parse '%.*s'" msgstr "kan inte tolka \"%.*s\"" -#: sequencer.c:3577 +#: sequencer.c:3778 #, c-format msgid "nothing to merge: '%.*s'" msgstr "inget att slå samman: \"%.*s\"" -#: sequencer.c:3589 +#: sequencer.c:3790 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]" -#: sequencer.c:3605 +#: sequencer.c:3806 #, c-format msgid "could not get commit message of '%s'" msgstr "kunde inte läsa incheckningsmeddelande för \"%s\"" -#: sequencer.c:3788 +#: sequencer.c:3989 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "kunde inte ens försöka slå ihop \"%.*s\"" -#: sequencer.c:3804 +#: sequencer.c:4005 msgid "merge: Unable to write new index file" msgstr "sammanslagning: Kunde inte skriva ny indexfil" -#: sequencer.c:3878 +#: sequencer.c:4079 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: sequencer.c:3881 +#: sequencer.c:4082 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Oväntat svar från stash: \"%s\"" -#: sequencer.c:3887 +#: sequencer.c:4088 #, c-format msgid "Could not create directory for '%s'" msgstr "Kunde inte skapa katalog för \"%s\"" -#: sequencer.c:3890 +#: sequencer.c:4091 #, c-format msgid "Created autostash: %s\n" msgstr "Skapade autostash: %s\n" -#: sequencer.c:3894 +#: sequencer.c:4095 msgid "could not reset --hard" msgstr "kunde inte utföra \"reset --hard\"" -#: sequencer.c:3919 +#: sequencer.c:4120 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:3931 +#: sequencer.c:4132 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:3934 +#: sequencer.c:4135 #, c-format msgid "" "%s\n" @@ -8069,29 +8170,29 @@ msgstr "" "Dina ändringar är säkra i stashen.\n" "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" -#: sequencer.c:3939 +#: sequencer.c:4140 msgid "Applying autostash resulted in conflicts." msgstr "Tillämpning av autostash gav konflikter." -#: sequencer.c:3940 +#: sequencer.c:4141 msgid "Autostash exists; creating a new stash entry." msgstr "Autostash finns; skapar ny stash-post." -#: sequencer.c:4033 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4234 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: sequencer.c:4048 +#: sequencer.c:4249 #, c-format msgid "Stopped at HEAD\n" msgstr "Stoppade på HEAD\n" -#: sequencer.c:4050 +#: sequencer.c:4251 #, c-format msgid "Stopped at %s\n" msgstr "Stoppade på %s\n" -#: sequencer.c:4058 +#: sequencer.c:4259 #, c-format msgid "" "Could not execute the todo command\n" @@ -8112,58 +8213,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4104 +#: sequencer.c:4305 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Ombaserar (%d/%d)%s" -#: sequencer.c:4149 +#: sequencer.c:4351 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:4220 +#: sequencer.c:4422 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:4279 +#: sequencer.c:4481 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:4284 +#: sequencer.c:4486 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:4298 +#: sequencer.c:4500 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:4358 +#: sequencer.c:4560 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Lyckades ombasera och uppdatera %s.\n" -#: sequencer.c:4391 +#: sequencer.c:4612 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:4400 +#: sequencer.c:4621 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:4402 +#: sequencer.c:4623 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:4404 +#: sequencer.c:4625 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:4407 +#: sequencer.c:4628 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8173,50 +8274,50 @@ msgstr "" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" "först och kör sedan \"git rebase --continue\" igen." -#: sequencer.c:4443 sequencer.c:4482 +#: sequencer.c:4664 sequencer.c:4703 #, c-format msgid "could not write file: '%s'" msgstr "kunde inte skriva fil: \"%s\"" -#: sequencer.c:4498 +#: sequencer.c:4719 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:4505 +#: sequencer.c:4726 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:4621 +#: sequencer.c:4846 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:4625 +#: sequencer.c:4850 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:4660 +#: sequencer.c:4885 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: sequencer.c:5137 +#: sequencer.c:5362 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stöds" -#: sequencer.c:5140 +#: sequencer.c:5365 msgid "make_script: error preparing revisions" msgstr "make_script: fel när revisioner skulle förberedas" -#: sequencer.c:5382 sequencer.c:5399 +#: sequencer.c:5615 sequencer.c:5632 msgid "nothing to do" msgstr "inget att göra" -#: sequencer.c:5418 +#: sequencer.c:5651 msgid "could not skip unnecessary pick commands" msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon" -#: sequencer.c:5512 +#: sequencer.c:5751 msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." @@ -8362,7 +8463,7 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:1362 +#: setup.c:1370 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -8371,56 +8472,69 @@ msgstr "" "problem med filläges-värdet i core.sharedRepository (0%.3o).\n" "Ägaren av filerna måste alltid ha läs- och skrivbehörighet." -#: setup.c:1409 +#: setup.c:1417 msgid "open /dev/null or dup failed" msgstr "misslyckades öppna /dev/null eller \"dup\"" -#: setup.c:1424 +#: setup.c:1432 msgid "fork failed" msgstr "\"fork\" misslyckades" -#: setup.c:1429 +#: setup.c:1437 t/helper/test-simple-ipc.c:285 msgid "setsid failed" msgstr "\"setsid\" misslyckades" +#: sparse-index.c:151 +msgid "attempting to use sparse-index without cone mode" +msgstr "försöker använda glest index utan \"cone\"-läge" + +#: sparse-index.c:156 +msgid "unable to update cache-tree, staying full" +msgstr "kan inte uppdatera cacheträd, behåller fullt läge" + +#: sparse-index.c:239 +#, c-format +msgid "index entry is a directory, but not sparse (%08x)" +msgstr "indexposten är en katalog, men inte gles (%08x)" + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:848 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB" msgstr "%u,%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:850 +#: strbuf.c:852 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u,%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:858 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB" msgstr "%u,%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:860 +#: strbuf.c:862 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u,%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:867 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB" msgstr "%u,%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:869 +#: strbuf.c:871 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u,%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:875 +#: strbuf.c:877 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -8428,20 +8542,20 @@ msgstr[0] "%u byte" msgstr[1] "%u bytes" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:877 +#: strbuf.c:879 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u byte/s" msgstr[1] "%u bytes/s" -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737 #: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" -#: strbuf.c:1175 +#: strbuf.c:1177 #, c-format msgid "could not edit '%s'" msgstr "kunde inte redigera \"%s\"" @@ -8490,22 +8604,22 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s" msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:327 +#: submodule.c:328 #, c-format msgid "in unpopulated submodule '%s'" msgstr "i ej utcheckad undermodul \"%s\"" -#: submodule.c:358 +#: submodule.c:359 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" -#: submodule.c:435 +#: submodule.c:436 #, c-format msgid "bad --ignore-submodules argument: %s" msgstr "felaktigt argument till --ignore-submodules: %s" -#: submodule.c:817 +#: submodule.c:818 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " @@ -8514,12 +8628,12 @@ msgstr "" "Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul " "med samma namn. Hoppar över den." -#: submodule.c:920 +#: submodule.c:921 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning" -#: submodule.c:1005 +#: submodule.c:1006 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " @@ -8528,36 +8642,36 @@ msgstr "" "kunde inte köra \"git rev-list <incheckningar> --not --remotes -n 1\" i " "undermodulen \"%s\"" -#: submodule.c:1128 +#: submodule.c:1129 #, c-format msgid "process for submodule '%s' failed" msgstr "process för undermodulen \"%s\" misslyckades" -#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469 +#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens." -#: submodule.c:1168 +#: submodule.c:1169 #, c-format msgid "Pushing submodule '%s'\n" msgstr "Sänder undermodulen \"%s\"\n" -#: submodule.c:1171 +#: submodule.c:1172 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "Kunde inte sända undermodulen \"%s\"\n" -#: submodule.c:1463 +#: submodule.c:1464 #, c-format msgid "Fetching submodule %s%s\n" msgstr "Hämtar undermodulen %s%s\n" -#: submodule.c:1497 +#: submodule.c:1498 #, c-format msgid "Could not access submodule '%s'\n" msgstr "Kunde inte komma åt undermodulen \"%s\"\n" -#: submodule.c:1652 +#: submodule.c:1653 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8566,61 +8680,61 @@ msgstr "" "Fel vid hämtning av undermodul:\n" "%s" -#: submodule.c:1677 +#: submodule.c:1678 #, c-format msgid "'%s' not recognized as a git repository" msgstr "\"%s\" känns inte igen som ett git-arkiv" -#: submodule.c:1694 +#: submodule.c:1695 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "Kunde inte köra \"git status --porcelain=2\" i undermodulen \"%s\"" -#: submodule.c:1735 +#: submodule.c:1736 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\"" -#: submodule.c:1810 +#: submodule.c:1811 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" -#: submodule.c:1823 +#: submodule.c:1824 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" -#: submodule.c:1838 +#: submodule.c:1839 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Kunde inte ta bort inställningen core.worktree i undermodulen \"%s\"" -#: submodule.c:1865 submodule.c:2175 +#: submodule.c:1866 submodule.c:2176 #, c-format msgid "could not recurse into submodule '%s'" msgstr "kunde inte rekursera in i undermodulen \"%s\"" -#: submodule.c:1886 +#: submodule.c:1887 msgid "could not reset submodule index" msgstr "kunde inte återställa indexet i undermodul" -#: submodule.c:1928 +#: submodule.c:1929 #, c-format msgid "submodule '%s' has dirty index" msgstr "undermodulen \"%s\" har ett smutsigt index" -#: submodule.c:1980 +#: submodule.c:1981 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Undermoduler \"%s\" kunde inte uppdateras." -#: submodule.c:2048 +#: submodule.c:2049 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\"" -#: submodule.c:2069 +#: submodule.c:2070 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8628,17 +8742,17 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:2081 submodule.c:2140 +#: submodule.c:2082 submodule.c:2141 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:2085 +#: submodule.c:2086 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog" -#: submodule.c:2092 +#: submodule.c:2093 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8649,65 +8763,71 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:2220 +#: submodule.c:2221 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:2260 +#: submodule.c:2261 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" -#: trailer.c:236 +#: symlinks.c:244 +#, c-format +msgid "failed to lstat '%s'" +msgstr "misslyckades ta status (lstat) på \"%s\"" + +#: trailer.c:244 #, c-format msgid "running trailer command '%s' failed" msgstr "misslyckades utföra släpradskommandot \"%s\"" -#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 -#: trailer.c:555 +#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566 +#: trailer.c:570 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "okänt värde \"%s\" för nyckeln \"%s\"" -#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 +#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299 +#: builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "mer än en %s" -#: trailer.c:728 +#: trailer.c:743 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "tom släpradssymbol i släpraden \"%.*s\"" -#: trailer.c:748 +#: trailer.c:763 #, c-format msgid "could not read input file '%s'" msgstr "kunde inte läsa indatafilen \"%s\"" -#: trailer.c:751 builtin/mktag.c:91 +#: trailer.c:766 builtin/mktag.c:88 msgid "could not read from stdin" msgstr "kunde inte läsa från standard in" -#: trailer.c:1009 wrapper.c:676 +#: trailer.c:1024 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "kunde inte ta status på %s" -#: trailer.c:1011 +#: trailer.c:1026 #, c-format msgid "file %s is not a regular file" msgstr "filen %s är inte en normal fil" -#: trailer.c:1013 +#: trailer.c:1028 #, c-format msgid "file %s is not writable by user" msgstr "filen %s är inte skrivbar av användaren" -#: trailer.c:1025 +#: trailer.c:1040 msgid "could not open temporary file" msgstr "kunde inte öppna temporär fil" -#: trailer.c:1065 +#: trailer.c:1080 #, c-format msgid "could not rename temporary file to %s" msgstr "kunde inte byta namn på temporär fil till %s" @@ -8758,7 +8878,7 @@ msgstr "kunde inte köra fast-import" msgid "error while running fast-import" msgstr "fel när fast-import kördes" -#: transport-helper.c:549 transport-helper.c:1237 +#: transport-helper.c:549 transport-helper.c:1247 #, c-format msgid "could not read ref %s" msgstr "kunde inte läsa referensen %s" @@ -8776,7 +8896,7 @@ msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst" msgid "invalid remote service path" msgstr "felaktig sökväg till fjärrtjänst" -#: transport-helper.c:661 transport.c:1447 +#: transport-helper.c:661 transport.c:1471 msgid "operation not supported by protocol" msgstr "funktionen stöds inte av protokollet" @@ -8785,68 +8905,72 @@ msgstr "funktionen stöds inte av protokollet" msgid "can't connect to subservice %s" msgstr "kan inte ansluta till undertjänsten %s" -#: transport-helper.c:745 +#: transport-helper.c:693 transport.c:397 +msgid "--negotiate-only requires protocol v2" +msgstr "--negotiate-only kräver protokoll v2" + +#: transport-helper.c:755 msgid "'option' without a matching 'ok/error' directive" msgstr "\"option\" utan mostsvarande \"ok/error\"-direktiv" -#: transport-helper.c:788 +#: transport-helper.c:798 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\"" -#: transport-helper.c:845 +#: transport-helper.c:855 #, c-format msgid "helper reported unexpected status of %s" msgstr "hjälparen returnerade oväntad status %s" -#: transport-helper.c:928 +#: transport-helper.c:938 #, c-format msgid "helper %s does not support dry-run" msgstr "hjälparen %s stöder inte dry-run" -#: transport-helper.c:931 +#: transport-helper.c:941 #, c-format msgid "helper %s does not support --signed" msgstr "hjälparen %s stöder inte --signed" -#: transport-helper.c:934 +#: transport-helper.c:944 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "hjälparen %s stöder inte --signed=if-asked" -#: transport-helper.c:939 +#: transport-helper.c:949 #, c-format msgid "helper %s does not support --atomic" msgstr "hjälparen %s stöder inte --atomic" -#: transport-helper.c:943 +#: transport-helper.c:953 #, c-format msgid "helper %s does not support --%s" msgstr "hjälparen %s stöder inte --%s" -#: transport-helper.c:950 +#: transport-helper.c:960 #, c-format msgid "helper %s does not support 'push-option'" msgstr "hjälparen %s stöder inte \"push-option\"" -#: transport-helper.c:1050 +#: transport-helper.c:1060 msgid "remote-helper doesn't support push; refspec needed" msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs" -#: transport-helper.c:1055 +#: transport-helper.c:1065 #, c-format msgid "helper %s does not support 'force'" msgstr "hjälparen %s stöder inte \"force\"" -#: transport-helper.c:1102 +#: transport-helper.c:1112 msgid "couldn't run fast-export" msgstr "kunde inte köra fast-export" -#: transport-helper.c:1107 +#: transport-helper.c:1117 msgid "error while running fast-export" msgstr "fel vid körning av fast-export" -#: transport-helper.c:1132 +#: transport-helper.c:1142 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8855,52 +8979,52 @@ msgstr "" "Inga gemensamma referenser och inga angavs; gör inget.\n" "Du kanske borde ange en gren.\n" -#: transport-helper.c:1214 +#: transport-helper.c:1224 #, c-format msgid "unsupported object format '%s'" msgstr "objektformatet \"%s\" stöds ej" -#: transport-helper.c:1223 +#: transport-helper.c:1233 #, c-format msgid "malformed response in ref list: %s" msgstr "felformat svar i referenslistan: %s" -#: transport-helper.c:1375 +#: transport-helper.c:1385 #, c-format msgid "read(%s) failed" msgstr "läs(%s) misslyckades" -#: transport-helper.c:1402 +#: transport-helper.c:1412 #, c-format msgid "write(%s) failed" msgstr "skriv(%s) misslyckades" -#: transport-helper.c:1451 +#: transport-helper.c:1461 #, c-format msgid "%s thread failed" msgstr "%s-tråden misslyckades" -#: transport-helper.c:1455 +#: transport-helper.c:1465 #, c-format msgid "%s thread failed to join: %s" msgstr "%s-tråden misslyckades ansluta: %s" -#: transport-helper.c:1474 transport-helper.c:1478 +#: transport-helper.c:1484 transport-helper.c:1488 #, c-format msgid "can't start thread for copying data: %s" msgstr "kan inte starta tråd för kopiering av data: %s" -#: transport-helper.c:1515 +#: transport-helper.c:1525 #, c-format msgid "%s process failed to wait" msgstr "processen %s misslyckades vänta" -#: transport-helper.c:1519 +#: transport-helper.c:1529 #, c-format msgid "%s process failed" msgstr "processen %s misslyckades" -#: transport-helper.c:1537 transport-helper.c:1546 +#: transport-helper.c:1547 transport-helper.c:1556 msgid "can't start thread for copying data" msgstr "kan inte skapa tråd för kopiering av data" @@ -8919,37 +9043,41 @@ msgstr "kunde inte läsa paketet (bundlen) \"%s\"" msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: \"%s\"" -#: transport.c:269 +#: transport.c:272 msgid "see protocol.version in 'git help config' for more details" msgstr "se protocol.version i \"git help config\" för mer information" -#: transport.c:270 +#: transport.c:273 msgid "server options require protocol version 2 or later" msgstr "serverflaggor kräver protokollversion 2 eller senare" -#: transport.c:727 +#: transport.c:400 +msgid "server does not support wait-for-done" +msgstr "servern stöder inte wait-for-done" + +#: transport.c:751 msgid "could not parse transport.color.* config" msgstr "kunde inte tolka inställningen för transport.color.*" -#: transport.c:802 +#: transport.c:826 msgid "support for protocol v2 not implemented yet" msgstr "stöd för protokoll v2 ännu ej implementerat" -#: transport.c:936 +#: transport.c:960 #, c-format msgid "unknown value for config '%s': %s" msgstr "okänt värde för inställningen \"%s\": %s" -#: transport.c:1002 +#: transport.c:1026 #, c-format msgid "transport '%s' not allowed" msgstr "transporten \"%s\" tillåts inte" -#: transport.c:1055 +#: transport.c:1079 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync stöds inte längre" -#: transport.c:1157 +#: transport.c:1181 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8958,7 +9086,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:1161 +#: transport.c:1185 #, c-format msgid "" "\n" @@ -8985,11 +9113,11 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:1169 +#: transport.c:1193 msgid "Aborting." msgstr "Avbryter." -#: transport.c:1316 +#: transport.c:1340 msgid "failed to push all needed submodules" msgstr "kunde inte sända alla nödvändiga undermoduler" @@ -9009,7 +9137,7 @@ msgstr "tomt filnamn i trädpost" msgid "too-short tree file" msgstr "trädfil för kort" -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -9018,7 +9146,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:115 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -9027,7 +9155,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%s" -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9037,7 +9165,7 @@ msgstr "" "sammanslagning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:120 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9047,7 +9175,7 @@ msgstr "" "sammanslagning:\n" "%%s" -#: unpack-trees.c:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9056,7 +9184,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"." -#: unpack-trees.c:125 +#: unpack-trees.c:127 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9065,7 +9193,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:130 +#: unpack-trees.c:132 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -9075,7 +9203,7 @@ msgstr "" "dem:\n" "%s" -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -9084,7 +9212,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:136 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -9093,7 +9221,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%s" -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9103,7 +9231,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du slår samman." -#: unpack-trees.c:141 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9113,7 +9241,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9122,7 +9250,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:146 +#: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9131,7 +9259,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%s" -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9142,7 +9270,7 @@ msgstr "" "utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:154 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9153,7 +9281,7 @@ msgstr "" "utcheckningen:\n" "%%s" -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9163,7 +9291,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:159 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9173,7 +9301,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9182,7 +9310,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:164 +#: unpack-trees.c:166 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9191,12 +9319,12 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:172 +#: unpack-trees.c:174 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda." -#: unpack-trees.c:175 +#: unpack-trees.c:177 #, c-format msgid "" "Cannot update submodule:\n" @@ -9205,7 +9333,7 @@ msgstr "" "Kan inte uppdatera undermodul:\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:180 #, c-format msgid "" "The following paths are not up to date and were left despite sparse " @@ -9215,7 +9343,7 @@ msgstr "" "Följande sökvägar är inte àjour och lämnades till trots för gles-mönster:\n" "%s" -#: unpack-trees.c:180 +#: unpack-trees.c:182 #, c-format msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" @@ -9225,7 +9353,7 @@ msgstr "" "mönster:\n" "%s" -#: unpack-trees.c:182 +#: unpack-trees.c:184 #, c-format msgid "" "The following paths were already present and thus not updated despite sparse " @@ -9236,12 +9364,12 @@ msgstr "" "gles-mönster:\n" "%s" -#: unpack-trees.c:262 +#: unpack-trees.c:264 #, c-format msgid "Aborting\n" msgstr "Avbryter\n" -#: unpack-trees.c:289 +#: unpack-trees.c:291 #, c-format msgid "" "After fixing the above paths, you may want to run `git sparse-checkout " @@ -9250,11 +9378,11 @@ msgstr "" "Du bör köra \"git sparse-checkout reapply\" efter att ha fixat sökvägarna " "ovan.\n" -#: unpack-trees.c:350 +#: unpack-trees.c:352 msgid "Updating files" msgstr "Uppdaterar filer" -#: unpack-trees.c:382 +#: unpack-trees.c:384 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -9264,11 +9392,16 @@ msgstr "" "sökvägar på ett okänsligt filsystem) och endast en från samma\n" "kollisionsgrupp finns i arbetskatalogen:\n" -#: unpack-trees.c:1498 +#: unpack-trees.c:1519 msgid "Updating index flags" msgstr "Uppdaterar indexflaggor" -#: upload-pack.c:1543 +#: unpack-trees.c:2608 +#, c-format +msgid "worktree and untracked commit have duplicate entries: %s" +msgstr "arbetskatalog och ospårad incheckning har dublettposter: %s" + +#: upload-pack.c:1548 msgid "expected flush after fetch arguments" msgstr "förväntade \"flush\" efter \"fetch\"-argument" @@ -9305,7 +9438,7 @@ msgstr "felaktigt \"..\"-sökvägssegment" msgid "Fetching objects" msgstr "Hämtar objekt" -#: worktree.c:238 builtin/am.c:2103 +#: worktree.c:238 builtin/am.c:2151 #, c-format msgid "failed to read '%s'" msgstr "misslyckades läsa \"%s\"" @@ -9446,11 +9579,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning) msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:211 wt-status.c:1072 +#: wt-status.c:211 wt-status.c:1075 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:234 wt-status.c:1081 +#: wt-status.c:234 wt-status.c:1084 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" @@ -9553,22 +9686,22 @@ msgstr "ändrat innehåll, " msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:905 +#: wt-status.c:908 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Stashen innehåller just nu %d post" msgstr[1] "Stashen innehåller just nu %d poster" -#: wt-status.c:936 +#: wt-status.c:939 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:938 +#: wt-status.c:941 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:1020 +#: wt-status.c:1023 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9576,7 +9709,7 @@ msgstr "" "Raden ovan får inte ändras eller tas bort.\n" "Allt under den kommer tas bort." -#: wt-status.c:1112 +#: wt-status.c:1115 #, c-format msgid "" "\n" @@ -9587,107 +9720,107 @@ msgstr "" "Det tog %.2f sekunder att räkna före/bakom-värden.\n" "Du kan använda \"--no-ahead-behind\" för undvika detta.\n" -#: wt-status.c:1142 +#: wt-status.c:1145 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:1145 +#: wt-status.c:1148 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:1147 +#: wt-status.c:1150 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)" -#: wt-status.c:1151 +#: wt-status.c:1154 msgid "All conflicts fixed but you are still merging." msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning." -#: wt-status.c:1154 +#: wt-status.c:1157 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:1163 +#: wt-status.c:1166 msgid "You are in the middle of an am session." msgstr "Du är i mitten av en körning av \"git am\"." -#: wt-status.c:1166 +#: wt-status.c:1169 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:1170 +#: wt-status.c:1173 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:1172 +#: wt-status.c:1175 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:1174 +#: wt-status.c:1177 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" -#: wt-status.c:1307 +#: wt-status.c:1310 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo saknas." -#: wt-status.c:1309 +#: wt-status.c:1312 msgid "No commands done." msgstr "Inga kommandon utförda." -#: wt-status.c:1312 +#: wt-status.c:1315 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Sista kommandot utfört (%d kommando utfört):" msgstr[1] "Sista kommandot utfört (%d kommandon utfört):" -#: wt-status.c:1323 +#: wt-status.c:1326 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1328 +#: wt-status.c:1331 msgid "No commands remaining." msgstr "Inga kommandon återstår." -#: wt-status.c:1331 +#: wt-status.c:1334 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Nästa kommando att utföra (%d kommando återstår):" msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):" -#: wt-status.c:1339 +#: wt-status.c:1342 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)" -#: wt-status.c:1351 +#: wt-status.c:1354 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." -#: wt-status.c:1356 +#: wt-status.c:1359 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1369 +#: wt-status.c:1372 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1371 +#: wt-status.c:1374 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1373 +#: wt-status.c:1376 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" -#: wt-status.c:1380 +#: wt-status.c:1383 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1384 +#: wt-status.c:1387 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -9695,155 +9828,155 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1389 +#: wt-status.c:1392 msgid "You are currently splitting a commit during a rebase." msgstr "Du håller på att dela upp en incheckning i en ombasering." -#: wt-status.c:1392 +#: wt-status.c:1395 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")" -#: wt-status.c:1396 +#: wt-status.c:1399 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1401 +#: wt-status.c:1404 msgid "You are currently editing a commit during a rebase." msgstr "Du håller på att redigera en incheckning under en ombasering." -#: wt-status.c:1404 +#: wt-status.c:1407 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)" -#: wt-status.c:1406 +#: wt-status.c:1409 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: wt-status.c:1417 +#: wt-status.c:1420 msgid "Cherry-pick currently in progress." msgstr "Cherry-pick pågår." -#: wt-status.c:1420 +#: wt-status.c:1423 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s." -#: wt-status.c:1427 +#: wt-status.c:1430 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1430 +#: wt-status.c:1433 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (kör \"git cherry-pick --continue\" för att fortsätta)" -#: wt-status.c:1433 +#: wt-status.c:1436 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1435 +#: wt-status.c:1438 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (använd \"git cherry-pick --skip\" för att hoppa över patchen)" -#: wt-status.c:1437 +#: wt-status.c:1440 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-" "operationen)" -#: wt-status.c:1447 +#: wt-status.c:1450 msgid "Revert currently in progress." msgstr "Ångring pågår." -#: wt-status.c:1450 +#: wt-status.c:1453 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1456 +#: wt-status.c:1459 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1459 +#: wt-status.c:1462 msgid " (run \"git revert --continue\" to continue)" msgstr " (kör \"git revert --continue\" för att fortsätta)" -#: wt-status.c:1462 +#: wt-status.c:1465 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1464 +#: wt-status.c:1467 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (använd \"git revert --skip\" för att hoppa över patchen)" -#: wt-status.c:1466 +#: wt-status.c:1469 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1476 +#: wt-status.c:1479 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"." -#: wt-status.c:1480 +#: wt-status.c:1483 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1483 +#: wt-status.c:1486 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)" -#: wt-status.c:1494 +#: wt-status.c:1497 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "Du är i en gles utcheckning med %d%% spårade filer på plats." -#: wt-status.c:1733 +#: wt-status.c:1736 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1740 +#: wt-status.c:1743 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå " -#: wt-status.c:1742 +#: wt-status.c:1745 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå " -#: wt-status.c:1747 +#: wt-status.c:1750 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1749 +#: wt-status.c:1752 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1752 +#: wt-status.c:1755 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1769 +#: wt-status.c:1772 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1770 +#: wt-status.c:1773 msgid "No commits yet" msgstr "Inga incheckningar ännu" -#: wt-status.c:1784 +#: wt-status.c:1787 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1786 +#: wt-status.c:1789 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1790 +#: wt-status.c:1793 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9855,32 +9988,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1796 +#: wt-status.c:1799 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1798 +#: wt-status.c:1801 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1804 +#: wt-status.c:1807 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1809 +#: wt-status.c:1812 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" "\")\n" -#: wt-status.c:1813 +#: wt-status.c:1816 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1817 +#: wt-status.c:1820 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9889,67 +10022,85 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1821 +#: wt-status.c:1824 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "inget köat för incheckning, men ospårade filer finns\n" -#: wt-status.c:1825 +#: wt-status.c:1828 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n" -#: wt-status.c:1829 wt-status.c:1835 +#: wt-status.c:1832 wt-status.c:1838 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1832 +#: wt-status.c:1835 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "inget att checka in (använd -u för att visa ospårade filer)\n" -#: wt-status.c:1837 +#: wt-status.c:1840 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1942 +#: wt-status.c:1945 msgid "No commits yet on " msgstr "Inga incheckningar ännu på " -#: wt-status.c:1946 +#: wt-status.c:1949 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1977 +#: wt-status.c:1980 msgid "different" msgstr "olika" -#: wt-status.c:1979 wt-status.c:1987 +#: wt-status.c:1982 wt-status.c:1990 msgid "behind " msgstr "efter " -#: wt-status.c:1982 wt-status.c:1985 +#: wt-status.c:1985 wt-status.c:1988 msgid "ahead " msgstr "före " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2507 +#: wt-status.c:2511 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har oköade ändringar." -#: wt-status.c:2513 +#: wt-status.c:2517 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehåller dit index ändringar som inte har checkats in." -#: wt-status.c:2515 +#: wt-status.c:2519 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." -#: compat/precompose_utf8.c:58 builtin/clone.c:457 +#: compat/simple-ipc/ipc-unix-socket.c:178 +msgid "could not send IPC command" +msgstr "kunde inte sända IPC-kommando" + +#: compat/simple-ipc/ipc-unix-socket.c:185 +msgid "could not read IPC response" +msgstr "kunde inte läsa IPC-svar" + +#: compat/simple-ipc/ipc-unix-socket.c:862 +#, c-format +msgid "could not start accept_thread '%s'" +msgstr "kunde inte ta status \"accept_thread\" \"%s\"" + +#: compat/simple-ipc/ipc-unix-socket.c:874 +#, c-format +msgid "could not start worker[0] for '%s'" +msgstr "kunde inte starta \"worker[0]\" för \"%s\"" + +#: compat/precompose_utf8.c:58 builtin/clone.c:461 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" @@ -9958,131 +10109,131 @@ msgstr "misslyckades ta bort länken \"%s\"" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<flaggor>] [--] <sökväg>..." -#: builtin/add.c:58 +#: builtin/add.c:61 #, c-format msgid "cannot chmod %cx '%s'" msgstr "kan inte utföra chmod %cx \"%s\"" -#: builtin/add.c:96 +#: builtin/add.c:99 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:101 builtin/commit.c:285 +#: builtin/add.c:104 builtin/commit.c:297 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:111 +#: builtin/add.c:114 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:186 +#: builtin/add.c:198 msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:280 builtin/rev-parse.c:991 +#: builtin/add.c:307 builtin/rev-parse.c:991 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:291 +#: builtin/add.c:318 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning." -#: builtin/add.c:295 +#: builtin/add.c:322 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:298 +#: builtin/add.c:325 msgid "editing patch failed" msgstr "redigering av patch misslyckades" -#: builtin/add.c:301 +#: builtin/add.c:328 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:303 +#: builtin/add.c:330 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:308 +#: builtin/add.c:335 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:316 +#: builtin/add.c:343 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" -#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124 +#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124 #: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 -#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 +#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:339 +#: builtin/add.c:366 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:341 +#: builtin/add.c:368 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:342 +#: builtin/add.c:369 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:343 +#: builtin/add.c:370 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:344 +#: builtin/add.c:371 msgid "renormalize EOL of tracked files (implies -u)" msgstr "åternormalisera radslut i spårade filer (implicerar -u)" -#: builtin/add.c:345 +#: builtin/add.c:372 msgid "record only the fact that the path will be added later" msgstr "registrera endast att sökvägen kommer läggas till senare" -#: builtin/add.c:346 +#: builtin/add.c:373 msgid "add changes from all tracked and untracked files" msgstr "lägg till ändringar från alla spårade och ospårade filer" -#: builtin/add.c:349 +#: builtin/add.c:376 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)" -#: builtin/add.c:351 +#: builtin/add.c:378 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:352 +#: builtin/add.c:379 msgid "just skip files which cannot be added because of errors" msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" -#: builtin/add.c:353 +#: builtin/add.c:380 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:355 builtin/update-index.c:1004 +#: builtin/add.c:382 builtin/update-index.c:1006 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/add.c:357 +#: builtin/add.c:384 msgid "warn when adding an embedded repository" msgstr "varna när ett inbyggt arkiv läggs till" -#: builtin/add.c:359 +#: builtin/add.c:386 msgid "backend for `git stash -p`" msgstr "bakända för \"git stash -p\"" -#: builtin/add.c:377 +#: builtin/add.c:404 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -10113,12 +10264,12 @@ msgstr "" "\n" "Se \"git help submodule\" för ytterligare information." -#: builtin/add.c:405 +#: builtin/add.c:432 #, c-format msgid "adding embedded git repository: %s" msgstr "lägger till inbäddat git-arkiv: %s" -#: builtin/add.c:424 +#: builtin/add.c:451 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -10128,47 +10279,51 @@ msgstr "" "Slå av detta meddelande med\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:433 +#: builtin/add.c:460 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:461 builtin/commit.c:345 +#: builtin/add.c:488 +msgid "--dry-run is incompatible with --interactive/--patch" +msgstr "--dry-run är inkompatibelt med --interactive/--patch" + +#: builtin/add.c:490 builtin/commit.c:357 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch" -#: builtin/add.c:478 +#: builtin/add.c:507 msgid "--pathspec-from-file is incompatible with --edit" msgstr "--pathspec-from-file är inkompatibelt med --edit" -#: builtin/add.c:490 +#: builtin/add.c:519 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:493 +#: builtin/add.c:522 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" -#: builtin/add.c:497 +#: builtin/add.c:526 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x" -#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569 +#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 +#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar" -#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575 +#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 +#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul kräver --pathspec-from-file" -#: builtin/add.c:526 +#: builtin/add.c:555 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:528 +#: builtin/add.c:557 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -10178,109 +10333,109 @@ msgstr "" "Slå av detta meddelande genom att köra\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:352 +#: builtin/am.c:364 msgid "could not parse author script" msgstr "kunde inte tolka författarskript" -#: builtin/am.c:436 +#: builtin/am.c:454 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:478 +#: builtin/am.c:496 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/am.c:516 +#: builtin/am.c:534 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/am.c:542 +#: builtin/am.c:560 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:730 +#: builtin/am.c:748 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:795 +#: builtin/am.c:813 msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" -#: builtin/am.c:843 +#: builtin/am.c:861 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:866 builtin/am.c:878 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:855 +#: builtin/am.c:873 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:948 +#: builtin/am.c:966 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:953 builtin/clone.c:410 +#: builtin/am.c:971 builtin/clone.c:414 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:958 +#: builtin/am.c:976 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1089 +#: builtin/am.c:1125 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "När du har löst problemet, kör \"%s --continue\"." -#: builtin/am.c:1090 +#: builtin/am.c:1126 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället." -#: builtin/am.c:1091 +#: builtin/am.c:1127 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"." -#: builtin/am.c:1174 +#: builtin/am.c:1222 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Patch sänd med format=flowed; blanksteg på slut av rader kan ha tappats." -#: builtin/am.c:1202 +#: builtin/am.c:1250 msgid "Patch is empty." msgstr "Patchen är tom." -#: builtin/am.c:1267 +#: builtin/am.c:1315 #, c-format msgid "missing author line in commit %s" msgstr "saknad \"author\"-rad i incheckningen %s" -#: builtin/am.c:1270 +#: builtin/am.c:1318 #, c-format msgid "invalid ident line: %.*s" msgstr "ogiltig ident-rad: %.*s" -#: builtin/am.c:1489 +#: builtin/am.c:1537 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: builtin/am.c:1491 +#: builtin/am.c:1539 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1510 +#: builtin/am.c:1558 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10288,25 +10443,25 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1516 +#: builtin/am.c:1564 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1542 +#: builtin/am.c:1590 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1574 +#: builtin/am.c:1622 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1626 builtin/am.c:1630 +#: builtin/am.c:1674 builtin/am.c:1678 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1648 +#: builtin/am.c:1696 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -10314,41 +10469,41 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1658 +#: builtin/am.c:1706 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: " -#: builtin/am.c:1704 builtin/commit.c:395 +#: builtin/am.c:1752 builtin/commit.c:408 msgid "unable to write index file" msgstr "kan inte skriva indexfil" -#: builtin/am.c:1708 +#: builtin/am.c:1756 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1748 builtin/am.c:1816 +#: builtin/am.c:1796 builtin/am.c:1864 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1765 +#: builtin/am.c:1813 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1771 +#: builtin/am.c:1819 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1775 +#: builtin/am.c:1823 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" "Använd \"git am --show-current-patch=diff\" för att se patchen som " "misslyckades" -#: builtin/am.c:1819 +#: builtin/am.c:1867 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10358,7 +10513,7 @@ msgstr "" "Om det inte är något kvar att köa kan det hända att något annat redan\n" "introducerat samma ändringar; kanske du bör hoppa över patchen." -#: builtin/am.c:1826 +#: builtin/am.c:1874 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10370,17 +10525,17 @@ msgstr "" "lösta.\n" "Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den." -#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 +#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"." -#: builtin/am.c:1985 +#: builtin/am.c:2033 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2029 +#: builtin/am.c:2077 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10388,155 +10543,159 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2136 +#: builtin/am.c:2184 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2178 +#: builtin/am.c:2226 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Felaktigt värde för --show-current-patch: %s" -#: builtin/am.c:2182 +#: builtin/am.c:2230 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s är inkompatibelt med --show-current-patch=%s" -#: builtin/am.c:2213 +#: builtin/am.c:2261 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2214 +#: builtin/am.c:2262 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2220 +#: builtin/am.c:2268 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2222 +#: builtin/am.c:2270 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2224 +#: builtin/am.c:2272 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 -#: builtin/repack.c:334 builtin/stash.c:882 +#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16 +#: builtin/repack.c:472 builtin/stash.c:948 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2227 +#: builtin/am.c:2275 msgid "add a Signed-off-by trailer to the commit message" msgstr "lägg till \"Signed-off-by\"-släprad i incheckningsmeddelandet" -#: builtin/am.c:2230 +#: builtin/am.c:2278 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2232 +#: builtin/am.c:2280 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2234 +#: builtin/am.c:2282 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2236 +#: builtin/am.c:2284 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2238 +#: builtin/am.c:2286 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet" -#: builtin/am.c:2241 +#: builtin/am.c:2289 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr" -#: builtin/am.c:2244 +#: builtin/am.c:2292 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2273 +#: builtin/am.c:2294 +msgid "pass it through git-mailinfo" +msgstr "sänd det genom git-mailinfo" + +#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 +#: builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 +#: builtin/am.c:2324 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261 +#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349 -#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172 -#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175 -#: parse-options.h:316 +#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 +#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176 +#: parse-options.h:317 msgid "n" msgstr "n" -#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136 -#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470 +#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137 +#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 #: builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2270 +#: builtin/am.c:2321 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2276 +#: builtin/am.c:2327 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2278 +#: builtin/am.c:2329 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2281 +#: builtin/am.c:2332 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2284 +#: builtin/am.c:2335 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2287 +#: builtin/am.c:2338 msgid "restore the original branch and abort the patching operation" msgstr "återställ originalgrenen och avbryt patchningen" -#: builtin/am.c:2290 +#: builtin/am.c:2341 msgid "abort the patching operation but keep HEAD where it is" msgstr "avbryt patchningen men behåll HEAD där det är" -#: builtin/am.c:2294 +#: builtin/am.c:2345 msgid "show the patch being applied" msgstr "visa patchen som tillämpas" -#: builtin/am.c:2299 +#: builtin/am.c:2350 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2301 +#: builtin/am.c:2352 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 -#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538 -#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451 +#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630 +#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 +#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401 +#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2307 +#: builtin/am.c:2358 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2325 +#: builtin/am.c:2376 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -10544,16 +10703,16 @@ msgstr "" "Flaggan -b/--binary har varit utan funktion länge, och\n" "kommer tas bort. Vi ber dig att inte använda den längre." -#: builtin/am.c:2332 +#: builtin/am.c:2383 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2347 +#: builtin/am.c:2398 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs." -#: builtin/am.c:2371 +#: builtin/am.c:2422 #, c-format msgid "" "Stray %s directory found.\n" @@ -10562,11 +10721,11 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2377 +#: builtin/am.c:2428 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." -#: builtin/am.c:2387 +#: builtin/am.c:2438 msgid "interactive mode requires patches on the command line" msgstr "interaktivt läge kräver patchar på kommandoraden" @@ -10773,7 +10932,7 @@ msgstr "" "ogiltigt argument %s för \"git bisect terms\".\n" "Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new." -#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014 +#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021 msgid "revision walk setup failed\n" msgstr "misslyckades starta revisionstraversering\n" @@ -10841,86 +11000,91 @@ msgstr "Anropa \"--bisect-state\" med minst ett argument." msgid "'git bisect %s' can take only one argument." msgstr "\"git bisect %s\" kan bara ta ett argument." -#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878 +#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880 #, c-format msgid "Bad rev input: %s" msgstr "Felaktig rev-indata: %s" -#: builtin/bisect--helper.c:912 +#: builtin/bisect--helper.c:887 +#, c-format +msgid "Bad rev input (not a commit): %s" +msgstr "Felaktig rev-indata (ej incheckning): %s" + +#: builtin/bisect--helper.c:919 msgid "We are not bisecting." msgstr "Vi utför ingen bisect för tillfället." -#: builtin/bisect--helper.c:962 +#: builtin/bisect--helper.c:969 #, c-format msgid "'%s'?? what are you talking about?" msgstr "\"%s\"?? vad menar du?" -#: builtin/bisect--helper.c:974 +#: builtin/bisect--helper.c:981 #, c-format msgid "cannot read file '%s' for replaying" msgstr "kan inte läsa filen \"%s\" för återuppspelning" -#: builtin/bisect--helper.c:1047 +#: builtin/bisect--helper.c:1054 msgid "reset the bisection state" msgstr "återställ bisect-tillstånd" -#: builtin/bisect--helper.c:1049 +#: builtin/bisect--helper.c:1056 msgid "check whether bad or good terms exist" msgstr "se efter om termer för rätt och fel finns" -#: builtin/bisect--helper.c:1051 +#: builtin/bisect--helper.c:1058 msgid "print out the bisect terms" msgstr "skriv ut termer för bisect" -#: builtin/bisect--helper.c:1053 +#: builtin/bisect--helper.c:1060 msgid "start the bisect session" msgstr "påbörja bisect-körningen" -#: builtin/bisect--helper.c:1055 +#: builtin/bisect--helper.c:1062 msgid "find the next bisection commit" msgstr "hitta nästa incheckning i bisect" -#: builtin/bisect--helper.c:1057 +#: builtin/bisect--helper.c:1064 msgid "mark the state of ref (or refs)" msgstr "markera tillståndet för en eller flera referenser" -#: builtin/bisect--helper.c:1059 +#: builtin/bisect--helper.c:1066 msgid "list the bisection steps so far" msgstr "lista \"bisect\"-stegen som utförts så långt" -#: builtin/bisect--helper.c:1061 +#: builtin/bisect--helper.c:1068 msgid "replay the bisection process from the given file" msgstr "spela upp \"bisect\"-processen från angiven fil" -#: builtin/bisect--helper.c:1063 +#: builtin/bisect--helper.c:1070 msgid "skip some commits for checkout" msgstr "hoppa över ett par incheckningar" -#: builtin/bisect--helper.c:1065 +#: builtin/bisect--helper.c:1072 msgid "no log for BISECT_WRITE" msgstr "ingen logg för BISECT_WRITE" -#: builtin/bisect--helper.c:1080 +#: builtin/bisect--helper.c:1087 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset kräver antingen inget argument eller en incheckning" -#: builtin/bisect--helper.c:1085 +#: builtin/bisect--helper.c:1092 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check kräver 2 eller 3 argument" -#: builtin/bisect--helper.c:1091 +#: builtin/bisect--helper.c:1098 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms kräver noll eller ett argument" -#: builtin/bisect--helper.c:1100 +#: builtin/bisect--helper.c:1107 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next kräver 0 argument" -#: builtin/bisect--helper.c:1111 +#: builtin/bisect--helper.c:1118 msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log kräver 0 argument" -#: builtin/bisect--helper.c:1116 +#: builtin/bisect--helper.c:1123 msgid "no logfile given" msgstr "ingen loggfil angiven" @@ -10971,9 +11135,9 @@ msgstr "vehandla inte rotincheckningar som gränser (Standard: av)" msgid "show work cost statistics" msgstr "visa statistik över arbetskostnad" -#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92 -#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175 -#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119 +#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 +#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 +#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 #: builtin/push.c:575 builtin/send-pack.c:198 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" @@ -11022,7 +11186,7 @@ msgstr "visa författarens e-post istället för namn (Standard: av)" msgid "ignore whitespace differences" msgstr "ignorera ändringar i blanksteg" -#: builtin/blame.c:883 builtin/log.c:1812 +#: builtin/blame.c:883 builtin/log.c:1820 msgid "rev" msgstr "incheckning" @@ -11199,75 +11363,75 @@ msgstr "Tog bort fjärrspårande grenen %s (var %s).\n" msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:438 builtin/tag.c:61 +#: builtin/branch.c:440 builtin/tag.c:63 msgid "unable to parse format string" msgstr "kan inte tolka formatsträng" -#: builtin/branch.c:469 +#: builtin/branch.c:471 msgid "could not resolve HEAD" msgstr "kunde inte slå upp HEAD" -#: builtin/branch.c:475 +#: builtin/branch.c:477 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) pekar utenför refs/heads/" -#: builtin/branch.c:490 +#: builtin/branch.c:492 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Grenen %s ombaseras på %s" -#: builtin/branch.c:494 +#: builtin/branch.c:496 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -#: builtin/branch.c:511 +#: builtin/branch.c:513 msgid "cannot copy the current branch while not on any." msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:513 +#: builtin/branch.c:515 msgid "cannot rename the current branch while not on any." msgstr "" "kunde inte byta namn på aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:524 +#: builtin/branch.c:526 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:553 +#: builtin/branch.c:555 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:555 +#: builtin/branch.c:557 msgid "Branch copy failed" msgstr "Misslyckades kopiera gren" -#: builtin/branch.c:559 +#: builtin/branch.c:561 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Skapade kopia av felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:562 +#: builtin/branch.c:564 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:568 +#: builtin/branch.c:570 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!" -#: builtin/branch.c:577 +#: builtin/branch.c:579 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:579 +#: builtin/branch.c:581 msgid "Branch is copied, but update of config-file failed" msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:595 +#: builtin/branch.c:597 #, c-format msgid "" "Please edit the description for the branch\n" @@ -11278,211 +11442,211 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/branch.c:629 +#: builtin/branch.c:631 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:631 +#: builtin/branch.c:633 msgid "show hash and subject, give twice for upstream branch" msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren" -#: builtin/branch.c:632 +#: builtin/branch.c:634 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:633 +#: builtin/branch.c:635 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:635 +#: builtin/branch.c:637 msgid "do not use" msgstr "använd ej" -#: builtin/branch.c:637 builtin/rebase.c:534 +#: builtin/branch.c:639 builtin/rebase.c:533 msgid "upstream" msgstr "uppströms" -#: builtin/branch.c:637 +#: builtin/branch.c:639 msgid "change the upstream info" msgstr "ändra uppströmsinformationen" -#: builtin/branch.c:638 +#: builtin/branch.c:640 msgid "unset the upstream info" msgstr "ta bort uppströmsinformationen" -#: builtin/branch.c:639 +#: builtin/branch.c:641 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:640 +#: builtin/branch.c:642 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:642 builtin/branch.c:644 +#: builtin/branch.c:644 builtin/branch.c:646 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:643 builtin/branch.c:645 +#: builtin/branch.c:645 builtin/branch.c:647 msgid "print only branches that don't contain the commit" msgstr "visa endast grenar som inte innehåller incheckningen" -#: builtin/branch.c:648 +#: builtin/branch.c:650 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:649 +#: builtin/branch.c:651 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:651 +#: builtin/branch.c:653 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:652 +#: builtin/branch.c:654 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:653 +#: builtin/branch.c:655 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:654 +#: builtin/branch.c:656 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:655 +#: builtin/branch.c:657 msgid "copy a branch and its reflog" msgstr "kopiera en gren och dess reflogg" -#: builtin/branch.c:656 +#: builtin/branch.c:658 msgid "copy a branch, even if target exists" msgstr "kopiera en gren, även om målet finns" -#: builtin/branch.c:657 +#: builtin/branch.c:659 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:658 +#: builtin/branch.c:660 msgid "show current branch name" msgstr "visa namn på aktuell gren" -#: builtin/branch.c:659 +#: builtin/branch.c:661 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:661 +#: builtin/branch.c:663 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:662 +#: builtin/branch.c:664 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:663 +#: builtin/branch.c:665 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:664 +#: builtin/branch.c:666 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:665 +#: builtin/branch.c:667 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:667 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:466 +#: builtin/tag.c:477 msgid "object" msgstr "objekt" -#: builtin/branch.c:668 +#: builtin/branch.c:670 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473 +#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484 msgid "sorting and filtering are case insensitive" msgstr "sortering och filtrering skiljer gemener och VERSALER" -#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471 +#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/branch.c:693 builtin/clone.c:790 +#: builtin/branch.c:695 builtin/clone.c:794 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:717 +#: builtin/branch.c:719 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797 +#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:764 +#: builtin/branch.c:766 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:769 +#: builtin/branch.c:771 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:776 +#: builtin/branch.c:778 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu." -#: builtin/branch.c:779 +#: builtin/branch.c:781 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:794 +#: builtin/branch.c:796 msgid "too many branches for a copy operation" msgstr "för många grenar för kopiering" -#: builtin/branch.c:803 +#: builtin/branch.c:805 msgid "too many arguments for a rename operation" msgstr "för många flaggor för namnbyte" -#: builtin/branch.c:808 +#: builtin/branch.c:810 msgid "too many arguments to set new upstream" msgstr "för många flaggor för att byta uppström" -#: builtin/branch.c:812 +#: builtin/branch.c:814 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren." -#: builtin/branch.c:815 builtin/branch.c:838 +#: builtin/branch.c:817 builtin/branch.c:840 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:819 +#: builtin/branch.c:821 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:832 +#: builtin/branch.c:834 msgid "too many arguments to unset upstream" msgstr "för många flaggor för att ta bort uppström" -#: builtin/branch.c:836 +#: builtin/branch.c:838 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren." -#: builtin/branch.c:842 +#: builtin/branch.c:844 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:852 +#: builtin/branch.c:854 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11490,7 +11654,7 @@ msgstr "" "Flaggorna -a och -r på \"git branch\" tar inte ett namn på gren.\n" "Menade du att använda: -a|-r --list <mönster>?" -#: builtin/branch.c:856 +#: builtin/branch.c:858 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -11559,38 +11723,38 @@ msgstr "" "Se över resten av felrapporten nedan.\n" "Du kan ta bort rader du inte vill dela.\n" -#: builtin/bugreport.c:135 +#: builtin/bugreport.c:136 msgid "specify a destination for the bugreport file" msgstr "ange mål för buggrapporteringsfilen" -#: builtin/bugreport.c:137 +#: builtin/bugreport.c:138 msgid "specify a strftime format suffix for the filename" msgstr "ange ett filändelse i strftime-format" -#: builtin/bugreport.c:159 +#: builtin/bugreport.c:160 #, c-format msgid "could not create leading directories for '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/bugreport.c:166 +#: builtin/bugreport.c:167 msgid "System Info" msgstr "Systeminfo" -#: builtin/bugreport.c:169 +#: builtin/bugreport.c:170 msgid "Enabled Hooks" msgstr "Aktiverade krokar" -#: builtin/bugreport.c:176 +#: builtin/bugreport.c:177 #, c-format msgid "couldn't create a new file at '%s'" msgstr "kunde inte skapa filen på \"%s\"" -#: builtin/bugreport.c:179 +#: builtin/bugreport.c:180 #, c-format msgid "unable to write to %s" msgstr "kunde inte skriva till %s" -#: builtin/bugreport.c:189 +#: builtin/bugreport.c:190 #, c-format msgid "Created new report at '%s'.\n" msgstr "Skapade ny rapport på \"%s\"\n" @@ -11611,19 +11775,19 @@ msgstr "git bundle list-heads <fil> [<refnamn>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <fil> [<refnamn>...]" -#: builtin/bundle.c:67 builtin/pack-objects.c:3495 +#: builtin/bundle.c:67 builtin/pack-objects.c:3747 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/bundle.c:69 builtin/pack-objects.c:3497 +#: builtin/bundle.c:69 builtin/pack-objects.c:3749 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/bundle.c:71 builtin/pack-objects.c:3499 +#: builtin/bundle.c:71 builtin/pack-objects.c:3751 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/bundle.c:74 builtin/pack-objects.c:3502 +#: builtin/bundle.c:74 builtin/pack-objects.c:3754 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" @@ -11766,8 +11930,8 @@ msgstr "läs filnamn från standard in" msgid "terminate input and output records by a NUL character" msgstr "avsluta in- och utdataposter med NUL-tecken" -#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549 -#: builtin/worktree.c:489 +#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 +#: builtin/worktree.c:491 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -11779,27 +11943,27 @@ msgstr "visa indatasökvägar som inte träffas" msgid "ignore index when checking" msgstr "ignorera index vid kontroll" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:165 msgid "cannot specify pathnames with --stdin" msgstr "kan inte ange sökvägsnamn med --stdin" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:168 msgid "-z only makes sense with --stdin" msgstr "-z kan endast användas tillsammans med --stdin" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:170 msgid "no path specified" msgstr "ingen sökväg angavs" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:174 msgid "--quiet is only valid with a single pathname" msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:176 msgid "cannot have both --quiet and --verbose" msgstr "kan inte använda både --quiet och --verbose" -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:179 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching är endast giltig med --verbose" @@ -11820,6 +11984,21 @@ msgstr "kunde inte tolka kontakt: %s" msgid "no contacts specified" msgstr "inga kontakter angavs" +#: builtin/checkout--worker.c:110 +msgid "git checkout--worker [<options>]" +msgstr "git checkout--worker [<flaggor>]" + +#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 +#: builtin/column.c:31 builtin/submodule--helper.c:1825 +#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836 +#: builtin/submodule--helper.c:2334 builtin/worktree.c:719 +msgid "string" +msgstr "sträng" + +#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202 +msgid "when creating files, prepend <string>" +msgstr "när filer skapas, lägg till <sträng> först" + #: builtin/checkout-index.c:152 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<flaggor>] [--] [<fil>...]" @@ -11828,157 +12007,146 @@ msgstr "git checkout-index [<flaggor>] [--] [<fil>...]" msgid "stage should be between 1 and 3 or all" msgstr "etapp måste vara mellan 1 och 3 eller \"all\"" -#: builtin/checkout-index.c:186 +#: builtin/checkout-index.c:187 msgid "check out all files in the index" msgstr "checka ut alla filer i indexet" -#: builtin/checkout-index.c:187 +#: builtin/checkout-index.c:188 msgid "force overwrite of existing files" msgstr "tvinga överskrivning av befintliga filer" -#: builtin/checkout-index.c:189 +#: builtin/checkout-index.c:190 msgid "no warning for existing files and files not in index" msgstr "ingen varning för existerande filer och filer ej i indexet" -#: builtin/checkout-index.c:191 +#: builtin/checkout-index.c:192 msgid "don't checkout new files" msgstr "checka inte ut nya filer" -#: builtin/checkout-index.c:193 +#: builtin/checkout-index.c:194 msgid "update stat information in the index file" msgstr "uppdatera stat-information i indexfilen" -#: builtin/checkout-index.c:197 +#: builtin/checkout-index.c:198 msgid "read list of paths from the standard input" msgstr "läs listan över sökvägar från standard in" -#: builtin/checkout-index.c:199 +#: builtin/checkout-index.c:200 msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" -#: builtin/checkout-index.c:200 builtin/column.c:31 -#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 -#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:717 -msgid "string" -msgstr "sträng" - -#: builtin/checkout-index.c:201 -msgid "when creating files, prepend <string>" -msgstr "när filer skapas, lägg till <sträng> först" - -#: builtin/checkout-index.c:203 +#: builtin/checkout-index.c:204 msgid "copy out the files from named stage" msgstr "kopiera ut filer från namngiven etapp" -#: builtin/checkout.c:31 +#: builtin/checkout.c:33 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<flaggor>] <gren>" -#: builtin/checkout.c:32 +#: builtin/checkout.c:34 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..." -#: builtin/checkout.c:37 +#: builtin/checkout.c:39 msgid "git switch [<options>] [<branch>]" msgstr "git switch [<flaggor>] [<gren>]" -#: builtin/checkout.c:42 +#: builtin/checkout.c:44 msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..." -#: builtin/checkout.c:188 builtin/checkout.c:227 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:190 builtin/checkout.c:229 +#: builtin/checkout.c:192 builtin/checkout.c:231 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:206 +#: builtin/checkout.c:208 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner" -#: builtin/checkout.c:258 +#: builtin/checkout.c:261 #, c-format msgid "path '%s' does not have necessary versions" msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner" -#: builtin/checkout.c:275 +#: builtin/checkout.c:278 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:291 +#: builtin/checkout.c:294 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:396 +#: builtin/checkout.c:414 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Återskapade %d sammanslagningskonflikt" msgstr[1] "Återskapade %d sammanslagningskonflikter" -#: builtin/checkout.c:401 +#: builtin/checkout.c:419 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Uppdaterade %d sökväg från %s" msgstr[1] "Uppdaterade %d sökvägar från %s" -#: builtin/checkout.c:408 +#: builtin/checkout.c:426 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Uppdaterade %d sökväg från indexet" msgstr[1] "Uppdaterade %d sökvägar från indexet" -#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 -#: builtin/checkout.c:441 +#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 +#: builtin/checkout.c:459 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar" -#: builtin/checkout.c:444 builtin/checkout.c:447 +#: builtin/checkout.c:462 builtin/checkout.c:465 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:451 +#: builtin/checkout.c:469 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." -#: builtin/checkout.c:455 +#: builtin/checkout.c:473 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "varken \"%s\" eller \"%s\" har angivits" -#: builtin/checkout.c:459 +#: builtin/checkout.c:477 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "\"%s\" måste användas när \"%s\" inte anges" -#: builtin/checkout.c:464 builtin/checkout.c:469 +#: builtin/checkout.c:482 builtin/checkout.c:487 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "\"%s\" eller \"%s\" kan inte användas med %s" -#: builtin/checkout.c:543 builtin/checkout.c:550 +#: builtin/checkout.c:563 builtin/checkout.c:570 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:718 +#: builtin/checkout.c:739 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:772 +#: builtin/checkout.c:793 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11987,50 +12155,50 @@ msgstr "" "kan inte fortsätta med köade ändringar i följande filer:\n" "%s" -#: builtin/checkout.c:865 +#: builtin/checkout.c:886 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:907 +#: builtin/checkout.c:928 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:915 +#: builtin/checkout.c:936 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:918 +#: builtin/checkout.c:939 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:922 +#: builtin/checkout.c:943 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:924 builtin/checkout.c:1355 +#: builtin/checkout.c:945 builtin/checkout.c:1376 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:926 +#: builtin/checkout.c:947 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:977 +#: builtin/checkout.c:998 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:983 +#: builtin/checkout.c:1004 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12053,7 +12221,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1002 +#: builtin/checkout.c:1023 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12080,19 +12248,19 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:1037 +#: builtin/checkout.c:1058 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:1041 +#: builtin/checkout.c:1062 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:1081 builtin/checkout.c:1350 +#: builtin/checkout.c:1102 builtin/checkout.c:1371 msgid "You are on a branch yet to be born" msgstr "Du är på en gren som ännu inte är född" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1184 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12101,7 +12269,7 @@ msgstr "" "\"%s\" kan vara både en lokal fil och en spårande gren.\n" "Använd -- (och möjligen --no-guess) för att göra otvetydig" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1191 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12121,51 +12289,51 @@ msgstr "" "föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n" "checkout.defaultRemote=origin i din konfiguration." -#: builtin/checkout.c:1180 +#: builtin/checkout.c:1201 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1267 msgid "only one reference expected" msgstr "endast en referens förväntades" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1284 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438 +#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1322 builtin/checkout.c:1688 +#: builtin/checkout.c:1343 builtin/checkout.c:1709 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1369 +#: builtin/checkout.c:1390 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "förväntade gren, fick taggen \"%s\"" -#: builtin/checkout.c:1371 +#: builtin/checkout.c:1392 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "förväntade gren, fick fjärrgrenen \"%s\"" -#: builtin/checkout.c:1372 builtin/checkout.c:1380 +#: builtin/checkout.c:1393 builtin/checkout.c:1401 #, c-format msgid "a branch is expected, got '%s'" msgstr "förväntade gren, fick \"%s\"" -#: builtin/checkout.c:1375 +#: builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "förväntade gren, fick incheckningen \"%s\"" -#: builtin/checkout.c:1391 +#: builtin/checkout.c:1412 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12173,7 +12341,7 @@ msgstr "" "kan inte växla gren vid sammanslagning\n" "Överväg \"git merge --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1416 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12181,7 +12349,7 @@ msgstr "" "kan inte växla gren mitt i en \"am\"-körning\n" "Överväg \"git am --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1399 +#: builtin/checkout.c:1420 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12189,7 +12357,7 @@ msgstr "" "kan inte växla gren vid ombasering\n" "Överväg \"git rebase --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1403 +#: builtin/checkout.c:1424 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12197,7 +12365,7 @@ msgstr "" "kan inte växla gren i en \"cherry-pick\"\n" "Överväg \"git cherry-pick --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1407 +#: builtin/checkout.c:1428 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12205,139 +12373,139 @@ msgstr "" "kan inte växla gren i en \"revert\"\n" "Överväg \"git revert --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1432 msgid "you are switching branch while bisecting" msgstr "då växlar grenar medan du gör en \"bisect\"" -#: builtin/checkout.c:1418 +#: builtin/checkout.c:1439 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429 +#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439 -#: builtin/checkout.c:1444 builtin/checkout.c:1449 +#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 +#: builtin/checkout.c:1465 builtin/checkout.c:1470 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1446 +#: builtin/checkout.c:1467 #, c-format msgid "'%s' cannot take <start-point>" msgstr "\"%s\" kan inte ta <startpunkt>" -#: builtin/checkout.c:1454 +#: builtin/checkout.c:1475 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1461 +#: builtin/checkout.c:1482 msgid "missing branch or commit argument" msgstr "saknar gren- eller incheckingsargument" -#: builtin/checkout.c:1504 +#: builtin/checkout.c:1525 msgid "perform a 3-way merge with the new branch" msgstr "utför en 3-vägssammanslagning för den nya grenen" -#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322 +#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323 msgid "style" msgstr "stil" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1527 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1518 builtin/worktree.c:486 +#: builtin/checkout.c:1539 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1519 +#: builtin/checkout.c:1540 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1521 +#: builtin/checkout.c:1542 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1523 +#: builtin/checkout.c:1544 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1523 +#: builtin/checkout.c:1544 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1525 builtin/merge.c:301 +#: builtin/checkout.c:1546 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1528 +#: builtin/checkout.c:1549 msgid "do not check if another worktree is holding the given ref" msgstr "" "kontrollera inte om en annan arbetskatalog håller den angivna referensen" -#: builtin/checkout.c:1541 +#: builtin/checkout.c:1562 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1565 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1548 +#: builtin/checkout.c:1569 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1603 +#: builtin/checkout.c:1624 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1607 +#: builtin/checkout.c:1628 msgid "-p and --overlay are mutually exclusive" msgstr "-p och --overlay är ömsesidigt uteslutande" -#: builtin/checkout.c:1644 +#: builtin/checkout.c:1665 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1649 +#: builtin/checkout.c:1670 #, c-format msgid "missing branch name; try -%c" msgstr "grennamn saknas; försök med -%c" -#: builtin/checkout.c:1681 +#: builtin/checkout.c:1702 #, c-format msgid "could not resolve %s" msgstr "kunde inte upplösa %s" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1718 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1704 +#: builtin/checkout.c:1725 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den" -#: builtin/checkout.c:1708 +#: builtin/checkout.c:1729 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\"" -#: builtin/checkout.c:1717 +#: builtin/checkout.c:1738 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file är inkompatibelt med --detach" -#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566 +#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file är inkompatibelt med --patch" -#: builtin/checkout.c:1733 +#: builtin/checkout.c:1754 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12345,70 +12513,70 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1759 msgid "you must specify path(s) to restore" msgstr "du måste ange katalog(er) att återställa" -#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815 -#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482 -#: builtin/worktree.c:484 +#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 +#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484 +#: builtin/worktree.c:486 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1765 +#: builtin/checkout.c:1786 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1767 +#: builtin/checkout.c:1788 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1768 +#: builtin/checkout.c:1789 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1770 +#: builtin/checkout.c:1791 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "förutspå \"git checkout <gren-saknas>\" (förval)" -#: builtin/checkout.c:1771 +#: builtin/checkout.c:1792 msgid "use overlay mode (default)" msgstr "använd överläggsläge (standard)" -#: builtin/checkout.c:1816 +#: builtin/checkout.c:1837 msgid "create and switch to a new branch" msgstr "skapa och växla till en ny gren" -#: builtin/checkout.c:1818 +#: builtin/checkout.c:1839 msgid "create/reset and switch to a branch" msgstr "skapa/nollställ och växla till en gren" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1841 msgid "second guess 'git switch <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1822 +#: builtin/checkout.c:1843 msgid "throw away local modifications" msgstr "kasta bort lokala ändringar" -#: builtin/checkout.c:1856 +#: builtin/checkout.c:1877 msgid "which tree-ish to checkout from" msgstr "vilken träd-igt att checka ut från" -#: builtin/checkout.c:1858 +#: builtin/checkout.c:1879 msgid "restore the index" msgstr "återställ indexet" -#: builtin/checkout.c:1860 +#: builtin/checkout.c:1881 msgid "restore the working tree (default)" msgstr "återställ arbetskatalogen (förval)" -#: builtin/checkout.c:1862 +#: builtin/checkout.c:1883 msgid "ignore unmerged entries" msgstr "ignorera ej sammanslagna poster" -#: builtin/checkout.c:1863 +#: builtin/checkout.c:1884 msgid "use overlay mode" msgstr "använd överläggsläge" @@ -12439,11 +12607,6 @@ msgstr "Hoppar över arkivet %s\n" msgid "Would skip repository %s\n" msgstr "Skulle hoppa över arkivet %s\n" -#: builtin/clean.c:37 -#, c-format -msgid "failed to remove %s" -msgstr "misslyckades ta bort %s" - #: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" @@ -12554,8 +12717,8 @@ msgid "remove whole directories" msgstr "ta bort hela kataloger" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186 -#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "mönster" @@ -12596,164 +12759,169 @@ msgstr "-x och -X kan inte användas samtidigt" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:94 +#: builtin/clone.c:96 +msgid "don't clone shallow repository" +msgstr "klona inte grunt arkiv" + +#: builtin/clone.c:98 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:99 +#: builtin/clone.c:103 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:101 +#: builtin/clone.c:105 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:103 +#: builtin/clone.c:107 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:105 +#: builtin/clone.c:109 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "pathspec" msgstr "sökvägsangivelse" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:111 +#: builtin/clone.c:115 msgid "number of submodules cloned in parallel" msgstr "antal undermoduler som klonas parallellt" -#: builtin/clone.c:112 builtin/init-db.c:552 +#: builtin/clone.c:116 builtin/init-db.c:538 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:113 builtin/init-db.c:553 +#: builtin/clone.c:117 builtin/init-db.c:539 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 -#: builtin/submodule--helper.c:2336 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832 +#: builtin/submodule--helper.c:2337 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:119 builtin/submodule--helper.c:1833 -#: builtin/submodule--helper.c:2338 +#: builtin/clone.c:123 builtin/submodule--helper.c:1834 +#: builtin/submodule--helper.c:2339 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" -#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357 +#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495 +#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 msgid "name" msgstr "namn" -#: builtin/clone.c:121 +#: builtin/clone.c:125 msgid "use <name> instead of 'origin' to track upstream" msgstr "använd <namn> istället för \"origin\" för att spåra uppströms" -#: builtin/clone.c:123 +#: builtin/clone.c:127 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:125 +#: builtin/clone.c:129 msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863 #: builtin/pull.c:208 msgid "depth" msgstr "djup" -#: builtin/clone.c:127 +#: builtin/clone.c:131 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804 #: builtin/pull.c:211 msgid "time" msgstr "tid" -#: builtin/clone.c:129 +#: builtin/clone.c:133 msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323 +#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318 msgid "revision" msgstr "revision" -#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215 +#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" -#: builtin/clone.c:133 builtin/submodule--helper.c:1843 -#: builtin/submodule--helper.c:2352 +#: builtin/clone.c:137 builtin/submodule--helper.c:1844 +#: builtin/submodule--helper.c:2353 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:135 +#: builtin/clone.c:139 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "klona inga taggar och gör att senare hämtningar inte följer dem" -#: builtin/clone.c:137 +#: builtin/clone.c:141 msgid "any cloned submodules will be shallow" msgstr "klonade undermoduler kommer vara grunda" -#: builtin/clone.c:138 builtin/init-db.c:561 +#: builtin/clone.c:142 builtin/init-db.c:547 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:139 builtin/init-db.c:562 +#: builtin/clone.c:143 builtin/init-db.c:548 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:140 +#: builtin/clone.c:144 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:141 +#: builtin/clone.c:145 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 #: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "serverspecifik" -#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 #: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "" "inget att checka in\n" "flagga att sända" -#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234 +#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 #: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237 +#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 #: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" -#: builtin/clone.c:150 +#: builtin/clone.c:154 msgid "any cloned submodules will use their remote-tracking branch" msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren" -#: builtin/clone.c:152 +#: builtin/clone.c:156 msgid "initialize sparse-checkout file to include only files at root" msgstr "initiera sparse-checkout-filen till att bara inkludera filer i roten" -#: builtin/clone.c:288 +#: builtin/clone.c:292 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12761,42 +12929,42 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog på kommandoraden" -#: builtin/clone.c:341 +#: builtin/clone.c:345 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Kan inte skapa suppleant för \"%s\": %s\n" -#: builtin/clone.c:414 +#: builtin/clone.c:418 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:432 +#: builtin/clone.c:436 #, c-format msgid "failed to start iterator over '%s'" msgstr "misslyckades starta iterator över \"%s\"" -#: builtin/clone.c:463 +#: builtin/clone.c:467 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:467 +#: builtin/clone.c:471 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:472 +#: builtin/clone.c:476 #, c-format msgid "failed to iterate over '%s'" msgstr "misslyckades iterera över \"%s\"" -#: builtin/clone.c:499 +#: builtin/clone.c:503 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:513 +#: builtin/clone.c:517 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12806,147 +12974,147 @@ msgstr "" "Du kan inspektera det som checkades ut med \"git status\"\n" "och försöka med \"git restore -source=HEAD :/\"\n" -#: builtin/clone.c:590 +#: builtin/clone.c:594 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." -#: builtin/clone.c:709 +#: builtin/clone.c:713 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:757 +#: builtin/clone.c:761 msgid "failed to initialize sparse-checkout" msgstr "misslyckades initiera sparse-checkout" -#: builtin/clone.c:780 +#: builtin/clone.c:784 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" -#: builtin/clone.c:812 +#: builtin/clone.c:816 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:887 +#: builtin/clone.c:894 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:950 +#: builtin/clone.c:957 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:952 +#: builtin/clone.c:959 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:993 builtin/receive-pack.c:2493 +#: builtin/clone.c:1001 builtin/receive-pack.c:2491 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:997 +#: builtin/clone.c:1005 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:1010 +#: builtin/clone.c:1018 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:1013 +#: builtin/clone.c:1021 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:1026 +#: builtin/clone.c:1035 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:1030 builtin/fetch.c:1951 +#: builtin/clone.c:1039 builtin/fetch.c:2011 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:1040 +#: builtin/clone.c:1049 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:1046 +#: builtin/clone.c:1055 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "arkivsökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:1060 +#: builtin/clone.c:1069 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271 -#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 +#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:1080 +#: builtin/clone.c:1089 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:1100 +#: builtin/clone.c:1109 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:1102 +#: builtin/clone.c:1111 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1126 +#: builtin/clone.c:1135 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" "clone --recursive är inte kompatibel med --reference och --reference-if-able" -#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705 +#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" -#: builtin/clone.c:1211 +#: builtin/clone.c:1229 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1213 +#: builtin/clone.c:1231 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1215 +#: builtin/clone.c:1233 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1217 +#: builtin/clone.c:1235 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1220 +#: builtin/clone.c:1240 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1225 +#: builtin/clone.c:1245 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1315 builtin/clone.c:1323 +#: builtin/clone.c:1337 builtin/clone.c:1345 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1326 +#: builtin/clone.c:1348 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -12963,20 +13131,20 @@ msgid "layout to use" msgstr "utseende att använda" #: builtin/column.c:30 -msgid "Maximum width" -msgstr "Maximal bredd" +msgid "maximum width" +msgstr "maximal bredd" #: builtin/column.c:31 -msgid "Padding space on left border" -msgstr "Spaltfyllnad i vänsterkanten" +msgid "padding space on left border" +msgstr "spaltfyllnad i vänsterkanten" #: builtin/column.c:32 -msgid "Padding space on right border" -msgstr "Spaltfyllnad i högerkanten" +msgid "padding space on right border" +msgstr "spaltfyllnad i högerkanten" #: builtin/column.c:33 -msgid "Padding space between columns" -msgstr "Spaltfyllnad mellan spalter" +msgid "padding space between columns" +msgstr "spaltfyllnad mellan spalter" #: builtin/column.c:51 msgid "--command must be the first argument" @@ -13004,7 +13172,7 @@ msgid "could not find object directory matching %s" msgstr "kunde inte hitta objektkatalog för %s" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768 +#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776 msgid "dir" msgstr "kat" @@ -13099,7 +13267,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "duplicerad förälder %s ignorerades" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559 #, c-format msgid "not a valid object name %s" msgstr "objektnamnet är inte giltigt: %s" @@ -13127,13 +13295,13 @@ msgstr "förälder" msgid "id of a parent commit object" msgstr "id på ett förälderincheckningsobjekt" -#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537 -#: builtin/tag.c:445 +#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605 +#: builtin/tag.c:456 msgid "message" msgstr "meddelande" -#: builtin/commit-tree.c:115 builtin/commit.c:1504 +#: builtin/commit-tree.c:115 builtin/commit.c:1614 msgid "commit message" msgstr "incheckningsmeddelande" @@ -13141,7 +13309,7 @@ msgstr "incheckningsmeddelande" msgid "read commit log message from file" msgstr "läs incheckningsloggmeddelande från fil" -#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299 +#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG-signera incheckning" @@ -13216,73 +13384,73 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c:312 +#: builtin/commit.c:324 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:348 +#: builtin/commit.c:360 msgid "--pathspec-from-file with -a does not make sense" msgstr "--pathspec-from-file med -a ger ingen mening" -#: builtin/commit.c:361 +#: builtin/commit.c:374 msgid "No paths with --include/--only does not make sense." msgstr "Du måste ange sökvägar tillsammans med --include/--only." -#: builtin/commit.c:373 +#: builtin/commit.c:386 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:382 +#: builtin/commit.c:395 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:397 +#: builtin/commit.c:410 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:399 +#: builtin/commit.c:412 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 +#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:476 +#: builtin/commit.c:489 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:478 +#: builtin/commit.c:491 msgid "cannot do a partial commit during a cherry-pick." msgstr "kan inte utföra en delvis incheckning under en cherry-pick." -#: builtin/commit.c:480 +#: builtin/commit.c:493 msgid "cannot do a partial commit during a rebase." msgstr "kan inte utföra en delvis incheckning under en ombasering." -#: builtin/commit.c:488 +#: builtin/commit.c:501 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:507 +#: builtin/commit.c:520 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:605 +#: builtin/commit.c:618 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:607 +#: builtin/commit.c:620 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:626 +#: builtin/commit.c:639 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:679 +#: builtin/commit.c:692 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -13290,38 +13458,43 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 +#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:729 builtin/shortlog.c:413 +#: builtin/commit.c:758 builtin/shortlog.c:413 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:731 +#: builtin/commit.c:760 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:735 +#: builtin/commit.c:764 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:766 builtin/commit.c:782 +#: builtin/commit.c:801 +#, c-format +msgid "cannot combine -m with --fixup:%s" +msgstr "kan inte kombinera -m med --fixup:%s" + +#: builtin/commit.c:813 builtin/commit.c:829 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:773 +#: builtin/commit.c:820 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:833 +#: builtin/commit.c:880 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:853 +#: builtin/commit.c:900 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -13335,7 +13508,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "och försöker igen.\n" -#: builtin/commit.c:858 +#: builtin/commit.c:905 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13349,7 +13522,7 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "och försöker igen.\n" -#: builtin/commit.c:868 +#: builtin/commit.c:915 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13359,7 +13532,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:876 +#: builtin/commit.c:923 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13370,144 +13543,175 @@ msgstr "" "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:893 +#: builtin/commit.c:940 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:901 +#: builtin/commit.c:948 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:908 +#: builtin/commit.c:955 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:926 +#: builtin/commit.c:973 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:997 +#: builtin/commit.c:1018 +msgid "unable to pass trailers to --trailers" +msgstr "kan inte sända släprader till --trailers" + +#: builtin/commit.c:1058 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:1011 builtin/tag.c:308 +#: builtin/commit.c:1072 builtin/tag.c:319 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1116 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' är inte 'Namn <epost>' och motsvarar ingen befintlig författare" -#: builtin/commit.c:1069 +#: builtin/commit.c:1130 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ogiltigt ignorerat läge \"%s\"" -#: builtin/commit.c:1087 builtin/commit.c:1331 +#: builtin/commit.c:1148 builtin/commit.c:1441 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1127 +#: builtin/commit.c:1188 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1171 +#: builtin/commit.c:1219 +msgid "You are in the middle of a merge -- cannot reword." +msgstr "Du är i mitten av en sammanslagning -- kan inte omformulera." + +#: builtin/commit.c:1221 +msgid "You are in the middle of a cherry-pick -- cannot reword." +msgstr "Du är i mitten av en cherry-pick -- kan inte omformulera." + +#: builtin/commit.c:1224 +#, c-format +msgid "cannot combine reword option of --fixup with path '%s'" +msgstr "" +"kan inte kombinera omformuleringsflaggor för --fixup med sökvägen \"%s\"" + +#: builtin/commit.c:1226 +msgid "" +"reword option of --fixup is mutually exclusive with --patch/--interactive/--" +"all/--include/--only" +msgstr "" +"omformuleringsflaggan i --fixup är ömsesidigt uteslutande med --patch/--" +"interactive/--all/--include/--only" + +#: builtin/commit.c:1245 msgid "Using both --reset-author and --author does not make sense" msgstr "Kan inte använda både --reset-author och --author" -#: builtin/commit.c:1180 +#: builtin/commit.c:1254 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1183 +#: builtin/commit.c:1257 msgid "You are in the middle of a merge -- cannot amend." msgstr "Du är i mitten av en sammanslagning -- kan inte utöka." -#: builtin/commit.c:1185 +#: builtin/commit.c:1259 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Du är i mitten av en cherry-pick -- kan inte utöka." -#: builtin/commit.c:1187 +#: builtin/commit.c:1261 msgid "You are in the middle of a rebase -- cannot amend." msgstr "Du är i mitten av en ombasering -- kan inte utöka." -#: builtin/commit.c:1190 +#: builtin/commit.c:1264 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1200 +#: builtin/commit.c:1274 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Endast en av -c/-C/-F/--fixup kan användas." -#: builtin/commit.c:1202 +#: builtin/commit.c:1276 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." -#: builtin/commit.c:1211 +#: builtin/commit.c:1285 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author kan endast användas med -C, -c eller --amend." -#: builtin/commit.c:1229 +#: builtin/commit.c:1303 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Endast en av --include/--only/--all/--interactive/--patch kan användas." -#: builtin/commit.c:1235 +#: builtin/commit.c:1331 +#, c-format +msgid "unknown option: --fixup=%s:%s" +msgstr "okänd flagga: --fixup=%s:%s" + +#: builtin/commit.c:1345 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "sökvägarna \"%s ...\" med -a ger ingen mening" -#: builtin/commit.c:1366 builtin/commit.c:1527 +#: builtin/commit.c:1476 builtin/commit.c:1642 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1368 builtin/commit.c:1529 +#: builtin/commit.c:1478 builtin/commit.c:1644 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1370 +#: builtin/commit.c:1480 msgid "show stash information" msgstr "visa information om stash" -#: builtin/commit.c:1372 builtin/commit.c:1531 +#: builtin/commit.c:1482 builtin/commit.c:1646 msgid "compute full ahead/behind values" msgstr "beräkna fullständiga före-/efter-värden" -#: builtin/commit.c:1374 +#: builtin/commit.c:1484 msgid "version" msgstr "version" -#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 -#: builtin/worktree.c:679 +#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560 +#: builtin/worktree.c:681 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1377 builtin/commit.c:1535 +#: builtin/commit.c:1487 builtin/commit.c:1650 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1380 builtin/commit.c:1538 +#: builtin/commit.c:1490 builtin/commit.c:1653 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656 #: builtin/fast-export.c:1198 builtin/fast-export.c:1201 -#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336 +#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 msgid "mode" msgstr "läge" -#: builtin/commit.c:1383 builtin/commit.c:1541 +#: builtin/commit.c:1493 builtin/commit.c:1656 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "visa ospårade filer, valfria lägen: all, normal, no. (Standard: all)" -#: builtin/commit.c:1387 +#: builtin/commit.c:1497 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13515,11 +13719,11 @@ msgstr "" "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: " "traditional)" -#: builtin/commit.c:1389 parse-options.h:192 +#: builtin/commit.c:1499 parse-options.h:193 msgid "when" msgstr "när" -#: builtin/commit.c:1390 +#: builtin/commit.c:1500 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -13527,172 +13731,194 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1392 +#: builtin/commit.c:1502 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1393 +#: builtin/commit.c:1503 msgid "do not detect renames" msgstr "detektera inte namnändringar" -#: builtin/commit.c:1395 +#: builtin/commit.c:1505 msgid "detect renames, optionally set similarity index" msgstr "detektera namnändringar, möjligen sätt likhetsindex" -#: builtin/commit.c:1415 +#: builtin/commit.c:1525 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "Kombinationen av argument för ignorerade och ospårade filer stöds ej" -#: builtin/commit.c:1497 +#: builtin/commit.c:1607 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1498 +#: builtin/commit.c:1608 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1500 +#: builtin/commit.c:1610 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447 +#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1502 +#: builtin/commit.c:1612 msgid "author" msgstr "författare" -#: builtin/commit.c:1502 +#: builtin/commit.c:1612 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1503 builtin/gc.c:550 +#: builtin/commit.c:1613 builtin/gc.c:550 msgid "date" msgstr "datum" -#: builtin/commit.c:1503 +#: builtin/commit.c:1613 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 -#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90 +#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622 +#: parse-options.h:329 ref-filter.h:90 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1505 +#: builtin/commit.c:1615 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1506 +#: builtin/commit.c:1616 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1507 -msgid "use autosquash formatted message to fixup specified commit" +#. TRANSLATORS: Leave "[(amend|reword):]" as-is, +#. and only translate <commit>. +#. +#: builtin/commit.c:1621 +msgid "[(amend|reword):]commit" +msgstr "[(amend|reword):]incheckning" + +#: builtin/commit.c:1621 +msgid "" +"use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" -"använd autosquash-formaterat meddelande för att fixa angiven incheckning" +"använd autosquash-formaterat meddelande för att fixa/omformulera angiven " +"incheckning" -#: builtin/commit.c:1508 +#: builtin/commit.c:1622 msgid "use autosquash formatted message to squash specified commit" msgstr "" "använd autosquash-formaterat meddelande för att slå ihop med angiven " "incheckning" -#: builtin/commit.c:1509 +#: builtin/commit.c:1623 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)" -#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302 +#: builtin/commit.c:1624 builtin/interpret-trailers.c:111 +msgid "trailer" +msgstr "släprad" + +#: builtin/commit.c:1624 +msgid "add custom trailer(s)" +msgstr "använd skräddarsydd(a) släprad(er)" + +#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "lägg till Signed-off-by-släprad" -#: builtin/commit.c:1511 +#: builtin/commit.c:1626 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1512 +#: builtin/commit.c:1627 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1514 +#: builtin/commit.c:1629 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1519 +#: builtin/commit.c:1634 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1520 +#: builtin/commit.c:1635 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1521 +#: builtin/commit.c:1636 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1522 +#: builtin/commit.c:1637 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1523 +#: builtin/commit.c:1638 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1524 +#: builtin/commit.c:1639 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1525 +#: builtin/commit.c:1640 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1526 +#: builtin/commit.c:1641 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1539 +#: builtin/commit.c:1654 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1540 +#: builtin/commit.c:1655 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1547 +#: builtin/commit.c:1662 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1549 +#: builtin/commit.c:1664 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1622 +#: builtin/commit.c:1737 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1629 +#: builtin/commit.c:1744 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1650 +#: builtin/commit.c:1765 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1657 +#: builtin/commit.c:1772 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1662 +#: builtin/commit.c:1777 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1696 +#: builtin/commit.c:1788 +#, c-format +msgid "Aborting commit due to empty commit message body.\n" +msgstr "Avbryter på grund av tom incheckningsmeddelandekropp.\n" + +#: builtin/commit.c:1824 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -14035,7 +14261,7 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" -#: builtin/credential-cache--daemon.c:226 +#: builtin/credential-cache--daemon.c:227 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -14048,11 +14274,11 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: builtin/credential-cache--daemon.c:275 +#: builtin/credential-cache--daemon.c:276 msgid "print debugging messages to stderr" msgstr "skriv felsökningsmeddelanden på standard fel" -#: builtin/credential-cache--daemon.c:315 +#: builtin/credential-cache--daemon.c:316 msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "" "\"credential-cache--daemon\" ej tillgänglig; stöd för unix-uttag saknas" @@ -14258,7 +14484,7 @@ msgstr "%s...%s: ingen sammanslagningsbas" msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:532 builtin/grep.c:682 +#: builtin/diff.c:532 builtin/grep.c:684 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." @@ -14278,32 +14504,32 @@ msgstr "ej hanterat objekt \"%s\" angavs." msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s: flera sammanslagningsbaser, använder %s" -#: builtin/difftool.c:30 +#: builtin/difftool.c:31 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]" -#: builtin/difftool.c:260 +#: builtin/difftool.c:261 #, c-format msgid "failed: %d" msgstr "misslyckades: %d" -#: builtin/difftool.c:302 +#: builtin/difftool.c:303 #, c-format msgid "could not read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/difftool.c:304 +#: builtin/difftool.c:305 #, c-format msgid "could not read symlink file %s" msgstr "kunde inte läsa symbolisk länk-fil %s" -#: builtin/difftool.c:312 +#: builtin/difftool.c:313 #, c-format msgid "could not read object %s for symlink %s" msgstr "kunde inte läsa objektet %s för symboliska länken %s" -#: builtin/difftool.c:412 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -14311,53 +14537,53 @@ msgstr "" "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n" "katalogdiffläge (\"-d\" och \"--dir-diff\")." -#: builtin/difftool.c:633 +#: builtin/difftool.c:637 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "bägge filerna ändrade: \"%s\" och \"%s\"." -#: builtin/difftool.c:635 +#: builtin/difftool.c:639 msgid "working tree file has been left." msgstr "filen i arbetskatalogen lämnades kvar." -#: builtin/difftool.c:646 +#: builtin/difftool.c:650 #, c-format msgid "temporary files exist in '%s'." msgstr "temporära filer finns i \"%s\"." -#: builtin/difftool.c:647 +#: builtin/difftool.c:651 msgid "you may want to cleanup or recover these." msgstr "du kanske vill städa eller rädda dem." -#: builtin/difftool.c:696 +#: builtin/difftool.c:700 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "använd \"diff.guitool\" istället för \"diff.tool\"" -#: builtin/difftool.c:698 +#: builtin/difftool.c:702 msgid "perform a full-directory diff" msgstr "utför diff för hela katalogen" -#: builtin/difftool.c:700 +#: builtin/difftool.c:704 msgid "do not prompt before launching a diff tool" msgstr "fråga inte vid start av diff-verktyg" -#: builtin/difftool.c:705 +#: builtin/difftool.c:709 msgid "use symlinks in dir-diff mode" msgstr "använd symboliska länkar i katalogdiffläge" -#: builtin/difftool.c:706 +#: builtin/difftool.c:710 msgid "tool" msgstr "verktyg" -#: builtin/difftool.c:707 +#: builtin/difftool.c:711 msgid "use the specified diff tool" msgstr "använd angivet diff-verktyg" -#: builtin/difftool.c:709 +#: builtin/difftool.c:713 msgid "print a list of diff tools that may be used with `--tool`" msgstr "visa en lista över diff-verktyg som kan användas med \"--tool\"" -#: builtin/difftool.c:712 +#: builtin/difftool.c:716 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -14365,31 +14591,31 @@ msgstr "" "låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde " "skilt från noll" -#: builtin/difftool.c:715 +#: builtin/difftool.c:719 msgid "specify a custom command for viewing diffs" msgstr "ange eget kommando för att visa diffar" -#: builtin/difftool.c:716 +#: builtin/difftool.c:720 msgid "passed to `diff`" msgstr "sändes till \"diff\"" -#: builtin/difftool.c:731 +#: builtin/difftool.c:735 msgid "difftool requires worktree or --no-index" msgstr "difftool kräver en arbetskatalog eller --no-index" -#: builtin/difftool.c:738 +#: builtin/difftool.c:742 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff är inkompatibelt med --no-index" -#: builtin/difftool.c:741 +#: builtin/difftool.c:745 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande" -#: builtin/difftool.c:749 +#: builtin/difftool.c:753 msgid "no <tool> given for --tool=<tool>" msgstr "inget <verktyg> angavs för --tool=<verktyg>" -#: builtin/difftool.c:756 +#: builtin/difftool.c:760 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs för --extcmd=<kommando>" @@ -14481,7 +14707,7 @@ msgstr "använd done-funktionen för att avsluta strömmen" msgid "skip output of blob data" msgstr "hoppa över skrivning av blob-data" -#: builtin/fast-export.c:1222 builtin/log.c:1815 +#: builtin/fast-export.c:1222 builtin/log.c:1823 msgid "refspec" msgstr "referensspecifikation" @@ -14571,97 +14797,103 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:120 +#: builtin/fetch.c:122 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel kan inte vara negativt" -#: builtin/fetch.c:143 builtin/pull.c:185 +#: builtin/fetch.c:145 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:145 builtin/pull.c:245 +#: builtin/fetch.c:147 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "ställ in uppström för git pull/fetch" -#: builtin/fetch.c:147 builtin/pull.c:188 +#: builtin/fetch.c:149 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" -#: builtin/fetch.c:149 +#: builtin/fetch.c:151 msgid "use atomic transaction to update references" msgstr "använd atomiska transaktioner för att uppdatera referenser" -#: builtin/fetch.c:151 builtin/pull.c:191 +#: builtin/fetch.c:153 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:152 +#: builtin/fetch.c:154 msgid "force overwrite of local reference" msgstr "tvinga överskrivning av lokal referens" -#: builtin/fetch.c:154 +#: builtin/fetch.c:156 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:156 builtin/pull.c:195 +#: builtin/fetch.c:158 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:158 +#: builtin/fetch.c:160 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:160 +#: builtin/fetch.c:162 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:162 builtin/pull.c:198 +#: builtin/fetch.c:164 +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "" +"modifiera referensspecifikationen så att alla referenser hamnar i refs/" +"prefetch/" + +#: builtin/fetch.c:166 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:164 +#: builtin/fetch.c:168 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar" -#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122 +#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:166 +#: builtin/fetch.c:170 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:171 +#: builtin/fetch.c:175 msgid "write fetched references to the FETCH_HEAD file" msgstr "skriv hämtade referenser till FETCH_HEAD-filen" -#: builtin/fetch.c:172 builtin/pull.c:206 +#: builtin/fetch.c:176 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:174 +#: builtin/fetch.c:178 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209 +#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:179 builtin/pull.c:212 +#: builtin/fetch.c:183 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "fördjupa historik för grund klon baserad på tid" -#: builtin/fetch.c:185 builtin/pull.c:221 +#: builtin/fetch.c:189 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:188 +#: builtin/fetch.c:192 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:191 +#: builtin/fetch.c:195 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -14669,98 +14901,102 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:195 builtin/pull.c:224 +#: builtin/fetch.c:199 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:196 builtin/pull.c:226 +#: builtin/fetch.c:200 builtin/pull.c:226 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:197 builtin/pull.c:227 +#: builtin/fetch.c:201 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:204 builtin/pull.c:240 +#: builtin/fetch.c:208 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "rapportera att vi bara har objekt nåbara från detta objektet" -#: builtin/fetch.c:207 builtin/fetch.c:209 +#: builtin/fetch.c:210 +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "hämta inte paketfil; skriv istället förfäder till förhandlingstips" + +#: builtin/fetch.c:213 builtin/fetch.c:215 msgid "run 'maintenance --auto' after fetching" msgstr "kör \"maintenance --auto\" efter hämtning" -#: builtin/fetch.c:211 builtin/pull.c:243 +#: builtin/fetch.c:217 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar" -#: builtin/fetch.c:213 +#: builtin/fetch.c:219 msgid "write the commit-graph after fetching" msgstr "skriv incheckingsgrafen efter hämtning" -#: builtin/fetch.c:215 +#: builtin/fetch.c:221 msgid "accept refspecs from stdin" msgstr "ta emot referenser från standard in" -#: builtin/fetch.c:526 +#: builtin/fetch.c:586 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:697 +#: builtin/fetch.c:757 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s" -#: builtin/fetch.c:796 +#: builtin/fetch.c:856 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:800 +#: builtin/fetch.c:860 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901 +#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:814 +#: builtin/fetch.c:874 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:824 +#: builtin/fetch.c:884 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884 -#: builtin/fetch.c:896 +#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944 +#: builtin/fetch.c:956 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:829 +#: builtin/fetch.c:889 msgid "would clobber existing tag" msgstr "skulle skriva över befintlig tagg" -#: builtin/fetch.c:851 +#: builtin/fetch.c:911 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:854 +#: builtin/fetch.c:914 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:857 +#: builtin/fetch.c:917 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:896 +#: builtin/fetch.c:956 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:901 +#: builtin/fetch.c:961 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:1005 +#: builtin/fetch.c:1065 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -14771,7 +15007,7 @@ msgstr "" "av. För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n" "\"git config fetch.showForcedUpdates true\"." -#: builtin/fetch.c:1009 +#: builtin/fetch.c:1069 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14784,22 +15020,22 @@ msgstr "" "showForcedUpdates\n" "false\" för att undvika testet.\n" -#: builtin/fetch.c:1041 +#: builtin/fetch.c:1101 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s sände inte alla nödvändiga objekt\n" -#: builtin/fetch.c:1069 +#: builtin/fetch.c:1129 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "avvisa %s då grunda rötter inte kan uppdateras" -#: builtin/fetch.c:1146 builtin/fetch.c:1297 +#: builtin/fetch.c:1206 builtin/fetch.c:1357 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1228 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14808,56 +15044,56 @@ msgstr "" "vissa lokala referenser kunde inte uppdateras; testa att köra\n" " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" -#: builtin/fetch.c:1267 +#: builtin/fetch.c:1327 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:1268 +#: builtin/fetch.c:1328 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:1300 +#: builtin/fetch.c:1360 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:1301 builtin/remote.c:1118 +#: builtin/fetch.c:1361 builtin/remote.c:1118 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:1324 +#: builtin/fetch.c:1384 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv" -#: builtin/fetch.c:1343 +#: builtin/fetch.c:1403 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" -#: builtin/fetch.c:1346 +#: builtin/fetch.c:1406 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1558 +#: builtin/fetch.c:1618 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream" -#: builtin/fetch.c:1573 +#: builtin/fetch.c:1633 msgid "not setting upstream for a remote remote-tracking branch" msgstr "ställer inte in uppströmsgren för en fjärrspårande gren på fjärren" -#: builtin/fetch.c:1575 +#: builtin/fetch.c:1635 msgid "not setting upstream for a remote tag" msgstr "ställer inte in uppström för en fjärrtag" -#: builtin/fetch.c:1577 +#: builtin/fetch.c:1637 msgid "unknown branch type" msgstr "okänd grentyp" -#: builtin/fetch.c:1579 +#: builtin/fetch.c:1639 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -14865,22 +15101,22 @@ msgstr "" "hittade ingen källgren.\n" "du måste ange exakt en gren med flaggan --set-upstream." -#: builtin/fetch.c:1708 builtin/fetch.c:1771 +#: builtin/fetch.c:1768 builtin/fetch.c:1831 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101 +#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1790 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "kunde inte hämta \"%s\" (felkod: %d)\n" -#: builtin/fetch.c:1834 +#: builtin/fetch.c:1894 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14888,44 +15124,52 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar ska hämtas från." -#: builtin/fetch.c:1870 +#: builtin/fetch.c:1930 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1935 +#: builtin/fetch.c:1995 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1937 +#: builtin/fetch.c:1997 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1942 +#: builtin/fetch.c:2002 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1944 +#: builtin/fetch.c:2004 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1961 +#: builtin/fetch.c:2021 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1963 +#: builtin/fetch.c:2023 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1972 +#: builtin/fetch.c:2032 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1979 +#: builtin/fetch.c:2039 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" -#: builtin/fetch.c:1997 +#: builtin/fetch.c:2055 +msgid "must supply remote when using --negotiate-only" +msgstr "måste ange fjärr när --negotiate-only anges" + +#: builtin/fetch.c:2060 +msgid "Protocol does not support --negotiate-only, exiting." +msgstr "Protokollet stöder inte --negotiate-only, avslutar." + +#: builtin/fetch.c:2079 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -14933,11 +15177,11 @@ msgstr "" "--filter kan endast användas med fjärren konfigurerad i extensions." "partialclone" -#: builtin/fetch.c:2001 +#: builtin/fetch.c:2083 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic kan bara användas vid hämtning från en fjärr" -#: builtin/fetch.c:2005 +#: builtin/fetch.c:2087 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin kan bara användas vid hämtning fårn en fjärr" @@ -14985,47 +15229,47 @@ msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "" "git for-each-ref [--contains [<incheckning>]] [--no-contains [<incheckning>]]" -#: builtin/for-each-ref.c:28 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for shells" msgstr "citera platshållare passande för skal" -#: builtin/for-each-ref.c:30 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for perl" msgstr "citera platshållare passande för perl" -#: builtin/for-each-ref.c:32 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for python" msgstr "citera platshållare passande för python" -#: builtin/for-each-ref.c:34 +#: builtin/for-each-ref.c:36 msgid "quote placeholders suitably for Tcl" msgstr "citera platshållare passande för Tcl" -#: builtin/for-each-ref.c:37 +#: builtin/for-each-ref.c:39 msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:39 builtin/tag.c:472 +#: builtin/for-each-ref.c:41 builtin/tag.c:483 msgid "respect format colors" msgstr "använd formatfärger" -#: builtin/for-each-ref.c:42 +#: builtin/for-each-ref.c:44 msgid "print only refs which points at the given object" msgstr "visa endast referenser som pekar på objektet" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:46 msgid "print only refs that are merged" msgstr "visa endast referenser som slagits samman" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:47 msgid "print only refs that are not merged" msgstr "visa endast referenser som ej slagits samman" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:48 msgid "print only refs which contain the commit" msgstr "visa endast referenser som innehåller incheckningen" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:49 msgid "print only refs which don't contain the commit" msgstr "visa endast referenser som inte innehåller incheckningen" @@ -15045,32 +15289,32 @@ msgstr "konfigurationsnyckel som innehåller en lista över arkivsökvägar" msgid "missing --config=<config>" msgstr "saknar --config=<konfig>" -#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131 +#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128 msgid "unknown" msgstr "okänd" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:83 builtin/fsck.c:103 +#: builtin/fsck.c:78 builtin/fsck.c:100 #, c-format msgid "error in %s %s: %s" msgstr "fel i %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:97 +#: builtin/fsck.c:94 #, c-format msgid "warning in %s %s: %s" msgstr "varning i %s %s: %s" -#: builtin/fsck.c:126 builtin/fsck.c:129 +#: builtin/fsck.c:123 builtin/fsck.c:126 #, c-format msgid "broken link from %7s %s" msgstr "trasig länk från %7s %s" -#: builtin/fsck.c:138 +#: builtin/fsck.c:135 msgid "wrong object type in link" msgstr "fel objekttyp i länk" -#: builtin/fsck.c:154 +#: builtin/fsck.c:151 #, c-format msgid "" "broken link from %7s %s\n" @@ -15079,215 +15323,215 @@ msgstr "" "trasig länk från %7s %s\n" " till %7s %s" -#: builtin/fsck.c:265 +#: builtin/fsck.c:263 #, c-format msgid "missing %s %s" msgstr "saknat %s %s" -#: builtin/fsck.c:292 +#: builtin/fsck.c:290 #, c-format msgid "unreachable %s %s" msgstr "onåbart %s %s" -#: builtin/fsck.c:312 +#: builtin/fsck.c:310 #, c-format msgid "dangling %s %s" msgstr "hängande %s %s" -#: builtin/fsck.c:322 +#: builtin/fsck.c:320 msgid "could not create lost-found" msgstr "kunde inte skapa lost-found" -#: builtin/fsck.c:333 +#: builtin/fsck.c:331 #, c-format msgid "could not finish '%s'" msgstr "kunde inte avsluta \"%s\"" -#: builtin/fsck.c:350 +#: builtin/fsck.c:348 #, c-format msgid "Checking %s" msgstr "Kontrollerar %s" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:388 +#: builtin/fsck.c:386 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Kontrollerar konnektivitet (%d objekt)" -#: builtin/fsck.c:407 +#: builtin/fsck.c:405 #, c-format msgid "Checking %s %s" msgstr "Kontrollerar %s %s" -#: builtin/fsck.c:412 +#: builtin/fsck.c:410 msgid "broken links" msgstr "trasiga länkar" -#: builtin/fsck.c:421 +#: builtin/fsck.c:419 #, c-format msgid "root %s" msgstr "roten %s" -#: builtin/fsck.c:429 +#: builtin/fsck.c:427 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "taggad %s %s (%s) i %s" -#: builtin/fsck.c:458 +#: builtin/fsck.c:456 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objekt trasigt eller saknas" -#: builtin/fsck.c:483 +#: builtin/fsck.c:481 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: ogiltig reflog-post %s" -#: builtin/fsck.c:497 +#: builtin/fsck.c:495 #, c-format msgid "Checking reflog %s->%s" msgstr "Kontrollerar reflog %s->%s" -#: builtin/fsck.c:531 +#: builtin/fsck.c:529 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: ogiltig sha1-pekare %s" -#: builtin/fsck.c:538 +#: builtin/fsck.c:536 #, c-format msgid "%s: not a commit" msgstr "%s: inte en incheckning!" -#: builtin/fsck.c:592 +#: builtin/fsck.c:590 msgid "notice: No default references" msgstr "obs: Inga förvalda referenser" -#: builtin/fsck.c:607 +#: builtin/fsck.c:605 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objektet trasigt eller saknas: %s" -#: builtin/fsck.c:620 +#: builtin/fsck.c:618 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: objektet kunde inte tolkas: %s" -#: builtin/fsck.c:640 +#: builtin/fsck.c:638 #, c-format msgid "bad sha1 file: %s" msgstr "ogiltig sha1-fil: %s" -#: builtin/fsck.c:655 +#: builtin/fsck.c:653 msgid "Checking object directory" msgstr "Kontrollerar objektkatalog" -#: builtin/fsck.c:658 +#: builtin/fsck.c:656 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:673 +#: builtin/fsck.c:671 #, c-format msgid "Checking %s link" msgstr "Kontrollerar %s-länk" -#: builtin/fsck.c:678 builtin/index-pack.c:865 +#: builtin/fsck.c:676 builtin/index-pack.c:866 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/fsck.c:685 +#: builtin/fsck.c:683 #, c-format msgid "%s points to something strange (%s)" msgstr "%s pekar på något konstigt (%s)" -#: builtin/fsck.c:691 +#: builtin/fsck.c:689 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: frånkopplat HEAD pekar på ingenting" -#: builtin/fsck.c:695 +#: builtin/fsck.c:693 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "obs: %s pekar på en ofödd gren (%s)" -#: builtin/fsck.c:707 +#: builtin/fsck.c:705 msgid "Checking cache tree" msgstr "Kontrollerar cacheträd" -#: builtin/fsck.c:712 +#: builtin/fsck.c:710 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: ogiltig sha1-pekare i cacheträd" -#: builtin/fsck.c:721 +#: builtin/fsck.c:719 msgid "non-tree in cache-tree" msgstr "icke-träd i cacheträd" -#: builtin/fsck.c:752 +#: builtin/fsck.c:750 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:758 +#: builtin/fsck.c:756 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:759 +#: builtin/fsck.c:757 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:760 +#: builtin/fsck.c:758 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:761 +#: builtin/fsck.c:759 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:762 +#: builtin/fsck.c:760 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:763 +#: builtin/fsck.c:761 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:764 +#: builtin/fsck.c:762 msgid "also consider packs and alternate objects" msgstr "ta även hänsyn till paket och supplerande objekt" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:765 +#: builtin/fsck.c:763 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:766 builtin/mktag.c:78 +#: builtin/fsck.c:764 builtin/mktag.c:75 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:768 +#: builtin/fsck.c:766 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:769 builtin/prune.c:134 +#: builtin/fsck.c:767 builtin/prune.c:134 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:770 +#: builtin/fsck.c:768 msgid "show verbose names for reachable objects" msgstr "visa ordrika namn för nåbara objekt" -#: builtin/fsck.c:829 builtin/index-pack.c:261 +#: builtin/fsck.c:827 builtin/index-pack.c:262 msgid "Checking objects" msgstr "Kontrollerar objekt" -#: builtin/fsck.c:857 +#: builtin/fsck.c:855 #, c-format msgid "%s: object missing" msgstr "%s: objekt saknas" -#: builtin/fsck.c:868 +#: builtin/fsck.c:866 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "ogiltig parameter: förväntade sha1, fick \"%s\"" @@ -15306,12 +15550,12 @@ msgstr "Misslyckades ta status (fstat) på %s: %s" msgid "failed to parse '%s' value '%s'" msgstr "misslyckades tolka \"%s\" värde \"%s\"" -#: builtin/gc.c:487 builtin/init-db.c:58 +#: builtin/gc.c:487 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562 +#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" @@ -15410,146 +15654,146 @@ msgstr "okänt argument för --schedule, %s" msgid "failed to write commit-graph" msgstr "kunde inte skriva incheckningsgraf" -#: builtin/gc.c:914 -msgid "failed to fill remotes" -msgstr "kunde inte fylla fjärrar" +#: builtin/gc.c:905 +msgid "failed to prefetch remotes" +msgstr "kunde inte förhämta fjärrar" -#: builtin/gc.c:1037 +#: builtin/gc.c:1022 msgid "failed to start 'git pack-objects' process" msgstr "kunde inte starta \"git pack-objects\"-process" -#: builtin/gc.c:1054 +#: builtin/gc.c:1039 msgid "failed to finish 'git pack-objects' process" msgstr "kunde inte avsluta \"git pack-objects\"-process" -#: builtin/gc.c:1106 +#: builtin/gc.c:1091 msgid "failed to write multi-pack-index" msgstr "kunde inte skriva multi-pack-index" -#: builtin/gc.c:1124 +#: builtin/gc.c:1109 msgid "'git multi-pack-index expire' failed" msgstr "\"git multi-pack-index expire\" misslyckades" -#: builtin/gc.c:1185 +#: builtin/gc.c:1170 msgid "'git multi-pack-index repack' failed" msgstr "\"git multi-pack-index repack\" misslyckades" -#: builtin/gc.c:1194 +#: builtin/gc.c:1179 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" "hoppar över \"incremental-repack\"-uppgift eftersom core.multiPackIndex är " "inaktiverat" -#: builtin/gc.c:1298 +#: builtin/gc.c:1283 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "låsfilen \"%s\" finns, hoppar över underhåll" -#: builtin/gc.c:1328 +#: builtin/gc.c:1313 #, c-format msgid "task '%s' failed" msgstr "uppgiften \"%s\" misslyckades" -#: builtin/gc.c:1410 +#: builtin/gc.c:1395 #, c-format msgid "'%s' is not a valid task" msgstr "\"%s\" är inte en giltig uppgift" -#: builtin/gc.c:1415 +#: builtin/gc.c:1400 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "uppgiften \"%s\" kan inte väljas flera gånger" -#: builtin/gc.c:1430 +#: builtin/gc.c:1415 msgid "run tasks based on the state of the repository" msgstr "kör uppgifter baserad på arkivets tillstånd" -#: builtin/gc.c:1431 +#: builtin/gc.c:1416 msgid "frequency" msgstr "frekvens" -#: builtin/gc.c:1432 +#: builtin/gc.c:1417 msgid "run tasks based on frequency" msgstr "kör uppgifter baserat på frekvens" -#: builtin/gc.c:1435 +#: builtin/gc.c:1420 msgid "do not report progress or other information over stderr" msgstr "rapportera inte framgång eller annan information över standard fel" -#: builtin/gc.c:1436 +#: builtin/gc.c:1421 msgid "task" msgstr "uppgift" -#: builtin/gc.c:1437 +#: builtin/gc.c:1422 msgid "run a specific task" msgstr "utför en specifik uppgift" -#: builtin/gc.c:1454 +#: builtin/gc.c:1439 msgid "use at most one of --auto and --schedule=<frequency>" msgstr "använd som mest en av --auto och --schedule=<frekvens>" -#: builtin/gc.c:1497 +#: builtin/gc.c:1482 msgid "failed to run 'git config'" msgstr "misslyckades köra \"git config\"" -#: builtin/gc.c:1562 +#: builtin/gc.c:1547 #, c-format msgid "failed to expand path '%s'" msgstr "misslyckades expandera sökvägen \"%s\"" -#: builtin/gc.c:1591 +#: builtin/gc.c:1576 msgid "failed to start launchctl" msgstr "misslyckades starta launchctl" -#: builtin/gc.c:1628 +#: builtin/gc.c:1613 #, c-format msgid "failed to create directories for '%s'" msgstr "misslyckades skapa kataloger för \"%s\"" -#: builtin/gc.c:1689 +#: builtin/gc.c:1674 #, c-format msgid "failed to bootstrap service %s" msgstr "misslyckades starta tjänsten %s" -#: builtin/gc.c:1760 +#: builtin/gc.c:1745 msgid "failed to create temp xml file" msgstr "misslyckades skapa temporär xml-fil" -#: builtin/gc.c:1850 +#: builtin/gc.c:1835 msgid "failed to start schtasks" msgstr "misslyckades starta schtasks" -#: builtin/gc.c:1894 +#: builtin/gc.c:1879 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" "kunde inte köra \"crontab -l\"; ditt system kanske inte stöder \"cron\"" -#: builtin/gc.c:1911 +#: builtin/gc.c:1896 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "kunde inte köra \"crontab\"; ditt system kanske inte stöder \"cron\"" -#: builtin/gc.c:1915 +#: builtin/gc.c:1900 msgid "failed to open stdin of 'crontab'" msgstr "misslyckades öppna standard in för \"crontab\"" -#: builtin/gc.c:1956 +#: builtin/gc.c:1942 msgid "'crontab' died" msgstr "\"crontab\" dog" -#: builtin/gc.c:1990 +#: builtin/gc.c:1976 msgid "another process is scheduling background maintenance" msgstr "en annan process schemalägger bakgrundsunderhåll" -#: builtin/gc.c:2009 +#: builtin/gc.c:2000 msgid "failed to add repo to global config" msgstr "misslyckades lägga till arkiv till global konfiguration" -#: builtin/gc.c:2019 +#: builtin/gc.c:2010 msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <underkommando> [<flaggor>]" -#: builtin/gc.c:2038 +#: builtin/gc.c:2029 #, c-format msgid "invalid subcommand: %s" msgstr "felaktigt underkommando: %s" @@ -15572,258 +15816,258 @@ msgstr "felaktigt antal trådar angivet (%d) för %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808 -#: builtin/pack-objects.c:2944 +#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793 +#: builtin/pack-objects.c:2969 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641 +#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:656 +#: builtin/grep.c:658 #, c-format msgid "unable to grep from object of type %s" msgstr "kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:737 +#: builtin/grep.c:739 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:836 +#: builtin/grep.c:838 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:838 +#: builtin/grep.c:840 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:840 +#: builtin/grep.c:842 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:842 +#: builtin/grep.c:844 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:844 +#: builtin/grep.c:846 msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:847 +#: builtin/grep.c:849 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:851 +#: builtin/grep.c:853 msgid "match patterns only at word boundaries" msgstr "träffa endast mönster vid ordgränser" -#: builtin/grep.c:853 +#: builtin/grep.c:855 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:858 +#: builtin/grep.c:860 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "search in subdirectories (default)" msgstr "sök i underkataloger (standard)" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:866 +#: builtin/grep.c:868 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:869 +#: builtin/grep.c:871 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:872 +#: builtin/grep.c:874 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:875 +#: builtin/grep.c:877 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:878 +#: builtin/grep.c:880 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:879 +#: builtin/grep.c:881 msgid "show column number of first match" msgstr "visa kolumnnummer för första träff" -#: builtin/grep.c:880 +#: builtin/grep.c:882 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:881 +#: builtin/grep.c:883 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:883 +#: builtin/grep.c:885 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:885 +#: builtin/grep.c:887 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:890 +#: builtin/grep.c:892 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:892 +#: builtin/grep.c:894 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:895 +#: builtin/grep.c:897 msgid "show only matching parts of a line" msgstr "visa endast träffade delar av rader" -#: builtin/grep.c:897 +#: builtin/grep.c:899 msgid "show the number of matches instead of matching lines" msgstr "visa antal träffar istället för träffade rader" -#: builtin/grep.c:898 +#: builtin/grep.c:900 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:900 +#: builtin/grep.c:902 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:902 +#: builtin/grep.c:904 msgid "show filename only once above matches from same file" msgstr "visa filnamn endast en gång ovanför träffar från samma fil" -#: builtin/grep.c:905 +#: builtin/grep.c:907 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:908 +#: builtin/grep.c:910 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:910 +#: builtin/grep.c:912 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:912 +#: builtin/grep.c:914 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:913 +#: builtin/grep.c:915 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:916 +#: builtin/grep.c:918 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:918 +#: builtin/grep.c:920 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:921 +#: builtin/grep.c:923 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:923 +#: builtin/grep.c:925 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:925 +#: builtin/grep.c:927 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:937 +#: builtin/grep.c:939 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:939 +#: builtin/grep.c:941 msgid "show only matches from files that match all patterns" msgstr "visa endast träffar från filer som träffar alla mönster" -#: builtin/grep.c:942 +#: builtin/grep.c:944 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:942 +#: builtin/grep.c:944 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:946 +#: builtin/grep.c:948 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:1012 +#: builtin/grep.c:1014 msgid "no pattern given" msgstr "inget mönster angavs" -#: builtin/grep.c:1048 +#: builtin/grep.c:1050 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index och --untracked kan inte användas med revisioner" -#: builtin/grep.c:1056 +#: builtin/grep.c:1058 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1086 +#: builtin/grep.c:1088 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked stöds inte med --recurse-submodules" -#: builtin/grep.c:1090 +#: builtin/grep.c:1092 msgid "invalid option combination, ignoring --threads" msgstr "ogiltig kombination av flaggor, ignorerar --threads" -#: builtin/grep.c:1093 builtin/pack-objects.c:3672 +#: builtin/grep.c:1095 builtin/pack-objects.c:3930 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941 +#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:1130 +#: builtin/grep.c:1132 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1156 +#: builtin/grep.c:1158 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached och --untracked kan inte användas med --no-index" -#: builtin/grep.c:1159 +#: builtin/grep.c:1161 msgid "--untracked cannot be used with --cached" msgstr "--untracked kan inte användas med --cached" -#: builtin/grep.c:1165 +#: builtin/grep.c:1167 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll" -#: builtin/grep.c:1173 +#: builtin/grep.c:1175 msgid "both --cached and trees are given" msgstr "både --cached och träd angavs" @@ -15955,12 +16199,12 @@ msgstr "ingen man-visare hanterade förfrågan" msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:520 builtin/help.c:531 git.c:340 +#: builtin/help.c:520 builtin/help.c:531 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "\"%s\" är ett alias för \"%s\"" -#: builtin/help.c:534 git.c:372 +#: builtin/help.c:534 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "felaktig alias.%s-sträng: %s" @@ -15974,396 +16218,392 @@ msgstr "användning: %s%s" msgid "'git help config' for more information" msgstr "\"git help config\" för mer information" -#: builtin/index-pack.c:221 +#: builtin/index-pack.c:222 #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" -#: builtin/index-pack.c:241 +#: builtin/index-pack.c:242 #, c-format msgid "did not receive expected object %s" msgstr "emottog inte det förväntade objektet %s" -#: builtin/index-pack.c:244 +#: builtin/index-pack.c:245 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objektet %s: förväntad typ %s, såg %s" -#: builtin/index-pack.c:294 +#: builtin/index-pack.c:295 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "kan inte fylla %d byte" msgstr[1] "kan inte fylla %d byte" -#: builtin/index-pack.c:304 +#: builtin/index-pack.c:305 msgid "early EOF" msgstr "tidigt filslut" -#: builtin/index-pack.c:305 +#: builtin/index-pack.c:306 msgid "read error on input" msgstr "indataläsfel" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:318 msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:324 builtin/pack-objects.c:624 +#: builtin/index-pack.c:325 builtin/pack-objects.c:624 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" -#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:328 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "paket är större än tillåten maximal storlek" -#: builtin/index-pack.c:342 +#: builtin/index-pack.c:343 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: builtin/index-pack.c:348 +#: builtin/index-pack.c:349 #, c-format msgid "cannot open packfile '%s'" msgstr "kan inte öppna paketfilen \"%s\"" -#: builtin/index-pack.c:362 +#: builtin/index-pack.c:363 msgid "pack signature mismatch" msgstr "paketsignatur stämmer inte överens" -#: builtin/index-pack.c:364 +#: builtin/index-pack.c:365 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paketversion %<PRIu32> stöds ej" -#: builtin/index-pack.c:382 +#: builtin/index-pack.c:383 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s" -#: builtin/index-pack.c:488 +#: builtin/index-pack.c:489 #, c-format msgid "inflate returned %d" msgstr "inflate returnerade %d" -#: builtin/index-pack.c:537 +#: builtin/index-pack.c:538 msgid "offset value overflow for delta base object" msgstr "indexvärdespill för deltabasobjekt" -#: builtin/index-pack.c:545 +#: builtin/index-pack.c:546 msgid "delta base offset is out of bound" msgstr "deltabasindex utanför gränsen" -#: builtin/index-pack.c:553 +#: builtin/index-pack.c:554 #, c-format msgid "unknown object type %d" msgstr "okänd objekttyp %d" -#: builtin/index-pack.c:584 +#: builtin/index-pack.c:585 msgid "cannot pread pack file" msgstr "kan inte utföra \"pread\" på paketfil" -#: builtin/index-pack.c:586 +#: builtin/index-pack.c:587 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" -#: builtin/index-pack.c:612 +#: builtin/index-pack.c:613 msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 -#: builtin/index-pack.c:826 builtin/index-pack.c:835 +#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788 +#: builtin/index-pack.c:827 builtin/index-pack.c:836 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/index-pack.c:761 builtin/pack-objects.c:171 #: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:825 #, c-format msgid "cannot read existing object info %s" msgstr "kan inte läsa information om befintligt objekt %s" -#: builtin/index-pack.c:832 +#: builtin/index-pack.c:833 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:846 +#: builtin/index-pack.c:847 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:849 builtin/index-pack.c:868 +#: builtin/index-pack.c:850 builtin/index-pack.c:869 msgid "fsck error in packed object" msgstr "fsck-fel i packat objekt" -#: builtin/index-pack.c:870 +#: builtin/index-pack.c:871 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Inte alla barnobjekt för %s kan nås" -#: builtin/index-pack.c:931 builtin/index-pack.c:978 +#: builtin/index-pack.c:932 builtin/index-pack.c:979 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1162 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1162 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1196 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1200 +#: builtin/index-pack.c:1201 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1203 +#: builtin/index-pack.c:1204 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1215 +#: builtin/index-pack.c:1216 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1238 +#: builtin/index-pack.c:1239 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707 +#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1282 +#: builtin/index-pack.c:1283 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1288 +#: builtin/index-pack.c:1289 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "slutfördes med %d lokalt objekt" msgstr[1] "slutfördes med %d lokala objekt" -#: builtin/index-pack.c:1300 +#: builtin/index-pack.c:1301 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1304 +#: builtin/index-pack.c:1305 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paketet har %d oanalyserat delta" msgstr[1] "paketet har %d oanalyserade delta" -#: builtin/index-pack.c:1328 +#: builtin/index-pack.c:1329 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1424 +#: builtin/index-pack.c:1425 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1445 +#: builtin/index-pack.c:1446 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "paketfilnamnet \"%s\" slutar inte med \".%s\"" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1470 #, c-format msgid "cannot write %s file '%s'" msgstr "kan inte ta skriva %s-fil \"%s\"" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1478 #, c-format msgid "cannot close written %s file '%s'" msgstr "kan inte stänga skriven %s-fil \"%s\"" -#: builtin/index-pack.c:1503 +#: builtin/index-pack.c:1504 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1517 +#: builtin/index-pack.c:1518 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1526 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1534 -msgid "cannot store reverse index file" -msgstr "kan inte spara reverse-index-fil" - -#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952 +#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1651 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1652 +#: builtin/index-pack.c:1653 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\"" -#: builtin/index-pack.c:1700 +#: builtin/index-pack.c:1701 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "icke-delta: %d objekt" msgstr[1] "icke-delta: %d objekt" -#: builtin/index-pack.c:1707 +#: builtin/index-pack.c:1708 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "kedjelängd = %d: %lu objekt" msgstr[1] "kedjelängd = %d: %lu objekt" -#: builtin/index-pack.c:1765 +#: builtin/index-pack.c:1750 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1819 builtin/index-pack.c:1822 -#: builtin/index-pack.c:1838 builtin/index-pack.c:1842 +#: builtin/index-pack.c:1804 builtin/index-pack.c:1807 +#: builtin/index-pack.c:1823 builtin/index-pack.c:1827 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625 +#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613 #, c-format msgid "unknown hash algorithm '%s'" msgstr "okänd hashningsalgoritm \"%s\"" -#: builtin/index-pack.c:1867 +#: builtin/index-pack.c:1852 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1869 +#: builtin/index-pack.c:1854 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1871 +#: builtin/index-pack.c:1856 msgid "--object-format cannot be used with --stdin" msgstr "--object-format kan inte användas med --stdin" -#: builtin/index-pack.c:1886 +#: builtin/index-pack.c:1871 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" -#: builtin/index-pack.c:1956 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "fsck-fel i packat objekt" -#: builtin/init-db.c:64 +#: builtin/init-db.c:63 #, c-format msgid "cannot stat template '%s'" msgstr "kan inte ta status på mallen \"%s\"" -#: builtin/init-db.c:69 +#: builtin/init-db.c:68 #, c-format msgid "cannot opendir '%s'" msgstr "kan inte öppna katalogen (opendir) \"%s\"" -#: builtin/init-db.c:81 +#: builtin/init-db.c:80 #, c-format msgid "cannot readlink '%s'" msgstr "kan inte läsa länk (readlink) \"%s\"" -#: builtin/init-db.c:83 +#: builtin/init-db.c:82 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\"" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "kan inte kopiera \"%s\" till \"%s\"" -#: builtin/init-db.c:93 +#: builtin/init-db.c:92 #, c-format msgid "ignoring template %s" msgstr "ignorerar mallen %s" -#: builtin/init-db.c:124 +#: builtin/init-db.c:123 #, c-format msgid "templates not found in %s" msgstr "mallarna hittades inte i %s" -#: builtin/init-db.c:139 +#: builtin/init-db.c:138 #, c-format msgid "not copying templates from '%s': %s" msgstr "kopierade inte mallar från \"%s\": %s" -#: builtin/init-db.c:275 +#: builtin/init-db.c:262 #, c-format msgid "invalid initial branch name: '%s'" msgstr "ogiltigt namn på första gren: \"%s\"" -#: builtin/init-db.c:367 +#: builtin/init-db.c:353 #, c-format msgid "unable to handle file type %d" msgstr "kan inte hantera filtyp %d" -#: builtin/init-db.c:370 +#: builtin/init-db.c:356 #, c-format msgid "unable to move %s to %s" msgstr "kan inte flytta %s till %s" -#: builtin/init-db.c:386 +#: builtin/init-db.c:372 msgid "attempt to reinitialize repository with different hash" msgstr "försöker initiera arkivet på nytt med annan hash" -#: builtin/init-db.c:410 builtin/init-db.c:413 +#: builtin/init-db.c:396 builtin/init-db.c:399 #, c-format msgid "%s already exists" msgstr "%s finns redan" -#: builtin/init-db.c:445 +#: builtin/init-db.c:431 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: ignorerade --initial-branch=%s" -#: builtin/init-db.c:476 +#: builtin/init-db.c:462 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Ominitierade befintligt delat Git-arkiv i %s%s\n" -#: builtin/init-db.c:477 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Ominitierade befintligt Git-arkiv i %s%s\n" -#: builtin/init-db.c:481 +#: builtin/init-db.c:467 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Initierade tomt delat Git-arkiv i %s%s\n" -#: builtin/init-db.c:482 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Initierade tomt Git-arkiv i %s%s\n" -#: builtin/init-db.c:531 +#: builtin/init-db.c:517 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -16371,41 +16611,41 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--" "shared[=<behörigheter>]] [<katalog>]" -#: builtin/init-db.c:557 +#: builtin/init-db.c:543 msgid "permissions" msgstr "behörigheter" -#: builtin/init-db.c:558 +#: builtin/init-db.c:544 msgid "specify that the git repository is to be shared amongst several users" msgstr "ange att git-arkivet ska delas bland flera användare" -#: builtin/init-db.c:564 +#: builtin/init-db.c:550 msgid "override the name of the initial branch" msgstr "överstyr namnet på första gren" -#: builtin/init-db.c:565 builtin/verify-pack.c:74 +#: builtin/init-db.c:551 builtin/verify-pack.c:74 msgid "hash" msgstr "hash" -#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "ange hashningsalgoritm att använda" -#: builtin/init-db.c:573 +#: builtin/init-db.c:559 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "--separate-git-dir och --bare är ömsesidigt uteslutande" -#: builtin/init-db.c:602 builtin/init-db.c:607 +#: builtin/init-db.c:590 builtin/init-db.c:595 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:611 builtin/init-db.c:666 +#: builtin/init-db.c:599 builtin/init-db.c:654 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:638 +#: builtin/init-db.c:626 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -16414,12 +16654,12 @@ msgstr "" "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-" "dir=<katalog>)" -#: builtin/init-db.c:690 +#: builtin/init-db.c:678 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" -#: builtin/init-db.c:695 +#: builtin/init-db.c:683 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separatebgit-dir är inkompatibelt med naket arkiv" @@ -16471,10 +16711,6 @@ msgstr "välj tolkningsalternativ" msgid "do not treat --- specially" msgstr "tolka inte --- speciellt" -#: builtin/interpret-trailers.c:111 -msgid "trailer" -msgstr "släprad" - #: builtin/interpret-trailers.c:112 msgid "trailer(s) to add" msgstr "släprad(er) att lägga till" @@ -16537,80 +16773,80 @@ msgstr "-L<intervall>:<fil> kan inte användas med sökvägsspecifikation" msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:566 +#: builtin/log.c:568 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:581 builtin/log.c:671 +#: builtin/log.c:583 builtin/log.c:673 #, c-format msgid "could not read object %s" msgstr "kunde inte läsa objektet %s" -#: builtin/log.c:696 +#: builtin/log.c:698 #, c-format msgid "unknown type: %d" msgstr "okänd typ: %d" -#: builtin/log.c:841 +#: builtin/log.c:843 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: ogiltigt omslag från beskrivningsläge" -#: builtin/log.c:848 +#: builtin/log.c:850 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:977 +#: builtin/log.c:979 #, c-format msgid "cannot open patch file %s" msgstr "kan inte öppna patchfilen %s" -#: builtin/log.c:994 +#: builtin/log.c:996 msgid "need exactly one range" msgstr "behöver precis ett intervall" -#: builtin/log.c:1004 +#: builtin/log.c:1006 msgid "not a range" msgstr "inte ett intervall" -#: builtin/log.c:1168 +#: builtin/log.c:1170 msgid "cover letter needs email format" msgstr "omslagsbrevet behöver e-postformat" -#: builtin/log.c:1174 +#: builtin/log.c:1176 msgid "failed to create cover-letter file" msgstr "misslyckades skapa fil för omslagsbrev" -#: builtin/log.c:1261 +#: builtin/log.c:1263 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1288 +#: builtin/log.c:1290 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1346 +#: builtin/log.c:1348 msgid "two output directories?" msgstr "två utdatakataloger?" -#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331 +#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340 #, c-format msgid "unknown commit %s" msgstr "okänd incheckning %s" -#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "misslyckades slå upp \"%s\" som en giltig referens" -#: builtin/log.c:1517 +#: builtin/log.c:1519 msgid "could not find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1527 +#: builtin/log.c:1529 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -16620,394 +16856,398 @@ msgstr "" "använd git branch --set-upstream-to för att spåra en fjärrgren.\n" "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt" -#: builtin/log.c:1550 +#: builtin/log.c:1552 msgid "failed to find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1567 +#: builtin/log.c:1569 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1577 +#: builtin/log.c:1579 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1635 +#: builtin/log.c:1637 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1692 +#: builtin/log.c:1700 msgid "failed to infer range-diff origin of current series" msgstr "misslyckades räkna ut intervalldiff-ursprung för aktuell serie" -#: builtin/log.c:1694 +#: builtin/log.c:1702 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "använd \"%s\" som intervalldiff-ursprung för aktuell serie" -#: builtin/log.c:1738 +#: builtin/log.c:1746 msgid "use [PATCH n/m] even with a single patch" msgstr "använd [PATCH n/m] även för en ensam patch" -#: builtin/log.c:1741 +#: builtin/log.c:1749 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1745 +#: builtin/log.c:1753 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1747 +#: builtin/log.c:1755 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1749 +#: builtin/log.c:1757 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1750 +#: builtin/log.c:1758 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1751 +#: builtin/log.c:1759 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1753 +#: builtin/log.c:1761 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1755 +#: builtin/log.c:1762 +msgid "reroll-count" +msgstr "antal iterationer" + +#: builtin/log.c:1763 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1757 +#: builtin/log.c:1765 msgid "max length of output filename" msgstr "maximal längd för utdatafilnamn" -#: builtin/log.c:1759 +#: builtin/log.c:1767 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1762 +#: builtin/log.c:1770 msgid "cover-from-description-mode" msgstr "cover-from-description-läge" -#: builtin/log.c:1763 +#: builtin/log.c:1771 msgid "generate parts of a cover letter based on a branch's description" msgstr "skapa delar av omslagsbrevet baserat på grenbeskrivelsen" -#: builtin/log.c:1765 +#: builtin/log.c:1773 msgid "use [<prefix>] instead of [PATCH]" msgstr "använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1768 +#: builtin/log.c:1776 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1771 +#: builtin/log.c:1779 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1774 +#: builtin/log.c:1782 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1776 +#: builtin/log.c:1784 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1778 +#: builtin/log.c:1786 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1780 +#: builtin/log.c:1788 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1782 +#: builtin/log.c:1790 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1783 +#: builtin/log.c:1791 msgid "header" msgstr "huvud" -#: builtin/log.c:1784 +#: builtin/log.c:1792 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1785 builtin/log.c:1786 +#: builtin/log.c:1793 builtin/log.c:1794 msgid "email" msgstr "epost" -#: builtin/log.c:1785 +#: builtin/log.c:1793 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1786 +#: builtin/log.c:1794 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1787 +#: builtin/log.c:1795 msgid "ident" msgstr "ident" -#: builtin/log.c:1788 +#: builtin/log.c:1796 msgid "set From address to <ident> (or committer ident if absent)" msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)" -#: builtin/log.c:1790 +#: builtin/log.c:1798 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1791 +#: builtin/log.c:1799 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1792 builtin/log.c:1795 +#: builtin/log.c:1800 builtin/log.c:1803 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1793 +#: builtin/log.c:1801 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1796 +#: builtin/log.c:1804 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1800 +#: builtin/log.c:1808 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1802 +#: builtin/log.c:1810 msgid "signature" msgstr "signatur" -#: builtin/log.c:1803 +#: builtin/log.c:1811 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1804 +#: builtin/log.c:1812 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1805 +#: builtin/log.c:1813 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1808 +#: builtin/log.c:1816 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1809 +#: builtin/log.c:1817 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1811 +#: builtin/log.c:1819 msgid "show progress while generating patches" msgstr "visa förloppsindikator medan patchar skapas" -#: builtin/log.c:1813 +#: builtin/log.c:1821 msgid "show changes against <rev> in cover letter or single patch" msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch" -#: builtin/log.c:1816 +#: builtin/log.c:1824 msgid "show changes against <refspec> in cover letter or single patch" msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch" -#: builtin/log.c:1818 +#: builtin/log.c:1826 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "procent som skapelse vägs med" -#: builtin/log.c:1904 +#: builtin/log.c:1913 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1919 +#: builtin/log.c:1928 msgid "-n and -k are mutually exclusive" msgstr "-n och -k kan inte användas samtidigt" -#: builtin/log.c:1921 +#: builtin/log.c:1930 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt" -#: builtin/log.c:1929 +#: builtin/log.c:1938 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1931 +#: builtin/log.c:1940 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1933 +#: builtin/log.c:1942 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1955 +#: builtin/log.c:1964 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "--stdout, --output, och --output-directory är ömsesidigt uteslutande" -#: builtin/log.c:2078 +#: builtin/log.c:2087 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff kräver --cover-letter eller ensam patch" -#: builtin/log.c:2082 +#: builtin/log.c:2091 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:2083 +#: builtin/log.c:2092 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff mot v%d:" -#: builtin/log.c:2089 +#: builtin/log.c:2098 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor kräver --range-diff" -#: builtin/log.c:2093 +#: builtin/log.c:2102 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff kräver --cover-letter eller ensam patch" -#: builtin/log.c:2101 +#: builtin/log.c:2110 msgid "Range-diff:" msgstr "Intervall-diff:" -#: builtin/log.c:2102 +#: builtin/log.c:2111 #, c-format msgid "Range-diff against v%d:" msgstr "Intervall-diff mot v%d:" -#: builtin/log.c:2113 +#: builtin/log.c:2122 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:2149 +#: builtin/log.c:2158 msgid "Generating patches" msgstr "Skapar patchar" -#: builtin/log.c:2193 +#: builtin/log.c:2202 msgid "failed to create output files" msgstr "misslyckades skapa utdatafiler" -#: builtin/log.c:2252 +#: builtin/log.c:2261 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:2306 +#: builtin/log.c:2315 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" -#: builtin/ls-files.c:486 +#: builtin/ls-files.c:563 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:619 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:544 +#: builtin/ls-files.c:621 msgid "use lowercase letters for 'assume unchanged' files" msgstr "använd små bokstäver för \"anta oförändrade\"-filer" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:623 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "använd små bokstäver för \"fsmonitor clean\"-filer" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:625 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:627 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:629 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:631 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:633 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:636 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:638 msgid "show files on the filesystem that need to be removed" msgstr "visa filer i filsystemet som behöver tas bort" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:640 msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:642 msgid "show line endings of files" msgstr "visa radslut i filer" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:644 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:647 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:572 +#: builtin/ls-files.c:649 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:574 +#: builtin/ls-files.c:651 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:654 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses från <fil>" -#: builtin/ls-files.c:580 +#: builtin/ls-files.c:657 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" -#: builtin/ls-files.c:582 +#: builtin/ls-files.c:659 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:586 +#: builtin/ls-files.c:663 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:589 +#: builtin/ls-files.c:666 msgid "recurse through submodules" msgstr "rekursera ner i undermoduler" -#: builtin/ls-files.c:591 +#: builtin/ls-files.c:668 msgid "if any <file> is not in the index, treat this as an error" msgstr "om en <fil> inte är indexet, betrakta det som ett fel" -#: builtin/ls-files.c:592 +#: builtin/ls-files.c:669 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:593 +#: builtin/ls-files.c:670 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns" -#: builtin/ls-files.c:595 +#: builtin/ls-files.c:672 msgid "show debugging data" msgstr "visa felsökningsutdata" -#: builtin/ls-files.c:597 +#: builtin/ls-files.c:674 msgid "suppress duplicate entries" msgstr "undertyck dublettposter" @@ -17025,7 +17265,7 @@ msgstr "" msgid "do not print remote URL" msgstr "visa inte fjärr-URL" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399 msgid "exec" msgstr "exec" @@ -17093,6 +17333,55 @@ msgstr "använd fullständiga sökvägsnamn" msgid "list entire tree; not just current directory (implies --full-name)" msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" +#. TRANSLATORS: keep <> in "<" mail ">" info. +#: builtin/mailinfo.c:14 +msgid "git mailinfo [<options>] <msg> <patch> < mail >info" +msgstr "git mailinfo [<flaggor>] <meddelande> <patch> < epost >info" + +#: builtin/mailinfo.c:58 +msgid "keep subject" +msgstr "behåll ärenderad" + +#: builtin/mailinfo.c:60 +msgid "keep non patch brackets in subject" +msgstr "behåll hakparanterser som inte är \"patch\" i ärenderaden" + +#: builtin/mailinfo.c:62 +msgid "copy Message-ID to the end of commit message" +msgstr "kopiera Message-ID till slutet av incheckningsmeddelandet" + +#: builtin/mailinfo.c:64 +msgid "re-code metadata to i18n.commitEncoding" +msgstr "koda om metadata till i18n.commmitEncoding" + +#: builtin/mailinfo.c:67 +msgid "disable charset re-coding of metadata" +msgstr "inaktivera omkodning av metadata" + +#: builtin/mailinfo.c:69 +msgid "encoding" +msgstr "teckenkodning" + +#: builtin/mailinfo.c:70 +msgid "re-code metadata to this encoding" +msgstr "omkoda metadata till denna teckenkodning" + +#: builtin/mailinfo.c:72 +msgid "use scissors" +msgstr "använd saxar" + +#: builtin/mailinfo.c:73 +msgid "<action>" +msgstr "<åtgärd>" + +#: builtin/mailinfo.c:74 +msgid "action when quoted CR is found" +msgstr "åtgärd när citerad vagnretur hittas" + +#: builtin/mailinfo.c:77 +msgid "use headers in message's body" +msgstr "använd huvuden i brevkroppen" + #: builtin/mailsplit.c:241 #, c-format msgid "empty mbox: '%s'" @@ -17287,7 +17576,7 @@ msgid "verify that the named commit has a valid GPG signature" msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur" #: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114 +#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114 msgid "strategy" msgstr "strategi" @@ -17344,57 +17633,57 @@ msgstr "inte ett giltigt objekt: %s" msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:399 -msgid " (nothing to squash)" -msgstr " (inget att platta till)" +#: builtin/merge.c:400 +msgid "Already up to date. (nothing to squash)" +msgstr "Redan à jour. (inget att platta till)" -#: builtin/merge.c:410 +#: builtin/merge.c:414 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:460 +#: builtin/merge.c:464 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:511 +#: builtin/merge.c:515 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:598 +#: builtin/merge.c:602 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:724 +#: builtin/merge.c:728 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:737 +#: builtin/merge.c:741 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:808 +#: builtin/merge.c:812 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:817 +#: builtin/merge.c:821 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra " "den.\n" -#: builtin/merge.c:823 +#: builtin/merge.c:827 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -17405,11 +17694,11 @@ msgstr "" "temagren.\n" "\n" -#: builtin/merge.c:828 +#: builtin/merge.c:832 msgid "An empty message aborts the commit.\n" msgstr "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/merge.c:831 +#: builtin/merge.c:835 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -17418,73 +17707,73 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:884 +#: builtin/merge.c:888 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:899 +#: builtin/merge.c:903 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:960 +#: builtin/merge.c:964 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n" -#: builtin/merge.c:999 +#: builtin/merge.c:1003 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:1001 +#: builtin/merge.c:1005 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:1003 +#: builtin/merge.c:1007 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:1008 +#: builtin/merge.c:1012 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Ingen fjärrspårande gren för %s från %s" -#: builtin/merge.c:1065 +#: builtin/merge.c:1069 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1168 +#: builtin/merge.c:1172 #, c-format msgid "not something we can merge in %s: %s" msgstr "inte något vi kan slå ihop med %s: %s" -#: builtin/merge.c:1202 +#: builtin/merge.c:1206 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1312 +#: builtin/merge.c:1316 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1316 +#: builtin/merge.c:1320 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1334 +#: builtin/merge.c:1338 msgid "--quit expects no arguments" msgstr "--quit tar inga argument" -#: builtin/merge.c:1347 +#: builtin/merge.c:1351 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1351 +#: builtin/merge.c:1355 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1367 +#: builtin/merge.c:1371 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17492,7 +17781,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1374 +#: builtin/merge.c:1378 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17500,96 +17789,88 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1377 +#: builtin/merge.c:1381 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)." -#: builtin/merge.c:1391 +#: builtin/merge.c:1395 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1393 +#: builtin/merge.c:1397 msgid "You cannot combine --squash with --commit." msgstr "Du kan inte kombinera --squash med --commit." -#: builtin/merge.c:1409 +#: builtin/merge.c:1413 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1426 +#: builtin/merge.c:1430 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1428 +#: builtin/merge.c:1432 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud" -#: builtin/merge.c:1433 +#: builtin/merge.c:1437 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1435 +#: builtin/merge.c:1439 msgid "Can merge only exactly one commit into empty head" msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud" -#: builtin/merge.c:1516 +#: builtin/merge.c:1520 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1525 -msgid "Already up to date." -msgstr "Redan à jour." - -#: builtin/merge.c:1535 +#: builtin/merge.c:1539 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1581 +#: builtin/merge.c:1585 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1588 +#: builtin/merge.c:1592 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1613 -msgid "Already up to date. Yeeah!" -msgstr "Redan à jour. Toppen!" - -#: builtin/merge.c:1619 +#: builtin/merge.c:1623 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1647 builtin/merge.c:1712 +#: builtin/merge.c:1651 builtin/merge.c:1716 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1655 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1703 +#: builtin/merge.c:1707 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1705 +#: builtin/merge.c:1709 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1714 +#: builtin/merge.c:1718 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Använder %s för att förbereda lösning för hand.\n" -#: builtin/merge.c:1728 +#: builtin/merge.c:1732 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -17599,40 +17880,40 @@ msgstr "" msgid "git mktag" msgstr "git mktag" -#: builtin/mktag.c:30 +#: builtin/mktag.c:27 #, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "varning: taggindata godkänns inte av fsck: %s" -#: builtin/mktag.c:41 +#: builtin/mktag.c:38 #, c-format msgid "error: tag input does not pass fsck: %s" msgstr "fel: taggindata godkänns inte av fsck: %s" -#: builtin/mktag.c:44 +#: builtin/mktag.c:41 #, c-format msgid "%d (FSCK_IGNORE?) should never trigger this callback" msgstr "%d (FSCK_IGNORE?) skulle aldrig utlösa detta återanrop" -#: builtin/mktag.c:59 +#: builtin/mktag.c:56 #, c-format msgid "could not read tagged object '%s'" msgstr "kunde inte läsa det taggade objektet \"%s\"" -#: builtin/mktag.c:62 +#: builtin/mktag.c:59 #, c-format msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "objektet \"%s\" taggat som \"%s\", men är av typen \"%s\"" -#: builtin/mktag.c:99 +#: builtin/mktag.c:97 msgid "tag on stdin did not pass our strict fsck check" msgstr "tagg på stdin godkänns inte av vår strikta fsck-kontroll" -#: builtin/mktag.c:102 +#: builtin/mktag.c:100 msgid "tag on stdin did not refer to a valid object" msgstr "taggen på stdin pekar inte på ett giltigt objekt" -#: builtin/mktag.c:105 builtin/tag.c:232 +#: builtin/mktag.c:103 builtin/tag.c:243 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" @@ -17652,38 +17933,43 @@ msgstr "tillåt saknade objekt" msgid "allow creation of more than one tree" msgstr "tillåt skapa mer än ett träd" -#: builtin/multi-pack-index.c:9 -msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" -msgstr "" -"git multi-pack-index [<flaggor>] (write|verify|expire|repack --batch-" -"size=<storlek>)" +#: builtin/multi-pack-index.c:10 +msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]" +msgstr "git multi-pack-index [<flaggor>] write [--preferred-pack=<paket>]" + +#: builtin/multi-pack-index.c:13 +msgid "git multi-pack-index [<options>] verify" +msgstr "git multi-pack-index [<flaggor>] verify" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:16 +msgid "git multi-pack-index [<options>] expire" +msgstr "git multi-pack-index [<flaggor>] expire" + +#: builtin/multi-pack-index.c:19 +msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" +msgstr "git multi-pack-index [<flaggor>] repack [--batch-size=<storlek>]" + +#: builtin/multi-pack-index.c:54 msgid "object directory containing set of packfile and pack-index pairs" msgstr "objektkatalog med uppsättning av par med paketfiler och pack-index" -#: builtin/multi-pack-index.c:29 +#: builtin/multi-pack-index.c:69 +msgid "preferred-pack" +msgstr "föredraget paket" + +#: builtin/multi-pack-index.c:70 +msgid "pack for reuse when computing a multi-pack bitmap" +msgstr "paket att återanvända vid beräkning av multipaketsbitkarta" + +#: builtin/multi-pack-index.c:128 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" msgstr "" "vid ompackning, samla mindre paketfiler i en bunt som är större än denna " -"storlekt" - -#: builtin/multi-pack-index.c:50 builtin/notes.c:376 builtin/notes.c:431 -#: builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598 -#: builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963 -#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:575 -msgid "too many arguments" -msgstr "för många argument" +"storlek" -#: builtin/multi-pack-index.c:60 -msgid "--batch-size option is only for 'repack' subcommand" -msgstr "flaggan --batch-size används bara i underkommandot \"repack\"" - -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:180 #, c-format msgid "unrecognized subcommand: %s" msgstr "okänt underkommando: %s" @@ -17780,7 +18066,7 @@ msgstr "%s, källa=%s, mål=%s" msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" @@ -17972,7 +18258,7 @@ msgstr "kunde inte skriva anteckningsobjekt" msgid "the note contents have been left in %s" msgstr "anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:242 builtin/tag.c:565 +#: builtin/notes.c:242 builtin/tag.c:576 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" @@ -18012,6 +18298,13 @@ msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\"" msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)" +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 +#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 +#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 +#: builtin/prune-packed.c:25 builtin/tag.c:586 +msgid "too many arguments" +msgstr "för många argument" + #: builtin/notes.c:389 builtin/notes.c:678 #, c-format msgid "no note found for object %s." @@ -18200,7 +18493,7 @@ msgstr "" "%s och checka in resultatet med \"git notes merge --commit\", eller avbryt " "sammanslagningen med \"git notes merge --abort\".\n" -#: builtin/notes.c:897 builtin/tag.c:578 +#: builtin/notes.c:897 builtin/tag.c:589 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." @@ -18234,7 +18527,7 @@ msgstr "anteckningar-ref" msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1034 builtin/stash.c:1671 +#: builtin/notes.c:1034 builtin/stash.c:1739 #, c-format msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" @@ -18304,63 +18597,63 @@ msgstr "misslyckades ta status på %s" msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades" -#: builtin/pack-objects.c:1358 +#: builtin/pack-objects.c:1383 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas" -#: builtin/pack-objects.c:1806 +#: builtin/pack-objects.c:1831 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "deltabasoffset utanför gränsen i pack för %s" -#: builtin/pack-objects.c:1815 +#: builtin/pack-objects.c:1840 #, c-format msgid "delta base offset out of bound for %s" msgstr "deltabasoffset utanför gränsvärden för %s" -#: builtin/pack-objects.c:2096 +#: builtin/pack-objects.c:2121 msgid "Counting objects" msgstr "Räknar objekt" -#: builtin/pack-objects.c:2241 +#: builtin/pack-objects.c:2266 #, c-format msgid "unable to parse object header of %s" msgstr "kunde inte tolka objekthuvud för %s" -#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327 -#: builtin/pack-objects.c:2337 +#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352 +#: builtin/pack-objects.c:2362 #, c-format msgid "object %s cannot be read" msgstr "objektet %s kunde inte läsas" -#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341 +#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "objektet %s har inkonsistent objektlängd (%<PRIuMAX> mot %<PRIuMAX>)" -#: builtin/pack-objects.c:2351 +#: builtin/pack-objects.c:2376 msgid "suboptimal pack - out of memory" msgstr "icke-optimalt pack - minnet slut" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2691 #, c-format msgid "Delta compression using up to %d threads" msgstr "Deltakomprimering använder upp till %d trådar" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:2830 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "kan inte packa objekt nåbara från taggen %s" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2916 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2922 msgid "inconsistency with delta count" msgstr "deltaräknaren är inkonsekvent" -#: builtin/pack-objects.c:2976 +#: builtin/pack-objects.c:3001 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -18369,14 +18662,24 @@ msgstr "" "värdet på uploadpack.blobpackfileuri måste vara på formen '<objekt-hash> " "<paket-hash> <uri>' (fick '%s')" -#: builtin/pack-objects.c:2979 +#: builtin/pack-objects.c:3004 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "" "objektet redan konfigurerat i et annat uploadpack.blobpackfileuri (fick '%s)" -#: builtin/pack-objects.c:3008 +#: builtin/pack-objects.c:3039 +#, c-format +msgid "could not get type of object %s in pack %s" +msgstr "kunde inte hämta typ för objektet %s i paketet %s" + +#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175 +#, c-format +msgid "could not find pack '%s'" +msgstr "kunde inte hitta paketet \"%s\"" + +#: builtin/pack-objects.c:3218 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18385,7 +18688,7 @@ msgstr "" "förväntade kant-objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:3014 +#: builtin/pack-objects.c:3224 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18394,236 +18697,248 @@ msgstr "" "förväntade objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:3112 +#: builtin/pack-objects.c:3322 msgid "invalid value for --missing" msgstr "ogiltigt värde för --missing" -#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279 +#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490 msgid "cannot open pack index" msgstr "kan inte öppna paketfilen" -#: builtin/pack-objects.c:3202 +#: builtin/pack-objects.c:3412 #, c-format msgid "loose object at %s could not be examined" msgstr "lösa objekt på %s kunde inte underökas" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3498 msgid "unable to force loose object" msgstr "kan inte tvinga lösa objekt" -#: builtin/pack-objects.c:3380 +#: builtin/pack-objects.c:3628 #, c-format msgid "not a rev '%s'" msgstr "inte en referens \"%s\"" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3631 #, c-format msgid "bad revision '%s'" msgstr "felaktig revision \"%s\"" -#: builtin/pack-objects.c:3408 +#: builtin/pack-objects.c:3659 msgid "unable to add recent objects" msgstr "kan inte lägga till nya objekt" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3712 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:3465 +#: builtin/pack-objects.c:3716 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:3503 +#: builtin/pack-objects.c:3755 msgid "<version>[,<offset>]" msgstr "<version>[,<offset>]" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3756 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:3507 +#: builtin/pack-objects.c:3759 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:3509 +#: builtin/pack-objects.c:3761 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från supplerande objektlager" -#: builtin/pack-objects.c:3511 +#: builtin/pack-objects.c:3763 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:3513 +#: builtin/pack-objects.c:3765 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:3515 +#: builtin/pack-objects.c:3767 msgid "limit pack window by memory in addition to object limit" msgstr "begränsa paketfönster efter minne förutom objektgräns" -#: builtin/pack-objects.c:3517 +#: builtin/pack-objects.c:3769 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "maximal längd på deltakedja tillåten i slutligt paket" -#: builtin/pack-objects.c:3519 +#: builtin/pack-objects.c:3771 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:3521 +#: builtin/pack-objects.c:3773 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:3523 +#: builtin/pack-objects.c:3775 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:3525 +#: builtin/pack-objects.c:3777 msgid "use threads when searching for best delta matches" msgstr "använd trådar vid sökning efter bästa deltaträffar" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3779 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:3529 +#: builtin/pack-objects.c:3781 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:3531 +#: builtin/pack-objects.c:3783 msgid "limit the objects to those that are not yet packed" msgstr "begränsa objekt till dem som ännu inte packats" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3786 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:3537 +#: builtin/pack-objects.c:3789 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:3540 +#: builtin/pack-objects.c:3792 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:3543 +#: builtin/pack-objects.c:3795 +msgid "read packs from stdin" +msgstr "läs paket från standard in" + +#: builtin/pack-objects.c:3797 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:3545 +#: builtin/pack-objects.c:3799 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som ska packas" -#: builtin/pack-objects.c:3547 +#: builtin/pack-objects.c:3801 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:3549 +#: builtin/pack-objects.c:3803 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3805 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:3554 +#: builtin/pack-objects.c:3808 msgid "use the sparse reachability algorithm" msgstr "använd gles-nåbarhetsalgoritmen" -#: builtin/pack-objects.c:3556 +#: builtin/pack-objects.c:3810 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3812 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:3560 +#: builtin/pack-objects.c:3814 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:3562 +#: builtin/pack-objects.c:3816 msgid "ignore this pack" msgstr "ignorera detta paket" -#: builtin/pack-objects.c:3564 +#: builtin/pack-objects.c:3818 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:3566 +#: builtin/pack-objects.c:3820 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:3568 +#: builtin/pack-objects.c:3822 msgid "use a bitmap index if available to speed up counting objects" msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare" -#: builtin/pack-objects.c:3570 +#: builtin/pack-objects.c:3824 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3574 +#: builtin/pack-objects.c:3828 msgid "write a bitmap index if possible" msgstr "skriv bitkartindex om möjligt" -#: builtin/pack-objects.c:3578 +#: builtin/pack-objects.c:3832 msgid "handling for missing objects" msgstr "hantering av saknade objekt" -#: builtin/pack-objects.c:3581 +#: builtin/pack-objects.c:3835 msgid "do not pack objects in promisor packfiles" msgstr "packa inte objekt i kontraktspackfiler" -#: builtin/pack-objects.c:3583 +#: builtin/pack-objects.c:3837 msgid "respect islands during delta compression" msgstr "respektera öar under deltakomprimering" -#: builtin/pack-objects.c:3585 +#: builtin/pack-objects.c:3839 msgid "protocol" msgstr "protokoll" -#: builtin/pack-objects.c:3586 +#: builtin/pack-objects.c:3840 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" "uteslut redan konfigurerade uploadpack.blobpackfileuri med detta protokoll" -#: builtin/pack-objects.c:3617 +#: builtin/pack-objects.c:3873 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "deltakedjedjupet %d är för djupt, påtvingar %d" -#: builtin/pack-objects.c:3622 +#: builtin/pack-objects.c:3878 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit är för högt, påtvingar %d" -#: builtin/pack-objects.c:3676 +#: builtin/pack-objects.c:3934 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size kan inte användas för att bygga ett paket som ska överföras" -#: builtin/pack-objects.c:3678 +#: builtin/pack-objects.c:3936 msgid "minimum pack size limit is 1 MiB" msgstr "minsta packstorlek är 1 MiB" -#: builtin/pack-objects.c:3683 +#: builtin/pack-objects.c:3941 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin kan inte användas för att bygga ett indexerbart paket" -#: builtin/pack-objects.c:3686 +#: builtin/pack-objects.c:3944 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt" -#: builtin/pack-objects.c:3692 +#: builtin/pack-objects.c:3950 msgid "cannot use --filter without --stdout" msgstr "kan inte använda --filter utan --stdout" -#: builtin/pack-objects.c:3752 +#: builtin/pack-objects.c:3952 +msgid "cannot use --filter with --stdin-packs" +msgstr "kan inte använda --filter med --stdin-packs" + +#: builtin/pack-objects.c:3956 +msgid "cannot use internal rev list with --stdin-packs" +msgstr "kan inte använda intern revisionslista med --stdin-packs" + +#: builtin/pack-objects.c:4015 msgid "Enumerating objects" msgstr "Räknar upp objekt" -#: builtin/pack-objects.c:3783 +#: builtin/pack-objects.c:4052 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -18703,11 +19018,11 @@ msgstr "Alternativ gällande sammanslagning" msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126 msgid "allow fast-forward" msgstr "tillåt snabbspolning" -#: builtin/pull.c:167 parse-options.h:339 +#: builtin/pull.c:167 parse-options.h:340 msgid "automatically stash/stash pop before and after" msgstr "utför automatiskt stash/stash pop före och efter" @@ -18762,7 +19077,7 @@ msgstr "" "gren. Eftersom det inte är den fjärr som är konfigurerad som\n" "standard för aktuell gren måste du ange en gren på kommandoraden." -#: builtin/pull.c:456 builtin/rebase.c:1253 +#: builtin/pull.c:456 builtin/rebase.c:1248 msgid "You are not currently on a branch." msgstr "Du är inte på någon gren för närvarande." @@ -18779,7 +19094,7 @@ msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." #: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 -#: builtin/rebase.c:1259 +#: builtin/rebase.c:1254 msgid "<remote>" msgstr "<fjärr>" @@ -18787,7 +19102,7 @@ msgstr "<fjärr>" msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:471 builtin/rebase.c:1251 +#: builtin/pull.c:471 builtin/rebase.c:1246 msgid "There is no tracking information for the current branch." msgstr "Det finns ingen spårningsinformation för aktuell gren." @@ -19211,10 +19526,6 @@ msgstr "git range-diff [<flaggor>] <gammal-bas>..<ny-ända>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<flaggor>] <bas> <gammal-ända> <ny-ända>" -#: builtin/range-diff.c:28 -msgid "Percentage by which creation is weighted" -msgstr "Procent som skapelse vägs med" - #: builtin/range-diff.c:30 msgid "use simple diff colors" msgstr "använd enkla diff-färger" @@ -19348,188 +19659,188 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246 +#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245 #, c-format msgid "unusable todo list: '%s'" msgstr "oanvändbar todo-lista: %s" -#: builtin/rebase.c:312 +#: builtin/rebase.c:311 #, c-format msgid "could not create temporary %s" msgstr "kunde inte skapa temporär %s" -#: builtin/rebase.c:318 +#: builtin/rebase.c:317 msgid "could not mark as interactive" msgstr "kunde inte markera som interaktiv" -#: builtin/rebase.c:371 +#: builtin/rebase.c:370 msgid "could not generate todo list" msgstr "Kunde inte skapa attgöra-lista" -#: builtin/rebase.c:413 +#: builtin/rebase.c:412 msgid "a base commit must be provided with --upstream or --onto" msgstr "en basincheckning måste anges med --upstream eller --onto" -#: builtin/rebase.c:482 +#: builtin/rebase.c:481 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<flaggor>]" -#: builtin/rebase.c:495 builtin/rebase.c:1394 +#: builtin/rebase.c:494 builtin/rebase.c:1389 msgid "keep commits which start empty" msgstr "behåller incheckningar som är tomma från början" -#: builtin/rebase.c:499 builtin/revert.c:128 +#: builtin/rebase.c:498 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "tillåt incheckningar med tomt meddelande" -#: builtin/rebase.c:501 +#: builtin/rebase.c:500 msgid "rebase merge commits" msgstr "ombasera sammanslagningar" -#: builtin/rebase.c:503 +#: builtin/rebase.c:502 msgid "keep original branch points of cousins" msgstr "behåll ursprungliga förgreningspunkter för kusiner" -#: builtin/rebase.c:505 +#: builtin/rebase.c:504 msgid "move commits that begin with squash!/fixup!" msgstr "flytta incheckningar som inleds med squash!/fixup!" -#: builtin/rebase.c:506 +#: builtin/rebase.c:505 msgid "sign commits" msgstr "signera incheckningar" -#: builtin/rebase.c:508 builtin/rebase.c:1333 +#: builtin/rebase.c:507 builtin/rebase.c:1328 msgid "display a diffstat of what changed upstream" msgstr "vis diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:510 +#: builtin/rebase.c:509 msgid "continue rebase" msgstr "fortsätt ombasering" -#: builtin/rebase.c:512 +#: builtin/rebase.c:511 msgid "skip commit" msgstr "hoppa över incheckning" -#: builtin/rebase.c:513 +#: builtin/rebase.c:512 msgid "edit the todo list" msgstr "redigera attgöra-listan" -#: builtin/rebase.c:515 +#: builtin/rebase.c:514 msgid "show the current patch" msgstr "visa nuvarande patch" -#: builtin/rebase.c:518 +#: builtin/rebase.c:517 msgid "shorten commit ids in the todo list" msgstr "förkorta inchecknings-id i todo-listan" -#: builtin/rebase.c:520 +#: builtin/rebase.c:519 msgid "expand commit ids in the todo list" msgstr "utöka inchecknings-id i todo-listan" -#: builtin/rebase.c:522 +#: builtin/rebase.c:521 msgid "check the todo list" msgstr "kontrollera todo-listan" -#: builtin/rebase.c:524 +#: builtin/rebase.c:523 msgid "rearrange fixup/squash lines" msgstr "ordna om fixup-/squash-rader" -#: builtin/rebase.c:526 +#: builtin/rebase.c:525 msgid "insert exec commands in todo list" msgstr "lägg in exec-kommandon i todo-listan" -#: builtin/rebase.c:527 +#: builtin/rebase.c:526 msgid "onto" msgstr "ovanpå" -#: builtin/rebase.c:530 +#: builtin/rebase.c:529 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:530 +#: builtin/rebase.c:529 msgid "restrict revision" msgstr "begränsa revision" -#: builtin/rebase.c:532 +#: builtin/rebase.c:531 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:533 +#: builtin/rebase.c:532 msgid "squash onto" msgstr "tryck ihop ovanpå" -#: builtin/rebase.c:535 +#: builtin/rebase.c:534 msgid "the upstream commit" msgstr "uppströmsincheckningen" -#: builtin/rebase.c:537 +#: builtin/rebase.c:536 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:537 +#: builtin/rebase.c:536 msgid "head name" msgstr "namn på huvud" -#: builtin/rebase.c:542 +#: builtin/rebase.c:541 msgid "rebase strategy" msgstr "sammanslagningsstrategi" -#: builtin/rebase.c:543 +#: builtin/rebase.c:542 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:544 +#: builtin/rebase.c:543 msgid "strategy options" msgstr "strategiflaggor" -#: builtin/rebase.c:545 +#: builtin/rebase.c:544 msgid "switch-to" msgstr "switch-to" -#: builtin/rebase.c:546 +#: builtin/rebase.c:545 msgid "the branch or commit to checkout" msgstr "gren eller inchecking att checka ut" -#: builtin/rebase.c:547 +#: builtin/rebase.c:546 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:547 +#: builtin/rebase.c:546 msgid "onto name" msgstr "på-namn" -#: builtin/rebase.c:548 +#: builtin/rebase.c:547 msgid "cmd" msgstr "kmd" -#: builtin/rebase.c:548 +#: builtin/rebase.c:547 msgid "the command to run" msgstr "kommando att köra" -#: builtin/rebase.c:551 builtin/rebase.c:1427 +#: builtin/rebase.c:550 builtin/rebase.c:1422 msgid "automatically re-schedule any `exec` that fails" msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt" -#: builtin/rebase.c:567 +#: builtin/rebase.c:566 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges" -#: builtin/rebase.c:583 +#: builtin/rebase.c:582 #, c-format msgid "%s requires the merge backend" msgstr "%s kräver \"merge\"-bakändan" -#: builtin/rebase.c:626 +#: builtin/rebase.c:625 #, c-format msgid "could not get 'onto': '%s'" msgstr "kunde inte hämta \"onto\": \"%s\"" -#: builtin/rebase.c:643 +#: builtin/rebase.c:642 #, c-format msgid "invalid orig-head: '%s'" msgstr "ogiltigt orig-head: \"%s\"" -#: builtin/rebase.c:668 +#: builtin/rebase.c:667 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\"" @@ -19567,7 +19878,7 @@ msgstr "" "\n" "Därför kan inte git ombasera dessa." -#: builtin/rebase.c:1227 +#: builtin/rebase.c:1222 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -19575,7 +19886,7 @@ msgid "" msgstr "" "okänd tom-typ \"%s\"; giltiga värden är \"drop\", \"keep\" och \"ask\"." -#: builtin/rebase.c:1245 +#: builtin/rebase.c:1240 #, c-format msgid "" "%s\n" @@ -19592,7 +19903,7 @@ msgstr "" " git rebase '<gren>'\n" "\n" -#: builtin/rebase.c:1261 +#: builtin/rebase.c:1256 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -19605,190 +19916,182 @@ msgstr "" " git branch --set-upstream-to=%s/<gren> %s\n" "\n" -#: builtin/rebase.c:1291 +#: builtin/rebase.c:1286 msgid "exec commands cannot contain newlines" msgstr "exec-kommandon kan inte innehålla nyradstecken" -#: builtin/rebase.c:1295 +#: builtin/rebase.c:1290 msgid "empty exec command" msgstr "tomt exec-kommando" -#: builtin/rebase.c:1324 +#: builtin/rebase.c:1319 msgid "rebase onto given branch instead of upstream" msgstr "ombasera mot given grenen istället för uppström" -#: builtin/rebase.c:1326 +#: builtin/rebase.c:1321 msgid "use the merge-base of upstream and branch as the current base" msgstr "använd sammanslagningsbasen mellan uppströms och gren som aktuell bas" -#: builtin/rebase.c:1328 +#: builtin/rebase.c:1323 msgid "allow pre-rebase hook to run" msgstr "tillåt pre-rebase-krok att köra" -#: builtin/rebase.c:1330 +#: builtin/rebase.c:1325 msgid "be quiet. implies --no-stat" msgstr "var tyst. implicerar --no-stat" -#: builtin/rebase.c:1336 +#: builtin/rebase.c:1331 msgid "do not show diffstat of what changed upstream" msgstr "visa inte en diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1334 msgid "add a Signed-off-by trailer to each commit" msgstr "lägg \"Signed-off-by:\"-släprad till varje incheckning" -#: builtin/rebase.c:1342 +#: builtin/rebase.c:1337 msgid "make committer date match author date" msgstr "sätt incheckningsdatum till författardatum" -#: builtin/rebase.c:1344 +#: builtin/rebase.c:1339 msgid "ignore author date and use current date" msgstr "ignorera författardatum och använd nuvarande" -#: builtin/rebase.c:1346 +#: builtin/rebase.c:1341 msgid "synonym of --reset-author-date" msgstr "synonym för --reset-author-date" -#: builtin/rebase.c:1348 builtin/rebase.c:1352 +#: builtin/rebase.c:1343 builtin/rebase.c:1347 msgid "passed to 'git apply'" msgstr "sänds till \"git apply\"" -#: builtin/rebase.c:1350 +#: builtin/rebase.c:1345 msgid "ignore changes in whitespace" msgstr "ignorera ändringar i blanksteg" -#: builtin/rebase.c:1354 builtin/rebase.c:1357 +#: builtin/rebase.c:1349 builtin/rebase.c:1352 msgid "cherry-pick all commits, even if unchanged" msgstr "utför cherry-pick på alla incheckningar, även om oändrad" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1354 msgid "continue" msgstr "fortsätt" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1357 msgid "skip current patch and continue" msgstr "hoppa över nuvarande patch och fortsätt" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1359 msgid "abort and check out the original branch" msgstr "avbryt och checka ut ursprungsgrenen" -#: builtin/rebase.c:1367 +#: builtin/rebase.c:1362 msgid "abort but keep HEAD where it is" msgstr "avbryt men behåll HEAD där det är" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1363 msgid "edit the todo list during an interactive rebase" msgstr "redigera attgöra-listan under interaktiv ombasering." -#: builtin/rebase.c:1371 +#: builtin/rebase.c:1366 msgid "show the patch file being applied or merged" msgstr "visa patchen som tillämpas eller slås samman" -#: builtin/rebase.c:1374 +#: builtin/rebase.c:1369 msgid "use apply strategies to rebase" msgstr "använd appliceringstrategier för ombasering" -#: builtin/rebase.c:1378 +#: builtin/rebase.c:1373 msgid "use merging strategies to rebase" msgstr "använd sammanslagningsstrategier för ombasering" -#: builtin/rebase.c:1382 +#: builtin/rebase.c:1377 msgid "let the user edit the list of commits to rebase" msgstr "låt användaren redigera listan över incheckningar att ombasera" -#: builtin/rebase.c:1386 +#: builtin/rebase.c:1381 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" "(AVRÅDS) försök återskapa sammanslagningar istället för att ignorera dem" -#: builtin/rebase.c:1391 +#: builtin/rebase.c:1386 msgid "how to handle commits that become empty" msgstr "hur incheckningar som blir tomma ska hanteras" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1393 msgid "move commits that begin with squash!/fixup! under -i" msgstr "flytta incheckningar som börjar med squash!/fixup! under -i" -#: builtin/rebase.c:1405 +#: builtin/rebase.c:1400 msgid "add exec lines after each commit of the editable list" msgstr "lägg till exec-rader efter varje incheckning i den redigerbara listan" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1404 msgid "allow rebasing commits with empty messages" msgstr "tillåt ombasering av incheckningar med tomt meddelande" -#: builtin/rebase.c:1413 +#: builtin/rebase.c:1408 msgid "try to rebase merges instead of skipping them" msgstr "försök ombasera sammanslagningar istället för att ignorera dem" -#: builtin/rebase.c:1416 +#: builtin/rebase.c:1411 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "använd \"merge-base --fork-point\" för att förfina uppström" -#: builtin/rebase.c:1418 +#: builtin/rebase.c:1413 msgid "use the given merge strategy" msgstr "använd angiven sammanslagningsstrategi" -#: builtin/rebase.c:1420 builtin/revert.c:115 +#: builtin/rebase.c:1415 builtin/revert.c:115 msgid "option" msgstr "alternativ" -#: builtin/rebase.c:1421 +#: builtin/rebase.c:1416 msgid "pass the argument through to the merge strategy" msgstr "sänd flaggan till sammanslagningsstrategin" -#: builtin/rebase.c:1424 +#: builtin/rebase.c:1419 msgid "rebase all reachable commits up to the root(s)" msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna" -#: builtin/rebase.c:1429 +#: builtin/rebase.c:1424 msgid "apply all changes, even those already present upstream" msgstr "applicera alla ändringar, även de som redan finns uppströms" -#: builtin/rebase.c:1446 -msgid "" -"the rebase.useBuiltin support has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"stödet för rebase.useBuiltin har tagits bort!\n" -"Se posten för det i \"git help config\" för detaljer." - -#: builtin/rebase.c:1452 +#: builtin/rebase.c:1442 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera." -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1483 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges avråds från. Använd --rebase-merges istället." -#: builtin/rebase.c:1498 +#: builtin/rebase.c:1488 msgid "cannot combine '--keep-base' with '--onto'" msgstr "kan inte kombinera \"--keep-base\" med \"--onto\"" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1490 msgid "cannot combine '--keep-base' with '--root'" msgstr "kan inte kombinera \"--keep-base\" med \"--root\"" -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1494 msgid "cannot combine '--root' with '--fork-point'" msgstr "kan inte kombinera \"--root\" med \"--fork-point\"" -#: builtin/rebase.c:1507 +#: builtin/rebase.c:1497 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: builtin/rebase.c:1511 +#: builtin/rebase.c:1501 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." -#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: builtin/rebase.c:1546 +#: builtin/rebase.c:1536 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -19796,16 +20099,16 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: builtin/rebase.c:1565 +#: builtin/rebase.c:1555 msgid "could not discard worktree changes" msgstr "kunde inte kasta ändringar i arbetskatalogen" -#: builtin/rebase.c:1584 +#: builtin/rebase.c:1574 #, c-format msgid "could not move back to %s" msgstr "kunde inte flytta tillbaka till %s" -#: builtin/rebase.c:1630 +#: builtin/rebase.c:1620 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -19826,134 +20129,134 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där.\n" -#: builtin/rebase.c:1658 +#: builtin/rebase.c:1648 msgid "switch `C' expects a numerical value" msgstr "flaggan \"C\" förväntar ett numeriskt värde" -#: builtin/rebase.c:1700 +#: builtin/rebase.c:1690 #, c-format msgid "Unknown mode: %s" msgstr "Okänt läge: %s" -#: builtin/rebase.c:1739 +#: builtin/rebase.c:1729 msgid "--strategy requires --merge or --interactive" msgstr "--strategy kräver --merge eller --interactive" -#: builtin/rebase.c:1769 +#: builtin/rebase.c:1759 msgid "cannot combine apply options with merge options" msgstr "kan inte kombinera apply-flaggor med merge-flaggor" -#: builtin/rebase.c:1782 +#: builtin/rebase.c:1772 #, c-format msgid "Unknown rebase backend: %s" msgstr "Okänd rebase-bakända: %s" -#: builtin/rebase.c:1812 +#: builtin/rebase.c:1802 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec kräver --exec eller --interactive" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1822 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\"" -#: builtin/rebase.c:1836 +#: builtin/rebase.c:1826 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec" "\"" -#: builtin/rebase.c:1860 +#: builtin/rebase.c:1850 #, c-format msgid "invalid upstream '%s'" msgstr "felaktig uppström \"%s\"" -#: builtin/rebase.c:1866 +#: builtin/rebase.c:1856 msgid "Could not create new root commit" msgstr "kunde inte skapa ny rotincheckning" -#: builtin/rebase.c:1892 +#: builtin/rebase.c:1882 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "\"%s\": behöver precis en sammanslagningsbas med gren" -#: builtin/rebase.c:1895 +#: builtin/rebase.c:1885 #, c-format msgid "'%s': need exactly one merge base" msgstr "\"%s\": behöver precis en sammanslagningsbas" -#: builtin/rebase.c:1903 +#: builtin/rebase.c:1893 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Pekar inte på en giltig incheckning: \"%s\"" -#: builtin/rebase.c:1931 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\"" -#: builtin/rebase.c:1939 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:2414 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2415 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/rebase.c:1950 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" msgstr "Kunde inte bestämma HEAD:s incheckning" -#: builtin/rebase.c:1971 +#: builtin/rebase.c:1961 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: builtin/rebase.c:2007 +#: builtin/rebase.c:1997 #, c-format msgid "could not switch to %s" msgstr "kunde inte växla till %s" -#: builtin/rebase.c:2018 +#: builtin/rebase.c:2008 msgid "HEAD is up to date." msgstr "HEAD är à jour." -#: builtin/rebase.c:2020 +#: builtin/rebase.c:2010 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Aktuell gren %s är à jour.\n" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:2018 msgid "HEAD is up to date, rebase forced." msgstr "HEAD är à jour, ombasering framtvingad." -#: builtin/rebase.c:2030 +#: builtin/rebase.c:2020 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Aktuell gren %s är à jour, ombasering framtvingad.\n" -#: builtin/rebase.c:2038 +#: builtin/rebase.c:2028 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: builtin/rebase.c:2045 +#: builtin/rebase.c:2035 #, c-format msgid "Changes to %s:\n" msgstr "Ändringar till %s:\n" -#: builtin/rebase.c:2048 +#: builtin/rebase.c:2038 #, c-format msgid "Changes from %s to %s:\n" msgstr "Ändringar från %s till %s:\n" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:2063 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det...\n" -#: builtin/rebase.c:2082 +#: builtin/rebase.c:2072 msgid "Could not detach HEAD" msgstr "Kunde inte koppla från HEAD" -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2081 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Snabbspolade %s till %s.\n" @@ -20013,11 +20316,11 @@ msgstr "" "\n" "För att undvika detta meddelande kan du sätta det till \"refuse\"." -#: builtin/receive-pack.c:2481 +#: builtin/receive-pack.c:2479 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:2495 +#: builtin/receive-pack.c:2493 msgid "You must specify a directory." msgstr "Du måste ange en katalog." @@ -20252,7 +20555,7 @@ msgstr "" "\t%s:%d\n" "anger nu den icke-existerande fjärren \"%s\"" -#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 +#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943 #, c-format msgid "No such remote: '%s'" msgstr "Ingen sådan fjärr: \"%s\"" @@ -20606,7 +20909,7 @@ msgstr "" msgid "could not start pack-objects to repack promisor objects" msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt" -#: builtin/repack.c:270 builtin/repack.c:446 +#: builtin/repack.c:270 builtin/repack.c:630 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Förväntar kompletta hex-objekt-id-rader endast från pack-objects." @@ -20615,104 +20918,127 @@ msgstr "" msgid "could not finish pack-objects to repack promisor objects" msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt" -#: builtin/repack.c:322 +#: builtin/repack.c:309 +#, c-format +msgid "cannot open index for %s" +msgstr "kunde inte öppna indexet för %s" + +#: builtin/repack.c:368 +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "paketet %s för stort för att tas med i geometriskt förlopp" + +#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413 +#, c-format +msgid "pack %s too large to roll up" +msgstr "paketet %s för stort att rulla upp" + +#: builtin/repack.c:460 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:324 +#: builtin/repack.c:462 msgid "same as -a, and turn unreachable objects loose" msgstr "samma som -a, och gör onåbara objekt lösa" -#: builtin/repack.c:327 +#: builtin/repack.c:465 msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort överflödiga paket, och kör git-prune-packed" -#: builtin/repack.c:329 +#: builtin/repack.c:467 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "sänd --no-reuse-delta till git-pack-objects" -#: builtin/repack.c:331 +#: builtin/repack.c:469 msgid "pass --no-reuse-object to git-pack-objects" msgstr "sänd --no-reuse-object till git-pack-objects" -#: builtin/repack.c:333 +#: builtin/repack.c:471 msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" -#: builtin/repack.c:336 +#: builtin/repack.c:474 msgid "pass --local to git-pack-objects" msgstr "sänd --local till git-pack-objects" -#: builtin/repack.c:338 +#: builtin/repack.c:476 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:340 +#: builtin/repack.c:478 msgid "pass --delta-islands to git-pack-objects" msgstr "sänd --delta-islands till git-pack-objects" -#: builtin/repack.c:341 +#: builtin/repack.c:479 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:342 +#: builtin/repack.c:480 msgid "with -A, do not loosen objects older than this" msgstr "med -A, lös inte upp objekt äldre än detta" -#: builtin/repack.c:344 +#: builtin/repack.c:482 msgid "with -a, repack unreachable objects" msgstr "med -a, packa om onåbara objekt" -#: builtin/repack.c:346 +#: builtin/repack.c:484 msgid "size of the window used for delta compression" msgstr "storlek på fönster använt för deltakomprimering" -#: builtin/repack.c:347 builtin/repack.c:353 +#: builtin/repack.c:485 builtin/repack.c:491 msgid "bytes" msgstr "byte" -#: builtin/repack.c:348 +#: builtin/repack.c:486 msgid "same as the above, but limit memory size instead of entries count" msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal" -#: builtin/repack.c:350 +#: builtin/repack.c:488 msgid "limits the maximum delta depth" msgstr "begränsa maximalt deltadjup" -#: builtin/repack.c:352 +#: builtin/repack.c:490 msgid "limits the maximum number of threads" msgstr "begränsar maximalt antal trådar" -#: builtin/repack.c:354 +#: builtin/repack.c:492 msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:356 +#: builtin/repack.c:494 msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:358 +#: builtin/repack.c:496 msgid "do not repack this pack" msgstr "packa inte om detta paket" -#: builtin/repack.c:368 +#: builtin/repack.c:498 +msgid "find a geometric progression with factor <N>" +msgstr "hitta ett geometrisk förlopp med faktor <N>" + +#: builtin/repack.c:508 msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" -#: builtin/repack.c:372 +#: builtin/repack.c:512 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:455 +#: builtin/repack.c:527 +msgid "--geometric is incompatible with -A, -a" +msgstr "--geometric är inkompatibel med -A, -a" + +#: builtin/repack.c:639 msgid "Nothing new to pack." msgstr "Inget nytt att packa." -#: builtin/repack.c:485 +#: builtin/repack.c:669 #, c-format msgid "missing required file: %s" msgstr "nödvändig fil saknas: %s" -#: builtin/repack.c:487 +#: builtin/repack.c:671 #, c-format msgid "could not unlink: %s" msgstr "kunde inte ta bort: \"%s\"" @@ -21045,8 +21371,8 @@ msgstr "HEAD är nu på %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." -#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661 -#: builtin/stash.c:685 +#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663 +#: builtin/stash.c:687 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" @@ -21130,19 +21456,19 @@ msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-list.c:534 +#: builtin/rev-list.c:538 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "kan inte kombinera --exclude-promisor-objects och --missing" -#: builtin/rev-list.c:595 +#: builtin/rev-list.c:599 msgid "object filtering requires --objects" msgstr "objektfiltrering kräver --objects" -#: builtin/rev-list.c:651 +#: builtin/rev-list.c:659 msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-list.c:656 +#: builtin/rev-list.c:664 msgid "marked counting is incompatible with --objects" msgstr "markerad räkning är inkompatibelt med --objects" @@ -21255,19 +21581,19 @@ msgstr "behåll incheckningar som börjar som tomma" msgid "keep redundant, empty commits" msgstr "behåll redundanta, tomma incheckningar" -#: builtin/revert.c:239 +#: builtin/revert.c:237 msgid "revert failed" msgstr "\"revert\" misslyckades" -#: builtin/revert.c:252 +#: builtin/revert.c:250 msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" -#: builtin/rm.c:19 +#: builtin/rm.c:20 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<flaggor>] [--] <fil>..." -#: builtin/rm.c:207 +#: builtin/rm.c:208 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -21279,7 +21605,7 @@ msgstr[0] "" msgstr[1] "" "följande filer har köat innehåll som skiljer sig både från filen och HEAD:" -#: builtin/rm.c:212 +#: builtin/rm.c:213 msgid "" "\n" "(use -f to force removal)" @@ -21287,13 +21613,13 @@ msgstr "" "\n" "(använd -f för att tvinga borttagning)" -#: builtin/rm.c:216 +#: builtin/rm.c:217 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "följande fil har ändringar köade i indexet:" msgstr[1] "följande filer har ändringar köade i indexet:" -#: builtin/rm.c:220 builtin/rm.c:229 +#: builtin/rm.c:221 builtin/rm.c:230 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -21301,47 +21627,47 @@ msgstr "" "\n" "(använd --cached för att behålla filen eller -f för att tvinga borttagning)" -#: builtin/rm.c:226 +#: builtin/rm.c:227 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "följande fil har lokala ändringar:" msgstr[1] "följande filer har lokala ändringar:" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "do not list removed files" msgstr "lista inte borttagna filer" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "only remove from the index" msgstr "ta bara bort från indexet" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "override the up-to-date check" msgstr "överstyr àjour-testet" -#: builtin/rm.c:246 +#: builtin/rm.c:247 msgid "allow recursive removal" msgstr "tillåt rekursiv borttagning" -#: builtin/rm.c:248 +#: builtin/rm.c:249 msgid "exit with a zero status even if nothing matched" msgstr "avsluta med nollstatus även om inget träffades" -#: builtin/rm.c:282 +#: builtin/rm.c:283 msgid "No pathspec was given. Which files should I remove?" msgstr "Ingen sökvägsangivelse gavs. Vilka filer ska jag ta bort?" -#: builtin/rm.c:305 +#: builtin/rm.c:310 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "löa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta" -#: builtin/rm.c:323 +#: builtin/rm.c:331 #, c-format msgid "not removing '%s' recursively without -r" msgstr "tar inte bort \"%s\" rekursivt utan -r" -#: builtin/rm.c:362 +#: builtin/rm.c:379 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" @@ -21619,103 +21945,111 @@ msgstr "visa inte resultat på standard ut (användbart med --verify)" msgid "show refs from stdin that aren't in local repository" msgstr "visa referenser från standard in som inte finns i lokalt arkiv" -#: builtin/sparse-checkout.c:21 +#: builtin/sparse-checkout.c:22 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <flaggor>" -#: builtin/sparse-checkout.c:45 +#: builtin/sparse-checkout.c:46 msgid "git sparse-checkout list" msgstr "git sparse-checkout list" -#: builtin/sparse-checkout.c:71 +#: builtin/sparse-checkout.c:72 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" "arbetskatalogen är inte glest (sparse-checkout-filen kanske inte finns)" -#: builtin/sparse-checkout.c:223 +#: builtin/sparse-checkout.c:227 msgid "failed to create directory for sparse-checkout file" msgstr "misslyckades skapa katalog för \"sparse-checkout\"-filen" -#: builtin/sparse-checkout.c:264 +#: builtin/sparse-checkout.c:268 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "kunde inte uppgradera arkivformat för att aktivera worktreeConfig" -#: builtin/sparse-checkout.c:266 +#: builtin/sparse-checkout.c:270 msgid "failed to set extensions.worktreeConfig setting" msgstr "misslyckades ändra inställningen extensions.worktreeConfig" -#: builtin/sparse-checkout.c:283 -msgid "git sparse-checkout init [--cone]" -msgstr "git sparse-checkout init [--cone]" +#: builtin/sparse-checkout.c:290 +msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" +msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" -#: builtin/sparse-checkout.c:302 +#: builtin/sparse-checkout.c:310 msgid "initialize the sparse-checkout in cone mode" msgstr "initiera sparse-checkout i konläge" -#: builtin/sparse-checkout.c:339 +#: builtin/sparse-checkout.c:312 +msgid "toggle the use of a sparse index" +msgstr "slå på/av använding av glest index" + +#: builtin/sparse-checkout.c:340 +msgid "failed to modify sparse-index config" +msgstr "misslyckades ändra inställning för sparse-index" + +#: builtin/sparse-checkout.c:361 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: builtin/sparse-checkout.c:396 +#: builtin/sparse-checkout.c:419 #, c-format msgid "could not normalize path %s" msgstr "kunde inte normalisera sökvägen \"%s\"" -#: builtin/sparse-checkout.c:408 +#: builtin/sparse-checkout.c:431 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <mönster>)" -#: builtin/sparse-checkout.c:433 +#: builtin/sparse-checkout.c:456 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "kan inte ta bort citering av C-sträng \"%s\"" -#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511 +#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 msgid "unable to load existing sparse-checkout patterns" msgstr "kunde inte läsa in existerande mönster för gles utcheckning" -#: builtin/sparse-checkout.c:556 +#: builtin/sparse-checkout.c:579 msgid "read patterns from standard in" msgstr "läs mönster från standard in" -#: builtin/sparse-checkout.c:571 +#: builtin/sparse-checkout.c:594 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:590 +#: builtin/sparse-checkout.c:613 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:618 +#: builtin/sparse-checkout.c:644 msgid "error while refreshing working directory" msgstr "fel vid uppdatering av arbetskatalog" -#: builtin/stash.c:22 builtin/stash.c:38 +#: builtin/stash.c:24 builtin/stash.c:40 msgid "git stash list [<options>]" msgstr "git stash list [<flaggor>]" -#: builtin/stash.c:23 builtin/stash.c:43 +#: builtin/stash.c:25 builtin/stash.c:45 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<flaggor>] [<stash>]" -#: builtin/stash.c:24 builtin/stash.c:48 +#: builtin/stash.c:26 builtin/stash.c:50 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" -#: builtin/stash.c:25 +#: builtin/stash.c:27 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:26 builtin/stash.c:63 +#: builtin/stash.c:28 builtin/stash.c:65 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <grennamn> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:68 +#: builtin/stash.c:29 builtin/stash.c:70 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 +#: builtin/stash.c:30 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" @@ -21727,7 +22061,7 @@ msgstr "" " [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n" " [--] [<sökväg>...]]" -#: builtin/stash.c:32 builtin/stash.c:85 +#: builtin/stash.c:34 builtin/stash.c:87 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -21735,19 +22069,19 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<meddelande>]" -#: builtin/stash.c:53 +#: builtin/stash.c:55 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:58 +#: builtin/stash.c:60 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:73 +#: builtin/stash.c:75 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <meddelande>] [-q|--quiet] <incheckning>" -#: builtin/stash.c:78 +#: builtin/stash.c:80 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" @@ -21757,30 +22091,30 @@ msgstr "" " [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n" " [--] [<sökväg>...]]" -#: builtin/stash.c:128 +#: builtin/stash.c:130 #, c-format msgid "'%s' is not a stash-like commit" msgstr "\"%s\" är inte en \"stash\"-liknande incheckning" -#: builtin/stash.c:148 +#: builtin/stash.c:150 #, c-format msgid "Too many revisions specified:%s" msgstr "För många revisioner angivna:%s" -#: builtin/stash.c:162 +#: builtin/stash.c:164 msgid "No stash entries found." msgstr "Inga \"stash\"-poster hittades." -#: builtin/stash.c:176 +#: builtin/stash.c:178 #, c-format msgid "%s is not a valid reference" msgstr "%s är inte en giltigt referens" -#: builtin/stash.c:225 +#: builtin/stash.c:227 msgid "git stash clear with arguments is unimplemented" msgstr "\"git stash clear\" med argument har inte implementerats" -#: builtin/stash.c:429 +#: builtin/stash.c:431 #, c-format msgid "" "WARNING: Untracked file in way of tracked file! Renaming\n" @@ -21791,150 +22125,166 @@ msgstr "" " %s -> %s\n" " för att lämna plats.\n" -#: builtin/stash.c:490 +#: builtin/stash.c:492 msgid "cannot apply a stash in the middle of a merge" msgstr "kan inte tillämpa en \"stash\" mitt i en sammanslagning" -#: builtin/stash.c:501 +#: builtin/stash.c:503 #, c-format msgid "could not generate diff %s^!." msgstr "kunde inte skapa diff %s^!." -#: builtin/stash.c:508 +#: builtin/stash.c:510 msgid "conflicts in index. Try without --index." msgstr "konflikter i indexet. Testa utan --index." -#: builtin/stash.c:514 +#: builtin/stash.c:516 msgid "could not save index tree" msgstr "kunde inte spara indexträd" -#: builtin/stash.c:523 +#: builtin/stash.c:525 msgid "could not restore untracked files from stash" msgstr "kunde inte återställa ospårade filer från stash-post" -#: builtin/stash.c:537 +#: builtin/stash.c:539 #, c-format msgid "Merging %s with %s" msgstr "Slår ihop %s med %s" -#: builtin/stash.c:547 +#: builtin/stash.c:549 msgid "Index was not unstashed." msgstr "Indexet har inte tagits upp ur \"stash\":en" -#: builtin/stash.c:589 builtin/stash.c:687 +#: builtin/stash.c:591 builtin/stash.c:689 msgid "attempt to recreate the index" msgstr "försök återskapa indexet" -#: builtin/stash.c:633 +#: builtin/stash.c:635 #, c-format msgid "Dropped %s (%s)" msgstr "Kastade %s (%s)" -#: builtin/stash.c:636 +#: builtin/stash.c:638 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Kunde inte kasta \"stash\"-post" -#: builtin/stash.c:649 +#: builtin/stash.c:651 #, c-format msgid "'%s' is not a stash reference" msgstr "\"%s\" är inte en \"stash\"-referens" -#: builtin/stash.c:699 +#: builtin/stash.c:701 msgid "The stash entry is kept in case you need it again." msgstr "Stash-posten behålls ifall du behöver den igen." -#: builtin/stash.c:722 +#: builtin/stash.c:724 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: builtin/stash.c:866 builtin/stash.c:903 +#: builtin/stash.c:808 +msgid "failed to parse tree" +msgstr "misslyckades tolka träd" + +#: builtin/stash.c:819 +msgid "failed to unpack trees" +msgstr "misslyckades packa upp träd" + +#: builtin/stash.c:839 +msgid "include untracked files in the stash" +msgstr "ta med ospårade filer i \"stash\"" + +#: builtin/stash.c:842 +msgid "only show untracked files in the stash" +msgstr "visa bara ospårade filer i \"stash\"" + +#: builtin/stash.c:932 builtin/stash.c:969 #, c-format msgid "Cannot update %s with %s" msgstr "Kan inte uppdatera %s med %s" -#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603 +#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671 msgid "stash message" msgstr "\"stash\"-meddelande" -#: builtin/stash.c:894 +#: builtin/stash.c:960 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" kräver ett <incheckning>-argument" -#: builtin/stash.c:1109 +#: builtin/stash.c:1175 msgid "No changes selected" msgstr "Inga ändringar valda" -#: builtin/stash.c:1209 +#: builtin/stash.c:1275 msgid "You do not have the initial commit yet" msgstr "Du har inte den första incheckningen ännu" -#: builtin/stash.c:1236 +#: builtin/stash.c:1302 msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstånd för indexet" -#: builtin/stash.c:1245 +#: builtin/stash.c:1311 msgid "Cannot save the untracked files" msgstr "Kan inte spara ospårade filer" -#: builtin/stash.c:1256 builtin/stash.c:1265 +#: builtin/stash.c:1322 builtin/stash.c:1331 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" -#: builtin/stash.c:1293 +#: builtin/stash.c:1359 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: builtin/stash.c:1342 +#: builtin/stash.c:1408 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt" -#: builtin/stash.c:1358 +#: builtin/stash.c:1426 msgid "Did you forget to 'git add'?" msgstr "Glömde du använda \"git add\"?" -#: builtin/stash.c:1373 +#: builtin/stash.c:1441 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: builtin/stash.c:1380 +#: builtin/stash.c:1448 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: builtin/stash.c:1395 +#: builtin/stash.c:1463 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: builtin/stash.c:1400 +#: builtin/stash.c:1468 #, c-format msgid "Saved working directory and index state %s" msgstr "Sparade arbetskatalogen och indexstatus %s" -#: builtin/stash.c:1490 +#: builtin/stash.c:1558 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: builtin/stash.c:1529 builtin/stash.c:1594 +#: builtin/stash.c:1597 builtin/stash.c:1662 msgid "keep index" msgstr "behåll indexet" -#: builtin/stash.c:1531 builtin/stash.c:1596 +#: builtin/stash.c:1599 builtin/stash.c:1664 msgid "stash in patch mode" msgstr "\"stash\" i \"patch\"-läge" -#: builtin/stash.c:1532 builtin/stash.c:1597 +#: builtin/stash.c:1600 builtin/stash.c:1665 msgid "quiet mode" msgstr "tyst läge" -#: builtin/stash.c:1534 builtin/stash.c:1599 +#: builtin/stash.c:1602 builtin/stash.c:1667 msgid "include untracked files in stash" msgstr "ta med ospårade filer i \"stash\"" -#: builtin/stash.c:1536 builtin/stash.c:1601 +#: builtin/stash.c:1604 builtin/stash.c:1669 msgid "include ignore files" msgstr "ta med ignorerade filer" -#: builtin/stash.c:1636 +#: builtin/stash.c:1704 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -21958,7 +22308,7 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken" msgid "prepend comment character and space to each line" msgstr "lägg in kommentarstecken och blanksteg först på varje rad" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" @@ -21972,7 +22322,7 @@ msgstr "submodule--helper print-default-remote tar inga argument" msgid "cannot strip one component off url '%s'" msgstr "kan inte ta bort en komponent från url:en \"%s\"" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" @@ -21980,18 +22330,18 @@ msgstr "alternativa ankare för relativa sökvägar" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:652 +#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:653 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:525 #, c-format msgid "Entering '%s'\n" msgstr "Går in i \"%s\"\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:528 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22000,7 +22350,7 @@ msgstr "" "run_command returnerade icke-nollstatus för %s\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:550 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22011,20 +22361,20 @@ msgstr "" "undermoduler för %s\n" "." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:566 msgid "suppress output of entering each submodule command" msgstr "dölj utdata från för varje undermodulskommando som startas" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 -#: builtin/submodule--helper.c:1487 +#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:1488 msgid "recurse into nested submodules" msgstr "rekursera in i nästlade undermoduler" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:573 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:600 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -22033,54 +22383,54 @@ msgstr "" "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget " "officiella uppström." -#: builtin/submodule--helper.c:666 +#: builtin/submodule--helper.c:667 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:670 +#: builtin/submodule--helper.c:671 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:680 +#: builtin/submodule--helper.c:681 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n" -#: builtin/submodule--helper.c:687 +#: builtin/submodule--helper.c:688 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:709 +#: builtin/submodule--helper.c:710 msgid "suppress output for initializing a submodule" msgstr "dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:714 +#: builtin/submodule--helper.c:715 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<flaggor>] [<sökväg>]" -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 +#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\"" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:836 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\"" -#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "misslyckades rekursera in i undermodulen \"%s\"" -#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 +#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624 msgid "suppress submodule status output" msgstr "hindra statusutskrift för undermodul" -#: builtin/submodule--helper.c:887 +#: builtin/submodule--helper.c:888 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -22088,100 +22438,100 @@ msgstr "" "visa incheckning från indexet istället för den som lagrats i undermodulens " "HEAD" -#: builtin/submodule--helper.c:893 +#: builtin/submodule--helper.c:894 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]" -#: builtin/submodule--helper.c:917 +#: builtin/submodule--helper.c:918 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:990 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" -#: builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:993 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(submodule)->%s(blob)" -#: builtin/submodule--helper.c:1005 +#: builtin/submodule--helper.c:1006 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1056 #, c-format msgid "couldn't hash object from '%s'" msgstr "kunde inte hasha objekt från \"%s\"" -#: builtin/submodule--helper.c:1059 +#: builtin/submodule--helper.c:1060 #, c-format msgid "unexpected mode %o\n" msgstr "okänt läge %o\n" -#: builtin/submodule--helper.c:1300 +#: builtin/submodule--helper.c:1301 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "använd incechkning lagrad i indexet istället för undermodulens HEAD" -#: builtin/submodule--helper.c:1302 +#: builtin/submodule--helper.c:1303 msgid "to compare the commit in the index with that in the submodule HEAD" msgstr "" "för att jämföra incheckningen i indexet med den som lagrats i undermodulens " "HEAD" -#: builtin/submodule--helper.c:1304 +#: builtin/submodule--helper.c:1305 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "" "hoppa över undermoduler där värdet för \"ignore_config\" är satt till \"all\"" -#: builtin/submodule--helper.c:1306 +#: builtin/submodule--helper.c:1307 msgid "limit the summary size" msgstr "begränsa översiktsstorleken" -#: builtin/submodule--helper.c:1311 +#: builtin/submodule--helper.c:1312 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "" "git submodule--helper summary [<flaggor>] [<incheckning>] [--] [<sökväg>]" -#: builtin/submodule--helper.c:1335 +#: builtin/submodule--helper.c:1336 msgid "could not fetch a revision for HEAD" msgstr "kunde inte hämta en version för HEAD" -#: builtin/submodule--helper.c:1340 +#: builtin/submodule--helper.c:1341 msgid "--cached and --files are mutually exclusive" msgstr "--cached och --files är ömsesidigt uteslutande" -#: builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1408 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synkroniserar undermodul-url för \"%s\"\n" -#: builtin/submodule--helper.c:1413 +#: builtin/submodule--helper.c:1414 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1427 +#: builtin/submodule--helper.c:1428 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "misslyckades hämta standardfjärr för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1439 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1485 +#: builtin/submodule--helper.c:1486 msgid "suppress output of synchronizing submodule url" msgstr "dölj utdata från synkronisering av undermodul-url" -#: builtin/submodule--helper.c:1492 +#: builtin/submodule--helper.c:1493 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]" -#: builtin/submodule--helper.c:1546 +#: builtin/submodule--helper.c:1547 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -22190,7 +22540,7 @@ msgstr "" "Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf" "\" om du verkligen vill ta bort den och all dess historik)" -#: builtin/submodule--helper.c:1558 +#: builtin/submodule--helper.c:1559 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -22199,46 +22549,46 @@ msgstr "" "Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort " "dem" -#: builtin/submodule--helper.c:1566 +#: builtin/submodule--helper.c:1567 #, c-format msgid "Cleared directory '%s'\n" msgstr "Rensade katalogen \"%s\"\n" -#: builtin/submodule--helper.c:1568 +#: builtin/submodule--helper.c:1569 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n" -#: builtin/submodule--helper.c:1579 +#: builtin/submodule--helper.c:1580 #, c-format msgid "could not create empty submodule directory %s" msgstr "kunde inte skapa tom undermodulskatalog %s" -#: builtin/submodule--helper.c:1595 +#: builtin/submodule--helper.c:1596 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:1625 msgid "remove submodule working trees even if they contain local changes" msgstr "" "ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1626 msgid "unregister all submodules" msgstr "avregistrera alla undermoduler" -#: builtin/submodule--helper.c:1630 +#: builtin/submodule--helper.c:1631 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]" -#: builtin/submodule--helper.c:1644 +#: builtin/submodule--helper.c:1645 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler" -#: builtin/submodule--helper.c:1713 +#: builtin/submodule--helper.c:1714 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -22250,46 +22600,46 @@ msgstr "" "submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n" "med \"--reference-if-able\" istället för \"--reference\"." -#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 +#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s" -#: builtin/submodule--helper.c:1791 +#: builtin/submodule--helper.c:1792 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte" -#: builtin/submodule--helper.c:1798 +#: builtin/submodule--helper.c:1799 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte" -#: builtin/submodule--helper.c:1822 +#: builtin/submodule--helper.c:1823 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen ska klonas till" -#: builtin/submodule--helper.c:1825 +#: builtin/submodule--helper.c:1826 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:1828 +#: builtin/submodule--helper.c:1829 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:1836 +#: builtin/submodule--helper.c:1837 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 +#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351 msgid "disallow cloning into non-empty directory" msgstr "förhindra kloning till icke-tom katalog" -#: builtin/submodule--helper.c:1848 +#: builtin/submodule--helper.c:1849 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22299,103 +22649,103 @@ msgstr "" "<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --" "path <sökväg>" -#: builtin/submodule--helper.c:1873 +#: builtin/submodule--helper.c:1874 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "vägrar skapa/använda \"%s\" i en annan undermoduls gitkatalog" -#: builtin/submodule--helper.c:1884 +#: builtin/submodule--helper.c:1885 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" -#: builtin/submodule--helper.c:1888 +#: builtin/submodule--helper.c:1889 #, c-format msgid "directory not empty: '%s'" msgstr "katalogen inte tom: \"%s\"" -#: builtin/submodule--helper.c:1900 +#: builtin/submodule--helper.c:1901 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:1936 +#: builtin/submodule--helper.c:1937 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Ogiltigt uppdateringsläge \"%s\" för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1940 +#: builtin/submodule--helper.c:1941 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Ogiltigt uppdateringsläge \"%s\" konfigurerat för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:2041 +#: builtin/submodule--helper.c:2042 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:2045 +#: builtin/submodule--helper.c:2046 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:2075 +#: builtin/submodule--helper.c:2076 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:2104 +#: builtin/submodule--helper.c:2105 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:2254 +#: builtin/submodule--helper.c:2255 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:2265 +#: builtin/submodule--helper.c:2266 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Misslyckades klona \"%s\" för andra gången, avbryter" -#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:2330 +#: builtin/submodule--helper.c:2331 msgid "path into the working tree, across nested submodule boundaries" msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser" -#: builtin/submodule--helper.c:2334 +#: builtin/submodule--helper.c:2335 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:2340 +#: builtin/submodule--helper.c:2341 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "skapa en grund klon trunkerad till angivet antal revisioner" -#: builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2344 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:2345 +#: builtin/submodule--helper.c:2346 msgid "whether the initial clone should follow the shallow recommendation" msgstr "om den första klonen ska följa rekommendation för grund kloning" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2347 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:2357 +#: builtin/submodule--helper.c:2358 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:2370 +#: builtin/submodule--helper.c:2371 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:2418 +#: builtin/submodule--helper.c:2419 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -22404,84 +22754,84 @@ msgstr "" "Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men " "huvudprojektet är inte på någon gren" -#: builtin/submodule--helper.c:2541 +#: builtin/submodule--helper.c:2542 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\"" -#: builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2575 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:2580 +#: builtin/submodule--helper.c:2581 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]" -#: builtin/submodule--helper.c:2636 +#: builtin/submodule--helper.c:2637 msgid "check if it is safe to write to the .gitmodules file" msgstr "se om det är säkert att skriva till .gitmodules-filen" -#: builtin/submodule--helper.c:2639 +#: builtin/submodule--helper.c:2640 msgid "unset the config in the .gitmodules file" msgstr "ta bort konfigurationen från .gitmodules-filen" -#: builtin/submodule--helper.c:2644 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <namn> [<värde>]" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <namn>" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2647 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2665 git-submodule.sh:150 +#: builtin/submodule--helper.c:2666 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "se till att .gitmodules finns i arbetskatalogen" -#: builtin/submodule--helper.c:2681 +#: builtin/submodule--helper.c:2682 msgid "suppress output for setting url of a submodule" msgstr "dölj utdata från inställning av url för undermodul" -#: builtin/submodule--helper.c:2685 +#: builtin/submodule--helper.c:2686 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <sökväg> <nyurl>" -#: builtin/submodule--helper.c:2718 +#: builtin/submodule--helper.c:2719 msgid "set the default tracking branch to master" msgstr "välj master som förvald spårad gren" -#: builtin/submodule--helper.c:2720 +#: builtin/submodule--helper.c:2721 msgid "set the default tracking branch" msgstr "välj förvald spårad gren" -#: builtin/submodule--helper.c:2724 +#: builtin/submodule--helper.c:2725 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <sökväg>" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2726 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--brand) <gren> <sökväg>" -#: builtin/submodule--helper.c:2732 +#: builtin/submodule--helper.c:2733 msgid "--branch or --default required" msgstr "--branch eller --default krävs" -#: builtin/submodule--helper.c:2735 +#: builtin/submodule--helper.c:2736 msgid "--branch and --default are mutually exclusive" msgstr "--branch och --default är ömsesidigt uteslutande" -#: builtin/submodule--helper.c:2792 git.c:441 git.c:714 +#: builtin/submodule--helper.c:2793 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" -#: builtin/submodule--helper.c:2798 +#: builtin/submodule--helper.c:2799 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -22494,24 +22844,24 @@ msgstr "git symbolic-ref [<flaggor>] <namn> [<ref>]" msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <namn>" -#: builtin/symbolic-ref.c:40 +#: builtin/symbolic-ref.c:42 msgid "suppress error message for non-symbolic (detached) refs" msgstr "" "undertryck felmeddelanden för icke-symboliska (frånkopplade) referenser" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:43 msgid "delete symbolic ref" msgstr "ta bort symbolisk referens" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:44 msgid "shorten ref output" msgstr "förkorta ref-utdata" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 msgid "reason" msgstr "skäl" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 msgid "reason of the update" msgstr "skäl till uppdateringen" @@ -22543,17 +22893,17 @@ msgstr "" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <taggnamn>..." -#: builtin/tag.c:89 +#: builtin/tag.c:100 #, c-format msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:124 +#: builtin/tag.c:135 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:159 +#: builtin/tag.c:170 #, c-format msgid "" "\n" @@ -22566,7 +22916,7 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:163 +#: builtin/tag.c:174 #, c-format msgid "" "\n" @@ -22581,11 +22931,11 @@ msgstr "" "Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n" "du vill.\n" -#: builtin/tag.c:230 +#: builtin/tag.c:241 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:248 +#: builtin/tag.c:259 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -22598,139 +22948,139 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:264 +#: builtin/tag.c:275 msgid "bad object type." msgstr "felaktig objekttyp." -#: builtin/tag.c:317 +#: builtin/tag.c:328 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:324 +#: builtin/tag.c:335 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:435 +#: builtin/tag.c:446 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:437 +#: builtin/tag.c:448 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:439 +#: builtin/tag.c:450 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:440 +#: builtin/tag.c:451 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:442 +#: builtin/tag.c:453 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:444 +#: builtin/tag.c:455 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:446 +#: builtin/tag.c:457 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:448 +#: builtin/tag.c:459 msgid "force edit of tag message" msgstr "tvinga redigering av incheckningsmeddelande" -#: builtin/tag.c:449 +#: builtin/tag.c:460 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:452 +#: builtin/tag.c:463 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:453 +#: builtin/tag.c:464 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:454 builtin/update-ref.c:505 +#: builtin/tag.c:465 builtin/update-ref.c:505 msgid "create a reflog" msgstr "skapa en reflog" -#: builtin/tag.c:456 +#: builtin/tag.c:467 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:457 +#: builtin/tag.c:468 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:458 builtin/tag.c:460 +#: builtin/tag.c:469 builtin/tag.c:471 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:459 builtin/tag.c:461 +#: builtin/tag.c:470 builtin/tag.c:472 msgid "print only tags that don't contain the commit" msgstr "visa endast taggar som inte innehåller incheckningen" -#: builtin/tag.c:462 +#: builtin/tag.c:473 msgid "print only tags that are merged" msgstr "visa endast taggar som slagits samman" -#: builtin/tag.c:463 +#: builtin/tag.c:474 msgid "print only tags that are not merged" msgstr "visa endast taggar som ej slagits samman" -#: builtin/tag.c:467 +#: builtin/tag.c:478 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:515 +#: builtin/tag.c:526 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:537 +#: builtin/tag.c:548 msgid "-n option is only allowed in list mode" msgstr "Flaggan -n är endast tillåten i listläge" -#: builtin/tag.c:539 +#: builtin/tag.c:550 msgid "--contains option is only allowed in list mode" msgstr "Flaggan --contains är endast tillåten i listläge" -#: builtin/tag.c:541 +#: builtin/tag.c:552 msgid "--no-contains option is only allowed in list mode" msgstr "Flaggan --no-contains är endast tillåten i listläge" -#: builtin/tag.c:543 +#: builtin/tag.c:554 msgid "--points-at option is only allowed in list mode" msgstr "Flaggan --points-at är endast tillåten i listläge" -#: builtin/tag.c:545 +#: builtin/tag.c:556 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge" -#: builtin/tag.c:556 +#: builtin/tag.c:567 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:581 +#: builtin/tag.c:592 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:586 +#: builtin/tag.c:597 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:617 +#: builtin/tag.c:628 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" -#: builtin/unpack-objects.c:502 +#: builtin/unpack-objects.c:504 msgid "Unpacking objects" msgstr "Packar upp objekt" @@ -22794,143 +23144,143 @@ msgstr " OK" msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:974 +#: builtin/update-index.c:976 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:977 +#: builtin/update-index.c:979 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:980 +#: builtin/update-index.c:982 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:982 +#: builtin/update-index.c:984 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:984 +#: builtin/update-index.c:986 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:986 +#: builtin/update-index.c:988 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:989 +#: builtin/update-index.c:991 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:993 +#: builtin/update-index.c:995 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:997 +#: builtin/update-index.c:999 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1000 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1010 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1013 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1016 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1019 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1022 msgid "do not touch index-only entries" msgstr "rör inte \"endast index\"-poster" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1024 msgid "add to index only; do not add content to object database" msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1026 msgid "remove named paths even if present in worktree" msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1028 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1030 msgid "read list of paths to be updated from standard input" msgstr "läs lista över sökvägar att uppdatera från standard in" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1034 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1038 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "återfyll etapp 2 och 3 från angivna sökvägar" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1042 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1046 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1049 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1051 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1055 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1057 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1059 msgid "enable/disable untracked cache" msgstr "aktivera/inaktivera ospårad cache" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1061 msgid "test if the filesystem supports untracked cache" msgstr "testa om filsystemet stöder ospårad cache" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1063 msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1065 msgid "write out the index even if is not flagged as changed" msgstr "skriv ut indexet även om det inte angivits som ändrat" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1067 msgid "enable or disable file system monitor" msgstr "aktivera eller inaktivera filsystemsövervakning" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1069 msgid "mark files as fsmonitor valid" msgstr "markera filer som \"fsmonitor valid\"" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1072 msgid "clear fsmonitor valid bit" msgstr "töm \"fsmonitor valid\"-bit" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1175 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -22938,7 +23288,7 @@ msgstr "" "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen " "vill aktivera delat index" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1184 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -22946,7 +23296,7 @@ msgstr "" "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen " "vill inaktivera delat index" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1196 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -22954,11 +23304,11 @@ msgstr "" "core.untrackedCache är satt till true; ta bort eller ändra det om du " "verkligen vill inaktivera den ospårade cachen" -#: builtin/update-index.c:1198 +#: builtin/update-index.c:1200 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1208 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -22966,26 +23316,26 @@ msgstr "" "core.untrackedCache är satt till false; ta bort eller ändra det om du " "verkligen vill aktivera den ospårade cachen" -#: builtin/update-index.c:1210 +#: builtin/update-index.c:1212 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1220 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "core.fsmonitor inte satt; sätt om du verkligen vill aktivera fsmonitor" -#: builtin/update-index.c:1222 +#: builtin/update-index.c:1224 msgid "fsmonitor enabled" msgstr "fsmonitor aktiverat" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1227 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor är satt; ta bort om du verkligen vill inaktivera fsmonitor" -#: builtin/update-index.c:1229 +#: builtin/update-index.c:1231 msgid "fsmonitor disabled" msgstr "fsmonitor inaktiverat" @@ -23105,7 +23455,7 @@ msgstr "git worktree remove [<flaggor>] <arbetskatalog>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <sökväg>" -#: builtin/worktree.c:61 builtin/worktree.c:933 +#: builtin/worktree.c:61 builtin/worktree.c:935 #, c-format msgid "failed to delete '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -23178,104 +23528,104 @@ msgstr "Förbereder arbetskatalog (checkar ut \"%s\")" msgid "Preparing worktree (detached HEAD %s)" msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)" -#: builtin/worktree.c:480 +#: builtin/worktree.c:482 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog" -#: builtin/worktree.c:483 +#: builtin/worktree.c:485 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:485 +#: builtin/worktree.c:487 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:487 +#: builtin/worktree.c:489 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:488 +#: builtin/worktree.c:490 msgid "keep the new working tree locked" msgstr "låt arbetskatalogen förbli låst" -#: builtin/worktree.c:491 +#: builtin/worktree.c:493 msgid "set up tracking mode (see git-branch(1))" msgstr "ställ in spårningsläge (se git-branch(1))" -#: builtin/worktree.c:494 +#: builtin/worktree.c:496 msgid "try to match the new branch name with a remote-tracking branch" msgstr "försök träffa namn på ny gren mot en fjärrspårande gren" -#: builtin/worktree.c:502 +#: builtin/worktree.c:504 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" -#: builtin/worktree.c:563 +#: builtin/worktree.c:565 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track kan endast användas när ny gran skapas" -#: builtin/worktree.c:680 +#: builtin/worktree.c:682 msgid "show extended annotations and reasons, if available" msgstr "visa utökade annoteringar och grunder, om tillgängliga" -#: builtin/worktree.c:682 +#: builtin/worktree.c:684 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "" "lägg till \"prunable\"-annoteringar till arbetskataloger äldre än <tid>" -#: builtin/worktree.c:691 +#: builtin/worktree.c:693 msgid "--verbose and --porcelain are mutually exclusive" msgstr "--verbose och --porcelain är ömsesidigt uteslutande" -#: builtin/worktree.c:718 +#: builtin/worktree.c:720 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837 -#: builtin/worktree.c:961 +#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839 +#: builtin/worktree.c:963 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:732 builtin/worktree.c:765 +#: builtin/worktree.c:734 builtin/worktree.c:767 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:737 +#: builtin/worktree.c:739 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:739 +#: builtin/worktree.c:741 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:767 +#: builtin/worktree.c:769 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" -#: builtin/worktree.c:808 +#: builtin/worktree.c:810 msgid "working trees containing submodules cannot be moved or removed" msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort" -#: builtin/worktree.c:816 +#: builtin/worktree.c:818 msgid "force move even if worktree is dirty or locked" msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst" -#: builtin/worktree.c:839 builtin/worktree.c:963 +#: builtin/worktree.c:841 builtin/worktree.c:965 #, c-format msgid "'%s' is a main working tree" msgstr "\"%s\" är inte en huvudarbetskatalog" -#: builtin/worktree.c:844 +#: builtin/worktree.c:846 #, c-format msgid "could not figure out destination name from '%s'" msgstr "kunde inte lista ut målnamn från \"%s\"" -#: builtin/worktree.c:857 +#: builtin/worktree.c:859 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23284,7 +23634,7 @@ msgstr "" "kan inte flytta en låst arbetskatalog, orsak till lås: %s\n" "använd \"move -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:859 +#: builtin/worktree.c:861 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23292,38 +23642,38 @@ msgstr "" "kan inte flytta en låst arbetskatalog;\n" "använd \"move -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:862 +#: builtin/worktree.c:864 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s" -#: builtin/worktree.c:867 +#: builtin/worktree.c:869 #, c-format msgid "failed to move '%s' to '%s'" msgstr "misslyckades flytta \"%s\" till \"%s\"" -#: builtin/worktree.c:913 +#: builtin/worktree.c:915 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "misslyckades köra \"git status\" på \"%s\"" -#: builtin/worktree.c:917 +#: builtin/worktree.c:919 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" "\"%s\" innehåller ändrade eller ospårade filer, använd --force för att ta " "bort det" -#: builtin/worktree.c:922 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "misslyckades köra \"git status\" på \"%s\", kod %d" -#: builtin/worktree.c:945 +#: builtin/worktree.c:947 msgid "force removal even if worktree is dirty or locked" msgstr "tvinga ta bort även om arbetskatalogen är smutsig eller låst" -#: builtin/worktree.c:968 +#: builtin/worktree.c:970 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23332,7 +23682,7 @@ msgstr "" "kan inte ta bort en låst arbetskatalog, orsak till låset: %s\n" "använd \"remove -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:970 +#: builtin/worktree.c:972 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23340,17 +23690,17 @@ msgstr "" "kan inte ta bort en låst arbetskatalog;\n" "använd \"remove -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:973 +#: builtin/worktree.c:975 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s" -#: builtin/worktree.c:997 +#: builtin/worktree.c:999 #, c-format msgid "repair: %s: %s" msgstr "reparera: %s: %s" -#: builtin/worktree.c:1000 +#: builtin/worktree.c:1002 #, c-format msgid "error: %s: %s" msgstr "fel: %s: %s" @@ -23371,49 +23721,6 @@ msgstr "visa trädobjekt för underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast användbart vid felsökning" -#: http-fetch.c:118 -#, c-format -msgid "argument to --packfile must be a valid hash (got '%s')" -msgstr "" -"argumentet till --packfile måste vara ett giltigt hashvärde (fick '%s')" - -#: http-fetch.c:128 -msgid "not a git repository" -msgstr "inte ett git-arkiv" - -#: http-fetch.c:134 -msgid "--packfile requires --index-pack-args" -msgstr "--packfile kräver --index-pack-args" - -#: http-fetch.c:143 -msgid "--index-pack-args can only be used with --packfile" -msgstr "--index-pack-args kan endast användas med --packfile" - -#: t/helper/test-fast-rebase.c:141 -msgid "unhandled options" -msgstr "flaggor som inte hanterats" - -#: t/helper/test-fast-rebase.c:146 -msgid "error preparing revisions" -msgstr "fel när revisioner skulle förberedas" - -#: t/helper/test-reach.c:154 -#, c-format -msgid "commit %s is not marked reachable" -msgstr "incheckning %s är inte märkt nåbar" - -#: t/helper/test-reach.c:164 -msgid "too many commits marked reachable" -msgstr "för många incheckningar markerade nåbara" - -#: t/helper/test-serve-v2.c:7 -msgid "test-tool serve-v2 [<options>]" -msgstr "test-tool serve-v2 [<flaggor>]" - -#: t/helper/test-serve-v2.c:19 -msgid "exit immediately after advertising capabilities" -msgstr "avsluta omedelbart efter kungörelse av kapabiliteter" - #: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" @@ -23470,22 +23777,27 @@ msgstr "inget prefix angavs för --super-prefix\n" msgid "-c expects a configuration string\n" msgstr "-c förväntar en konfigurationssträng\n" -#: git.c:292 +#: git.c:260 +#, c-format +msgid "no config key given for --config-env\n" +msgstr "ingen konfigurationsnyckel angavs för --config-env\n" + +#: git.c:300 #, c-format msgid "no directory given for -C\n" msgstr "ingen katalog angavs för -C\n" -#: git.c:318 +#: git.c:326 #, c-format msgid "unknown option: %s\n" msgstr "okänd flagga: %s\n" -#: git.c:367 +#: git.c:375 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "vid expandering av aliaset \"%s\": \"%s\"" -#: git.c:376 +#: git.c:384 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -23494,39 +23806,39 @@ msgstr "" "aliaset \"%s\" ändrar miljövariabler.\n" "Du kan använda \"!git\" i aliaset för att göra det" -#: git.c:383 +#: git.c:391 #, c-format msgid "empty alias for %s" msgstr "tomt alias för %s" -#: git.c:386 +#: git.c:394 #, c-format msgid "recursive alias: %s" msgstr "rekursivt alias: %s" -#: git.c:468 +#: git.c:476 msgid "write failure on standard output" msgstr "skrivfel på standard ut" -#: git.c:470 +#: git.c:478 msgid "unknown write failure on standard output" msgstr "okänt skrivfel på standard ut" -#: git.c:472 +#: git.c:480 msgid "close failed on standard output" msgstr "stäng misslyckades på standard ut" -#: git.c:823 +#: git.c:833 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s" -#: git.c:873 +#: git.c:883 #, c-format msgid "cannot handle %s as a builtin" msgstr "kan inte hantera %s som inbyggd" -#: git.c:886 +#: git.c:896 #, c-format msgid "" "usage: %s\n" @@ -23535,17 +23847,167 @@ msgstr "" "användning: %s\n" "\n" -#: git.c:906 +#: git.c:916 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n" -#: git.c:918 +#: git.c:928 #, c-format msgid "failed to run command '%s': %s\n" msgstr "misslyckades köra kommandot \"%s\": %s\n" +#: http-fetch.c:118 +#, c-format +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "" +"argumentet till --packfile måste vara ett giltigt hashvärde (fick '%s')" + +#: http-fetch.c:128 +msgid "not a git repository" +msgstr "inte ett git-arkiv" + +#: http-fetch.c:134 +msgid "--packfile requires --index-pack-args" +msgstr "--packfile kräver --index-pack-args" + +#: http-fetch.c:143 +msgid "--index-pack-args can only be used with --packfile" +msgstr "--index-pack-args kan endast användas med --packfile" + +#: t/helper/test-fast-rebase.c:141 +msgid "unhandled options" +msgstr "flaggor som inte hanterats" + +#: t/helper/test-fast-rebase.c:146 +msgid "error preparing revisions" +msgstr "fel när revisioner skulle förberedas" + +#: t/helper/test-reach.c:154 +#, c-format +msgid "commit %s is not marked reachable" +msgstr "incheckning %s är inte märkt nåbar" + +#: t/helper/test-reach.c:164 +msgid "too many commits marked reachable" +msgstr "för många incheckningar markerade nåbara" + +#: t/helper/test-serve-v2.c:7 +msgid "test-tool serve-v2 [<options>]" +msgstr "test-tool serve-v2 [<flaggor>]" + +#: t/helper/test-serve-v2.c:19 +msgid "exit immediately after advertising capabilities" +msgstr "avsluta omedelbart efter kungörelse av kapabiliteter" + +#: t/helper/test-simple-ipc.c:262 +#, c-format +msgid "socket/pipe already in use: '%s'" +msgstr "uttag/rör används redan: \"%s\"" + +#: t/helper/test-simple-ipc.c:264 +#, c-format +msgid "could not start server on: '%s'" +msgstr "kunde inte starta server på: \"%s\"" + +#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331 +msgid "could not spawn daemon in the background" +msgstr "kunde inte starta serverprocess i bakgrunden" + +#: t/helper/test-simple-ipc.c:356 +msgid "waitpid failed" +msgstr "\"waitpid\" misslyckades" + +#: t/helper/test-simple-ipc.c:376 +msgid "daemon not online yet" +msgstr "serverprocessen ännu inte operativ" + +#: t/helper/test-simple-ipc.c:406 +msgid "daemon failed to start" +msgstr "serverprocessen kunde inte startas" + +#: t/helper/test-simple-ipc.c:410 +msgid "waitpid is confused" +msgstr "waitpid är förvirrad" + +#: t/helper/test-simple-ipc.c:541 +msgid "daemon has not shutdown yet" +msgstr "serverprocessen har ännu inte avslutats" + +#: t/helper/test-simple-ipc.c:682 +msgid "test-helper simple-ipc is-active [<name>] [<options>]" +msgstr "test-helper simple-ipc is-active [<namn>] [<flaggor>]" + +#: t/helper/test-simple-ipc.c:683 +msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]" +msgstr "test-helper simple-ipc run-daemon [<namn>] [<trådar>]" + +#: t/helper/test-simple-ipc.c:684 +msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" +msgstr "" +"test-helper simple-ipc start-daemon [<namn>] [<trådar>] [<max-väntetid>]" + +#: t/helper/test-simple-ipc.c:685 +msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" +msgstr "test-helper simple-ipc stop-daemon [<namn>] [<max-väntetid>]" + +#: t/helper/test-simple-ipc.c:686 +msgid "test-helper simple-ipc send [<name>] [<token>]" +msgstr "test-helper simple-ipc send [<namn>] [<igenkänningstecken>]" + +#: t/helper/test-simple-ipc.c:687 +msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" +msgstr "test-helper simple-ipc sendbytes [<namn>] [<antal-byte>] [<byte>]" + +#: t/helper/test-simple-ipc.c:688 +msgid "" +"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " +"[<batchsize>]" +msgstr "" +"test-helper simple-ipc multiple [<namn>] [<trådar>] [<antal-byte>] " +"[<buntstorlek>]" + +#: t/helper/test-simple-ipc.c:696 +msgid "name or pathname of unix domain socket" +msgstr "namn eller sövkäg till unixdomän-uttag" + +#: t/helper/test-simple-ipc.c:698 +msgid "named-pipe name" +msgstr "namn på namngivet rör" + +#: t/helper/test-simple-ipc.c:700 +msgid "number of threads in server thread pool" +msgstr "antal trådar i serverns trådpool" + +#: t/helper/test-simple-ipc.c:701 +msgid "seconds to wait for daemon to start or stop" +msgstr "sekunder att vänta på att serverprocessen startar eller stoppar" + +#: t/helper/test-simple-ipc.c:703 +msgid "number of bytes" +msgstr "antal byte" + +#: t/helper/test-simple-ipc.c:704 +msgid "number of requests per thread" +msgstr "antal frågor per tråd" + +#: t/helper/test-simple-ipc.c:706 +msgid "byte" +msgstr "byte" + +#: t/helper/test-simple-ipc.c:706 +msgid "ballast character" +msgstr "ballasttecken" + +#: t/helper/test-simple-ipc.c:707 +msgid "token" +msgstr "igenkänningstecken" + +#: t/helper/test-simple-ipc.c:707 +msgid "command token to send to the server" +msgstr "igenkänningstecken för kommando att sända till servern" + #: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" @@ -23582,7 +24044,7 @@ msgstr "Kan inte sätta SSL-bakända till \"%s\": cURL byggdes utan SSL-bakändo msgid "Could not set SSL backend to '%s': already set" msgstr "Kunde inte sätta SSL-bakända till \"%s\": redan valt" -#: http.c:2025 +#: http.c:2035 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -23733,43 +24195,43 @@ msgstr "ingen kompilatorinformation tillgänglig\n" msgid "no libc information available\n" msgstr "ingen libc-information tillgänglig\n" -#: list-objects-filter-options.h:91 +#: list-objects-filter-options.h:94 msgid "args" msgstr "argument" -#: list-objects-filter-options.h:92 +#: list-objects-filter-options.h:95 msgid "object filtering" msgstr "objektfiltrering" -#: parse-options.h:183 +#: parse-options.h:184 msgid "expiry-date" msgstr "giltig-till" -#: parse-options.h:197 +#: parse-options.h:198 msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" -#: parse-options.h:309 +#: parse-options.h:310 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:311 +#: parse-options.h:312 msgid "be more quiet" msgstr "var mer tyst" -#: parse-options.h:317 +#: parse-options.h:318 msgid "use <n> digits to display object names" msgstr "använd <n> siffror för att visa objektnamn" -#: parse-options.h:336 +#: parse-options.h:337 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer ska tas bort från meddelande" -#: parse-options.h:337 +#: parse-options.h:338 msgid "read pathspec from file" msgstr "läs sökvägsangivelse från fil" -#: parse-options.h:338 +#: parse-options.h:339 msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "med --pathspec-from-file, sökvägsangivelser avdelas med NUL-tecken" @@ -25422,27 +25884,32 @@ msgstr "lokal zon skiljer sig från GMT med delar av minuter\n" msgid "local time offset greater than or equal to 24 hours\n" msgstr "lokal tidszonförskjutning större än eller lika med 24 timmar\n" -#: git-send-email.perl:223 git-send-email.perl:229 +#: git-send-email.perl:222 +#, perl-format +msgid "fatal: command '%s' died with exit code %d" +msgstr "ödesdigert: kommandot \"%s\" dog med slutkoden %d" + +#: git-send-email.perl:235 msgid "the editor exited uncleanly, aborting everything" msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting" -#: git-send-email.perl:312 +#: git-send-email.perl:321 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "\"%s\" innehåller en mellanliggande version av e-postbrevet du skrev.\n" -#: git-send-email.perl:317 +#: git-send-email.perl:326 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "\"%s.final\" innehåller det skrivna brevet.\n" -#: git-send-email.perl:410 +#: git-send-email.perl:419 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-alias är inkompatibelt med andra flaggor\n" -#: git-send-email.perl:484 +#: git-send-email.perl:493 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -25454,11 +25921,11 @@ msgstr "" "Sätt sendemail.forbidSendmailVariables till false för att inaktivera denna " "kontroll.\n" -#: git-send-email.perl:489 git-send-email.perl:691 +#: git-send-email.perl:498 git-send-email.perl:700 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Kan inte köra git format-patch från utanför arkivet\n" -#: git-send-email.perl:492 +#: git-send-email.perl:501 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -25466,37 +25933,37 @@ msgstr "" "\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad " "eller konfigurationsflagga)\n" -#: git-send-email.perl:505 +#: git-send-email.perl:514 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Okänt fält i --suppress-cc: \"%s\"\n" -#: git-send-email.perl:536 +#: git-send-email.perl:545 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Okänd inställning i --confirm: \"%s\"\n" -#: git-send-email.perl:564 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "varning: sendmail-alias med citationstecken stöds inte. %s\n" -#: git-send-email.perl:566 +#: git-send-email.perl:575 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "varning: \":include:\" stöds inte: %s\n" -#: git-send-email.perl:568 +#: git-send-email.perl:577 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "varning: omdirigering til \"/fil\" eller \"|rör\" stöds inte: %s\n" -#: git-send-email.perl:573 +#: git-send-email.perl:582 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "varning: sendmail-raden känns inte igen: %s\n" -#: git-send-email.perl:657 +#: git-send-email.perl:666 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -25511,21 +25978,12 @@ msgstr "" " * Säga \"./%s\" om du menar en fil; eller\n" " * Ange flaggan --format-patch om du menar ett intervall.\n" -#: git-send-email.perl:678 +#: git-send-email.perl:687 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Misslyckades utföra opendir %s: %s" -#: git-send-email.perl:702 -#, perl-format -msgid "" -"fatal: %s: %s\n" -"warning: no patches were sent\n" -msgstr "" -"ödesdigert: %s: %s\n" -"varning: inga patchar har sänts\n" - -#: git-send-email.perl:713 +#: git-send-email.perl:720 msgid "" "\n" "No patch files specified!\n" @@ -25535,17 +25993,17 @@ msgstr "" "Inga patchfiler angavs!\n" "\n" -#: git-send-email.perl:726 +#: git-send-email.perl:733 #, perl-format msgid "No subject line in %s?" msgstr "Ingen ärenderad i %s?" -#: git-send-email.perl:736 +#: git-send-email.perl:743 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Kunde inte öppna för skrivning %s: %s" -#: git-send-email.perl:747 +#: git-send-email.perl:754 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -25559,38 +26017,38 @@ msgstr "" "\n" "Rensa brevkroppen om du inte vill sända någon sammanfattning.\n" -#: git-send-email.perl:771 +#: git-send-email.perl:778 #, perl-format msgid "Failed to open %s: %s" msgstr "Misslyckades öppna %s: %s" -#: git-send-email.perl:788 +#: git-send-email.perl:795 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Misslyckades öppna %s.final: %s" -#: git-send-email.perl:831 +#: git-send-email.perl:838 msgid "Summary email is empty, skipping it\n" msgstr "Sammanfattande brev tomt, hoppar över\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:866 +#: git-send-email.perl:873 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Är du säker på att du vill använda <%s> [Y=ja, N=nej]? " -#: git-send-email.perl:921 +#: git-send-email.perl:928 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" "Följande filer är åttabitars, men anger inte en Content-Transfer-Encoding.\n" -#: git-send-email.perl:926 +#: git-send-email.perl:933 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Vilken åttabitarsteckenkodning ska jag ange [UTF-8]? " -#: git-send-email.perl:934 +#: git-send-email.perl:941 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -25603,21 +26061,21 @@ msgstr "" "har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen " "vill sända.\n" -#: git-send-email.perl:953 +#: git-send-email.perl:960 msgid "To whom should the emails be sent (if anyone)?" msgstr "Till vem ska breven sändas (om någon)?" -#: git-send-email.perl:971 +#: git-send-email.perl:978 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n" -#: git-send-email.perl:983 +#: git-send-email.perl:990 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Message-ID att använda som In-Reply-To för det första brevet (om något)? " -#: git-send-email.perl:1041 git-send-email.perl:1049 +#: git-send-email.perl:1048 git-send-email.perl:1056 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "fel: kunde inte få fram en giltig adress från: %s\n" @@ -25625,16 +26083,16 @@ msgstr "fel: kunde inte få fram en giltig adress från: %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1053 +#: git-send-email.perl:1060 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera): " -#: git-send-email.perl:1370 +#: git-send-email.perl:1377 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA-sökvägen \"%s\" finns inte" -#: git-send-email.perl:1453 +#: git-send-email.perl:1460 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -25661,124 +26119,139 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1468 +#: git-send-email.perl:1475 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Sända brevet? (y=ja, n=nej, e=redigera, q=avsluta, a=alla): " -#: git-send-email.perl:1471 +#: git-send-email.perl:1478 msgid "Send this email reply required" msgstr "Svar krävs på frågan \"Sända brevet?\"" -#: git-send-email.perl:1499 +#: git-send-email.perl:1506 msgid "The required SMTP server is not properly defined." msgstr "Nödvändig SMTP-server har inte angivits korrekt." -#: git-send-email.perl:1546 +#: git-send-email.perl:1553 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Servern stöder inte SMARTTLS! %s" -#: git-send-email.perl:1551 git-send-email.perl:1555 +#: git-send-email.perl:1558 git-send-email.perl:1562 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS misslyckades! %s" -#: git-send-email.perl:1564 +#: git-send-email.perl:1571 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Kan inte initiera SMTP korrekt. Kontrollera inställningarna och använd --" "smtp-debug." -#: git-send-email.perl:1582 +#: git-send-email.perl:1589 #, perl-format msgid "Failed to send %s\n" msgstr "Misslyckades sända %s\n" -#: git-send-email.perl:1585 +#: git-send-email.perl:1592 #, perl-format msgid "Dry-Sent %s\n" msgstr "Test-Sände %s\n" -#: git-send-email.perl:1585 +#: git-send-email.perl:1592 #, perl-format msgid "Sent %s\n" msgstr "Sände %s\n" -#: git-send-email.perl:1587 +#: git-send-email.perl:1594 msgid "Dry-OK. Log says:\n" msgstr "Test-OK. Loggen säger:\n" -#: git-send-email.perl:1587 +#: git-send-email.perl:1594 msgid "OK. Log says:\n" msgstr "OK. Loggen säger:\n" -#: git-send-email.perl:1599 +#: git-send-email.perl:1606 msgid "Result: " msgstr "Resultat: " -#: git-send-email.perl:1602 +#: git-send-email.perl:1609 msgid "Result: OK\n" msgstr "Resultat: OK\n" -#: git-send-email.perl:1620 +#: git-send-email.perl:1627 #, perl-format msgid "can't open file %s" msgstr "kan inte öppna filen %s" -#: git-send-email.perl:1667 git-send-email.perl:1687 +#: git-send-email.perl:1674 git-send-email.perl:1694 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1673 +#: git-send-email.perl:1680 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Lägger till to: %s från raden \"%s\"\n" -#: git-send-email.perl:1730 +#: git-send-email.perl:1737 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(icke-mbox) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1765 +#: git-send-email.perl:1772 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n" -#: git-send-email.perl:1876 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Kunde inte köra \"%s\"" -#: git-send-email.perl:1883 +#: git-send-email.perl:1890 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Lägger till %s: %s från: \"%s\"\n" -#: git-send-email.perl:1887 +#: git-send-email.perl:1894 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) misslyckades stänga röret till \"%s\"" -#: git-send-email.perl:1917 +#: git-send-email.perl:1924 msgid "cannot send message as 7bit" msgstr "kan inte sända brev som sjubitars" -#: git-send-email.perl:1925 +#: git-send-email.perl:1932 msgid "invalid transfer encoding" msgstr "ogiltig överföringskondning" -#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 +#: git-send-email.perl:1966 +#, perl-format +msgid "" +"fatal: %s: rejected by sendemail-validate hook\n" +"%s\n" +"warning: no patches were sent\n" +msgstr "" +"ödesdigert: %s: refuserad av sendemail-validate-kroken\n" +"%s\n" +"varning: inga patchar har sänts\n" + +#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039 #, perl-format msgid "unable to open %s: %s\n" msgstr "kunde inte öppna %s: %s\n" -#: git-send-email.perl:1969 +#: git-send-email.perl:1979 #, perl-format -msgid "%s: patch contains a line longer than 998 characters" -msgstr "%s: patchen innehåller en rad längre än 998 tecken" +msgid "" +"fatal: %s:%d is longer than 998 characters\n" +"warning: no patches were sent\n" +msgstr "" +"ödesdigert: %s:%d är längre än 998 tecken\n" +"varning: inga patchar har sänts\n" -#: git-send-email.perl:1986 +#: git-send-email.perl:1997 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" @@ -25786,11 +26259,42 @@ msgstr "" "säkerhetskopior.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1990 +#: git-send-email.perl:2001 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "--cached and --3way cannot be used together." +#~ msgstr "--cached och --3way kan inte användas samtidigt." + +#~ msgid "both" +#~ msgstr "båda" + +#~ msgid "one" +#~ msgstr "en" + +#~ msgid "Already up to date!" +#~ msgstr "Redan à jour!" + +#~ msgid "Already up to date. Yeeah!" +#~ msgstr "Redan à jour. Toppen!" + +#~ msgid "--batch-size option is only for 'repack' subcommand" +#~ msgstr "flaggan --batch-size används bara i underkommandot \"repack\"" + +#~ msgid "Percentage by which creation is weighted" +#~ msgstr "Procent som skapelse vägs med" + +#~ msgid "" +#~ "the rebase.useBuiltin support has been removed!\n" +#~ "See its entry in 'git help config' for details." +#~ msgstr "" +#~ "stödet för rebase.useBuiltin har tagits bort!\n" +#~ "Se posten för det i \"git help config\" för detaljer." + +#~ msgid "%s: patch contains a line longer than 998 characters" +#~ msgstr "%s: patchen innehåller en rad längre än 998 tecken" + #~ msgid "repository contains replace objects; skipping commit-graph" #~ msgstr "arkivet innehåller replace-objekt; hoppar över incheckningsgraf" @@ -26798,9 +27302,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "commit object" #~ msgstr "incheckningsobjekt" -#~ msgid "tree object" -#~ msgstr "trädobjekt" - #~ msgid "blob object" #~ msgstr "blob-objekt" @@ -26841,9 +27342,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "insanely long object directory %.*s" #~ msgstr "tokigt lång objektkatalog %.*s" -#~ msgid "git merge [<options>] <msg> HEAD <commit>" -#~ msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>" - #~ msgid "tag name too long: %.*s..." #~ msgstr "taggnamnet för långt: %.*s..." @@ -26944,9 +27442,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: ogiltig " #~ "enhet" -#~ msgid "This is the 2nd commit message:" -#~ msgstr "Det här är 2:a incheckningsmeddelandet:" - #~ msgid "This is the 3rd commit message:" #~ msgstr "Det här är 3:e incheckningsmeddelandet:" @@ -26983,9 +27478,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "This is the ${n}rd commit message:" #~ msgstr "Det här är ${n}:e incheckningsmeddelandet:" -#~ msgid "The 1st commit message will be skipped:" -#~ msgstr "1:a incheckningsmeddelandet kommer hoppas över:" - #~ msgid "The 2nd commit message will be skipped:" #~ msgstr "2:a incheckningsmeddelandet kommer hoppas över:" @@ -11,7 +11,7 @@ # ––––––––––––––––––––––––––––––––––––––––––––––––––––––––––# # 3-way merge | 3 yönlü birleştirme # # bare repository | çıplak depo # -# blame | genel bakış +# blame | genel bakış # # blob object | ikili nesne # # branch | dal # # bundle | demet # @@ -90,8 +90,8 @@ msgid "" msgstr "" "Project-Id-Version: Git Turkish Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-03-04 22:41+0800\n" -"PO-Revision-Date: 2020-02/27 16:00+0300\n" +"POT-Creation-Date: 2021-05-17 16:02+0800\n" +"PO-Revision-Date: 2021-05-17 18:00+0300\n" "Last-Translator: Emir SARI <bitigchi@me.com>\n" "Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n" "Language: tr\n" @@ -105,9 +105,9 @@ msgstr "" msgid "Huh (%s)?" msgstr "Pardon (%s)?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292 -#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538 -#: builtin/rebase.c:1963 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 +#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 +#: builtin/rebase.c:1953 msgid "could not read index" msgstr "indeks okunamadı" @@ -135,7 +135,7 @@ msgstr "Güncelle" msgid "could not stage '%s'" msgstr "'%s' hazırlanamadı" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687 msgid "could not write index" msgstr "indeks yazılamadı" @@ -151,7 +151,7 @@ msgstr[1] "%d yol güncellendi\n" msgid "note: %s is untracked now.\n" msgstr "not: %s artık izlenmiyor.\n" -#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" @@ -291,12 +291,12 @@ msgstr "hazırlanmış" msgid "unstaged" msgstr "hazırlanmamış" -#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 -#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 -#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 +#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 +#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327 +#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 #: git-add--interactive.perl:213 msgid "path" msgstr "yol" @@ -820,7 +820,7 @@ msgstr "Üzgünüm, bu parça düzenlenemiyor" msgid "'git apply' failed" msgstr "'git apply' başarısız oldu" -#: advice.c:143 +#: advice.c:145 #, c-format msgid "" "\n" @@ -829,37 +829,37 @@ msgstr "" "\n" "Bu iletiyi \"git config advice.%s false\" ile devre dışı bırakın" -#: advice.c:159 +#: advice.c:161 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sipucu: %.*s%s\n" -#: advice.c:250 +#: advice.c:252 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Seç-al yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var." -#: advice.c:252 +#: advice.c:254 msgid "Committing is not possible because you have unmerged files." msgstr "İşleme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var." -#: advice.c:254 +#: advice.c:256 msgid "Merging is not possible because you have unmerged files." msgstr "Birleştirme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var." -#: advice.c:256 +#: advice.c:258 msgid "Pulling is not possible because you have unmerged files." msgstr "Çekme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var." -#: advice.c:258 +#: advice.c:260 msgid "Reverting is not possible because you have unmerged files." msgstr "Geriye al yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var." -#: advice.c:260 +#: advice.c:262 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "%s yapılamıyor; birleştirmesi tamamlanmamış dosyalarınız var." -#: advice.c:268 +#: advice.c:270 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -867,23 +867,39 @@ msgstr "" "Onları çalışma ağacında onarın, ardından hazırlığı bitirmek için uygun\n" "görüldüğü biçimde 'git add/rm <dosya>' yaptıktan sonra işleyin." -#: advice.c:276 +#: advice.c:278 msgid "Exiting because of an unresolved conflict." msgstr "Çözüme kavuşturulmamış bir çakışmadan dolayı çıkılıyor." -#: advice.c:281 builtin/merge.c:1370 +#: advice.c:283 builtin/merge.c:1374 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut)." -#: advice.c:283 +#: advice.c:285 msgid "Please, commit your changes before merging." msgstr "Birleştirme öncesinde değişikliklerinizi işleyin." -#: advice.c:284 +#: advice.c:286 msgid "Exiting because of unfinished merge." msgstr "Tamamlanmamış birleştirmeden dolayı çıkılıyor." -#: advice.c:290 +#: advice.c:296 +#, c-format +msgid "" +"The following pathspecs didn't match any eligible path, but they do match " +"index\n" +"entries outside the current sparse checkout:\n" +msgstr "" +"Aşağıdaki yol belirteçleri uygun bir yolla eşleşmediler; ancak geçerli\n" +"aralıklı çıkışın dışındaki girdilerle eşleşiyorlar:\n" + +#: advice.c:303 +msgid "" +"Disable or modify the sparsity rules if you intend to update such entries." +msgstr "Böyle girdileri güncellemeyi düşünüyorsanız aralıklandırma kurallarını " +"devre dışı bırakın veya değiştirin." + +#: advice.c:310 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -932,83 +948,79 @@ msgstr "komut satırı \\ ile bitiyor" msgid "unclosed quote" msgstr "kapatılmamış tırnak" -#: apply.c:69 +#: apply.c:70 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "tanımlanamayan boşluk seçeneği '%s'" -#: apply.c:85 +#: apply.c:86 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "tanımlanamayan boşluk yok sayma seçeneği '%s'" -#: apply.c:135 +#: apply.c:136 msgid "--reject and --3way cannot be used together." msgstr "--reject ve --3way birlikte kullanılamaz." -#: apply.c:137 -msgid "--cached and --3way cannot be used together." -msgstr "--cached ve --3way birlikte kullanılamaz." - -#: apply.c:140 +#: apply.c:139 msgid "--3way outside a repository" msgstr "-3way bir depo dışında" -#: apply.c:151 +#: apply.c:150 msgid "--index outside a repository" msgstr "--index bir depo dışında" -#: apply.c:154 +#: apply.c:153 msgid "--cached outside a repository" msgstr "--cached bir depo dışında" -#: apply.c:801 +#: apply.c:800 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Zaman damgası düzenli ifadesi %s hazırlanamıyor" -#: apply.c:810 +#: apply.c:809 #, c-format msgid "regexec returned %d for input: %s" msgstr "düzenli ifade girdi için %d döndürdü: %s" -#: apply.c:884 +#: apply.c:883 #, c-format msgid "unable to find filename in patch at line %d" msgstr "yamanın %d. satırında dosya adı bulunamıyor " -#: apply.c:922 +#: apply.c:921 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: hatalı git-diff - /dev/null bekleniyordu, %s alındı, satır %d" -#: apply.c:928 +#: apply.c:927 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: hatalı git-diff - %d. satırda tutarsız yeni dosya adı" -#: apply.c:929 +#: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: hatalı git-diff - %d. satırda tutarsız eski dosya adı" -#: apply.c:934 +#: apply.c:933 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: hatalı git-diff - %d. satırda /dev/null bekleniyordu" -#: apply.c:963 +#: apply.c:962 #, c-format msgid "invalid mode on line %d: %s" msgstr "%d. satırda geçersiz kip: %s" -#: apply.c:1282 +#: apply.c:1281 #, c-format msgid "inconsistent header lines %d and %d" msgstr "tutarsız üstbilgi satırları %d ve %d" -#: apply.c:1372 +#: apply.c:1371 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1023,93 +1035,93 @@ msgstr[1] "" "%d öncü yol adı bileşeni kaldırılırken git diff üstbilgisi dosya adı " "bilgisine iye değil (%d. satır)" -#: apply.c:1385 +#: apply.c:1384 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff üstbilgisi dosya adı bilgisine iye değil (%d. satır)" -#: apply.c:1481 +#: apply.c:1480 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: beklenmedik satır: %.*s" -#: apply.c:1550 +#: apply.c:1549 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "%d. satırda üstbilgisi olmayan yama parçacığı: %.*s" -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "yeni dosyanın eski içeriğe bağımlılığı var" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "silinen dosya içinde hâlâ bir şeyler var" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "hasarlı yama, %d. satır" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "%s yeni dosyasının eski içeriğe bağımlılığı var" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "%s silinen dosyasının içinde hâlâ bir şeyler var" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** uyarı: %s dosyası boş duruma gelir; ancak silinmez" -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "hasarlı ikili yama, %d. satır: %.*s" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "tanımlanamayan ikili yama, %d. satır" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "yalnızca anlamsız veri içeren yama, %d. satır" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "%s sembolik bağı okunamıyor" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "%s açılamıyor veya okunamıyor" -#: apply.c:2936 +#: apply.c:2935 #, c-format msgid "invalid start of line: '%c'" msgstr "geçersiz satır başlangıcı: '%c'" -#: apply.c:3057 +#: apply.c:3056 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Parça #%d başarılı oldu, %d (%d satır ofset)." msgstr[1] "Parça #%d başarılı oldu, %d (%d satır ofset)." -#: apply.c:3069 +#: apply.c:3068 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" "Bağlam şuna indirildi: (%ld/%ld) (%d konumundaki parçacığı uygulamak için)" -#: apply.c:3075 +#: apply.c:3074 #, c-format msgid "" "while searching for:\n" @@ -1118,435 +1130,439 @@ msgstr "" "şunu ararken:\n" "%.*s" -#: apply.c:3097 +#: apply.c:3096 #, c-format msgid "missing binary patch data for '%s'" msgstr "'%s' için ikili yama verisi eksik" -#: apply.c:3105 +#: apply.c:3104 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "'%s' parçası geri alınmadan bir ikili yama reverse-apply yapılamıyor" -#: apply.c:3152 +#: apply.c:3151 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "tam indeks satırı olmadan '%s' üzerine bir ikili yama uygulanamıyor" -#: apply.c:3163 +#: apply.c:3162 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "Bu yama geçerli içerik ile eşleşmeyen '%s' üzerine uygulanır (%s)." -#: apply.c:3171 +#: apply.c:3170 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "yama boş bir '%s' üzerine uygulanır; ancak o boş değil" -#: apply.c:3189 +#: apply.c:3188 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "gereken songörüntü %s ('%s' için) okunamıyor" -#: apply.c:3202 +#: apply.c:3201 #, c-format msgid "binary patch does not apply to '%s'" msgstr "ikili yama '%s' üzerine uygulanamıyor" -#: apply.c:3209 +#: apply.c:3208 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "'%s' üzerine ikili yama yanlış sonuç doğuruyor (%s bekleniyordu, %s alındı)" -#: apply.c:3230 +#: apply.c:3229 #, c-format msgid "patch failed: %s:%ld" msgstr "yama başarısız oldu: %s:%ld" -#: apply.c:3353 +#: apply.c:3352 #, c-format msgid "cannot checkout %s" msgstr "%s çıkışı yapılamıyor" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213 +#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214 #: setup.c:308 #, c-format msgid "failed to read %s" msgstr "%s okunamadı" -#: apply.c:3413 +#: apply.c:3412 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "'%s' bir sembolik bağın ötesinden okunuyor" -#: apply.c:3442 apply.c:3685 +#: apply.c:3441 apply.c:3687 #, c-format msgid "path %s has been renamed/deleted" msgstr "%s yolu yeniden adlandırıldı/silindi" -#: apply.c:3528 apply.c:3700 +#: apply.c:3527 apply.c:3702 #, c-format msgid "%s: does not exist in index" msgstr "%s: indekste bulunmuyor" -#: apply.c:3537 apply.c:3708 apply.c:3952 +#: apply.c:3536 apply.c:3710 apply.c:3954 #, c-format msgid "%s: does not match index" msgstr "%s: indeks ile eşleşmiyor" -#: apply.c:3572 -msgid "repository lacks the necessary blob to fall back on 3-way merge." -msgstr "" -"Depo 3 yönlü birleştirmeye geri çekilebilme için gereken ikili nesneye iye " -"değil." +#: apply.c:3571 +msgid "repository lacks the necessary blob to perform 3-way merge." +msgstr "Depo, 3 yönlü birleştirme için gereken ikili nesneye iye değil." -#: apply.c:3575 +#: apply.c:3574 #, c-format -msgid "Falling back to three-way merge...\n" -msgstr "3 yönlü birleştirmeye geri çekiliniyor...\n" +msgid "Performing three-way merge...\n" +msgstr "3 yönlü birleştirme gerçekleştiriliyor...\n" -#: apply.c:3591 apply.c:3595 +#: apply.c:3590 apply.c:3594 #, c-format msgid "cannot read the current contents of '%s'" msgstr "'%s' ögesinin geçerli içeriği okunamıyor" -#: apply.c:3607 +#: apply.c:3606 #, c-format -msgid "Failed to fall back on three-way merge...\n" -msgstr "3 yönlü birleştirmeye geri çekinilemedi...\n" +msgid "Failed to perform three-way merge...\n" +msgstr "3 yönlü birleştirme gerçekleştirilemedi...\n" -#: apply.c:3621 +#: apply.c:3620 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "'%s' üzerine yama çakışmalarla birlikte uygulandı.\n" -#: apply.c:3626 +#: apply.c:3625 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "'%s' üzerine yama sorunsuzca uygulandı.\n" -#: apply.c:3652 +#: apply.c:3642 +#, c-format +msgid "Falling back to direct application...\n" +msgstr "Doğrudan uygulamaya geri çekiliniyor...\n" + +#: apply.c:3654 msgid "removal patch leaves file contents" msgstr "kaldırma yaması dosya içeriğini bırakır" -#: apply.c:3725 +#: apply.c:3727 #, c-format msgid "%s: wrong type" msgstr "%s: yanlış tür" -#: apply.c:3727 +#: apply.c:3729 #, c-format msgid "%s has type %o, expected %o" msgstr "%s, %o türüne iye, %o bekleniyordu" -#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 -#: read-cache.c:1313 +#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 +#: read-cache.c:1351 #, c-format msgid "invalid path '%s'" msgstr "geçersiz yol '%s'" -#: apply.c:3950 +#: apply.c:3952 #, c-format msgid "%s: already exists in index" msgstr "%s: indekste halihazırda var" -#: apply.c:3954 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "%s: çalışma dizininde halihazırda var" -#: apply.c:3974 +#: apply.c:3976 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "şunun yeni kipi (%o): %s, eski kip (%o) ile eşleşmiyor " -#: apply.c:3979 +#: apply.c:3981 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "şunun yeni kipi (%o): %s, şunun eski kipi (%o): %s, ile eşleşmiyor" -#: apply.c:3999 +#: apply.c:4001 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "etkilenen dosya '%s' bir sembolik bağın ötesinde" -#: apply.c:4003 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "%s: yama uygulanamıyor" -#: apply.c:4018 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "%s yaması denetleniyor..." -#: apply.c:4110 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "%s altmodülü için sha1 bilgisi eksik veya yararsız" -#: apply.c:4117 +#: apply.c:4119 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "geçerli HEAD'de olmayan %s için kip değişimi" -#: apply.c:4120 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 bilgisi eksik veya yararsız (%s)." -#: apply.c:4129 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "%s geçici indekse eklenemedi" -#: apply.c:4139 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "geçici indeks şuraya yazılamadı: %s" -#: apply.c:4277 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "%s indeksten kaldırılamıyor" -#: apply.c:4311 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "%s altmodülü için hasarlı yama" -#: apply.c:4317 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "yeni oluşturulan '%s' dosyasının bilgileri alınamıyor" -#: apply.c:4325 +#: apply.c:4327 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "yeni oluşturulan %s dosyası için yardımcı bellek oluşturulamıyor" -#: apply.c:4331 apply.c:4476 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "%s için önbellek girdisi eklenemiyor" -#: apply.c:4374 builtin/bisect--helper.c:523 +#: apply.c:4376 builtin/bisect--helper.c:523 #, c-format msgid "failed to write to '%s'" msgstr "şuraya yazılamadı: '%s'" -#: apply.c:4378 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "'%s' dosyası kapatılıyor" -#: apply.c:4448 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "'%s' dosyası yazılamıyor, %o kipi" -#: apply.c:4546 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "%s yaması sorunsuzca uygulandı." -#: apply.c:4554 +#: apply.c:4556 msgid "internal error" msgstr "iç hata" -#: apply.c:4557 +#: apply.c:4559 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "%%s yaması %d geri çevirme ile uygulanıyor..." msgstr[1] "%%s yaması %d geri çevirme ile uygulanıyor..." -#: apply.c:4568 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr ".rej dosya adı %.*s.rej olarak kısaltılıyor" -#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334 +#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394 #, c-format msgid "cannot open %s" msgstr "%s açılamıyor" -#: apply.c:4590 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Parça #%d sorunsuzca uygulandı." -#: apply.c:4594 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "Parça %d geri çevrildi." -#: apply.c:4718 +#: apply.c:4725 #, c-format msgid "Skipped patch '%s'." msgstr "'%s' yaması atlandı." -#: apply.c:4726 +#: apply.c:4733 msgid "unrecognized input" msgstr "tanımlanamayan girdi" -#: apply.c:4746 +#: apply.c:4753 msgid "unable to read index file" msgstr "indeks dosyası okunamıyor" -#: apply.c:4903 +#: apply.c:4910 #, c-format msgid "can't open patch '%s': %s" msgstr "'%s' yaması açılamıyor: %s" -#: apply.c:4930 +#: apply.c:4937 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d boşluk hatası susturuldu" msgstr[1] "%d boşluk hatası susturuldu" -#: apply.c:4936 apply.c:4951 +#: apply.c:4943 apply.c:4958 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d satır boşluk hatası ekliyor." msgstr[1] "%d satır boşluk hatası ekliyor." -#: apply.c:4944 +#: apply.c:4951 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "Boşluk hataları düzeltildikten sonra %d satır uygulandı." msgstr[1] "Boşluk hataları düzeltildikten sonra %d satır uygulandı." -#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "Yeni indeks dosyası yazılamıyor" -#: apply.c:4988 +#: apply.c:4995 msgid "don't apply changes matching the given path" msgstr "verilen yol ile eşleşen değişiklikleri uygulama" -#: apply.c:4991 +#: apply.c:4998 msgid "apply changes matching the given path" msgstr "verilen yol ile eşleşen değişiklikleri uygula" -#: apply.c:4993 builtin/am.c:2266 +#: apply.c:5000 builtin/am.c:2317 msgid "num" msgstr "sayı" -#: apply.c:4994 +#: apply.c:5001 msgid "remove <num> leading slashes from traditional diff paths" msgstr "geleneksel diff yollarından <sayı> öncü eğik çizgiyi kaldır" -#: apply.c:4997 +#: apply.c:5004 msgid "ignore additions made by the patch" msgstr "yamanın yaptığı eklemeleri yok say" -#: apply.c:4999 +#: apply.c:5006 msgid "instead of applying the patch, output diffstat for the input" msgstr "yamayı uygulama yerine girdi için diffstat çıktısı ver" -#: apply.c:5003 +#: apply.c:5010 msgid "show number of added and deleted lines in decimal notation" msgstr "eklenen ve silinen satırların sayısını onluk birimde göster" -#: apply.c:5005 +#: apply.c:5012 msgid "instead of applying the patch, output a summary for the input" msgstr "yamayı uygulama yerine girdi için bir özet çıktısı ver" -#: apply.c:5007 +#: apply.c:5014 msgid "instead of applying the patch, see if the patch is applicable" msgstr "yamayı uygulama yerine yamanın uygulanabilir olup olmadığına bak" -#: apply.c:5009 +#: apply.c:5016 msgid "make sure the patch is applicable to the current index" msgstr "yamanın geçerli indekse uygulanabilir olduğundan emin ol" -#: apply.c:5011 +#: apply.c:5018 msgid "mark new files with `git add --intent-to-add`" msgstr "yeni dosyaları `git add --intent-to-add` ile imle" -#: apply.c:5013 +#: apply.c:5020 msgid "apply a patch without touching the working tree" msgstr "çalışma ağacına dokunmadan bir yama uygula" -#: apply.c:5015 +#: apply.c:5022 msgid "accept a patch that touches outside the working area" msgstr "çalışma ağacının dışına dokunan bir yamayı kabul et" -#: apply.c:5018 +#: apply.c:5025 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "ek olarak yamayı da uygula (--stat/--summary/--check ile kullan)" -#: apply.c:5020 -msgid "attempt three-way merge if a patch does not apply" -msgstr "bir yama uygulanamıyorsa 3 yönlü birleştirme dene" +#: apply.c:5027 +msgid "attempt three-way merge, fall back on normal patch if that fails" +msgstr "3 yönlü birleştirme dene, başarısız olursa normal yamaya geri çekil" -#: apply.c:5022 +#: apply.c:5029 msgid "build a temporary index based on embedded index information" msgstr "gömülü indeks bilgisini temel alan geçici bir indeks oluştur" -#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540 +#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617 msgid "paths are separated with NUL character" msgstr "yollar NUL karakteri ile ayrılır" -#: apply.c:5027 +#: apply.c:5034 msgid "ensure at least <n> lines of context match" msgstr "en az <n> bağlam satırının eşleştiğinden emin ol" -#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 -#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3577 builtin/rebase.c:1352 +#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 +#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831 +#: builtin/rebase.c:1347 msgid "action" msgstr "eylem" -#: apply.c:5029 +#: apply.c:5036 msgid "detect new or modified lines that have whitespace errors" msgstr "boşluk hatası içeren yeni veya değiştirilmiş satırları algıla" -#: apply.c:5032 apply.c:5035 +#: apply.c:5039 apply.c:5042 msgid "ignore changes in whitespace when finding context" msgstr "bağlam bulurken boşluk değişikliklerini yok say" -#: apply.c:5038 +#: apply.c:5045 msgid "apply the patch in reverse" msgstr "yamayı tersten uygula" -#: apply.c:5040 +#: apply.c:5047 msgid "don't expect at least one line of context" msgstr "en az bir satır bağlam bekleme" -#: apply.c:5042 +#: apply.c:5049 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "reddedilmiş parçaları ilgili *.rej dosyalarında bırak" -#: apply.c:5044 +#: apply.c:5051 msgid "allow overlapping hunks" msgstr "üst üste binen parçalara izin ver" -#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757 -#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 +#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 +#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "ayrıntı ver" -#: apply.c:5047 +#: apply.c:5054 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "dosya sonunda yanlışlıkla algılanan eksik yenisatırı hoş gör" -#: apply.c:5050 +#: apply.c:5057 msgid "do not trust the line counts in the hunk headers" msgstr "parça üstbilgisindeki satır sayımına güvenme" -#: apply.c:5052 builtin/am.c:2254 +#: apply.c:5059 builtin/am.c:2305 msgid "root" msgstr "kök" -#: apply.c:5053 +#: apply.c:5060 msgid "prepend <root> to all filenames" msgstr "tüm dosya adlarının başına <kök> ekle" @@ -1612,141 +1628,141 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <depo> [--exec <komut>] --list" -#: archive.c:192 +#: archive.c:188 #, c-format msgid "cannot read %s" msgstr "%s okunamıyor" -#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894 -#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786 -#: builtin/merge.c:1139 +#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 +#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 +#: builtin/merge.c:1143 #, c-format msgid "could not read '%s'" msgstr "'%s' okunamadı" -#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315 +#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "yol belirteci '%s' hiçbir dosya ile eşleşmedi" -#: archive.c:454 +#: archive.c:451 #, c-format msgid "no such ref: %.*s" msgstr "böyle bir başvuru yok: %.*s" -#: archive.c:460 +#: archive.c:457 #, c-format msgid "not a valid object name: %s" msgstr "geçerli bir nesne adı değil: %s" -#: archive.c:473 +#: archive.c:470 #, c-format msgid "not a tree object: %s" msgstr "bir ağaç nesnesi değil: %s" -#: archive.c:485 +#: archive.c:482 msgid "current working directory is untracked" msgstr "geçerli çalışma dizini izlenmiyor" -#: archive.c:526 +#: archive.c:523 #, c-format msgid "File not found: %s" msgstr "Dosya bulunamadı: %s" -#: archive.c:528 +#: archive.c:525 #, c-format msgid "Not a regular file: %s" msgstr "Normal bir dosya değil: %s" -#: archive.c:555 +#: archive.c:552 msgid "fmt" msgstr "biçim" -#: archive.c:555 +#: archive.c:552 msgid "archive format" msgstr "arşiv biçimi" -#: archive.c:556 builtin/log.c:1764 +#: archive.c:553 builtin/log.c:1772 msgid "prefix" msgstr "önek" -#: archive.c:557 +#: archive.c:554 msgid "prepend prefix to each pathname in the archive" msgstr "öneki arşivdeki tüm yol adlarının başına ekle" -#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888 +#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105 -#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 +#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105 +#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" msgstr "dosya" -#: archive.c:559 +#: archive.c:556 msgid "add untracked file to archive" msgstr "izlenmeyen dosyaları arşive ekle" -#: archive.c:562 builtin/archive.c:90 +#: archive.c:559 builtin/archive.c:90 msgid "write the archive to this file" msgstr "arşivi bu dosyaya yaz" -#: archive.c:564 +#: archive.c:561 msgid "read .gitattributes in working directory" msgstr "çalışma dizinindeki .gitattributes'u oku" -#: archive.c:565 +#: archive.c:562 msgid "report archived files on stderr" msgstr "arşivlenmiş dosyaları stderr'de raporla" -#: archive.c:567 +#: archive.c:564 msgid "set compression level" msgstr "sıkıştırma düzeyini ayarla" -#: archive.c:570 +#: archive.c:567 msgid "list supported archive formats" msgstr "desteklenen arşiv biçimlerini listele" -#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 +#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 +#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 msgid "repo" msgstr "depo" -#: archive.c:573 builtin/archive.c:92 +#: archive.c:570 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "arşivi uzak konum deposu <depo>'dan al" -#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 #: builtin/notes.c:498 msgid "command" msgstr "komut" -#: archive.c:575 builtin/archive.c:94 +#: archive.c:572 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "uzak konum komutu git-upload-archive'e olan yol" -#: archive.c:582 +#: archive.c:579 msgid "Unexpected option --remote" msgstr "Beklenmedik seçenek --remote" -#: archive.c:584 +#: archive.c:581 msgid "Option --exec can only be used together with --remote" msgstr "--exec seçeneği yalnızca --remote ile birlikte kullanılabilir" -#: archive.c:586 +#: archive.c:583 msgid "Unexpected option --output" msgstr "Beklenmedik seçenek --output" -#: archive.c:588 +#: archive.c:585 msgid "Options --add-file and --remote cannot be used together" msgstr "--add-file ve --remote seçenekleri birlikte kullanılamaz" -#: archive.c:610 +#: archive.c:607 #, c-format msgid "Unknown archive format '%s'" msgstr "Bilinmeyen arşiv biçimi '%s'" -#: archive.c:619 +#: archive.c:616 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "'%s' biçimi için desteklenmeyen argüman: -%d" @@ -1756,12 +1772,12 @@ msgstr "'%s' biçimi için desteklenmeyen argüman: -%d" msgid "%.*s is not a valid attribute name" msgstr "%.*s geçerli bir öznitelik adı değil" -#: attr.c:359 +#: attr.c:363 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s izin verilmiyor: %s:%d" -#: attr.c:399 +#: attr.c:403 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1843,7 +1859,7 @@ msgstr "İkili arama: Birleştirme temelleri sınanmalı\n" msgid "a %s revision is needed" msgstr "bir %s revizyonu gerekiyor" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298 #, c-format msgid "could not create file '%s'" msgstr "'%s' dosyası oluşturulamadı" @@ -1888,41 +1904,41 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "İkili arama: Şundan sonra sınanacak %d revizyon kaldı: %s\n" msgstr[1] "İkili arama: Şundan sonra sınanacak %d revizyon kaldı: %s\n" -#: blame.c:2777 +#: blame.c:2776 msgid "--contents and --reverse do not blend well." msgstr "--contents ve --reverse birlikte pek iyi gitmiyor." -#: blame.c:2791 +#: blame.c:2790 msgid "cannot use --contents with final commit object name" msgstr "--contents son işleme nesnesi adı ile kullanılamıyor" -#: blame.c:2812 +#: blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse ve --first-parent birlikte en son işlemenin belirtilmesini " "gerektiriyor" -#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146 -#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411 -#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335 -#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410 -#: builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 +#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 +#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 +#: builtin/pack-objects.c:3661 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "revizyonda gezinme ayarlaması başarısız oldu" -#: blame.c:2839 +#: blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent birlikte ilk üst öge zincirinin yanında erim " "gerektiriyor" -#: blame.c:2850 +#: blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "şurada %s yolu bulunamadı: %s" -#: blame.c:2861 +#: blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "%s ikili nesnesi %s yolunda okunamıyor" @@ -2060,12 +2076,12 @@ msgstr "Belirsiz nesne adı: '%s'." msgid "Not a valid branch point: '%s'." msgstr "Geçerli bir dal noktası değil: '%s'." -#: branch.c:365 +#: branch.c:366 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' çıkışı '%s' konumunda halihazırda yapılmış" -#: branch.c:388 +#: branch.c:389 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "%s çalışma ağacının HEAD'i güncellenmemiş" @@ -2090,8 +2106,8 @@ msgstr "'%s' bir v2 veya v3 demet dosyası gibi görünmüyor" msgid "unrecognized header: %s%s (%d)" msgstr "tanımlanamayan üstbilgi: %s%s (%d)" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184 -#: builtin/commit.c:814 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "'%s' açılamadı" @@ -2149,7 +2165,7 @@ msgstr "desteklenmeyen demet sürümü %d" msgid "cannot write bundle version %d with algorithm %s" msgstr "demet sürümü %d, %s algoritması ile yazılamıyor" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "tanımlanamayan argüman: %s" @@ -2191,235 +2207,235 @@ msgstr "en son iri parçanın numarası sıfır olmayan %<PRIx32>" msgid "invalid color value: %.*s" msgstr "geçersiz renk değeri: %.*s" -#: commit-graph.c:197 midx.c:46 +#: commit-graph.c:204 midx.c:47 msgid "invalid hash version" msgstr "geçersiz sağlama sürümü" -#: commit-graph.c:255 +#: commit-graph.c:262 msgid "commit-graph file is too small" msgstr "commit-graph dosyası pek küçük" -#: commit-graph.c:348 +#: commit-graph.c:355 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "commit-graph imzası %X, %X ile eşleşmiyor" -#: commit-graph.c:355 +#: commit-graph.c:362 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "commit-graph sürümü %x, %X ile eşleşmiyor" -#: commit-graph.c:362 +#: commit-graph.c:369 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "commit-graph sağlama sürümü %X, %X ile eşleşmiyor" -#: commit-graph.c:379 +#: commit-graph.c:386 #, c-format msgid "commit-graph file is too small to hold %u chunks" msgstr "commit-graph dosyası %u iri parça tutmak için pek küçük" -#: commit-graph.c:472 +#: commit-graph.c:482 msgid "commit-graph has no base graphs chunk" msgstr "commit-graph temel grafiği iri parçasına iye değil" -#: commit-graph.c:482 +#: commit-graph.c:492 msgid "commit-graph chain does not match" msgstr "commit-graph zinciri eşleşmiyor" -#: commit-graph.c:530 +#: commit-graph.c:540 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "geçersiz commit-graph zinciri: '%s'. satır bir sağlama değil" -#: commit-graph.c:554 +#: commit-graph.c:564 msgid "unable to find all commit-graph files" msgstr "tüm commit-graph dosyaları bulunamıyor" -#: commit-graph.c:735 commit-graph.c:772 +#: commit-graph.c:745 commit-graph.c:782 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "geçersiz işleme konumu. commit-graph büyük olasılıkla hasar görmüş." -#: commit-graph.c:756 +#: commit-graph.c:766 #, c-format msgid "could not find commit %s" msgstr "%s işlemesi bulunamadı" -#: commit-graph.c:789 +#: commit-graph.c:799 msgid "commit-graph requires overflow generation data but has none" msgstr "commit-graph, taşım oluşturma verisi gerektiriyor; ancak hiç yok" -#: commit-graph.c:1065 builtin/am.c:1292 +#: commit-graph.c:1075 builtin/am.c:1340 #, c-format msgid "unable to parse commit %s" msgstr "%s işlemesi ayrıştırılamıyor" -#: commit-graph.c:1327 builtin/pack-objects.c:2872 +#: commit-graph.c:1337 builtin/pack-objects.c:2897 #, c-format msgid "unable to get type of object %s" msgstr "%s nesnesinin türü alınamıyor" -#: commit-graph.c:1358 +#: commit-graph.c:1368 msgid "Loading known commits in commit graph" msgstr "İşleme grafiğindeki bilinen işlemeler yükleniyor" -#: commit-graph.c:1375 +#: commit-graph.c:1385 msgid "Expanding reachable commits in commit graph" msgstr "İşleme grafiğindeki ulaşılabilir işlemeler genişletiliyor" -#: commit-graph.c:1395 +#: commit-graph.c:1405 msgid "Clearing commit marks in commit graph" msgstr "İşleme grafiğindeki işleme imleri temizleniyor" -#: commit-graph.c:1414 +#: commit-graph.c:1424 msgid "Computing commit graph topological levels" msgstr "İşleme grafiği ilingesel düzeyleri hesaplanıyor" -#: commit-graph.c:1467 +#: commit-graph.c:1477 msgid "Computing commit graph generation numbers" msgstr "İşleme grafiği kuşak sayıları hesaplanıyor" -#: commit-graph.c:1548 +#: commit-graph.c:1558 msgid "Computing commit changed paths Bloom filters" msgstr "" "Geçerli işlemelerdeki değiştirilmiş yollar için Bloom süzgeci hesaplanıyor" -#: commit-graph.c:1625 +#: commit-graph.c:1635 msgid "Collecting referenced commits" msgstr "Başvurulmuş işlemeler toplanıyor" -#: commit-graph.c:1650 +#: commit-graph.c:1660 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "%d pakette işleme grafiği için işlemeler bulunuyor" msgstr[1] "%d pakette işleme grafiği için işlemeler bulunuyor" -#: commit-graph.c:1663 +#: commit-graph.c:1673 #, c-format msgid "error adding pack %s" msgstr "%s paketi eklenirken hata" -#: commit-graph.c:1667 +#: commit-graph.c:1677 #, c-format msgid "error opening index for %s" msgstr "%s için indeks açılırken hata" -#: commit-graph.c:1704 +#: commit-graph.c:1714 msgid "Finding commits for commit graph among packed objects" msgstr "Paketlenmiş nesneler arasından işleme grafiği için işlemeler bulunuyor" -#: commit-graph.c:1722 +#: commit-graph.c:1732 msgid "Finding extra edges in commit graph" msgstr "İşleme grafiğindeki ek sınırlar bulunuyor" -#: commit-graph.c:1771 +#: commit-graph.c:1781 msgid "failed to write correct number of base graph ids" msgstr "temel grafiği numaralarının doğru sayısı yazılamadı" -#: commit-graph.c:1802 midx.c:794 +#: commit-graph.c:1812 midx.c:906 #, c-format msgid "unable to create leading directories of %s" msgstr "%s öncü dizinleri oluşturulamıyor" -#: commit-graph.c:1815 +#: commit-graph.c:1825 msgid "unable to create temporary graph layer" msgstr "geçici grafik katmanı oluşturulamıyor" -#: commit-graph.c:1820 +#: commit-graph.c:1830 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "'%s' için paylaşılan izinler ayarlanamıyor" -#: commit-graph.c:1879 +#: commit-graph.c:1887 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "İşleme grafiği %d geçişte yazılıyor" msgstr[1] "İşleme grafiği %d geçişte yazılıyor" -#: commit-graph.c:1915 +#: commit-graph.c:1923 msgid "unable to open commit-graph chain file" msgstr "commit-graph zincir dosyası açılamıyor" -#: commit-graph.c:1931 +#: commit-graph.c:1939 msgid "failed to rename base commit-graph file" msgstr "temel commit-graph dosyası yeniden adlandırılamadı" -#: commit-graph.c:1951 +#: commit-graph.c:1959 msgid "failed to rename temporary commit-graph file" msgstr "geçici commit-graph dosyası yeniden adlandırılamadı" -#: commit-graph.c:2084 +#: commit-graph.c:2092 msgid "Scanning merged commits" msgstr "Birleştirilen işlemeler taranıyor" -#: commit-graph.c:2128 +#: commit-graph.c:2136 msgid "Merging commit-graph" msgstr "commit-graph birleştiriliyor" -#: commit-graph.c:2235 +#: commit-graph.c:2244 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" "bir commit-graph yazılmaya çalışılıyor; ancak 'core.commitGraph' devre dışı" -#: commit-graph.c:2342 +#: commit-graph.c:2351 msgid "too many commits to write graph" msgstr "grafik yazımı için çok fazla işleme" -#: commit-graph.c:2440 +#: commit-graph.c:2450 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "commit-graph dosyasının sağlama toplamı yanlış ve büyük olasılıkla hasar " "görmüş" -#: commit-graph.c:2450 +#: commit-graph.c:2460 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "commit-graph hatalı nesne tanımlayıcı sırasına iye: %s, sonra %s" -#: commit-graph.c:2460 commit-graph.c:2475 +#: commit-graph.c:2470 commit-graph.c:2485 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "commit-graph hatalı fanout değerine iye: fanout[%d] = %u != %u" -#: commit-graph.c:2467 +#: commit-graph.c:2477 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "%s işlemesi commit-graph'tan ayrıştırılamadı" -#: commit-graph.c:2485 +#: commit-graph.c:2495 msgid "Verifying commits in commit graph" msgstr "İşleme grafiğindeki işlemeler doğrulanıyor" -#: commit-graph.c:2500 +#: commit-graph.c:2510 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "%s işlemesi commit-graph için olan nesne veritabanından ayrıştırılamadı" -#: commit-graph.c:2507 +#: commit-graph.c:2517 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "commit-graph'teki %s işlemesi için olan kök ağaç nesne tanımlayıcısı %s != %s" -#: commit-graph.c:2517 +#: commit-graph.c:2527 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "%s işlemesi için olan commit-graph üst öge listesi çok uzun" -#: commit-graph.c:2526 +#: commit-graph.c:2536 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s için olan commit-graph üst ögesi %s != %s" -#: commit-graph.c:2540 +#: commit-graph.c:2550 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "%s işlemesi için olan commit-graph üst öge listesi erkenden sonlanıyor" -#: commit-graph.c:2545 +#: commit-graph.c:2555 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2427,7 +2443,7 @@ msgstr "" "%s işlemesi için commit-graph kuşak sayısı sıfır; ancak başka yerlerde " "sıfırdan farklı" -#: commit-graph.c:2549 +#: commit-graph.c:2559 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2435,19 +2451,19 @@ msgstr "" "%s işlemesi için commit-graph kuşak sayısı sıfırdan farklı; ancak başka " "yerlerde sıfır" -#: commit-graph.c:2566 +#: commit-graph.c:2576 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "%s işlemesi için commit-graph kuşağı %<PRIuMAX> < %<PRIuMAX>" -#: commit-graph.c:2572 +#: commit-graph.c:2582 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "%s işlemesi için commit-graph içindeki işleme tarihi %<PRIuMAX> != %<PRIuMAX>" -#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416 +#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "%s ayrıştırılamadı" @@ -2477,28 +2493,28 @@ msgstr "" "\"git config advice.graftFileDeprecated false\"\n" "kullanarak bu iletiyi kapatabilirsiniz." -#: commit.c:1223 +#: commit.c:1237 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "%s işlemesinin güvenilmeyen bir GPG imzası var, iddiaya göre %s tarafından." -#: commit.c:1227 +#: commit.c:1241 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "%s işlemesinin hatalı bir GPG imzası var, iddiaya göre %s tarafından." -#: commit.c:1230 +#: commit.c:1244 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "%s işlemesinin bir GPG imzası yok." -#: commit.c:1233 +#: commit.c:1247 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "%s işlemesinin %s tarafından sağlanan düzgün bir GPG imzası var\n" -#: commit.c:1487 +#: commit.c:1501 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2566,7 +2582,7 @@ msgstr "anahtar, bir bölüm içermiyor: %s" msgid "key does not contain variable name: %s" msgstr "anahtar, bir değişken adı içermiyor: %s" -#: config.c:472 sequencer.c:2588 +#: config.c:472 sequencer.c:2785 #, c-format msgid "invalid key: %s" msgstr "geçersiz anahtar: %s" @@ -2638,7 +2654,7 @@ msgstr "hatalı yapılandırma satırı %d, %s komut satırı içinde" #: config.c:1015 #, c-format msgid "bad config line %d in %s" -msgstr "hatalı yapılandırma satırı %d, %s içinde" +msgstr "hatalı yapılandırma satırı %d (%s içinde)" #: config.c:1152 msgid "out of range" @@ -2689,72 +2705,72 @@ msgstr "" #: config.c:1178 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" -msgstr "hatalı sayısal yapılandırma değeri '%s', '%s' için, %s içinde: %s" +msgstr "hatalı sayısal yapılandırma değeri '%s', '%s' için (%s içinde): %s" -#: config.c:1194 +#: config.c:1257 #, c-format msgid "bad boolean config value '%s' for '%s'" msgstr "hatalı Boole yapılandırma değeri '%s', '%s' için" -#: config.c:1289 +#: config.c:1275 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "şuradaki kullanıcı dizini genişletilemedi: '%s'" -#: config.c:1298 +#: config.c:1284 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "%s', '%s' için geçerli bir zaman damgası değil" -#: config.c:1391 +#: config.c:1377 #, c-format msgid "abbrev length out of range: %d" msgstr "kısaltma uzunluğu erim dışında: %d" -#: config.c:1405 config.c:1416 +#: config.c:1391 config.c:1402 #, c-format msgid "bad zlib compression level %d" msgstr "hatalı zlib sıkıştırma düzeyi %d" -#: config.c:1508 +#: config.c:1494 msgid "core.commentChar should only be one character" msgstr "core.commentChar yalnızca bir karakter olmalı" -#: config.c:1541 +#: config.c:1527 #, c-format msgid "invalid mode for object creation: %s" msgstr "nesne oluşturma için geçersiz kip: %s" -#: config.c:1613 +#: config.c:1599 #, c-format msgid "malformed value for %s" msgstr "%s için hatalı oluşturulmuş değer" -#: config.c:1639 +#: config.c:1625 #, c-format msgid "malformed value for %s: %s" msgstr "%s için hatalı oluşturulmuş değer: %s" -#: config.c:1640 +#: config.c:1626 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "nothing, matching, simple, upstream veya current içinden biri olmalı" -#: config.c:1701 builtin/pack-objects.c:3666 +#: config.c:1687 builtin/pack-objects.c:3924 #, c-format msgid "bad pack compression level %d" msgstr "hatalı paket sıkıştırma düzeyi %d" -#: config.c:1823 +#: config.c:1809 #, c-format msgid "unable to load config blob object '%s'" msgstr "'%s' yapılandırma ikili nesnesi yüklenemiyor" -#: config.c:1826 +#: config.c:1812 #, c-format msgid "reference '%s' does not point to a blob" msgstr "'%s' başvurusu ikili bir nesneye işaret etmiyor" -#: config.c:1843 +#: config.c:1829 #, c-format msgid "unable to resolve config blob '%s'" msgstr "'%s' yapılandırma ikili nesnesi çözülemiyor" @@ -2764,105 +2780,105 @@ msgstr "'%s' yapılandırma ikili nesnesi çözülemiyor" msgid "failed to parse %s" msgstr "%s ayrıştırılamadı" -#: config.c:1927 +#: config.c:1929 msgid "unable to parse command-line config" msgstr "komut satırı yapılandırması ayrıştırılamıyor" -#: config.c:2290 +#: config.c:2293 msgid "unknown error occurred while reading the configuration files" msgstr "yapılandırma dosyaları okunurken beklenmedik bir hata oluştu" -#: config.c:2464 +#: config.c:2467 #, c-format msgid "Invalid %s: '%s'" msgstr "Geçersiz %s: '%s'" -#: config.c:2509 +#: config.c:2512 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange değeri '%d' 0 ve 100 arasında olmalı" -#: config.c:2555 +#: config.c:2558 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "'%s' komut satırı yapılandırmasından ayrıştırılamıyor" -#: config.c:2557 +#: config.c:2560 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "hatalı yapılandırma değişkeni '%s', '%s' dosyası %d. satırda" -#: config.c:2641 +#: config.c:2644 #, c-format msgid "invalid section name '%s'" msgstr "geçersiz bölüm adı '%s'" -#: config.c:2673 +#: config.c:2676 #, c-format msgid "%s has multiple values" msgstr "%s birden çok değere iye" -#: config.c:2702 +#: config.c:2705 #, c-format msgid "failed to write new configuration file %s" msgstr "yeni yapılandırma dosyası %s yazılamadı" -#: config.c:2954 config.c:3280 +#: config.c:2957 config.c:3283 #, c-format msgid "could not lock config file %s" msgstr "%s yapılandırma dosyası kilitlenemedi" -#: config.c:2965 +#: config.c:2968 #, c-format msgid "opening %s" msgstr "%s açılıyor" -#: config.c:3002 builtin/config.c:361 +#: config.c:3005 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "geçersiz dizgi: %s" -#: config.c:3027 +#: config.c:3030 #, c-format msgid "invalid config file %s" msgstr "geçersiz yapılandırma dosyası %s" -#: config.c:3040 config.c:3293 +#: config.c:3043 config.c:3296 #, c-format msgid "fstat on %s failed" msgstr "%s üzerinde fstat başarısız oldu" -#: config.c:3051 +#: config.c:3054 #, c-format msgid "unable to mmap '%s'" msgstr "'%s' mmap yapılamıyor" -#: config.c:3060 config.c:3298 +#: config.c:3063 config.c:3301 #, c-format msgid "chmod on %s failed" msgstr "%s üzerinde chmod başarısız oldu" -#: config.c:3145 config.c:3395 +#: config.c:3148 config.c:3398 #, c-format msgid "could not write config file %s" msgstr "%s yapılandırma dosyası yazılamadı" -#: config.c:3179 +#: config.c:3182 #, c-format msgid "could not set '%s' to '%s'" msgstr "'%s', '%s' olarak ayarlanamadı" -#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "'%s' ayarı kapatılamadı" -#: config.c:3271 +#: config.c:3274 #, c-format msgid "invalid section name: %s" msgstr "geçersiz bölüm adı: %s" -#: config.c:3438 +#: config.c:3441 #, c-format msgid "missing value for '%s'" msgstr "'%s' için değer eksik" @@ -3039,7 +3055,7 @@ msgstr "garip yol adı '%s' engellendi" msgid "unable to fork" msgstr "çatallanamıyor" -#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Bağlantı denetleniyor" @@ -3055,17 +3071,17 @@ msgstr "rev-list yazılamadı" msgid "failed to close rev-list's stdin" msgstr "rev-list'in stdin'i kapatılamadı" -#: convert.c:194 +#: convert.c:183 #, c-format msgid "illegal crlf_action %d" msgstr "izin verilmeyen crlf_action %d" -#: convert.c:207 +#: convert.c:196 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF %s içinde LF ile değiştirilecek" -#: convert.c:209 +#: convert.c:198 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -3074,12 +3090,12 @@ msgstr "" "CRLF %s içinde LF ile değiştirilecek.\n" "Dosya sizin çalışma dizininizde kendi orijinal satır sonlarına iye olacak." -#: convert.c:217 +#: convert.c:206 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF %s içinde CRLF ile değiştirilecek" -#: convert.c:219 +#: convert.c:208 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -3088,12 +3104,12 @@ msgstr "" "LF %s içinde CRLF ile değiştirilecek.\n" "Dosya sizin çalışma dizininizde kendi orijinal satır sonlarına iye olacak." -#: convert.c:284 +#: convert.c:273 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "BOM '%s' içinde yasaklı, eğer %s olarak kodlanmışsa" -#: convert.c:291 +#: convert.c:280 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " @@ -3102,12 +3118,12 @@ msgstr "" "'%s' dosyası bir bayt sıra imi (BOM) içeriyor. Lütfen çalışma ağacı " "kodlaması için UTF-%.*s kullanın." -#: convert.c:304 +#: convert.c:293 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "BOM '%s' içinde gerekli, eğer %s olarak kodlanmışsa" -#: convert.c:306 +#: convert.c:295 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -3116,51 +3132,51 @@ msgstr "" "'%s' dosyasında bir bayt sıra imi (BOM) eksik. Lütfen çalışma ağacı " "kodlaması için UTF-%sBE veya UTF-%sLE (bayt sırasına göre) kullanın." -#: convert.c:419 convert.c:490 +#: convert.c:408 convert.c:479 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "'%s', %s değerinden %s değerine kodlanamadı" -#: convert.c:462 +#: convert.c:451 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" "'%s' kodlamasını %s -> %s biçiminde yapıp tersine döndürmek aynı şey değil" -#: convert.c:665 +#: convert.c:654 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "'%s' dış süzgecini çalıştırmak için çatallama yapılamıyor" -#: convert.c:685 +#: convert.c:674 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "girdi '%s' dış süzgecine beslenemiyor" -#: convert.c:692 +#: convert.c:681 #, c-format msgid "external filter '%s' failed %d" msgstr "'%s' dış süzgeci %d için başarısız oldu" -#: convert.c:727 convert.c:730 +#: convert.c:716 convert.c:719 #, c-format msgid "read from external filter '%s' failed" msgstr "'%s' dış süzgecinden okuma başarısız oldu" -#: convert.c:733 convert.c:788 +#: convert.c:722 convert.c:777 #, c-format msgid "external filter '%s' failed" msgstr "'%s' dış süzgeci başarısız oldu" -#: convert.c:837 +#: convert.c:826 msgid "unexpected filter type" msgstr "beklenmedik süzgeç türü" -#: convert.c:848 +#: convert.c:837 msgid "path name too long for external filter" msgstr "dış süzgeç için yol adı pek uzun" -#: convert.c:940 +#: convert.c:934 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3168,16 +3184,16 @@ msgid "" msgstr "" "'%s' dış süzgeci artık kullanılamıyor; ancak tüm yolların süzümü bitmedi" -#: convert.c:1240 +#: convert.c:1234 msgid "true/false are no valid working-tree-encodings" msgstr "doğru/yanlış geçerli bir çalışma ağacı kodlaması değil" -#: convert.c:1428 convert.c:1462 +#: convert.c:1414 convert.c:1447 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: temiz süzgeç '%s' başarısız oldu" -#: convert.c:1508 +#: convert.c:1490 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: is süzgeci %s başarısız oldu" @@ -3304,28 +3320,28 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "%d delta adası imlendi, bitti.\n" -#: diff-merges.c:70 +#: diff-merges.c:80 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "--diff-merges için bilinmeyen değer: %s" -#: diff-lib.c:534 +#: diff-lib.c:538 msgid "--merge-base does not work with ranges" msgstr "--merge-base erimlerle çalışmaz" -#: diff-lib.c:536 +#: diff-lib.c:540 msgid "--merge-base only works with commits" msgstr "--merge-base yalnızca işlemelerle çalışır" -#: diff-lib.c:553 +#: diff-lib.c:557 msgid "unable to get HEAD" msgstr "HEAD alınamıyor" -#: diff-lib.c:560 +#: diff-lib.c:564 msgid "no merge base found" msgstr "bir birleştirme temeli bulunamadı" -#: diff-lib.c:562 +#: diff-lib.c:566 msgid "multiple merge bases found" msgstr "birden çok birleştirme temeli bulundu" @@ -3390,35 +3406,35 @@ msgstr "" "'diff.dirstat' yapılandırma değişkeninde hatalar bulundu:\n" "%s" -#: diff.c:4276 +#: diff.c:4278 #, c-format msgid "external diff died, stopping at %s" msgstr "dış diff sonlandı, %s konumunda durdu" -#: diff.c:4628 +#: diff.c:4630 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check ve -s birlikte kullanılmaz" -#: diff.c:4631 +#: diff.c:4633 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S ve --find-object birlikte kullanılmaz" -#: diff.c:4710 +#: diff.c:4712 msgid "--follow requires exactly one pathspec" msgstr "--follow tam olarak yalnızca bir yol belirteci gerektiriyor" -#: diff.c:4758 +#: diff.c:4760 #, c-format msgid "invalid --stat value: %s" msgstr "geçersiz --stat değeri: %s" -#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306 +#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s bir sayısal değer bekliyor" -#: diff.c:4795 +#: diff.c:4797 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3427,42 +3443,42 @@ msgstr "" "--dirstat/-X seçenek parametresi ayrıştırılamadı:\n" "%s" -#: diff.c:4880 +#: diff.c:4882 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "şurada bilinmeyen değişiklik sınıfı '%c': -diff-filter=%s" -#: diff.c:4904 +#: diff.c:4906 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "şundan sonra bilinmeyen değer: ws-error-highlight=%.*s" -#: diff.c:4918 +#: diff.c:4920 #, c-format msgid "unable to resolve '%s'" msgstr "'%s' çözülemiyor" -#: diff.c:4968 diff.c:4974 +#: diff.c:4970 diff.c:4976 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s <n>/<m> biçimi bekliyor" -#: diff.c:4986 +#: diff.c:4988 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s bir karakter bekliyor, '%s' aldı" -#: diff.c:5007 +#: diff.c:5009 #, c-format msgid "bad --color-moved argument: %s" msgstr "hatalı --color-moved argümanı: %s" -#: diff.c:5026 +#: diff.c:5028 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws içinde geçersiz kip '%s'" -#: diff.c:5066 +#: diff.c:5068 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3470,162 +3486,162 @@ msgstr "" "diff-algorithm seçeneği şunları kabul eder: \"myers\", \"minimal\", " "\"patience\" ve \"histogram\"" -#: diff.c:5102 diff.c:5122 +#: diff.c:5104 diff.c:5124 #, c-format msgid "invalid argument to %s" msgstr "%s için geçersiz argüman" -#: diff.c:5226 +#: diff.c:5228 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "-I'ya geçersiz düzenli ifade verildi: '%s'" -#: diff.c:5275 +#: diff.c:5277 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "--submodule seçenek parametresi ayrıştırılamadı: '%s'" -#: diff.c:5331 +#: diff.c:5333 #, c-format msgid "bad --word-diff argument: %s" msgstr "hatalı --word-diff argümanı: %s" -#: diff.c:5367 +#: diff.c:5369 msgid "Diff output format options" msgstr "Diff çıktısı biçimlendirme seçenekleri" -#: diff.c:5369 diff.c:5375 +#: diff.c:5371 diff.c:5377 msgid "generate patch" msgstr "yama oluştur" -#: diff.c:5372 builtin/log.c:179 +#: diff.c:5374 builtin/log.c:179 msgid "suppress diff output" msgstr "diff çıktısını gizle" -#: diff.c:5377 diff.c:5491 diff.c:5498 +#: diff.c:5379 diff.c:5493 diff.c:5500 msgid "<n>" msgstr "<n>" -#: diff.c:5378 diff.c:5381 +#: diff.c:5380 diff.c:5383 msgid "generate diffs with <n> lines context" msgstr "diff'leri <n> satır bağlamlı oluştur" -#: diff.c:5383 +#: diff.c:5385 msgid "generate the diff in raw format" msgstr "diff'i ham biçimde oluştur" -#: diff.c:5386 +#: diff.c:5388 msgid "synonym for '-p --raw'" msgstr "'-p --raw eşanlamlısı" -#: diff.c:5390 +#: diff.c:5392 msgid "synonym for '-p --stat'" msgstr "'-p --stat eşanlamlısı" -#: diff.c:5394 +#: diff.c:5396 msgid "machine friendly --stat" msgstr "makinede okunabilen --stat" -#: diff.c:5397 +#: diff.c:5399 msgid "output only the last line of --stat" msgstr "--stat'ın yalnızca son satırını çıktı ver" -#: diff.c:5399 diff.c:5407 +#: diff.c:5401 diff.c:5409 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5400 +#: diff.c:5402 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "her alt dizin için göreceli bir miktar değişikliğin dağıtımını çıktı ver" -#: diff.c:5404 +#: diff.c:5406 msgid "synonym for --dirstat=cumulative" msgstr "--dirstat-cumulative eşanlamlısı" -#: diff.c:5408 +#: diff.c:5410 msgid "synonym for --dirstat=files,param1,param2..." msgstr "--dirstat=files,param1,param2... eşanlamlısı" -#: diff.c:5412 +#: diff.c:5414 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "değişiklikler çakışma imleyicileri veya boşluk hataları doğuruyorsa uyar" -#: diff.c:5415 +#: diff.c:5417 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "sıkışık özet; örn. oluşumlar, yeniden adlandırmalar ve kip değişiklikleri" -#: diff.c:5418 +#: diff.c:5420 msgid "show only names of changed files" msgstr "yalnızca değiştirilen dosyaların adlarını göster" -#: diff.c:5421 +#: diff.c:5423 msgid "show only names and status of changed files" msgstr "yalnızca değiştirilen dosyaların adlarını ve durumlarını göster" -#: diff.c:5423 +#: diff.c:5425 msgid "<width>[,<name-width>[,<count>]]" msgstr "<genişlik>[,<ad-genişlik>[,<sayım>]]" -#: diff.c:5424 +#: diff.c:5426 msgid "generate diffstat" msgstr "diffstat oluştur" -#: diff.c:5426 diff.c:5429 diff.c:5432 +#: diff.c:5428 diff.c:5431 diff.c:5434 msgid "<width>" msgstr "<genişlik>" -#: diff.c:5427 +#: diff.c:5429 msgid "generate diffstat with a given width" msgstr "diffstat'ı verilmiş bir genişlik ile oluştur" -#: diff.c:5430 +#: diff.c:5432 msgid "generate diffstat with a given name width" msgstr "diffstat'ı verilmiş bir ad genişliği ile oluştur" -#: diff.c:5433 +#: diff.c:5435 msgid "generate diffstat with a given graph width" msgstr "diffstat'ı verilmiş bir grafik genişliği ile oluştur" -#: diff.c:5435 +#: diff.c:5437 msgid "<count>" msgstr "<sayım>" -#: diff.c:5436 +#: diff.c:5438 msgid "generate diffstat with limited lines" msgstr "diffstat'ı kısıtlı satırlarla oluştur" -#: diff.c:5439 +#: diff.c:5441 msgid "generate compact summary in diffstat" msgstr "diffstat içinde ufak özet oluştur" -#: diff.c:5442 +#: diff.c:5444 msgid "output a binary diff that can be applied" msgstr "uygulanabilir bir ikili diff çıktısı ver" -#: diff.c:5445 +#: diff.c:5447 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "\"index\" satırlarında tam ön ve songörüntü nesne adlarını göster" -#: diff.c:5447 +#: diff.c:5449 msgid "show colored diff" msgstr "renkli diff göster" -#: diff.c:5448 +#: diff.c:5450 msgid "<kind>" msgstr "<çeşit>" -#: diff.c:5449 +#: diff.c:5451 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" "diff'teki boşluk hatalarını 'context', 'old' veya 'new' satırlarında vurgula" -#: diff.c:5452 +#: diff.c:5454 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3633,88 +3649,88 @@ msgstr "" "--raw veya --numstat içinde yol adlarını tahrip etme ve çıktı alanı " "sonlandırıcıları olarak NUL'ları kullan" -#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570 +#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572 msgid "<prefix>" msgstr "<önek>" -#: diff.c:5456 +#: diff.c:5458 msgid "show the given source prefix instead of \"a/\"" msgstr "\"a/\" yerine verilmiş kaynak önekini göster" -#: diff.c:5459 +#: diff.c:5461 msgid "show the given destination prefix instead of \"b/\"" msgstr "\"b/\"yerine verilmiş kaynak önekini göster" -#: diff.c:5462 +#: diff.c:5464 msgid "prepend an additional prefix to every line of output" msgstr "çıktının her satırının başına ek bir önek ekle" -#: diff.c:5465 +#: diff.c:5467 msgid "do not show any source or destination prefix" msgstr "hiçbir kaynak ve hedef önekini gösterme" -#: diff.c:5468 +#: diff.c:5470 msgid "show context between diff hunks up to the specified number of lines" msgstr "diff parçaları arasındaki bağlamı belirtilen satır sayısı kadar göster" -#: diff.c:5472 diff.c:5477 diff.c:5482 +#: diff.c:5474 diff.c:5479 diff.c:5484 msgid "<char>" msgstr "<karakter>" -#: diff.c:5473 +#: diff.c:5475 msgid "specify the character to indicate a new line instead of '+'" msgstr "yeni satırı belirtmek için '+' yerine kullanılacak karakteri belirle" -#: diff.c:5478 +#: diff.c:5480 msgid "specify the character to indicate an old line instead of '-'" msgstr "eski satırı belirtmek için '-' yerine kullanılacak karakteri belirle" -#: diff.c:5483 +#: diff.c:5485 msgid "specify the character to indicate a context instead of ' '" msgstr "bağlam belirtmek için ' ' yerine kullanılacak karakteri belirle" -#: diff.c:5486 +#: diff.c:5488 msgid "Diff rename options" msgstr "Diff yeniden adlandırma seçenekleri" -#: diff.c:5487 +#: diff.c:5489 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5488 +#: diff.c:5490 msgid "break complete rewrite changes into pairs of delete and create" msgstr "tam yeniden yazım değişikliklerini silme ve oluşturma olarak ayır" -#: diff.c:5492 +#: diff.c:5494 msgid "detect renames" msgstr "yeniden adlandırmaları algıla" -#: diff.c:5496 +#: diff.c:5498 msgid "omit the preimage for deletes" msgstr "silmeler için öngörüntüyü atla" -#: diff.c:5499 +#: diff.c:5501 msgid "detect copies" msgstr "kopyaları algıla" -#: diff.c:5503 +#: diff.c:5505 msgid "use unmodified files as source to find copies" msgstr "değiştirilmemiş dosyaları kopyaları bulmak için kaynak olarak kullan" -#: diff.c:5505 +#: diff.c:5507 msgid "disable rename detection" msgstr "yeniden adlandırma algılamasını devre dışı bırak" -#: diff.c:5508 +#: diff.c:5510 msgid "use empty blobs as rename source" msgstr "boş ikili nesneleri yeniden adlandırma kaynağı olarak kullan" -#: diff.c:5510 +#: diff.c:5512 msgid "continue listing the history of a file beyond renames" msgstr "" "bir dosyanın geçmişini listelemeyi yeniden adlandırmaların ötesinde sürdür" -#: diff.c:5513 +#: diff.c:5515 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3722,234 +3738,234 @@ msgstr "" "eğer yeniden adlandırma/kopyalama hedeflerinin sayısı verilen sınırı aşarsa " "yeniden adlandırma/kopyalama algılamasını önle" -#: diff.c:5515 +#: diff.c:5517 msgid "Diff algorithm options" msgstr "Diff algoritma seçenekleri" -#: diff.c:5517 +#: diff.c:5519 msgid "produce the smallest possible diff" msgstr "olabilecek en küçük diff'i üret" -#: diff.c:5520 +#: diff.c:5522 msgid "ignore whitespace when comparing lines" msgstr "satırları karşılaştırırken boşlukları yok say" -#: diff.c:5523 +#: diff.c:5525 msgid "ignore changes in amount of whitespace" msgstr "boşluk sayısındaki değişiklikleri yok say" -#: diff.c:5526 +#: diff.c:5528 msgid "ignore changes in whitespace at EOL" msgstr "satır sonundaki boşluk değişikliklerini yok say" -#: diff.c:5529 +#: diff.c:5531 msgid "ignore carrier-return at the end of line" msgstr "satır sonundaki satırbaşı karakterini yok say" -#: diff.c:5532 +#: diff.c:5534 msgid "ignore changes whose lines are all blank" msgstr "satırlarının tümü boş olan değişiklikleri yok say" -#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604 +#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606 msgid "<regex>" msgstr "<ifade>" -#: diff.c:5535 +#: diff.c:5537 msgid "ignore changes whose all lines match <regex>" msgstr "satırlarının tümü <ifade> ile eşleşen değişiklikleri yok say" -#: diff.c:5538 +#: diff.c:5540 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "diff parça sınırlarını kolay okuma için bulgusal olarak kaydır" -#: diff.c:5541 +#: diff.c:5543 msgid "generate diff using the \"patience diff\" algorithm" msgstr "diff'i \"patience diff\" algoritmasını kullanarak oluştur" -#: diff.c:5545 +#: diff.c:5547 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "diff'i \"histogram diff\" algoritmasını kullanarak oluştur" -#: diff.c:5547 +#: diff.c:5549 msgid "<algorithm>" msgstr "<algoritma>" -#: diff.c:5548 +#: diff.c:5550 msgid "choose a diff algorithm" msgstr "bir diff algoritması seç" -#: diff.c:5550 +#: diff.c:5552 msgid "<text>" msgstr "<metin>" -#: diff.c:5551 +#: diff.c:5553 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "diff'i \"anchored diff\" algoritmasını kullanarak oluştur" -#: diff.c:5553 diff.c:5562 diff.c:5565 +#: diff.c:5555 diff.c:5564 diff.c:5567 msgid "<mode>" msgstr "<kip>" -#: diff.c:5554 +#: diff.c:5556 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "sözcük diff'ini değiştirilen sözcükleri sınırlandırmak için <kip> kullanarak " "göster" -#: diff.c:5557 +#: diff.c:5559 msgid "use <regex> to decide what a word is" msgstr "bir sözcüğün ne olduğuna karar vermek için <ifade> kullan" -#: diff.c:5560 +#: diff.c:5562 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "şuna eşdeğer: --word-diff=color --word-diff-regex=<ifade>" -#: diff.c:5563 +#: diff.c:5565 msgid "moved lines of code are colored differently" msgstr "taşınan kod satırları farklı renklendirilir" -#: diff.c:5566 +#: diff.c:5568 msgid "how white spaces are ignored in --color-moved" msgstr "boşluklar --color-moved içinde nasıl yok sayılır" -#: diff.c:5569 +#: diff.c:5571 msgid "Other diff options" msgstr "Diğer diff seçenekleri" -#: diff.c:5571 +#: diff.c:5573 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "altdizinden çalıştırıldığında dışarıdaki değişiklikleri hariç tut ve " "göreceli yolları göster" -#: diff.c:5575 +#: diff.c:5577 msgid "treat all files as text" msgstr "tüm dosyaları metin olarak varsay" -#: diff.c:5577 +#: diff.c:5579 msgid "swap two inputs, reverse the diff" msgstr "iki girdiyi değiştir, diff'i tersine döndür" -#: diff.c:5579 +#: diff.c:5581 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "ayrımlar varsa 1 ile, yoksa 0 ile çık" -#: diff.c:5581 +#: diff.c:5583 msgid "disable all output of the program" msgstr "tüm program çıktısını devre dışı bırak" -#: diff.c:5583 +#: diff.c:5585 msgid "allow an external diff helper to be executed" msgstr "bir dış diff yardımcısının çalıştırılmasına izin ver" -#: diff.c:5585 +#: diff.c:5587 msgid "run external text conversion filters when comparing binary files" msgstr "" "ikili dosyaları karşılaştırırken dış metin dönüştürme süzgeçlerini çalıştır" -#: diff.c:5587 +#: diff.c:5589 msgid "<when>" msgstr "<ne-zaman>" -#: diff.c:5588 +#: diff.c:5590 msgid "ignore changes to submodules in the diff generation" msgstr "diff oluştururken altmodüllere olan değişiklikleri yok say" -#: diff.c:5591 +#: diff.c:5593 msgid "<format>" msgstr "<biçim>" -#: diff.c:5592 +#: diff.c:5594 msgid "specify how differences in submodules are shown" msgstr "altmodüllerdeki değişikliklerin nasıl gösterileceğini belirt" -#: diff.c:5596 +#: diff.c:5598 msgid "hide 'git add -N' entries from the index" msgstr "indeksten 'git add -N' girdilerini gizle" -#: diff.c:5599 +#: diff.c:5601 msgid "treat 'git add -N' entries as real in the index" msgstr "indekste 'git add -N' girdilerine gerçekmiş gibi davran" -#: diff.c:5601 +#: diff.c:5603 msgid "<string>" msgstr "<dizi>" -#: diff.c:5602 +#: diff.c:5604 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "belirtilen dizinin görülme sayısını değiştiren ayrımlara bak" -#: diff.c:5605 +#: diff.c:5607 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "belirtilen düzenli ifadenin görülme sayısını değiştiren ayrımlara bak" -#: diff.c:5608 +#: diff.c:5610 msgid "show all changes in the changeset with -S or -G" msgstr "değişiklik setinde -S veya -G içeren tüm değişiklikleri göster" -#: diff.c:5611 +#: diff.c:5613 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "-S içindeki <dizi>'yi genişletilmiş POSIX düzenli ifadesi olarak işle" -#: diff.c:5614 +#: diff.c:5616 msgid "control the order in which files appear in the output" msgstr "dosyaların çıktıda hangi sırayla görüneceğini denetle" -#: diff.c:5615 diff.c:5618 +#: diff.c:5617 diff.c:5620 msgid "<path>" msgstr "<yol>" -#: diff.c:5616 +#: diff.c:5618 msgid "show the change in the specified path first" msgstr "öncelikle belirtilen yoldaki değişikliği göster" -#: diff.c:5619 +#: diff.c:5621 msgid "skip the output to the specified path" msgstr "belirtilen yola olan çıktıyı atla" -#: diff.c:5621 +#: diff.c:5623 msgid "<object-id>" msgstr "<nesne-no>" -#: diff.c:5622 +#: diff.c:5624 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "belirtilen nesnenin görülme sayısını değiştiren ayrımlara bak" -#: diff.c:5624 +#: diff.c:5626 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5625 +#: diff.c:5627 msgid "select files by diff type" msgstr "dosyaları diff türüne göre seç" -#: diff.c:5627 +#: diff.c:5629 msgid "<file>" msgstr "<dosya>" -#: diff.c:5628 +#: diff.c:5630 msgid "Output to a specific file" msgstr "belirli bir dosyaya çıktı ver" -#: diff.c:6285 +#: diff.c:6287 msgid "inexact rename detection was skipped due to too many files." msgstr "" "Kesin olmayan yeniden adlandırma algılaması çok fazla dosya olmasından " "dolayı atlandı." -#: diff.c:6288 +#: diff.c:6290 msgid "only found copies from modified paths due to too many files." msgstr "" "Çok fazla dosya olmasından dolayı yalnızca değiştirilen yollardan kopyalar " "bulundu." -#: diff.c:6291 +#: diff.c:6293 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3962,7 +3978,7 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "orderfile '%s' okunamadı" -#: diffcore-rename.c:786 +#: diffcore-rename.c:1418 msgid "Performing inexact rename detection" msgstr "Kesin olmayan yeniden adlandırma algılaması gerçekleştiriliyor" @@ -3995,35 +4011,35 @@ msgstr "sparse-checkout dosyanızın sorunları olabilir: '%s' dizgisi yinelenmi msgid "disabling cone pattern matching" msgstr "koni dizgi eşleşmesi devre dışı bırakılıyor" -#: dir.c:1198 +#: dir.c:1206 #, c-format msgid "cannot use %s as an exclude file" msgstr "%s bir 'exclude' dosyası olarak kullanılamıyor" -#: dir.c:2305 +#: dir.c:2314 #, c-format msgid "could not open directory '%s'" msgstr "'%s' dizini açılamadı" -#: dir.c:2605 +#: dir.c:2614 msgid "failed to get kernel name and information" msgstr "çekirdek adı ve bilgisi alınamadı" -#: dir.c:2729 +#: dir.c:2738 msgid "untracked cache is disabled on this system or location" msgstr "izlenmeyen önbellek bu sistemde veya konumda devre dışı bırakılmış" -#: dir.c:3534 +#: dir.c:3543 #, c-format msgid "index file corrupt in repo %s" msgstr "%s deposundaki indeks dosyası hasarlı" -#: dir.c:3579 dir.c:3584 +#: dir.c:3590 dir.c:3595 #, c-format msgid "could not create directories for %s" msgstr "%s için dizinler oluşturulamadı" -#: dir.c:3613 +#: dir.c:3624 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "git dizini '%s' konumundan '%s' konumuna göç ettirilemedi" @@ -4033,11 +4049,11 @@ msgstr "git dizini '%s' konumundan '%s' konumuna göç ettirilemedi" msgid "hint: Waiting for your editor to close the file...%c" msgstr "İpucu: Düzenleyicinizin dosyayı kapatması bekleniyor...%c" -#: entry.c:177 +#: entry.c:179 msgid "Filtering content" msgstr "İçerik süzülüyor" -#: entry.c:478 +#: entry.c:500 #, c-format msgid "could not stat file '%s'" msgstr "'%s' dosyasının bilgileri alınamadı" @@ -4057,249 +4073,257 @@ msgstr "GIT_DIR şuna ayarlanamadı: '%s'" msgid "too many args to run %s" msgstr "%s çalıştırmak için çok fazla argüman" -#: fetch-pack.c:177 +#: fetch-pack.c:182 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: sığ bir liste bekleniyordu" -#: fetch-pack.c:180 +#: fetch-pack.c:185 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: sığ listeden sonra floş paketi bekleniyordu" -#: fetch-pack.c:191 +#: fetch-pack.c:196 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: ACK/NAK bekleniyordu, floş paket alındı" -#: fetch-pack.c:211 +#: fetch-pack.c:216 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ACK/NAK bekleniyordu, '%s' alındı" -#: fetch-pack.c:222 +#: fetch-pack.c:227 msgid "unable to write to remote" msgstr "uzak konuma yazılamıyor" -#: fetch-pack.c:283 +#: fetch-pack.c:288 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc multi_ack_detailed gerektiriyor" -#: fetch-pack.c:378 fetch-pack.c:1457 +#: fetch-pack.c:383 fetch-pack.c:1423 #, c-format msgid "invalid shallow line: %s" msgstr "geçersiz sığ satır: %s" -#: fetch-pack.c:384 fetch-pack.c:1463 +#: fetch-pack.c:389 fetch-pack.c:1429 #, c-format msgid "invalid unshallow line: %s" msgstr "geçersiz sığ olmayan satır: %s" -#: fetch-pack.c:386 fetch-pack.c:1465 +#: fetch-pack.c:391 fetch-pack.c:1431 #, c-format msgid "object not found: %s" msgstr "nesne bulunamadı: %s" -#: fetch-pack.c:389 fetch-pack.c:1468 +#: fetch-pack.c:394 fetch-pack.c:1434 #, c-format msgid "error in object: %s" msgstr "nesne içinde hata: %s" -#: fetch-pack.c:391 fetch-pack.c:1470 +#: fetch-pack.c:396 fetch-pack.c:1436 #, c-format msgid "no shallow found: %s" msgstr "sığ bulunamadı: %s" -#: fetch-pack.c:394 fetch-pack.c:1474 +#: fetch-pack.c:399 fetch-pack.c:1440 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "sığ/sığ olmayan bekleniyordu, %s alındı" -#: fetch-pack.c:434 +#: fetch-pack.c:439 #, c-format msgid "got %s %d %s" msgstr "%s %d %s alındı" -#: fetch-pack.c:451 +#: fetch-pack.c:456 #, c-format msgid "invalid commit %s" msgstr "geçersiz işleme %s" -#: fetch-pack.c:482 +#: fetch-pack.c:487 msgid "giving up" msgstr "vazgeçiliyor" -#: fetch-pack.c:495 progress.c:339 +#: fetch-pack.c:500 progress.c:339 msgid "done" msgstr "bitti" -#: fetch-pack.c:507 +#: fetch-pack.c:512 #, c-format msgid "got %s (%d) %s" msgstr "%s (%d) %s alındı" -#: fetch-pack.c:543 +#: fetch-pack.c:548 #, c-format msgid "Marking %s as complete" msgstr "%s tamam olarak imleniyor" -#: fetch-pack.c:758 +#: fetch-pack.c:763 #, c-format msgid "already have %s (%s)" msgstr "%s halihazırda var (%s)" -#: fetch-pack.c:844 +#: fetch-pack.c:849 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: yanbant çoğullama çözücüsü ayrı çatallanamıyor" -#: fetch-pack.c:852 +#: fetch-pack.c:857 msgid "protocol error: bad pack header" msgstr "protokol hatası: hatalı paket üstbilgisi" -#: fetch-pack.c:946 +#: fetch-pack.c:951 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: %s ayrı çatallanamıyor" -#: fetch-pack.c:952 +#: fetch-pack.c:957 msgid "fetch-pack: invalid index-pack output" msgstr "fetch-pack: geçersiz index-pack çıktısı" -#: fetch-pack.c:969 +#: fetch-pack.c:974 #, c-format msgid "%s failed" msgstr "%s başarısız oldu" -#: fetch-pack.c:971 +#: fetch-pack.c:976 msgid "error in sideband demultiplexer" msgstr "yanbant çoğullama çözücüsünde hata" -#: fetch-pack.c:1031 +#: fetch-pack.c:1019 #, c-format msgid "Server version is %.*s" msgstr "Sunucu sürümü %.*s" -#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054 -#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 -#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 -#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108 +#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042 +#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 +#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096 #, c-format msgid "Server supports %s" msgstr "Sunucu %s destekliyor" -#: fetch-pack.c:1041 +#: fetch-pack.c:1029 msgid "Server does not support shallow clients" msgstr "Sunucu sığ istemcileri desteklemiyor" -#: fetch-pack.c:1101 +#: fetch-pack.c:1089 msgid "Server does not support --shallow-since" msgstr "Sunucu --shallow-since desteklemiyor" -#: fetch-pack.c:1106 +#: fetch-pack.c:1094 msgid "Server does not support --shallow-exclude" msgstr "Sunucu --shallow-exclude desteklemiyor" -#: fetch-pack.c:1110 +#: fetch-pack.c:1098 msgid "Server does not support --deepen" msgstr "Sunucu --deepen desteklemiyor" -#: fetch-pack.c:1112 +#: fetch-pack.c:1100 msgid "Server does not support this repository's object format" msgstr "Sunucu bu deponun nesne türünü desteklemiyor" -#: fetch-pack.c:1125 +#: fetch-pack.c:1113 msgid "no common commits" msgstr "ortak işleme yok" -#: fetch-pack.c:1138 fetch-pack.c:1682 +#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238 +msgid "source repository is shallow, reject to clone." +msgstr "kaynak depo sığ, klonlama için reddet" + +#: fetch-pack.c:1128 fetch-pack.c:1651 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: getirme başarısız" -#: fetch-pack.c:1265 +#: fetch-pack.c:1242 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "eşleşmeyen algoritmalar: istemci %s; sunucu %s" -#: fetch-pack.c:1269 +#: fetch-pack.c:1246 #, c-format msgid "the server does not support algorithm '%s'" msgstr "sunucu '%s' algoritmasını desteklemiyor" -#: fetch-pack.c:1289 +#: fetch-pack.c:1279 msgid "Server does not support shallow requests" msgstr "Sunucu sığ istekleri desteklemiyor" -#: fetch-pack.c:1296 +#: fetch-pack.c:1286 msgid "Server supports filter" msgstr "Sunucu süzgeç destekliyor" -#: fetch-pack.c:1335 +#: fetch-pack.c:1329 fetch-pack.c:2034 msgid "unable to write request to remote" msgstr "uzak konuma istek yazılamıyor" -#: fetch-pack.c:1353 +#: fetch-pack.c:1347 #, c-format msgid "error reading section header '%s'" msgstr "bölüm üstbilgisi '%s' okunurken hata" -#: fetch-pack.c:1359 +#: fetch-pack.c:1353 #, c-format msgid "expected '%s', received '%s'" msgstr "'%s' bekleniyordu, '%s' alındı" -#: fetch-pack.c:1420 +#: fetch-pack.c:1387 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "beklenmedik alındı satırı: '%s'" -#: fetch-pack.c:1425 +#: fetch-pack.c:1392 #, c-format msgid "error processing acks: %d" msgstr "alındılar işlenirken hata: %d" -#: fetch-pack.c:1435 +#: fetch-pack.c:1402 msgid "expected packfile to be sent after 'ready'" msgstr "paket dosyasının 'ready'den sonra gönderilmesi gerekiyordu" -#: fetch-pack.c:1437 +#: fetch-pack.c:1404 msgid "expected no other sections to be sent after no 'ready'" msgstr "'ready' \"yok\" iken başka hiçbir bölümün gönderilmemesi gerekiyordu" -#: fetch-pack.c:1479 +#: fetch-pack.c:1445 #, c-format msgid "error processing shallow info: %d" msgstr "sığ bilgi işlenirken hata: %d" -#: fetch-pack.c:1526 +#: fetch-pack.c:1494 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "wanted-ref bekleniyordu, '%s' alındı" -#: fetch-pack.c:1531 +#: fetch-pack.c:1499 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "beklenmedik wanted-ref: '%s'" -#: fetch-pack.c:1536 +#: fetch-pack.c:1504 #, c-format msgid "error processing wanted refs: %d" msgstr "aranan başvurular işlenirken hata: %d" -#: fetch-pack.c:1566 +#: fetch-pack.c:1534 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: yanıt sonu paketi bekleniyordu" -#: fetch-pack.c:1960 +#: fetch-pack.c:1930 msgid "no matching remote head" msgstr "eşleşen uzak dal ucu yok" -#: fetch-pack.c:1983 builtin/clone.c:693 +#: fetch-pack.c:1953 builtin/clone.c:697 msgid "remote did not send all necessary objects" msgstr "uzak konum gereken tüm nesneleri göndermedi" -#: fetch-pack.c:2010 +#: fetch-pack.c:2056 +msgid "unexpected 'ready' from remote" +msgstr "uzak konumdan beklenmedik 'ready'" + +#: fetch-pack.c:2079 #, c-format msgid "no such remote ref %s" msgstr "böyle bir uzak başvuru yok: %s" -#: fetch-pack.c:2013 +#: fetch-pack.c:2082 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Sunucu %s tanıtılmamış nesnesi için isteğe izin vermiyor" @@ -4322,7 +4346,7 @@ msgstr "gpg veriyi imzalayamadı" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "log.graphColors içindeki '%.*s' geçersiz rengini yok say" -#: grep.c:543 +#: grep.c:531 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4330,18 +4354,18 @@ msgstr "" "verilen dizgi NULL baytı içeriyor (-f <dosya> aracılığıyla). Bu yalnızca " "PCRE v2 altında -P ile desteklenir" -#: grep.c:1906 +#: grep.c:1893 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': %s okunamıyor" -#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90 -#: builtin/rm.c:135 +#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "'%s' dosyasının bilgileri alınamadı" -#: grep.c:1934 +#: grep.c:1921 #, c-format msgid "'%s': short read" msgstr "'%s': kısa okuma" @@ -4567,47 +4591,52 @@ msgstr "boş tanımlayıcı adına (<%s> için) izin verilmiyor" msgid "name consists only of disallowed characters: %s" msgstr "ad yalnızca izin verilmeyen karakterlerden oluşuyor: %s" -#: ident.c:454 builtin/commit.c:634 +#: ident.c:454 builtin/commit.c:647 #, c-format msgid "invalid date format: %s" msgstr "geçersiz tarih biçimi: %s" -#: list-objects-filter-options.c:81 +#: list-objects-filter-options.c:83 msgid "expected 'tree:<depth>'" msgstr "'tree:<derinlik>' bekleniyordu" -#: list-objects-filter-options.c:96 +#: list-objects-filter-options.c:98 msgid "sparse:path filters support has been dropped" msgstr "sparse:path süzgeçleri desteği artık yok" -#: list-objects-filter-options.c:109 +#: list-objects-filter-options.c:105 +#, c-format +msgid "'%s' for 'object:type=<type>' isnot a valid object type" +msgstr "'object:type=<tür>' için '%s' geçerli bir nesne türü değil" + +#: list-objects-filter-options.c:124 #, c-format msgid "invalid filter-spec '%s'" msgstr "geçersiz filter-spec '%s'" -#: list-objects-filter-options.c:125 +#: list-objects-filter-options.c:140 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "sub-filter-spec içinde kaçış karakteri olmalı: '%c'" -#: list-objects-filter-options.c:167 +#: list-objects-filter-options.c:182 msgid "expected something after combine:" msgstr "birlikte kullanımdan sonra bir şeyler bekleniyordu:" -#: list-objects-filter-options.c:249 +#: list-objects-filter-options.c:264 msgid "multiple filter-specs cannot be combined" msgstr "çoklu filter-specs birlikte kullanılamaz" -#: list-objects-filter-options.c:361 +#: list-objects-filter-options.c:376 msgid "unable to upgrade repository format to support partial clone" msgstr "depo biçimi kısımsal klonları desteklemesi için yükseltilemiyor" -#: list-objects-filter.c:492 +#: list-objects-filter.c:532 #, c-format msgid "unable to access sparse blob in '%s'" msgstr "'%s' içindeki aralıklı ikili nesneye erişilemiyor" -#: list-objects-filter.c:495 +#: list-objects-filter.c:535 #, c-format msgid "unable to parse sparse filter data in %s" msgstr "%s içindeki aralıklı süzgeç verisi ayrıştırılamıyor" @@ -4624,7 +4653,7 @@ msgstr "" "'%s' girdisi (%s ağacında) ikili nesne kipine iye; ancak bir ikili geniş " "nesne değil" -#: list-objects.c:375 +#: list-objects.c:395 #, c-format msgid "unable to load root tree for commit %s" msgstr "%s işlemesi için kök ağacı yüklenemiyor" @@ -4662,32 +4691,41 @@ msgstr "lsrefs.unborn için '%s' geçersiz değeri" msgid "expected flush after ls-refs arguments" msgstr "ls-refs argümanlarından sonra floş bekleniyordu" -#: merge-ort.c:888 merge-recursive.c:1191 +#: mailinfo.c:1050 +msgid "quoted CRLF detected" +msgstr "alıntılanmış CRLF algılandı" + +#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46 +#, c-format +msgid "bad action '%s' for '%s'" +msgstr "hatalı eylem '%s', '%s' için" + +#: merge-ort.c:1116 merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "%s altmodülü birleştirilemedi (çıkış yapılmadı)" -#: merge-ort.c:897 merge-recursive.c:1198 +#: merge-ort.c:1125 merge-recursive.c:1212 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "%s altmodülü birleştirilemedi (işlemeler mevcut değil)" -#: merge-ort.c:906 merge-recursive.c:1205 +#: merge-ort.c:1134 merge-recursive.c:1219 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "%s altmodülü birleştirilemedi (işlemeler merge-base'i takip etmiyor)" -#: merge-ort.c:916 merge-ort.c:923 +#: merge-ort.c:1144 merge-ort.c:1151 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "Not: %s altmodülü %s yönüne ileri sarılıyor" -#: merge-ort.c:944 +#: merge-ort.c:1172 #, c-format msgid "Failed to merge submodule %s" msgstr "'%s' altmodülünü birleştirilemedi" -#: merge-ort.c:951 +#: merge-ort.c:1179 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4696,7 +4734,7 @@ msgstr "" "%s altmodülü birleştirilemedi; ancak olası bir birleştirme çözümü mevcut:\n" "%s\n" -#: merge-ort.c:955 merge-recursive.c:1259 +#: merge-ort.c:1183 merge-recursive.c:1273 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4712,7 +4750,7 @@ msgstr "" "\n" "komutu bu öneriyi kabul edecektir.\n" -#: merge-ort.c:968 +#: merge-ort.c:1196 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4722,21 +4760,21 @@ msgstr "" "mevcut:\n" "%s" -#: merge-ort.c:1127 merge-recursive.c:1341 +#: merge-ort.c:1415 merge-recursive.c:1362 msgid "Failed to execute internal merge" msgstr "İç birleştirme çalıştırılamadı" -#: merge-ort.c:1132 merge-recursive.c:1346 +#: merge-ort.c:1420 merge-recursive.c:1367 #, c-format msgid "Unable to add %s to database" msgstr "%s veritabanına eklenemedi" -#: merge-ort.c:1139 merge-recursive.c:1378 +#: merge-ort.c:1427 merge-recursive.c:1400 #, c-format msgid "Auto-merging %s" msgstr "%s kendiliğinden birleştiriliyor" -#: merge-ort.c:1278 merge-recursive.c:2100 +#: merge-ort.c:1566 merge-recursive.c:2122 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4746,7 +4784,7 @@ msgstr "" "örtülü yeniden adlandırmanın aşağıdaki yolları oraya koymasına engel oluyor: " "%s." -#: merge-ort.c:1288 merge-recursive.c:2110 +#: merge-ort.c:1576 merge-recursive.c:2132 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4756,7 +4794,7 @@ msgstr "" "eşlemlenemiyor; örtülü dizin yeniden adlandırmaları aşağıdaki yolları oraya " "koymayı denedi: %s." -#: merge-ort.c:1471 +#: merge-ort.c:1634 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4767,7 +4805,7 @@ msgstr "" "adlandırılacağı belirsiz; herhangi bir hedef dosyaların çoğunu almadan " "birden çok başka dizine yeniden adlandırılmıştı." -#: merge-ort.c:1637 merge-recursive.c:2447 +#: merge-ort.c:1788 merge-recursive.c:2468 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4776,7 +4814,7 @@ msgstr "" "UYARI: %s -> %s yeniden adlandırmasını %s ögesine uygulamadan kaçınılıyor, " "çünkü %s ögesinin kendisi yeniden adlandırıldı." -#: merge-ort.c:1781 merge-recursive.c:3215 +#: merge-ort.c:1932 merge-recursive.c:3244 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4785,7 +4823,7 @@ msgstr "" "Yol güncellendi: %s, (%s içinde eklenen) %s içinde yeniden adlandırılan bir " "dizinde; onu %s konumuna taşıdı." -#: merge-ort.c:1788 merge-recursive.c:3222 +#: merge-ort.c:1939 merge-recursive.c:3251 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4794,7 +4832,7 @@ msgstr "" "Yol güncellendi: %s, %s olarak yeniden adlandırıldı (%s içinde), %s içinde " "yeniden adlandırılan bir dizinde; onu %s konumuna taşıdı." -#: merge-ort.c:1801 merge-recursive.c:3218 +#: merge-ort.c:1952 merge-recursive.c:3247 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4803,7 +4841,7 @@ msgstr "" "ÇAKIŞMA (dosya konumu): %s, (%s içinde eklenen) %s içinde yeniden " "adlandırılan bir dizinde, belki de %s konumuna taşınmalı." -#: merge-ort.c:1809 merge-recursive.c:3225 +#: merge-ort.c:1960 merge-recursive.c:3254 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4812,14 +4850,14 @@ msgstr "" "ÇAKIŞMA (dosya konumu): %s, %s olarak yeniden adlandırıldı (%s içinde), %s " "içinde yeniden adlandırılan bir dizinde, belki de %s konumuna taşınmalı." -#: merge-ort.c:1952 +#: merge-ort.c:2103 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "ÇAKIŞMA (y. adlandır/y. adlandır): %s->%s olarak adlandırıldı (%s içinde) ve " "ek olarak %s olarak da adlandırıldı (%s içinde)." -#: merge-ort.c:2047 +#: merge-ort.c:2198 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4830,14 +4868,24 @@ msgstr "" "içerik çakışmaları var ve başka bir yolla çarpışıyor; bu iç içe geçmiş " "çakışmaimleyicilerine neden olabilir." -#: merge-ort.c:2066 merge-ort.c:2090 +#: merge-ort.c:2217 merge-ort.c:2241 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" "ÇAKIŞMA (yeniden adlandır/sil): %s->%s olarak adlandırıldı (%s içinde); " "ancak %s içinde silindi." -#: merge-ort.c:2735 +#: merge-ort.c:2550 merge-recursive.c:3002 +#, c-format +msgid "cannot read object %s" +msgstr "%s nesnesi okunamıyor" + +#: merge-ort.c:2553 merge-recursive.c:3005 +#, c-format +msgid "object %s is not a blob" +msgstr "%s nesnesi ikili bir nesne değil" + +#: merge-ort.c:2981 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " @@ -4846,42 +4894,44 @@ msgstr "" "ÇAKIŞMA (dosya/dizin): Dizin, şuradan %s yolunda: %s; bunun yerine %s " "konumuna taşınıyor." -#: merge-ort.c:2808 +#: merge-ort.c:3055 #, c-format msgid "" -"CONFLICT (distinct types): %s had different types on each side; renamed %s " +"CONFLICT (distinct types): %s had different types on each side; renamed both " "of them so each can be recorded somewhere." msgstr "" "ÇAKIŞMA (belirgin türler): %s ögesinin her bir yanında değişik türler vardı; " -"bunlardan %s tanesi yeniden adlandırıldı; böylelikle başka bir yerde " -"kayıtları yazılabilir." - -#: merge-ort.c:2812 -msgid "both" -msgstr "her ikisi de" +"ikisi de yeniden adlandırıldı; böylelikle başka bir yerde kayıtları " +"yazılabilir." -#: merge-ort.c:2812 -msgid "one" -msgstr "bir" +#: merge-ort.c:3062 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed one " +"of them so each can be recorded somewhere." +msgstr "" +"ÇAKIŞMA (belirgin türler): %s ögesinin her bir yanında değişik türler vardı; " +"bir tanesi yeniden adlandırıldı; böylelikle her birinin başka bir yerde " +"kayıtları yazılabilir." -#: merge-ort.c:2907 merge-recursive.c:3052 +#: merge-ort.c:3162 merge-recursive.c:3081 msgid "content" msgstr "içerik" -#: merge-ort.c:2909 merge-recursive.c:3056 +#: merge-ort.c:3164 merge-recursive.c:3085 msgid "add/add" msgstr "ekle/ekle" -#: merge-ort.c:2911 merge-recursive.c:3101 +#: merge-ort.c:3166 merge-recursive.c:3130 msgid "submodule" msgstr "altmodül" -#: merge-ort.c:2913 merge-recursive.c:3102 +#: merge-ort.c:3168 merge-recursive.c:3131 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "ÇAKIŞMA (%s): %s içinde birleştirme çakışması" -#: merge-ort.c:2938 +#: merge-ort.c:3198 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4890,15 +4940,24 @@ msgstr "" "ÇAKIŞMA (değiştir/sil): %s silindi (%s içinde) ve %s içinde değiştirildi. %s " "sürümü (şunun: %s) ağaçta bırakıldı." +#: merge-ort.c:3433 +#, c-format +msgid "" +"Note: %s not up to date and in way of checking out conflicted version; old " +"copy renamed to %s" +msgstr "" +"Not: %s güncel değil ve çakışmalı sürümlerin çıkışının önünde; eski kopya " +"%s olarak yeniden adlandırıldı." + #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:3406 +#: merge-ort.c:3730 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "şu ağaçlar için birleştirme bilgisi toplama başarısız: %s, %s, %s" -#: merge-ort-wrappers.c:13 merge-recursive.c:3661 +#: merge-ort-wrappers.c:13 merge-recursive.c:3699 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4908,10 +4967,9 @@ msgstr "" "yazılacak:\n" "\t%s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3436 -#, c-format -msgid "Already up to date!" -msgstr "Tümü güncel!" +#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402 +msgid "Already up to date." +msgstr "Tümü güncel." #: merge-recursive.c:356 msgid "(bad commit)\n" @@ -4928,88 +4986,88 @@ msgstr "" msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo '%s' yolu için yenilenemedi; birleştirme iptal ediliyor." -#: merge-recursive.c:874 +#: merge-recursive.c:876 #, c-format msgid "failed to create path '%s'%s" msgstr "'%s'%s yolu oluşturulamadı" -#: merge-recursive.c:885 +#: merge-recursive.c:887 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Altdizine yer açmak için %s kaldırılıyor\n" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:901 merge-recursive.c:920 msgid ": perhaps a D/F conflict?" msgstr ": bir D/F çakışması olabilir mi?" -#: merge-recursive.c:908 +#: merge-recursive.c:910 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "'%s' konumundaki izlenmeyen dosyayı kaybetme reddediliyor" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:951 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "%s '%s' nesnesi okunamıyor" -#: merge-recursive.c:954 +#: merge-recursive.c:956 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' için ikili nesne bekleniyordu" -#: merge-recursive.c:979 +#: merge-recursive.c:981 #, c-format msgid "failed to open '%s': %s" msgstr "'%s' açılamadı: %s" -#: merge-recursive.c:990 +#: merge-recursive.c:992 #, c-format msgid "failed to symlink '%s': %s" msgstr "'%s' için sembolik bağ oluşturulamadı: %s" -#: merge-recursive.c:995 +#: merge-recursive.c:997 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "şununla ne yapılacağı bilinmiyor: %06o %s '%s'" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1227 merge-recursive.c:1239 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "%s altmodülü şu işlemeye ileri sarılıyor:" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1230 merge-recursive.c:1242 #, c-format msgid "Fast-forwarding submodule %s" msgstr "%s altmodülü ileri sarılıyor" -#: merge-recursive.c:1251 +#: merge-recursive.c:1265 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "%s altmodülü birleştirilemedi (işlemeleri takip eden birleştirme bulunamadı)" -#: merge-recursive.c:1255 +#: merge-recursive.c:1269 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "%s altmodülü birleştirilemedi (ileri sarım değil)" -#: merge-recursive.c:1256 +#: merge-recursive.c:1270 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Şu altmodül için olası bir birleştirme çözümü bulundu:\n" -#: merge-recursive.c:1268 +#: merge-recursive.c:1282 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "%s altmodülü birleştirilemedi (birden çok birleştirme bulundu)" -#: merge-recursive.c:1402 +#: merge-recursive.c:1424 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Hata: %s konumundaki izlenmeyen dosyayı kaybetme reddediliyor, bunun yerine " "%s konumuna yazılacak." -#: merge-recursive.c:1474 +#: merge-recursive.c:1496 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5018,7 +5076,7 @@ msgstr "" "ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s (%s içinde). %s (%s) sürümü " "ağaçta bırakıldı." -#: merge-recursive.c:1479 +#: merge-recursive.c:1501 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5027,7 +5085,7 @@ msgstr "" "ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s şuraya: %s (%s içinde). %s " "(%s) sürümü ağaçta bırakıldı." -#: merge-recursive.c:1486 +#: merge-recursive.c:1508 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5036,7 +5094,7 @@ msgstr "" "ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s (%s içinde). %s (%s) sürümü " "ağaçta %s konumunda bırakıldı." -#: merge-recursive.c:1491 +#: merge-recursive.c:1513 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5045,45 +5103,45 @@ msgstr "" "ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s şuraya: %s (%s içinde). %s " "(%s) sürümü ağaçta %s konumunda bırakıldı." -#: merge-recursive.c:1526 +#: merge-recursive.c:1548 msgid "rename" msgstr "yeniden adlandır" -#: merge-recursive.c:1526 +#: merge-recursive.c:1548 msgid "renamed" msgstr "yeniden adlandırıldı" -#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 +#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "%s konumundaki kirli dosyayı kaybetme reddediliyor" -#: merge-recursive.c:1587 +#: merge-recursive.c:1609 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Engel olduğu halde %s konumundaki izlenmeyen dosyayı kaybetme reddediliyor." -#: merge-recursive.c:1645 +#: merge-recursive.c:1667 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "ÇAKIŞMA (yeniden adlandır/ekle): %s->%s olarak adlandırıldı (%s içinde). %s " "eklendi (%s içinde)." -#: merge-recursive.c:1676 +#: merge-recursive.c:1698 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s bir dizin (%s içinde), bunun yerine %s olarak ekleniyor" -#: merge-recursive.c:1681 +#: merge-recursive.c:1703 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "%s konumundaki izlenmeyen dosyayı kaybetme reddediliyor, bunun yerine %s " "olarak ekleniyor" -#: merge-recursive.c:1708 +#: merge-recursive.c:1730 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5092,18 +5150,18 @@ msgstr "" "ÇAKIŞMA (y. adlandır/y. adlandır): \"%s\"->\"%s\" olarak adlandır (\"%s\" " "dalında), \"%s\"->\"%s\" olarak adlandır (\"%s\"%s içinde)" -#: merge-recursive.c:1713 +#: merge-recursive.c:1735 msgid " (left unresolved)" msgstr " (çözülmeden bırakıldı)" -#: merge-recursive.c:1805 +#: merge-recursive.c:1827 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "ÇAKIŞMA (y. adlandır/y. adlandır): %s->%s olarak adlandır (%s içinde). %s->" "%s olarak adlandır (%s içinde)" -#: merge-recursive.c:2068 +#: merge-recursive.c:2090 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5114,7 +5172,7 @@ msgstr "" "yerleştirileceği belirsiz; çünkü %s dizini birden çok başka dizine yeniden " "adlandırılırken hiçbir hedef dosyaların büyük çoğunluğunu almadı." -#: merge-recursive.c:2202 +#: merge-recursive.c:2224 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5123,90 +5181,80 @@ msgstr "" "ÇAKIŞMA (y. adlandır/y. adlandır): Dizini %s->%s olarak adlandır (%s " "içinde). Dizini %s->%s olarak adlandır (%s içinde)." -#: merge-recursive.c:2973 -#, c-format -msgid "cannot read object %s" -msgstr "%s nesnesi okunamıyor" - -#: merge-recursive.c:2976 -#, c-format -msgid "object %s is not a blob" -msgstr "%s nesnesi ikili bir nesne değil" - -#: merge-recursive.c:3040 +#: merge-recursive.c:3069 msgid "modify" msgstr "değiştir" -#: merge-recursive.c:3040 +#: merge-recursive.c:3069 msgid "modified" msgstr "değiştirilmiş" -#: merge-recursive.c:3079 +#: merge-recursive.c:3108 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s atlandı (mevcut ile aynı biçimde birleştirildi)" -#: merge-recursive.c:3132 +#: merge-recursive.c:3161 #, c-format msgid "Adding as %s instead" msgstr "Bunun yerine %s olarak ekleniyor" -#: merge-recursive.c:3339 +#: merge-recursive.c:3368 #, c-format msgid "Removing %s" msgstr "%s kaldırılıyor" -#: merge-recursive.c:3362 +#: merge-recursive.c:3391 msgid "file/directory" msgstr "dosya/dizin" -#: merge-recursive.c:3367 +#: merge-recursive.c:3396 msgid "directory/file" msgstr "dizin/dosya" -#: merge-recursive.c:3374 +#: merge-recursive.c:3403 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "ÇAKIŞMA (%s): %s adıyla bir dizin var (%s içinde). %s, %s olarak ekleniyor." -#: merge-recursive.c:3383 +#: merge-recursive.c:3412 #, c-format msgid "Adding %s" msgstr "%s ekleniyor" -#: merge-recursive.c:3392 +#: merge-recursive.c:3421 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "ÇAKIŞMA (ekle/ekle): %s içinde birleştirme çakışması" -#: merge-recursive.c:3445 +#: merge-recursive.c:3474 #, c-format msgid "merging of trees %s and %s failed" msgstr "%s ve %s ağaçlarının birleştirilmesi başarısız" -#: merge-recursive.c:3539 +#: merge-recursive.c:3568 msgid "Merging:" msgstr "Birleştiriliyor:" -#: merge-recursive.c:3552 +#: merge-recursive.c:3581 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u ortak ata bulundu:" msgstr[1] "%u ortak ata bulundu:" -#: merge-recursive.c:3602 +#: merge-recursive.c:3631 msgid "merge returned no commit" msgstr "birleştirme herhangi bir işleme döndürmedi" -#: merge-recursive.c:3758 +#: merge-recursive.c:3796 #, c-format msgid "Could not parse object '%s'" msgstr "'%s' nesnesi ayrıştırılamadı" -#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896 -#: builtin/stash.c:471 +#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900 +#: builtin/stash.c:473 msgid "Unable to write index." msgstr "İndeks yazılamıyor." @@ -5214,176 +5262,195 @@ msgstr "İndeks yazılamıyor." msgid "failed to read the cache" msgstr "önbellek okunamadı" -#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917 -#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817 -#: builtin/stash.c:265 +#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965 +#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 +#: builtin/stash.c:267 msgid "unable to write new index file" msgstr "yeni indeks dosyası yazılamıyor" -#: midx.c:62 +#: midx.c:74 msgid "multi-pack-index OID fanout is of the wrong size" msgstr "multi-pack-index OID ikiye bölümünün boyutu hatalı" -#: midx.c:93 +#: midx.c:105 #, c-format msgid "multi-pack-index file %s is too small" msgstr "multi-pack-index dosyası %s pek küçük" -#: midx.c:109 +#: midx.c:121 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "multi-pack-index imzası 0x%08x, 0x%08x imzası ile eşleşmiyor" -#: midx.c:114 +#: midx.c:126 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index sürümü %d tanımlanamıyor" -#: midx.c:119 +#: midx.c:131 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "multi-pack-index sağlama sürümü %u, %u sürümü ile eşleşmiyor" -#: midx.c:136 +#: midx.c:148 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index'ten gerekli pack-name iri parçası eksik" -#: midx.c:138 +#: midx.c:150 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index'ten gerekli OID fanout iri parçası eksik" -#: midx.c:140 +#: midx.c:152 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index'ten gerekli OID arama iri parçası eksik" -#: midx.c:142 +#: midx.c:154 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index'ten gerekli nesne ofsetleri iri parçası eksik" -#: midx.c:158 +#: midx.c:170 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "multi-pack-index paket adlarının sırasız: '%s' şundan önce: '%s'" -#: midx.c:202 +#: midx.c:214 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "hatalı pack-int-id: %u (%u toplam paket)" -#: midx.c:252 +#: midx.c:264 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "multi-pack-index bir 64 bit ofset depoluyor; ancak off_t pek küçük" -#: midx.c:467 +#: midx.c:490 #, c-format msgid "failed to add packfile '%s'" msgstr "paket dosyası '%s' eklenemedi" -#: midx.c:473 +#: midx.c:496 #, c-format msgid "failed to open pack-index '%s'" msgstr "pack-index '%s' açılamadı" -#: midx.c:533 +#: midx.c:564 #, c-format msgid "failed to locate object %d in packfile" msgstr "%d nesnesi paket dosyasında bulunamadı" -#: midx.c:821 +#: midx.c:880 builtin/index-pack.c:1535 +msgid "cannot store reverse index file" +msgstr "ters indeks dosyası depolanamıyor" + +#: midx.c:933 msgid "Adding packfiles to multi-pack-index" msgstr "Paket dosyaları multi-pack-index'e ekleniyor" -#: midx.c:855 +#: midx.c:979 #, c-format msgid "did not see pack-file %s to drop" msgstr "bırakılacak pack-file %s görülmedi" -#: midx.c:904 +#: midx.c:1024 +#, c-format +msgid "unknown preferred pack: '%s'" +msgstr "bilinmeyen tercih edilen paket: '%s'" + +#: midx.c:1029 +#, c-format +msgid "preferred pack '%s' is expired" +msgstr "tercih edilen '%s' paketinin süresi geçmiş" + +#: midx.c:1045 msgid "no pack files to index." msgstr "indekslenecek paket dosyası yok." -#: midx.c:965 +#: midx.c:1125 builtin/clean.c:37 +#, c-format +msgid "failed to remove %s" +msgstr "%s kaldırılamadı" + +#: midx.c:1156 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "multi-pack-index %s konumunda temizlenemedi" -#: midx.c:1021 +#: midx.c:1214 msgid "multi-pack-index file exists, but failed to parse" msgstr "multi-pack-index dosyası mevcut, ancak ayrıştırılamadı" -#: midx.c:1029 +#: midx.c:1222 msgid "Looking for referenced packfiles" msgstr "Başvurulmuş paket dosyaları aranıyor" -#: midx.c:1044 +#: midx.c:1237 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "oid fanout sırasız: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1049 +#: midx.c:1242 msgid "the midx contains no oid" msgstr "midx bir oid içermiyor" -#: midx.c:1058 +#: midx.c:1251 msgid "Verifying OID order in multi-pack-index" msgstr "multi-pack-index içindeki OID sırası doğrulanıyor" -#: midx.c:1067 +#: midx.c:1260 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "oid araması sırasız: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1087 +#: midx.c:1280 msgid "Sorting objects by packfile" msgstr "Nesneler paket dosyasına göre sıralanıyor" -#: midx.c:1094 +#: midx.c:1287 msgid "Verifying object offsets" msgstr "Nesne ofsetleri doğrulanıyor" -#: midx.c:1110 +#: midx.c:1303 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "şunun için paket girdisi yüklenemedi: oid[%d] = %s" -#: midx.c:1116 +#: midx.c:1309 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "paket dosyası %s için pack-index yüklenemedi" -#: midx.c:1125 +#: midx.c:1318 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "şunun için yanlış nesne ofseti: oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1150 +#: midx.c:1343 msgid "Counting referenced objects" msgstr "Başvurulmuş nesneler sayılıyor" -#: midx.c:1160 +#: midx.c:1353 msgid "Finding and deleting unreferenced packfiles" msgstr "Başvurulmamış paket dosyaları bulunuyor ve siliniyor" -#: midx.c:1351 +#: midx.c:1544 msgid "could not start pack-objects" msgstr "pack-objects başlatılamadı" -#: midx.c:1371 +#: midx.c:1564 msgid "could not finish pack-objects" msgstr "pack-objects bitirilemedi" -#: name-hash.c:538 +#: name-hash.c:542 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "lazy_dir iş parçacığı oluşturulamıyor: %s" -#: name-hash.c:560 +#: name-hash.c:564 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "lazy_name oluşturulamıyor: %s" -#: name-hash.c:566 +#: name-hash.c:570 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "lazy_name iş parçacığı ucu birleştirilemiyor: %s" @@ -5428,257 +5495,257 @@ msgstr "%s içindeki notları yeniden yazma reddediliyor (refs/notes/ dışında msgid "Bad %s value: '%s'" msgstr "Hatalı %s değeri: '%s'" -#: object-file.c:480 +#: object-file.c:526 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "nesne dizini %s yok; şurayı denetleyin: .git/objects/info/alternates" -#: object-file.c:531 +#: object-file.c:577 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "alternatif nesne yolu olağanlaştırılamıyor: %s" -#: object-file.c:603 +#: object-file.c:649 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: alternatif nesne depoları yok sayılıyor, iç içe geçme pek derin" -#: object-file.c:610 +#: object-file.c:656 #, c-format msgid "unable to normalize object directory: %s" msgstr "nesne dizini olağanlaştırılamıyor: %s" -#: object-file.c:653 +#: object-file.c:699 msgid "unable to fdopen alternates lockfile" msgstr "alternatifler kilit dosyası fdopen yapılamıyor" -#: object-file.c:671 +#: object-file.c:717 msgid "unable to read alternates file" msgstr "alternatifler dosyası okunamıyor" -#: object-file.c:678 +#: object-file.c:724 msgid "unable to move new alternates file into place" msgstr "yeni alternatifler dosyası yerine taşınamıyor" -#: object-file.c:713 +#: object-file.c:759 #, c-format msgid "path '%s' does not exist" msgstr "'%s' diye bir yol yok" -#: object-file.c:734 +#: object-file.c:780 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "Bağlantı yapılmış çıkış olarak '%s' başvuru deposu henüz desteklenmiyor." -#: object-file.c:740 +#: object-file.c:786 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "Başvuru deposu '%s' yerel bir depo değil." -#: object-file.c:746 +#: object-file.c:792 #, c-format msgid "reference repository '%s' is shallow" msgstr "başvuru deposu '%s' sığ" -#: object-file.c:754 +#: object-file.c:800 #, c-format msgid "reference repository '%s' is grafted" msgstr "başvuru deposu '%s' aşılı" -#: object-file.c:814 +#: object-file.c:860 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "alternatif başvurular ayrıştırılırken geçersiz satır: %s" -#: object-file.c:964 +#: object-file.c:1010 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "%<PRIuMAX>, %<PRIuMAX> sınırı üzerinden mmap yapılmaya çalışılıyor" -#: object-file.c:985 +#: object-file.c:1031 msgid "mmap failed" msgstr "mmap başarısız" -#: object-file.c:1149 +#: object-file.c:1195 #, c-format msgid "object file %s is empty" msgstr "nesne dosyası %s boş" -#: object-file.c:1284 object-file.c:2477 +#: object-file.c:1330 object-file.c:2524 #, c-format msgid "corrupt loose object '%s'" msgstr "hasar görmüş gevşek nesne '%s'" -#: object-file.c:1286 object-file.c:2481 +#: object-file.c:1332 object-file.c:2528 #, c-format msgid "garbage at end of loose object '%s'" msgstr "gevşek nesne '%s' sonunda anlamsız veri" -#: object-file.c:1328 +#: object-file.c:1374 msgid "invalid object type" msgstr "geçersiz nesne türü" -#: object-file.c:1412 +#: object-file.c:1458 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "%s üstbilgisi --allow-unknown-type ile açılamıyor" -#: object-file.c:1415 +#: object-file.c:1461 #, c-format msgid "unable to unpack %s header" msgstr "%s üstbilgisi açılamıyor" -#: object-file.c:1421 +#: object-file.c:1467 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "%s üstbilgisi paketi --allow-unknown-type ile ayrıştırılamıyor" -#: object-file.c:1424 +#: object-file.c:1470 #, c-format msgid "unable to parse %s header" msgstr "%s üstbilgisi ayrıştırılamıyor" -#: object-file.c:1651 +#: object-file.c:1697 #, c-format msgid "failed to read object %s" msgstr "%s nesnesi okunamadı" -#: object-file.c:1655 +#: object-file.c:1701 #, c-format msgid "replacement %s not found for %s" msgstr "%s yedeği %s için bulunamadı" -#: object-file.c:1659 +#: object-file.c:1705 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "%s gevşek nesnesi (%s içinde depolanıyor) hasar görmüş" -#: object-file.c:1663 +#: object-file.c:1709 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "paketlenmiş nesne %s (%s içinde depolanıyor) hasar görmüş" -#: object-file.c:1768 +#: object-file.c:1814 #, c-format msgid "unable to write file %s" msgstr "%s dosyası yazılamıyor" -#: object-file.c:1775 +#: object-file.c:1821 #, c-format msgid "unable to set permission to '%s'" msgstr "'%s' ögesine izin ayarlanamıyor" -#: object-file.c:1782 +#: object-file.c:1828 msgid "file write error" msgstr "dosya yazım hatası" -#: object-file.c:1802 +#: object-file.c:1848 msgid "error when closing loose object file" msgstr "gevşek nesne dosyası kapatılırken hata" -#: object-file.c:1867 +#: object-file.c:1913 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "%s depo veritabanına nesne eklemek için yetersiz izin" -#: object-file.c:1869 +#: object-file.c:1915 msgid "unable to create temporary file" msgstr "geçici dosya oluşturulamıyor" -#: object-file.c:1893 +#: object-file.c:1939 msgid "unable to write loose object file" msgstr "gevşek nesne dosyası yazılamıyor" -#: object-file.c:1899 +#: object-file.c:1945 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "yeni nesne %s söndürülemiyor (%d)" -#: object-file.c:1903 +#: object-file.c:1949 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "%s nesnesi üzerinde deflateEnd başarısız oldu (%d)" -#: object-file.c:1907 +#: object-file.c:1953 #, c-format msgid "confused by unstable object source data for %s" msgstr "%s için olan nesne kaynak verisinden dolayı kafa karışıklığı" -#: object-file.c:1917 builtin/pack-objects.c:1097 +#: object-file.c:1963 builtin/pack-objects.c:1097 #, c-format msgid "failed utime() on %s" msgstr "%s üzerinde utime() başarısız" -#: object-file.c:1994 +#: object-file.c:2040 #, c-format msgid "cannot read object for %s" msgstr "%s için nesne okunamıyor" -#: object-file.c:2045 +#: object-file.c:2091 msgid "corrupt commit" msgstr "hasar görmüş işleme" -#: object-file.c:2053 +#: object-file.c:2099 msgid "corrupt tag" msgstr "hasar görmüş etiket" -#: object-file.c:2153 +#: object-file.c:2199 #, c-format msgid "read error while indexing %s" msgstr "%s indekslenirken okuma hatası" -#: object-file.c:2156 +#: object-file.c:2202 #, c-format msgid "short read while indexing %s" msgstr "%s indekslenirken kısa read" -#: object-file.c:2229 object-file.c:2239 +#: object-file.c:2275 object-file.c:2285 #, c-format msgid "%s: failed to insert into database" msgstr "%s: veritabanına ekleme başarısız" -#: object-file.c:2245 +#: object-file.c:2291 #, c-format msgid "%s: unsupported file type" msgstr "%s: desteklenmeyen dosya türü" -#: object-file.c:2269 +#: object-file.c:2315 #, c-format msgid "%s is not a valid object" msgstr "%s geçerli bir nesne değil" -#: object-file.c:2271 +#: object-file.c:2317 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s geçerli bir '%s' nesnesi değil" -#: object-file.c:2298 builtin/index-pack.c:192 +#: object-file.c:2344 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "%s açılamıyor" -#: object-file.c:2488 object-file.c:2541 +#: object-file.c:2535 object-file.c:2588 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s için sağlama uyuşmazlığı (%s bekleniyordu)" -#: object-file.c:2512 +#: object-file.c:2559 #, c-format msgid "unable to mmap %s" msgstr "%s mmap yapılamadı" -#: object-file.c:2517 +#: object-file.c:2564 #, c-format msgid "unable to unpack header of %s" msgstr "%s üstbilgisi açılamıyor" -#: object-file.c:2523 +#: object-file.c:2570 #, c-format msgid "unable to parse header of %s" msgstr "%s üstbilgisi ayrıştırılamıyor" -#: object-file.c:2534 +#: object-file.c:2581 #, c-format msgid "unable to unpack contents of %s" msgstr "%s içeriği açılamıyor" @@ -5791,71 +5858,71 @@ msgstr "geçersiz nesne türü \"%s\"" msgid "object %s is a %s, not a %s" msgstr "%s nesnesi bir %s, %s değil" -#: object.c:233 +#: object.c:232 #, c-format msgid "object %s has unknown type id %d" msgstr "%s nesnesi %d bilinmeyen tür numarasına iye" -#: object.c:246 +#: object.c:245 #, c-format msgid "unable to parse object: %s" msgstr "nesne ayrıştırılamıyor: %s" -#: object.c:266 object.c:278 +#: object.c:265 object.c:277 #, c-format msgid "hash mismatch %s" msgstr "sağlama uyuşmazlığı %s" -#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226 +#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251 #, c-format msgid "unable to get size of %s" msgstr "%s boyutu alınamıyor" -#: pack-bitmap.c:1489 builtin/rev-list.c:92 +#: pack-bitmap.c:1547 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "%s ögesinin disk kullanımı alınamıyor" -#: pack-revindex.c:220 +#: pack-revindex.c:221 #, c-format msgid "reverse-index file %s is too small" msgstr "reverse-index dosyası %s pek küçük" -#: pack-revindex.c:225 +#: pack-revindex.c:226 #, c-format msgid "reverse-index file %s is corrupt" msgstr "reverse-index dosyası %s hasar görmüş" -#: pack-revindex.c:233 +#: pack-revindex.c:234 #, c-format msgid "reverse-index file %s has unknown signature" msgstr "%s reverse-index dosyasının bilinmeyen bir imzası var" -#: pack-revindex.c:237 +#: pack-revindex.c:238 #, c-format msgid "reverse-index file %s has unsupported version %<PRIu32>" msgstr "%s reverse-index dosyasının sürümü %<PRIu32> desteklenmiyor" -#: pack-revindex.c:242 +#: pack-revindex.c:243 #, c-format msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "%s reverse-index dosyasının sağlama numarası %<PRIu32> desteklenmiyor" -#: pack-write.c:236 +#: pack-write.c:250 msgid "cannot both write and verify reverse index" msgstr "ters indeks dosyası hem yazılıp hem doğrulanamıyor" -#: pack-write.c:257 +#: pack-write.c:271 #, c-format msgid "could not stat: %s" msgstr "dosya bilgileri alınamadı: %s" -#: pack-write.c:269 +#: pack-write.c:283 #, c-format msgid "failed to make %s readable" msgstr "%s, yazılabilir yapılamadı" -#: pack-write.c:508 +#: pack-write.c:522 #, c-format msgid "could not write '%s' promisor file" msgstr "vaat dosyası '%s' yazılamadı" @@ -5864,12 +5931,12 @@ msgstr "vaat dosyası '%s' yazılamadı" msgid "offset before end of packfile (broken .idx?)" msgstr "ofset paket dosyasının sonundan önce (bozuk .idx?)" -#: packfile.c:1934 +#: packfile.c:1937 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "ofset %s için paket indeksinin başlangıcından önce (hasarlı indeks?)" -#: packfile.c:1938 +#: packfile.c:1941 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "ofset %s için paket indeksinin sonundan ötede (kırpılmış index?)" @@ -5934,31 +6001,31 @@ msgstr "belirsiz seçenek: %s (--%s%s veya --%s%s olabilir)" msgid "did you mean `--%s` (with two dashes)?" msgstr "şunu mu demek istediniz: '--%s' (iki tire ile)?" -#: parse-options.c:666 parse-options.c:971 +#: parse-options.c:668 parse-options.c:988 #, c-format msgid "alias of --%s" msgstr "şunun arması: --%s" -#: parse-options.c:862 +#: parse-options.c:879 #, c-format msgid "unknown option `%s'" msgstr "bilinmeyen seçenek '%s'" -#: parse-options.c:864 +#: parse-options.c:881 #, c-format msgid "unknown switch `%c'" msgstr "bilinmeyen anahtar '%c'" -#: parse-options.c:866 +#: parse-options.c:883 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "dizi içinde bilinmeyen ascii dışı seçenek: '%s'" -#: parse-options.c:890 +#: parse-options.c:907 msgid "..." msgstr "..." -#: parse-options.c:909 +#: parse-options.c:926 #, c-format msgid "usage: %s" msgstr "kullanım: %s" @@ -5966,17 +6033,17 @@ msgstr "kullanım: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:915 +#: parse-options.c:932 #, c-format msgid " or: %s" msgstr " veya: %s" -#: parse-options.c:918 +#: parse-options.c:935 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:957 +#: parse-options.c:974 msgid "-NUM" msgstr "-SAYI" @@ -5985,28 +6052,28 @@ msgstr "-SAYI" msgid "Could not make %s writable by group" msgstr "%s grup ile yazılabilir yapılamadı" -#: pathspec.c:130 +#: pathspec.c:151 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "Kaçış karakteri '\\' attr değerindeki son karakter olarak kullanılamaz" -#: pathspec.c:148 +#: pathspec.c:169 msgid "Only one 'attr:' specification is allowed." msgstr "Yalnızca bir 'attr:' belirtimine izin verilir." -#: pathspec.c:151 +#: pathspec.c:172 msgid "attr spec must not be empty" msgstr "attr belirteci boş olmamalı" -#: pathspec.c:194 +#: pathspec.c:215 #, c-format msgid "invalid attribute name %s" msgstr "geçersiz öznitelik adı %s" -#: pathspec.c:259 +#: pathspec.c:280 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "global 'glob' ve 'noglob' yol belirteci ayarları birbiriyle uyumsuz" -#: pathspec.c:266 +#: pathspec.c:287 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -6014,51 +6081,51 @@ msgstr "" "global 'literal' yol belirteci ayarı diğer tüm global yol belirteci " "ayarlarıyla uyumsuz" -#: pathspec.c:306 +#: pathspec.c:327 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "yol belirteci sihri 'prefix' için geçersiz parametre" -#: pathspec.c:327 +#: pathspec.c:348 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Geçersiz yol belirteci sihri '%.*s' (%s içinde)" -#: pathspec.c:332 +#: pathspec.c:353 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "'%s' içindeki yol belirteci sihrinin sonunda eksik ')'" -#: pathspec.c:370 +#: pathspec.c:391 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Yerine getirilmemiş yol belirteci sihri '%c' ('%s' içinde)" -#: pathspec.c:429 +#: pathspec.c:450 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' ve 'glob' birbiriyle uyumsuz" -#: pathspec.c:445 +#: pathspec.c:466 #, c-format msgid "%s: '%s' is outside repository at '%s'" msgstr "%s: '%s', '%s' konumunda depo dışında" -#: pathspec.c:521 +#: pathspec.c:542 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (belleten: '%c')" -#: pathspec.c:531 +#: pathspec.c:552 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: yol belirteci sihri bu komut tarafından desteklenmiyor: %s" -#: pathspec.c:598 +#: pathspec.c:619 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "yol belirteci '%s' bir sembolik bağın ötesinde" -#: pathspec.c:643 +#: pathspec.c:664 #, c-format msgid "line is badly quoted: %s" msgstr "satırda hatalı tırnaklar: %s" @@ -6079,7 +6146,7 @@ msgstr "durumsuz ayırıcı paketi yazılamıyor" msgid "flush packet write failed" msgstr "floş paketi yazımı başarısız" -#: pkt-line.c:153 pkt-line.c:239 +#: pkt-line.c:153 pkt-line.c:265 msgid "protocol error: impossibly long line" msgstr "protokol hatası: olanaksız uzun satır" @@ -6087,33 +6154,34 @@ msgstr "protokol hatası: olanaksız uzun satır" msgid "packet write with format failed" msgstr "biçimlendirilmiş paket yazımı başarısız" -#: pkt-line.c:203 +#: pkt-line.c:204 msgid "packet write failed - data exceeds max packet size" msgstr "paket yazımı başarısız - veri olabilecek en çok paket boyutunu aşıyor" -#: pkt-line.c:210 pkt-line.c:217 -msgid "packet write failed" -msgstr "paket yazımı başarısız" +#: pkt-line.c:222 +#, c-format +msgid "packet write failed: %s" +msgstr "paket yazımı başarısız: %s" -#: pkt-line.c:302 +#: pkt-line.c:328 pkt-line.c:329 msgid "read error" msgstr "okuma hatası" -#: pkt-line.c:310 +#: pkt-line.c:339 pkt-line.c:340 msgid "the remote end hung up unexpectedly" msgstr "uzak konum beklenmedik bir biçimde hattı kapattı" -#: pkt-line.c:338 +#: pkt-line.c:369 pkt-line.c:371 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "protokol hatası: hatalı satır uzunluğu karakteri: %.4s" -#: pkt-line.c:352 pkt-line.c:357 +#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396 #, c-format msgid "protocol error: bad line length %d" msgstr "protokol hatası: hatalı satır uzunluğu %d" -#: pkt-line.c:373 sideband.c:165 +#: pkt-line.c:413 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "uzak konum hatası: %s" @@ -6127,7 +6195,7 @@ msgstr "İndeks yenileniyor" msgid "unable to create threaded lstat: %s" msgstr "iş parçacıklarına ayrılmış 'lstat' oluşturulamıyor: %s" -#: pretty.c:984 +#: pretty.c:988 msgid "unable to parse --pretty format" msgstr "--pretty biçimi ayrıştırılamıyor" @@ -6148,6 +6216,10 @@ msgstr "promisor-remote: altişlemi getirmek için stdin kapatılamıyor" msgid "promisor remote name cannot begin with '/': %s" msgstr "vaatçi uzak konum adı '/' ile başlayamaz: %s" +#: protocol-caps.c:103 +msgid "object-info: expected flush after arguments" +msgstr "object-info: argümanlardan sonra floş bekleniyordu" + #: prune-packed.c:35 msgid "Removing duplicate objects" msgstr "Yinelenmiş nesneler kaldırılıyor" @@ -6160,7 +6232,7 @@ msgstr "'log' başlatılamadı" msgid "could not read `log` output" msgstr "'log' çıktısı okunamadı" -#: range-diff.c:101 sequencer.c:5318 +#: range-diff.c:101 sequencer.c:5551 #, c-format msgid "could not parse commit '%s'" msgstr "'%s' işlemesi ayrıştırılamadı" @@ -6191,51 +6263,51 @@ msgstr "-p ve --overlay birlikte kullanılmaz" msgid "could not parse log for '%s'" msgstr "'%s' günlüğü ayrıştırılamadı" -#: read-cache.c:682 +#: read-cache.c:708 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "dosya arması '%s' eklenmeyecek ('%s' indekste halihazırda var)" -#: read-cache.c:698 +#: read-cache.c:724 msgid "cannot create an empty blob in the object database" msgstr "nesne veritabanında boş ikili bir nesne oluşturulamıyor" -#: read-cache.c:720 +#: read-cache.c:746 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%s: yalnızca sıradan dosyalar, sembolik bağlar ve git dizinleri eklenebilir" -#: read-cache.c:725 +#: read-cache.c:751 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' çıkışı yapılmış bir işlemeye iye değil" -#: read-cache.c:777 +#: read-cache.c:803 #, c-format msgid "unable to index file '%s'" msgstr "'%s' dosyası indekslenemiyor" -#: read-cache.c:796 +#: read-cache.c:822 #, c-format msgid "unable to add '%s' to index" msgstr "'%s' indekse eklenemiyor" -#: read-cache.c:807 +#: read-cache.c:833 #, c-format msgid "unable to stat '%s'" msgstr "'%s' dosyasının bilgileri alınamıyor" -#: read-cache.c:1318 +#: read-cache.c:1356 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' hem bir dosya hem de bir dizin olarak görünüyor" -#: read-cache.c:1532 +#: read-cache.c:1571 msgid "Refresh index" msgstr "İndeks yenileniyor" -#: read-cache.c:1657 +#: read-cache.c:1700 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6244,7 +6316,7 @@ msgstr "" "index.version ayarlanmış; ancak değer geçersiz.\n" "%i sürümü kullanılıyor" -#: read-cache.c:1667 +#: read-cache.c:1710 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6253,139 +6325,143 @@ msgstr "" "GIT_INDEX_VERSION ayarlanmış; ancak değer geçersiz.\n" "%i sürümü kullanılıyor" -#: read-cache.c:1723 +#: read-cache.c:1766 #, c-format msgid "bad signature 0x%08x" msgstr "hatalı imza 0x%08x" -#: read-cache.c:1726 +#: read-cache.c:1769 #, c-format msgid "bad index version %d" msgstr "hatalı indeks sürümü %d" -#: read-cache.c:1735 +#: read-cache.c:1778 msgid "bad index file sha1 signature" msgstr "hatalı indeks dosyası sha1 imzası" -#: read-cache.c:1765 +#: read-cache.c:1812 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "indeks bizim anlamadığımız %.4s imzası kullanıyor" -#: read-cache.c:1767 +#: read-cache.c:1814 #, c-format msgid "ignoring %.4s extension" msgstr "%.4s uzantısı yok sayılıyor" -#: read-cache.c:1804 +#: read-cache.c:1851 #, c-format msgid "unknown index entry format 0x%08x" msgstr "bilinmeyen indeks girdisi biçimi 0x%08x" -#: read-cache.c:1820 +#: read-cache.c:1867 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "indekste hatalı oluşturulmuş ad alanı, '%s' yolu yakınında" -#: read-cache.c:1877 +#: read-cache.c:1924 msgid "unordered stage entries in index" msgstr "indekste sırasız hazırlama alanı girdileri" -#: read-cache.c:1880 +#: read-cache.c:1927 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "birleştirilmiş dosya '%s' için çoklu hazırlama alanı girdileri" -#: read-cache.c:1883 +#: read-cache.c:1930 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' için sırasız hazırlama alanı girdileri" -#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181 -#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991 +#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 #: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "indeks dosyası hasar görmüş" -#: read-cache.c:2133 +#: read-cache.c:2180 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "load_cache_entries iş parçacığı oluşturulamıyor: %s" -#: read-cache.c:2146 +#: read-cache.c:2193 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "load_cache_entries iş parçacığı ucu birleştirilemiyor: %s" -#: read-cache.c:2179 +#: read-cache.c:2226 #, c-format msgid "%s: index file open failed" msgstr "%s: indeks dosyası açılamadı" -#: read-cache.c:2183 +#: read-cache.c:2230 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: açık indeksin bilgileri alınamıyor" -#: read-cache.c:2187 +#: read-cache.c:2234 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: indeks dosyası beklenenden daha küçük" -#: read-cache.c:2191 +#: read-cache.c:2238 #, c-format msgid "%s: unable to map index file" msgstr "%s: indeks dosyası eşlemlenemiyor" -#: read-cache.c:2233 +#: read-cache.c:2280 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "load_index_extensions iş parçacığı oluşturulamıyor: %s" -#: read-cache.c:2260 +#: read-cache.c:2307 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "load_index_extensions iş parçacığı ucu birleştirilemiyor: %s" -#: read-cache.c:2292 +#: read-cache.c:2345 #, c-format msgid "could not freshen shared index '%s'" msgstr "paylaşılan indeks '%s' tazelenemedi" -#: read-cache.c:2339 +#: read-cache.c:2392 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "bozuk indeks, %s bekleniyordu (%s içinde), %s alındı" -#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141 +#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 #, c-format msgid "could not close '%s'" msgstr "'%s' kapatılamadı" -#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239 +#: read-cache.c:3138 +msgid "failed to convert to a sparse-index" +msgstr "bir sparse-index'e dönüştürülemedi" + +#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441 #, c-format msgid "could not stat '%s'" msgstr "'%s' bilgileri alınamadı" -#: read-cache.c:3151 +#: read-cache.c:3222 #, c-format msgid "unable to open git dir: %s" msgstr "git dizini açılamıyor: %s" -#: read-cache.c:3163 +#: read-cache.c:3234 #, c-format msgid "unable to unlink: %s" msgstr "bağlantı kesilemiyor: %s" -#: read-cache.c:3188 +#: read-cache.c:3263 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "'%s' üzerindeki izin bitleri onarılamıyor" -#: read-cache.c:3337 +#: read-cache.c:3412 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: #0 numaralı hazırlama alanına bırakılamıyor" @@ -6416,7 +6492,10 @@ msgid "" "r, reword <commit> = use commit, but edit the commit message\n" "e, edit <commit> = use commit, but stop for amending\n" "s, squash <commit> = use commit, but meld into previous commit\n" -"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n" +" commit's log message, unless -C is used, in which case\n" +" keep only this commit's message; -c is same as -C but\n" +" opens the editor\n" "x, exec <command> = run command (the rest of the line) using shell\n" "b, break = stop here (continue rebase later with 'git rebase --continue')\n" "d, drop <commit> = remove commit\n" @@ -6425,7 +6504,7 @@ msgid "" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" ". create a merge commit using the original merge commit's\n" ". message (or the oneline, if no original merge commit was\n" -". specified). Use -c <commit> to reword the commit message.\n" +". specified); use -c <commit> to reword the commit message\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -6435,7 +6514,10 @@ msgstr "" "r, reword <işleme> = işlemeyi kullan; ancak işleme iletisini düzenle\n" "e, edit <işleme> = işlemeyi kullan; ancak değiştirmek için dur\n" "s, squash <işleme> = işlemeyi kullan; ancak önceki işleme içine karıştır\n" -"f, fixup <işleme> = \"squash\" gibi; ancak bu işlemenin günlük iletisini at\n" +"f, fixup [-C | -c] <işleme> = \"squash\" gibi; ancak yalnızca bir önceki\n" +" işlemenin günlük iletisini tutar (-C kullanılmadıysa,\n" +" o zaman yalnızca bu işlemenin iletisini tutar; -c, -C\n" +" ile aynıdır; ancak ek olarak düzenleyiciyi açar)\n" "x, exec <komut> = komutu (satırın geri kalanı) kabuk kullanarak çalıştır\n" "b, break = burada dur (daha sonra sürdürmek için 'git rebase --continue')\n" "d, drop <işleme> = işlemeyi kaldır\n" @@ -6449,14 +6531,14 @@ msgstr "" "\n" "Bu satırlar yeniden sıralanabilirler, yukarıdan aşağıya çalıştırılırlar.\n" -#: rebase-interactive.c:63 +#: rebase-interactive.c:66 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "%s ögesini %s üzerine yeniden temellendir (%d komut)" msgstr[1] "%s ögesini %s üzerine yeniden temellendir (%d komut)" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -6465,7 +6547,7 @@ msgstr "" "Hiçbir satırı kaldırmayın. Bir işlemeyi kaldırmak için 'drop'u açıkça " "kullanın.\n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 +#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -6473,7 +6555,7 @@ msgstr "" "\n" "Buradaki bir satırı kaldırırsanız İŞLEME KAYBOLUR.\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 +#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -6488,7 +6570,7 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 +#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -6498,19 +6580,19 @@ msgstr "" "Ancak tümünü kaldırırsanız yeniden temellendirme iptal edilecektir.\n" "\n" -#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615 -#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816 +#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271 #, c-format msgid "could not write '%s'" msgstr "'%s' yazılamadı" -#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230 -#: builtin/rebase.c:254 +#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229 +#: builtin/rebase.c:253 #, c-format msgid "could not write '%s'." msgstr "'%s' yazılamadı." -#: rebase-interactive.c:193 +#: rebase-interactive.c:196 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -6519,7 +6601,7 @@ msgstr "" "Uyarı: Bazı işlemeler yanlışlıkla bırakılmış olabilir.\n" "Bırakılan işlemeler: (yeniden eskiye):\n" -#: rebase-interactive.c:200 +#: rebase-interactive.c:203 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -6536,14 +6618,14 @@ msgstr "" "Kullanılabilir davranışlar: ignore, warn, error.\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402 -#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241 -#: builtin/rebase.c:266 +#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597 +#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240 +#: builtin/rebase.c:265 #, c-format msgid "could not read '%s'." msgstr "'%s' okunamadı." -#: ref-filter.c:42 wt-status.c:1975 +#: ref-filter.c:42 wt-status.c:1978 msgid "gone" msgstr "gitti" @@ -6699,111 +6781,111 @@ msgstr "" msgid "format: %%(if) atom used without a %%(then) atom" msgstr "biçim: %%(if) ögeciği bir %%(then) ögeciği olmadan kullanıldı" -#: ref-filter.c:806 +#: ref-filter.c:807 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "biçim: %%(then) ögeciği bir %%(if) ögeciği olmadan kullanıldı" -#: ref-filter.c:808 +#: ref-filter.c:809 #, c-format msgid "format: %%(then) atom used more than once" msgstr "biçim: %%(then) ögeciği birden çok kez kullanıldı" -#: ref-filter.c:810 +#: ref-filter.c:811 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "biçim: %%(then) ögeciği %%(else) ögeciğinden sonra kullanıldı" -#: ref-filter.c:838 +#: ref-filter.c:839 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "biçim: %%(else) ögeciği bir %%(if) ögeciği olmadan kullanıldı" -#: ref-filter.c:840 +#: ref-filter.c:841 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "biçim: %%(else) ögeciği bir %%(then) ögeciği olmadan kullanıldı" -#: ref-filter.c:842 +#: ref-filter.c:843 #, c-format msgid "format: %%(else) atom used more than once" msgstr "biçim: %%(else) ögeciği birden çok kez kullanıldı" -#: ref-filter.c:857 +#: ref-filter.c:858 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "biçim: %%(end) ögeciği eş ögeciği olmadan kullanıldı" -#: ref-filter.c:914 +#: ref-filter.c:915 #, c-format msgid "malformed format string %s" msgstr "hatalı oluşturulmuş biçim dizisi %s" -#: ref-filter.c:1555 +#: ref-filter.c:1556 #, c-format msgid "(no branch, rebasing %s)" msgstr "(dal yok, %s yeniden temellendiriliyor)" -#: ref-filter.c:1558 +#: ref-filter.c:1559 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(dal yok, ayrık HEAD %s yeniden temellendiriliyor)" -#: ref-filter.c:1561 +#: ref-filter.c:1562 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(dal yok, ikili arama %s üzerinde başladı)" -#: ref-filter.c:1565 +#: ref-filter.c:1566 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD, %s konumunda ayrıldı)" -#: ref-filter.c:1568 +#: ref-filter.c:1569 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD, %s ögesinden ayrıldı)" -#: ref-filter.c:1571 +#: ref-filter.c:1572 msgid "(no branch)" msgstr "(dal yok)" -#: ref-filter.c:1603 ref-filter.c:1812 +#: ref-filter.c:1604 ref-filter.c:1813 #, c-format msgid "missing object %s for %s" msgstr "eksik nesne %s (%s için)" -#: ref-filter.c:1613 +#: ref-filter.c:1614 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer %s üzerinde başarısız oldu (%s için)" -#: ref-filter.c:1996 +#: ref-filter.c:1997 #, c-format msgid "malformed object at '%s'" msgstr "'%s' konumunda hatalı oluşturulmuş nesne" -#: ref-filter.c:2085 +#: ref-filter.c:2086 #, c-format msgid "ignoring ref with broken name %s" msgstr "bozuk ada iye %s başvurusu yok sayılıyor" -#: ref-filter.c:2090 refs.c:676 +#: ref-filter.c:2091 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "bozuk başvuru %s yok sayılıyor" -#: ref-filter.c:2430 +#: ref-filter.c:2431 #, c-format msgid "format: %%(end) atom missing" msgstr "biçim: %%(end) ögeciği eksik" -#: ref-filter.c:2529 +#: ref-filter.c:2525 #, c-format msgid "malformed object name %s" msgstr "hatalı oluşturulmuş nesne adı %s" -#: ref-filter.c:2534 +#: ref-filter.c:2530 #, c-format msgid "option `%s' must point to a commit" msgstr "'%s' bir işlemeye işaret etmeli" @@ -7259,8 +7341,8 @@ msgstr "'%s' başıboşunun bağlantısı kesilemiyor" msgid "Recorded preimage for '%s'" msgstr "'%s' için öngörüntü kaydedildi" -#: rerere.c:865 submodule.c:2088 builtin/log.c:1991 -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 +#: rerere.c:865 submodule.c:2089 builtin/log.c:2000 +#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891 #, c-format msgid "could not create directory '%s'" msgstr "'%s' dizini oluşturulamadı" @@ -7298,25 +7380,25 @@ msgstr "rr-cache dizini açılamıyor" msgid "could not determine HEAD revision" msgstr "HEAD revizyonu saptanamadı" -#: reset.c:70 reset.c:76 sequencer.c:3468 +#: reset.c:70 reset.c:76 sequencer.c:3669 #, c-format msgid "failed to find tree of %s" msgstr "%s ögesinin ağacı bulunamadı" -#: revision.c:2338 +#: revision.c:2343 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<paketdosyası> artık desteklenmiyor" -#: revision.c:2668 +#: revision.c:2683 msgid "your current branch appears to be broken" msgstr "geçerli dalınız bozuk gibi görünüyor" -#: revision.c:2671 +#: revision.c:2686 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "geçerli dalınız '%s' içinde henüz bir işleme yok" -#: revision.c:2877 +#: revision.c:2892 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L, -p ve -s dışında başka diff biçimlerini henüz desteklemiyor" @@ -7324,12 +7406,12 @@ msgstr "-L, -p ve -s dışında başka diff biçimlerini henüz desteklemiyor" msgid "open /dev/null failed" msgstr "/dev/null açılamadı" -#: run-command.c:1274 +#: run-command.c:1275 #, c-format msgid "cannot create async thread: %s" msgstr "async iş parçacığı oluşturulamadı: %s" -#: run-command.c:1338 +#: run-command.c:1345 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -7338,33 +7420,41 @@ msgstr "" "'%s' kancası yok sayıldı; çünkü bir çalıştırılabilir olarak ayarlanmamış.\n" "Bu uyarıyı 'git config advice.ignoredHook false' ile kapatabilirsiniz." -#: send-pack.c:146 +#: send-pack.c:150 msgid "unexpected flush packet while reading remote unpack status" msgstr "uzak konum açım durumu okunurken beklenmedik floş paketi" -#: send-pack.c:148 +#: send-pack.c:152 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "uzak konum açım durumu ayrıştırılamadı: %s" -#: send-pack.c:150 +#: send-pack.c:154 #, c-format msgid "remote unpack failed: %s" msgstr "uzak konum açımı başarısız: %s" -#: send-pack.c:374 +#: send-pack.c:378 msgid "failed to sign the push certificate" msgstr "itme sertifikası imzalanamadı" -#: send-pack.c:467 +#: send-pack.c:433 +msgid "send-pack: unable to fork off fetch subprocess" +msgstr "send-pack: getirme altişlemi çatallanamıyor" + +#: send-pack.c:455 +msgid "push negotiation failed; proceeding anyway with push" +msgstr "itme pazarlığı başarısız; yine de itme olmadan sürdürülüyor" + +#: send-pack.c:520 msgid "the receiving end does not support this repository's hash algorithm" msgstr "alıcı uç bu deponun sağlama algoritmasını desteklemiyor" -#: send-pack.c:476 +#: send-pack.c:529 msgid "the receiving end does not support --signed push" msgstr "alıcı uç --signed itmeyi desteklemiyor" -#: send-pack.c:478 +#: send-pack.c:531 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -7372,47 +7462,47 @@ msgstr "" "alıcı uç --signed itmeyi desteklemediğinden dolayı bir itme sertifikası " "gönderilmiyor" -#: send-pack.c:490 +#: send-pack.c:543 msgid "the receiving end does not support --atomic push" msgstr "alıcı uç --atomic itmeyi desteklemiyor" -#: send-pack.c:495 +#: send-pack.c:548 msgid "the receiving end does not support push options" msgstr "alıcı uç itme seçeneklerini desteklemiyor" -#: sequencer.c:195 +#: sequencer.c:196 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "geçersiz işleme iletisi temizleme kipi '%s'" -#: sequencer.c:323 +#: sequencer.c:324 #, c-format msgid "could not delete '%s'" msgstr "'%s' silinemedi" -#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385 +#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402 #, c-format msgid "could not remove '%s'" msgstr "'%s' kaldırılamadı" -#: sequencer.c:353 +#: sequencer.c:354 msgid "revert" msgstr "geri al" -#: sequencer.c:355 +#: sequencer.c:356 msgid "cherry-pick" msgstr "seç-al" -#: sequencer.c:357 +#: sequencer.c:358 msgid "rebase" msgstr "yeniden temellendirme" -#: sequencer.c:359 +#: sequencer.c:360 #, c-format msgid "unknown action: %d" msgstr "bilinmeyen eylem: %d" -#: sequencer.c:418 +#: sequencer.c:419 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -7420,7 +7510,7 @@ msgstr "" "çakışmaları çözdükten sonra doğrusu verilen yolları 'git add <yollar>'\n" "veya 'git rm <yollar>' ile imleyin" -#: sequencer.c:421 +#: sequencer.c:422 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -7430,43 +7520,43 @@ msgstr "" "veya 'git rm <yollar>' ile imleyin ve çıkan sonucu\n" "'git commit' ile işleyin" -#: sequencer.c:434 sequencer.c:3070 +#: sequencer.c:435 sequencer.c:3271 #, c-format msgid "could not lock '%s'" msgstr "'%s' kilitlenemedi" -#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088 -#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 +#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "şuraya yazılamadı: '%s'" -#: sequencer.c:441 +#: sequencer.c:442 #, c-format msgid "could not write eol to '%s'" msgstr "satır sonu şuraya yazılamadı: '%s'" -#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090 -#: sequencer.c:3353 +#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 +#: sequencer.c:3554 #, c-format msgid "failed to finalize '%s'" msgstr "'%s' tamamlanamadı" -#: sequencer.c:485 +#: sequencer.c:486 #, c-format msgid "your local changes would be overwritten by %s." msgstr "%s ile yerel değişikliklerinizin üzerine yazılacaktır." -#: sequencer.c:489 +#: sequencer.c:490 msgid "commit your changes or stash them to proceed." msgstr "İlerlemek için değişikliklerinizi işleyin veya zulalayın." -#: sequencer.c:521 +#: sequencer.c:522 #, c-format msgid "%s: fast-forward" msgstr "%s: ileri sar" -#: sequencer.c:560 builtin/tag.c:598 +#: sequencer.c:561 builtin/tag.c:609 #, c-format msgid "Invalid cleanup mode %s" msgstr "Geçersiz temizlik kipi %s" @@ -7474,65 +7564,65 @@ msgstr "Geçersiz temizlik kipi %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:670 +#: sequencer.c:671 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Yeni indeks dosyası yazılamıyor" -#: sequencer.c:684 +#: sequencer.c:685 msgid "unable to update cache tree" msgstr "önbellek ağacı güncellenemiyor" -#: sequencer.c:698 +#: sequencer.c:699 msgid "could not resolve HEAD commit" msgstr "HEAD işlemesi çözülemedi" -#: sequencer.c:778 +#: sequencer.c:779 #, c-format msgid "no key present in '%.*s'" msgstr "'%.*s' içinde bir anahtar yok" -#: sequencer.c:789 +#: sequencer.c:790 #, c-format msgid "unable to dequote value of '%s'" msgstr "'%s' ögesinin tırnakları kaldırılamıyor" -#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728 +#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "'%s' okuma için açılamadı" -#: sequencer.c:836 +#: sequencer.c:837 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' halihazırda verilmiş" -#: sequencer.c:841 +#: sequencer.c:842 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' halihazırda verilmiş" -#: sequencer.c:846 +#: sequencer.c:847 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' halihazırda verilmiş" -#: sequencer.c:850 +#: sequencer.c:851 #, c-format msgid "unknown variable '%s'" msgstr "bilinmeyen değişken '%s'" -#: sequencer.c:855 +#: sequencer.c:856 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' eksik" -#: sequencer.c:857 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' eksik" -#: sequencer.c:859 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' eksik" -#: sequencer.c:924 +#: sequencer.c:925 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -7562,11 +7652,11 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:1211 +#: sequencer.c:1212 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' başarısız oldu" -#: sequencer.c:1217 +#: sequencer.c:1218 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7592,7 +7682,7 @@ msgstr "" "\n" "\tgit commit --amend --reset-author\n" -#: sequencer.c:1230 +#: sequencer.c:1231 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7616,338 +7706,342 @@ msgstr "" "\n" "\tgit commit --amend --reset-author\n" -#: sequencer.c:1272 +#: sequencer.c:1273 msgid "couldn't look up newly created commit" msgstr "yeni yapılan işleme aranamadı" -#: sequencer.c:1274 +#: sequencer.c:1275 msgid "could not parse newly created commit" msgstr "yeni yapılan işleme ayrıştırılamadı" -#: sequencer.c:1320 +#: sequencer.c:1321 msgid "unable to resolve HEAD after creating commit" msgstr "HEAD, işleme yapıldıktan sonra çözülemiyor" -#: sequencer.c:1322 +#: sequencer.c:1323 msgid "detached HEAD" msgstr "ayrık HEAD" -#: sequencer.c:1326 +#: sequencer.c:1327 msgid " (root-commit)" msgstr " (kök işleme)" -#: sequencer.c:1347 +#: sequencer.c:1348 msgid "could not parse HEAD" msgstr "HEAD ayrıştırılamadı" -#: sequencer.c:1349 +#: sequencer.c:1350 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s bir işleme değil" -#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692 msgid "could not parse HEAD commit" msgstr "HEAD işlemesi ayrıştırılamadı" -#: sequencer.c:1409 sequencer.c:2108 +#: sequencer.c:1410 sequencer.c:2295 msgid "unable to parse commit author" msgstr "işleme yazarı ayrıştırılamıyor" -#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702 +#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706 msgid "git write-tree failed to write a tree" msgstr "git write-tree bir ağaca yazamadı" -#: sequencer.c:1453 sequencer.c:1573 +#: sequencer.c:1454 sequencer.c:1574 #, c-format msgid "unable to read commit message from '%s'" msgstr "'%s' konumundan işleme iletisi okunamıyor" -#: sequencer.c:1484 sequencer.c:1516 +#: sequencer.c:1485 sequencer.c:1517 #, c-format msgid "invalid author identity '%s'" msgstr "geçersiz yazar kimliği '%s'" -#: sequencer.c:1490 +#: sequencer.c:1491 msgid "corrupt author: missing date information" msgstr "hasar görmüş yazar: tarih bilgisi eksik" -#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905 -#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909 +#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "işleme nesnesi yazılamadı" -#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "%s güncellenemedi" -#: sequencer.c:1605 +#: sequencer.c:1606 #, c-format msgid "could not parse commit %s" msgstr "%s işlemesi ayrıştırılamadı" -#: sequencer.c:1610 +#: sequencer.c:1611 #, c-format msgid "could not parse parent commit %s" msgstr "üst işleme %s ayrıştırılamadı" -#: sequencer.c:1693 sequencer.c:1804 +#: sequencer.c:1694 sequencer.c:1975 #, c-format msgid "unknown command: %d" msgstr "bilinmeyen komut: %d" -#: sequencer.c:1751 sequencer.c:1776 +#: sequencer.c:1736 git-rebase--preserve-merges.sh:486 +msgid "This is the 1st commit message:" +msgstr "Birinci işleme iletisi bu:" + +#: sequencer.c:1737 +#, c-format +msgid "This is the commit message #%d:" +msgstr "İşleme iletisi #%d bu:" + +#: sequencer.c:1738 +msgid "The 1st commit message will be skipped:" +msgstr "Birinci işlemenin iletisi atlanacak:" + +#: sequencer.c:1739 +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "İşleme iletisi #%d atlanacak:" + +#: sequencer.c:1740 #, c-format msgid "This is a combination of %d commits." msgstr "Bu %d işlemenin bir birleşimi." -#: sequencer.c:1761 +#: sequencer.c:1887 sequencer.c:1944 +#, c-format +msgid "cannot write '%s'" +msgstr "'%s' yazılamıyor" + +#: sequencer.c:1934 msgid "need a HEAD to fixup" msgstr "düzeltmek için bir HEAD gerekiyor" -#: sequencer.c:1763 sequencer.c:3380 +#: sequencer.c:1936 sequencer.c:3581 msgid "could not read HEAD" msgstr "HEAD okunamadı" -#: sequencer.c:1765 +#: sequencer.c:1938 msgid "could not read HEAD's commit message" msgstr "HEAD'in işleme iletisi okunamadı" -#: sequencer.c:1771 -#, c-format -msgid "cannot write '%s'" -msgstr "'%s' yazılamıyor" - -#: sequencer.c:1778 git-rebase--preserve-merges.sh:486 -msgid "This is the 1st commit message:" -msgstr "Birinci işleme iletisi bu:" - -#: sequencer.c:1786 +#: sequencer.c:1962 #, c-format msgid "could not read commit message of %s" msgstr "%s işleme iletisi okunamadı" -#: sequencer.c:1793 -#, c-format -msgid "This is the commit message #%d:" -msgstr "İşleme iletisi #%d bu:" - -#: sequencer.c:1799 -#, c-format -msgid "The commit message #%d will be skipped:" -msgstr "İşleme iletisi #%d atlanacak:" - -#: sequencer.c:1887 +#: sequencer.c:2072 msgid "your index file is unmerged." msgstr "indeks dosyanız birleştirilmemiş" -#: sequencer.c:1894 +#: sequencer.c:2079 msgid "cannot fixup root commit" msgstr "kök işleme düzeltilemiyor" -#: sequencer.c:1913 +#: sequencer.c:2098 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "%s işlemesi bir birleştirme; ancak bir -m seçeneği verilmedi." -#: sequencer.c:1921 sequencer.c:1929 +#: sequencer.c:2106 sequencer.c:2114 #, c-format msgid "commit %s does not have parent %d" msgstr "%s işlemesinin %d diye bir üst ögesi yok" -#: sequencer.c:1935 +#: sequencer.c:2120 #, c-format msgid "cannot get commit message for %s" msgstr "%s işlemesinin iletisi alınamıyor" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1954 +#: sequencer.c:2139 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: üst işleme %s ayrıştırılamıyor" -#: sequencer.c:2019 +#: sequencer.c:2205 #, c-format msgid "could not rename '%s' to '%s'" msgstr "'%s', '%s' olarak yeniden adlandırılamadı" -#: sequencer.c:2079 +#: sequencer.c:2265 #, c-format msgid "could not revert %s... %s" msgstr "%s geri alınamadı... %s" -#: sequencer.c:2080 +#: sequencer.c:2266 #, c-format msgid "could not apply %s... %s" msgstr "%s uygulanamadı... %s" -#: sequencer.c:2100 +#: sequencer.c:2287 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "%s %s bırakılıyor -- yama içeriği halihazırda üstkaynakta\n" -#: sequencer.c:2158 +#: sequencer.c:2345 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: indeks okunamadı" -#: sequencer.c:2165 +#: sequencer.c:2352 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: indeks yenilenemedi" -#: sequencer.c:2242 +#: sequencer.c:2425 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s argüman kabul etmiyor: '%s'" -#: sequencer.c:2251 +#: sequencer.c:2434 #, c-format msgid "missing arguments for %s" msgstr "%s için eksik argüman" -#: sequencer.c:2282 +#: sequencer.c:2477 #, c-format msgid "could not parse '%s'" msgstr "'%s' ayrıştırılamadı" -#: sequencer.c:2343 +#: sequencer.c:2538 #, c-format msgid "invalid line %d: %.*s" msgstr "geçersiz satır %d: %.*s" -#: sequencer.c:2354 +#: sequencer.c:2549 #, c-format msgid "cannot '%s' without a previous commit" msgstr "öncesinde bir işleme olmadan '%s' yapılamıyor" -#: sequencer.c:2440 +#: sequencer.c:2635 msgid "cancelling a cherry picking in progress" msgstr "sürmekte olan bir seç-al iptal ediliyor" -#: sequencer.c:2449 +#: sequencer.c:2644 msgid "cancelling a revert in progress" msgstr "sürmekte olan bir geri al iptal ediliyor" -#: sequencer.c:2493 +#: sequencer.c:2690 msgid "please fix this using 'git rebase --edit-todo'." msgstr "lütfen bunu 'git rebase --edit-todo' kullanarak onarın." -#: sequencer.c:2495 +#: sequencer.c:2692 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "kullanılabilir olmayan yönerge tablosu: '%s'" -#: sequencer.c:2500 +#: sequencer.c:2697 msgid "no commits parsed." msgstr "Hiçbir işleme ayrıştırılmadı." -#: sequencer.c:2511 +#: sequencer.c:2708 msgid "cannot cherry-pick during a revert." msgstr "bir geri al sırasında seç-al yapılamıyor" -#: sequencer.c:2513 +#: sequencer.c:2710 msgid "cannot revert during a cherry-pick." msgstr "bir seç-al sırasında geri al yapılamıyor" -#: sequencer.c:2591 +#: sequencer.c:2788 #, c-format msgid "invalid value for %s: %s" msgstr "%s için geçersiz değer: %s" -#: sequencer.c:2698 +#: sequencer.c:2897 msgid "unusable squash-onto" msgstr "kullanılabilir olmayan squash-onto" -#: sequencer.c:2718 +#: sequencer.c:2917 #, c-format msgid "malformed options sheet: '%s'" msgstr "hatalı oluşturulmuş seçenekler tablosu: '%s'" -#: sequencer.c:2811 sequencer.c:4644 +#: sequencer.c:3012 sequencer.c:4869 msgid "empty commit set passed" msgstr "boş işleme seti aktarıldı" -#: sequencer.c:2828 +#: sequencer.c:3029 msgid "revert is already in progress" msgstr "geri al halihazırda sürüyor" -#: sequencer.c:2830 +#: sequencer.c:3031 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "\"git revert (--continue | %s--abort | --quit)\" deneyin" -#: sequencer.c:2833 +#: sequencer.c:3034 msgid "cherry-pick is already in progress" msgstr "seç-al halihazırda sürüyor" -#: sequencer.c:2835 +#: sequencer.c:3036 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "\"git cherry-pick (--continue | %s--abort | --quit)\" deneyin" -#: sequencer.c:2849 +#: sequencer.c:3050 #, c-format msgid "could not create sequencer directory '%s'" msgstr "ardıştırıcı dizini '%s' oluşturulamadı" -#: sequencer.c:2864 +#: sequencer.c:3065 msgid "could not lock HEAD" msgstr "HEAD kilitlenemedi" -#: sequencer.c:2924 sequencer.c:4379 +#: sequencer.c:3125 sequencer.c:4582 msgid "no cherry-pick or revert in progress" msgstr "süren bir seç-al veya geri al yok" -#: sequencer.c:2926 sequencer.c:2937 +#: sequencer.c:3127 sequencer.c:3138 msgid "cannot resolve HEAD" msgstr "HEAD çözülemiyor" -#: sequencer.c:2928 sequencer.c:2972 +#: sequencer.c:3129 sequencer.c:3173 msgid "cannot abort from a branch yet to be born" msgstr "daha doğmamış bir daldan iptal edilemiyor" -#: sequencer.c:2958 builtin/grep.c:757 +#: sequencer.c:3159 builtin/grep.c:759 #, c-format msgid "cannot open '%s'" msgstr "'%s' açılamıyor" -#: sequencer.c:2960 +#: sequencer.c:3161 #, c-format msgid "cannot read '%s': %s" msgstr "'%s' okunamıyor: %s" -#: sequencer.c:2961 +#: sequencer.c:3162 msgid "unexpected end of file" msgstr "beklenmedik dosya sonu" -#: sequencer.c:2967 +#: sequencer.c:3168 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "depolanmış seç-al öncesi HEAD dosyası '%s' hasar görmüş" -#: sequencer.c:2978 +#: sequencer.c:3179 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "HEAD'i taşımış görünüyorsunuz. Geri sarılmıyor, HEAD'inizi denetleyin!" -#: sequencer.c:3019 +#: sequencer.c:3220 msgid "no revert in progress" msgstr "süren bir geri al yok" -#: sequencer.c:3028 +#: sequencer.c:3229 msgid "no cherry-pick in progress" msgstr "süren bir seç-al yok" -#: sequencer.c:3038 +#: sequencer.c:3239 msgid "failed to skip the commit" msgstr "işleme atlanamadı" -#: sequencer.c:3045 +#: sequencer.c:3246 msgid "there is nothing to skip" msgstr "atlanacak bir şey yok" -#: sequencer.c:3048 +#: sequencer.c:3249 #, c-format msgid "" "have you committed already?\n" @@ -7956,16 +8050,16 @@ msgstr "" "İşlemeyi yaptınız mı?\n" "\"git %s --continue\" deneyin.\"" -#: sequencer.c:3210 sequencer.c:4271 +#: sequencer.c:3411 sequencer.c:4473 msgid "cannot read HEAD" msgstr "HEAD okunamıyor" -#: sequencer.c:3227 +#: sequencer.c:3428 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "'%s', '%s' konumuna kopyalanamıyor" -#: sequencer.c:3235 +#: sequencer.c:3436 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7984,27 +8078,27 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3245 +#: sequencer.c:3446 #, c-format msgid "Could not apply %s... %.*s" msgstr "%s uygulanamıyor... %.*s" -#: sequencer.c:3252 +#: sequencer.c:3453 #, c-format msgid "Could not merge %.*s" msgstr "%.*s birleştirilemedi" -#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640 +#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644 #, c-format msgid "could not copy '%s' to '%s'" msgstr "'%s', '%s' konumuna kopyalanamadı" -#: sequencer.c:3282 +#: sequencer.c:3483 #, c-format msgid "Executing: %s\n" msgstr "Çalıştırılıyor: %s\n" -#: sequencer.c:3297 +#: sequencer.c:3498 #, c-format msgid "" "execution failed: %s\n" @@ -8019,11 +8113,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3303 +#: sequencer.c:3504 msgid "and made changes to the index and/or the working tree\n" msgstr "ve indekse ve/veya çalışma ağacına değişiklikler yapıldı\n" -#: sequencer.c:3309 +#: sequencer.c:3510 #, c-format msgid "" "execution succeeded: %s\n" @@ -8040,90 +8134,90 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3370 +#: sequencer.c:3571 #, c-format msgid "illegal label name: '%.*s'" msgstr "izin verilmeyen etiket adı: '%.*s'" -#: sequencer.c:3424 +#: sequencer.c:3625 msgid "writing fake root commit" msgstr "sahte kök işlemesi yazılıyor" -#: sequencer.c:3429 +#: sequencer.c:3630 msgid "writing squash-onto" msgstr "squash-onto yazılıyor" -#: sequencer.c:3513 +#: sequencer.c:3714 #, c-format msgid "could not resolve '%s'" msgstr "'%s' çözülemedi" -#: sequencer.c:3546 +#: sequencer.c:3747 msgid "cannot merge without a current revision" msgstr "güncel bir revizyon olmadan birleştirilemiyor" -#: sequencer.c:3568 +#: sequencer.c:3769 #, c-format msgid "unable to parse '%.*s'" msgstr "'%.*s' ayrıştırılamıyor" -#: sequencer.c:3577 +#: sequencer.c:3778 #, c-format msgid "nothing to merge: '%.*s'" msgstr "birleştirilecek bir şey yok: '%.*s'" -#: sequencer.c:3589 +#: sequencer.c:3790 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "ahtapot birleştirmesi bir [yeni kök]ün üzerinde çalıştırılamaz" -#: sequencer.c:3605 +#: sequencer.c:3806 #, c-format msgid "could not get commit message of '%s'" msgstr "'%s' işlemesinin işleme iletisi alınamadı" -#: sequencer.c:3788 +#: sequencer.c:3989 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "şunu birleştirme girişiminde bulunulamadı bile: '%.*s'" -#: sequencer.c:3804 +#: sequencer.c:4005 msgid "merge: Unable to write new index file" msgstr "merge: Yeni indeks dosyası yazılamıyor" -#: sequencer.c:3878 +#: sequencer.c:4079 msgid "Cannot autostash" msgstr "Kendiliğinden zulalanamıyor" -#: sequencer.c:3881 +#: sequencer.c:4082 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Beklenmedik zula yanıtı: '%s'" -#: sequencer.c:3887 +#: sequencer.c:4088 #, c-format msgid "Could not create directory for '%s'" msgstr "'%s' için dizin oluşturulamadı" -#: sequencer.c:3890 +#: sequencer.c:4091 #, c-format msgid "Created autostash: %s\n" msgstr "Zula kendiliğinden oluşturuldu: %s\n" -#: sequencer.c:3894 +#: sequencer.c:4095 msgid "could not reset --hard" msgstr "'reset --hard' yapılamadı" -#: sequencer.c:3919 +#: sequencer.c:4120 #, c-format msgid "Applied autostash.\n" msgstr "Kendiliğinden zulalama uygulandı.\n" -#: sequencer.c:3931 +#: sequencer.c:4132 #, c-format msgid "cannot store %s" msgstr "%s depolanamıyor" -#: sequencer.c:3934 +#: sequencer.c:4135 #, c-format msgid "" "%s\n" @@ -8134,29 +8228,29 @@ msgstr "" "Değişiklikleriniz zulada güvende.\n" "İstediğiniz zaman \"git stash pop\" veya \"git stash drop\" yapabilirsiniz.\n" -#: sequencer.c:3939 +#: sequencer.c:4140 msgid "Applying autostash resulted in conflicts." msgstr "Kendiliğinden zulalama çakışmalara neden oldu." -#: sequencer.c:3940 +#: sequencer.c:4141 msgid "Autostash exists; creating a new stash entry." msgstr "Kendiliğinden zulalama mevcut; yeni bir zula girdisi oluşturuluyor." -#: sequencer.c:4033 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4234 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "HEAD ayrılamadı" -#: sequencer.c:4048 +#: sequencer.c:4249 #, c-format msgid "Stopped at HEAD\n" msgstr "HEAD'de duruldu\n" -#: sequencer.c:4050 +#: sequencer.c:4251 #, c-format msgid "Stopped at %s\n" msgstr "%s konumunda duruldu\n" -#: sequencer.c:4058 +#: sequencer.c:4259 #, c-format msgid "" "Could not execute the todo command\n" @@ -8177,58 +8271,58 @@ msgstr "" "\tgit rebase --edit-todo\n" "\tgit rebase --continue\n" -#: sequencer.c:4104 +#: sequencer.c:4305 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Yeniden temellendiriliyor: (%d/%d)%s" -#: sequencer.c:4149 +#: sequencer.c:4351 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "%s konumunda durdu... %.*s\n" -#: sequencer.c:4220 +#: sequencer.c:4422 #, c-format msgid "unknown command %d" msgstr "bilinmeyen komut %d" -#: sequencer.c:4279 +#: sequencer.c:4481 msgid "could not read orig-head" msgstr "orig-head okunamadı" -#: sequencer.c:4284 +#: sequencer.c:4486 msgid "could not read 'onto'" msgstr "'onto' okunamadı" -#: sequencer.c:4298 +#: sequencer.c:4500 #, c-format msgid "could not update HEAD to %s" msgstr "HEAD şu konuma güncellenemedi: %s" -#: sequencer.c:4358 +#: sequencer.c:4560 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "%s başarıyla yeniden temellendirildi ve güncellendi.\n" -#: sequencer.c:4391 +#: sequencer.c:4612 msgid "cannot rebase: You have unstaged changes." msgstr "Yeniden temellendirilemiyor: Hazırlanmamış değişiklikleriniz var." -#: sequencer.c:4400 +#: sequencer.c:4621 msgid "cannot amend non-existing commit" msgstr "var olmayan işleme değiştirilemiyor" -#: sequencer.c:4402 +#: sequencer.c:4623 #, c-format msgid "invalid file: '%s'" msgstr "geçersiz dosya: '%s'" -#: sequencer.c:4404 +#: sequencer.c:4625 #, c-format msgid "invalid contents: '%s'" msgstr "geçersiz içerik: '%s'" -#: sequencer.c:4407 +#: sequencer.c:4628 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8238,50 +8332,50 @@ msgstr "" "Çalışma ağacınızda işlenmemiş değişiklikleriniz var. Lütfen önce\n" "onları işleyin ve ardından 'git rebase --continue' yapın." -#: sequencer.c:4443 sequencer.c:4482 +#: sequencer.c:4664 sequencer.c:4703 #, c-format msgid "could not write file: '%s'" msgstr "dosya yazılamadı: '%s'" -#: sequencer.c:4498 +#: sequencer.c:4719 msgid "could not remove CHERRY_PICK_HEAD" msgstr "CHERRY_PICK_HEAD kaldırılamadı" -#: sequencer.c:4505 +#: sequencer.c:4726 msgid "could not commit staged changes." msgstr "Hazırlanmış değişiklikler işlenemedi." -#: sequencer.c:4621 +#: sequencer.c:4846 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: Bir %s seçip alınamıyor" -#: sequencer.c:4625 +#: sequencer.c:4850 #, c-format msgid "%s: bad revision" msgstr "%s hatalı revizyon" -#: sequencer.c:4660 +#: sequencer.c:4885 msgid "can't revert as initial commit" msgstr "ilk işleme geri alınamaz" -#: sequencer.c:5137 +#: sequencer.c:5362 msgid "make_script: unhandled options" msgstr "make_script: ele alınmayan seçenekler" -#: sequencer.c:5140 +#: sequencer.c:5365 msgid "make_script: error preparing revisions" msgstr "make_script: revizyonlar hazırlanırken hata" -#: sequencer.c:5382 sequencer.c:5399 +#: sequencer.c:5615 sequencer.c:5632 msgid "nothing to do" msgstr "yapılacak bir şey yok" -#: sequencer.c:5418 +#: sequencer.c:5651 msgid "could not skip unnecessary pick commands" msgstr "gerekli olmayan seçim komutları atlanamadı" -#: sequencer.c:5512 +#: sequencer.c:5751 msgid "the script was already rearranged." msgstr "betik halihazırda yeniden düzenlenmişti" @@ -8426,7 +8520,7 @@ msgstr "" "Dosya sistemi sınırında duruluyor (GIT_DISCOVERY_ACROSS_FILESYSTEM " "ayarlanmamış)." -#: setup.c:1362 +#: setup.c:1370 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -8435,56 +8529,69 @@ msgstr "" "core.sharedRepository dosya kipi değeri ile sorun (0%.3o).\n" "Dosyaların sahibinin her zaman okuma ve yazma izni olması gerekir." -#: setup.c:1409 +#: setup.c:1417 msgid "open /dev/null or dup failed" msgstr "/dev/null açılması veya açıklayıcı çoğaltılması başarısız" -#: setup.c:1424 +#: setup.c:1432 msgid "fork failed" msgstr "çatallama başarısız" -#: setup.c:1429 +#: setup.c:1437 t/helper/test-simple-ipc.c:285 msgid "setsid failed" msgstr "setsid başarısız" +#: sparse-index.c:151 +msgid "attempting to use sparse-index without cone mode" +msgstr "koni kipi olmadan sparse-index kullanılmaya çalışılıyor" + +#: sparse-index.c:156 +msgid "unable to update cache-tree, staying full" +msgstr "önbellek ağacı güncellenemiyor, dolu kalınıyor" + +#: sparse-index.c:239 +#, c-format +msgid "index entry is a directory, but not sparse (%08x)" +msgstr "indeks girdisi bir dizin; ancak aralıklı değil (%08x)" + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:848 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:850 +#: strbuf.c:852 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/sn" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:858 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:860 +#: strbuf.c:862 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/sn" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:867 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:869 +#: strbuf.c:871 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/sn" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:875 +#: strbuf.c:877 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -8492,20 +8599,20 @@ msgstr[0] "%u bayt" msgstr[1] "%u bayt" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:877 +#: strbuf.c:879 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u bayt/sn" msgstr[1] "%u bayt/sn" -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737 #: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" msgstr "'%s' yazma için açılamadı" -#: strbuf.c:1175 +#: strbuf.c:1177 #, c-format msgid "could not edit '%s'" msgstr "'%s' düzenlenemedi" @@ -8555,22 +8662,22 @@ msgstr "%s için .gitmodules girdisi kaldırılamadı" msgid "staging updated .gitmodules failed" msgstr "güncellenmiş .gitmodules'u hazırlama başarısız oldu" -#: submodule.c:327 +#: submodule.c:328 #, c-format msgid "in unpopulated submodule '%s'" msgstr "içi doldurulmamış '%s' altmodülünde" -#: submodule.c:358 +#: submodule.c:359 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Yol belirteci '%s' '%.*s' altmodülünde" -#: submodule.c:435 +#: submodule.c:436 #, c-format msgid "bad --ignore-submodules argument: %s" msgstr "hatalı --ignore-submodules argümanı: %s" -#: submodule.c:817 +#: submodule.c:818 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " @@ -8579,12 +8686,12 @@ msgstr "" "%s işlemesinde '%s' yolunda bulunan altmodül, aynı adlı bir altmodülle " "çarpışıyor. Atlanıyor." -#: submodule.c:920 +#: submodule.c:921 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "altmodül girdisi '%s' (%s) bir %s, işleme değil" -#: submodule.c:1005 +#: submodule.c:1006 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " @@ -8593,36 +8700,36 @@ msgstr "" "'%s' altmodülünde 'git rev-list <commits> --not --remotes -n 1' " "çalıştırılamadı" -#: submodule.c:1128 +#: submodule.c:1129 #, c-format msgid "process for submodule '%s' failed" msgstr "'%s' altmodülü için işlem başarısız oldu" -#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469 +#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470 msgid "Failed to resolve HEAD as a valid ref." msgstr "HEAD geçerli bir başvuru olarak çözülemedi." -#: submodule.c:1168 +#: submodule.c:1169 #, c-format msgid "Pushing submodule '%s'\n" msgstr "'%s' altmodülü itiliyor\n" -#: submodule.c:1171 +#: submodule.c:1172 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "'%s' altmodülü itilemiyor\n" -#: submodule.c:1463 +#: submodule.c:1464 #, c-format msgid "Fetching submodule %s%s\n" msgstr "%s%s altmodülü getiriliyor\n" -#: submodule.c:1497 +#: submodule.c:1498 #, c-format msgid "Could not access submodule '%s'\n" msgstr "'%s' altmodülüne erişilemedi\n" -#: submodule.c:1652 +#: submodule.c:1653 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8631,78 +8738,78 @@ msgstr "" "Altmodül getirilirken hata:\n" "%s" -#: submodule.c:1677 +#: submodule.c:1678 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' bir git deposu olarak tanımlanamadı" -#: submodule.c:1694 +#: submodule.c:1695 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "'%s' altmodülü içinde 'git status --porcelain=2' çalıştırılamadı" -#: submodule.c:1735 +#: submodule.c:1736 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "'%s' altmodülü içinde 'git status --porcelain=2' başarısız oldu" -#: submodule.c:1810 +#: submodule.c:1811 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "'%s' altmodülü içinde 'git status' başlatılamadı" -#: submodule.c:1823 +#: submodule.c:1824 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "'%s' altmodülü içinde 'git status' çalıştırılamadı" -#: submodule.c:1838 +#: submodule.c:1839 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "'%s' altmodülü içinde core.worktree ayarı kapatılamadı" -#: submodule.c:1865 submodule.c:2175 +#: submodule.c:1866 submodule.c:2176 #, c-format msgid "could not recurse into submodule '%s'" msgstr "'%s' altmodülüne özyinelenemedi" -#: submodule.c:1886 +#: submodule.c:1887 msgid "could not reset submodule index" msgstr "altmodül indeksi sıfırlanamadı" -#: submodule.c:1928 +#: submodule.c:1929 #, c-format msgid "submodule '%s' has dirty index" msgstr "'%s' altmodülü indeksi kirli" -#: submodule.c:1980 +#: submodule.c:1981 #, c-format msgid "Submodule '%s' could not be updated." msgstr "'%s' altmodülü güncellenemedi." -#: submodule.c:2048 +#: submodule.c:2049 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "altmodül git dizini '%s', '%.*s' git dizini içinde" -#: submodule.c:2069 +#: submodule.c:2070 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" "relocate_gitdir birden çok çalışma ağaçlı '%s' altmodülü için desteklenmiyor" -#: submodule.c:2081 submodule.c:2140 +#: submodule.c:2082 submodule.c:2141 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "'%s' altmodülü adı aranamadı" -#: submodule.c:2085 +#: submodule.c:2086 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "'%s' ögesini mevcut bir git dizinine taşıma reddediliyor" -#: submodule.c:2092 +#: submodule.c:2093 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8713,65 +8820,71 @@ msgstr "" "şuradan: '%s'\n" "şuraya: '%s'\n" -#: submodule.c:2220 +#: submodule.c:2221 msgid "could not start ls-files in .." msgstr "ls-files şurada başlatılamadı .." -#: submodule.c:2260 +#: submodule.c:2261 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree beklenmedik bir biçimde %d kodu ile çıktı" -#: trailer.c:236 +#: symlinks.c:244 +#, c-format +msgid "failed to lstat '%s'" +msgstr "'%s', lstat yapılamadı" + +#: trailer.c:244 #, c-format msgid "running trailer command '%s' failed" msgstr "'%s' artbilgi komutunu çalıştırma başarısız oldu" -#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 -#: trailer.c:555 +#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566 +#: trailer.c:570 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "bilinmeyen değer '%s' ('%s' anahtarı için)" -#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 +#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299 +#: builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "birden çok %s" -#: trailer.c:728 +#: trailer.c:743 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "'%.*s' artbilgisi içinde boş artbilgi jetonu" -#: trailer.c:748 +#: trailer.c:763 #, c-format msgid "could not read input file '%s'" msgstr "'%s' girdi dosyası okunamadı" -#: trailer.c:751 builtin/mktag.c:91 +#: trailer.c:766 builtin/mktag.c:88 msgid "could not read from stdin" msgstr "stdin'den okunamadı" -#: trailer.c:1009 wrapper.c:676 +#: trailer.c:1024 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "%s dosya bilgileri alınamadı" -#: trailer.c:1011 +#: trailer.c:1026 #, c-format msgid "file %s is not a regular file" msgstr "%s dosyası sıradan bir dosya değil" -#: trailer.c:1013 +#: trailer.c:1028 #, c-format msgid "file %s is not writable by user" msgstr "%s dosyası kullanıcı tarafından yazılabilir değil" -#: trailer.c:1025 +#: trailer.c:1040 msgid "could not open temporary file" msgstr "geçici dosya açılamadı" -#: trailer.c:1065 +#: trailer.c:1080 #, c-format msgid "could not rename temporary file to %s" msgstr "geçici dosya adı %s olarak değiştirilemedi" @@ -8820,7 +8933,7 @@ msgstr "fast-import çalıştırılamadı" msgid "error while running fast-import" msgstr "fast-import çalıştırılırken hata" -#: transport-helper.c:549 transport-helper.c:1237 +#: transport-helper.c:549 transport-helper.c:1247 #, c-format msgid "could not read ref %s" msgstr "%s başvurusu okunamadı" @@ -8838,7 +8951,7 @@ msgstr "uzak servis yolu ayarlama protokol tarafından desteklenmiyor" msgid "invalid remote service path" msgstr "geçersiz uzak konum servis yolu" -#: transport-helper.c:661 transport.c:1447 +#: transport-helper.c:661 transport.c:1471 msgid "operation not supported by protocol" msgstr "işlem protokol tarafından desteklenmiyor" @@ -8847,68 +8960,72 @@ msgstr "işlem protokol tarafından desteklenmiyor" msgid "can't connect to subservice %s" msgstr "%s altservisine bağlanılamıyor" -#: transport-helper.c:745 +#: transport-helper.c:693 transport.c:397 +msgid "--negotiate-only requires protocol v2" +msgstr "--negotiate-only protokolün ikinci sürümünü gerektiriyor" + +#: transport-helper.c:755 msgid "'option' without a matching 'ok/error' directive" msgstr "eşleşen bir 'tamam/hata' direktifi olmadan 'option'" -#: transport-helper.c:788 +#: transport-helper.c:798 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "tamam/hata bekleniyordu, yardımcı şunu söyledi: '%s'" -#: transport-helper.c:845 +#: transport-helper.c:855 #, c-format msgid "helper reported unexpected status of %s" msgstr "yardımcı %s beklenmedik durumu bildirdi" -#: transport-helper.c:928 +#: transport-helper.c:938 #, c-format msgid "helper %s does not support dry-run" msgstr "%s yardımcısı 'dry-run' desteklemiyor" -#: transport-helper.c:931 +#: transport-helper.c:941 #, c-format msgid "helper %s does not support --signed" msgstr "%s yardımcısı --signed desteklemiyor" -#: transport-helper.c:934 +#: transport-helper.c:944 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "%s yardımcısı --signed=if-asked desteklemiyor" -#: transport-helper.c:939 +#: transport-helper.c:949 #, c-format msgid "helper %s does not support --atomic" msgstr "%s yardımcısı --atomic desteklemiyor" -#: transport-helper.c:943 +#: transport-helper.c:953 #, c-format msgid "helper %s does not support --%s" msgstr "%s yardımcısı --%s desteklemiyor" -#: transport-helper.c:950 +#: transport-helper.c:960 #, c-format msgid "helper %s does not support 'push-option'" msgstr "%s yardımcısı 'push-option' desteklemiyor" -#: transport-helper.c:1050 +#: transport-helper.c:1060 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-helper itme desteklemiyor; başvuru belirteci gerekli" -#: transport-helper.c:1055 +#: transport-helper.c:1065 #, c-format msgid "helper %s does not support 'force'" msgstr "%s yardımcısı 'force' desteklemiyor" -#: transport-helper.c:1102 +#: transport-helper.c:1112 msgid "couldn't run fast-export" msgstr "fast-export çalıştırılamadı" -#: transport-helper.c:1107 +#: transport-helper.c:1117 msgid "error while running fast-export" msgstr "fast-export çalıştırılırken hata" -#: transport-helper.c:1132 +#: transport-helper.c:1142 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8917,52 +9034,52 @@ msgstr "" "Ortak başvuru yok ve hiç belirtilmemiş; bir şey yapılmayacak.\n" "Belki de bir dal belirtmelisiniz.\n" -#: transport-helper.c:1214 +#: transport-helper.c:1224 #, c-format msgid "unsupported object format '%s'" msgstr "desteklenmeyen nesne biçimi '%s'" -#: transport-helper.c:1223 +#: transport-helper.c:1233 #, c-format msgid "malformed response in ref list: %s" msgstr "başvuru listesinde hatalı oluşturulmuş yanıt: %s" -#: transport-helper.c:1375 +#: transport-helper.c:1385 #, c-format msgid "read(%s) failed" msgstr "read(%s) başarısız oldu" -#: transport-helper.c:1402 +#: transport-helper.c:1412 #, c-format msgid "write(%s) failed" msgstr "write(%s) başarısız oldu" -#: transport-helper.c:1451 +#: transport-helper.c:1461 #, c-format msgid "%s thread failed" msgstr "%s iş parçacığı başarısız oldu" -#: transport-helper.c:1455 +#: transport-helper.c:1465 #, c-format msgid "%s thread failed to join: %s" msgstr "%s iş parçacığı eklenemedi: %s" -#: transport-helper.c:1474 transport-helper.c:1478 +#: transport-helper.c:1484 transport-helper.c:1488 #, c-format msgid "can't start thread for copying data: %s" msgstr "veri kopyalama için iş parçacığı başlatılamıyor: %s" -#: transport-helper.c:1515 +#: transport-helper.c:1525 #, c-format msgid "%s process failed to wait" msgstr "%s işlemi bekleyemedi" -#: transport-helper.c:1519 +#: transport-helper.c:1529 #, c-format msgid "%s process failed" msgstr "%s işlemi başarısız oldu" -#: transport-helper.c:1537 transport-helper.c:1546 +#: transport-helper.c:1547 transport-helper.c:1556 msgid "can't start thread for copying data" msgstr "veri kopyalama için iş parçacığı başlatılamıyor" @@ -8981,37 +9098,41 @@ msgstr "'%s' demeti okunamadı" msgid "transport: invalid depth option '%s'" msgstr "transport: Geçersiz derinlik seçeneği '%s'" -#: transport.c:269 +#: transport.c:272 msgid "see protocol.version in 'git help config' for more details" msgstr "ayrıntılar için 'git help config' içinde protocol.version'a bakın" -#: transport.c:270 +#: transport.c:273 msgid "server options require protocol version 2 or later" msgstr "sunucu seçenekleri protokol sürüm 2 veya sonrasını gerektirir" -#: transport.c:727 +#: transport.c:400 +msgid "server does not support wait-for-done" +msgstr "Sunucu, wait-for-done desteklemiyor" + +#: transport.c:751 msgid "could not parse transport.color.* config" msgstr "transport.color.* yapılandırması ayrıştırılamadı" -#: transport.c:802 +#: transport.c:826 msgid "support for protocol v2 not implemented yet" msgstr "protokol v2 desteği henüz yerine getirilmedi" -#: transport.c:936 +#: transport.c:960 #, c-format msgid "unknown value for config '%s': %s" msgstr "'%s' yapılandırması için bilinmeyen değer: %s" -#: transport.c:1002 +#: transport.c:1026 #, c-format msgid "transport '%s' not allowed" msgstr "'%s' taşıyıcısına izin verilmiyor" -#: transport.c:1055 +#: transport.c:1079 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync artık desteklenmiyor" -#: transport.c:1157 +#: transport.c:1181 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -9020,7 +9141,7 @@ msgstr "" "Aşağıdaki altmodül yolları başka hiçbir uzak konumda bulunamayan\n" "değişiklikler içeriyor:\n" -#: transport.c:1161 +#: transport.c:1185 #, c-format msgid "" "\n" @@ -9047,11 +9168,11 @@ msgstr "" "kullanın.\n" "\n" -#: transport.c:1169 +#: transport.c:1193 msgid "Aborting." msgstr "İptal ediliyor" -#: transport.c:1316 +#: transport.c:1340 msgid "failed to push all needed submodules" msgstr "gereken tüm altmodüller itilemedi" @@ -9071,7 +9192,7 @@ msgstr "ağaç girdisinde boş dosya adı" msgid "too-short tree file" msgstr "ağaç dosyası çok kısa" -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -9080,7 +9201,7 @@ msgstr "" "Çıkış ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n" "%%sLütfen dal değiştirmeden önce değişikliklerinizi işleyin veya zulalayın." -#: unpack-trees.c:115 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -9089,7 +9210,7 @@ msgstr "" "Çıkış ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n" "%%s" -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9099,7 +9220,7 @@ msgstr "" "yazılacak:\n" "%%sLütfen birleştirmeden önce değişikliklerinizi işleyin veya zulalayın." -#: unpack-trees.c:120 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9109,7 +9230,7 @@ msgstr "" "yazılacak:\n" "%%s" -#: unpack-trees.c:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9118,7 +9239,7 @@ msgstr "" "%s ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n" "%%sLütfen %s yapmadan önce değişikliklerinizi işleyin veya zulalayın." -#: unpack-trees.c:125 +#: unpack-trees.c:127 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9127,7 +9248,7 @@ msgstr "" "%s ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n" "%%s" -#: unpack-trees.c:130 +#: unpack-trees.c:132 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -9136,7 +9257,7 @@ msgstr "" "Aşağıdaki dizinleri güncellemek içlerindeki izlenmeyen dosyaları kaybeder:\n" "%s" -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -9145,7 +9266,7 @@ msgstr "" "Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n" "%%sLütfen dal değiştirmeden önce onları taşıyın veya kaldırın." -#: unpack-trees.c:136 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -9154,7 +9275,7 @@ msgstr "" "Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n" "%%s" -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9163,7 +9284,7 @@ msgstr "" "Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n" "%%sLütfen birleştirmeden önce onları taşıyın veya kaldırın." -#: unpack-trees.c:141 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9172,7 +9293,7 @@ msgstr "" "Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n" "%%s" -#: unpack-trees.c:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9181,7 +9302,7 @@ msgstr "" "%s ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n" "%%sLütfen %s yapmadan önce onları taşıyın veya kaldırın." -#: unpack-trees.c:146 +#: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9190,7 +9311,7 @@ msgstr "" "%s ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n" "%%s" -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9201,7 +9322,7 @@ msgstr "" "yazılacak:\n" "%%sLütfen dal değiştirmeden önce onları taşıyın veya kaldırın." -#: unpack-trees.c:154 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9212,7 +9333,7 @@ msgstr "" "yazılacak:\n" "%%s" -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9222,7 +9343,7 @@ msgstr "" "yazılacak:\n" "%%sLütfen birleştirmeden önce onları taşıyın veya kaldırın." -#: unpack-trees.c:159 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9232,7 +9353,7 @@ msgstr "" "yazılacak:\n" "%%s" -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9241,7 +9362,7 @@ msgstr "" "%s ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine yazılacak:\n" "%%sLütfen %s yapmadan önce onları taşıyın veya kaldırın." -#: unpack-trees.c:164 +#: unpack-trees.c:166 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9250,12 +9371,12 @@ msgstr "" "%s ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine yazılacak:\n" "%%s" -#: unpack-trees.c:172 +#: unpack-trees.c:174 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "'%s' girdisi '%s' ile üst üste biniyor. Bağlanamıyor." -#: unpack-trees.c:175 +#: unpack-trees.c:177 #, c-format msgid "" "Cannot update submodule:\n" @@ -9264,7 +9385,7 @@ msgstr "" "Altmodül güncellenemiyor:\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:180 #, c-format msgid "" "The following paths are not up to date and were left despite sparse " @@ -9274,7 +9395,7 @@ msgstr "" "Aşağıdaki yollar güncel değil ve seyrek dizgilere rağmen terk edilmiş:\n" "%s" -#: unpack-trees.c:180 +#: unpack-trees.c:182 #, c-format msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" @@ -9283,7 +9404,7 @@ msgstr "" "Aşağıdaki yollar birleştirilmemiş ve seyrek dizgilere rağmen terk edilmiş:\n" "%s" -#: unpack-trees.c:182 +#: unpack-trees.c:184 #, c-format msgid "" "The following paths were already present and thus not updated despite sparse " @@ -9294,12 +9415,12 @@ msgstr "" "güncellenmedi:\n" "%s" -#: unpack-trees.c:262 +#: unpack-trees.c:264 #, c-format msgid "Aborting\n" msgstr "İptal ediliyor\n" -#: unpack-trees.c:289 +#: unpack-trees.c:291 #, c-format msgid "" "After fixing the above paths, you may want to run `git sparse-checkout " @@ -9308,11 +9429,11 @@ msgstr "" "Yukarıdaki yolları onardıktan sonra 'git sparse-checkout reapply' yapmak " "isteyebilirsiniz.\n" -#: unpack-trees.c:350 +#: unpack-trees.c:352 msgid "Updating files" msgstr "Dosyalar güncelleniyor" -#: unpack-trees.c:382 +#: unpack-trees.c:384 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -9322,11 +9443,16 @@ msgstr "" "olmayan dosya sisteminde BÜYÜK/küçük harf duyarlı yollar) ve aynı çarpışan\n" "gruptan yalnızca bir tanesi çalışma ağacında:\n" -#: unpack-trees.c:1498 +#: unpack-trees.c:1519 msgid "Updating index flags" msgstr "İndeks bayrakları güncelleniyor" -#: upload-pack.c:1543 +#: unpack-trees.c:2608 +#, c-format +msgid "worktree and untracked commit have duplicate entries: %s" +msgstr "çalışma ağacı ve izlenmeyen işlemenin yinelenmiş girdileri var: %s" + +#: upload-pack.c:1548 msgid "expected flush after fetch arguments" msgstr "getir argümanlarından sonra floş bekleniyordu" @@ -9363,7 +9489,7 @@ msgstr "geçersiz '..' yol kesimi" msgid "Fetching objects" msgstr "Nesneler getiriliyor" -#: worktree.c:238 builtin/am.c:2103 +#: worktree.c:238 builtin/am.c:2151 #, c-format msgid "failed to read '%s'" msgstr "'%s' okunamadı" @@ -9507,11 +9633,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (hazırlığı bitirmek için \"git rm <dosya>...\" kullanın)" -#: wt-status.c:211 wt-status.c:1072 +#: wt-status.c:211 wt-status.c:1075 msgid "Changes to be committed:" msgstr "İşlenecek değişiklikler:" -#: wt-status.c:234 wt-status.c:1081 +#: wt-status.c:234 wt-status.c:1084 msgid "Changes not staged for commit:" msgstr "İşleme için hazırlanmamış değişiklikler:" @@ -9611,22 +9737,22 @@ msgstr "değiştirilen içerik, " msgid "untracked content, " msgstr "izlenmeyen içerik, " -#: wt-status.c:905 +#: wt-status.c:908 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Zulanızda şu anda %d girdi var" msgstr[1] "Zulanızda şu anda %d girdi var" -#: wt-status.c:936 +#: wt-status.c:939 msgid "Submodules changed but not updated:" msgstr "Değiştirilen; ancak güncellenmeyen altmodüller:" -#: wt-status.c:938 +#: wt-status.c:941 msgid "Submodule changes to be committed:" msgstr "İşlenecek altmodül değişiklikleri:" -#: wt-status.c:1020 +#: wt-status.c:1023 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9634,7 +9760,7 @@ msgstr "" "Yukarıdaki satırı değiştirmeyin veya kaldırmayın.\n" "Altındaki her şey yok sayılacaktır." -#: wt-status.c:1112 +#: wt-status.c:1115 #, c-format msgid "" "\n" @@ -9645,107 +9771,107 @@ msgstr "" "Dal önünde/arkasında değerlerini hesaplama %.2f saniye sürdü.\n" "Bundan kaçınmak için --no-ahead-behind kullanabilirsiniz.\n" -#: wt-status.c:1142 +#: wt-status.c:1145 msgid "You have unmerged paths." msgstr "Birleştirilmemiş yollarınız var." -#: wt-status.c:1145 +#: wt-status.c:1148 msgid " (fix conflicts and run \"git commit\")" msgstr " (çakışmaları onar ve \"git commit\" çalıştır)" -#: wt-status.c:1147 +#: wt-status.c:1150 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (birleştirmeyi iptal etmek için \"git merge --abort\" kullanın)" -#: wt-status.c:1151 +#: wt-status.c:1154 msgid "All conflicts fixed but you are still merging." msgstr "Tüm çakışmalar onarıldı; ancak siz hâlâ birleştiriyorsunuz." -#: wt-status.c:1154 +#: wt-status.c:1157 msgid " (use \"git commit\" to conclude merge)" msgstr " (birleştirmeyi sonuçlandırmak için \"git commit\" kullanın)" -#: wt-status.c:1163 +#: wt-status.c:1166 msgid "You are in the middle of an am session." msgstr "Bir 'am' oturumunun tam ortasındasınız." -#: wt-status.c:1166 +#: wt-status.c:1169 msgid "The current patch is empty." msgstr "Mevcut yama boş." -#: wt-status.c:1170 +#: wt-status.c:1173 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (çakışmaları onar ve ardından \"git am --continue\" çalıştır)" -#: wt-status.c:1172 +#: wt-status.c:1175 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (bu yamayı atlamak için \"git am --skip\" kullanın" -#: wt-status.c:1174 +#: wt-status.c:1177 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (ilk dalı eski durumuna getirmek için \"git am --abort\" kullanın)" -#: wt-status.c:1307 +#: wt-status.c:1310 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo eksik" -#: wt-status.c:1309 +#: wt-status.c:1312 msgid "No commands done." msgstr "Yerine getirilen bir komut yok." -#: wt-status.c:1312 +#: wt-status.c:1315 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Son yerine getirilen komut (toplamda %d komut):" msgstr[1] "Son yerine getirilen komutlar (toplamda %d komut):" -#: wt-status.c:1323 +#: wt-status.c:1326 #, c-format msgid " (see more in file %s)" msgstr " (ek bilgi için %s dosyasına bakın)" -#: wt-status.c:1328 +#: wt-status.c:1331 msgid "No commands remaining." msgstr "Kalan komut yok." -#: wt-status.c:1331 +#: wt-status.c:1334 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Sıradaki yerine getirilecek komut (%d kalan komut):" msgstr[1] "Sıradaki yerine getirilecek komutlar (%d kalan komut):" -#: wt-status.c:1339 +#: wt-status.c:1342 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (görüntüleme ve düzenleme için \"git rebase --edit-todo\" kullanın)" -#: wt-status.c:1351 +#: wt-status.c:1354 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Şu anda '%s' dalını '%s' üzerine yeniden temellendiriyorsunuz." -#: wt-status.c:1356 +#: wt-status.c:1359 msgid "You are currently rebasing." msgstr "Şu anda yeniden temellendirme yapmaktasınız." -#: wt-status.c:1369 +#: wt-status.c:1372 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (çakışmaları çözün ve ardından \"git rebase --continue\" çalıştır)" -#: wt-status.c:1371 +#: wt-status.c:1374 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (bu yamayı atlamak için \"git rebase --skip\" kullanın)" -#: wt-status.c:1373 +#: wt-status.c:1376 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (ilk dalı çıkış yapmak için \"git rebase --abort\" kullanın)" -#: wt-status.c:1380 +#: wt-status.c:1383 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tüm çakışmalar onarıldı: \"git rebase --continue\" çalıştır)" -#: wt-status.c:1384 +#: wt-status.c:1387 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -9753,154 +9879,154 @@ msgstr "" "Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi " "parçalara bölüyorsunuz." -#: wt-status.c:1389 +#: wt-status.c:1392 msgid "You are currently splitting a commit during a rebase." msgstr "" "Şu anda yeniden temellendirme sırasında bir işlemeyi parçalara bölüyorsunuz." -#: wt-status.c:1392 +#: wt-status.c:1395 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Çalışma dizininiz temizlendiğinde \"git rebase --continue\" çalıştır)" -#: wt-status.c:1396 +#: wt-status.c:1399 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi " "düzenliyorsunuz." -#: wt-status.c:1401 +#: wt-status.c:1404 msgid "You are currently editing a commit during a rebase." msgstr "Şu anda yeniden temellendirme sırasında bir işlemeyi düzenliyorsunuz." -#: wt-status.c:1404 +#: wt-status.c:1407 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (geçerli işlemeyi değiştirmek için \"git commit --amend\" kullanın)" -#: wt-status.c:1406 +#: wt-status.c:1409 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (değişikliklerinizden memnunsanız \"git rebase --continue\" kullanın)" -#: wt-status.c:1417 +#: wt-status.c:1420 msgid "Cherry-pick currently in progress." msgstr "Seç-al şu anda sürmekte." -#: wt-status.c:1420 +#: wt-status.c:1423 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Şu anda %s işlemesini seç-al yapıyorsunuz." -#: wt-status.c:1427 +#: wt-status.c:1430 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (çakışmaları onar ve \"git cherry-pick --continue\" çalıştır)" -#: wt-status.c:1430 +#: wt-status.c:1433 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (sürdürmek için \"git cherry-pick --continue\" çalıştır)" -#: wt-status.c:1433 +#: wt-status.c:1436 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (tüm çakışmalar onarıldı: \"git cherry-pick --continue\" çalıştır)" -#: wt-status.c:1435 +#: wt-status.c:1438 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (bu yamayı atlamak için \"git cherry-pick --skip\" kullanın)" -#: wt-status.c:1437 +#: wt-status.c:1440 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (seç-al işlemini iptal için \"git cherry-pick --abort\" kullanın)" -#: wt-status.c:1447 +#: wt-status.c:1450 msgid "Revert currently in progress." msgstr "Geriye al şu anda sürmekte." -#: wt-status.c:1450 +#: wt-status.c:1453 #, c-format msgid "You are currently reverting commit %s." msgstr "Şu anda %s işlemesini geri alıyorsunuz." -#: wt-status.c:1456 +#: wt-status.c:1459 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (çakışmaları onar ve \"git revert --continue\" çalıştır)" -#: wt-status.c:1459 +#: wt-status.c:1462 msgid " (run \"git revert --continue\" to continue)" msgstr " (sürdürmek için \"git revert --continue\" çalıştır)" -#: wt-status.c:1462 +#: wt-status.c:1465 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tüm çakışmalar onarıldı: \"git revert --continue\" çalıştır)" -#: wt-status.c:1464 +#: wt-status.c:1467 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (bu yamayı atlamak için \"git revert --skip\" kullanın)" -#: wt-status.c:1466 +#: wt-status.c:1469 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (geri al işlemini iptal için \"git revert --abort\" kullanın)" -#: wt-status.c:1476 +#: wt-status.c:1479 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Şu anda ikili arama yapıyorsunuz, '%s' dalından başlandı." -#: wt-status.c:1480 +#: wt-status.c:1483 msgid "You are currently bisecting." msgstr "Şu anda ikili arama yapıyorsunuz" -#: wt-status.c:1483 +#: wt-status.c:1486 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (ilk dala dönmek için \"git bisect reset\" kullanın)" -#: wt-status.c:1494 +#: wt-status.c:1497 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "İzlenen dosyaların %%%d mevcut olduğu aralıklı bir çıkıştasınız." -#: wt-status.c:1733 +#: wt-status.c:1736 msgid "On branch " msgstr "Üzerinde bulunulan dal: " -#: wt-status.c:1740 +#: wt-status.c:1743 msgid "interactive rebase in progress; onto " msgstr "şunun üzerine etkileşimli yeniden temellendirme sürmekte: " -#: wt-status.c:1742 +#: wt-status.c:1745 msgid "rebase in progress; onto " msgstr "şunun üzerine yeniden temellendirme sürmekte: " -#: wt-status.c:1747 +#: wt-status.c:1750 msgid "HEAD detached at " msgstr "HEAD şurada ayrıldı: " -#: wt-status.c:1749 +#: wt-status.c:1752 msgid "HEAD detached from " msgstr "HEAD şundan ayrıldı: " -#: wt-status.c:1752 +#: wt-status.c:1755 msgid "Not currently on any branch." msgstr "Şu anda bir dal üzerinde değil." -#: wt-status.c:1769 +#: wt-status.c:1772 msgid "Initial commit" msgstr "İlk işleme" -#: wt-status.c:1770 +#: wt-status.c:1773 msgid "No commits yet" msgstr "Henüz bir işleme yok" -#: wt-status.c:1784 +#: wt-status.c:1787 msgid "Untracked files" msgstr "İzlenmeyen dosyalar" -#: wt-status.c:1786 +#: wt-status.c:1789 msgid "Ignored files" msgstr "Yok sayılan dosyalar" -#: wt-status.c:1790 +#: wt-status.c:1793 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9911,32 +10037,32 @@ msgstr "" "bunu hızlandırabilir; ancak yeni dosyaları eklemeyi unutmamanız\n" "konusunda dikkatli olmalısınız (ek bilgi için 'git help status')." -#: wt-status.c:1796 +#: wt-status.c:1799 #, c-format msgid "Untracked files not listed%s" msgstr "İzlenmeyen dosyalar listelenmiyor%s" -#: wt-status.c:1798 +#: wt-status.c:1801 msgid " (use -u option to show untracked files)" msgstr " (izlenmeyen dosyaları göstermek için -u seçeneğini kullanın)" -#: wt-status.c:1804 +#: wt-status.c:1807 msgid "No changes" msgstr "Değişiklik yok" -#: wt-status.c:1809 +#: wt-status.c:1812 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "İşlemeye eklenen değişiklik yok (\"git add\" ve/veya \"git commit -a\" " "kullanın)\n" -#: wt-status.c:1813 +#: wt-status.c:1816 #, c-format msgid "no changes added to commit\n" msgstr "İşlemeye eklenen değişiklik yok\n" -#: wt-status.c:1817 +#: wt-status.c:1820 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9945,70 +10071,88 @@ msgstr "" "işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var (izlemek için\n" "\"git add\" kullanın)\n" -#: wt-status.c:1821 +#: wt-status.c:1824 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var\n" -#: wt-status.c:1825 +#: wt-status.c:1828 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "İşlenecek bir şey yok (dosyalar oluşturun/kopyalayın ve izlemek için \"git " "add\" kullanın)\n" -#: wt-status.c:1829 wt-status.c:1835 +#: wt-status.c:1832 wt-status.c:1838 #, c-format msgid "nothing to commit\n" msgstr "İşlenecek bir şey yok\n" -#: wt-status.c:1832 +#: wt-status.c:1835 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "İşlenecek bir şey yok (izlenmeyen dosyaları göstermek için -u kullanın)\n" -#: wt-status.c:1837 +#: wt-status.c:1840 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "İşlenecek bir şey yok, çalışma ağacı temiz\n" -#: wt-status.c:1942 +#: wt-status.c:1945 msgid "No commits yet on " msgstr "Şurada henüz bir işleme yok: " -#: wt-status.c:1946 +#: wt-status.c:1949 msgid "HEAD (no branch)" msgstr "HEAD (dal yok)" -#: wt-status.c:1977 +#: wt-status.c:1980 msgid "different" msgstr "değişik" -#: wt-status.c:1979 wt-status.c:1987 +#: wt-status.c:1982 wt-status.c:1990 msgid "behind " msgstr "şunun arkasında: " -#: wt-status.c:1982 wt-status.c:1985 +#: wt-status.c:1985 wt-status.c:1988 msgid "ahead " msgstr "şunun önünde: " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2507 +#: wt-status.c:2511 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "%s yapılamıyor: Hazırlanmamış değişiklikleriniz var." -#: wt-status.c:2513 +#: wt-status.c:2517 msgid "additionally, your index contains uncommitted changes." msgstr "Ek olarak, indeksiniz işlenmemiş değişiklikler içeriyor." -#: wt-status.c:2515 +#: wt-status.c:2519 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s yapılamıyor: İndeksiniz işlenmemiş değişiklikler içeriyor." -#: compat/precompose_utf8.c:58 builtin/clone.c:457 +#: compat/simple-ipc/ipc-unix-socket.c:178 +msgid "could not send IPC command" +msgstr "IPC komutu gönderilemedi" + +#: compat/simple-ipc/ipc-unix-socket.c:185 +msgid "could not read IPC response" +msgstr "IPC yanıtı okunamadı" + +#: compat/simple-ipc/ipc-unix-socket.c:862 +#, c-format +msgid "could not start accept_thread '%s'" +msgstr "accept_thread '%s' başlatılamadı" + +#: compat/simple-ipc/ipc-unix-socket.c:874 +#, c-format +msgid "could not start worker[0] for '%s'" +msgstr "'%s' için worker[0] başlatılamadı" + +#: compat/precompose_utf8.c:58 builtin/clone.c:461 #, c-format msgid "failed to unlink '%s'" msgstr "'%s' bağlantısı kesilemedi" @@ -10017,135 +10161,135 @@ msgstr "'%s' bağlantısı kesilemedi" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<seçenekler>] [--] <yol-blrtç>..." -#: builtin/add.c:58 +#: builtin/add.c:61 #, c-format msgid "cannot chmod %cx '%s'" msgstr "%cx '%s' chmod yapılamıyor" -#: builtin/add.c:96 +#: builtin/add.c:99 #, c-format msgid "unexpected diff status %c" msgstr "beklenmedik diff durumu %c" -#: builtin/add.c:101 builtin/commit.c:285 +#: builtin/add.c:104 builtin/commit.c:297 msgid "updating files failed" msgstr "dosyaları güncelleme başarısız" -#: builtin/add.c:111 +#: builtin/add.c:114 #, c-format msgid "remove '%s'\n" msgstr "kaldır: '%s'\n" -#: builtin/add.c:186 +#: builtin/add.c:198 msgid "Unstaged changes after refreshing the index:" msgstr "İndeksi yeniledikten sonra hazırlanmamış değişiklikler:" -#: builtin/add.c:280 builtin/rev-parse.c:991 +#: builtin/add.c:307 builtin/rev-parse.c:991 msgid "Could not read the index" msgstr "İndeks okunamadı" -#: builtin/add.c:291 +#: builtin/add.c:318 #, c-format msgid "Could not open '%s' for writing." msgstr "'%s' yazım için açılamadı." -#: builtin/add.c:295 +#: builtin/add.c:322 msgid "Could not write patch" msgstr "Yama yazılamadı" -#: builtin/add.c:298 +#: builtin/add.c:325 msgid "editing patch failed" msgstr "yamayı düzenleme başarısız" -#: builtin/add.c:301 +#: builtin/add.c:328 #, c-format msgid "Could not stat '%s'" msgstr "'%s' dosya bilgileri alınamadı" -#: builtin/add.c:303 +#: builtin/add.c:330 msgid "Empty patch. Aborted." msgstr "Boş yama. İptal edildi." -#: builtin/add.c:308 +#: builtin/add.c:335 #, c-format msgid "Could not apply '%s'" msgstr "'%s' uygulanamadı" -#: builtin/add.c:316 +#: builtin/add.c:343 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Aşağıdaki yollar sizin .gitignore dosyalarınızın biri tarafından yok " "sayılıyor:\n" -#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124 +#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124 #: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 -#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 +#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 msgid "dry run" msgstr "sınama turu" -#: builtin/add.c:339 +#: builtin/add.c:366 msgid "interactive picking" msgstr "etkileşimli seçim" -#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 msgid "select hunks interactively" msgstr "parçaları etkileşimli olarak seç" -#: builtin/add.c:341 +#: builtin/add.c:368 msgid "edit current diff and apply" msgstr "geçerli diff'i düzenle ve uygula" -#: builtin/add.c:342 +#: builtin/add.c:369 msgid "allow adding otherwise ignored files" msgstr "başka türlü yok sayılan dosyaların eklenmesine izin ver" -#: builtin/add.c:343 +#: builtin/add.c:370 msgid "update tracked files" msgstr "izlenen dosyaları güncelle" -#: builtin/add.c:344 +#: builtin/add.c:371 msgid "renormalize EOL of tracked files (implies -u)" msgstr "izlenen dosyaların satır sonlarını yeniden olağanlaştır (-u ima eder)" -#: builtin/add.c:345 +#: builtin/add.c:372 msgid "record only the fact that the path will be added later" msgstr "yalnızca yolun sonra ekleneceği gerçeğinin kaydını yaz" -#: builtin/add.c:346 +#: builtin/add.c:373 msgid "add changes from all tracked and untracked files" msgstr "tüm izlenen/izlenmeyen dosyalardan değişiklikleri ekle" -#: builtin/add.c:349 +#: builtin/add.c:376 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "çalışma ağacında kaldırılan yolları yok say (--no-all ile aynı)" -#: builtin/add.c:351 +#: builtin/add.c:378 msgid "don't add, only refresh the index" msgstr "ekleme, yalnızca indeksi yenile" -#: builtin/add.c:352 +#: builtin/add.c:379 msgid "just skip files which cannot be added because of errors" msgstr "yalnızca hatalardan dolayı eklenemeyen dosyaları atla" -#: builtin/add.c:353 +#: builtin/add.c:380 msgid "check if - even missing - files are ignored in dry run" msgstr "" "dosyaların -eksik olsalar bile- sınama turunda yok sayılıp sayılmadığını " "denetle" -#: builtin/add.c:355 builtin/update-index.c:1004 +#: builtin/add.c:382 builtin/update-index.c:1006 msgid "override the executable bit of the listed files" msgstr "listelenen dosyaların çalıştırılabilir kısımlarını geçersiz kıl" -#: builtin/add.c:357 +#: builtin/add.c:384 msgid "warn when adding an embedded repository" msgstr "gömülü bir depo eklenirken uyar" -#: builtin/add.c:359 +#: builtin/add.c:386 msgid "backend for `git stash -p`" msgstr "'git stash -p' için arka uç" -#: builtin/add.c:377 +#: builtin/add.c:404 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -10176,12 +10320,12 @@ msgstr "" "\n" "Ek bilgi için: \"git help submodule\"." -#: builtin/add.c:405 +#: builtin/add.c:432 #, c-format msgid "adding embedded git repository: %s" msgstr "gömülü git deposu ekleniyor: %s" -#: builtin/add.c:424 +#: builtin/add.c:451 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -10191,49 +10335,53 @@ msgstr "" "Bu iletiyi 'git config advice.addIgnoredFile false'\n" "kullanarak kapatabilirsiniz." -#: builtin/add.c:433 +#: builtin/add.c:460 msgid "adding files failed" msgstr "dosya ekleme başarısız" -#: builtin/add.c:461 builtin/commit.c:345 +#: builtin/add.c:488 +msgid "--dry-run is incompatible with --interactive/--patch" +msgstr "--dry-run, --interactive/--patch ile uyumsuz" + +#: builtin/add.c:490 builtin/commit.c:357 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file, --interactive/--patch ile uyumsuz" -#: builtin/add.c:478 +#: builtin/add.c:507 msgid "--pathspec-from-file is incompatible with --edit" msgstr "--pathspec-from-file, --edit ile uyumsuz" -#: builtin/add.c:490 +#: builtin/add.c:519 msgid "-A and -u are mutually incompatible" msgstr "-A ve -u karşılıklı olarak uyumlu" -#: builtin/add.c:493 +#: builtin/add.c:522 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" "--ignore-missing seçeneği yalnızca --dry-run seçeneği ile birlikte " "kullanılabilir" -#: builtin/add.c:497 +#: builtin/add.c:526 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod param '%s' ya -x ya da +x olmalıdır" -#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569 +#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 +#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file yol belirteci argümanları ile uyumsuz" -#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575 +#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 +#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul, --pathspec-from-file gerektiriyor" -#: builtin/add.c:526 +#: builtin/add.c:555 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Hiçbir şey belirtilmedi, hiçbir şey eklenmedi.\n" -#: builtin/add.c:528 +#: builtin/add.c:557 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -10243,111 +10391,111 @@ msgstr "" "Bu iletiyi 'git config advice.addEmptyPathspec false'\n" "yaparak kapatabilirsiniz." -#: builtin/am.c:352 +#: builtin/am.c:364 msgid "could not parse author script" msgstr "yazar betiği ayrıştırılamadı" -#: builtin/am.c:436 +#: builtin/am.c:454 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' applypatch-msg kancası tarafından silindi" -#: builtin/am.c:478 +#: builtin/am.c:496 #, c-format msgid "Malformed input line: '%s'." msgstr "Hatalı oluşturulmuş girdi satırı: '%s'." -#: builtin/am.c:516 +#: builtin/am.c:534 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Notların '%s' konumundan '%s' konumuna kopyalanması başarısız" -#: builtin/am.c:542 +#: builtin/am.c:560 msgid "fseek failed" msgstr "fseek başarısız oldu" -#: builtin/am.c:730 +#: builtin/am.c:748 #, c-format msgid "could not parse patch '%s'" msgstr "'%s' yaması ayrıştırılamadı" -#: builtin/am.c:795 +#: builtin/am.c:813 msgid "Only one StGIT patch series can be applied at once" msgstr "Bir kerede yalnızca bir StGIT yama serisi uygulanabilir" -#: builtin/am.c:843 +#: builtin/am.c:861 msgid "invalid timestamp" msgstr "geçersiz zaman damgası" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:866 builtin/am.c:878 msgid "invalid Date line" msgstr "geçersiz tarih satırı" -#: builtin/am.c:855 +#: builtin/am.c:873 msgid "invalid timezone offset" msgstr "geçersiz zaman dilimi ofseti" -#: builtin/am.c:948 +#: builtin/am.c:966 msgid "Patch format detection failed." msgstr "Yama biçimi algılaması başarısız." -#: builtin/am.c:953 builtin/clone.c:410 +#: builtin/am.c:971 builtin/clone.c:414 #, c-format msgid "failed to create directory '%s'" msgstr "'%s' dizini oluşturulamadı" -#: builtin/am.c:958 +#: builtin/am.c:976 msgid "Failed to split patches." msgstr "Yamalar parçalanıp bölünemedi." -#: builtin/am.c:1089 +#: builtin/am.c:1125 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Bu sorunu çözdüğünüzde \"%s --continue\" çalıştırın." -#: builtin/am.c:1090 +#: builtin/am.c:1126 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Eğer bu yamayı atlamayı yeğliyorsanız \"%s --skip\" çalıştırın." -#: builtin/am.c:1091 +#: builtin/am.c:1127 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "İlk dalı eski durumuna getirip yamalamayı durdurmak için \"%s --abort\" " "çalıştır." -#: builtin/am.c:1174 +#: builtin/am.c:1222 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Yama format=flowed ile gönderildi; satır sonlarındaki boşluk kaybolmuş " "olabilir." -#: builtin/am.c:1202 +#: builtin/am.c:1250 msgid "Patch is empty." msgstr "Yama boş." -#: builtin/am.c:1267 +#: builtin/am.c:1315 #, c-format msgid "missing author line in commit %s" msgstr "%s işlemesinde yazar satırı eksik" -#: builtin/am.c:1270 +#: builtin/am.c:1318 #, c-format msgid "invalid ident line: %.*s" msgstr "geçersiz tanımlama satırı: %.*s" -#: builtin/am.c:1489 +#: builtin/am.c:1537 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Depo 3 yönlü birleştirmeye geri çekilebilme için gereken ikili nesnelere iye " "değil." -#: builtin/am.c:1491 +#: builtin/am.c:1539 msgid "Using index info to reconstruct a base tree..." msgstr "Bir temel ağacını yeniden yapmak için indeks bilgisi kullanılıyor..." -#: builtin/am.c:1510 +#: builtin/am.c:1558 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10355,24 +10503,24 @@ msgstr "" "Yamanızı elle mi düzenlediniz?\n" "Kendi indeksinde kaydı yazılan ikili nesnelere uygulanamıyor." -#: builtin/am.c:1516 +#: builtin/am.c:1564 msgid "Falling back to patching base and 3-way merge..." msgstr "Temeli yamalamaya ve 3 yönlü birleştirmeye geri çekiliniyor..." -#: builtin/am.c:1542 +#: builtin/am.c:1590 msgid "Failed to merge in the changes." msgstr "Değişiklikler birleştirilemedi." -#: builtin/am.c:1574 +#: builtin/am.c:1622 msgid "applying to an empty history" msgstr "boş bir geçmişe uygulanıyor" -#: builtin/am.c:1626 builtin/am.c:1630 +#: builtin/am.c:1674 builtin/am.c:1678 #, c-format msgid "cannot resume: %s does not exist." msgstr "sürdürülemiyor: %s yok" -#: builtin/am.c:1648 +#: builtin/am.c:1696 msgid "Commit Body is:" msgstr "İşleme gövdesi:" @@ -10380,41 +10528,41 @@ msgstr "İşleme gövdesi:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1658 +#: builtin/am.c:1706 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Uygula? [y]evet/[n]hayır/düz[e]nle/[v]yamayı görüntüle/tümünü k[a]bul et: " -#: builtin/am.c:1704 builtin/commit.c:395 +#: builtin/am.c:1752 builtin/commit.c:408 msgid "unable to write index file" msgstr "indeks dosyası yazılamıyor" -#: builtin/am.c:1708 +#: builtin/am.c:1756 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Kirli indeks: Yamalar uygulanamıyor (kirli: %s)" -#: builtin/am.c:1748 builtin/am.c:1816 +#: builtin/am.c:1796 builtin/am.c:1864 #, c-format msgid "Applying: %.*s" msgstr "Uygulanıyor: %.*s" -#: builtin/am.c:1765 +#: builtin/am.c:1813 msgid "No changes -- Patch already applied." msgstr "Değişiklik yok -- Yama halihazırda uygulandı." -#: builtin/am.c:1771 +#: builtin/am.c:1819 #, c-format msgid "Patch failed at %s %.*s" msgstr "Yama şurada başarısız oldu: %s %.*s" -#: builtin/am.c:1775 +#: builtin/am.c:1823 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" "Başarısız olan yamayı görmek için 'git am --show-current-patch=diff' kullanın" -#: builtin/am.c:1819 +#: builtin/am.c:1867 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10424,7 +10572,7 @@ msgstr "" "Hazırlanacak başka bir şey kalmadıysa büyük olasılıkla başka bir şey\n" "aynı değişiklikleri uygulamış olabilir; bu yamayı atlamak isteyebilirsiniz." -#: builtin/am.c:1826 +#: builtin/am.c:1874 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10437,17 +10585,17 @@ msgstr "" "Bir dosyanın \"onlar sildi\" olduğunu kabul etmek için dosya ile 'git rm' " "yapabilirsiniz." -#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 +#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "'%s' nesnesi ayrıştırılamadı." -#: builtin/am.c:1985 +#: builtin/am.c:2033 msgid "failed to clean index" msgstr "indeks temizlenemedi" -#: builtin/am.c:2029 +#: builtin/am.c:2077 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10455,156 +10603,160 @@ msgstr "" "Son 'am' başarısızlığından bu yana HEAD'i hareket ettirmiş görünüyorsunuz.\n" "ORIG_HEAD'e geri sarılmıyor." -#: builtin/am.c:2136 +#: builtin/am.c:2184 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Geçersiz --patch-format değeri: %s" -#: builtin/am.c:2178 +#: builtin/am.c:2226 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "--show-current-patch için geçersiz değer: %s" -#: builtin/am.c:2182 +#: builtin/am.c:2230 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s, --show-current-patch=%s ile uyumsuz" -#: builtin/am.c:2213 +#: builtin/am.c:2261 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<seçenekler>] [(<mbox> | <posta-dizin>)...]" -#: builtin/am.c:2214 +#: builtin/am.c:2262 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<seçenekler>] (--continue | --skip | --abort)" -#: builtin/am.c:2220 +#: builtin/am.c:2268 msgid "run interactively" msgstr "etkileşimli olarak çalıştır" -#: builtin/am.c:2222 +#: builtin/am.c:2270 msgid "historical option -- no-op" msgstr "tarihi seçenek -- no-op" -#: builtin/am.c:2224 +#: builtin/am.c:2272 msgid "allow fall back on 3way merging if needed" msgstr "gerekirse 3 yönlü birleştirmeye geri çekilmeye izin ver" -#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 -#: builtin/repack.c:334 builtin/stash.c:882 +#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16 +#: builtin/repack.c:472 builtin/stash.c:948 msgid "be quiet" msgstr "sessiz ol" -#: builtin/am.c:2227 +#: builtin/am.c:2275 msgid "add a Signed-off-by trailer to the commit message" msgstr "işleme iletisine bir Signed-off-by satırı ekle" -#: builtin/am.c:2230 +#: builtin/am.c:2278 msgid "recode into utf8 (default)" msgstr "utf8 olarak yeniden kodla (öntanımlı)" -#: builtin/am.c:2232 +#: builtin/am.c:2280 msgid "pass -k flag to git-mailinfo" msgstr "'git-mailinfo'ya -k bayrağını geçir" -#: builtin/am.c:2234 +#: builtin/am.c:2282 msgid "pass -b flag to git-mailinfo" msgstr "'git-mailinfo'ya -b bayrağını geçir" -#: builtin/am.c:2236 +#: builtin/am.c:2284 msgid "pass -m flag to git-mailinfo" msgstr "'git-mailinfo'ya -m bayrağını geçir" -#: builtin/am.c:2238 +#: builtin/am.c:2286 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "'git-mailsplit'e mbox biçimi için --keep-cr bayrağını geçir" -#: builtin/am.c:2241 +#: builtin/am.c:2289 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "'git-mailsplit'e 'am.keepcr'dan bağımsız olarak --keep-cr bayrağını geçirme" -#: builtin/am.c:2244 +#: builtin/am.c:2292 msgid "strip everything before a scissors line" msgstr "bir kesim çizgisinden önceki her şeyi çıkar" -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2273 +#: builtin/am.c:2294 +msgid "pass it through git-mailinfo" +msgstr "git-mailinfo içerisinden geçir" + +#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 +#: builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 +#: builtin/am.c:2324 msgid "pass it through git-apply" msgstr "git-apply aracılığıyla geçir" -#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261 +#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349 -#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172 -#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175 -#: parse-options.h:316 +#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 +#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176 +#: parse-options.h:317 msgid "n" msgstr "n" -#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136 -#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470 +#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137 +#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 #: builtin/verify-tag.c:38 msgid "format" msgstr "biçim" -#: builtin/am.c:2270 +#: builtin/am.c:2321 msgid "format the patch(es) are in" msgstr "yama biçimi" -#: builtin/am.c:2276 +#: builtin/am.c:2327 msgid "override error message when patch failure occurs" msgstr "yama başarısız olduğunda hata iletisini geçersiz kıl" -#: builtin/am.c:2278 +#: builtin/am.c:2329 msgid "continue applying patches after resolving a conflict" msgstr "bir çakışmayı çözdükten sonra yamaları uygulamayı sürdür" -#: builtin/am.c:2281 +#: builtin/am.c:2332 msgid "synonyms for --continue" msgstr "--continue eşanlamlıları" -#: builtin/am.c:2284 +#: builtin/am.c:2335 msgid "skip the current patch" msgstr "geçerli yamayı atla" -#: builtin/am.c:2287 +#: builtin/am.c:2338 msgid "restore the original branch and abort the patching operation" msgstr "orijinal dalı eski durumuna getir ve yamalama işlemini iptal et" -#: builtin/am.c:2290 +#: builtin/am.c:2341 msgid "abort the patching operation but keep HEAD where it is" msgstr "yamalama işlemini iptal et; ancak HEAD'i olduğu yerde bırak" -#: builtin/am.c:2294 +#: builtin/am.c:2345 msgid "show the patch being applied" msgstr "uygulanmakta olan yamayı göster" -#: builtin/am.c:2299 +#: builtin/am.c:2350 msgid "lie about committer date" msgstr "işleyici tarihi hakkında yalan söyle" -#: builtin/am.c:2301 +#: builtin/am.c:2352 msgid "use current timestamp for author date" msgstr "yazar tarihi için geçerli zaman damgasını kullan" -#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 -#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538 -#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451 +#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630 +#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 +#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401 +#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396 msgid "GPG-sign commits" msgstr "GPG imzalı işlemeler" -#: builtin/am.c:2307 +#: builtin/am.c:2358 msgid "(internal use for git-rebase)" msgstr "(git-rebase için iç kullanım)" -#: builtin/am.c:2325 +#: builtin/am.c:2376 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -10612,17 +10764,17 @@ msgstr "" "-b/--binary seçeneği uzunca bir süredir düzgün çalışmıyordu ve\n" "yakında kaldırılacak. Lütfen artık kullanmayın." -#: builtin/am.c:2332 +#: builtin/am.c:2383 msgid "failed to read the index" msgstr "indeks okunamadı" -#: builtin/am.c:2347 +#: builtin/am.c:2398 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "Bir önceki yeniden temellendirme dizini %s hâlâ mevcut; ancak mbox verildi." -#: builtin/am.c:2371 +#: builtin/am.c:2422 #, c-format msgid "" "Stray %s directory found.\n" @@ -10631,11 +10783,11 @@ msgstr "" "Başıboş %s dizini bulundu.\n" "Kaldırmak için \"git am --abort\" kullanın." -#: builtin/am.c:2377 +#: builtin/am.c:2428 msgid "Resolve operation not in progress, we are not resuming." msgstr "İlerlemekte olan bir çözüm işlemi yok, sürdürme yapmıyoruz." -#: builtin/am.c:2387 +#: builtin/am.c:2438 msgid "interactive mode requires patches on the command line" msgstr "etkileşimli kip yamanın komut satırında olmasını gerektirir" @@ -10841,7 +10993,7 @@ msgstr "" "'git bisect terms' için geçersiz argüman %s.\n" "Desteklenen seçenekler: --term-good|--term-old ve --term-bad|--term-new." -#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014 +#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021 msgid "revision walk setup failed\n" msgstr "revizyonda gezinme ayarlaması başarısız oldu\n" @@ -10907,86 +11059,91 @@ msgstr "Lütfen '--bisec-state'i en az bir argümanla çalıştırın" msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' yalnızca bir argüman alabilir." -#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878 +#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880 #, c-format msgid "Bad rev input: %s" msgstr "Hatalı revizyon girdisi: %s" -#: builtin/bisect--helper.c:912 +#: builtin/bisect--helper.c:887 +#, c-format +msgid "Bad rev input (not a commit): %s" +msgstr "Hatalı revizyon girdisi (bir işleme değil): %s" + +#: builtin/bisect--helper.c:919 msgid "We are not bisecting." msgstr "İkili arama yapmıyoruz." -#: builtin/bisect--helper.c:962 +#: builtin/bisect--helper.c:969 #, c-format msgid "'%s'?? what are you talking about?" msgstr "'%s'?? ney ney?" -#: builtin/bisect--helper.c:974 +#: builtin/bisect--helper.c:981 #, c-format msgid "cannot read file '%s' for replaying" msgstr "'%s' dosyası yeniden oynatım için okunamıyor" -#: builtin/bisect--helper.c:1047 +#: builtin/bisect--helper.c:1054 msgid "reset the bisection state" msgstr "ikili arama durumunu sıfırla" -#: builtin/bisect--helper.c:1049 +#: builtin/bisect--helper.c:1056 msgid "check whether bad or good terms exist" msgstr "iyi veya kötü terimlerin olup olmadığını denetle" -#: builtin/bisect--helper.c:1051 +#: builtin/bisect--helper.c:1058 msgid "print out the bisect terms" msgstr "ikili arama terimlerini yazdır" -#: builtin/bisect--helper.c:1053 +#: builtin/bisect--helper.c:1060 msgid "start the bisect session" msgstr "ikili arama oturumunu başlat" -#: builtin/bisect--helper.c:1055 +#: builtin/bisect--helper.c:1062 msgid "find the next bisection commit" msgstr "bir sonraki ikili arama işlemesini bul" -#: builtin/bisect--helper.c:1057 +#: builtin/bisect--helper.c:1064 msgid "mark the state of ref (or refs)" msgstr "başvurunun (veya başvuruların) durumunu imle" -#: builtin/bisect--helper.c:1059 +#: builtin/bisect--helper.c:1066 msgid "list the bisection steps so far" msgstr "şu ana kadarki ikili arama durumunu listele" -#: builtin/bisect--helper.c:1061 +#: builtin/bisect--helper.c:1068 msgid "replay the bisection process from the given file" msgstr "verilen dosyadan ikili arama işlemini yeniden oynat" -#: builtin/bisect--helper.c:1063 +#: builtin/bisect--helper.c:1070 msgid "skip some commits for checkout" msgstr "çıkış için birkaç işlemeyi atla" -#: builtin/bisect--helper.c:1065 +#: builtin/bisect--helper.c:1072 msgid "no log for BISECT_WRITE" msgstr "BISECT_WRITE için günlük yok" -#: builtin/bisect--helper.c:1080 +#: builtin/bisect--helper.c:1087 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset bir argüman veya işleme gerektirmiyor" -#: builtin/bisect--helper.c:1085 +#: builtin/bisect--helper.c:1092 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check 2 veya 3 argüman gerektiriyor" -#: builtin/bisect--helper.c:1091 +#: builtin/bisect--helper.c:1098 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms 0 veya 1 argüman gerektiriyor" -#: builtin/bisect--helper.c:1100 +#: builtin/bisect--helper.c:1107 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next 0 argüman gerektiriyor" -#: builtin/bisect--helper.c:1111 +#: builtin/bisect--helper.c:1118 msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log 0 argüman gerektiriyor" -#: builtin/bisect--helper.c:1116 +#: builtin/bisect--helper.c:1123 msgid "no logfile given" msgstr "hiçbir günlük dosyası verilmedi" @@ -11037,9 +11194,9 @@ msgstr "kök işlemelerini sınır olarak değerlendirme (Öntanımlı: Kapalı) msgid "show work cost statistics" msgstr "iş maliyet istatistiklerini göster" -#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92 -#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175 -#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119 +#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 +#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 +#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 #: builtin/push.c:575 builtin/send-pack.c:198 msgid "force progress reporting" msgstr "durum belirtmeyi zorla" @@ -11088,7 +11245,7 @@ msgstr "yazar adı yerine e-postasını göster (Öntanımlı: Kapalı)" msgid "ignore whitespace differences" msgstr "boşluk ayrımlarını yok say" -#: builtin/blame.c:883 builtin/log.c:1812 +#: builtin/blame.c:883 builtin/log.c:1820 msgid "rev" msgstr "revizyon" @@ -11265,74 +11422,74 @@ msgstr "Uzak izleme dalı %s silindi (%s idi).\n" msgid "Deleted branch %s (was %s).\n" msgstr "%s dalı silindi (%s idi).\n" -#: builtin/branch.c:438 builtin/tag.c:61 +#: builtin/branch.c:440 builtin/tag.c:63 msgid "unable to parse format string" msgstr "biçim dizisi ayrıştırılamıyor" -#: builtin/branch.c:469 +#: builtin/branch.c:471 msgid "could not resolve HEAD" msgstr "HEAD çözülemedi" -#: builtin/branch.c:475 +#: builtin/branch.c:477 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s), refs/heads/ dışına işaret ediyor" -#: builtin/branch.c:490 +#: builtin/branch.c:492 #, c-format msgid "Branch %s is being rebased at %s" msgstr "%s dalı %s konumunda yeniden temellendiriliyor" -#: builtin/branch.c:494 +#: builtin/branch.c:496 #, c-format msgid "Branch %s is being bisected at %s" msgstr "%s dalı %s konumunda ikili aranıyor" -#: builtin/branch.c:511 +#: builtin/branch.c:513 msgid "cannot copy the current branch while not on any." msgstr "bir dalın üzerinde değilken geçerli dal kopyalanamaz" -#: builtin/branch.c:513 +#: builtin/branch.c:515 msgid "cannot rename the current branch while not on any." msgstr "bir dalın üzerinde değilken geçerli dal yeniden adlandırılamaz" -#: builtin/branch.c:524 +#: builtin/branch.c:526 #, c-format msgid "Invalid branch name: '%s'" msgstr "Geçersiz dal adı: '%s'" -#: builtin/branch.c:553 +#: builtin/branch.c:555 msgid "Branch rename failed" msgstr "Dal yeniden adlandırması başarısız" -#: builtin/branch.c:555 +#: builtin/branch.c:557 msgid "Branch copy failed" msgstr "Dal kopyalaması başarısız" -#: builtin/branch.c:559 +#: builtin/branch.c:561 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Yanlış adlandırılan '%s' dalının bir kopyası oluşturuldu" -#: builtin/branch.c:562 +#: builtin/branch.c:564 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Yanlış adlandırılan '%s' dalı yeniden adlandırıldı" -#: builtin/branch.c:568 +#: builtin/branch.c:570 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Dal %s olarak yeniden adlandırıldı; ancak HEAD güncellenmedi!" -#: builtin/branch.c:577 +#: builtin/branch.c:579 msgid "Branch is renamed, but update of config-file failed" msgstr "Dal yeniden adlandırıldı; ancak config-file güncellemesi başarısız" -#: builtin/branch.c:579 +#: builtin/branch.c:581 msgid "Branch is copied, but update of config-file failed" msgstr "Dal kopyalandı; ancak config-file güncellemesi başarısız" -#: builtin/branch.c:595 +#: builtin/branch.c:597 #, c-format msgid "" "Please edit the description for the branch\n" @@ -11343,180 +11500,180 @@ msgstr "" "\t%s\n" "'%c' ile başlayan satırlar çıkarılacaktır.\n" -#: builtin/branch.c:629 +#: builtin/branch.c:631 msgid "Generic options" msgstr "Genel seçenekler" -#: builtin/branch.c:631 +#: builtin/branch.c:633 msgid "show hash and subject, give twice for upstream branch" msgstr "sağlamayı ve konuyu göster, üstkaynak dalı için iki kez ver" -#: builtin/branch.c:632 +#: builtin/branch.c:634 msgid "suppress informational messages" msgstr "bilgi iletilerini gizle" -#: builtin/branch.c:633 +#: builtin/branch.c:635 msgid "set up tracking mode (see git-pull(1))" msgstr "izleme kipini ayarla (bilgi için: git-pull(1))" -#: builtin/branch.c:635 +#: builtin/branch.c:637 msgid "do not use" msgstr "kullanma" -#: builtin/branch.c:637 builtin/rebase.c:534 +#: builtin/branch.c:639 builtin/rebase.c:533 msgid "upstream" msgstr "üstkaynak" -#: builtin/branch.c:637 +#: builtin/branch.c:639 msgid "change the upstream info" msgstr "üstkaynak bilgisini değiştir" -#: builtin/branch.c:638 +#: builtin/branch.c:640 msgid "unset the upstream info" msgstr "üstkaynak bilgisini kaldır" -#: builtin/branch.c:639 +#: builtin/branch.c:641 msgid "use colored output" msgstr "renklendirilmiş çıktı kullan" -#: builtin/branch.c:640 +#: builtin/branch.c:642 msgid "act on remote-tracking branches" msgstr "uzak izleme dallarında iş yap" -#: builtin/branch.c:642 builtin/branch.c:644 +#: builtin/branch.c:644 builtin/branch.c:646 msgid "print only branches that contain the commit" msgstr "yalnızca işlemeyi içeren dalları yazdır" -#: builtin/branch.c:643 builtin/branch.c:645 +#: builtin/branch.c:645 builtin/branch.c:647 msgid "print only branches that don't contain the commit" msgstr "yalnızca işlemeyi içermeyen dalları yazdır" -#: builtin/branch.c:648 +#: builtin/branch.c:650 msgid "Specific git-branch actions:" msgstr "Özel git-branch eylemleri:" -#: builtin/branch.c:649 +#: builtin/branch.c:651 msgid "list both remote-tracking and local branches" msgstr "hem uzak izleme hem de yerel dalları listele" -#: builtin/branch.c:651 +#: builtin/branch.c:653 msgid "delete fully merged branch" msgstr "tümüyle birleştirilen dalı sil" -#: builtin/branch.c:652 +#: builtin/branch.c:654 msgid "delete branch (even if not merged)" msgstr "dalı sil (birleştirilmemiş olsa bile)" -#: builtin/branch.c:653 +#: builtin/branch.c:655 msgid "move/rename a branch and its reflog" msgstr "bir dalı ve onun başvuru günlüğünü taşı/yeniden adlandır" -#: builtin/branch.c:654 +#: builtin/branch.c:656 msgid "move/rename a branch, even if target exists" msgstr "bir dalı taşı/yeniden adlandır, hedef var olsa bile" -#: builtin/branch.c:655 +#: builtin/branch.c:657 msgid "copy a branch and its reflog" msgstr "bir dalı ve onun başvuru günlüğünü kopyala" -#: builtin/branch.c:656 +#: builtin/branch.c:658 msgid "copy a branch, even if target exists" msgstr "bir dalı kopyala, hedef var olsa bile" -#: builtin/branch.c:657 +#: builtin/branch.c:659 msgid "list branch names" msgstr "dal adlarını listele" -#: builtin/branch.c:658 +#: builtin/branch.c:660 msgid "show current branch name" msgstr "geçerli dal adını göster" -#: builtin/branch.c:659 +#: builtin/branch.c:661 msgid "create the branch's reflog" msgstr "dalın başvuru günlüğünü oluştur" -#: builtin/branch.c:661 +#: builtin/branch.c:663 msgid "edit the description for the branch" msgstr "dalın açıklamasını düzenle" -#: builtin/branch.c:662 +#: builtin/branch.c:664 msgid "force creation, move/rename, deletion" msgstr "zorla oluştur, taşı/yeniden adlandır, sil" -#: builtin/branch.c:663 +#: builtin/branch.c:665 msgid "print only branches that are merged" msgstr "yalnızca birleştirilen dalları yazdır" -#: builtin/branch.c:664 +#: builtin/branch.c:666 msgid "print only branches that are not merged" msgstr "yalnızca birleştirilmeyen dalları yazdır" -#: builtin/branch.c:665 +#: builtin/branch.c:667 msgid "list branches in columns" msgstr "dalları sütunlarla listele" -#: builtin/branch.c:667 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:466 +#: builtin/tag.c:477 msgid "object" msgstr "nesne" -#: builtin/branch.c:668 +#: builtin/branch.c:670 msgid "print only branches of the object" msgstr "yalnızca nesnenin dallarını yazdır" -#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473 +#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484 msgid "sorting and filtering are case insensitive" msgstr "sıralama ve süzme BÜYÜK/küçük harf duyarlı değildir" -#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471 +#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "çıktı için kullanılacak biçim" -#: builtin/branch.c:693 builtin/clone.c:790 +#: builtin/branch.c:695 builtin/clone.c:794 msgid "HEAD not found below refs/heads!" msgstr "HEAD, refs/heads altında bulunamadı!" -#: builtin/branch.c:717 +#: builtin/branch.c:719 msgid "--column and --verbose are incompatible" msgstr "--column ve --verbose birbiriyle uyumsuz" -#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797 +#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799 msgid "branch name required" msgstr "dal adı gerekli" -#: builtin/branch.c:764 +#: builtin/branch.c:766 msgid "Cannot give description to detached HEAD" msgstr "Ayrılmış HEAD'e açıklama verilemiyor" -#: builtin/branch.c:769 +#: builtin/branch.c:771 msgid "cannot edit description of more than one branch" msgstr "birden çok dalın açıklaması düzenlenemiyor" -#: builtin/branch.c:776 +#: builtin/branch.c:778 #, c-format msgid "No commit on branch '%s' yet." msgstr "'%s' dalında henüz bir işleme yok." -#: builtin/branch.c:779 +#: builtin/branch.c:781 #, c-format msgid "No branch named '%s'." msgstr "'%s' adında bir dal yok." -#: builtin/branch.c:794 +#: builtin/branch.c:796 msgid "too many branches for a copy operation" msgstr "bir kopyalama işlemi için çok fazla dal" -#: builtin/branch.c:803 +#: builtin/branch.c:805 msgid "too many arguments for a rename operation" msgstr "bir yeniden adlandırma işlemi için çok fazla argüman" -#: builtin/branch.c:808 +#: builtin/branch.c:810 msgid "too many arguments to set new upstream" msgstr "yeni üstkaynak ayarlamak için çok fazla argüman" -#: builtin/branch.c:812 +#: builtin/branch.c:814 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -11524,31 +11681,31 @@ msgstr "" "HEAD'in üst kaynağı %s olarak ayarlanamadı; çünkü herhangi bir dala işaret " "etmiyor." -#: builtin/branch.c:815 builtin/branch.c:838 +#: builtin/branch.c:817 builtin/branch.c:840 #, c-format msgid "no such branch '%s'" msgstr "'%s' diye bir dal yok" -#: builtin/branch.c:819 +#: builtin/branch.c:821 #, c-format msgid "branch '%s' does not exist" msgstr "'%s' diye bir dal mevcut değil" -#: builtin/branch.c:832 +#: builtin/branch.c:834 msgid "too many arguments to unset upstream" msgstr "üst kaynağı kaldırmak için çok fazla argüman" -#: builtin/branch.c:836 +#: builtin/branch.c:838 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "HEAD'in üst kaynağı kaldırılamadı; çünkü herhangi bir dala işaret etmiyor." -#: builtin/branch.c:842 +#: builtin/branch.c:844 #, c-format msgid "Branch '%s' has no upstream information" msgstr "'%s' dalının üstkaynak bilgisi yok" -#: builtin/branch.c:852 +#: builtin/branch.c:854 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11556,7 +11713,7 @@ msgstr "" "'git branch'in -a ve -r seçenekleri bir dal adı almaz.\n" "Şunu mu demek istediniz: -a|-r --list <dizgi>?" -#: builtin/branch.c:856 +#: builtin/branch.c:858 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -11624,38 +11781,38 @@ msgstr "" "Aşağıda hata raporunun geri kalanına bir göz atın.\n" "Paylaşmak istemediğiniz satırları silebilirsiniz.\n" -#: builtin/bugreport.c:135 +#: builtin/bugreport.c:136 msgid "specify a destination for the bugreport file" msgstr "hata raporu dosyası için bir konum belirtin" -#: builtin/bugreport.c:137 +#: builtin/bugreport.c:138 msgid "specify a strftime format suffix for the filename" msgstr "dosya adı için bir strftime biçimli ek belirtin" -#: builtin/bugreport.c:159 +#: builtin/bugreport.c:160 #, c-format msgid "could not create leading directories for '%s'" msgstr "'%s' için öncü dizinler oluşturulamadı" -#: builtin/bugreport.c:166 +#: builtin/bugreport.c:167 msgid "System Info" msgstr "Sistem Bilgisi" -#: builtin/bugreport.c:169 +#: builtin/bugreport.c:170 msgid "Enabled Hooks" msgstr "Etkin Kancalar" -#: builtin/bugreport.c:176 +#: builtin/bugreport.c:177 #, c-format msgid "couldn't create a new file at '%s'" msgstr "'%s' hata raporu dosyası oluşturulamadı" -#: builtin/bugreport.c:179 +#: builtin/bugreport.c:180 #, c-format msgid "unable to write to %s" msgstr "%s dosyasına yazılamıyor" -#: builtin/bugreport.c:189 +#: builtin/bugreport.c:190 #, c-format msgid "Created new report at '%s'.\n" msgstr "Hata raporu '%s' dosyasına yazıldı.\n" @@ -11676,19 +11833,19 @@ msgstr "git bundle list-heads <dosya> [<başvuru-adı>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <dosya> [<başvuru-adı>...]" -#: builtin/bundle.c:67 builtin/pack-objects.c:3495 +#: builtin/bundle.c:67 builtin/pack-objects.c:3747 msgid "do not show progress meter" msgstr "ilerleme çubuğunu gösterme" -#: builtin/bundle.c:69 builtin/pack-objects.c:3497 +#: builtin/bundle.c:69 builtin/pack-objects.c:3749 msgid "show progress meter" msgstr "ilerleme çubuğunu göster" -#: builtin/bundle.c:71 builtin/pack-objects.c:3499 +#: builtin/bundle.c:71 builtin/pack-objects.c:3751 msgid "show progress meter during object writing phase" msgstr "ilerleme çubuğunu nesne yazımı aşaması sırasında göster" -#: builtin/bundle.c:74 builtin/pack-objects.c:3502 +#: builtin/bundle.c:74 builtin/pack-objects.c:3754 msgid "similar to --all-progress when progress meter is shown" msgstr "ilerleme çubuğu gösterildiğinde --all-progress'e benzer" @@ -11831,8 +11988,8 @@ msgstr "dosya adlarını stdin'den oku" msgid "terminate input and output records by a NUL character" msgstr "girdi ve çıktı kayıtlarını bir NUL karakteri ile sonlandır" -#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549 -#: builtin/worktree.c:489 +#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 +#: builtin/worktree.c:491 msgid "suppress progress reporting" msgstr "ilerleme bildirimini gizle" @@ -11844,27 +12001,27 @@ msgstr "eşleşmeyen girdi yollarını göster" msgid "ignore index when checking" msgstr "denetlerken indeksi yok say" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:165 msgid "cannot specify pathnames with --stdin" msgstr "yol adları --stdin ile belirtilemiyor" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:168 msgid "-z only makes sense with --stdin" msgstr "-z yalnızca --stdin ile bir anlam ifade eder" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:170 msgid "no path specified" msgstr "bir yol belirtilmedi" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:174 msgid "--quiet is only valid with a single pathname" msgstr "--quiet yalnızca tek bir yol adı ile geçerlidir" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:176 msgid "cannot have both --quiet and --verbose" msgstr "hem --quiet hem --verbose birlikte kullanılamaz" -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:179 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching yalnızca --verbose ile geçerlidir" @@ -11885,6 +12042,21 @@ msgstr "kişi ayrıştırılamadı: %s" msgid "no contacts specified" msgstr "kişi belirtilmedi" +#: builtin/checkout--worker.c:110 +msgid "git checkout--worker [<options>]" +msgstr "git checkout--worker [<seçenekler>]" + +#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 +#: builtin/column.c:31 builtin/submodule--helper.c:1825 +#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836 +#: builtin/submodule--helper.c:2334 builtin/worktree.c:719 +msgid "string" +msgstr "dizi" + +#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202 +msgid "when creating files, prepend <string>" +msgstr "dosyalar oluştururken başına <dizi> ekle" + #: builtin/checkout-index.c:152 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<seçenekler>] [--] [<dosya>...]" @@ -11893,157 +12065,146 @@ msgstr "git checkout-index [<seçenekler>] [--] [<dosya>...]" msgid "stage should be between 1 and 3 or all" msgstr "stage 1 ve 3 arasında veya tümü olmalıdır" -#: builtin/checkout-index.c:186 +#: builtin/checkout-index.c:187 msgid "check out all files in the index" msgstr "indeksteki tüm dosyaları çıkış yap" -#: builtin/checkout-index.c:187 +#: builtin/checkout-index.c:188 msgid "force overwrite of existing files" msgstr "mevcut dosyaların üzerine yazılmasını zorla" -#: builtin/checkout-index.c:189 +#: builtin/checkout-index.c:190 msgid "no warning for existing files and files not in index" msgstr "mevcut dosyalar ve indekste olmayan dosyalar için uyarma" -#: builtin/checkout-index.c:191 +#: builtin/checkout-index.c:192 msgid "don't checkout new files" msgstr "yeni dosyaları çıkış yapma" -#: builtin/checkout-index.c:193 +#: builtin/checkout-index.c:194 msgid "update stat information in the index file" msgstr "indeks dosyasındaki dosya bilgilerini güncelle" -#: builtin/checkout-index.c:197 +#: builtin/checkout-index.c:198 msgid "read list of paths from the standard input" msgstr "yolların listesini standart girdi'den oku" -#: builtin/checkout-index.c:199 +#: builtin/checkout-index.c:200 msgid "write the content to temporary files" msgstr "içeriği geçici dosyalara yaz" -#: builtin/checkout-index.c:200 builtin/column.c:31 -#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 -#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:717 -msgid "string" -msgstr "dizi" - -#: builtin/checkout-index.c:201 -msgid "when creating files, prepend <string>" -msgstr "dosyalar oluştururken başına <dizi> ekle" - -#: builtin/checkout-index.c:203 +#: builtin/checkout-index.c:204 msgid "copy out the files from named stage" msgstr "dosyaları adı verilen alandan kopyala" -#: builtin/checkout.c:31 +#: builtin/checkout.c:33 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<seçenekler>] <dal>" -#: builtin/checkout.c:32 +#: builtin/checkout.c:34 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<seçenekler>] [<dal>] -- <dosya>..." -#: builtin/checkout.c:37 +#: builtin/checkout.c:39 msgid "git switch [<options>] [<branch>]" msgstr "git switch [<seçenekler>] [<dal>]" -#: builtin/checkout.c:42 +#: builtin/checkout.c:44 msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<seçenekler>] [--source=<dal>] <dosya>..." -#: builtin/checkout.c:188 builtin/checkout.c:227 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have our version" msgstr "'%s' yolu bizdeki sürüme iye değil" -#: builtin/checkout.c:190 builtin/checkout.c:229 +#: builtin/checkout.c:192 builtin/checkout.c:231 #, c-format msgid "path '%s' does not have their version" msgstr "'%s' yolu onlardaki sürüme iye değil" -#: builtin/checkout.c:206 +#: builtin/checkout.c:208 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "'%s' yolu gereken tüm sürümlere iye değil" -#: builtin/checkout.c:258 +#: builtin/checkout.c:261 #, c-format msgid "path '%s' does not have necessary versions" msgstr "'%s' yolu gereken sürümlere iye değil" -#: builtin/checkout.c:275 +#: builtin/checkout.c:278 #, c-format msgid "path '%s': cannot merge" msgstr "'%s' yolu: Birleştirilemiyor" -#: builtin/checkout.c:291 +#: builtin/checkout.c:294 #, c-format msgid "Unable to add merge result for '%s'" msgstr "'%s' için birleştirme sonuçları eklenemiyor" -#: builtin/checkout.c:396 +#: builtin/checkout.c:414 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "%d birleştirme çakışması yeniden oluşturuldu" msgstr[1] "%d birleştirme çakışması yeniden oluşturuldu" -#: builtin/checkout.c:401 +#: builtin/checkout.c:419 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "%d yol şuradan güncellendi: %s" msgstr[1] "%d yol şuradan güncellendi: %s" -#: builtin/checkout.c:408 +#: builtin/checkout.c:426 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "%d yol indeksten güncellendi" msgstr[1] "%d yol indeksten güncellendi" -#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 -#: builtin/checkout.c:441 +#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 +#: builtin/checkout.c:459 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' güncellenmekte olan yollarla kullanılamaz" -#: builtin/checkout.c:444 builtin/checkout.c:447 +#: builtin/checkout.c:462 builtin/checkout.c:465 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s', %s ile birlikte kullanılamaz" -#: builtin/checkout.c:451 +#: builtin/checkout.c:469 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Aynı anda hem yolları güncelleyip hem de '%s' dalına geçilemiyor." -#: builtin/checkout.c:455 +#: builtin/checkout.c:473 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "ne '%s' ne de '%s' belirtilmiş" -#: builtin/checkout.c:459 +#: builtin/checkout.c:477 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s', '%s' ögesinin belirtilmediği durumlarda kullanılmalıdır" -#: builtin/checkout.c:464 builtin/checkout.c:469 +#: builtin/checkout.c:482 builtin/checkout.c:487 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' veya '%s', %s ile birlikte kullanılamaz" -#: builtin/checkout.c:543 builtin/checkout.c:550 +#: builtin/checkout.c:563 builtin/checkout.c:570 #, c-format msgid "path '%s' is unmerged" msgstr "'%s' yolu birleştirilmemiş" -#: builtin/checkout.c:718 +#: builtin/checkout.c:739 msgid "you need to resolve your current index first" msgstr "önce geçerli indeksinizi çözmelisiniz" -#: builtin/checkout.c:772 +#: builtin/checkout.c:793 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12052,50 +12213,50 @@ msgstr "" "aşağıdaki dosyalardaki hazırlanan değişikliklerle sürdürülemiyor:\n" "%s" -#: builtin/checkout.c:865 +#: builtin/checkout.c:886 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "'%s' için başvuru günlüğü yapılamıyor: %s\n" -#: builtin/checkout.c:907 +#: builtin/checkout.c:928 msgid "HEAD is now at" msgstr "HEAD konumu:" -#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "HEAD güncellenemiyor" -#: builtin/checkout.c:915 +#: builtin/checkout.c:936 #, c-format msgid "Reset branch '%s'\n" msgstr "'%s' dalı sıfırlandı.\n" -#: builtin/checkout.c:918 +#: builtin/checkout.c:939 #, c-format msgid "Already on '%s'\n" msgstr "Halihazırda '%s' üzerinde\n" -#: builtin/checkout.c:922 +#: builtin/checkout.c:943 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "'%s' dalına geçildi ve sıfırlandı.\n" -#: builtin/checkout.c:924 builtin/checkout.c:1355 +#: builtin/checkout.c:945 builtin/checkout.c:1376 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Yeni '%s' dalına geçildi.\n" -#: builtin/checkout.c:926 +#: builtin/checkout.c:947 #, c-format msgid "Switched to branch '%s'\n" msgstr "'%s' dalına geçildi.\n" -#: builtin/checkout.c:977 +#: builtin/checkout.c:998 #, c-format msgid " ... and %d more.\n" msgstr "... ve %d daha.\n" -#: builtin/checkout.c:983 +#: builtin/checkout.c:1004 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12118,7 +12279,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1002 +#: builtin/checkout.c:1023 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12145,19 +12306,19 @@ msgstr[1] "" "\tgit branch <yeni-dal-adı> %s\n" "\n" -#: builtin/checkout.c:1037 +#: builtin/checkout.c:1058 msgid "internal error in revision walk" msgstr "revizyonlarda gezinirken iç hata" -#: builtin/checkout.c:1041 +#: builtin/checkout.c:1062 msgid "Previous HEAD position was" msgstr "Önceki HEAD konumu şuydu:" -#: builtin/checkout.c:1081 builtin/checkout.c:1350 +#: builtin/checkout.c:1102 builtin/checkout.c:1371 msgid "You are on a branch yet to be born" msgstr "Henüz doğmamış bir dal üzerindesiniz" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1184 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12166,7 +12327,7 @@ msgstr "" "'%s' hem bir yerel dosya hem de bir izleme dalı olabilir.\n" "Lütfen -- (ve isteğe bağlı olarak --no-guess) kullanıp belirsizliği giderin." -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1191 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12186,51 +12347,51 @@ msgstr "" "isterseniz, örn. 'origin', yapılandırmanızda checkout.defaultsRemote=origin\n" "ayarını yapmayı düşünün." -#: builtin/checkout.c:1180 +#: builtin/checkout.c:1201 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' birden çok (%d) uzak izleme dalıyla eşleşti" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1267 msgid "only one reference expected" msgstr "yalnızca bir başvuru bekleniyordu" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1284 #, c-format msgid "only one reference expected, %d given." msgstr "yalnızca bir başvuru bekleniyordu, %d verildi" -#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438 +#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438 #, c-format msgid "invalid reference: %s" msgstr "geçersiz başvuru: %s" -#: builtin/checkout.c:1322 builtin/checkout.c:1688 +#: builtin/checkout.c:1343 builtin/checkout.c:1709 #, c-format msgid "reference is not a tree: %s" msgstr "başvuru bir ağaca değil: %s" -#: builtin/checkout.c:1369 +#: builtin/checkout.c:1390 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "bir dal bekleniyordu, '%s' etiketi alındı" -#: builtin/checkout.c:1371 +#: builtin/checkout.c:1392 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "bir dal bekleniyordu, '%s' uzak dalı alındı" -#: builtin/checkout.c:1372 builtin/checkout.c:1380 +#: builtin/checkout.c:1393 builtin/checkout.c:1401 #, c-format msgid "a branch is expected, got '%s'" msgstr "bir dal bekleniyordu, '%s' alındı" -#: builtin/checkout.c:1375 +#: builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "bir dal bekleniyordu, '%s' işlemesi alındı" -#: builtin/checkout.c:1391 +#: builtin/checkout.c:1412 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12238,7 +12399,7 @@ msgstr "" "Birleştirme yaparken dal değiştirilemiyor.\n" "\"git merge --quit\" veya \"git worktree add\" yapmayı düşünün." -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1416 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12246,7 +12407,7 @@ msgstr "" "Bir \"am\" oturumunun ortasında dal değiştirilemiyor.\n" "\"git am --quit\" veya \"git worktree add\" yapmayı düşünün." -#: builtin/checkout.c:1399 +#: builtin/checkout.c:1420 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12254,7 +12415,7 @@ msgstr "" "Yeniden temellendirme yaparken dal değiştirilemiyor.\n" "\"git rebase --quit\" veya \"git worktree add\" yapmayı düşünün." -#: builtin/checkout.c:1403 +#: builtin/checkout.c:1424 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12262,7 +12423,7 @@ msgstr "" "Seç-al yaparken dal değiştirilemiyor.\n" "\"git cherry-pick --quit\" veya \"git worktree add\" yapmayı düşünün." -#: builtin/checkout.c:1407 +#: builtin/checkout.c:1428 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12270,138 +12431,138 @@ msgstr "" "Geriye al yaparken dal değiştirilemiyor.\n" "\"git revert --quit\" veya \"git worktree add\" yapmayı düşünün." -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1432 msgid "you are switching branch while bisecting" msgstr "ikili arama yaparken dal değiştiriyorsunuz" -#: builtin/checkout.c:1418 +#: builtin/checkout.c:1439 msgid "paths cannot be used with switching branches" msgstr "dal değiştirilirken yollar kullanılamaz" -#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429 +#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "dal değiştirilirken '%s' kullanılamaz" -#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439 -#: builtin/checkout.c:1444 builtin/checkout.c:1449 +#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 +#: builtin/checkout.c:1465 builtin/checkout.c:1470 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s', '%s' ile birlikte kullanılamaz" -#: builtin/checkout.c:1446 +#: builtin/checkout.c:1467 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s', <başlama-noktası> alamaz" -#: builtin/checkout.c:1454 +#: builtin/checkout.c:1475 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Dal, işleme olmayan '%s' ögesine değiştirilemez" -#: builtin/checkout.c:1461 +#: builtin/checkout.c:1482 msgid "missing branch or commit argument" msgstr "dal veya işleme argümanı eksik" -#: builtin/checkout.c:1504 +#: builtin/checkout.c:1525 msgid "perform a 3-way merge with the new branch" msgstr "yeni dal ile bir 3 yönlü birleştirme gerçekleştir" -#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322 +#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323 msgid "style" msgstr "stil" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1527 msgid "conflict style (merge or diff3)" msgstr "çakışma stili (birleştirme veya diff3)" -#: builtin/checkout.c:1518 builtin/worktree.c:486 +#: builtin/checkout.c:1539 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "adı verilen işlemede HEAD'i ayır" -#: builtin/checkout.c:1519 +#: builtin/checkout.c:1540 msgid "set upstream info for new branch" msgstr "yeni dal için üstkaynak bilgisi ayarla" -#: builtin/checkout.c:1521 +#: builtin/checkout.c:1542 msgid "force checkout (throw away local modifications)" msgstr "zorla çıkış yap (yerel değişiklikleri çöpe at)" -#: builtin/checkout.c:1523 +#: builtin/checkout.c:1544 msgid "new-branch" msgstr "yeni dal" -#: builtin/checkout.c:1523 +#: builtin/checkout.c:1544 msgid "new unparented branch" msgstr "yeni üst ögesi olmayan dal" -#: builtin/checkout.c:1525 builtin/merge.c:301 +#: builtin/checkout.c:1546 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "yok sayılan dosyaları güncelle (öntanımlı)" -#: builtin/checkout.c:1528 +#: builtin/checkout.c:1549 msgid "do not check if another worktree is holding the given ref" msgstr "" "verilen başvuruyu başka bir çalışma ağacının tutup tutmadığını denetleme" -#: builtin/checkout.c:1541 +#: builtin/checkout.c:1562 msgid "checkout our version for unmerged files" msgstr "birleştirilmeyen dosyalar için bizdeki sürümü çıkış yap" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1565 msgid "checkout their version for unmerged files" msgstr "birleştirilmeyen dosyalar için onlardaki sürümünü çıkış yap" -#: builtin/checkout.c:1548 +#: builtin/checkout.c:1569 msgid "do not limit pathspecs to sparse entries only" msgstr "yol belirteçlerini yalnızca aralıklı girdilere kısıtlama" -#: builtin/checkout.c:1603 +#: builtin/checkout.c:1624 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c ve --orphan birlikte kullanılmaz" -#: builtin/checkout.c:1607 +#: builtin/checkout.c:1628 msgid "-p and --overlay are mutually exclusive" msgstr "-p ve --overlay birlikte kullanılmaz" -#: builtin/checkout.c:1644 +#: builtin/checkout.c:1665 msgid "--track needs a branch name" msgstr "--track için bir dal adı gerekli" -#: builtin/checkout.c:1649 +#: builtin/checkout.c:1670 #, c-format msgid "missing branch name; try -%c" msgstr "eksik dal adı; -%c deneyin" -#: builtin/checkout.c:1681 +#: builtin/checkout.c:1702 #, c-format msgid "could not resolve %s" msgstr "%s çözülemedi" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1718 msgid "invalid path specification" msgstr "geçersiz yol belirtimi" -#: builtin/checkout.c:1704 +#: builtin/checkout.c:1725 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' bir işleme değil ve ondan bir '%s' dalı oluşturulamaz" -#: builtin/checkout.c:1708 +#: builtin/checkout.c:1729 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach bir '%s' yol argümanı almıyor" -#: builtin/checkout.c:1717 +#: builtin/checkout.c:1738 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file, --detach ile uyumsuz" -#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566 +#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file, --patch ile uyumsuz" -#: builtin/checkout.c:1733 +#: builtin/checkout.c:1754 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12409,70 +12570,70 @@ msgstr "" "git checkout: --ours/--theirs, --force ve --merge indeks çıkışı yapılırken\n" "birlikte kullanılamaz" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1759 msgid "you must specify path(s) to restore" msgstr "eski durumuna getirilecek yolları belirtmelisiniz" -#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815 -#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482 -#: builtin/worktree.c:484 +#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 +#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484 +#: builtin/worktree.c:486 msgid "branch" msgstr "dal" -#: builtin/checkout.c:1765 +#: builtin/checkout.c:1786 msgid "create and checkout a new branch" msgstr "yeni bir dal oluştur ve çıkış yap" -#: builtin/checkout.c:1767 +#: builtin/checkout.c:1788 msgid "create/reset and checkout a branch" msgstr "bir dal oluştur/sıfırla ve çıkış yap" -#: builtin/checkout.c:1768 +#: builtin/checkout.c:1789 msgid "create reflog for new branch" msgstr "yeni dal için başvuru günlüğü oluştur" -#: builtin/checkout.c:1770 +#: builtin/checkout.c:1791 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "'git checkout <böyle-bir-dal-yok>'a temkinli yaklaş (öntanımlı)" -#: builtin/checkout.c:1771 +#: builtin/checkout.c:1792 msgid "use overlay mode (default)" msgstr "yerpaylaşım kipini kullan (öntanımlı)" -#: builtin/checkout.c:1816 +#: builtin/checkout.c:1837 msgid "create and switch to a new branch" msgstr "yeni bir dal oluştur ve ona geç" -#: builtin/checkout.c:1818 +#: builtin/checkout.c:1839 msgid "create/reset and switch to a branch" msgstr "bir dal oluştur/sıfırla ve ona geç" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1841 msgid "second guess 'git switch <no-such-branch>'" msgstr "'git switch <böyle-bir-dal-yok>'a temkinli yaklaş" -#: builtin/checkout.c:1822 +#: builtin/checkout.c:1843 msgid "throw away local modifications" msgstr "yerel değişiklikleri çöpe at" -#: builtin/checkout.c:1856 +#: builtin/checkout.c:1877 msgid "which tree-ish to checkout from" msgstr "çıkış yapılacak ağacımsı" -#: builtin/checkout.c:1858 +#: builtin/checkout.c:1879 msgid "restore the index" msgstr "indeksi eski durumuna getir" -#: builtin/checkout.c:1860 +#: builtin/checkout.c:1881 msgid "restore the working tree (default)" msgstr "çalışma ağacını eski durumuna getir" -#: builtin/checkout.c:1862 +#: builtin/checkout.c:1883 msgid "ignore unmerged entries" msgstr "birleştirilmemiş girdileri yok say" -#: builtin/checkout.c:1863 +#: builtin/checkout.c:1884 msgid "use overlay mode" msgstr "yerpaylaşım kipini kullan" @@ -12502,11 +12663,6 @@ msgstr "%s dizini atlanıyor\n" msgid "Would skip repository %s\n" msgstr "%s dizini atlanacak\n" -#: builtin/clean.c:37 -#, c-format -msgid "failed to remove %s" -msgstr "%s kaldırılamadı" - #: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" @@ -12616,8 +12772,8 @@ msgid "remove whole directories" msgstr "dizinleri tümüyle kaldır" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186 -#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "dizgi" @@ -12658,164 +12814,169 @@ msgstr "-x ve -X birlikte kullanılamaz" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<seçenekler>] [--] <depo> [<dizin>]" -#: builtin/clone.c:94 +#: builtin/clone.c:96 +msgid "don't clone shallow repository" +msgstr "sığ depoyu klonlama" + +#: builtin/clone.c:98 msgid "don't create a checkout" msgstr "çıkış yapma!" -#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541 msgid "create a bare repository" msgstr "çıplak bir depo oluştur" -#: builtin/clone.c:99 +#: builtin/clone.c:103 msgid "create a mirror repository (implies bare)" msgstr "bir yansı depo oluştur (çıplak ima eder)" -#: builtin/clone.c:101 +#: builtin/clone.c:105 msgid "to clone from a local repository" msgstr "bir yerel depodan klonla" -#: builtin/clone.c:103 +#: builtin/clone.c:107 msgid "don't use local hardlinks, always copy" msgstr "yerel sabit bağları kullanma, her zaman kopyala" -#: builtin/clone.c:105 +#: builtin/clone.c:109 msgid "setup as shared repository" msgstr "paylaşılan depo ayarla" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "pathspec" msgstr "yol belirteci" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "initialize submodules in the clone" msgstr "klon içerisindeki altmodülleri ilklendir" -#: builtin/clone.c:111 +#: builtin/clone.c:115 msgid "number of submodules cloned in parallel" msgstr "paralelde klonlanan altmodüllerin sayısı" -#: builtin/clone.c:112 builtin/init-db.c:552 +#: builtin/clone.c:116 builtin/init-db.c:538 msgid "template-directory" msgstr "şablon dizini" -#: builtin/clone.c:113 builtin/init-db.c:553 +#: builtin/clone.c:117 builtin/init-db.c:539 msgid "directory from which templates will be used" msgstr "şablonların kullanılacağı dizin" -#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 -#: builtin/submodule--helper.c:2336 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832 +#: builtin/submodule--helper.c:2337 msgid "reference repository" msgstr "başvuru deposu" -#: builtin/clone.c:119 builtin/submodule--helper.c:1833 -#: builtin/submodule--helper.c:2338 +#: builtin/clone.c:123 builtin/submodule--helper.c:1834 +#: builtin/submodule--helper.c:2339 msgid "use --reference only while cloning" msgstr "--reference'ı yalnızca klonlarken kullan" -#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357 +#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495 +#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 msgid "name" msgstr "ad" -#: builtin/clone.c:121 +#: builtin/clone.c:125 msgid "use <name> instead of 'origin' to track upstream" msgstr "üstkaynağı izlemek için 'origin' yerine <ad> kullan" -#: builtin/clone.c:123 +#: builtin/clone.c:127 msgid "checkout <branch> instead of the remote's HEAD" msgstr "uzak konumun HEAD'i yerine <dal>'ı çıkış yap" -#: builtin/clone.c:125 +#: builtin/clone.c:129 msgid "path to git-upload-pack on the remote" msgstr "uzak konumdaki git-upload-pack'e olan yol" -#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863 #: builtin/pull.c:208 msgid "depth" msgstr "derinlik" -#: builtin/clone.c:127 +#: builtin/clone.c:131 msgid "create a shallow clone of that depth" msgstr "verilen derinlikte sığ bir depo oluştur" -#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804 #: builtin/pull.c:211 msgid "time" msgstr "zaman" -#: builtin/clone.c:129 +#: builtin/clone.c:133 msgid "create a shallow clone since a specific time" msgstr "verilen zamandan sonrasını içeren bir sığ depo oluştur" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323 +#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318 msgid "revision" msgstr "revizyon" -#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215 +#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "revizyonu hariç tutarak sığ klonun geçmişini derinleştir" -#: builtin/clone.c:133 builtin/submodule--helper.c:1843 -#: builtin/submodule--helper.c:2352 +#: builtin/clone.c:137 builtin/submodule--helper.c:1844 +#: builtin/submodule--helper.c:2353 msgid "clone only one branch, HEAD or --branch" msgstr "yalnızca bir dal klonla, HEAD veya --branch" -#: builtin/clone.c:135 +#: builtin/clone.c:139 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "etiket klonlama ve sonraki getirmeler de onları izlemesin" -#: builtin/clone.c:137 +#: builtin/clone.c:141 msgid "any cloned submodules will be shallow" msgstr "klonlanan altmodüller sığ olacak" -#: builtin/clone.c:138 builtin/init-db.c:561 +#: builtin/clone.c:142 builtin/init-db.c:547 msgid "gitdir" msgstr "git dizini" -#: builtin/clone.c:139 builtin/init-db.c:562 +#: builtin/clone.c:143 builtin/init-db.c:548 msgid "separate git dir from working tree" msgstr "git dizinini çalışma ağacından ayır" -#: builtin/clone.c:140 +#: builtin/clone.c:144 msgid "key=value" msgstr "anahtar=değer" -#: builtin/clone.c:141 +#: builtin/clone.c:145 msgid "set config inside the new repository" msgstr "yapılandırmayı yeni deponun içinde ayarla" -#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 #: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "sunucuya özel" -#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 #: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "iletme seçeneği" -#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234 +#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 #: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "yalnızca IPv4 adresleri kullan" -#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237 +#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 #: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "yalnızca IPv6 adresleri kullan" -#: builtin/clone.c:150 +#: builtin/clone.c:154 msgid "any cloned submodules will use their remote-tracking branch" msgstr "klonlanan herhangi bir altmodül kendi uzak izleme dallarını kullanacak" -#: builtin/clone.c:152 +#: builtin/clone.c:156 msgid "initialize sparse-checkout file to include only files at root" msgstr "" "sparse-checkout dosyasını yalnızca kökteki dosyaları içerecek biçimde " "ilklendir" -#: builtin/clone.c:288 +#: builtin/clone.c:292 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12823,42 +12984,42 @@ msgstr "" "Bir dizin adı tahmin edilemedi.\n" "Lütfen komut satırında bir dizin belirtin." -#: builtin/clone.c:341 +#: builtin/clone.c:345 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: '%s' için alternatif eklenemedi: %s\n" -#: builtin/clone.c:414 +#: builtin/clone.c:418 #, c-format msgid "%s exists and is not a directory" msgstr "%s var ve bir dizin değil" -#: builtin/clone.c:432 +#: builtin/clone.c:436 #, c-format msgid "failed to start iterator over '%s'" msgstr "yineleyici '%s' üzerinden çalıştırılamadı" -#: builtin/clone.c:463 +#: builtin/clone.c:467 #, c-format msgid "failed to create link '%s'" msgstr "'%s' bağı oluşturulamadı" -#: builtin/clone.c:467 +#: builtin/clone.c:471 #, c-format msgid "failed to copy file to '%s'" msgstr "dosya şuraya kopyalanamadı: '%s'" -#: builtin/clone.c:472 +#: builtin/clone.c:476 #, c-format msgid "failed to iterate over '%s'" msgstr "'%s' üzerinde yinelenemedi" -#: builtin/clone.c:499 +#: builtin/clone.c:503 #, c-format msgid "done.\n" msgstr "bitti.\n" -#: builtin/clone.c:513 +#: builtin/clone.c:517 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12868,147 +13029,147 @@ msgstr "" "Neyin çıkış yapılıp yapılmadığını 'git status' ile inceleyebilir\n" "ve 'git restore --source=HEAD' ile yeniden deneyebilirsiniz.\n" -#: builtin/clone.c:590 +#: builtin/clone.c:594 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Klonlanacak %s uzak dal bulunamadı." -#: builtin/clone.c:709 +#: builtin/clone.c:713 #, c-format msgid "unable to update %s" msgstr "%s güncellenemiyor" -#: builtin/clone.c:757 +#: builtin/clone.c:761 msgid "failed to initialize sparse-checkout" msgstr "sparse-checkout ilklendirilemedi" -#: builtin/clone.c:780 +#: builtin/clone.c:784 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "uzak konum HEAD'i var olmayan başvuruya bağlanıyor, çıkış yapılamıyor.\n" -#: builtin/clone.c:812 +#: builtin/clone.c:816 msgid "unable to checkout working tree" msgstr "çalışma ağacı çıkış yapılamıyor" -#: builtin/clone.c:887 +#: builtin/clone.c:894 msgid "unable to write parameters to config file" msgstr "parametreler yapılandırma dosyasına yazılamıyor" -#: builtin/clone.c:950 +#: builtin/clone.c:957 msgid "cannot repack to clean up" msgstr "temizlik için yeniden paketlenemiyor" -#: builtin/clone.c:952 +#: builtin/clone.c:959 msgid "cannot unlink temporary alternates file" msgstr "geçici alternatifler dosyasının bağlantısı kesilemiyor" -#: builtin/clone.c:993 builtin/receive-pack.c:2493 +#: builtin/clone.c:1001 builtin/receive-pack.c:2491 msgid "Too many arguments." msgstr "Çok fazla argüman." -#: builtin/clone.c:997 +#: builtin/clone.c:1005 msgid "You must specify a repository to clone." msgstr "Klonlamak için bir depo belirtmelisiniz." -#: builtin/clone.c:1010 +#: builtin/clone.c:1018 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare ve --origin %s seçenekleri birbiriyle uyumsuz." -#: builtin/clone.c:1013 +#: builtin/clone.c:1021 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare ve --separate-git-dir birbiriyle uyumsuz." -#: builtin/clone.c:1026 +#: builtin/clone.c:1035 #, c-format msgid "repository '%s' does not exist" msgstr "'%s' deposu mevcut değil" -#: builtin/clone.c:1030 builtin/fetch.c:1951 +#: builtin/clone.c:1039 builtin/fetch.c:2011 #, c-format msgid "depth %s is not a positive number" msgstr "%s derinliği pozitif bir sayı değil" -#: builtin/clone.c:1040 +#: builtin/clone.c:1049 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "Hedef yolu '%s' halihazırda mevcut ve boş bir dizin değil." -#: builtin/clone.c:1046 +#: builtin/clone.c:1055 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "Depo yolu '%s' halihazırda mevcut ve boş bir dizin değil." -#: builtin/clone.c:1060 +#: builtin/clone.c:1069 #, c-format msgid "working tree '%s' already exists." msgstr "Çalışma ağacı '%s' halihazırda mevcut." -#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271 -#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 +#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314 #, c-format msgid "could not create leading directories of '%s'" msgstr "şunun öncü dizinleri oluşturulamadı: '%s'" -#: builtin/clone.c:1080 +#: builtin/clone.c:1089 #, c-format msgid "could not create work tree dir '%s'" msgstr "'%s' çalışma ağacı dizini oluşturulamadı" -#: builtin/clone.c:1100 +#: builtin/clone.c:1109 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "'%s' çıplak deposuna klonlanıyor...\n" -#: builtin/clone.c:1102 +#: builtin/clone.c:1111 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonlama konumu: '%s'...\n" -#: builtin/clone.c:1126 +#: builtin/clone.c:1135 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" "clone --recursive hem --reference hem --reference-if-able ile uyumlu değil" -#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705 +#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' geçerli bir uzak konum adı değil" -#: builtin/clone.c:1211 +#: builtin/clone.c:1229 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth yerel klonlarda yok sayılır; yerine file:// kullanın." -#: builtin/clone.c:1213 +#: builtin/clone.c:1231 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since yerel klonlarda yok sayılır; yerine file:// kullanın." -#: builtin/clone.c:1215 +#: builtin/clone.c:1233 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude yerel klonlarda yok sayılır; yerine file:// kullanın." -#: builtin/clone.c:1217 +#: builtin/clone.c:1235 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter yerel klonlarda yok sayılır; yerine file:// kullanın." -#: builtin/clone.c:1220 +#: builtin/clone.c:1240 msgid "source repository is shallow, ignoring --local" msgstr "kaynak depo sığ, --local yok sayılıyor" -#: builtin/clone.c:1225 +#: builtin/clone.c:1245 msgid "--local is ignored" msgstr "--local yok sayıldı" -#: builtin/clone.c:1315 builtin/clone.c:1323 +#: builtin/clone.c:1337 builtin/clone.c:1345 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "%s uzak dalı %s üstkaynağında bulunamadı" -#: builtin/clone.c:1326 +#: builtin/clone.c:1348 msgid "You appear to have cloned an empty repository." msgstr "Boş bir depoyu klonlamış görünüyorsunuz." @@ -13025,19 +13186,19 @@ msgid "layout to use" msgstr "kullanılacak yerleşim" #: builtin/column.c:30 -msgid "Maximum width" +msgid "maximum width" msgstr "olabilecek en çok genişlik" #: builtin/column.c:31 -msgid "Padding space on left border" +msgid "padding space on left border" msgstr "sol kenardaki dolgu boşluğu" #: builtin/column.c:32 -msgid "Padding space on right border" +msgid "padding space on right border" msgstr "sağ kenardaki dolgu boşluğu" #: builtin/column.c:33 -msgid "Padding space between columns" +msgid "padding space between columns" msgstr "sütunlar arasındaki dolgu boşluğu" #: builtin/column.c:51 @@ -13066,7 +13227,7 @@ msgid "could not find object directory matching %s" msgstr "'%s' ile eşleşen nesne dizini bulunamadı" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768 +#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776 msgid "dir" msgstr "dizin" @@ -13164,7 +13325,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "yinelenmiş üst öge %s yok sayıldı" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559 #, c-format msgid "not a valid object name %s" msgstr "%s geçerli bir nesne adı değil" @@ -13192,13 +13353,13 @@ msgstr "üst öge" msgid "id of a parent commit object" msgstr "bir üst işleme ögesinin no'su" -#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537 -#: builtin/tag.c:445 +#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605 +#: builtin/tag.c:456 msgid "message" msgstr "ileti" -#: builtin/commit-tree.c:115 builtin/commit.c:1504 +#: builtin/commit-tree.c:115 builtin/commit.c:1614 msgid "commit message" msgstr "işleme iletisi" @@ -13206,7 +13367,7 @@ msgstr "işleme iletisi" msgid "read commit log message from file" msgstr "işleme günlük iletisini dosyadan oku" -#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299 +#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "işlemeyi GPG ile imzala" @@ -13281,73 +13442,73 @@ msgstr "" "\tgit cherry-pick --continue\n" "\n" -#: builtin/commit.c:312 +#: builtin/commit.c:324 msgid "failed to unpack HEAD tree object" msgstr "HEAD ağaç nesnesi açılamadı" -#: builtin/commit.c:348 +#: builtin/commit.c:360 msgid "--pathspec-from-file with -a does not make sense" msgstr "--pathspec-from-file, -a ile bir anlam ifade etmiyor" -#: builtin/commit.c:361 +#: builtin/commit.c:374 msgid "No paths with --include/--only does not make sense." msgstr "--include/--only içermeyen yollar bir anlam ifade etmiyor." -#: builtin/commit.c:373 +#: builtin/commit.c:386 msgid "unable to create temporary index" msgstr "geçici indeks oluşturulamıyor" -#: builtin/commit.c:382 +#: builtin/commit.c:395 msgid "interactive add failed" msgstr "etkileşimli ekleme başarısız" -#: builtin/commit.c:397 +#: builtin/commit.c:410 msgid "unable to update temporary index" msgstr "geçici indeks güncellenemiyor" -#: builtin/commit.c:399 +#: builtin/commit.c:412 msgid "Failed to update main cache tree" msgstr "Ana önbellek ağacı güncellenemedi" -#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 +#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508 msgid "unable to write new_index file" msgstr "new_index_file yazılamıyor" -#: builtin/commit.c:476 +#: builtin/commit.c:489 msgid "cannot do a partial commit during a merge." msgstr "Bir birleştirme sırasında kısmi işleme yapılamaz." -#: builtin/commit.c:478 +#: builtin/commit.c:491 msgid "cannot do a partial commit during a cherry-pick." msgstr "Bir seç-al sırasında kısmi işleme yapılamaz." -#: builtin/commit.c:480 +#: builtin/commit.c:493 msgid "cannot do a partial commit during a rebase." msgstr "Bir yeniden temellendirme sırasında kısmi işleme yapılamaz." -#: builtin/commit.c:488 +#: builtin/commit.c:501 msgid "cannot read the index" msgstr "indeks okunamıyor" -#: builtin/commit.c:507 +#: builtin/commit.c:520 msgid "unable to write temporary index file" msgstr "geçici indeks dosyası yazılamıyor" -#: builtin/commit.c:605 +#: builtin/commit.c:618 #, c-format msgid "commit '%s' lacks author header" msgstr "'%s' işlemesinde yazar üstbilgisi yok" -#: builtin/commit.c:607 +#: builtin/commit.c:620 #, c-format msgid "commit '%s' has malformed author line" msgstr "'%s' işlemesindeki yazar satırı hatalı oluşturulmuş" -#: builtin/commit.c:626 +#: builtin/commit.c:639 msgid "malformed --author parameter" msgstr "hatalı oluşturulmuş --author parametresi" -#: builtin/commit.c:679 +#: builtin/commit.c:692 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -13355,38 +13516,43 @@ msgstr "" "mevcut işleme iletisinde kullanılmayan bir yorum\n" "karakteri seçilemiyor" -#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 +#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158 #, c-format msgid "could not lookup commit %s" msgstr "%s işlemesi aranamadı" -#: builtin/commit.c:729 builtin/shortlog.c:413 +#: builtin/commit.c:758 builtin/shortlog.c:413 #, c-format msgid "(reading log message from standard input)\n" msgstr "(günlük iletisi standart girdi'den okunuyor)\n" -#: builtin/commit.c:731 +#: builtin/commit.c:760 msgid "could not read log from standard input" msgstr "günlük standart girdi'den okunamadı" -#: builtin/commit.c:735 +#: builtin/commit.c:764 #, c-format msgid "could not read log file '%s'" msgstr "günlük dosyası '%s' okunamadı" -#: builtin/commit.c:766 builtin/commit.c:782 +#: builtin/commit.c:801 +#, c-format +msgid "cannot combine -m with --fixup:%s" +msgstr "--fixup:%s ile -m birlikte kullanılamaz" + +#: builtin/commit.c:813 builtin/commit.c:829 msgid "could not read SQUASH_MSG" msgstr "SQUASH_MSG okunamadı" -#: builtin/commit.c:773 +#: builtin/commit.c:820 msgid "could not read MERGE_MSG" msgstr "MERGE_MSG okunamadı" -#: builtin/commit.c:833 +#: builtin/commit.c:880 msgid "could not write commit template" msgstr "işleme şablonu yazılamadı" -#: builtin/commit.c:853 +#: builtin/commit.c:900 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -13400,7 +13566,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "ve yeniden deneyin.\n" -#: builtin/commit.c:858 +#: builtin/commit.c:905 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13414,7 +13580,7 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "ve yeniden deneyin.\n" -#: builtin/commit.c:868 +#: builtin/commit.c:915 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13423,7 +13589,7 @@ msgstr "" "Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n" "satırlar yok sayılacaktır. Boş bir ileti işlemeyi iptal eder.\n" -#: builtin/commit.c:876 +#: builtin/commit.c:923 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13434,150 +13600,181 @@ msgstr "" "satırlar tutulacaktır; isterseniz onları kaldırabilirsiniz.\n" "Boş bir ileti işlemeyi iptal eder.\n" -#: builtin/commit.c:893 +#: builtin/commit.c:940 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sYazar: %.*s <%.*s>" -#: builtin/commit.c:901 +#: builtin/commit.c:948 #, c-format msgid "%sDate: %s" msgstr "%sTarih: %s" -#: builtin/commit.c:908 +#: builtin/commit.c:955 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sİşleyici: %.*s <%.*s>" -#: builtin/commit.c:926 +#: builtin/commit.c:973 msgid "Cannot read index" msgstr "İndeks okunamıyor" -#: builtin/commit.c:997 +#: builtin/commit.c:1018 +msgid "unable to pass trailers to --trailers" +msgstr "--trailers'a artbilgiler geçirilemiyor" + +#: builtin/commit.c:1058 msgid "Error building trees" msgstr "Ağaçlar yapılırken hata" -#: builtin/commit.c:1011 builtin/tag.c:308 +#: builtin/commit.c:1072 builtin/tag.c:319 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Lütfen iletiyi -m veya -F seçeneğini kullanarak destekleyin.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1116 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s', 'Ad <e-posta>' biçiminde değil ve mevcut bir yazarla " "eşleşmiyor" -#: builtin/commit.c:1069 +#: builtin/commit.c:1130 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Geçersiz yok sayılanları göster kipi '%s'" -#: builtin/commit.c:1087 builtin/commit.c:1331 +#: builtin/commit.c:1148 builtin/commit.c:1441 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Geçersiz izlenmeyen dosyaları göster kipi '%s'" -#: builtin/commit.c:1127 +#: builtin/commit.c:1188 msgid "--long and -z are incompatible" msgstr "--long ve -z birbiriyle uyumsuz" -#: builtin/commit.c:1171 +#: builtin/commit.c:1219 +msgid "You are in the middle of a merge -- cannot reword." +msgstr "Bir birleştirmenin tam ortasındasınız -- ileti değiştirilemiyor." + +#: builtin/commit.c:1221 +msgid "You are in the middle of a cherry-pick -- cannot reword." +msgstr "Bir seç-al'ın tam ortasındasınız -- ileti değiştirilemiyor." + +#: builtin/commit.c:1224 +#, c-format +msgid "cannot combine reword option of --fixup with path '%s'" +msgstr "" +"--fixup'ın ileti değiştirme seçeneği '%s' yolu ile birlikte kullanılamıyor" + +#: builtin/commit.c:1226 +msgid "" +"reword option of --fixup is mutually exclusive with --patch/--interactive/--" +"all/--include/--only" +msgstr "" +"--fixup'ın ileti değiştirme seçeneği --patch/--interactive/--all/--include/" +"--only ile birlikte kullanılamaz" + +#: builtin/commit.c:1245 msgid "Using both --reset-author and --author does not make sense" msgstr "Hem --reset-author ve hem --author birlikte bir anlam ifade etmiyor" -#: builtin/commit.c:1180 +#: builtin/commit.c:1254 msgid "You have nothing to amend." msgstr "Değiştirecek bir şeyiniz yok." -#: builtin/commit.c:1183 +#: builtin/commit.c:1257 msgid "You are in the middle of a merge -- cannot amend." msgstr "Bir birleştirmenin tam ortasındasınız -- değiştirme yapılamıyor." -#: builtin/commit.c:1185 +#: builtin/commit.c:1259 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Bir seç-al'ın tam ortasındasınız -- değiştirme yapılamıyor." -#: builtin/commit.c:1187 +#: builtin/commit.c:1261 msgid "You are in the middle of a rebase -- cannot amend." msgstr "" "Bir yeniden temellendirmenin tam ortasındasınız -- değiştirme yapılamıyor." -#: builtin/commit.c:1190 +#: builtin/commit.c:1264 msgid "Options --squash and --fixup cannot be used together" msgstr "--squash ve --fixup seçenekleri birlikte kullanılamaz" -#: builtin/commit.c:1200 +#: builtin/commit.c:1274 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "-c/-C/-F/--fixup arasından yalnızca bir tanesi kullanılabilir." -#: builtin/commit.c:1202 +#: builtin/commit.c:1276 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "-m seçeneği -c/-C/-F ile birlikte kullanılamaz." -#: builtin/commit.c:1211 +#: builtin/commit.c:1285 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "--reset-author yalnızca -C, -c veya --amend ile birlikte kullanılabilir." -#: builtin/commit.c:1229 +#: builtin/commit.c:1303 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "--include/--only/--all/--interactive/--patch arasından yalnızca bir tanesi " "kullanılabilir." -#: builtin/commit.c:1235 +#: builtin/commit.c:1331 +#, c-format +msgid "unknown option: --fixup=%s:%s" +msgstr "bilinmeyen seçenek: --fixup=%s:%s" + +#: builtin/commit.c:1345 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "'%s ...' yolları -a ile bir anlam ifade etmiyor" -#: builtin/commit.c:1366 builtin/commit.c:1527 +#: builtin/commit.c:1476 builtin/commit.c:1642 msgid "show status concisely" msgstr "durumu kısaca göster" -#: builtin/commit.c:1368 builtin/commit.c:1529 +#: builtin/commit.c:1478 builtin/commit.c:1644 msgid "show branch information" msgstr "dal bilgisini göster" -#: builtin/commit.c:1370 +#: builtin/commit.c:1480 msgid "show stash information" msgstr "zula bilgisini göster" -#: builtin/commit.c:1372 builtin/commit.c:1531 +#: builtin/commit.c:1482 builtin/commit.c:1646 msgid "compute full ahead/behind values" msgstr "tam önünde/arkasında değerlerini hesapla" -#: builtin/commit.c:1374 +#: builtin/commit.c:1484 msgid "version" msgstr "sürüm" -#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 -#: builtin/worktree.c:679 +#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560 +#: builtin/worktree.c:681 msgid "machine-readable output" msgstr "makine tarafından okunabilir çıktı" -#: builtin/commit.c:1377 builtin/commit.c:1535 +#: builtin/commit.c:1487 builtin/commit.c:1650 msgid "show status in long format (default)" msgstr "durumu uzun biçimde göster (öntanımlı)" -#: builtin/commit.c:1380 builtin/commit.c:1538 +#: builtin/commit.c:1490 builtin/commit.c:1653 msgid "terminate entries with NUL" msgstr "girdileri NUL ile sonlandır" -#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656 #: builtin/fast-export.c:1198 builtin/fast-export.c:1201 -#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336 +#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 msgid "mode" msgstr "kip" -#: builtin/commit.c:1383 builtin/commit.c:1541 +#: builtin/commit.c:1493 builtin/commit.c:1656 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "izlenmeyen dosyaları göster, ist. bağlı kipler: all, normal, no (Öntanım.: " "all)" -#: builtin/commit.c:1387 +#: builtin/commit.c:1497 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13585,11 +13782,11 @@ msgstr "" "yok sayılan dosyaları göster, isteğe bağlı kipler: traditional (geleneksel) " "matching (eşleşen), no (hayır) (Öntanımlı: traditional)." -#: builtin/commit.c:1389 parse-options.h:192 +#: builtin/commit.c:1499 parse-options.h:193 msgid "when" msgstr "ne zaman" -#: builtin/commit.c:1390 +#: builtin/commit.c:1500 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -13597,177 +13794,198 @@ msgstr "" "altmodüllere olan değişiklikleri yok say, isteğe bağlı ne zaman: all " "(hepsi), dirty (kirli), untracked (izlenmeyen) (Öntanımlı: all)." -#: builtin/commit.c:1392 +#: builtin/commit.c:1502 msgid "list untracked files in columns" msgstr "izlenmeyen dosyaları sütunlarla göster" -#: builtin/commit.c:1393 +#: builtin/commit.c:1503 msgid "do not detect renames" msgstr "yeniden adlandırmaları algılama" -#: builtin/commit.c:1395 +#: builtin/commit.c:1505 msgid "detect renames, optionally set similarity index" msgstr "" "yeniden adlandırmaları algıla, isteğe bağlı olarak benzerlik indeksi ayarla" -#: builtin/commit.c:1415 +#: builtin/commit.c:1525 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Yok sayılan ve izlenmeyen dosyalar argümanlarının desteklenmeyen birlikte " "kullanımı" -#: builtin/commit.c:1497 +#: builtin/commit.c:1607 msgid "suppress summary after successful commit" msgstr "başarılı işlemenin ardından özeti gizle" -#: builtin/commit.c:1498 +#: builtin/commit.c:1608 msgid "show diff in commit message template" msgstr "diff'i işleme iletisi şablonunda göster" -#: builtin/commit.c:1500 +#: builtin/commit.c:1610 msgid "Commit message options" msgstr "İşleme iletisi seçenekleri" -#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447 +#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458 msgid "read message from file" msgstr "iletiyi dosyadan oku" -#: builtin/commit.c:1502 +#: builtin/commit.c:1612 msgid "author" msgstr "yazar" -#: builtin/commit.c:1502 +#: builtin/commit.c:1612 msgid "override author for commit" msgstr "işleme yazarını geçersiz kıl" -#: builtin/commit.c:1503 builtin/gc.c:550 +#: builtin/commit.c:1613 builtin/gc.c:550 msgid "date" msgstr "tarih" -#: builtin/commit.c:1503 +#: builtin/commit.c:1613 msgid "override date for commit" msgstr "işleme tarihini geçersiz kıl" -#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 -#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90 +#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622 +#: parse-options.h:329 ref-filter.h:90 msgid "commit" msgstr "işleme" -#: builtin/commit.c:1505 +#: builtin/commit.c:1615 msgid "reuse and edit message from specified commit" msgstr "belirtilen işlemenin iletisini düzenle ve yeniden kullan" -#: builtin/commit.c:1506 +#: builtin/commit.c:1616 msgid "reuse message from specified commit" msgstr "belirtilen işlemenin iletisini yeniden kullan" -#: builtin/commit.c:1507 -msgid "use autosquash formatted message to fixup specified commit" +#. TRANSLATORS: Leave "[(amend|reword):]" as-is, +#. and only translate <commit>. +#. +#: builtin/commit.c:1621 +msgid "[(amend|reword):]commit" +msgstr "[(amend|reword):]işleme" + +#: builtin/commit.c:1621 +msgid "" +"use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" -"belirtilen işlemeyi düzeltmek için kendiliğinden tıkıştırma tarafından " -"biçimlendirilen iletiyi kullan" +"belirtilen işlemeyi değiştirmek/iletiyi yeniden yazmak için kendiliğinden " +"tıkıştırma tarafından biçimlendirilen iletiyi kullan" -#: builtin/commit.c:1508 +#: builtin/commit.c:1622 msgid "use autosquash formatted message to squash specified commit" msgstr "" "belirtilen işlemeyi tıkıştırmak için kendiliğinden tıkıştırma tarafından " "biçimlendirilen iletiyi kullan" -#: builtin/commit.c:1509 +#: builtin/commit.c:1623 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "işlemenin yazarı şu andan itibaren benim (-C/-c/--amend ile kullanıldı)" -#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302 +#: builtin/commit.c:1624 builtin/interpret-trailers.c:111 +msgid "trailer" +msgstr "artbilgi" + +#: builtin/commit.c:1624 +msgid "add custom trailer(s)" +msgstr "özel artbilgiler ekle" + +#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "bir Signed-off-by artbilgisi ekle" -#: builtin/commit.c:1511 +#: builtin/commit.c:1626 msgid "use specified template file" msgstr "belirtilen şablon dosyasını kullan" -#: builtin/commit.c:1512 +#: builtin/commit.c:1627 msgid "force edit of commit" msgstr "işlemeyi zorla düzenle" -#: builtin/commit.c:1514 +#: builtin/commit.c:1629 msgid "include status in commit message template" msgstr "işleme iletisi şablonunda durumu içer" -#: builtin/commit.c:1519 +#: builtin/commit.c:1634 msgid "Commit contents options" msgstr "İşleme içeriği seçenekleri" -#: builtin/commit.c:1520 +#: builtin/commit.c:1635 msgid "commit all changed files" msgstr "değiştirilen tüm dosyaları gönder" -#: builtin/commit.c:1521 +#: builtin/commit.c:1636 msgid "add specified files to index for commit" msgstr "belirtilen dosyaları işleme için indekse ekle" -#: builtin/commit.c:1522 +#: builtin/commit.c:1637 msgid "interactively add files" msgstr "dosyaları etkileşimli olarak ekle" -#: builtin/commit.c:1523 +#: builtin/commit.c:1638 msgid "interactively add changes" msgstr "değişiklikleri etkileşimli olarak ekle" -#: builtin/commit.c:1524 +#: builtin/commit.c:1639 msgid "commit only specified files" msgstr "yalnızca belirtilen dosyaları gönder" -#: builtin/commit.c:1525 +#: builtin/commit.c:1640 msgid "bypass pre-commit and commit-msg hooks" msgstr "pre-commit ve commit-msg kancalarını atla" -#: builtin/commit.c:1526 +#: builtin/commit.c:1641 msgid "show what would be committed" msgstr "neyin işleneceğini göster" -#: builtin/commit.c:1539 +#: builtin/commit.c:1654 msgid "amend previous commit" msgstr "önceki işlemeyi değiştir" -#: builtin/commit.c:1540 +#: builtin/commit.c:1655 msgid "bypass post-rewrite hook" msgstr "post-rewrite kancasını atla" -#: builtin/commit.c:1547 +#: builtin/commit.c:1662 msgid "ok to record an empty change" msgstr "boş bir değişikliğin kaydı yazılabilir" -#: builtin/commit.c:1549 +#: builtin/commit.c:1664 msgid "ok to record a change with an empty message" msgstr "boş iletili bir değişikliğin kaydı yazılabilir" -#: builtin/commit.c:1622 +#: builtin/commit.c:1737 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Hasar görmüş MERGE_HEAD dosyası (%s)" -#: builtin/commit.c:1629 +#: builtin/commit.c:1744 msgid "could not read MERGE_MODE" msgstr "MERGE_MODE okunamadı" -#: builtin/commit.c:1650 +#: builtin/commit.c:1765 #, c-format msgid "could not read commit message: %s" msgstr "işleme iletisi okunamadı: %s" -#: builtin/commit.c:1657 +#: builtin/commit.c:1772 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "İşleme iletisinin boş olmasından dolayı iptal ediliyor.\n" -#: builtin/commit.c:1662 +#: builtin/commit.c:1777 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "İşleme iptal ediliyor; iletiyi düzenlenmedi.\n" -#: builtin/commit.c:1696 +#: builtin/commit.c:1788 +#, c-format +msgid "Aborting commit due to empty commit message body.\n" +msgstr "İşleme iletisi gövdesinin boş olmasından dolayı iptal ediliyor.\n" + +#: builtin/commit.c:1824 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -14112,7 +14330,7 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "yazdırma boyutları kişi tarafından okunabilir biçimde" -#: builtin/credential-cache--daemon.c:226 +#: builtin/credential-cache--daemon.c:227 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -14125,11 +14343,11 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: builtin/credential-cache--daemon.c:275 +#: builtin/credential-cache--daemon.c:276 msgid "print debugging messages to stderr" msgstr "hata ayıklama iletilerini stderr'e yazdır" -#: builtin/credential-cache--daemon.c:315 +#: builtin/credential-cache--daemon.c:316 msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "credential-cache-daemon kullanılamıyor; unix soket desteği yok" @@ -14334,7 +14552,7 @@ msgstr "%s...%s: birleştirme temeli yok" msgid "Not a git repository" msgstr "Bir git deposu değil" -#: builtin/diff.c:532 builtin/grep.c:682 +#: builtin/diff.c:532 builtin/grep.c:684 #, c-format msgid "invalid object '%s' given." msgstr "geçersiz nesne '%s' verildi" @@ -14354,31 +14572,31 @@ msgstr "ele alınmayan nesne '%s' verildi" msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s: çoklu birleştirme temelleri, %s kullanılıyor" -#: builtin/difftool.c:30 +#: builtin/difftool.c:31 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<seçenekler>] [<işleme> [<işleme>]] [--] [<yol>...]" -#: builtin/difftool.c:260 +#: builtin/difftool.c:261 #, c-format msgid "failed: %d" msgstr "başarısız: %d" -#: builtin/difftool.c:302 +#: builtin/difftool.c:303 #, c-format msgid "could not read symlink %s" msgstr "%s sembolik bağı okunamadı" -#: builtin/difftool.c:304 +#: builtin/difftool.c:305 #, c-format msgid "could not read symlink file %s" msgstr "%s sembolik bağ dosyası okunamadı" -#: builtin/difftool.c:312 +#: builtin/difftool.c:313 #, c-format msgid "could not read object %s for symlink %s" msgstr "%s nesnesi %s sembolik bağı için okunamadı" -#: builtin/difftool.c:412 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -14386,53 +14604,53 @@ msgstr "" "Birleştirilmiş diff biçimleri (-c ve --cc) dizin diff kipinde\n" "(-d ve --dir-diff) desteklenmiyor." -#: builtin/difftool.c:633 +#: builtin/difftool.c:637 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "Her iki dosya da değiştirildi: '%s' ve '%s'." -#: builtin/difftool.c:635 +#: builtin/difftool.c:639 msgid "working tree file has been left." msgstr "Çalışma ağacı dosyası bırakıldı." -#: builtin/difftool.c:646 +#: builtin/difftool.c:650 #, c-format msgid "temporary files exist in '%s'." msgstr "'%s' konumunda geçici dosyalar var." -#: builtin/difftool.c:647 +#: builtin/difftool.c:651 msgid "you may want to cleanup or recover these." msgstr "Bunları temizlemek veya kurtarmak isteyebilirsiniz." -#: builtin/difftool.c:696 +#: builtin/difftool.c:700 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "'diff.tool' yerine 'diff.guitool' kullan" -#: builtin/difftool.c:698 +#: builtin/difftool.c:702 msgid "perform a full-directory diff" msgstr "bir tam dizin diff'i gerçekleştir" -#: builtin/difftool.c:700 +#: builtin/difftool.c:704 msgid "do not prompt before launching a diff tool" msgstr "bir diff aracı çalıştırmadan önce sorma" -#: builtin/difftool.c:705 +#: builtin/difftool.c:709 msgid "use symlinks in dir-diff mode" msgstr "dir-diff kipinde sembolik bağlar kullan" -#: builtin/difftool.c:706 +#: builtin/difftool.c:710 msgid "tool" msgstr "araç" -#: builtin/difftool.c:707 +#: builtin/difftool.c:711 msgid "use the specified diff tool" msgstr "belirtilen diff aracını kullan" -#: builtin/difftool.c:709 +#: builtin/difftool.c:713 msgid "print a list of diff tools that may be used with `--tool`" msgstr "'-tool' ile birlikte kullanılabilecek diff araçlarının listesini çıkar" -#: builtin/difftool.c:712 +#: builtin/difftool.c:716 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -14440,31 +14658,31 @@ msgstr "" "çalıştırılan bir diff aracı sıfır olmayan bir çıkış kodu döndürdüğünde 'git-" "difftool'un çıkış yapmasını sağla" -#: builtin/difftool.c:715 +#: builtin/difftool.c:719 msgid "specify a custom command for viewing diffs" msgstr "diff'leri görüntülemek için özel bir komut belirle" -#: builtin/difftool.c:716 +#: builtin/difftool.c:720 msgid "passed to `diff`" msgstr "'diff'e aktarıldı" -#: builtin/difftool.c:731 +#: builtin/difftool.c:735 msgid "difftool requires worktree or --no-index" msgstr "difftool, çalışma ağacı veya --no-index gerektiriyor" -#: builtin/difftool.c:738 +#: builtin/difftool.c:742 msgid "--dir-diff is incompatible with --no-index" msgstr "-dir-diff, --no-index ile uyumsuz" -#: builtin/difftool.c:741 +#: builtin/difftool.c:745 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool ve --extcmd birlikte kullanılamaz" -#: builtin/difftool.c:749 +#: builtin/difftool.c:753 msgid "no <tool> given for --tool=<tool>" msgstr "--tool=<araç> için bir <araç> verilmedi" -#: builtin/difftool.c:756 +#: builtin/difftool.c:760 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "--extcmd=<komut> için bir <komut> verilmedi" @@ -14559,7 +14777,7 @@ msgstr "akışı sonlandırmak için 'done' özelliğini kullan" msgid "skip output of blob data" msgstr "ikili nesne verisi çıktısını atla" -#: builtin/fast-export.c:1222 builtin/log.c:1815 +#: builtin/fast-export.c:1222 builtin/log.c:1823 msgid "refspec" msgstr "başvuru belirteci" @@ -14649,98 +14867,103 @@ msgstr "git fetch --multiple [<seçenekler>] [(<depo> | <grup>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<seçenekler>]" -#: builtin/fetch.c:120 +#: builtin/fetch.c:122 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel negatif olamaz" -#: builtin/fetch.c:143 builtin/pull.c:185 +#: builtin/fetch.c:145 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "tüm uzak konumlardan getir" -#: builtin/fetch.c:145 builtin/pull.c:245 +#: builtin/fetch.c:147 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "git pull/fetch için üstkaynak ayarla" -#: builtin/fetch.c:147 builtin/pull.c:188 +#: builtin/fetch.c:149 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr ".git/FETCH_HEAD'in üzerine yazmak yerine ona iliştir" -#: builtin/fetch.c:149 +#: builtin/fetch.c:151 msgid "use atomic transaction to update references" msgstr "başvuruları güncellemek için atomsal işlem kullan" -#: builtin/fetch.c:151 builtin/pull.c:191 +#: builtin/fetch.c:153 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "uzak uçtaki yükleme paketine olan yol" -#: builtin/fetch.c:152 +#: builtin/fetch.c:154 msgid "force overwrite of local reference" msgstr "yerel başvurunun üzerine zorla yaz" -#: builtin/fetch.c:154 +#: builtin/fetch.c:156 msgid "fetch from multiple remotes" msgstr "birden çok uzak konumdan getir" -#: builtin/fetch.c:156 builtin/pull.c:195 +#: builtin/fetch.c:158 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "tüm etiketleri ve ilişkilendirilen nesneleri getir" -#: builtin/fetch.c:158 +#: builtin/fetch.c:160 msgid "do not fetch all tags (--no-tags)" msgstr "tüm etiketleri getirme (--no-tags)" -#: builtin/fetch.c:160 +#: builtin/fetch.c:162 msgid "number of submodules fetched in parallel" msgstr "paralelde getirilen altmodüllerin sayısı" -#: builtin/fetch.c:162 builtin/pull.c:198 +#: builtin/fetch.c:164 +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "başvuru belirtecini tüm başvuruları refs/prefetch/'e yerleştirecek " +"biçimde değiştir" + +#: builtin/fetch.c:166 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "artık uzak konumda olmayan uzak izleme dallarını buda" -#: builtin/fetch.c:164 +#: builtin/fetch.c:168 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "artık uzak konumda olmayan yerel etiketleri buda ve değiştirilen etiketleri " "güncelle" -#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122 +#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122 msgid "on-demand" msgstr "istek üzerine" -#: builtin/fetch.c:166 +#: builtin/fetch.c:170 msgid "control recursive fetching of submodules" msgstr "altmodüllerin özyineli getirilmesini denetle" -#: builtin/fetch.c:171 +#: builtin/fetch.c:175 msgid "write fetched references to the FETCH_HEAD file" msgstr "getirilen başvuruları FETCH_HEAD dosyasına yaz" -#: builtin/fetch.c:172 builtin/pull.c:206 +#: builtin/fetch.c:176 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "indirilen paketi tut" -#: builtin/fetch.c:174 +#: builtin/fetch.c:178 msgid "allow updating of HEAD ref" msgstr "HEAD başvurusunun güncellenmesine izin ver" -#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209 +#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "sığ klonun geçmişini derinleştir" -#: builtin/fetch.c:179 builtin/pull.c:212 +#: builtin/fetch.c:183 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "zamana bağlı olarak sığ deponun geçmişini derinleştir" -#: builtin/fetch.c:185 builtin/pull.c:221 +#: builtin/fetch.c:189 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "tam bir depoya dönüştür" -#: builtin/fetch.c:188 +#: builtin/fetch.c:192 msgid "prepend this to submodule path output" msgstr "bunu altmodül yol çıktısının başına ekle" -#: builtin/fetch.c:191 +#: builtin/fetch.c:195 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -14748,98 +14971,103 @@ msgstr "" "altmodüllerin özyineli getirilmesi için öntanımlı (yapılandırma " "dosyalarından daha az önceliğe iye)" -#: builtin/fetch.c:195 builtin/pull.c:224 +#: builtin/fetch.c:199 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr ".git/shallow'u güncelleyen başvuruları kabul et" -#: builtin/fetch.c:196 builtin/pull.c:226 +#: builtin/fetch.c:200 builtin/pull.c:226 msgid "refmap" msgstr "ilgili başvuru" -#: builtin/fetch.c:197 builtin/pull.c:227 +#: builtin/fetch.c:201 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "getirme ile ilgili başvuruları belirt" -#: builtin/fetch.c:204 builtin/pull.c:240 +#: builtin/fetch.c:208 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "yalnızca bu nesneden ulaşılabilir nesnelerimiz olduğunu bildir" -#: builtin/fetch.c:207 builtin/fetch.c:209 +#: builtin/fetch.c:210 +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "bir paket dosyasını getirme; bunun yerine pazarlık ipuçlarının " +"atalarını yazdır" + +#: builtin/fetch.c:213 builtin/fetch.c:215 msgid "run 'maintenance --auto' after fetching" msgstr "getirme sonrasında 'maintenance --auto' çalıştır" -#: builtin/fetch.c:211 builtin/pull.c:243 +#: builtin/fetch.c:217 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "tüm güncellenmiş dalları zorlanmış güncellemeler için denetle" -#: builtin/fetch.c:213 +#: builtin/fetch.c:219 msgid "write the commit-graph after fetching" msgstr "getirdikten sonra işleme grafiğini yaz" -#: builtin/fetch.c:215 +#: builtin/fetch.c:221 msgid "accept refspecs from stdin" msgstr "başvuru belirteçlerini stdin'den oku" -#: builtin/fetch.c:526 +#: builtin/fetch.c:586 msgid "Couldn't find remote ref HEAD" msgstr "Uzak HEAD başvurusu bulunamadı" -#: builtin/fetch.c:697 +#: builtin/fetch.c:757 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "fetch.output yapılandırması geçersiz değer içeriyor: %s" -#: builtin/fetch.c:796 +#: builtin/fetch.c:856 #, c-format msgid "object %s not found" msgstr "%s nesnesi bulunamadı" -#: builtin/fetch.c:800 +#: builtin/fetch.c:860 msgid "[up to date]" msgstr "[güncel]" -#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901 +#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961 msgid "[rejected]" msgstr "[reddedildi]" -#: builtin/fetch.c:814 +#: builtin/fetch.c:874 msgid "can't fetch in current branch" msgstr "geçerli dalda getirme yapılamıyor" -#: builtin/fetch.c:824 +#: builtin/fetch.c:884 msgid "[tag update]" msgstr "[etiket güncellemesi]" -#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884 -#: builtin/fetch.c:896 +#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944 +#: builtin/fetch.c:956 msgid "unable to update local ref" msgstr "yerel başvuru güncellenemiyor" -#: builtin/fetch.c:829 +#: builtin/fetch.c:889 msgid "would clobber existing tag" msgstr "var olan etiketi değiştirecektir" -#: builtin/fetch.c:851 +#: builtin/fetch.c:911 msgid "[new tag]" msgstr "[yeni etiket]" -#: builtin/fetch.c:854 +#: builtin/fetch.c:914 msgid "[new branch]" msgstr "[yeni dal]" -#: builtin/fetch.c:857 +#: builtin/fetch.c:917 msgid "[new ref]" msgstr "[yeni başvuru]" -#: builtin/fetch.c:896 +#: builtin/fetch.c:956 msgid "forced update" msgstr "zorlanmış güncelleme" -#: builtin/fetch.c:901 +#: builtin/fetch.c:961 msgid "non-fast-forward" msgstr "ileri sarım değil" -#: builtin/fetch.c:1005 +#: builtin/fetch.c:1065 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -14849,7 +15077,7 @@ msgstr "" "ancak bu denetleme kapatılmış. Yeniden açmak için --show-forced-updates\n" "bayrağını kullanın veya 'git config fetch.showForcedUpdates true' çalıştırın." -#: builtin/fetch.c:1009 +#: builtin/fetch.c:1069 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14861,22 +15089,22 @@ msgstr "" "kullanarak veya 'git config fetch.showForcedUpdates false' çalıştırarak\n" "bu denetlemeden kaçınabilirsiniz.\n" -#: builtin/fetch.c:1041 +#: builtin/fetch.c:1101 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s tüm gerekli nesneleri göndermedi\n" -#: builtin/fetch.c:1069 +#: builtin/fetch.c:1129 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "%s reddedilmeli; çünkü sığ köklerin güncellenmesine izin verilmiyor" -#: builtin/fetch.c:1146 builtin/fetch.c:1297 +#: builtin/fetch.c:1206 builtin/fetch.c:1357 #, c-format msgid "From %.*s\n" msgstr "Şu konumdan: %.*s\n" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1228 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14885,56 +15113,56 @@ msgstr "" "bazı yerel başvurular güncellenemedi; 'git remote prune %s'\n" "kullanarak eski ve çakışan dalları kaldırmayı deneyin" -#: builtin/fetch.c:1267 +#: builtin/fetch.c:1327 #, c-format msgid " (%s will become dangling)" msgstr " (%s sarkacak)" -#: builtin/fetch.c:1268 +#: builtin/fetch.c:1328 #, c-format msgid " (%s has become dangling)" msgstr " (%s sarkmaya başladı)" -#: builtin/fetch.c:1300 +#: builtin/fetch.c:1360 msgid "[deleted]" msgstr "[silindi]" -#: builtin/fetch.c:1301 builtin/remote.c:1118 +#: builtin/fetch.c:1361 builtin/remote.c:1118 msgid "(none)" msgstr "(hiçbiri)" -#: builtin/fetch.c:1324 +#: builtin/fetch.c:1384 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Çıplak olmayan deponun geçerli %s dalına getirme reddediliyor" -#: builtin/fetch.c:1343 +#: builtin/fetch.c:1403 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "\"%s\" seçeneği \"%s\" değeri %s için geçerli değil" -#: builtin/fetch.c:1346 +#: builtin/fetch.c:1406 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "\"%s\" seçeneği %s için yok sayılıyor\n" -#: builtin/fetch.c:1558 +#: builtin/fetch.c:1618 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "birden çok dal algılandı, --set-upstream ile uyumsuz" -#: builtin/fetch.c:1573 +#: builtin/fetch.c:1633 msgid "not setting upstream for a remote remote-tracking branch" msgstr "bir uzak konum uzak izleme dalı için üstkaynak ayarlanmıyor" -#: builtin/fetch.c:1575 +#: builtin/fetch.c:1635 msgid "not setting upstream for a remote tag" msgstr "bir uzak konum etiketi için üstkaynak ayarlanmıyor" -#: builtin/fetch.c:1577 +#: builtin/fetch.c:1637 msgid "unknown branch type" msgstr "bilinmeyen dal türü" -#: builtin/fetch.c:1579 +#: builtin/fetch.c:1639 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -14942,22 +15170,22 @@ msgstr "" "Kaynak dal bulunamadı.\n" "--set-upstream-option ile tam olarak bir dal belirtmeniz gerekiyor." -#: builtin/fetch.c:1708 builtin/fetch.c:1771 +#: builtin/fetch.c:1768 builtin/fetch.c:1831 #, c-format msgid "Fetching %s\n" msgstr "%s getiriliyor\n" -#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101 +#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "%s getirilemedi" -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1790 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "'%s' getirilemedi (çıkış kodu: %d)\n" -#: builtin/fetch.c:1834 +#: builtin/fetch.c:1894 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14965,45 +15193,53 @@ msgstr "" "Bir uzak dal belirtilmedi. Lütfen yeni revizyonların\n" "alınacağı bir URL veya uzak konum adı belirtin." -#: builtin/fetch.c:1870 +#: builtin/fetch.c:1930 msgid "You need to specify a tag name." msgstr "Bir etiket adı belirtmeniz gerekiyor." -#: builtin/fetch.c:1935 +#: builtin/fetch.c:1995 msgid "Negative depth in --deepen is not supported" msgstr "--deepen için negatif derinlik desteklenmiyor" -#: builtin/fetch.c:1937 +#: builtin/fetch.c:1997 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen ve --depth birlikte kullanılamaz" -#: builtin/fetch.c:1942 +#: builtin/fetch.c:2002 msgid "--depth and --unshallow cannot be used together" msgstr "--depth ve --unshallow birlikte kullanılamaz" -#: builtin/fetch.c:1944 +#: builtin/fetch.c:2004 msgid "--unshallow on a complete repository does not make sense" msgstr "tam bir depo üzerinde --unshallow bir anlam ifade etmiyor" -#: builtin/fetch.c:1961 +#: builtin/fetch.c:2021 msgid "fetch --all does not take a repository argument" msgstr "fetch --all bir depo argümanı almıyor" -#: builtin/fetch.c:1963 +#: builtin/fetch.c:2023 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all başvuru belirteçleri ile birlikte bir anlam ifade etmiyor" -#: builtin/fetch.c:1972 +#: builtin/fetch.c:2032 #, c-format msgid "No such remote or remote group: %s" msgstr "Böyle bir uzak konum veya uzak konum grubu yok: %s" -#: builtin/fetch.c:1979 +#: builtin/fetch.c:2039 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "Bir grubu getirme ve başvuru belirteçleri tanımlama bir anlam ifade etmiyor" -#: builtin/fetch.c:1997 +#: builtin/fetch.c:2055 +msgid "must supply remote when using --negotiate-only" +msgstr "--negotiate-only kullanırken uzak konum sağlanmalıdır" + +#: builtin/fetch.c:2060 +msgid "Protocol does not support --negotiate-only, exiting." +msgstr "Protokol, --negotiate-only desteklemiyor, çıkılıyor." + +#: builtin/fetch.c:2079 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -15011,11 +15247,11 @@ msgstr "" "--filter yalnızca extensions.partialclone içinde yapılandırılmış uzak konum " "ile kullanılabilir." -#: builtin/fetch.c:2001 +#: builtin/fetch.c:2083 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic yalnızca bir uzak konumdan getirirken kullanılabilir" -#: builtin/fetch.c:2005 +#: builtin/fetch.c:2087 msgid "--stdin can only be used when fetching from one remote" msgstr "" "--stdin seçeneği yalnızca bir uzak konumdan getirilirken kullanılabilir" @@ -15062,47 +15298,47 @@ msgstr "git for-each-ref [--merged [<işleme>]] [--no-merged [<işleme>]]" msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "git for-each-ref [--contains [<işleme>]] [--no-contains [<işleme>]]" -#: builtin/for-each-ref.c:28 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for shells" msgstr "yer tutucuları kabuğun anlayabileceği biçimde tırnak içine al" -#: builtin/for-each-ref.c:30 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for perl" msgstr "yer tutucuları perl'in anlayabileceği biçimde tırnak içine al" -#: builtin/for-each-ref.c:32 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for python" msgstr "yer tutucuları python'un anlayabileceği biçimde tırnak içine al" -#: builtin/for-each-ref.c:34 +#: builtin/for-each-ref.c:36 msgid "quote placeholders suitably for Tcl" msgstr "yer tutucuları Tcl'nin anlayabileceği biçimde tırnak içine al" -#: builtin/for-each-ref.c:37 +#: builtin/for-each-ref.c:39 msgid "show only <n> matched refs" msgstr "yalnızca <n> eşleşen başvuruyu göster" -#: builtin/for-each-ref.c:39 builtin/tag.c:472 +#: builtin/for-each-ref.c:41 builtin/tag.c:483 msgid "respect format colors" msgstr "biçim renklerine uy" -#: builtin/for-each-ref.c:42 +#: builtin/for-each-ref.c:44 msgid "print only refs which points at the given object" msgstr "yalnızca verilen nesneye işaret eden başvuruları yazdır" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:46 msgid "print only refs that are merged" msgstr "yalnızca birleştirilen başvuruları yazdır" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:47 msgid "print only refs that are not merged" msgstr "yalnızca birleştirilmemiş başvuruları yazdır" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:48 msgid "print only refs which contain the commit" msgstr "yalnızca işlemeyi içeren başvuruları yazdır" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:49 msgid "print only refs which don't contain the commit" msgstr "yalnızca işlemeyi içermeyen başvuruları yazdır" @@ -15122,32 +15358,32 @@ msgstr "bir depo yolları listesi tutan yapılandırma anahtarı" msgid "missing --config=<config>" msgstr "--config=<yapılandırma> eksik" -#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131 +#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128 msgid "unknown" msgstr "bilinmeyen" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:83 builtin/fsck.c:103 +#: builtin/fsck.c:78 builtin/fsck.c:100 #, c-format msgid "error in %s %s: %s" msgstr "%s %s içinde hata: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:97 +#: builtin/fsck.c:94 #, c-format msgid "warning in %s %s: %s" msgstr "%s %s içinde uyarı: %s" -#: builtin/fsck.c:126 builtin/fsck.c:129 +#: builtin/fsck.c:123 builtin/fsck.c:126 #, c-format msgid "broken link from %7s %s" msgstr "şuradan kırık bağ: %7s %s" -#: builtin/fsck.c:138 +#: builtin/fsck.c:135 msgid "wrong object type in link" msgstr "bağda yanlış nesne türü" -#: builtin/fsck.c:154 +#: builtin/fsck.c:151 #, c-format msgid "" "broken link from %7s %s\n" @@ -15156,211 +15392,211 @@ msgstr "" "şuradan kırık bağ: %7s %s\n" " şuraya: %7s %s" -#: builtin/fsck.c:265 +#: builtin/fsck.c:263 #, c-format msgid "missing %s %s" msgstr "eksik %s %s" -#: builtin/fsck.c:292 +#: builtin/fsck.c:290 #, c-format msgid "unreachable %s %s" msgstr "ulaşılamayan %s %s" -#: builtin/fsck.c:312 +#: builtin/fsck.c:310 #, c-format msgid "dangling %s %s" msgstr "sarkan %s %s" -#: builtin/fsck.c:322 +#: builtin/fsck.c:320 msgid "could not create lost-found" msgstr "lost-found oluşturulamadı" -#: builtin/fsck.c:333 +#: builtin/fsck.c:331 #, c-format msgid "could not finish '%s'" msgstr "'%s' bitirilemedi" -#: builtin/fsck.c:350 +#: builtin/fsck.c:348 #, c-format msgid "Checking %s" msgstr "%s denetleniyor" -#: builtin/fsck.c:388 +#: builtin/fsck.c:386 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Bağlanabilirlik denetleniyor (%d nesne)" -#: builtin/fsck.c:407 +#: builtin/fsck.c:405 #, c-format msgid "Checking %s %s" msgstr "%s %s denetleniyor" -#: builtin/fsck.c:412 +#: builtin/fsck.c:410 msgid "broken links" msgstr "kırık bağlar" -#: builtin/fsck.c:421 +#: builtin/fsck.c:419 #, c-format msgid "root %s" msgstr "kök %s" -#: builtin/fsck.c:429 +#: builtin/fsck.c:427 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "%s %s (%s) şurada etiketlendi: %s" -#: builtin/fsck.c:458 +#: builtin/fsck.c:456 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: nesne hasar görmüş veya kayıp" -#: builtin/fsck.c:483 +#: builtin/fsck.c:481 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: geçersiz başvuru günlüğü girdisi %s" -#: builtin/fsck.c:497 +#: builtin/fsck.c:495 #, c-format msgid "Checking reflog %s->%s" msgstr "Başvuru günlüğü denetleniyor: %s->%s" -#: builtin/fsck.c:531 +#: builtin/fsck.c:529 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: geçersiz sha1 işaretçisi %s" -#: builtin/fsck.c:538 +#: builtin/fsck.c:536 #, c-format msgid "%s: not a commit" msgstr "%s: bir işleme değil" -#: builtin/fsck.c:592 +#: builtin/fsck.c:590 msgid "notice: No default references" msgstr "Uyarı: Öntanımlı başvurular yok" -#: builtin/fsck.c:607 +#: builtin/fsck.c:605 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: nesne hasar görmüş veya kayıp: %s" -#: builtin/fsck.c:620 +#: builtin/fsck.c:618 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: nesne ayrıştırılamadı: %s" -#: builtin/fsck.c:640 +#: builtin/fsck.c:638 #, c-format msgid "bad sha1 file: %s" msgstr "hatalı sha1 dosyası: %s" -#: builtin/fsck.c:655 +#: builtin/fsck.c:653 msgid "Checking object directory" msgstr "Nesne dizini denetleniyor" -#: builtin/fsck.c:658 +#: builtin/fsck.c:656 msgid "Checking object directories" msgstr "Nesne dizinleri denetleniyor" -#: builtin/fsck.c:673 +#: builtin/fsck.c:671 #, c-format msgid "Checking %s link" msgstr "%s bağ denetleniyor" -#: builtin/fsck.c:678 builtin/index-pack.c:865 +#: builtin/fsck.c:676 builtin/index-pack.c:866 #, c-format msgid "invalid %s" msgstr "geçersiz %s" -#: builtin/fsck.c:685 +#: builtin/fsck.c:683 #, c-format msgid "%s points to something strange (%s)" msgstr "%s garip bir şeye işaret ediyor (%s)" -#: builtin/fsck.c:691 +#: builtin/fsck.c:689 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: ayrık HEAD bir şeye işaret etmiyor" -#: builtin/fsck.c:695 +#: builtin/fsck.c:693 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "Uyarı: %s henüz doğmamış bir dala işaret ediyor (%s)" -#: builtin/fsck.c:707 +#: builtin/fsck.c:705 msgid "Checking cache tree" msgstr "Önbellek ağacı denetleniyor" -#: builtin/fsck.c:712 +#: builtin/fsck.c:710 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: cache-tree içinde geçersiz sha1 işaretçisi" -#: builtin/fsck.c:721 +#: builtin/fsck.c:719 msgid "non-tree in cache-tree" msgstr "cache-tree içinde ağaç olmayan öge" -#: builtin/fsck.c:752 +#: builtin/fsck.c:750 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<seçenekler>] [<nesne>...]" -#: builtin/fsck.c:758 +#: builtin/fsck.c:756 msgid "show unreachable objects" msgstr "ulaşılamayan nesneleri göster" -#: builtin/fsck.c:759 +#: builtin/fsck.c:757 msgid "show dangling objects" msgstr "sarkan nesneleri göster" -#: builtin/fsck.c:760 +#: builtin/fsck.c:758 msgid "report tags" msgstr "etiketleri bildir" -#: builtin/fsck.c:761 +#: builtin/fsck.c:759 msgid "report root nodes" msgstr "kök düğümleri bildir" -#: builtin/fsck.c:762 +#: builtin/fsck.c:760 msgid "make index objects head nodes" msgstr "indeks nesnelerini dal ucu düğümü yap" -#: builtin/fsck.c:763 +#: builtin/fsck.c:761 msgid "make reflogs head nodes (default)" msgstr "başvuru günlüklerini dal ucu düğümü yap (öntanımlı)" -#: builtin/fsck.c:764 +#: builtin/fsck.c:762 msgid "also consider packs and alternate objects" msgstr "ek olarak paketleri ve alternatif nesneleri de dikkate al" -#: builtin/fsck.c:765 +#: builtin/fsck.c:763 msgid "check only connectivity" msgstr "yalnızca bağlanabilirliği denetle" -#: builtin/fsck.c:766 builtin/mktag.c:78 +#: builtin/fsck.c:764 builtin/mktag.c:75 msgid "enable more strict checking" msgstr "daha kesin denetlemeyi etkinleştir" -#: builtin/fsck.c:768 +#: builtin/fsck.c:766 msgid "write dangling objects in .git/lost-found" msgstr "sarkan nesneleri .git/lost-found'a yaz" -#: builtin/fsck.c:769 builtin/prune.c:134 +#: builtin/fsck.c:767 builtin/prune.c:134 msgid "show progress" msgstr "ilerlemeyi göster" -#: builtin/fsck.c:770 +#: builtin/fsck.c:768 msgid "show verbose names for reachable objects" msgstr "ulaşılabilir nesneler için ayrıntılı adları göster" -#: builtin/fsck.c:829 builtin/index-pack.c:261 +#: builtin/fsck.c:827 builtin/index-pack.c:262 msgid "Checking objects" msgstr "Nesneler denetleniyor" -#: builtin/fsck.c:857 +#: builtin/fsck.c:855 #, c-format msgid "%s: object missing" msgstr "%s: nesne kayıp" -#: builtin/fsck.c:868 +#: builtin/fsck.c:866 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "geçersiz parametre: sha1 bekleniyordu, '%s' alındı" @@ -15379,12 +15615,12 @@ msgstr "%s fstat yapılamadı: %s" msgid "failed to parse '%s' value '%s'" msgstr "'%s' değeri '%s' ayrıştırılamadı" -#: builtin/gc.c:487 builtin/init-db.c:58 +#: builtin/gc.c:487 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "'%s' bilgileri alınamıyor" -#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562 +#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573 #, c-format msgid "cannot read '%s'" msgstr "'%s' okunamıyor" @@ -15482,144 +15718,144 @@ msgstr "tanımlanamayan --schedule argümanı, %s" msgid "failed to write commit-graph" msgstr "commit-graph yazılamadı" -#: builtin/gc.c:914 -msgid "failed to fill remotes" -msgstr "uzak konumlar doldurulamadı" +#: builtin/gc.c:905 +msgid "failed to prefetch remotes" +msgstr "uzak konumlar önden getirilemedi" -#: builtin/gc.c:1037 +#: builtin/gc.c:1022 msgid "failed to start 'git pack-objects' process" msgstr "'git-pack-objects' işlemi başlatılamadı" -#: builtin/gc.c:1054 +#: builtin/gc.c:1039 msgid "failed to finish 'git pack-objects' process" msgstr "'git-pack-objects' işlemi bitirilemedi" -#: builtin/gc.c:1106 +#: builtin/gc.c:1091 msgid "failed to write multi-pack-index" msgstr "multi-pack-index yazılamadı" -#: builtin/gc.c:1124 +#: builtin/gc.c:1109 msgid "'git multi-pack-index expire' failed" msgstr "'git multi-pack-index expire' başarısız oldu" -#: builtin/gc.c:1185 +#: builtin/gc.c:1170 msgid "'git multi-pack-index repack' failed" msgstr "'git multi-pack-index repack' başarısız oldu" -#: builtin/gc.c:1194 +#: builtin/gc.c:1179 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" "incremental-repack görevi atlanıyor; çünkü core.multiPackIndex devre dışı" -#: builtin/gc.c:1298 +#: builtin/gc.c:1283 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "kilit dosyası '%s' mevcut, bakım atlanıyor" -#: builtin/gc.c:1328 +#: builtin/gc.c:1313 #, c-format msgid "task '%s' failed" msgstr "'%s' görevi başarısız oldu" -#: builtin/gc.c:1410 +#: builtin/gc.c:1395 #, c-format msgid "'%s' is not a valid task" msgstr "'%s' geçerli bir görev değil" -#: builtin/gc.c:1415 +#: builtin/gc.c:1400 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "'%s' görevi birden çok kez seçilemez" -#: builtin/gc.c:1430 +#: builtin/gc.c:1415 msgid "run tasks based on the state of the repository" msgstr "görevleri deponun durumuna göre çalıştır" -#: builtin/gc.c:1431 +#: builtin/gc.c:1416 msgid "frequency" msgstr "sıklık" -#: builtin/gc.c:1432 +#: builtin/gc.c:1417 msgid "run tasks based on frequency" msgstr "görevleri sıklığa göre çalıştır" -#: builtin/gc.c:1435 +#: builtin/gc.c:1420 msgid "do not report progress or other information over stderr" msgstr "stderr üzerinden ilerlemeyi veya başka bir bilgiyi raporlama" -#: builtin/gc.c:1436 +#: builtin/gc.c:1421 msgid "task" msgstr "görev" -#: builtin/gc.c:1437 +#: builtin/gc.c:1422 msgid "run a specific task" msgstr "belirli bir görevi çalıştır" -#: builtin/gc.c:1454 +#: builtin/gc.c:1439 msgid "use at most one of --auto and --schedule=<frequency>" msgstr "tek kezde --auto ve --schedule=<sıklık>'tan birini kullan" -#: builtin/gc.c:1497 +#: builtin/gc.c:1482 msgid "failed to run 'git config'" msgstr "'git config' çalıştırılamadı" -#: builtin/gc.c:1562 +#: builtin/gc.c:1547 #, c-format msgid "failed to expand path '%s'" msgstr "'%s' yolu oluşturulamadı" -#: builtin/gc.c:1591 +#: builtin/gc.c:1576 msgid "failed to start launchctl" msgstr "launchctl başlatılamadı" -#: builtin/gc.c:1628 +#: builtin/gc.c:1613 #, c-format msgid "failed to create directories for '%s'" msgstr "'%s' için dizinler oluşturulamadı" -#: builtin/gc.c:1689 +#: builtin/gc.c:1674 #, c-format msgid "failed to bootstrap service %s" msgstr "%s servisi özyüklenemedi" -#: builtin/gc.c:1760 +#: builtin/gc.c:1745 msgid "failed to create temp xml file" msgstr "geçici xml dosyası oluşturulamadı" -#: builtin/gc.c:1850 +#: builtin/gc.c:1835 msgid "failed to start schtasks" msgstr "schtasks başlatılamadı" -#: builtin/gc.c:1894 +#: builtin/gc.c:1879 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "'crontab -l' çalıştırılamadı; sisteminiz 'cron' desteklemiyor olabilir" -#: builtin/gc.c:1911 +#: builtin/gc.c:1896 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "'crontab' çalıştırılamadı; sisteminiz 'cron' desteklemiyor olabilir" -#: builtin/gc.c:1915 +#: builtin/gc.c:1900 msgid "failed to open stdin of 'crontab'" msgstr "'crontab' stdin'i açılamadı" -#: builtin/gc.c:1956 +#: builtin/gc.c:1942 msgid "'crontab' died" msgstr "'crontab' beklenmedik bir biçimde sonlandı" -#: builtin/gc.c:1990 +#: builtin/gc.c:1976 msgid "another process is scheduling background maintenance" msgstr "başka bir işlem arka plan bakımı zamanının ayarlıyor" -#: builtin/gc.c:2009 +#: builtin/gc.c:2000 msgid "failed to add repo to global config" msgstr "depo, global yapılandırmaya eklenemedi" -#: builtin/gc.c:2019 +#: builtin/gc.c:2010 msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <altkomut> [<seçenekler>]" -#: builtin/gc.c:2038 +#: builtin/gc.c:2029 #, c-format msgid "invalid subcommand: %s" msgstr "geçersiz altkomut: %s" @@ -15642,259 +15878,259 @@ msgstr "geçersiz belirtilen iş parçacığı sayısı (%d), %s için" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808 -#: builtin/pack-objects.c:2944 +#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793 +#: builtin/pack-objects.c:2969 #, c-format msgid "no threads support, ignoring %s" msgstr "iş parçacığı desteği yok, %s yok sayılıyor" -#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641 +#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643 #, c-format msgid "unable to read tree (%s)" msgstr "ağaç okunamıyor (%s)" -#: builtin/grep.c:656 +#: builtin/grep.c:658 #, c-format msgid "unable to grep from object of type %s" msgstr "%s türündeki bir nesneden grep yapılamıyor" -#: builtin/grep.c:737 +#: builtin/grep.c:739 #, c-format msgid "switch `%c' expects a numerical value" msgstr "'%c' anahtarı sayısal bir değer bekliyor" -#: builtin/grep.c:836 +#: builtin/grep.c:838 msgid "search in index instead of in the work tree" msgstr "çalışma ağacı yerine indekste ara" -#: builtin/grep.c:838 +#: builtin/grep.c:840 msgid "find in contents not managed by git" msgstr "git tarafından yönetilmeyen içerikte bul" -#: builtin/grep.c:840 +#: builtin/grep.c:842 msgid "search in both tracked and untracked files" msgstr "hem izlenen hem izlenmeyen dosyalar içinde ara" -#: builtin/grep.c:842 +#: builtin/grep.c:844 msgid "ignore files specified via '.gitignore'" msgstr "'.gitignore'da belirtilen dosyaları yok say" -#: builtin/grep.c:844 +#: builtin/grep.c:846 msgid "recursively search in each submodule" msgstr "her altmodülde özyineli olarak ara" -#: builtin/grep.c:847 +#: builtin/grep.c:849 msgid "show non-matching lines" msgstr "eşleşmeyen satırları göster" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "case insensitive matching" msgstr "BÜYÜK/küçük harf duyarsız eşleşme" -#: builtin/grep.c:851 +#: builtin/grep.c:853 msgid "match patterns only at word boundaries" msgstr "yalnızca sözcük sınırlarındaki dizgileri eşleştir" -#: builtin/grep.c:853 +#: builtin/grep.c:855 msgid "process binary files as text" msgstr "ikili dosyaları metin olarak işle" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "don't match patterns in binary files" msgstr "ikili dosyalardaki dizgileri eşleştirme" -#: builtin/grep.c:858 +#: builtin/grep.c:860 msgid "process binary files with textconv filters" msgstr "ikili dosyaları textconv süzgeçleri ile işle" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "search in subdirectories (default)" msgstr "altdizinlerde ara (öntanımlı)" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "descend at most <depth> levels" msgstr "en çok <derinlik> düzey in" -#: builtin/grep.c:866 +#: builtin/grep.c:868 msgid "use extended POSIX regular expressions" msgstr "genişletilmiş POSIX düzenli ifadelerini kullan" -#: builtin/grep.c:869 +#: builtin/grep.c:871 msgid "use basic POSIX regular expressions (default)" msgstr "temel POSIX düzenli ifadelerini kullan (öntanımlı)" -#: builtin/grep.c:872 +#: builtin/grep.c:874 msgid "interpret patterns as fixed strings" msgstr "dizgileri sabit diziler olarak yorumla" -#: builtin/grep.c:875 +#: builtin/grep.c:877 msgid "use Perl-compatible regular expressions" msgstr "Perl uyumlu düzenli ifadeler kullan" -#: builtin/grep.c:878 +#: builtin/grep.c:880 msgid "show line numbers" msgstr "satır numaralarını göster" -#: builtin/grep.c:879 +#: builtin/grep.c:881 msgid "show column number of first match" msgstr "ilk eşleşmenin sütun numarasını göster" -#: builtin/grep.c:880 +#: builtin/grep.c:882 msgid "don't show filenames" msgstr "dosya adlarını gösterme" -#: builtin/grep.c:881 +#: builtin/grep.c:883 msgid "show filenames" msgstr "dosya adlarını göster" -#: builtin/grep.c:883 +#: builtin/grep.c:885 msgid "show filenames relative to top directory" msgstr "dosya adlarını en üst dizine göreceli olarak göster" -#: builtin/grep.c:885 +#: builtin/grep.c:887 msgid "show only filenames instead of matching lines" msgstr "eşleşen satırlar yerine yalnızca dosya adlarını göster" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "synonym for --files-with-matches" msgstr "--files-with-matches eşanlamlısı" -#: builtin/grep.c:890 +#: builtin/grep.c:892 msgid "show only the names of files without match" msgstr "eşleşme olmadan yalnızca dosya adlarını göster" -#: builtin/grep.c:892 +#: builtin/grep.c:894 msgid "print NUL after filenames" msgstr "dosya adlarından sonra NUL yazdır" -#: builtin/grep.c:895 +#: builtin/grep.c:897 msgid "show only matching parts of a line" msgstr "yalnızca bir satırın eşleşen kısımlarını göster" -#: builtin/grep.c:897 +#: builtin/grep.c:899 msgid "show the number of matches instead of matching lines" msgstr "eşleşen satırlar yerine eşleşme sayısını göster" -#: builtin/grep.c:898 +#: builtin/grep.c:900 msgid "highlight matches" msgstr "eşleşmeleri vurgula" -#: builtin/grep.c:900 +#: builtin/grep.c:902 msgid "print empty line between matches from different files" msgstr "başka dosyalardan olan eşleşmelerin arasına boş satır yazdır" -#: builtin/grep.c:902 +#: builtin/grep.c:904 msgid "show filename only once above matches from same file" msgstr "" "aynı dosyadan olan eşleşmelerin üzerinde dosya adını yalnızca bir kez göster" -#: builtin/grep.c:905 +#: builtin/grep.c:907 msgid "show <n> context lines before and after matches" msgstr "eşleşmelerden önce ve sonra <n> satır bağlam göster" -#: builtin/grep.c:908 +#: builtin/grep.c:910 msgid "show <n> context lines before matches" msgstr "eşleşmelerden önce <n> satır bağlam göster" -#: builtin/grep.c:910 +#: builtin/grep.c:912 msgid "show <n> context lines after matches" msgstr "eşleşmelerden sonra <n> satır bağlam göster" -#: builtin/grep.c:912 +#: builtin/grep.c:914 msgid "use <n> worker threads" msgstr "<n> iş parçacığı kullan" -#: builtin/grep.c:913 +#: builtin/grep.c:915 msgid "shortcut for -C NUM" msgstr "-C NUM için kısayol" -#: builtin/grep.c:916 +#: builtin/grep.c:918 msgid "show a line with the function name before matches" msgstr "eşleşmelerden önce işlev adının olduğu bir satır göster" -#: builtin/grep.c:918 +#: builtin/grep.c:920 msgid "show the surrounding function" msgstr "çevresindeki işlevi göster" -#: builtin/grep.c:921 +#: builtin/grep.c:923 msgid "read patterns from file" msgstr "dizgileri dosyadan oku" -#: builtin/grep.c:923 +#: builtin/grep.c:925 msgid "match <pattern>" msgstr "<dizgi> ile eşleş" -#: builtin/grep.c:925 +#: builtin/grep.c:927 msgid "combine patterns specified with -e" msgstr "-e ile belirtilen dizgileri birleştir" -#: builtin/grep.c:937 +#: builtin/grep.c:939 msgid "indicate hit with exit status without output" msgstr "çıkış durumu ile olan eşleşmelerde çıktı verme" -#: builtin/grep.c:939 +#: builtin/grep.c:941 msgid "show only matches from files that match all patterns" msgstr "yalnızca tüm dizgilerle eşleşen dosyalardan eşleşmeleri göster" -#: builtin/grep.c:942 +#: builtin/grep.c:944 msgid "pager" msgstr "sayfalayıcı" -#: builtin/grep.c:942 +#: builtin/grep.c:944 msgid "show matching files in the pager" msgstr "sayfalayıcıda eşleşen dosyaları göster" -#: builtin/grep.c:946 +#: builtin/grep.c:948 msgid "allow calling of grep(1) (ignored by this build)" msgstr "grep(1)'in çağrılmasına izin ver (bu yapım tarafından yok sayıldı)" -#: builtin/grep.c:1012 +#: builtin/grep.c:1014 msgid "no pattern given" msgstr "bir dizgi verilmedi" -#: builtin/grep.c:1048 +#: builtin/grep.c:1050 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index veya --untracked revizyonlarla birlikte kullanılamaz" -#: builtin/grep.c:1056 +#: builtin/grep.c:1058 #, c-format msgid "unable to resolve revision: %s" msgstr "revizyon çözülemiyor: %s" -#: builtin/grep.c:1086 +#: builtin/grep.c:1088 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked, --recurse-submodules ile desteklenmiyor" -#: builtin/grep.c:1090 +#: builtin/grep.c:1092 msgid "invalid option combination, ignoring --threads" msgstr "geçersiz seçenek birleştirmesi, --threads yok sayılıyor" -#: builtin/grep.c:1093 builtin/pack-objects.c:3672 +#: builtin/grep.c:1095 builtin/pack-objects.c:3930 msgid "no threads support, ignoring --threads" msgstr "iş parçacığı desteği yok, --threads yok sayılıyor" -#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941 +#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966 #, c-format msgid "invalid number of threads specified (%d)" msgstr "geçersiz belirtilen iş parçacığı sayısı (%d)" -#: builtin/grep.c:1130 +#: builtin/grep.c:1132 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager yalnızca çalışma ağacında çalışır" -#: builtin/grep.c:1156 +#: builtin/grep.c:1158 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached veya --untracked, --no-index ile birlikte kullanılamıyor" -#: builtin/grep.c:1159 +#: builtin/grep.c:1161 msgid "--untracked cannot be used with --cached" msgstr "--untracked, --cached ile birlikte kullanılamıyor" -#: builtin/grep.c:1165 +#: builtin/grep.c:1167 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard, izlenen içerik için kullanılamıyor" -#: builtin/grep.c:1173 +#: builtin/grep.c:1175 msgid "both --cached and trees are given" msgstr "hem --cached hem ağaçlar verilmiş" @@ -16027,12 +16263,12 @@ msgstr "isteğe hiçbir man görüntüleyicisi ele almadı" msgid "no info viewer handled the request" msgstr "isteğe hiçbir bilgi görüntüleyicisi ele almadı" -#: builtin/help.c:520 builtin/help.c:531 git.c:340 +#: builtin/help.c:520 builtin/help.c:531 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s', '%s' olarak armalanmış" -#: builtin/help.c:534 git.c:372 +#: builtin/help.c:534 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "hatalı alias.%s dizisi: %s" @@ -16046,396 +16282,392 @@ msgstr "kullanım: %s%s" msgid "'git help config' for more information" msgstr "ek bilgi için: 'git help config'" -#: builtin/index-pack.c:221 +#: builtin/index-pack.c:222 #, c-format msgid "object type mismatch at %s" msgstr "%s konumunda nesne türü uyuşmazlığı" -#: builtin/index-pack.c:241 +#: builtin/index-pack.c:242 #, c-format msgid "did not receive expected object %s" msgstr "beklenen nesne %s alınmadı" -#: builtin/index-pack.c:244 +#: builtin/index-pack.c:245 #, c-format msgid "object %s: expected type %s, found %s" msgstr "nesne %s: beklenen tür %s, bulunan %s" -#: builtin/index-pack.c:294 +#: builtin/index-pack.c:295 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "%d bayt doldurulamıyor" msgstr[1] "%d bayt doldurulamıyor" -#: builtin/index-pack.c:304 +#: builtin/index-pack.c:305 msgid "early EOF" msgstr "erken dosya sonu" -#: builtin/index-pack.c:305 +#: builtin/index-pack.c:306 msgid "read error on input" msgstr "girdide okuma hatası" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:318 msgid "used more bytes than were available" msgstr "kullanılabilir olandan daha çok bayt kullanıldı" -#: builtin/index-pack.c:324 builtin/pack-objects.c:624 +#: builtin/index-pack.c:325 builtin/pack-objects.c:624 msgid "pack too large for current definition of off_t" msgstr "paket off_t'nin geçerli tanımı için çok büyük" -#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:328 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "paket izin verilen en büyük boyutu aşıyor" -#: builtin/index-pack.c:342 +#: builtin/index-pack.c:343 #, c-format msgid "unable to create '%s'" msgstr "'%s' oluşturulamıyor" -#: builtin/index-pack.c:348 +#: builtin/index-pack.c:349 #, c-format msgid "cannot open packfile '%s'" msgstr "'%s' paket dosyası açılamıyor" -#: builtin/index-pack.c:362 +#: builtin/index-pack.c:363 msgid "pack signature mismatch" msgstr "paket imzası uyuşmazlığı" -#: builtin/index-pack.c:364 +#: builtin/index-pack.c:365 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "paket sürümü %<PRIu32> desteklenmiyor" -#: builtin/index-pack.c:382 +#: builtin/index-pack.c:383 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paketin %<PRIuMAX> ofsetinde hatalı nesne var: %s" -#: builtin/index-pack.c:488 +#: builtin/index-pack.c:489 #, c-format msgid "inflate returned %d" msgstr "şişirme programı %d döndürdü" -#: builtin/index-pack.c:537 +#: builtin/index-pack.c:538 msgid "offset value overflow for delta base object" msgstr "delta tabanı nesnesi için ofset değeri taşımı" -#: builtin/index-pack.c:545 +#: builtin/index-pack.c:546 msgid "delta base offset is out of bound" msgstr "delta tabanı ofseti sınırlar dışında" -#: builtin/index-pack.c:553 +#: builtin/index-pack.c:554 #, c-format msgid "unknown object type %d" msgstr "bilinmeyen nesne türü %d" -#: builtin/index-pack.c:584 +#: builtin/index-pack.c:585 msgid "cannot pread pack file" msgstr "paket dosyası 'pread' yapılamıyor" -#: builtin/index-pack.c:586 +#: builtin/index-pack.c:587 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "zamansız paket dosyası sonu, %<PRIuMAX> bayt eksik" msgstr[1] "zamansız paket dosyası sonu, %<PRIuMAX> bayt eksik" -#: builtin/index-pack.c:612 +#: builtin/index-pack.c:613 msgid "serious inflate inconsistency" msgstr "ciddi şişirme programı tutarsızlığı" -#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 -#: builtin/index-pack.c:826 builtin/index-pack.c:835 +#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788 +#: builtin/index-pack.c:827 builtin/index-pack.c:836 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "%s İLE SHA1 ÇARPIŞMASI BULUNDU!" -#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/index-pack.c:761 builtin/pack-objects.c:171 #: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "%s okunamıyor" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:825 #, c-format msgid "cannot read existing object info %s" msgstr "mevcut %s nesne bilgisi okunamıyor" -#: builtin/index-pack.c:832 +#: builtin/index-pack.c:833 #, c-format msgid "cannot read existing object %s" msgstr "mevcut %s nesnesi okunamıyor" -#: builtin/index-pack.c:846 +#: builtin/index-pack.c:847 #, c-format msgid "invalid blob object %s" msgstr "geçersiz %s ikili nesnesi" -#: builtin/index-pack.c:849 builtin/index-pack.c:868 +#: builtin/index-pack.c:850 builtin/index-pack.c:869 msgid "fsck error in packed object" msgstr "paketlenmiş nesne içinde fsck hatası" -#: builtin/index-pack.c:870 +#: builtin/index-pack.c:871 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s ögesinin tüm alt ögeleri ulaşılabilir değil" -#: builtin/index-pack.c:931 builtin/index-pack.c:978 +#: builtin/index-pack.c:932 builtin/index-pack.c:979 msgid "failed to apply delta" msgstr "delta uygulanamadı" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1162 msgid "Receiving objects" msgstr "Nesneler alınıyor" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1162 msgid "Indexing objects" msgstr "Nesneler indeksleniyor" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1196 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paket hasar görmüş (SHA1 uyumsuzluğu)" -#: builtin/index-pack.c:1200 +#: builtin/index-pack.c:1201 msgid "cannot fstat packfile" msgstr "paket dosyası fstat yapılamıyor" -#: builtin/index-pack.c:1203 +#: builtin/index-pack.c:1204 msgid "pack has junk at the end" msgstr "paket sonunda döküntüler var" -#: builtin/index-pack.c:1215 +#: builtin/index-pack.c:1216 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() içindeki karmaşa akıl almaz düzeyde" -#: builtin/index-pack.c:1238 +#: builtin/index-pack.c:1239 msgid "Resolving deltas" msgstr "Deltalar çözülüyor" -#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707 +#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732 #, c-format msgid "unable to create thread: %s" msgstr "iş parçacığı oluşturulamadı: %s" -#: builtin/index-pack.c:1282 +#: builtin/index-pack.c:1283 msgid "confusion beyond insanity" msgstr "karmaşa akıl almaz düzeyde" -#: builtin/index-pack.c:1288 +#: builtin/index-pack.c:1289 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "%d yerel nesneyle tamamlandı" msgstr[1] "%d yerel nesneyle tamamlandı" -#: builtin/index-pack.c:1300 +#: builtin/index-pack.c:1301 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "%s için beklenmedik kuyruk sağlaması (disk hasarı?)" -#: builtin/index-pack.c:1304 +#: builtin/index-pack.c:1305 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paketin %d çözülmemiş deltası var" msgstr[1] "paketin %d çözülmemiş deltası var" -#: builtin/index-pack.c:1328 +#: builtin/index-pack.c:1329 #, c-format msgid "unable to deflate appended object (%d)" msgstr "iliştirilen nesne söndürülemedi (%d)" -#: builtin/index-pack.c:1424 +#: builtin/index-pack.c:1425 #, c-format msgid "local object %s is corrupt" msgstr "yerel nesne %s hasarlı" -#: builtin/index-pack.c:1445 +#: builtin/index-pack.c:1446 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "paket dosyası adı '%s', '.%s' ile bitmiyor" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1470 #, c-format msgid "cannot write %s file '%s'" msgstr "%s dosyası '%s' yazılamıyor" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1478 #, c-format msgid "cannot close written %s file '%s'" msgstr "yazılmış %s dosyası '%s' kapatılamıyor" -#: builtin/index-pack.c:1503 +#: builtin/index-pack.c:1504 msgid "error while closing pack file" msgstr "paket dosyası kapatılırken hata" -#: builtin/index-pack.c:1517 +#: builtin/index-pack.c:1518 msgid "cannot store pack file" msgstr "paket dosyası depolanamıyor" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1526 msgid "cannot store index file" msgstr "indeks dosyası depolanamıyor" -#: builtin/index-pack.c:1534 -msgid "cannot store reverse index file" -msgstr "ters indeks dosyası depolanamıyor" - -#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952 +#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "hatalı pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1651 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Mevcut paket dosyası '%s' açılamıyor" -#: builtin/index-pack.c:1652 +#: builtin/index-pack.c:1653 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "'%s' için mevcut paket idx dosyası açılamıyor" -#: builtin/index-pack.c:1700 +#: builtin/index-pack.c:1701 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "delta değil: %d nesne" msgstr[1] "delta değil: %d nesne" -#: builtin/index-pack.c:1707 +#: builtin/index-pack.c:1708 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "zincir uzunluğu = %d: %lu nesne" msgstr[1] "zincir uzunluğu = %d: %lu nesne" -#: builtin/index-pack.c:1765 +#: builtin/index-pack.c:1750 msgid "Cannot come back to cwd" msgstr "Şu anki çalışma dizinine geri gelinemiyor" -#: builtin/index-pack.c:1819 builtin/index-pack.c:1822 -#: builtin/index-pack.c:1838 builtin/index-pack.c:1842 +#: builtin/index-pack.c:1804 builtin/index-pack.c:1807 +#: builtin/index-pack.c:1823 builtin/index-pack.c:1827 #, c-format msgid "bad %s" msgstr "hatalı %s" -#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625 +#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613 #, c-format msgid "unknown hash algorithm '%s'" msgstr "bilinmeyen sağlama algoritması '%s'" -#: builtin/index-pack.c:1867 +#: builtin/index-pack.c:1852 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin, --stdin olmadan kullanılamaz" -#: builtin/index-pack.c:1869 +#: builtin/index-pack.c:1854 msgid "--stdin requires a git repository" msgstr "--stdin bir git dizini gerektirir" -#: builtin/index-pack.c:1871 +#: builtin/index-pack.c:1856 msgid "--object-format cannot be used with --stdin" msgstr "--object-format, --stdin olmadan kullanılamaz" -#: builtin/index-pack.c:1886 +#: builtin/index-pack.c:1871 msgid "--verify with no packfile name given" msgstr "--verify ile bir paket dosyası adı verilmedi" -#: builtin/index-pack.c:1956 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "paket nesnelerinde fsck hatası" -#: builtin/init-db.c:64 +#: builtin/init-db.c:63 #, c-format msgid "cannot stat template '%s'" msgstr "'%s' şablonunun bilgileri alınamıyor" -#: builtin/init-db.c:69 +#: builtin/init-db.c:68 #, c-format msgid "cannot opendir '%s'" msgstr "'%s' opendir yapılamıyor" -#: builtin/init-db.c:81 +#: builtin/init-db.c:80 #, c-format msgid "cannot readlink '%s'" msgstr "'%s' readlink yapılamıyor" -#: builtin/init-db.c:83 +#: builtin/init-db.c:82 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "'%s', '%s' ögesine sembolik bağla bağlanamıyor" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "'%s' şuraya kopyalanamıyor: '%s'" -#: builtin/init-db.c:93 +#: builtin/init-db.c:92 #, c-format msgid "ignoring template %s" msgstr "%s şablonu yok sayılıyor" -#: builtin/init-db.c:124 +#: builtin/init-db.c:123 #, c-format msgid "templates not found in %s" msgstr "şablonlar %s içinde bulunamadı" -#: builtin/init-db.c:139 +#: builtin/init-db.c:138 #, c-format msgid "not copying templates from '%s': %s" msgstr "şablonlar '%s' konumundan kopyalanmıyor: %s" -#: builtin/init-db.c:275 +#: builtin/init-db.c:262 #, c-format msgid "invalid initial branch name: '%s'" msgstr "geçersiz başlangıç dalı adı: '%s'" -#: builtin/init-db.c:367 +#: builtin/init-db.c:353 #, c-format msgid "unable to handle file type %d" msgstr "%d dosya türü ele alınamıyor" -#: builtin/init-db.c:370 +#: builtin/init-db.c:356 #, c-format msgid "unable to move %s to %s" msgstr "%s şuraya taşınamıyor: %s" -#: builtin/init-db.c:386 +#: builtin/init-db.c:372 msgid "attempt to reinitialize repository with different hash" msgstr "depoyu başka bir sağlama ile yeniden ilklendirme deneniyor" -#: builtin/init-db.c:410 builtin/init-db.c:413 +#: builtin/init-db.c:396 builtin/init-db.c:399 #, c-format msgid "%s already exists" msgstr "%s halihazırda var" -#: builtin/init-db.c:445 +#: builtin/init-db.c:431 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: --initial-branch=%s yok sayıldı" -#: builtin/init-db.c:476 +#: builtin/init-db.c:462 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "%s%s içindeki mevcut paylaşılan Git deposu yeniden ilklendirildi\n" -#: builtin/init-db.c:477 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "%s%s içindeki mevcut Git deposu yeniden ilklendirildi\n" -#: builtin/init-db.c:481 +#: builtin/init-db.c:467 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "%s%s içinde paylaşılan boş Git deposu ilklendirildi\n" -#: builtin/init-db.c:482 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "%s%s içinde boş Git deposu ilklendirildi\n" -#: builtin/init-db.c:531 +#: builtin/init-db.c:517 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -16443,41 +16675,41 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<şablon-dizini>] [--" "shared[=<izinler>]] [<dizin>]" -#: builtin/init-db.c:557 +#: builtin/init-db.c:543 msgid "permissions" msgstr "izinler" -#: builtin/init-db.c:558 +#: builtin/init-db.c:544 msgid "specify that the git repository is to be shared amongst several users" msgstr "git deposunun kullanıcılar arasında paylaşıp paylaşılmayacağını belirt" -#: builtin/init-db.c:564 +#: builtin/init-db.c:550 msgid "override the name of the initial branch" msgstr "başlangıç dalının adını geçersiz kıl" -#: builtin/init-db.c:565 builtin/verify-pack.c:74 +#: builtin/init-db.c:551 builtin/verify-pack.c:74 msgid "hash" msgstr "sağlama" -#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "kullanılacak sağlama algoritmasını belirle" -#: builtin/init-db.c:573 +#: builtin/init-db.c:559 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "--separate-git-dir ve --bare birlikte kullanılamaz" -#: builtin/init-db.c:602 builtin/init-db.c:607 +#: builtin/init-db.c:590 builtin/init-db.c:595 #, c-format msgid "cannot mkdir %s" msgstr "%s mkdir yapılamıyor" -#: builtin/init-db.c:611 builtin/init-db.c:666 +#: builtin/init-db.c:599 builtin/init-db.c:654 #, c-format msgid "cannot chdir to %s" msgstr "%s ögesine chdir yapılamıyor" -#: builtin/init-db.c:638 +#: builtin/init-db.c:626 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -16486,12 +16718,12 @@ msgstr "" "%s (veya --work-tree=<dizin>), %s (veya --git-dir=<dizin>) belirlenmeden " "izin verilmiyor" -#: builtin/init-db.c:690 +#: builtin/init-db.c:678 #, c-format msgid "Cannot access work tree '%s'" msgstr "'%s' çalışma ağacı erişilemiyor" -#: builtin/init-db.c:695 +#: builtin/init-db.c:683 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir, çıplak depo ile uyumsuz" @@ -16543,10 +16775,6 @@ msgstr "ayrıştırma seçeneklerini ayarla" msgid "do not treat --- specially" msgstr "ayırma çizgilerine (---) özel davranma" -#: builtin/interpret-trailers.c:111 -msgid "trailer" -msgstr "artbilgi" - #: builtin/interpret-trailers.c:112 msgid "trailer(s) to add" msgstr "eklenecek artbilgi(ler)" @@ -16609,80 +16837,80 @@ msgstr "-L<erim>:<dosya>, yol belirteci ile kullanılamıyor" msgid "Final output: %d %s\n" msgstr "Son çıktı: %d %s\n" -#: builtin/log.c:566 +#: builtin/log.c:568 #, c-format msgid "git show %s: bad file" msgstr "git show %s: hatalı dosya" -#: builtin/log.c:581 builtin/log.c:671 +#: builtin/log.c:583 builtin/log.c:673 #, c-format msgid "could not read object %s" msgstr "%s nesnesi okunamadı" -#: builtin/log.c:696 +#: builtin/log.c:698 #, c-format msgid "unknown type: %d" msgstr "bilinmeyen tür: %d" -#: builtin/log.c:841 +#: builtin/log.c:843 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: açıklama kipinden geçersiz kapak sayfası" -#: builtin/log.c:848 +#: builtin/log.c:850 msgid "format.headers without value" msgstr "format.headers değere iye değil" -#: builtin/log.c:977 +#: builtin/log.c:979 #, c-format msgid "cannot open patch file %s" msgstr "%s yama dosyası okunamıyor" -#: builtin/log.c:994 +#: builtin/log.c:996 msgid "need exactly one range" msgstr "bir tam erim gerekiyor" -#: builtin/log.c:1004 +#: builtin/log.c:1006 msgid "not a range" msgstr "bir erim değil" -#: builtin/log.c:1168 +#: builtin/log.c:1170 msgid "cover letter needs email format" msgstr "ön yazı için e-posta biçimi gerekli" -#: builtin/log.c:1174 +#: builtin/log.c:1176 msgid "failed to create cover-letter file" msgstr "cover-letter dosyası oluşturulamadı" -#: builtin/log.c:1261 +#: builtin/log.c:1263 #, c-format msgid "insane in-reply-to: %s" msgstr "akıl almaz in-reply-to: %s" -#: builtin/log.c:1288 +#: builtin/log.c:1290 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<seçenekler>] [<-beri> | <revizyon-erimi>]" -#: builtin/log.c:1346 +#: builtin/log.c:1348 msgid "two output directories?" msgstr "iki çıktı dizini?" -#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331 +#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340 #, c-format msgid "unknown commit %s" msgstr "bilinmeyen işleme %s" -#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "'%s' geçerli bir başvuru olarak çözülemedi" -#: builtin/log.c:1517 +#: builtin/log.c:1519 msgid "could not find exact merge base" msgstr "kesin birleştirme temeli bulunamadı" -#: builtin/log.c:1527 +#: builtin/log.c:1529 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -16693,396 +16921,400 @@ msgstr "" "izleyin. Bunun dışında taban işlemesini kendiniz --base=<taban-işlemesi-no>\n" "kullanarak el ile belirtebilirsiniz." -#: builtin/log.c:1550 +#: builtin/log.c:1552 msgid "failed to find exact merge base" msgstr "kesin birleştirme temeli bulunamadı" -#: builtin/log.c:1567 +#: builtin/log.c:1569 msgid "base commit should be the ancestor of revision list" msgstr "taban işlemesi revizyon listesinin atası olmalı" -#: builtin/log.c:1577 +#: builtin/log.c:1579 msgid "base commit shouldn't be in revision list" msgstr "taban işlemesi revizyon listesinde olmamalı" -#: builtin/log.c:1635 +#: builtin/log.c:1637 msgid "cannot get patch id" msgstr "yama numarası alınamıyor" -#: builtin/log.c:1692 +#: builtin/log.c:1700 msgid "failed to infer range-diff origin of current series" msgstr "geçerli dizinin range-diff kökeninden bir anlam çıkartılamadı" -#: builtin/log.c:1694 +#: builtin/log.c:1702 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "geçerli dizinin range-diff kökeni olarak '%s' kullanılıyor" -#: builtin/log.c:1738 +#: builtin/log.c:1746 msgid "use [PATCH n/m] even with a single patch" msgstr "bir yamayla bile olsa [PATCH n/m] kullan" -#: builtin/log.c:1741 +#: builtin/log.c:1749 msgid "use [PATCH] even with multiple patches" msgstr "birden çok yama bile olsa [PATCH] kullan" -#: builtin/log.c:1745 +#: builtin/log.c:1753 msgid "print patches to standard out" msgstr "yamaları standart çıktıya yazdır" -#: builtin/log.c:1747 +#: builtin/log.c:1755 msgid "generate a cover letter" msgstr "bir ön yazı oluştur" -#: builtin/log.c:1749 +#: builtin/log.c:1757 msgid "use simple number sequence for output file names" msgstr "çıktı dosya adları için yalın sayı dizisi oluştur" -#: builtin/log.c:1750 +#: builtin/log.c:1758 msgid "sfx" msgstr "sonek" -#: builtin/log.c:1751 +#: builtin/log.c:1759 msgid "use <sfx> instead of '.patch'" msgstr "'.patch' yerine <sonek> kullan" -#: builtin/log.c:1753 +#: builtin/log.c:1761 msgid "start numbering patches at <n> instead of 1" msgstr "yamaları 1 yerine <n>'de numaralandırmaya başla" -#: builtin/log.c:1755 +#: builtin/log.c:1762 +msgid "reroll-count" +msgstr "reroll-count" + +#: builtin/log.c:1763 msgid "mark the series as Nth re-roll" msgstr "diziyi n. deneme olarak imle" -#: builtin/log.c:1757 +#: builtin/log.c:1765 msgid "max length of output filename" msgstr "çıktı dosya adının olabilecek en çok uzunluğu" -#: builtin/log.c:1759 +#: builtin/log.c:1767 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "[PATCH] yerine [RFC PATCH] kullan" -#: builtin/log.c:1762 +#: builtin/log.c:1770 msgid "cover-from-description-mode" msgstr "açıklama kipinden kapak sayfası kipi" -#: builtin/log.c:1763 +#: builtin/log.c:1771 msgid "generate parts of a cover letter based on a branch's description" msgstr "ön yazının bazı kısımlarını dalın açıklamasından oluştur" -#: builtin/log.c:1765 +#: builtin/log.c:1773 msgid "use [<prefix>] instead of [PATCH]" msgstr "[PATCH] yerine [<önek>] kullan" -#: builtin/log.c:1768 +#: builtin/log.c:1776 msgid "store resulting files in <dir>" msgstr "ortaya çıkan dosyaları <dizin>'de depola" -#: builtin/log.c:1771 +#: builtin/log.c:1779 msgid "don't strip/add [PATCH]" msgstr "[PATCH]'i soyma/ekleme" -#: builtin/log.c:1774 +#: builtin/log.c:1782 msgid "don't output binary diffs" msgstr "ikili diff'leri çıktı verme" -#: builtin/log.c:1776 +#: builtin/log.c:1784 msgid "output all-zero hash in From header" msgstr "From başlığında tümü sıfırdan oluşan sağlama çıktısı ver" -#: builtin/log.c:1778 +#: builtin/log.c:1786 msgid "don't include a patch matching a commit upstream" msgstr "üstkaynaktaki bir işleme ile eşleşen bir yamayı içerme" -#: builtin/log.c:1780 +#: builtin/log.c:1788 msgid "show patch format instead of default (patch + stat)" msgstr "öntanımlı yerine yama biçimini göster (patch + stat)" -#: builtin/log.c:1782 +#: builtin/log.c:1790 msgid "Messaging" msgstr "İletileşme" -#: builtin/log.c:1783 +#: builtin/log.c:1791 msgid "header" msgstr "üstbilgi" -#: builtin/log.c:1784 +#: builtin/log.c:1792 msgid "add email header" msgstr "e-posta üstbilgisi ekle" -#: builtin/log.c:1785 builtin/log.c:1786 +#: builtin/log.c:1793 builtin/log.c:1794 msgid "email" msgstr "e-posta" -#: builtin/log.c:1785 +#: builtin/log.c:1793 msgid "add To: header" msgstr "To: üstbilgisi ekle" -#: builtin/log.c:1786 +#: builtin/log.c:1794 msgid "add Cc: header" msgstr "Cc: üstbilgisi ekle" -#: builtin/log.c:1787 +#: builtin/log.c:1795 msgid "ident" msgstr "tanımlayıcı" -#: builtin/log.c:1788 +#: builtin/log.c:1796 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "From adresini <tanımlayıcı> olarak ayarla (veya yoksa işleyici tanımlayıcısı)" -#: builtin/log.c:1790 +#: builtin/log.c:1798 msgid "message-id" msgstr "ileti no" -#: builtin/log.c:1791 +#: builtin/log.c:1799 msgid "make first mail a reply to <message-id>" msgstr "ilk postayı <ileti no>'ya bir yanıt yap" -#: builtin/log.c:1792 builtin/log.c:1795 +#: builtin/log.c:1800 builtin/log.c:1803 msgid "boundary" msgstr "sınır" -#: builtin/log.c:1793 +#: builtin/log.c:1801 msgid "attach the patch" msgstr "yamayı ekle" -#: builtin/log.c:1796 +#: builtin/log.c:1804 msgid "inline the patch" msgstr "yamayı iletiye koy" -#: builtin/log.c:1800 +#: builtin/log.c:1808 msgid "enable message threading, styles: shallow, deep" msgstr "iletileri kataloglamayı etkinleştir, stiller: shallow, deep" -#: builtin/log.c:1802 +#: builtin/log.c:1810 msgid "signature" msgstr "imza" -#: builtin/log.c:1803 +#: builtin/log.c:1811 msgid "add a signature" msgstr "imza ekle" -#: builtin/log.c:1804 +#: builtin/log.c:1812 msgid "base-commit" msgstr "taban işleme" -#: builtin/log.c:1805 +#: builtin/log.c:1813 msgid "add prerequisite tree info to the patch series" msgstr "yama dizisine önkoşul ağaç bilgisini ekle" -#: builtin/log.c:1808 +#: builtin/log.c:1816 msgid "add a signature from a file" msgstr "dosyadan bir imza ekle" -#: builtin/log.c:1809 +#: builtin/log.c:1817 msgid "don't print the patch filenames" msgstr "yama dosya adlarını yazdırma" -#: builtin/log.c:1811 +#: builtin/log.c:1819 msgid "show progress while generating patches" msgstr "yamalar oluşturulurken ilerlemeyi göster" -#: builtin/log.c:1813 +#: builtin/log.c:1821 msgid "show changes against <rev> in cover letter or single patch" msgstr "<rev> karşısındaki değişiklikleri ön yazıda veya tek bir yamada göster" -#: builtin/log.c:1816 +#: builtin/log.c:1824 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "<bşvr-blrtç> karşısındaki değişiklikleri ön yazıda veya tek bir yamada göster" -#: builtin/log.c:1818 +#: builtin/log.c:1826 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "oluşumun tartıldığı yüzde" -#: builtin/log.c:1904 +#: builtin/log.c:1913 #, c-format msgid "invalid ident line: %s" msgstr "geçersiz tanımlayıcı satırı: %s" -#: builtin/log.c:1919 +#: builtin/log.c:1928 msgid "-n and -k are mutually exclusive" msgstr "-n ve -k birlikte kullanılamaz" -#: builtin/log.c:1921 +#: builtin/log.c:1930 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc ve -k birlikte kullanılamaz" -#: builtin/log.c:1929 +#: builtin/log.c:1938 msgid "--name-only does not make sense" msgstr "--name-only bir anlam ifade etmiyor" -#: builtin/log.c:1931 +#: builtin/log.c:1940 msgid "--name-status does not make sense" msgstr "--name-status bir anlam ifade etmiyor" -#: builtin/log.c:1933 +#: builtin/log.c:1942 msgid "--check does not make sense" msgstr "--check bir anlam ifade etmiyor" -#: builtin/log.c:1955 +#: builtin/log.c:1964 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "--stdout, --output ve --output-directory birlikte kullanılamaz" -#: builtin/log.c:2078 +#: builtin/log.c:2087 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff, --cover-letter veya tek yama gerektiriyor" -#: builtin/log.c:2082 +#: builtin/log.c:2091 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:2083 +#: builtin/log.c:2092 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff v%d karşısında:" -#: builtin/log.c:2089 +#: builtin/log.c:2098 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor, --range-diff gerektiriyor" -#: builtin/log.c:2093 +#: builtin/log.c:2102 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff, --cover-letter veya tek yama gerektiriyor" -#: builtin/log.c:2101 +#: builtin/log.c:2110 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:2102 +#: builtin/log.c:2111 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff v%d karşısında:" -#: builtin/log.c:2113 +#: builtin/log.c:2122 #, c-format msgid "unable to read signature file '%s'" msgstr "'%s' imza dosyası okunamıyor" -#: builtin/log.c:2149 +#: builtin/log.c:2158 msgid "Generating patches" msgstr "Yamalar oluşturuluyor" -#: builtin/log.c:2193 +#: builtin/log.c:2202 msgid "failed to create output files" msgstr "çıktı dosyaları oluşturulamadı" -#: builtin/log.c:2252 +#: builtin/log.c:2261 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<üstkaynak> [<dal-ucu> [<sınır>]]]" -#: builtin/log.c:2306 +#: builtin/log.c:2315 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "İzlenen bir uzak dal bulunamadı, lütfen el ile <üstkaynak> belirtin.\n" -#: builtin/ls-files.c:486 +#: builtin/ls-files.c:563 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<seçenekler>] [<dosya>...]" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:619 msgid "identify the file status with tags" msgstr "dosya durumunu etiketlerle tanımla" -#: builtin/ls-files.c:544 +#: builtin/ls-files.c:621 msgid "use lowercase letters for 'assume unchanged' files" msgstr "'değiştirilmediği düşünülen' dosyaları küçük harflerle göster" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:623 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "'fsmonitor clean' dosyalarını küçük harflerle göster" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:625 msgid "show cached files in the output (default)" msgstr "önbelleğe alınan dosyaları çıktıda göster (öntanımlı)" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:627 msgid "show deleted files in the output" msgstr "silinen dosyaları çıktıda göster" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:629 msgid "show modified files in the output" msgstr "değiştirilen dosyaları çıktıda göster" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:631 msgid "show other files in the output" msgstr "diğer dosyaları çıktıda göster" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:633 msgid "show ignored files in the output" msgstr "yok sayılan dosyaları çıktıda göster" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:636 msgid "show staged contents' object name in the output" msgstr "hazırlanan içeriğin nesne adını çıktıda göster" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:638 msgid "show files on the filesystem that need to be removed" msgstr "dosya sistemindeki kaldırılması gereken dosyaları göster" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:640 msgid "show 'other' directories' names only" msgstr "'diğer' dizinlerin yalnızca adını göster" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:642 msgid "show line endings of files" msgstr "dosyaların satır sonlarını göster" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:644 msgid "don't show empty directories" msgstr "boş dizinleri gösterme" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:647 msgid "show unmerged files in the output" msgstr "birleştirilmemiş dosyaları çıktıda göster" -#: builtin/ls-files.c:572 +#: builtin/ls-files.c:649 msgid "show resolve-undo information" msgstr "'resolve-undo' bilgisini göster" -#: builtin/ls-files.c:574 +#: builtin/ls-files.c:651 msgid "skip files matching pattern" msgstr "dizgi ile eşleşen dosyaları atla" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:654 msgid "exclude patterns are read from <file>" msgstr "hariç tutma dizgileri <dosya>'dan okunuyor" -#: builtin/ls-files.c:580 +#: builtin/ls-files.c:657 msgid "read additional per-directory exclude patterns in <file>" msgstr "ek dizin başı hariç tutma dizgilerini <dosya>'dan oku" -#: builtin/ls-files.c:582 +#: builtin/ls-files.c:659 msgid "add the standard git exclusions" msgstr "standart git hariç tutmalarını ekle" -#: builtin/ls-files.c:586 +#: builtin/ls-files.c:663 msgid "make the output relative to the project top directory" msgstr "çıktıyı en üst proje dizinine göreceli olarak yap" -#: builtin/ls-files.c:589 +#: builtin/ls-files.c:666 msgid "recurse through submodules" msgstr "altmodüller içinden özyinele" -#: builtin/ls-files.c:591 +#: builtin/ls-files.c:668 msgid "if any <file> is not in the index, treat this as an error" msgstr "eğer bir <dosya> indekste değilse bunu bir hata olarak gör" -#: builtin/ls-files.c:592 +#: builtin/ls-files.c:669 msgid "tree-ish" msgstr "ağacımsı" -#: builtin/ls-files.c:593 +#: builtin/ls-files.c:670 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "<ağacımsı>'dan bu yana kaldırılan yolların hâlâ var olduğunu varsay" -#: builtin/ls-files.c:595 +#: builtin/ls-files.c:672 msgid "show debugging data" msgstr "hata ayıklama verisini göster" -#: builtin/ls-files.c:597 +#: builtin/ls-files.c:674 msgid "suppress duplicate entries" msgstr "yinelenen girdileri sustur" @@ -17100,7 +17332,7 @@ msgstr "" msgid "do not print remote URL" msgstr "uzak konum URL'sini yazdırma" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399 msgid "exec" msgstr "çalıştır" @@ -17168,6 +17400,55 @@ msgstr "tam yol adlarını kullan" msgid "list entire tree; not just current directory (implies --full-name)" msgstr "yalnızca geçerli dizini değil tüm ağacı listele (--full-name ima eder)" +#. TRANSLATORS: keep <> in "<" mail ">" info. +#: builtin/mailinfo.c:14 +msgid "git mailinfo [<options>] <msg> <patch> < mail >info" +msgstr "git mailinfo [<seçenekler>] <ileti> <yama> < mail >info" + +#: builtin/mailinfo.c:58 +msgid "keep subject" +msgstr "konuyu tut" + +#: builtin/mailinfo.c:60 +msgid "keep non patch brackets in subject" +msgstr "yama olmayan ayraçları konuda tut" + +#: builtin/mailinfo.c:62 +msgid "copy Message-ID to the end of commit message" +msgstr "Message-ID'yi işleme iletisinin sonuna kopyala" + +#: builtin/mailinfo.c:64 +msgid "re-code metadata to i18n.commitEncoding" +msgstr "üstveriyi i18n.commitEncoding olarak yeniden kodla" + +#: builtin/mailinfo.c:67 +msgid "disable charset re-coding of metadata" +msgstr "üstverinin karakter seti yeniden kodlamasını devre dışı bırak" + +#: builtin/mailinfo.c:69 +msgid "encoding" +msgstr "kodlama" + +#: builtin/mailinfo.c:70 +msgid "re-code metadata to this encoding" +msgstr "üstveriyi bu kodlama olacak biçimde yeniden kodla" + +#: builtin/mailinfo.c:72 +msgid "use scissors" +msgstr "makas kullan" + +#: builtin/mailinfo.c:73 +msgid "<action>" +msgstr "<eylem>" + +#: builtin/mailinfo.c:74 +msgid "action when quoted CR is found" +msgstr "alıntılanmış CR bulunduğu zaman yapılacak eylem" + +#: builtin/mailinfo.c:77 +msgid "use headers in message's body" +msgstr "ileti gövdesinde üstbilgi kullan" + #: builtin/mailsplit.c:241 #, c-format msgid "empty mbox: '%s'" @@ -17362,7 +17643,7 @@ msgid "verify that the named commit has a valid GPG signature" msgstr "adı verilen işlemenin geçerli bir GPG imzası olduğunu doğrula" #: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114 +#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114 msgid "strategy" msgstr "strateji" @@ -17420,55 +17701,55 @@ msgstr "geçerli bir nesne değil: %s" msgid "read-tree failed" msgstr "read-tree başarısız oldu" -#: builtin/merge.c:399 -msgid " (nothing to squash)" -msgstr " (tıkıştırılacak bir şey yok)" +#: builtin/merge.c:400 +msgid "Already up to date. (nothing to squash)" +msgstr "Tümü güncel (tıkıştırılacak bir şey yok)." -#: builtin/merge.c:410 +#: builtin/merge.c:414 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tıkıştırma işlemesi -- HEAD güncellenmiyor\n" -#: builtin/merge.c:460 +#: builtin/merge.c:464 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Birleştirme iletisi yok -- HEAD güncellenmiyor\n" -#: builtin/merge.c:511 +#: builtin/merge.c:515 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' bir işlemeye işaret etmiyor" -#: builtin/merge.c:598 +#: builtin/merge.c:602 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Hatalı branch.%s.mergeoptions dizisi: %s" -#: builtin/merge.c:724 +#: builtin/merge.c:728 msgid "Not handling anything other than two heads merge." msgstr "İki uç işlemenin birleştirilmesi dışında bir şey yapılmıyor." -#: builtin/merge.c:737 +#: builtin/merge.c:741 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive için geçersiz seçenek: -X%s" -#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "%s yazılamıyor" -#: builtin/merge.c:808 +#: builtin/merge.c:812 #, c-format msgid "Could not read from '%s'" msgstr "Şu konumdan okunamadı: '%s'" -#: builtin/merge.c:817 +#: builtin/merge.c:821 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "Birleştirme işlenmiyor, tamamlamak için 'git commit' kullanın.\n" -#: builtin/merge.c:823 +#: builtin/merge.c:827 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -17478,11 +17759,11 @@ msgstr "" "girin, özellikle güncellenmiş bir üstkaynağı kişisel dala birleştiriyorsa.\n" "\n" -#: builtin/merge.c:828 +#: builtin/merge.c:832 msgid "An empty message aborts the commit.\n" msgstr "Boş bir ileti işlemeyi iptal eder.\n" -#: builtin/merge.c:831 +#: builtin/merge.c:835 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -17491,72 +17772,72 @@ msgstr "" "'%c' ile başlayan satırlar yok sayılacaktır. Boş bir ileti işlemeyi\n" "iptal eder.\n" -#: builtin/merge.c:884 +#: builtin/merge.c:888 msgid "Empty commit message." msgstr "Boş işleme iletisi." -#: builtin/merge.c:899 +#: builtin/merge.c:903 #, c-format msgid "Wonderful.\n" msgstr "Harika.\n" -#: builtin/merge.c:960 +#: builtin/merge.c:964 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "Otomatik birleştirme başarısız; çakışmaları çözün ve sonucu işleyin.\n" -#: builtin/merge.c:999 +#: builtin/merge.c:1003 msgid "No current branch." msgstr "Geçerli dal yok." -#: builtin/merge.c:1001 +#: builtin/merge.c:1005 msgid "No remote for the current branch." msgstr "Geçerli dal için uzak konum yok." -#: builtin/merge.c:1003 +#: builtin/merge.c:1007 msgid "No default upstream defined for the current branch." msgstr "Geçerli dal için öntanımlı üstkaynak tanımlanmamış." -#: builtin/merge.c:1008 +#: builtin/merge.c:1012 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "%s için %s konumundan uzak izleme dalı yok" -#: builtin/merge.c:1065 +#: builtin/merge.c:1069 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Hatalı değer '%s', '%s' ortamında" -#: builtin/merge.c:1168 +#: builtin/merge.c:1172 #, c-format msgid "not something we can merge in %s: %s" msgstr "%s içinde birleştirebileceğimiz bir şey değil: %s" -#: builtin/merge.c:1202 +#: builtin/merge.c:1206 msgid "not something we can merge" msgstr "birleştirebileceğimiz bir şey değil" -#: builtin/merge.c:1312 +#: builtin/merge.c:1316 msgid "--abort expects no arguments" msgstr "--abort bir argüman beklemez" -#: builtin/merge.c:1316 +#: builtin/merge.c:1320 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "İptal edilecek bir birleştirme yok (MERGE_HEAD eksik)." -#: builtin/merge.c:1334 +#: builtin/merge.c:1338 msgid "--quit expects no arguments" msgstr "--quit bir argüman beklemez" -#: builtin/merge.c:1347 +#: builtin/merge.c:1351 msgid "--continue expects no arguments" msgstr "--continue bir argüman beklemez" -#: builtin/merge.c:1351 +#: builtin/merge.c:1355 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "İlerlemekte olan bir birleştirme yok (MERGE_HEAD eksik)." -#: builtin/merge.c:1367 +#: builtin/merge.c:1371 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17564,7 +17845,7 @@ msgstr "" "Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut).\n" "Lütfen birleştirmeden önce değişikliklerinizi işleyin." -#: builtin/merge.c:1374 +#: builtin/merge.c:1378 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17572,97 +17853,89 @@ msgstr "" "Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD mevcut).\n" "Lütfen birleştirmeden önce değişikliklerinizi işleyin." -#: builtin/merge.c:1377 +#: builtin/merge.c:1381 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD mevcut)." -#: builtin/merge.c:1391 +#: builtin/merge.c:1395 msgid "You cannot combine --squash with --no-ff." msgstr "--squash ile --no-ff birlikte kullanılamaz." -#: builtin/merge.c:1393 +#: builtin/merge.c:1397 msgid "You cannot combine --squash with --commit." msgstr "--squash ile --commit birlikte kullanılamaz." -#: builtin/merge.c:1409 +#: builtin/merge.c:1413 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Belirtilen bir işleme yok ve merge.defaultToUpstream ayarlanmamış." -#: builtin/merge.c:1426 +#: builtin/merge.c:1430 msgid "Squash commit into empty head not supported yet" msgstr "İşlemeyi boş dal ucuna tıkıştırma henüz desteklenmiyor" -#: builtin/merge.c:1428 +#: builtin/merge.c:1432 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "İleri sarım olmayan işlemeyi boş dal ucuna yapmak bir anlam ifade etmiyor" -#: builtin/merge.c:1433 +#: builtin/merge.c:1437 #, c-format msgid "%s - not something we can merge" msgstr "%s - birleştirebileceğimiz bir şey değil" -#: builtin/merge.c:1435 +#: builtin/merge.c:1439 msgid "Can merge only exactly one commit into empty head" msgstr "Boş dal ucuna tam olarak yalnızca bir işleme birleştirilebilir" -#: builtin/merge.c:1516 +#: builtin/merge.c:1520 msgid "refusing to merge unrelated histories" msgstr "birbiriyle ilişkisi olmayan geçmişleri birleştirme reddediliyor" -#: builtin/merge.c:1525 -msgid "Already up to date." -msgstr "Tümü güncel." - -#: builtin/merge.c:1535 +#: builtin/merge.c:1539 #, c-format msgid "Updating %s..%s\n" msgstr "Güncelleniyor: %s..%s\n" -#: builtin/merge.c:1581 +#: builtin/merge.c:1585 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Gerçekten önemsiz indeks içi birleştirme deneniyor...\n" -#: builtin/merge.c:1588 +#: builtin/merge.c:1592 #, c-format msgid "Nope.\n" msgstr "Yok.\n" -#: builtin/merge.c:1613 -msgid "Already up to date. Yeeah!" -msgstr "Tümü güncel. İşte bu!" - -#: builtin/merge.c:1619 +#: builtin/merge.c:1623 msgid "Not possible to fast-forward, aborting." msgstr "İleri sarma olanaklı değil, iptal ediliyor." -#: builtin/merge.c:1647 builtin/merge.c:1712 +#: builtin/merge.c:1651 builtin/merge.c:1716 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Ağaç bozulmamış durumuna geri sarılıyor...\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1655 #, c-format msgid "Trying merge strategy %s...\n" msgstr "%s birleştirme stratejisi deneniyor...\n" -#: builtin/merge.c:1703 +#: builtin/merge.c:1707 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Birleştirmeyi hiçbir birleştirme stratejisi işlemedi\n" -#: builtin/merge.c:1705 +#: builtin/merge.c:1709 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "%s stratejisi ile birleştirme başarısız oldu.\n" -#: builtin/merge.c:1714 +#: builtin/merge.c:1718 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "El ile çözümü hazırlamak için %s kullanılıyor.\n" -#: builtin/merge.c:1728 +#: builtin/merge.c:1732 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -17672,40 +17945,40 @@ msgstr "" msgid "git mktag" msgstr "git mktag" -#: builtin/mktag.c:30 +#: builtin/mktag.c:27 #, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "uyarı: etiket girdisi fsck'den geçemiyor: %s" -#: builtin/mktag.c:41 +#: builtin/mktag.c:38 #, c-format msgid "error: tag input does not pass fsck: %s" msgstr "hata: etiket girdisi fsck'den geçemiyor: %s" -#: builtin/mktag.c:44 +#: builtin/mktag.c:41 #, c-format msgid "%d (FSCK_IGNORE?) should never trigger this callback" msgstr "%d (FSCK_IGNORE?) hiçbir zaman bu geri çağırmayı tetiklememeli" -#: builtin/mktag.c:59 +#: builtin/mktag.c:56 #, c-format msgid "could not read tagged object '%s'" msgstr "etiketlenmiş nesne '%s' okunamadı" -#: builtin/mktag.c:62 +#: builtin/mktag.c:59 #, c-format msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "'%s' nesnesi '%s' olarak etiketlenmiş; ancak bir '%s' türü" -#: builtin/mktag.c:99 +#: builtin/mktag.c:97 msgid "tag on stdin did not pass our strict fsck check" msgstr "stdin üzerindeki etiket bizim sıkı fsck denetimimizi geçemedi" -#: builtin/mktag.c:102 +#: builtin/mktag.c:100 msgid "tag on stdin did not refer to a valid object" msgstr "stdin üzerindeki etiket geçerli bir nesneye başvurmuyor" -#: builtin/mktag.c:105 builtin/tag.c:232 +#: builtin/mktag.c:103 builtin/tag.c:243 msgid "unable to write tag file" msgstr "etiket dosyası yazılamıyor" @@ -17725,19 +17998,35 @@ msgstr "eksik nesnelere izin ver" msgid "allow creation of more than one tree" msgstr "birden çok ağacın oluşturulmasına izin ver" -#: builtin/multi-pack-index.c:9 -msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" -msgstr "" -"git multi-pack-index [<seçenekler>] (write|verify|expire|repack --batch-" -"size=<boyut>)" +#: builtin/multi-pack-index.c:10 +msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]" +msgstr "git multi-pack-index [<seçenekler>] write [--preferred-pack=<paket>]" + +#: builtin/multi-pack-index.c:13 +msgid "git multi-pack-index [<options>] verify" +msgstr "git multi-pack-index [<seçenekler>] verify" + +#: builtin/multi-pack-index.c:16 +msgid "git multi-pack-index [<options>] expire" +msgstr "git multi-pack-index [<seçenekler>] expire" + +#: builtin/multi-pack-index.c:19 +msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" +msgstr "git multi-pack-index [<seçenekler>] repack [--batch-size=<boyut>]" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:54 msgid "object directory containing set of packfile and pack-index pairs" msgstr "nesne dizini paket dosyası seti ve pack-index eşleri içeriyor" -#: builtin/multi-pack-index.c:29 +#: builtin/multi-pack-index.c:69 +msgid "preferred-pack" +msgstr "preferred-pack" + +#: builtin/multi-pack-index.c:70 +msgid "pack for reuse when computing a multi-pack bitmap" +msgstr "bir çoklu paket biteşlemi hesaplanırken yeniden kullanılacak paket" + +#: builtin/multi-pack-index.c:128 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -17745,18 +18034,7 @@ msgstr "" "yeniden paketleme sırasında daha küçük boyutlu paket dosyalarını bu boyuttan " "daha büyük bir toplu iş olarak toplayın" -#: builtin/multi-pack-index.c:50 builtin/notes.c:376 builtin/notes.c:431 -#: builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598 -#: builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963 -#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:575 -msgid "too many arguments" -msgstr "çok fazla argüman" - -#: builtin/multi-pack-index.c:60 -msgid "--batch-size option is only for 'repack' subcommand" -msgstr "--batch-size seçeneği yalnızca 'repack' altkomutu için" - -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:180 #, c-format msgid "unrecognized subcommand: %s" msgstr "tanımlanamayan altkomut: %s" @@ -17854,7 +18132,7 @@ msgstr "%s, kaynak=%s, hedef:%s" msgid "Renaming %s to %s\n" msgstr "%s, %s olarak yeniden adlandırılıyor\n" -#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667 #, c-format msgid "renaming '%s' failed" msgstr "'%s' yeniden adlandırılamadı" @@ -18044,7 +18322,7 @@ msgstr "not nesnesi yazılamıyor" msgid "the note contents have been left in %s" msgstr "not içeriği %s içinde bırakıldı" -#: builtin/notes.c:242 builtin/tag.c:565 +#: builtin/notes.c:242 builtin/tag.c:576 #, c-format msgid "could not open or read '%s'" msgstr "'%s' açılamadı veya okunamadı" @@ -18084,6 +18362,13 @@ msgstr "notlar '%s' konumundan '%s' konumuna kopyalanamadı" msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "notları %s yapma (%s içinde) reddediliyor (refs/notes/ dışında)" +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 +#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 +#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 +#: builtin/prune-packed.c:25 builtin/tag.c:586 +msgid "too many arguments" +msgstr "çok fazla argüman" + #: builtin/notes.c:389 builtin/notes.c:678 #, c-format msgid "no note found for object %s." @@ -18270,7 +18555,7 @@ msgstr "" "çözün ve sonucu 'git notes merge --commit' ile işleyin. Birleştirmeyi iptal " "etmek isterseniz 'git notes merge --abort' kullanarak bunu yapabilirsiniz.\n" -#: builtin/notes.c:897 builtin/tag.c:578 +#: builtin/notes.c:897 builtin/tag.c:589 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "'%s' geçerli bir başvuru olarak çözülemiyor" @@ -18304,7 +18589,7 @@ msgstr "not başvurusu" msgid "use notes from <notes-ref>" msgstr "notları <not-bşvr>'ndan kullan" -#: builtin/notes.c:1034 builtin/stash.c:1671 +#: builtin/notes.c:1034 builtin/stash.c:1739 #, c-format msgid "unknown subcommand: %s" msgstr "bilinmeyen altkomut: %s" @@ -18376,63 +18661,63 @@ msgstr "%s bilgileri alınamıyor" msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> nesne yazıldı (%<PRIu32> bekleniyordu)" -#: builtin/pack-objects.c:1358 +#: builtin/pack-objects.c:1383 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "bazı nesneler paketlenmediğinden dolayı biteşlem yazımı kapatılıyor" -#: builtin/pack-objects.c:1806 +#: builtin/pack-objects.c:1831 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s için paket içinde delta taban ofset taşımı" -#: builtin/pack-objects.c:1815 +#: builtin/pack-objects.c:1840 #, c-format msgid "delta base offset out of bound for %s" msgstr "%s için delta taban ofseti sınırların dışında" -#: builtin/pack-objects.c:2096 +#: builtin/pack-objects.c:2121 msgid "Counting objects" msgstr "Nesneler sayılıyor" -#: builtin/pack-objects.c:2241 +#: builtin/pack-objects.c:2266 #, c-format msgid "unable to parse object header of %s" msgstr "%s nesne üstbilgisi ayrıştırılamıyor" -#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327 -#: builtin/pack-objects.c:2337 +#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352 +#: builtin/pack-objects.c:2362 #, c-format msgid "object %s cannot be read" msgstr "%s nesnesi okunamıyor" -#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341 +#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "%s nesnesi için tutarsız nesne uzunluğu (%<PRIuMAX> / %<PRIuMAX>)" -#: builtin/pack-objects.c:2351 +#: builtin/pack-objects.c:2376 msgid "suboptimal pack - out of memory" msgstr "standart altı paket - bellek yetersiz" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2691 #, c-format msgid "Delta compression using up to %d threads" msgstr "Delta sıkıştırması %d iş parçacığı kullanıyor" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:2830 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "%s etiketinden ulaşılabilir nesneler paketlenemiyor" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2916 msgid "Compressing objects" msgstr "Nesneler sıkıştırılıyor" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2922 msgid "inconsistency with delta count" msgstr "delta sayımında tutarsızlık" -#: builtin/pack-objects.c:2976 +#: builtin/pack-objects.c:3001 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -18441,7 +18726,7 @@ msgstr "" "uploadpack.blobpackfileuri değeri '<nesne-sağlaması> <paket-sağlaması> <uri> " "biçiminde olmalıdır ('%s' alındı)" -#: builtin/pack-objects.c:2979 +#: builtin/pack-objects.c:3004 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" @@ -18449,7 +18734,17 @@ msgstr "" "nesne halihazırda başka bir uploadpack.blobpackfileuri içinde yapılandırıldı " "('%s' alındı)" -#: builtin/pack-objects.c:3008 +#: builtin/pack-objects.c:3039 +#, c-format +msgid "could not get type of object %s in pack %s" +msgstr "%s nesnesinin türü alınamıyor (%s paketinde)" + +#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175 +#, c-format +msgid "could not find pack '%s'" +msgstr "'%s' paketi bulunamadı" + +#: builtin/pack-objects.c:3218 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18458,7 +18753,7 @@ msgstr "" "sınır nesnesi numarası bekleniyordu, anlamsız veri alındı:\n" " %s" -#: builtin/pack-objects.c:3014 +#: builtin/pack-objects.c:3224 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18467,237 +18762,249 @@ msgstr "" "nesne numarası bekleniyordu, anlamsız veri alındı:\n" "%s" -#: builtin/pack-objects.c:3112 +#: builtin/pack-objects.c:3322 msgid "invalid value for --missing" msgstr "--missing için geçersiz değer" -#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279 +#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490 msgid "cannot open pack index" msgstr "paket indeksi açılamıyor" -#: builtin/pack-objects.c:3202 +#: builtin/pack-objects.c:3412 #, c-format msgid "loose object at %s could not be examined" msgstr "%s konumundaki gevşek nesne incelenemedi" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3498 msgid "unable to force loose object" msgstr "gevşek nesne zorlanamıyor" -#: builtin/pack-objects.c:3380 +#: builtin/pack-objects.c:3628 #, c-format msgid "not a rev '%s'" msgstr "bir revizyon değil: '%s'" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3631 #, c-format msgid "bad revision '%s'" msgstr "hatalı revizyon: '%s'" -#: builtin/pack-objects.c:3408 +#: builtin/pack-objects.c:3659 msgid "unable to add recent objects" msgstr "en son nesneler eklenemiyor" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3712 #, c-format msgid "unsupported index version %s" msgstr "desteklenmeyen indeks sürümü %s" -#: builtin/pack-objects.c:3465 +#: builtin/pack-objects.c:3716 #, c-format msgid "bad index version '%s'" msgstr "hatalı indeks sürümü '%s'" -#: builtin/pack-objects.c:3503 +#: builtin/pack-objects.c:3755 msgid "<version>[,<offset>]" msgstr "<sürüm>[,<ofset>]" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3756 msgid "write the pack index file in the specified idx format version" msgstr "paket indeks dosyasını belirtilen idx biçiminde yaz" -#: builtin/pack-objects.c:3507 +#: builtin/pack-objects.c:3759 msgid "maximum size of each output pack file" msgstr "her çıktı paketi dosyasının olabilecek en büyük boyutu" -#: builtin/pack-objects.c:3509 +#: builtin/pack-objects.c:3761 msgid "ignore borrowed objects from alternate object store" msgstr "alternatif nesne mağazasından ödünç alınan nesneleri yok say" -#: builtin/pack-objects.c:3511 +#: builtin/pack-objects.c:3763 msgid "ignore packed objects" msgstr "paketlenmiş nesneleri yok say" -#: builtin/pack-objects.c:3513 +#: builtin/pack-objects.c:3765 msgid "limit pack window by objects" msgstr "paket penceresini nesnelerle sınırla" -#: builtin/pack-objects.c:3515 +#: builtin/pack-objects.c:3767 msgid "limit pack window by memory in addition to object limit" msgstr "paket penceresini nesne limitine ek olarak bellek ile kısıtla" -#: builtin/pack-objects.c:3517 +#: builtin/pack-objects.c:3769 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "ortaya çıkan pakette olabilecek en büyük delta zincirinin uzunluğu" -#: builtin/pack-objects.c:3519 +#: builtin/pack-objects.c:3771 msgid "reuse existing deltas" msgstr "var olan deltaları yeniden kullan" -#: builtin/pack-objects.c:3521 +#: builtin/pack-objects.c:3773 msgid "reuse existing objects" msgstr "var olan nesneleri yeniden kullan" -#: builtin/pack-objects.c:3523 +#: builtin/pack-objects.c:3775 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA nesneleri kullan" -#: builtin/pack-objects.c:3525 +#: builtin/pack-objects.c:3777 msgid "use threads when searching for best delta matches" msgstr "en iyi delta eşleşmelerini ararken iş parçacıklarını kullan" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3779 msgid "do not create an empty pack output" msgstr "boş bir paket çıktısı oluşturma" -#: builtin/pack-objects.c:3529 +#: builtin/pack-objects.c:3781 msgid "read revision arguments from standard input" msgstr "revizyon argümanlarını standart girdi'den oku" -#: builtin/pack-objects.c:3531 +#: builtin/pack-objects.c:3783 msgid "limit the objects to those that are not yet packed" msgstr "nesneleri henüz paketlenmeyenlere kısıtla" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3786 msgid "include objects reachable from any reference" msgstr "herhangi bir başvurudan ulaşılabilir olan nesneleri içer" -#: builtin/pack-objects.c:3537 +#: builtin/pack-objects.c:3789 msgid "include objects referred by reflog entries" msgstr "başvuru günlüğü tarafından başvurulan nesneleri içer" -#: builtin/pack-objects.c:3540 +#: builtin/pack-objects.c:3792 msgid "include objects referred to by the index" msgstr "indeks tarafından başvurulan nesneleri içer" -#: builtin/pack-objects.c:3543 +#: builtin/pack-objects.c:3795 +msgid "read packs from stdin" +msgstr "paketleri stdin'den oku" + +#: builtin/pack-objects.c:3797 msgid "output pack to stdout" msgstr "paketi stdout'a çıktı ver" -#: builtin/pack-objects.c:3545 +#: builtin/pack-objects.c:3799 msgid "include tag objects that refer to objects to be packed" msgstr "paketlenecek nesnelere başvuran etiket nesnelerini içer" -#: builtin/pack-objects.c:3547 +#: builtin/pack-objects.c:3801 msgid "keep unreachable objects" msgstr "ulaşılamayan nesneleri tut" -#: builtin/pack-objects.c:3549 +#: builtin/pack-objects.c:3803 msgid "pack loose unreachable objects" msgstr "ulaşılamayan gevşek nesneleri paketle" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3805 msgid "unpack unreachable objects newer than <time>" msgstr "<zaman>'dan daha yeni ulaşılamayan nesneleri aç" -#: builtin/pack-objects.c:3554 +#: builtin/pack-objects.c:3808 msgid "use the sparse reachability algorithm" msgstr "aralıklı ulaşılabilirlik algoritmasını kullan" -#: builtin/pack-objects.c:3556 +#: builtin/pack-objects.c:3810 msgid "create thin packs" msgstr "ince paketler oluştur" -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3812 msgid "create packs suitable for shallow fetches" msgstr "sığ getirmelere uygun paketler oluştur" -#: builtin/pack-objects.c:3560 +#: builtin/pack-objects.c:3814 msgid "ignore packs that have companion .keep file" msgstr "eşlik eden .keep dosyasına iye paketleri yok say" -#: builtin/pack-objects.c:3562 +#: builtin/pack-objects.c:3816 msgid "ignore this pack" msgstr "bu paketi yok say" -#: builtin/pack-objects.c:3564 +#: builtin/pack-objects.c:3818 msgid "pack compression level" msgstr "paket sıkıştırma düzeyi" -#: builtin/pack-objects.c:3566 +#: builtin/pack-objects.c:3820 msgid "do not hide commits by grafts" msgstr "aşılarla gelen işlemeleri gizleme" -#: builtin/pack-objects.c:3568 +#: builtin/pack-objects.c:3822 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "nesnelerin sayımını hızlandırmak için eğer varsa bir biteşlem indeksi kullan" -#: builtin/pack-objects.c:3570 +#: builtin/pack-objects.c:3824 msgid "write a bitmap index together with the pack index" msgstr "paket indeksiyle birlikte bir biteşlem indeksi de yaz" -#: builtin/pack-objects.c:3574 +#: builtin/pack-objects.c:3828 msgid "write a bitmap index if possible" msgstr "eğer olanaklıysa bir biteşlem indeksi yaz" -#: builtin/pack-objects.c:3578 +#: builtin/pack-objects.c:3832 msgid "handling for missing objects" msgstr "eksik nesneler için işlem" -#: builtin/pack-objects.c:3581 +#: builtin/pack-objects.c:3835 msgid "do not pack objects in promisor packfiles" msgstr "nesneleri vaatçi paket dosyalarıyla paketleme" -#: builtin/pack-objects.c:3583 +#: builtin/pack-objects.c:3837 msgid "respect islands during delta compression" msgstr "delta sıkıştırması sırasında adalara uy" -#: builtin/pack-objects.c:3585 +#: builtin/pack-objects.c:3839 msgid "protocol" msgstr "protokol" -#: builtin/pack-objects.c:3586 +#: builtin/pack-objects.c:3840 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" "bu protokol ile herhangi bir yapılandırılmış uploadpack.blobpackfileuri " "ögesini hariç tut" -#: builtin/pack-objects.c:3617 +#: builtin/pack-objects.c:3873 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "delta zincir derinliği %d çok derin, %d zorlanıyor" -#: builtin/pack-objects.c:3622 +#: builtin/pack-objects.c:3878 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit çok yüksek, %d zorlanıyor" -#: builtin/pack-objects.c:3676 +#: builtin/pack-objects.c:3934 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "--max-pack-size, aktarım için bir paket yapımında kullanılamaz" -#: builtin/pack-objects.c:3678 +#: builtin/pack-objects.c:3936 msgid "minimum pack size limit is 1 MiB" msgstr "olabilecek en küçük paket boyutu limiti 1 MiB'dır" -#: builtin/pack-objects.c:3683 +#: builtin/pack-objects.c:3941 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin bir indekslenebilir paket yapımında kullanılamaz" -#: builtin/pack-objects.c:3686 +#: builtin/pack-objects.c:3944 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable ve --unpack-unreachable birbiriyle uyumsuz" -#: builtin/pack-objects.c:3692 +#: builtin/pack-objects.c:3950 msgid "cannot use --filter without --stdout" msgstr "--filter, --stdout olmadan kullanılamaz" -#: builtin/pack-objects.c:3752 +#: builtin/pack-objects.c:3952 +msgid "cannot use --filter with --stdin-packs" +msgstr "--filter, --stdin-packs ile birlikte kullanılamıyor" + +#: builtin/pack-objects.c:3956 +msgid "cannot use internal rev list with --stdin-packs" +msgstr "iç revizyon listeleri, --stdin-packs ile birlikte kullanılamıyor" + +#: builtin/pack-objects.c:4015 msgid "Enumerating objects" msgstr "Nesneler ortaya dökülüyor" -#: builtin/pack-objects.c:3783 +#: builtin/pack-objects.c:4052 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -18779,11 +19086,11 @@ msgstr "Birleştirme ile ilgili seçenekler" msgid "incorporate changes by rebasing rather than merging" msgstr "değişiklikleri birleştirme yerine yeniden temellendirme ile kat" -#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126 msgid "allow fast-forward" msgstr "ileri sarıma izin ver" -#: builtin/pull.c:167 parse-options.h:339 +#: builtin/pull.c:167 parse-options.h:340 msgid "automatically stash/stash pop before and after" msgstr "öncesinde ve sonrasında kendiliğinden zulala/zulaları patlat" @@ -18835,7 +19142,7 @@ msgstr "" "Bu, geçerli dalınız için öntanımlı yapılandırılmış uzak konum olmadığından,\n" "komut satırında bir dal belirtmeniz gerekir." -#: builtin/pull.c:456 builtin/rebase.c:1253 +#: builtin/pull.c:456 builtin/rebase.c:1248 msgid "You are not currently on a branch." msgstr "Şu anda bir dal üzerinde değilsiniz." @@ -18853,7 +19160,7 @@ msgid "See git-pull(1) for details." msgstr "Ayrıntılar için: git-pull(1)" #: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 -#: builtin/rebase.c:1259 +#: builtin/rebase.c:1254 msgid "<remote>" msgstr "<uzak-konum>" @@ -18861,7 +19168,7 @@ msgstr "<uzak-konum>" msgid "<branch>" msgstr "<dal>" -#: builtin/pull.c:471 builtin/rebase.c:1251 +#: builtin/pull.c:471 builtin/rebase.c:1246 msgid "There is no tracking information for the current branch." msgstr "Geçerli dal için izleme bilgisi yok." @@ -19285,10 +19592,6 @@ msgstr "git range-diff [<seçenekler>] <old-tip>...<new-tip>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<seçenekler>] <base> <old-tip> <new-tip>" -#: builtin/range-diff.c:28 -msgid "Percentage by which creation is weighted" -msgstr "oluşumun tartıldığı yüzde" - #: builtin/range-diff.c:30 msgid "use simple diff colors" msgstr "yalın diff renklerini kullan" @@ -19423,189 +19726,189 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246 +#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245 #, c-format msgid "unusable todo list: '%s'" msgstr "kullanılamaz yapılacaklar listesi: '%s'" -#: builtin/rebase.c:312 +#: builtin/rebase.c:311 #, c-format msgid "could not create temporary %s" msgstr "geçici %s oluşturulamadı" -#: builtin/rebase.c:318 +#: builtin/rebase.c:317 msgid "could not mark as interactive" msgstr "etkileşimli olarak imlenemedi" -#: builtin/rebase.c:371 +#: builtin/rebase.c:370 msgid "could not generate todo list" msgstr "yapılacaklar listesi oluşturulamadı" -#: builtin/rebase.c:413 +#: builtin/rebase.c:412 msgid "a base commit must be provided with --upstream or --onto" msgstr "bir taban işlemesi --upstream veya --onto ile sağlanmalıdır" -#: builtin/rebase.c:482 +#: builtin/rebase.c:481 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<seçenekler>]" -#: builtin/rebase.c:495 builtin/rebase.c:1394 +#: builtin/rebase.c:494 builtin/rebase.c:1389 msgid "keep commits which start empty" msgstr "boş başlayan işlemeleri tut" -#: builtin/rebase.c:499 builtin/revert.c:128 +#: builtin/rebase.c:498 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "boş iletili işlemelere izin ver" -#: builtin/rebase.c:501 +#: builtin/rebase.c:500 msgid "rebase merge commits" msgstr "birleştirme işlemelerini yeniden temellendir" -#: builtin/rebase.c:503 +#: builtin/rebase.c:502 msgid "keep original branch points of cousins" msgstr "kuzenlerin orijinal dal noktalarını tut" -#: builtin/rebase.c:505 +#: builtin/rebase.c:504 msgid "move commits that begin with squash!/fixup!" msgstr "squash!/fixup! ile başlayan işlemeleri taşı" -#: builtin/rebase.c:506 +#: builtin/rebase.c:505 msgid "sign commits" msgstr "işlemeleri imzala" -#: builtin/rebase.c:508 builtin/rebase.c:1333 +#: builtin/rebase.c:507 builtin/rebase.c:1328 msgid "display a diffstat of what changed upstream" msgstr "üstkaynakta nelerin değiştiğini gösteren bir diffstat görüntüle" -#: builtin/rebase.c:510 +#: builtin/rebase.c:509 msgid "continue rebase" msgstr "yeniden temellendirmeyi sürdür" -#: builtin/rebase.c:512 +#: builtin/rebase.c:511 msgid "skip commit" msgstr "işlemeyi atla" -#: builtin/rebase.c:513 +#: builtin/rebase.c:512 msgid "edit the todo list" msgstr "yapılacaklar listesini düzenle" -#: builtin/rebase.c:515 +#: builtin/rebase.c:514 msgid "show the current patch" msgstr "geçerli yamayı göster" -#: builtin/rebase.c:518 +#: builtin/rebase.c:517 msgid "shorten commit ids in the todo list" msgstr "yapılacaklar listesindeki işleme numaralarını kısalt" -#: builtin/rebase.c:520 +#: builtin/rebase.c:519 msgid "expand commit ids in the todo list" msgstr "yapılacaklar listesindeki işleme numaralarını genişlet" -#: builtin/rebase.c:522 +#: builtin/rebase.c:521 msgid "check the todo list" msgstr "yapılacaklar listesini denetle" -#: builtin/rebase.c:524 +#: builtin/rebase.c:523 msgid "rearrange fixup/squash lines" msgstr "fixup/squash satırlarını yeniden düzenle" -#: builtin/rebase.c:526 +#: builtin/rebase.c:525 msgid "insert exec commands in todo list" msgstr "yapılacaklar listesine 'exec' komutları ekle" -#: builtin/rebase.c:527 +#: builtin/rebase.c:526 msgid "onto" msgstr "üzerine" -#: builtin/rebase.c:530 +#: builtin/rebase.c:529 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:530 +#: builtin/rebase.c:529 msgid "restrict revision" msgstr "revizyonu sınırla" -#: builtin/rebase.c:532 +#: builtin/rebase.c:531 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:533 +#: builtin/rebase.c:532 msgid "squash onto" msgstr "tıkıştır" -#: builtin/rebase.c:535 +#: builtin/rebase.c:534 msgid "the upstream commit" msgstr "üstkaynak işlemesi" -#: builtin/rebase.c:537 +#: builtin/rebase.c:536 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:537 +#: builtin/rebase.c:536 msgid "head name" msgstr "dal ucu adı" -#: builtin/rebase.c:542 +#: builtin/rebase.c:541 msgid "rebase strategy" msgstr "yeniden temellendirme stratejisi" -#: builtin/rebase.c:543 +#: builtin/rebase.c:542 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:544 +#: builtin/rebase.c:543 msgid "strategy options" msgstr "strateji seçenekleri" -#: builtin/rebase.c:545 +#: builtin/rebase.c:544 msgid "switch-to" msgstr "switch-to" -#: builtin/rebase.c:546 +#: builtin/rebase.c:545 msgid "the branch or commit to checkout" msgstr "çıkış yapılacak dal veya işleme" -#: builtin/rebase.c:547 +#: builtin/rebase.c:546 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:547 +#: builtin/rebase.c:546 msgid "onto name" msgstr "'onto' adı:" -#: builtin/rebase.c:548 +#: builtin/rebase.c:547 msgid "cmd" msgstr "komut" -#: builtin/rebase.c:548 +#: builtin/rebase.c:547 msgid "the command to run" msgstr "çalıştırılacak komut" -#: builtin/rebase.c:551 builtin/rebase.c:1427 +#: builtin/rebase.c:550 builtin/rebase.c:1422 msgid "automatically re-schedule any `exec` that fails" msgstr "başarısız olan her 'exec'i kendiliğinden yeniden zamanla" -#: builtin/rebase.c:567 +#: builtin/rebase.c:566 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "" "--[no-]rebase-cousins seçeneğinin --rebase-merges olmadan hiçbir etkisi yok" -#: builtin/rebase.c:583 +#: builtin/rebase.c:582 #, c-format msgid "%s requires the merge backend" msgstr "%s birleştirme arka ucunu gerektiriyor" -#: builtin/rebase.c:626 +#: builtin/rebase.c:625 #, c-format msgid "could not get 'onto': '%s'" msgstr "'onto' alınamadı: '%s'" -#: builtin/rebase.c:643 +#: builtin/rebase.c:642 #, c-format msgid "invalid orig-head: '%s'" msgstr "geçersiz orig-head: '%s'" -#: builtin/rebase.c:668 +#: builtin/rebase.c:667 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "geçersiz allow_rerere_autoupdate yok sayılıyor: '%s'" @@ -19643,7 +19946,7 @@ msgstr "" "\n" "Bunun sonucu olarak git onları yeniden temellendiremiyor." -#: builtin/rebase.c:1227 +#: builtin/rebase.c:1222 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -19651,7 +19954,7 @@ msgid "" msgstr "" "tanımlanamayan boş tür '%s'; geçerli türler: \"drop\", \"keep\" ve \"ask\"" -#: builtin/rebase.c:1245 +#: builtin/rebase.c:1240 #, c-format msgid "" "%s\n" @@ -19668,7 +19971,7 @@ msgstr "" "\tgit rebase '<dal>'\n" "\n" -#: builtin/rebase.c:1261 +#: builtin/rebase.c:1256 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -19681,197 +19984,189 @@ msgstr "" "\tgit branch --set-upstream-to=%s/<dal> %s\n" "\n" -#: builtin/rebase.c:1291 +#: builtin/rebase.c:1286 msgid "exec commands cannot contain newlines" msgstr "'exec' komutları yenisatırlar içeremez" -#: builtin/rebase.c:1295 +#: builtin/rebase.c:1290 msgid "empty exec command" msgstr "boş 'exec' komutu" -#: builtin/rebase.c:1324 +#: builtin/rebase.c:1319 msgid "rebase onto given branch instead of upstream" msgstr "üstkaynak yerine verilen dalın üzerine yeniden temellendir" -#: builtin/rebase.c:1326 +#: builtin/rebase.c:1321 msgid "use the merge-base of upstream and branch as the current base" msgstr "üstkaynağın birleştirme temelini ve dalını geçerli temel olarak kullan" -#: builtin/rebase.c:1328 +#: builtin/rebase.c:1323 msgid "allow pre-rebase hook to run" msgstr "pre-rebase kancasının çalışmasına izin ver" -#: builtin/rebase.c:1330 +#: builtin/rebase.c:1325 msgid "be quiet. implies --no-stat" msgstr "sessiz ol (--no-stat ima eder)" -#: builtin/rebase.c:1336 +#: builtin/rebase.c:1331 msgid "do not show diffstat of what changed upstream" msgstr "üstkaynakta nelerin değiştiğini gösteren diffstat gösterme" -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1334 msgid "add a Signed-off-by trailer to each commit" msgstr "her işlemeye bir Signed-off-by artbilgisi ekle" -#: builtin/rebase.c:1342 +#: builtin/rebase.c:1337 msgid "make committer date match author date" msgstr "işleyici tarihi ile yazar tarihini aynı yap" -#: builtin/rebase.c:1344 +#: builtin/rebase.c:1339 msgid "ignore author date and use current date" msgstr "yazar tarihini yok say ve geçerli tarihi kullan" -#: builtin/rebase.c:1346 +#: builtin/rebase.c:1341 msgid "synonym of --reset-author-date" msgstr "--reset-author-date eşanlamlısı" -#: builtin/rebase.c:1348 builtin/rebase.c:1352 +#: builtin/rebase.c:1343 builtin/rebase.c:1347 msgid "passed to 'git apply'" msgstr "'git apply'a aktarıldı" -#: builtin/rebase.c:1350 +#: builtin/rebase.c:1345 msgid "ignore changes in whitespace" msgstr "boşluk değişikliklerini yok say" -#: builtin/rebase.c:1354 builtin/rebase.c:1357 +#: builtin/rebase.c:1349 builtin/rebase.c:1352 msgid "cherry-pick all commits, even if unchanged" msgstr "değiştirilmemiş olsa bile tüm işlemeleri seç-al yap" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1354 msgid "continue" msgstr "sürdür" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1357 msgid "skip current patch and continue" msgstr "geçerli yamayı atla ve sürdür" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1359 msgid "abort and check out the original branch" msgstr "iptal et ve orijinal dalı çıkış yap" -#: builtin/rebase.c:1367 +#: builtin/rebase.c:1362 msgid "abort but keep HEAD where it is" msgstr "iptal et; ancak HEAD'i olduğu yerde bırak" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1363 msgid "edit the todo list during an interactive rebase" msgstr "" "bir etkileşimli yeniden temellendirme sırasında yapılacaklar listesini " "düzenle" -#: builtin/rebase.c:1371 +#: builtin/rebase.c:1366 msgid "show the patch file being applied or merged" msgstr "yama dosyası uygulanırken veya birleştirilirken göster" -#: builtin/rebase.c:1374 +#: builtin/rebase.c:1369 msgid "use apply strategies to rebase" msgstr "yeniden temellendirmek için \"apply\" stratejilerini kullan" -#: builtin/rebase.c:1378 +#: builtin/rebase.c:1373 msgid "use merging strategies to rebase" msgstr "yeniden temellendirmek için birleştirme stratejilerini kullan" -#: builtin/rebase.c:1382 +#: builtin/rebase.c:1377 msgid "let the user edit the list of commits to rebase" msgstr "" "yeniden temellendirilecek işlemelerin listesini kullanıcının düzenlemesine " "izin ver" -#: builtin/rebase.c:1386 +#: builtin/rebase.c:1381 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" "(KULLANILMAMALI) birleştirmeleri yok saymak yerine onları yeniden " "oluşturmaya çalış" -#: builtin/rebase.c:1391 +#: builtin/rebase.c:1386 msgid "how to handle commits that become empty" msgstr "boşalan işlemelerin nasıl ele alınacağı" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1393 msgid "move commits that begin with squash!/fixup! under -i" msgstr "-i altındaki squash!/fixup! ile başlayan işlemeleri taşı" -#: builtin/rebase.c:1405 +#: builtin/rebase.c:1400 msgid "add exec lines after each commit of the editable list" msgstr "düzenlenebilir listenin her işlemesinden sonra exec satırları ekle" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1404 msgid "allow rebasing commits with empty messages" msgstr "boş iletili işlemelerin yeniden temellendirilmesine izin ver" -#: builtin/rebase.c:1413 +#: builtin/rebase.c:1408 msgid "try to rebase merges instead of skipping them" msgstr "birleştirmeleri atlamak yerine onları yeniden temellendirmeyi dene" -#: builtin/rebase.c:1416 +#: builtin/rebase.c:1411 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "üstkaynağı arılaştırmak için 'merge-base --fork-point' kullan" -#: builtin/rebase.c:1418 +#: builtin/rebase.c:1413 msgid "use the given merge strategy" msgstr "verilen birleştirme stratejisini kullan" -#: builtin/rebase.c:1420 builtin/revert.c:115 +#: builtin/rebase.c:1415 builtin/revert.c:115 msgid "option" msgstr "seçenek" -#: builtin/rebase.c:1421 +#: builtin/rebase.c:1416 msgid "pass the argument through to the merge strategy" msgstr "argümanı birleştirme stratejisine aktar" -#: builtin/rebase.c:1424 +#: builtin/rebase.c:1419 msgid "rebase all reachable commits up to the root(s)" msgstr "ulaşılabilir tüm işlemeleri kök(ler)e kadar yeniden temellendir" -#: builtin/rebase.c:1429 +#: builtin/rebase.c:1424 msgid "apply all changes, even those already present upstream" msgstr "tüm değişiklikleri uygula, halihazırda üstkaynakta olanları bile" -#: builtin/rebase.c:1446 -msgid "" -"the rebase.useBuiltin support has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"'rebase.useBuiltin' desteği kaldırıldı!\n" -"Ayrıntılar için 'git help config' içindeki girdisine bakın." - -#: builtin/rebase.c:1452 +#: builtin/rebase.c:1442 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Görünüşe göre 'git am' sürmekte. Yeniden temellendirilemiyor." -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1483 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "'git rebase --preserve-merges' artık eski. Yerine --rebase-merges kullanın." -#: builtin/rebase.c:1498 +#: builtin/rebase.c:1488 msgid "cannot combine '--keep-base' with '--onto'" msgstr "--keep-base ile --onto birlikte kullanılamaz" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1490 msgid "cannot combine '--keep-base' with '--root'" msgstr "--keep-base ile --root birlikte kullanılamaz" -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1494 msgid "cannot combine '--root' with '--fork-point'" msgstr "--root ile --fork-point birlikte kullanılamaz" -#: builtin/rebase.c:1507 +#: builtin/rebase.c:1497 msgid "No rebase in progress?" msgstr "Sürmekte olan bir yeniden temellendirme yok" -#: builtin/rebase.c:1511 +#: builtin/rebase.c:1501 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "--edit-todo seçeneği yalnızca etkileşimli yeniden temellendirme sırasında " "kullanılabilir." -#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "HEAD okunamıyor" -#: builtin/rebase.c:1546 +#: builtin/rebase.c:1536 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -19879,16 +20174,16 @@ msgstr "" "Önce tüm birleştirme çakışmalarını düzenlemeli ve onları\n" "git add kullanarak tamamlandı olarak imlemelisiniz." -#: builtin/rebase.c:1565 +#: builtin/rebase.c:1555 msgid "could not discard worktree changes" msgstr "çalışma ağacı değişiklikleri atılamadı" -#: builtin/rebase.c:1584 +#: builtin/rebase.c:1574 #, c-format msgid "could not move back to %s" msgstr "%s konumuna geri taşınamadı" -#: builtin/rebase.c:1630 +#: builtin/rebase.c:1620 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -19909,134 +20204,134 @@ msgstr "" "yapın ve beni yeniden çalıştırın. Ben sizi belki orada hâlâ değerli bir\n" "şeyler olabilir diye durdurdum.\n" -#: builtin/rebase.c:1658 +#: builtin/rebase.c:1648 msgid "switch `C' expects a numerical value" msgstr "'C' anahtarı sayısal bir değer bekliyor" -#: builtin/rebase.c:1700 +#: builtin/rebase.c:1690 #, c-format msgid "Unknown mode: %s" msgstr "Bilinmeyen kip: %s" -#: builtin/rebase.c:1739 +#: builtin/rebase.c:1729 msgid "--strategy requires --merge or --interactive" msgstr "--strategy, --merge veya --interactive gerektiriyor" -#: builtin/rebase.c:1769 +#: builtin/rebase.c:1759 msgid "cannot combine apply options with merge options" msgstr "\"apply\" seçenekleri \"merge\" seçenekleriyle birlikte kullanılamıyor" -#: builtin/rebase.c:1782 +#: builtin/rebase.c:1772 #, c-format msgid "Unknown rebase backend: %s" msgstr "Bilinmeyen yeniden temellendirme arka ucu: %s" -#: builtin/rebase.c:1812 +#: builtin/rebase.c:1802 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec, --exec veya --interactive gerektiriyor" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1822 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "--preserve-merges ile --rebase-merges birlikte kullanılamıyor" -#: builtin/rebase.c:1836 +#: builtin/rebase.c:1826 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "hata: --preserve-merges ile --reschedule-failed-exec birlikte kullanılamıyor" -#: builtin/rebase.c:1860 +#: builtin/rebase.c:1850 #, c-format msgid "invalid upstream '%s'" msgstr "geçersiz üstkaynak '%s'" -#: builtin/rebase.c:1866 +#: builtin/rebase.c:1856 msgid "Could not create new root commit" msgstr "Yeni kök işleme oluşturulamadı" -#: builtin/rebase.c:1892 +#: builtin/rebase.c:1882 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "'%s': tam olarak dallı bir birleştirme temeli gerekli" -#: builtin/rebase.c:1895 +#: builtin/rebase.c:1885 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': tam olarak bir birleştirme temeli gerekiyor" -#: builtin/rebase.c:1903 +#: builtin/rebase.c:1893 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "'%s' geçerli bir işlemeye işaret etmiyor" -#: builtin/rebase.c:1931 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "onulmaz: böyle bir dal/işleme yok: '%s'" -#: builtin/rebase.c:1939 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:2414 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2415 #, c-format msgid "No such ref: %s" msgstr "Böyle bir başvuru yok: %s" -#: builtin/rebase.c:1950 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" msgstr "HEAD bir revizyona çözülemedi" -#: builtin/rebase.c:1971 +#: builtin/rebase.c:1961 msgid "Please commit or stash them." msgstr "Lütfen onları işleyin veya zulalayın." -#: builtin/rebase.c:2007 +#: builtin/rebase.c:1997 #, c-format msgid "could not switch to %s" msgstr "şuraya geçilemedi: %s" -#: builtin/rebase.c:2018 +#: builtin/rebase.c:2008 msgid "HEAD is up to date." msgstr "HEAD güncel." -#: builtin/rebase.c:2020 +#: builtin/rebase.c:2010 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Geçerli dal %s güncel.\n" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:2018 msgid "HEAD is up to date, rebase forced." msgstr "HEAD güncel, yeniden temellendirme zorla yapıldı." -#: builtin/rebase.c:2030 +#: builtin/rebase.c:2020 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Geçerli dal %s güncel, yeniden temellendirme zorla yapıldı.\n" -#: builtin/rebase.c:2038 +#: builtin/rebase.c:2028 msgid "The pre-rebase hook refused to rebase." msgstr "'pre-rebase' kancası yeniden temellendirmeyi reddetti." -#: builtin/rebase.c:2045 +#: builtin/rebase.c:2035 #, c-format msgid "Changes to %s:\n" msgstr "%s için olan değişiklikler:\n" -#: builtin/rebase.c:2048 +#: builtin/rebase.c:2038 #, c-format msgid "Changes from %s to %s:\n" msgstr "%s -> %s değişiklikleri:\n" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:2063 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Öncelikle dal ucu üzerindeki çalışmanızı yeniden oynatmak için geri " "sarılıyor...\n" -#: builtin/rebase.c:2082 +#: builtin/rebase.c:2072 msgid "Could not detach HEAD" msgstr "HEAD ayrılamadı" -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2081 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "%s, %s konumuna ileri sarıldı.\n" @@ -20094,11 +20389,11 @@ msgstr "" "değişkenini 'warn' veya 'ignore' olarak ayarlayabilirsiniz.\n" "Bu iletiyi susturmak için onu 'refuse' olarak ayarlayın." -#: builtin/receive-pack.c:2481 +#: builtin/receive-pack.c:2479 msgid "quiet" msgstr "sessiz" -#: builtin/receive-pack.c:2495 +#: builtin/receive-pack.c:2493 msgid "You must specify a directory." msgstr "Bir dizin belirtmelisiniz." @@ -20336,7 +20631,7 @@ msgstr "" "\t%s:%d\n" "artık var olmayan '%s' uzak konumunu adlandırıyor." -#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 +#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943 #, c-format msgid "No such remote: '%s'" msgstr "Böyle bir uzak konum yok: '%s'" @@ -20693,7 +20988,7 @@ msgstr "" msgid "could not start pack-objects to repack promisor objects" msgstr "vaatçi nesneleri yeniden paketleme için pack-objects başlatılamadı" -#: builtin/repack.c:270 builtin/repack.c:446 +#: builtin/repack.c:270 builtin/repack.c:630 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Onaltılı tam nesne no satırları yalnızca pack-objects'ten bekleniyor." @@ -20702,104 +20997,127 @@ msgstr "" msgid "could not finish pack-objects to repack promisor objects" msgstr "vaatçi nesneleri yeniden paketleme için pack-objects bitirilemedi" -#: builtin/repack.c:322 +#: builtin/repack.c:309 +#, c-format +msgid "cannot open index for %s" +msgstr "%s için indeks açılamıyor" + +#: builtin/repack.c:368 +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "%s paketi, geometrik ilerlemede kullanmayı düşünmek için pek büyük" + +#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413 +#, c-format +msgid "pack %s too large to roll up" +msgstr "%s paketi, sarmak için pek büyük" + +#: builtin/repack.c:460 msgid "pack everything in a single pack" msgstr "her şeyi tek bir pakete sığdır" -#: builtin/repack.c:324 +#: builtin/repack.c:462 msgid "same as -a, and turn unreachable objects loose" msgstr "-a ile aynı ve ulaşılamayan nesneleri serbest bırakır" -#: builtin/repack.c:327 +#: builtin/repack.c:465 msgid "remove redundant packs, and run git-prune-packed" msgstr "gereksiz paketleri kaldır ve 'git prune-packed' çalıştır" -#: builtin/repack.c:329 +#: builtin/repack.c:467 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "'git-pack-objects'e --no-reuse-delta geçir" -#: builtin/repack.c:331 +#: builtin/repack.c:469 msgid "pass --no-reuse-object to git-pack-objects" msgstr "'git-pack-objects'e --no-reuse-object geçir" -#: builtin/repack.c:333 +#: builtin/repack.c:471 msgid "do not run git-update-server-info" msgstr "'git-update-server-info' çalıştırma" -#: builtin/repack.c:336 +#: builtin/repack.c:474 msgid "pass --local to git-pack-objects" msgstr "--local'ı 'git-pack-objects'e geçir" -#: builtin/repack.c:338 +#: builtin/repack.c:476 msgid "write bitmap index" msgstr "biteşlem indeksi yaz" -#: builtin/repack.c:340 +#: builtin/repack.c:478 msgid "pass --delta-islands to git-pack-objects" msgstr "--delta-islands'ı 'git-pack-objects'e geçir" -#: builtin/repack.c:341 +#: builtin/repack.c:479 msgid "approxidate" msgstr "yaklaşık tarih" -#: builtin/repack.c:342 +#: builtin/repack.c:480 msgid "with -A, do not loosen objects older than this" msgstr "-A ile, bundan daha eski nesneleri bırakma" -#: builtin/repack.c:344 +#: builtin/repack.c:482 msgid "with -a, repack unreachable objects" msgstr "-a ile, ulaşılamayan nesneleri yeniden paketle" -#: builtin/repack.c:346 +#: builtin/repack.c:484 msgid "size of the window used for delta compression" msgstr "delta sıkıştırması için kullanılan pencerenin boyutu" -#: builtin/repack.c:347 builtin/repack.c:353 +#: builtin/repack.c:485 builtin/repack.c:491 msgid "bytes" msgstr "baytlar" -#: builtin/repack.c:348 +#: builtin/repack.c:486 msgid "same as the above, but limit memory size instead of entries count" msgstr "yukarıdakiyle aynı; ancak girdi sayısı yerine bellek boyutunu kısıtla" -#: builtin/repack.c:350 +#: builtin/repack.c:488 msgid "limits the maximum delta depth" msgstr "olabilecek en büyük delta derinliğini kısıtlar" -#: builtin/repack.c:352 +#: builtin/repack.c:490 msgid "limits the maximum number of threads" msgstr "iş parçacıklarının olabilecek en büyük sayısını kısıtlar" -#: builtin/repack.c:354 +#: builtin/repack.c:492 msgid "maximum size of each packfile" msgstr "her paket dosyasının olabilecek en büyük boyutu" -#: builtin/repack.c:356 +#: builtin/repack.c:494 msgid "repack objects in packs marked with .keep" msgstr "nesneleri .keep ile imlenmiş paketlerde yeniden paketle" -#: builtin/repack.c:358 +#: builtin/repack.c:496 msgid "do not repack this pack" msgstr "bu paketi yeniden paketleme" -#: builtin/repack.c:368 +#: builtin/repack.c:498 +msgid "find a geometric progression with factor <N>" +msgstr "<N> faktörlü bir geometrik ilerleme bul" + +#: builtin/repack.c:508 msgid "cannot delete packs in a precious-objects repo" msgstr "bir precious-objects deposundaki paketler silinemiyor" -#: builtin/repack.c:372 +#: builtin/repack.c:512 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable ve -A birbiriyle uyumsuz" -#: builtin/repack.c:455 +#: builtin/repack.c:527 +msgid "--geometric is incompatible with -A, -a" +msgstr "--geometric, -A ve -a ile uyumsuz" + +#: builtin/repack.c:639 msgid "Nothing new to pack." msgstr "Paketlenecek yeni bir şey yok." -#: builtin/repack.c:485 +#: builtin/repack.c:669 #, c-format msgid "missing required file: %s" msgstr "gereken dosya eksik: %s" -#: builtin/repack.c:487 +#: builtin/repack.c:671 #, c-format msgid "could not unlink: %s" msgstr "bağlantı kaldırılamadı: %s" @@ -21132,8 +21450,8 @@ msgstr "HEAD şimdi şurada: %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "Bir birleştirmenin ortasında %s sıfırlaması yapılamıyor." -#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661 -#: builtin/stash.c:685 +#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663 +#: builtin/stash.c:687 msgid "be quiet, only report errors" msgstr "sessiz ol, yalnızca hataları bildir" @@ -21218,19 +21536,19 @@ msgstr "İndeks dosyası '%s' revizyonuna sıfırlanamadı." msgid "Could not write new index file." msgstr "Yeni indeks dosyası yazılamadı." -#: builtin/rev-list.c:534 +#: builtin/rev-list.c:538 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "--exclude-promisor-objects ve --missing birlikte kullanılamıyor" -#: builtin/rev-list.c:595 +#: builtin/rev-list.c:599 msgid "object filtering requires --objects" msgstr "nesne süzme --objects gerektiriyor" -#: builtin/rev-list.c:651 +#: builtin/rev-list.c:659 msgid "rev-list does not support display of notes" msgstr "rev-list not görüntülemesini desteklemiyor" -#: builtin/rev-list.c:656 +#: builtin/rev-list.c:664 msgid "marked counting is incompatible with --objects" msgstr "imlenmiş sayım, --objects ile uyumsuz" @@ -21342,19 +21660,19 @@ msgstr "başlangıçta boş olan işlemeleri koru" msgid "keep redundant, empty commits" msgstr "gereksiz, boş işlemeleri tut" -#: builtin/revert.c:239 +#: builtin/revert.c:237 msgid "revert failed" msgstr "geri al başarısız" -#: builtin/revert.c:252 +#: builtin/revert.c:250 msgid "cherry-pick failed" msgstr "seç-al başarısız" -#: builtin/rm.c:19 +#: builtin/rm.c:20 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<seçenekler>] [--] <dosya>..." -#: builtin/rm.c:207 +#: builtin/rm.c:208 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -21368,7 +21686,7 @@ msgstr[1] "" "Aşağıdaki dosyaların hem HEAD'den hem de dosyadan farklı hazırlanmış\n" "içeriği mevcut:" -#: builtin/rm.c:212 +#: builtin/rm.c:213 msgid "" "\n" "(use -f to force removal)" @@ -21376,13 +21694,13 @@ msgstr "" "\n" "(zorla kaldırmak için -f kullanın)" -#: builtin/rm.c:216 +#: builtin/rm.c:217 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "Aşağıdaki dosyanın indekste hazırlanmış değişiklikleri mevcut:" msgstr[1] "Aşağıdaki dosyaların indekste hazırlanmış değişiklikleri mevcut:" -#: builtin/rm.c:220 builtin/rm.c:229 +#: builtin/rm.c:221 builtin/rm.c:230 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -21390,48 +21708,48 @@ msgstr "" "\n" "(dosyayı tutmak için --cached, zorla kaldırmak için -f kullanın)" -#: builtin/rm.c:226 +#: builtin/rm.c:227 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "Aşağıdaki dosyanın yerel değişiklikleri var:" msgstr[1] "Aşağıdaki dosyaların yerel değişiklikleri var:" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "do not list removed files" msgstr "kaldırılan dosyaları listeleme" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "only remove from the index" msgstr "yalnızca indeksten kaldır" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "override the up-to-date check" msgstr "güncellik denetlemesini geçersiz kıl" -#: builtin/rm.c:246 +#: builtin/rm.c:247 msgid "allow recursive removal" msgstr "özyineli kaldırmaya izin ver" -#: builtin/rm.c:248 +#: builtin/rm.c:249 msgid "exit with a zero status even if nothing matched" msgstr "hiçbir şey eşleşmemiş olsa bile sıfır koduyla çık" -#: builtin/rm.c:282 +#: builtin/rm.c:283 msgid "No pathspec was given. Which files should I remove?" msgstr "Yol belirteci verilmedi. Hangi dosyaları kaldırmalıyım?" -#: builtin/rm.c:305 +#: builtin/rm.c:310 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "ilerlemek için lütfen değişikliklerinizi .gitmodules'a hazırlayın veya " "zulalayın" -#: builtin/rm.c:323 +#: builtin/rm.c:331 #, c-format msgid "not removing '%s' recursively without -r" msgstr "'%s', -r olmadan özyineli olarak kaldırılmıyor" -#: builtin/rm.c:362 +#: builtin/rm.c:379 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: %s kaldırılamadı" @@ -21708,103 +22026,111 @@ msgstr "sonuçları stdout'a yazdırma (--verify ile birlikte kullanışlı)" msgid "show refs from stdin that aren't in local repository" msgstr "stdin'den yerel bir depoda olmayan başvuruları göster" -#: builtin/sparse-checkout.c:21 +#: builtin/sparse-checkout.c:22 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <seçenekler>" -#: builtin/sparse-checkout.c:45 +#: builtin/sparse-checkout.c:46 msgid "git sparse-checkout list" msgstr "git sparse-checkout list" -#: builtin/sparse-checkout.c:71 +#: builtin/sparse-checkout.c:72 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" "bu çalışma ağacı aralıklı değil (sparse-checkout dosyası var olmayabilir)" -#: builtin/sparse-checkout.c:223 +#: builtin/sparse-checkout.c:227 msgid "failed to create directory for sparse-checkout file" msgstr "aralıklı çıkış dosyası için dizin oluşturulamadı" -#: builtin/sparse-checkout.c:264 +#: builtin/sparse-checkout.c:268 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "depo biçimi worktreeConfig etkinleştirmesi için yükseltilemiyor" -#: builtin/sparse-checkout.c:266 +#: builtin/sparse-checkout.c:270 msgid "failed to set extensions.worktreeConfig setting" msgstr "extensions.worktreeConfig yapılandırması ayarlanamadı" -#: builtin/sparse-checkout.c:283 -msgid "git sparse-checkout init [--cone]" -msgstr "git sparse-checkout init [--cone]" +#: builtin/sparse-checkout.c:290 +msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" +msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" -#: builtin/sparse-checkout.c:302 +#: builtin/sparse-checkout.c:310 msgid "initialize the sparse-checkout in cone mode" msgstr "aralıklı çıkışı koni kipinde ilklendir" -#: builtin/sparse-checkout.c:339 +#: builtin/sparse-checkout.c:312 +msgid "toggle the use of a sparse index" +msgstr "bir aralıklı indeksin kullanımını aç/kapa" + +#: builtin/sparse-checkout.c:340 +msgid "failed to modify sparse-index config" +msgstr "sparse-index yapılandırması değiştirilemedi" + +#: builtin/sparse-checkout.c:361 #, c-format msgid "failed to open '%s'" msgstr "'%s' açılamadı" -#: builtin/sparse-checkout.c:396 +#: builtin/sparse-checkout.c:419 #, c-format msgid "could not normalize path %s" msgstr "'%s' yolu olağanlaştırılamadı" -#: builtin/sparse-checkout.c:408 +#: builtin/sparse-checkout.c:431 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <dizgiler>)" -#: builtin/sparse-checkout.c:433 +#: builtin/sparse-checkout.c:456 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "C biçemli '%s' dizisinin tırnakları kaldırılamıyor" -#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511 +#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 msgid "unable to load existing sparse-checkout patterns" msgstr "mevcut aralıklı çıkış dizgileri yüklenemiyor" -#: builtin/sparse-checkout.c:556 +#: builtin/sparse-checkout.c:579 msgid "read patterns from standard in" msgstr "dizgileri stdin'den oku" -#: builtin/sparse-checkout.c:571 +#: builtin/sparse-checkout.c:594 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:590 +#: builtin/sparse-checkout.c:613 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:618 +#: builtin/sparse-checkout.c:644 msgid "error while refreshing working directory" msgstr "çalışma dizini yenilenirken hata" -#: builtin/stash.c:22 builtin/stash.c:38 +#: builtin/stash.c:24 builtin/stash.c:40 msgid "git stash list [<options>]" msgstr "git stash list [<seçenekler>]" -#: builtin/stash.c:23 builtin/stash.c:43 +#: builtin/stash.c:25 builtin/stash.c:45 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<seçenekler>] [<zula>]" -#: builtin/stash.c:24 builtin/stash.c:48 +#: builtin/stash.c:26 builtin/stash.c:50 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<zula>]" -#: builtin/stash.c:25 +#: builtin/stash.c:27 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<zula>]" -#: builtin/stash.c:26 builtin/stash.c:63 +#: builtin/stash.c:28 builtin/stash.c:65 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <dal-adı> [<zula>]" -#: builtin/stash.c:27 builtin/stash.c:68 +#: builtin/stash.c:29 builtin/stash.c:70 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 +#: builtin/stash.c:30 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" @@ -21816,7 +22142,7 @@ msgstr "" " [--pathspec-from-file=<dosya> [--pathspec-file-nul]]\n" " [--] [<yol-blrtç>...]]" -#: builtin/stash.c:32 builtin/stash.c:85 +#: builtin/stash.c:34 builtin/stash.c:87 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -21824,19 +22150,19 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<ileti>]" -#: builtin/stash.c:53 +#: builtin/stash.c:55 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<zula>]" -#: builtin/stash.c:58 +#: builtin/stash.c:60 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<zula>]" -#: builtin/stash.c:73 +#: builtin/stash.c:75 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <ileti>] [-q|--quiet] <işleme>" -#: builtin/stash.c:78 +#: builtin/stash.c:80 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" @@ -21846,30 +22172,30 @@ msgstr "" " [-u|--include-untracked] [-a|--all] [-m|--message <ileti>]\n" " [--] [<yol-blrtç>...]]" -#: builtin/stash.c:128 +#: builtin/stash.c:130 #, c-format msgid "'%s' is not a stash-like commit" msgstr "'%s' zulaya benzer bir işleme değil" -#: builtin/stash.c:148 +#: builtin/stash.c:150 #, c-format msgid "Too many revisions specified:%s" msgstr "Çok fazla revizyon belirtildi:%s" -#: builtin/stash.c:162 +#: builtin/stash.c:164 msgid "No stash entries found." msgstr "Zula girdisi bulunamadı." -#: builtin/stash.c:176 +#: builtin/stash.c:178 #, c-format msgid "%s is not a valid reference" msgstr "%s geçerli bir başvuru değil" -#: builtin/stash.c:225 +#: builtin/stash.c:227 msgid "git stash clear with arguments is unimplemented" msgstr "parametreli git stash clear henüz kullanılabilir değil" -#: builtin/stash.c:429 +#: builtin/stash.c:431 #, c-format msgid "" "WARNING: Untracked file in way of tracked file! Renaming\n" @@ -21881,150 +22207,166 @@ msgstr "" " %s -> %s\n" " yeniden adlandırılıyor.\n" -#: builtin/stash.c:490 +#: builtin/stash.c:492 msgid "cannot apply a stash in the middle of a merge" msgstr "bir birleştirmenin ortasında zula uygulanamıyor" -#: builtin/stash.c:501 +#: builtin/stash.c:503 #, c-format msgid "could not generate diff %s^!." msgstr "diff oluşturulamadı: %s^!." -#: builtin/stash.c:508 +#: builtin/stash.c:510 msgid "conflicts in index. Try without --index." msgstr "İndekste çakışmalar var. --index olmadan deneyin." -#: builtin/stash.c:514 +#: builtin/stash.c:516 msgid "could not save index tree" msgstr "indeks ağacı kaydedilemedi" -#: builtin/stash.c:523 +#: builtin/stash.c:525 msgid "could not restore untracked files from stash" msgstr "izlenmeyen dosyalar zuladan geri getirilemedi" -#: builtin/stash.c:537 +#: builtin/stash.c:539 #, c-format msgid "Merging %s with %s" msgstr "%s, %s ile birleştiriliyor" -#: builtin/stash.c:547 +#: builtin/stash.c:549 msgid "Index was not unstashed." msgstr "İndeks zuladan çıkartılmamıştı." -#: builtin/stash.c:589 builtin/stash.c:687 +#: builtin/stash.c:591 builtin/stash.c:689 msgid "attempt to recreate the index" msgstr "indeks yeniden oluşturulmaya çalışılıyor" -#: builtin/stash.c:633 +#: builtin/stash.c:635 #, c-format msgid "Dropped %s (%s)" msgstr "%s bırakıldı (%s)" -#: builtin/stash.c:636 +#: builtin/stash.c:638 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Zula girdisi bırakılamadı" -#: builtin/stash.c:649 +#: builtin/stash.c:651 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' bir zula başvurusu değil" -#: builtin/stash.c:699 +#: builtin/stash.c:701 msgid "The stash entry is kept in case you need it again." msgstr "Zula girdisi yeniden gereksiniminiz olursa diye saklanıyor." -#: builtin/stash.c:722 +#: builtin/stash.c:724 msgid "No branch name specified" msgstr "Dal adı belirtilmedi" -#: builtin/stash.c:866 builtin/stash.c:903 +#: builtin/stash.c:808 +msgid "failed to parse tree" +msgstr "ağaç ayrıştırılamadı" + +#: builtin/stash.c:819 +msgid "failed to unpack trees" +msgstr "ağaçların paketi açılamadı" + +#: builtin/stash.c:839 +msgid "include untracked files in the stash" +msgstr "zulada izlenmeyen dosyaları içer" + +#: builtin/stash.c:842 +msgid "only show untracked files in the stash" +msgstr "zulada yalnızca izlenmeyen dosyaları göster" + +#: builtin/stash.c:932 builtin/stash.c:969 #, c-format msgid "Cannot update %s with %s" msgstr "%s, %s ile güncellenemiyor" -#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603 +#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671 msgid "stash message" msgstr "zula iletisi" -#: builtin/stash.c:894 +#: builtin/stash.c:960 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" bir <işleme> argümanı gerektirir" -#: builtin/stash.c:1109 +#: builtin/stash.c:1175 msgid "No changes selected" msgstr "Değişiklik seçilmedi" -#: builtin/stash.c:1209 +#: builtin/stash.c:1275 msgid "You do not have the initial commit yet" msgstr "Henüz ilk işleme yapılmamış" -#: builtin/stash.c:1236 +#: builtin/stash.c:1302 msgid "Cannot save the current index state" msgstr "Geçerli indeks durumu kaydedilemiyor" -#: builtin/stash.c:1245 +#: builtin/stash.c:1311 msgid "Cannot save the untracked files" msgstr "İzlenmeyen dosyalar kaydedilemiyor" -#: builtin/stash.c:1256 builtin/stash.c:1265 +#: builtin/stash.c:1322 builtin/stash.c:1331 msgid "Cannot save the current worktree state" msgstr "Geçerli çalışma ağacı durumu kaydedilemiyor" -#: builtin/stash.c:1293 +#: builtin/stash.c:1359 msgid "Cannot record working tree state" msgstr "Çalışma ağacı durumu kaydı yazılamıyor" -#: builtin/stash.c:1342 +#: builtin/stash.c:1408 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "--patch, --include-untracked veya --all hepsi bir anda kullanılamıyor" -#: builtin/stash.c:1358 +#: builtin/stash.c:1426 msgid "Did you forget to 'git add'?" msgstr "'git add' yapmayı mı unuttunuz?" -#: builtin/stash.c:1373 +#: builtin/stash.c:1441 msgid "No local changes to save" msgstr "Kaydedilecek yerel değişiklik yok" -#: builtin/stash.c:1380 +#: builtin/stash.c:1448 msgid "Cannot initialize stash" msgstr "Zula ilklendirilemiyor" -#: builtin/stash.c:1395 +#: builtin/stash.c:1463 msgid "Cannot save the current status" msgstr "Geçerli durum kaydedilemiyor" -#: builtin/stash.c:1400 +#: builtin/stash.c:1468 #, c-format msgid "Saved working directory and index state %s" msgstr "Çalışma dizini ve indeks durumu %s kaydedildi" -#: builtin/stash.c:1490 +#: builtin/stash.c:1558 msgid "Cannot remove worktree changes" msgstr "Çalışma ağacı değişiklikleri kaldırılamıyor" -#: builtin/stash.c:1529 builtin/stash.c:1594 +#: builtin/stash.c:1597 builtin/stash.c:1662 msgid "keep index" msgstr "indeksi tut" -#: builtin/stash.c:1531 builtin/stash.c:1596 +#: builtin/stash.c:1599 builtin/stash.c:1664 msgid "stash in patch mode" msgstr "yama kipinde zula" -#: builtin/stash.c:1532 builtin/stash.c:1597 +#: builtin/stash.c:1600 builtin/stash.c:1665 msgid "quiet mode" msgstr "sessiz kip" -#: builtin/stash.c:1534 builtin/stash.c:1599 +#: builtin/stash.c:1602 builtin/stash.c:1667 msgid "include untracked files in stash" msgstr "zulada izlenmeyen dosyaları içer" -#: builtin/stash.c:1536 builtin/stash.c:1601 +#: builtin/stash.c:1604 builtin/stash.c:1669 msgid "include ignore files" msgstr "yok sayma dosyalarını içer" -#: builtin/stash.c:1636 +#: builtin/stash.c:1704 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -22048,7 +22390,7 @@ msgstr "yorum karakteri ile başlayan tüm satırları atla ve kaldır" msgid "prepend comment character and space to each line" msgstr "her satırın başına yorum karakteri ve boşluk koy" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Tam bir başvuru adı bekleniyordu, %s alındı" @@ -22062,7 +22404,7 @@ msgstr "submodule--helper print-default-remote argümanı almaz" msgid "cannot strip one component off url '%s'" msgstr "'%s' url'sinden bir bileşen çıkarılamıyor" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820 msgid "alternative anchor for relative paths" msgstr "göreceli yollar için alternatif tutturucu" @@ -22070,18 +22412,18 @@ msgstr "göreceli yollar için alternatif tutturucu" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<yol>] [<yol>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:652 +#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:653 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr ".gitmodules içinde '%s' altmodül yolu için url bulunamadı" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:525 #, c-format msgid "Entering '%s'\n" msgstr "Giriliyor: '%s'\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:528 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22090,7 +22432,7 @@ msgstr "" "run_command, %s için sıfır olmayan durum döndürdü\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:550 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22100,20 +22442,20 @@ msgstr "" "run_command, %s ögesinin iç içe geçmiş altmodülleri içinde özyinelerken " "sıfır olmayan durum döndürdü" -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:566 msgid "suppress output of entering each submodule command" msgstr "her bir altmodül komutu girişinin çıktısını gizle" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 -#: builtin/submodule--helper.c:1487 +#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:1488 msgid "recurse into nested submodules" msgstr "iç içe geçmiş altmodüle özyinele" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:573 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <komut>" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:600 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -22122,54 +22464,54 @@ msgstr "" "'%s' yapılandırması aranamadı. Bu deponun kendi yetkili üstkaynağı olduğu " "varsayılıyor." -#: builtin/submodule--helper.c:666 +#: builtin/submodule--helper.c:667 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Altmodül yolu url'si '%s' kaydı yapılamadı" -#: builtin/submodule--helper.c:670 +#: builtin/submodule--helper.c:671 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "'%s' altmodülü (%s), '%s' yoluna kaydı yapıldı\n" -#: builtin/submodule--helper.c:680 +#: builtin/submodule--helper.c:681 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "uyarı: '%s' altmodülü için komut güncellemesi önerilmiyor\n" -#: builtin/submodule--helper.c:687 +#: builtin/submodule--helper.c:688 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "'%s' altmodülü yolu için güncelleme kipi kaydı yapılamadı" -#: builtin/submodule--helper.c:709 +#: builtin/submodule--helper.c:710 msgid "suppress output for initializing a submodule" msgstr "bir altmodül ilklendirmesi çıktısını gizle" -#: builtin/submodule--helper.c:714 +#: builtin/submodule--helper.c:715 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<seçenekler>] [<yol>]" -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 +#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "'%s' yolu için .gitmodules içinde altmodül eşlemi bulunmadı" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:836 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "'%s' altmodülü içinde HEAD başvurusu çözülemedi" -#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "'%s' altmodülüne özyinelenemedi" -#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 +#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624 msgid "suppress submodule status output" msgstr "altmodül durum çıktısını gizle" -#: builtin/submodule--helper.c:887 +#: builtin/submodule--helper.c:888 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -22177,96 +22519,96 @@ msgstr "" "altmodül HEAD'i içinde depolanan işleme yerine indekste depolanan işlemeyi " "kullan" -#: builtin/submodule--helper.c:893 +#: builtin/submodule--helper.c:894 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<yol>...]" -#: builtin/submodule--helper.c:917 +#: builtin/submodule--helper.c:918 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <yol>" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:990 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(ikili nesne)->%s(altmodül)" -#: builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:993 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(altmodül)->%s(ikili nesne)" -#: builtin/submodule--helper.c:1005 +#: builtin/submodule--helper.c:1006 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1056 #, c-format msgid "couldn't hash object from '%s'" msgstr "'%s' üzerinden nesne sağlaması yapılamadı" -#: builtin/submodule--helper.c:1059 +#: builtin/submodule--helper.c:1060 #, c-format msgid "unexpected mode %o\n" msgstr "beklenmedik kip %o\n" -#: builtin/submodule--helper.c:1300 +#: builtin/submodule--helper.c:1301 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "altmodül HEAD'i içindeki işleme ile indekstekini karşılaştırmak için" -#: builtin/submodule--helper.c:1302 +#: builtin/submodule--helper.c:1303 msgid "to compare the commit in the index with that in the submodule HEAD" msgstr "altmodül HEAD'i yerine indekste depolanan işlemeyi kullan" -#: builtin/submodule--helper.c:1304 +#: builtin/submodule--helper.c:1305 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "'ignore_config' değeri 'all' olan altmodülleri atla" -#: builtin/submodule--helper.c:1306 +#: builtin/submodule--helper.c:1307 msgid "limit the summary size" msgstr "özet boyutunu sınırla" -#: builtin/submodule--helper.c:1311 +#: builtin/submodule--helper.c:1312 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "git submodule--helper summary [<seçenekler>] [<işleme>] [--] [<yol>]" -#: builtin/submodule--helper.c:1335 +#: builtin/submodule--helper.c:1336 msgid "could not fetch a revision for HEAD" msgstr "HEAD için bir revizyon getirilemedi" -#: builtin/submodule--helper.c:1340 +#: builtin/submodule--helper.c:1341 msgid "--cached and --files are mutually exclusive" msgstr "--cached ve --files birlikte kullanılamaz" -#: builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1408 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "'%s' için altmodül url'si eşitleniyor\n" -#: builtin/submodule--helper.c:1413 +#: builtin/submodule--helper.c:1414 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "'%s' altmodülü yolu için url kaydı yapılamadı" -#: builtin/submodule--helper.c:1427 +#: builtin/submodule--helper.c:1428 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "'%s' altmodülü için öntanımlı uzak konum alınamadı" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1439 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "'%s' altmodülü için uzak konum güncellenemedi" -#: builtin/submodule--helper.c:1485 +#: builtin/submodule--helper.c:1486 msgid "suppress output of synchronizing submodule url" msgstr "altmodül url'si eşitleme çıktısını gizle" -#: builtin/submodule--helper.c:1492 +#: builtin/submodule--helper.c:1493 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<yol>]" -#: builtin/submodule--helper.c:1546 +#: builtin/submodule--helper.c:1547 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -22275,7 +22617,7 @@ msgstr "" "Altmodül çalışma ağacı '%s' bir .git dizini içeriyor (tüm geçmişi dahil " "olacak biçimde kaldırmak istiyorsanız 'rm -rf' kullanın)" -#: builtin/submodule--helper.c:1558 +#: builtin/submodule--helper.c:1559 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -22284,47 +22626,47 @@ msgstr "" "Altmodül çalışma ağacı '%s' yerel değişiklikler içeriyor; onları atmak için " "'-f' kullanın" -#: builtin/submodule--helper.c:1566 +#: builtin/submodule--helper.c:1567 #, c-format msgid "Cleared directory '%s'\n" msgstr "'%s' dizini temizlendi\n" -#: builtin/submodule--helper.c:1568 +#: builtin/submodule--helper.c:1569 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "'%s' altmodül çalışma ağacı kaldırılamadı\n" -#: builtin/submodule--helper.c:1579 +#: builtin/submodule--helper.c:1580 #, c-format msgid "could not create empty submodule directory %s" msgstr "boş altmodül dizini %s oluşturulamadı" -#: builtin/submodule--helper.c:1595 +#: builtin/submodule--helper.c:1596 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "'%s' altmodülü (%s), '%s' yoluna kaydı yapılmamış\n" -#: builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:1625 msgid "remove submodule working trees even if they contain local changes" msgstr "altmodül çalışma ağaçlarını yerel değişiklikler içerseler bile kaldır" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1626 msgid "unregister all submodules" msgstr "tüm altmodüllerin kaydını kaldır" -#: builtin/submodule--helper.c:1630 +#: builtin/submodule--helper.c:1631 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<yol>...]]" -#: builtin/submodule--helper.c:1644 +#: builtin/submodule--helper.c:1645 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Tüm altmodüllerin ilklendirmesini gerçekten geri almak istiyorsanız '-all' " "kullanın" -#: builtin/submodule--helper.c:1713 +#: builtin/submodule--helper.c:1714 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -22336,46 +22678,46 @@ msgstr "" "submodule.alternateErrorStrategy ayarını 'info'ya ayarlayın veya\n" "--reference yerine --reference-if-able kullanarak klonlayın." -#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 +#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "'%s' altmodülü alternatif ekleyemiyor: %s" -#: builtin/submodule--helper.c:1791 +#: builtin/submodule--helper.c:1792 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "'%s' submodule.alternateErrorStrategy değeri tanımlanamadı" -#: builtin/submodule--helper.c:1798 +#: builtin/submodule--helper.c:1799 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "'%s' submodule.alternateLocation değeri tanımlanamadı" -#: builtin/submodule--helper.c:1822 +#: builtin/submodule--helper.c:1823 msgid "where the new submodule will be cloned to" msgstr "yeni altmodülün nereye klonlanacağı" -#: builtin/submodule--helper.c:1825 +#: builtin/submodule--helper.c:1826 msgid "name of the new submodule" msgstr "yeni altmodülün adı" -#: builtin/submodule--helper.c:1828 +#: builtin/submodule--helper.c:1829 msgid "url where to clone the submodule from" msgstr "altmodülün klonlanacağı url konumu" -#: builtin/submodule--helper.c:1836 +#: builtin/submodule--helper.c:1837 msgid "depth for shallow clones" msgstr "sığ klonların derinliği" -#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 +#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349 msgid "force cloning progress" msgstr "zorla klonla" -#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351 msgid "disallow cloning into non-empty directory" msgstr "boş olmayan dizine klonlamaya izin verme" -#: builtin/submodule--helper.c:1848 +#: builtin/submodule--helper.c:1849 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22384,103 +22726,103 @@ msgstr "" "git submodule--helper clone [--prefix=<yol>] [--quiet] [--reference <depo>] " "[--name <ad>] [--depth <derinlik>] [--single-branch] --url <url> --path <yol>" -#: builtin/submodule--helper.c:1873 +#: builtin/submodule--helper.c:1874 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "" "başka bir altmodülün git dizininde '%s' oluşturma/kullanma reddediliyor" -#: builtin/submodule--helper.c:1884 +#: builtin/submodule--helper.c:1885 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "'%s' ögesinin '%s' altmodül yoluna klonlanması başarısız" -#: builtin/submodule--helper.c:1888 +#: builtin/submodule--helper.c:1889 #, c-format msgid "directory not empty: '%s'" msgstr "dizin boş değil: '%s'" -#: builtin/submodule--helper.c:1900 +#: builtin/submodule--helper.c:1901 #, c-format msgid "could not get submodule directory for '%s'" msgstr "'%s' için altmodül dizini alınamadı" -#: builtin/submodule--helper.c:1936 +#: builtin/submodule--helper.c:1937 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için" -#: builtin/submodule--helper.c:1940 +#: builtin/submodule--helper.c:1941 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için yapılandırılmış" -#: builtin/submodule--helper.c:2041 +#: builtin/submodule--helper.c:2042 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Altmodül yolu '%s' ilklendirilmedi" -#: builtin/submodule--helper.c:2045 +#: builtin/submodule--helper.c:2046 msgid "Maybe you want to use 'update --init'?" msgstr "'update --init' mi kullanmak istersiniz?" -#: builtin/submodule--helper.c:2075 +#: builtin/submodule--helper.c:2076 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Birleştirilmemiş altmodül %s atlanıyor" -#: builtin/submodule--helper.c:2104 +#: builtin/submodule--helper.c:2105 #, c-format msgid "Skipping submodule '%s'" msgstr "'%s' altmodülü atlanıyor" -#: builtin/submodule--helper.c:2254 +#: builtin/submodule--helper.c:2255 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "'%s' klonlanamadı. Yeniden deneme zamanlandı." -#: builtin/submodule--helper.c:2265 +#: builtin/submodule--helper.c:2266 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "'%s' ikinci bir kez klonlanamadı, iptal ediliyor" -#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574 msgid "path into the working tree" msgstr "çalışma ağacına giden yol" -#: builtin/submodule--helper.c:2330 +#: builtin/submodule--helper.c:2331 msgid "path into the working tree, across nested submodule boundaries" msgstr "iç içe geçmiş altmodül sınırları üzerinden çalışma ağacına giden yol" -#: builtin/submodule--helper.c:2334 +#: builtin/submodule--helper.c:2335 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout veya none" -#: builtin/submodule--helper.c:2340 +#: builtin/submodule--helper.c:2341 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "belirli bir revizyon sayısına kısaltılmış sığ klon oluştur" -#: builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2344 msgid "parallel jobs" msgstr "paralel işler" -#: builtin/submodule--helper.c:2345 +#: builtin/submodule--helper.c:2346 msgid "whether the initial clone should follow the shallow recommendation" msgstr "ilk klonun sığlık üzerine olan tavsiyeyi izleyip izlemeyeceği" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2347 msgid "don't print cloning progress" msgstr "klonlama işlemini yazdırma" -#: builtin/submodule--helper.c:2357 +#: builtin/submodule--helper.c:2358 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<yol>] [<yol>...]" -#: builtin/submodule--helper.c:2370 +#: builtin/submodule--helper.c:2371 msgid "bad value for update parameter" msgstr "güncelleme parametresi için hatalı değer" -#: builtin/submodule--helper.c:2418 +#: builtin/submodule--helper.c:2419 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -22489,84 +22831,84 @@ msgstr "" "Altmodül (%s) dalı süperproje dalından devralmak üzere yapılandırıldı; ancak " "süperproje herhangi bir dalda değil" -#: builtin/submodule--helper.c:2541 +#: builtin/submodule--helper.c:2542 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "'%s' altmodülü için depo tutacağı alınamadı" -#: builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2575 msgid "recurse into submodules" msgstr "altmodüllere özyinele" -#: builtin/submodule--helper.c:2580 +#: builtin/submodule--helper.c:2581 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<seçenekler>] [<yol>...]" -#: builtin/submodule--helper.c:2636 +#: builtin/submodule--helper.c:2637 msgid "check if it is safe to write to the .gitmodules file" msgstr ".gitmodules dosyasına yazım güvenli mi değil mi denetle" -#: builtin/submodule--helper.c:2639 +#: builtin/submodule--helper.c:2640 msgid "unset the config in the .gitmodules file" msgstr ".gitmodules dosyasındaki yapılandırmayı kaldır" -#: builtin/submodule--helper.c:2644 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <ad> [<değer>]" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <ad>" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2647 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2665 git-submodule.sh:150 +#: builtin/submodule--helper.c:2666 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr ".gitmodules dosyasının çalışma ağacında olduğundan lütfen emin ol" -#: builtin/submodule--helper.c:2681 +#: builtin/submodule--helper.c:2682 msgid "suppress output for setting url of a submodule" msgstr "bir altmodül url ayarlanması çıktısını gizle" -#: builtin/submodule--helper.c:2685 +#: builtin/submodule--helper.c:2686 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <yol> <yeniurl>" -#: builtin/submodule--helper.c:2718 +#: builtin/submodule--helper.c:2719 msgid "set the default tracking branch to master" msgstr "öntanımlı izleme dalını master olarak ayarla" -#: builtin/submodule--helper.c:2720 +#: builtin/submodule--helper.c:2721 msgid "set the default tracking branch" msgstr "öntanımlı izleme dalını ayarla" -#: builtin/submodule--helper.c:2724 +#: builtin/submodule--helper.c:2725 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <yol>" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2726 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <dal> <yol>" -#: builtin/submodule--helper.c:2732 +#: builtin/submodule--helper.c:2733 msgid "--branch or --default required" msgstr "--branch veya --default gerekli" -#: builtin/submodule--helper.c:2735 +#: builtin/submodule--helper.c:2736 msgid "--branch and --default are mutually exclusive" msgstr "--branch ve --default birlikte kullanılamaz" -#: builtin/submodule--helper.c:2792 git.c:441 git.c:714 +#: builtin/submodule--helper.c:2793 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s, --super-prefix desteklemiyor" -#: builtin/submodule--helper.c:2798 +#: builtin/submodule--helper.c:2799 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' geçerli bir submodule-helper altkomutu değil" @@ -22579,23 +22921,23 @@ msgstr "git symbolic-ref [<seçenekler>] <ad> [<başvuru>]" msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <ad>" -#: builtin/symbolic-ref.c:40 +#: builtin/symbolic-ref.c:42 msgid "suppress error message for non-symbolic (detached) refs" msgstr "sembolik olmayan (ayrık) başvurular için hata iletisini gizle" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:43 msgid "delete symbolic ref" msgstr "sembolik başvuruyu sil" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:44 msgid "shorten ref output" msgstr "başvuru çıktısını kısalt" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 msgid "reason" msgstr "neden" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 msgid "reason of the update" msgstr "güncelleme nedeni" @@ -22627,17 +22969,17 @@ msgstr "" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<biçim>] <etiket-adı>..." -#: builtin/tag.c:89 +#: builtin/tag.c:100 #, c-format msgid "tag '%s' not found." msgstr "'%s' etiketi bulunamadı." -#: builtin/tag.c:124 +#: builtin/tag.c:135 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "'%s' etiketi silindi (%s idi)\n" -#: builtin/tag.c:159 +#: builtin/tag.c:170 #, c-format msgid "" "\n" @@ -22650,7 +22992,7 @@ msgstr "" " %s\n" "'%c' ile başlayan satırlar yok sayılacaktır.\n" -#: builtin/tag.c:163 +#: builtin/tag.c:174 #, c-format msgid "" "\n" @@ -22665,11 +23007,11 @@ msgstr "" "'%c' ile başlayan satırlar tutulacaktır; isterseniz onları " "kaldırabilirsiniz.\n" -#: builtin/tag.c:230 +#: builtin/tag.c:241 msgid "unable to sign the tag" msgstr "etiket imzalanamıyor" -#: builtin/tag.c:248 +#: builtin/tag.c:259 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -22682,140 +23024,140 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:264 +#: builtin/tag.c:275 msgid "bad object type." msgstr "hatalı nesne türü" -#: builtin/tag.c:317 +#: builtin/tag.c:328 msgid "no tag message?" msgstr "etiket iletisi yok mu?" -#: builtin/tag.c:324 +#: builtin/tag.c:335 #, c-format msgid "The tag message has been left in %s\n" msgstr "Etiket iletisi %s içinde bırakıldı\n" -#: builtin/tag.c:435 +#: builtin/tag.c:446 msgid "list tag names" msgstr "etiket adlarını listele" -#: builtin/tag.c:437 +#: builtin/tag.c:448 msgid "print <n> lines of each tag message" msgstr "her etiket iletisinin <n> satırını listele" -#: builtin/tag.c:439 +#: builtin/tag.c:450 msgid "delete tags" msgstr "etiketleri sil" -#: builtin/tag.c:440 +#: builtin/tag.c:451 msgid "verify tags" msgstr "etiketleri doğrula" -#: builtin/tag.c:442 +#: builtin/tag.c:453 msgid "Tag creation options" msgstr "Etiket oluşturma seçenekleri" -#: builtin/tag.c:444 +#: builtin/tag.c:455 msgid "annotated tag, needs a message" msgstr "açıklama eklenmiş etiket için bir ileti gerek" -#: builtin/tag.c:446 +#: builtin/tag.c:457 msgid "tag message" msgstr "etiket iletisi" -#: builtin/tag.c:448 +#: builtin/tag.c:459 msgid "force edit of tag message" msgstr "etiket iletisini zorla düzenle" -#: builtin/tag.c:449 +#: builtin/tag.c:460 msgid "annotated and GPG-signed tag" msgstr "açıklama eklenmiş ve GPG imzalı etiket" -#: builtin/tag.c:452 +#: builtin/tag.c:463 msgid "use another key to sign the tag" msgstr "etiketi imzalamak için başka bir anahtar kullanın" -#: builtin/tag.c:453 +#: builtin/tag.c:464 msgid "replace the tag if exists" msgstr "eğer varsa etiketi başkasıyla değiştir" -#: builtin/tag.c:454 builtin/update-ref.c:505 +#: builtin/tag.c:465 builtin/update-ref.c:505 msgid "create a reflog" msgstr "bir başvuru günlüğü oluştur" -#: builtin/tag.c:456 +#: builtin/tag.c:467 msgid "Tag listing options" msgstr "Etiket listeleme seçenekleri" -#: builtin/tag.c:457 +#: builtin/tag.c:468 msgid "show tag list in columns" msgstr "etiket listesini sütunlarla göster" -#: builtin/tag.c:458 builtin/tag.c:460 +#: builtin/tag.c:469 builtin/tag.c:471 msgid "print only tags that contain the commit" msgstr "yalnızca işlemeyi içeren etiketleri yazdır" -#: builtin/tag.c:459 builtin/tag.c:461 +#: builtin/tag.c:470 builtin/tag.c:472 msgid "print only tags that don't contain the commit" msgstr "yalnızca işleme içermeyen etiketleri yazdır" -#: builtin/tag.c:462 +#: builtin/tag.c:473 msgid "print only tags that are merged" msgstr "yalnızca birleştirilen etiketleri yazdır" -#: builtin/tag.c:463 +#: builtin/tag.c:474 msgid "print only tags that are not merged" msgstr "yalnızca birleştirilmeyen etiketleri yazdır" -#: builtin/tag.c:467 +#: builtin/tag.c:478 msgid "print only tags of the object" msgstr "yalnızca nesnenin etiketlerini yazdır" -#: builtin/tag.c:515 +#: builtin/tag.c:526 msgid "--column and -n are incompatible" msgstr "--column ve -n birbiriyle uyumsuz" -#: builtin/tag.c:537 +#: builtin/tag.c:548 msgid "-n option is only allowed in list mode" msgstr "-n seçeneğine yalnızca liste kipinde izin verilir" -#: builtin/tag.c:539 +#: builtin/tag.c:550 msgid "--contains option is only allowed in list mode" msgstr "--contains seçeneğine yalnızca liste kipinde izin verilir" -#: builtin/tag.c:541 +#: builtin/tag.c:552 msgid "--no-contains option is only allowed in list mode" msgstr "--no-contains seçeneğine yalnızca liste kipinde izin verilir" -#: builtin/tag.c:543 +#: builtin/tag.c:554 msgid "--points-at option is only allowed in list mode" msgstr "--points-at seçeneğine yalnızca liste kipinde izin verilir" -#: builtin/tag.c:545 +#: builtin/tag.c:556 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" "--merged ve --no-merged seçeneklerine yalnızca liste kipinde izin verilir" -#: builtin/tag.c:556 +#: builtin/tag.c:567 msgid "only one -F or -m option is allowed." msgstr "yalnızca bir -F veya -m seçeneğine izin verilir" -#: builtin/tag.c:581 +#: builtin/tag.c:592 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' geçerli bir etiket adı değil." -#: builtin/tag.c:586 +#: builtin/tag.c:597 #, c-format msgid "tag '%s' already exists" msgstr "'%s' etiketi halihazırda var" -#: builtin/tag.c:617 +#: builtin/tag.c:628 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "'%s' etiketi güncellendi (%s idi)\n" -#: builtin/unpack-objects.c:502 +#: builtin/unpack-objects.c:504 msgid "Unpacking objects" msgstr "Nesneler açılıyor" @@ -22876,143 +23218,143 @@ msgstr " Tamam" msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<seçenekler>] [--] [<dosya>...]" -#: builtin/update-index.c:974 +#: builtin/update-index.c:976 msgid "continue refresh even when index needs update" msgstr "indeksin güncellenmesi gerekse bile yenilemeyi sürdür" -#: builtin/update-index.c:977 +#: builtin/update-index.c:979 msgid "refresh: ignore submodules" msgstr "refresh: altmodülleri yok say" -#: builtin/update-index.c:980 +#: builtin/update-index.c:982 msgid "do not ignore new files" msgstr "yeni dosyaları yok sayma" -#: builtin/update-index.c:982 +#: builtin/update-index.c:984 msgid "let files replace directories and vice-versa" msgstr "dosyaların dizinlerin yerine geçmesine ve tersine izin ver" -#: builtin/update-index.c:984 +#: builtin/update-index.c:986 msgid "notice files missing from worktree" msgstr "çalışma ağacından eksik olan dosyaları fark et" -#: builtin/update-index.c:986 +#: builtin/update-index.c:988 msgid "refresh even if index contains unmerged entries" msgstr "indekste birleştirilmemiş girdiler olsa bile yenile" -#: builtin/update-index.c:989 +#: builtin/update-index.c:991 msgid "refresh stat information" msgstr "dosya durum bilgisini yenile" -#: builtin/update-index.c:993 +#: builtin/update-index.c:995 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "--refresh gibi; ancak assume-unchanged ayarını yok sayar" -#: builtin/update-index.c:997 +#: builtin/update-index.c:999 msgid "<mode>,<object>,<path>" msgstr "<kip>,<nesne>,<yol>" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1000 msgid "add the specified entry to the index" msgstr "belirtilen girdiyi indekse ekle" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1010 msgid "mark files as \"not changing\"" msgstr "dosyaları \"not changing\" olarak imle" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1013 msgid "clear assumed-unchanged bit" msgstr "assumed-unchanged kısmını temizle" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1016 msgid "mark files as \"index-only\"" msgstr "dosyaları \"index-only\" olarak imle" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1019 msgid "clear skip-worktree bit" msgstr "skip-worktree kısmını atla" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1022 msgid "do not touch index-only entries" msgstr "'index-only' girdilerine dokunma" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1024 msgid "add to index only; do not add content to object database" msgstr "yalnızca indekse ekle; içeriğe nesne veritabanına ekleme" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1026 msgid "remove named paths even if present in worktree" msgstr "çalışma ağacında mevcut olsa bile ad verilen yolları kaldır" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1028 msgid "with --stdin: input lines are terminated by null bytes" msgstr "--stdin ile: girdi satırları boş baytlarla sonlandırılır" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1030 msgid "read list of paths to be updated from standard input" msgstr "güncellenecek yol listelerini standart girdi'den oku" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1034 msgid "add entries from standard input to the index" msgstr "indekse standart girdi'den girdiler ekle" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1038 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "#2 ve #3 numaralı adımları listelenmiş yollar için yeniden doldur" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1042 msgid "only update entries that differ from HEAD" msgstr "yalnızca HEAD'den farklı olan girdileri güncelle" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1046 msgid "ignore files missing from worktree" msgstr "çalışma ağacından eksik olan dosyaları yok say" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1049 msgid "report actions to standard output" msgstr "eylemleri standart çıktı'ya bildir" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1051 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(okunabilir veri için) kaydedilmiş çözülmeyen çakışmaları unut" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1055 msgid "write index in this format" msgstr "indeksi bu biçimle yaz" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1057 msgid "enable or disable split index" msgstr "bölünmüş indeksi etkinleştir veya devre dışı bırak" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1059 msgid "enable/disable untracked cache" msgstr "izlenmeyen önbelleği etkinleştir/devre dışı bırak" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1061 msgid "test if the filesystem supports untracked cache" msgstr "dosya sisteminin izlenmeyen önbellek destekleyip desteklemediğini sına" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1063 msgid "enable untracked cache without testing the filesystem" msgstr "dosya sistemini sınamadan izlenmeyen önbelleği etkinleştir" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1065 msgid "write out the index even if is not flagged as changed" msgstr "değiştirilmiş olarak imlenmese bile indeksi yaz" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1067 msgid "enable or disable file system monitor" msgstr "dosya sistemi monitörünü etkinleştir veya devre dışı bırak" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1069 msgid "mark files as fsmonitor valid" msgstr "dosyaları dosya sistemi monitöründe geçerli olarak imle" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1072 msgid "clear fsmonitor valid bit" msgstr "dosya sistemi monitöründe geçerli kısmını temizle" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1175 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -23020,7 +23362,7 @@ msgstr "" "core.splitIndex 'false' olarak ayarlanmış; bölünmüş indeksi etkinleştirmeyi " "gerçekten istiyorsanız bunu kaldırın veya değiştirin" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1184 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -23028,7 +23370,7 @@ msgstr "" "core.splitIndex 'true' olarak ayarlanmış; bölünmüş indeksi devre dışı " "bırakmayı gerçekten istiyorsanız bunu kaldırın veya değiştirin" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1196 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -23036,11 +23378,11 @@ msgstr "" "core.untrackedCache 'true' olarak ayarlanmış; izlenmeyen önbelleği gerçekten " "devre dışı bırakmayı istiyorsanız bunu kaldırın veya değiştirin" -#: builtin/update-index.c:1198 +#: builtin/update-index.c:1200 msgid "Untracked cache disabled" msgstr "İzlenmeyen önbellek devre dışı bırakıldı" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1208 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -23048,29 +23390,29 @@ msgstr "" "core.untrackedCache 'false' olarak ayarlanmış; izlenmeyen önbelleği " "gerçekten etkinleştirmek istiyorsanız bunu kaldırın veya değiştirin" -#: builtin/update-index.c:1210 +#: builtin/update-index.c:1212 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "İzlenmeyen önbellek '%s' için etkinleştirildi" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1220 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "core.fsmonitor ayarlanmamış; dosya sistemin monitörünü gerçekten " "etkinleştirmek istiyorsanız onu ayarlayın" -#: builtin/update-index.c:1222 +#: builtin/update-index.c:1224 msgid "fsmonitor enabled" msgstr "dosya sistemi monitörü etkin" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1227 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor ayarlanmış; dosya sistemi monitörünü gerçekten devre dışı " "bırakmak istiyorsanız onu kaldırın" -#: builtin/update-index.c:1229 +#: builtin/update-index.c:1231 msgid "fsmonitor disabled" msgstr "dosya sistemi monitörü devre dışı" @@ -23191,7 +23533,7 @@ msgstr "git worktree remove [<seçenekler>] <ç-ağacı>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <yol>" -#: builtin/worktree.c:61 builtin/worktree.c:933 +#: builtin/worktree.c:61 builtin/worktree.c:935 #, c-format msgid "failed to delete '%s'" msgstr "'%s' silinemedi" @@ -23263,102 +23605,102 @@ msgstr "Çalışma ağacı hazırlanıyor ('%s' çıkış yapılıyor)" msgid "Preparing worktree (detached HEAD %s)" msgstr "Çalışma ağacı hazırlanıyor (ayrık HEAD %s)" -#: builtin/worktree.c:480 +#: builtin/worktree.c:482 msgid "checkout <branch> even if already checked out in other worktree" msgstr "diğer çalışma ağacında çıkış yapılmış olsa bile <dal> çıkışını yap" -#: builtin/worktree.c:483 +#: builtin/worktree.c:485 msgid "create a new branch" msgstr "yeni bir dal oluştur" -#: builtin/worktree.c:485 +#: builtin/worktree.c:487 msgid "create or reset a branch" msgstr "yeni bir dal oluştur veya sıfırla" -#: builtin/worktree.c:487 +#: builtin/worktree.c:489 msgid "populate the new working tree" msgstr "yeni çalışma ağacını doldur" -#: builtin/worktree.c:488 +#: builtin/worktree.c:490 msgid "keep the new working tree locked" msgstr "yeni çalışma ağacını kilitli tut" -#: builtin/worktree.c:491 +#: builtin/worktree.c:493 msgid "set up tracking mode (see git-branch(1))" msgstr "izleme kipini ayarla (bkz: git-branch(1))" -#: builtin/worktree.c:494 +#: builtin/worktree.c:496 msgid "try to match the new branch name with a remote-tracking branch" msgstr "yeni dalın adını bir uzak izleme dalıyla eşleştirmeyi dene" -#: builtin/worktree.c:502 +#: builtin/worktree.c:504 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B ve --detach birlikte kullanılamaz" -#: builtin/worktree.c:563 +#: builtin/worktree.c:565 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track yalnızca yeni bir dal oluşturulmuşsa kullanılabilir" -#: builtin/worktree.c:680 +#: builtin/worktree.c:682 msgid "show extended annotations and reasons, if available" msgstr "varsa genişletilmiş açıklamaları ve nedenleri göster" -#: builtin/worktree.c:682 +#: builtin/worktree.c:684 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "<zaman>'dan eski çalışma ağaçlarına 'budanabilir' açıklama ekle" -#: builtin/worktree.c:691 +#: builtin/worktree.c:693 msgid "--verbose and --porcelain are mutually exclusive" msgstr "--verbose ve --porcelain birlikte kullanılamaz" -#: builtin/worktree.c:718 +#: builtin/worktree.c:720 msgid "reason for locking" msgstr "kilitleme nedeni" -#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837 -#: builtin/worktree.c:961 +#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839 +#: builtin/worktree.c:963 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' bir çalışma ağacı değil" -#: builtin/worktree.c:732 builtin/worktree.c:765 +#: builtin/worktree.c:734 builtin/worktree.c:767 msgid "The main working tree cannot be locked or unlocked" msgstr "Ana çalışma ağacı kilitlenemez veya kilidi açılamaz" -#: builtin/worktree.c:737 +#: builtin/worktree.c:739 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' halihazırda kilitli, nedeni: %s" -#: builtin/worktree.c:739 +#: builtin/worktree.c:741 #, c-format msgid "'%s' is already locked" msgstr "'%s' halihazırda kilitli" -#: builtin/worktree.c:767 +#: builtin/worktree.c:769 #, c-format msgid "'%s' is not locked" msgstr "'%s' kilitli değil" -#: builtin/worktree.c:808 +#: builtin/worktree.c:810 msgid "working trees containing submodules cannot be moved or removed" msgstr "altmodül içeren çalışma ağaçları taşınamaz veya kaldırılamaz" -#: builtin/worktree.c:816 +#: builtin/worktree.c:818 msgid "force move even if worktree is dirty or locked" msgstr "çalışma ağacı kirli veya kilitli olsa bile zorla taşı" -#: builtin/worktree.c:839 builtin/worktree.c:963 +#: builtin/worktree.c:841 builtin/worktree.c:965 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' bir ana çalışma ağacı" -#: builtin/worktree.c:844 +#: builtin/worktree.c:846 #, c-format msgid "could not figure out destination name from '%s'" msgstr "hedef adı şuradan anlaşılamadı: '%s'" -#: builtin/worktree.c:857 +#: builtin/worktree.c:859 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23367,7 +23709,7 @@ msgstr "" "kilitli bir çalışma ağacı taşınamıyor, kilit nedeni: %s\n" "geçersiz kılmak için 'move -f -f' kullanın veya önce kilidini açın" -#: builtin/worktree.c:859 +#: builtin/worktree.c:861 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23375,38 +23717,38 @@ msgstr "" "kilitli bir çalışma ağacı taşınamıyor;\n" "geçersiz kılmak için 'move -f -f' kullanın veya önce kilidini açın" -#: builtin/worktree.c:862 +#: builtin/worktree.c:864 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "doğrulama başarısız, çalışma ağacı taşınamıyor: %s" -#: builtin/worktree.c:867 +#: builtin/worktree.c:869 #, c-format msgid "failed to move '%s' to '%s'" msgstr "'%s' -> '%s' taşıması başarısız" -#: builtin/worktree.c:913 +#: builtin/worktree.c:915 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "'%s' üzerinde 'git status' çalıştırılamadı" -#: builtin/worktree.c:917 +#: builtin/worktree.c:919 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" "'%s' değiştirilmiş veya izlenmeyen dosyalar içeriyor, silmek için --force " "kullanın" -#: builtin/worktree.c:922 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "'%s' üzerinde 'git status' çalıştırılamadı, kod %d" -#: builtin/worktree.c:945 +#: builtin/worktree.c:947 msgid "force removal even if worktree is dirty or locked" msgstr "çalışma ağacı kirli veya kilitli olsa bile zorla kaldır" -#: builtin/worktree.c:968 +#: builtin/worktree.c:970 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23415,7 +23757,7 @@ msgstr "" "kilitli bir çalışma ağacı kaldırılamıyor, kilit nedeni: %s\n" "geçersiz kılmak için 'remove -f -f' kullanın veya önce kilidini açın" -#: builtin/worktree.c:970 +#: builtin/worktree.c:972 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23423,17 +23765,17 @@ msgstr "" "kilitli bir çalışma ağacı kaldırılamıyor;\n" "geçersiz kılmak için 'remove -f -f' kullanın veya önce kilidini açın" -#: builtin/worktree.c:973 +#: builtin/worktree.c:975 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "doğrulama başarısız, çalışma ağacı kaldırılamıyor: %s" -#: builtin/worktree.c:997 +#: builtin/worktree.c:999 #, c-format msgid "repair: %s: %s" msgstr "şunu onar %s: %s" -#: builtin/worktree.c:1000 +#: builtin/worktree.c:1002 #, c-format msgid "error: %s: %s" msgstr "hata: %s: %s" @@ -23454,48 +23796,6 @@ msgstr "bir <önek> altdizini için ağaç nesnesi yaz" msgid "only useful for debugging" msgstr "yalnızca hata ayıklama için yararlı" -#: http-fetch.c:118 -#, c-format -msgid "argument to --packfile must be a valid hash (got '%s')" -msgstr "--packfile için argüman geçerli bir sağlama olmalıdır ('%s' alındı)" - -#: http-fetch.c:128 -msgid "not a git repository" -msgstr "bir git deposu değil" - -#: http-fetch.c:134 -msgid "--packfile requires --index-pack-args" -msgstr "--packfile, --index-pack-args gerektiriyor" - -#: http-fetch.c:143 -msgid "--index-pack-args can only be used with --packfile" -msgstr "--index-pack-args yalnızca --packfile ile kullanılabilir" - -#: t/helper/test-fast-rebase.c:141 -msgid "unhandled options" -msgstr "beklenmeyen seçenekler" - -#: t/helper/test-fast-rebase.c:146 -msgid "error preparing revisions" -msgstr "revizyonlar hazırlanırken hata" - -#: t/helper/test-reach.c:154 -#, c-format -msgid "commit %s is not marked reachable" -msgstr "%s işlemesi ulaşılabilir olarak imlenmedi" - -#: t/helper/test-reach.c:164 -msgid "too many commits marked reachable" -msgstr "çok fazla işleme ulaşılabilir olarak imlenmiş" - -#: t/helper/test-serve-v2.c:7 -msgid "test-tool serve-v2 [<options>]" -msgstr "test-tool serve-v2 [<seçenekler>]" - -#: t/helper/test-serve-v2.c:19 -msgid "exit immediately after advertising capabilities" -msgstr "becerileri gösterdikten hemen sonra çık" - #: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" @@ -23551,22 +23851,27 @@ msgstr "--super-prefix için önek verilmedi\n" msgid "-c expects a configuration string\n" msgstr "-c bir yapılandırma dizisi bekliyor\n" -#: git.c:292 +#: git.c:260 +#, c-format +msgid "no config key given for --config-env\n" +msgstr "--config-env için bir yapılandırma anahtarı verilmedi\n" + +#: git.c:300 #, c-format msgid "no directory given for -C\n" msgstr "-C için dizin verilmedi\n" -#: git.c:318 +#: git.c:326 #, c-format msgid "unknown option: %s\n" msgstr "bilinmeyen seçenek: %s\n" -#: git.c:367 +#: git.c:375 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "'%s' arması genişletirilirken: '%s'" -#: git.c:376 +#: git.c:384 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -23575,39 +23880,39 @@ msgstr "" "'%s' arması ortam değişkenlerini değiştirir.\n" "Bunu yapmak için armada '!git' kullanabilirsiniz." -#: git.c:383 +#: git.c:391 #, c-format msgid "empty alias for %s" msgstr "%s için boş arma" -#: git.c:386 +#: git.c:394 #, c-format msgid "recursive alias: %s" msgstr "özyineli arma: %s" -#: git.c:468 +#: git.c:476 msgid "write failure on standard output" msgstr "standart çıktı'da yazma hatası" -#: git.c:470 +#: git.c:478 msgid "unknown write failure on standard output" msgstr "standart çıktı'da bilinmeyen yazma hatası" -#: git.c:472 +#: git.c:480 msgid "close failed on standard output" msgstr "standart çıktı'da kapatma başarısız" -#: git.c:823 +#: git.c:833 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "arma döngüsü algılandı: '%s' genişletilmesi sonlanmıyor:%s" -#: git.c:873 +#: git.c:883 #, c-format msgid "cannot handle %s as a builtin" msgstr "%s bir yerleşik olarak ele alınamıyor" -#: git.c:886 +#: git.c:896 #, c-format msgid "" "usage: %s\n" @@ -23616,17 +23921,166 @@ msgstr "" "kullanım: %s\n" "\n" -#: git.c:906 +#: git.c:916 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "'%s' armasının genişletilmesi başarısız oldu; '%s' bir git komutu değil\n" -#: git.c:918 +#: git.c:928 #, c-format msgid "failed to run command '%s': %s\n" msgstr "'%s' komutu çalıştırılamadı: %s\n" +#: http-fetch.c:118 +#, c-format +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "--packfile için argüman geçerli bir sağlama olmalıdır ('%s' alındı)" + +#: http-fetch.c:128 +msgid "not a git repository" +msgstr "bir git deposu değil" + +#: http-fetch.c:134 +msgid "--packfile requires --index-pack-args" +msgstr "--packfile, --index-pack-args gerektiriyor" + +#: http-fetch.c:143 +msgid "--index-pack-args can only be used with --packfile" +msgstr "--index-pack-args yalnızca --packfile ile kullanılabilir" + +#: t/helper/test-fast-rebase.c:141 +msgid "unhandled options" +msgstr "beklenmeyen seçenekler" + +#: t/helper/test-fast-rebase.c:146 +msgid "error preparing revisions" +msgstr "revizyonlar hazırlanırken hata" + +#: t/helper/test-reach.c:154 +#, c-format +msgid "commit %s is not marked reachable" +msgstr "%s işlemesi ulaşılabilir olarak imlenmedi" + +#: t/helper/test-reach.c:164 +msgid "too many commits marked reachable" +msgstr "çok fazla işleme ulaşılabilir olarak imlenmiş" + +#: t/helper/test-serve-v2.c:7 +msgid "test-tool serve-v2 [<options>]" +msgstr "test-tool serve-v2 [<seçenekler>]" + +#: t/helper/test-serve-v2.c:19 +msgid "exit immediately after advertising capabilities" +msgstr "becerileri gösterdikten hemen sonra çık" + +#: t/helper/test-simple-ipc.c:262 +#, c-format +msgid "socket/pipe already in use: '%s'" +msgstr "soket/boru halihazırda kullanımda: '%s'" + +#: t/helper/test-simple-ipc.c:264 +#, c-format +msgid "could not start server on: '%s'" +msgstr "sunucu şurada başlatılamadı: '%s'" + +#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331 +msgid "could not spawn daemon in the background" +msgstr "arka plan servisi oluşturulup çalıştırılamadı" + +#: t/helper/test-simple-ipc.c:356 +msgid "waitpid failed" +msgstr "waitpid başarısız" + +#: t/helper/test-simple-ipc.c:376 +msgid "daemon not online yet" +msgstr "arka plan servisi henüz çevrimiçi değil" + +#: t/helper/test-simple-ipc.c:406 +msgid "daemon failed to start" +msgstr "arka plan servisi başlatılamadı" + +#: t/helper/test-simple-ipc.c:410 +msgid "waitpid is confused" +msgstr "waitpid'in kafası karışmış" + +#: t/helper/test-simple-ipc.c:541 +msgid "daemon has not shutdown yet" +msgstr "arka plan servisi henüz kapanmadı" + +#: t/helper/test-simple-ipc.c:682 +msgid "test-helper simple-ipc is-active [<name>] [<options>]" +msgstr "test-helper simple-ipc is-active [<ad>] [<seçenekler>]" + +#: t/helper/test-simple-ipc.c:683 +msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]" +msgstr "test-helper simple-ipc run-daemon [<ad>] [<iş-parçacıkları>]" + +#: t/helper/test-simple-ipc.c:684 +msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" +msgstr "" +"test-helper simple-ipc start-daemon [<ad>] [<iş-parçacıkları>] [<maks-bekl>]" + +#: t/helper/test-simple-ipc.c:685 +msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" +msgstr "test-helper simple-ipc stop-daemon [<ad>] [<maks-bekle>]" + +#: t/helper/test-simple-ipc.c:686 +msgid "test-helper simple-ipc send [<name>] [<token>]" +msgstr "test-helper simple-ipc send [<ad>] [<jeton>]" + +#: t/helper/test-simple-ipc.c:687 +msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" +msgstr "test-helper simple-ipc sendbytes [<ad>] [<bayt-sayısı>] [<bayt>]" + +#: t/helper/test-simple-ipc.c:688 +msgid "" +"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " +"[<batchsize>]" +msgstr "" +"test-helper simple-ipc multiple [<ad>] [<iş-parçacığı>] [<bayt-sayısı>] " +"[<parti-boyutu>]" + +#: t/helper/test-simple-ipc.c:696 +msgid "name or pathname of unix domain socket" +msgstr "unix ad alanının adı veya yol adı" + +#: t/helper/test-simple-ipc.c:698 +msgid "named-pipe name" +msgstr "named-pipe adı" + +#: t/helper/test-simple-ipc.c:700 +msgid "number of threads in server thread pool" +msgstr "sunucu iş parçacığı havuzundaki iş parçacığı sayısı" + +#: t/helper/test-simple-ipc.c:701 +msgid "seconds to wait for daemon to start or stop" +msgstr "arka plan servisinin başlaaması veya durması için beklenecek saniye" + +#: t/helper/test-simple-ipc.c:703 +msgid "number of bytes" +msgstr "bayt sayısı" + +#: t/helper/test-simple-ipc.c:704 +msgid "number of requests per thread" +msgstr "iş parçacığı başına düşen istek sayısı" + +#: t/helper/test-simple-ipc.c:706 +msgid "byte" +msgstr "bayt" + +#: t/helper/test-simple-ipc.c:706 +msgid "ballast character" +msgstr "dengeleyici karakter" + +#: t/helper/test-simple-ipc.c:707 +msgid "token" +msgstr "jeton" + +#: t/helper/test-simple-ipc.c:707 +msgid "command token to send to the server" +msgstr "sunucuya gönderilecek komut jetonu" + #: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" @@ -23664,7 +24118,7 @@ msgstr "" msgid "Could not set SSL backend to '%s': already set" msgstr "SSL arka ucu '%s' olarak ayarlanamadı: Halihazırda ayarlanmış" -#: http.c:2025 +#: http.c:2035 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -23816,43 +24270,43 @@ msgstr "derleyici bilgisi mevcut değil\n" msgid "no libc information available\n" msgstr "libc bilgisi mevcut değil\n" -#: list-objects-filter-options.h:91 +#: list-objects-filter-options.h:94 msgid "args" msgstr "argümanlar" -#: list-objects-filter-options.h:92 +#: list-objects-filter-options.h:95 msgid "object filtering" msgstr "nesne süzümü" -#: parse-options.h:183 +#: parse-options.h:184 msgid "expiry-date" msgstr "son kullanım tarihi" -#: parse-options.h:197 +#: parse-options.h:198 msgid "no-op (backward compatibility)" msgstr "işlem yok (geriye dönük uyumluluk için)" -#: parse-options.h:309 +#: parse-options.h:310 msgid "be more verbose" msgstr "daha ayrıntılı anlat" -#: parse-options.h:311 +#: parse-options.h:312 msgid "be more quiet" msgstr "daha sessiz ol" -#: parse-options.h:317 +#: parse-options.h:318 msgid "use <n> digits to display object names" msgstr "nesne adlarını görüntülemek için <n> basamak kullan" -#: parse-options.h:336 +#: parse-options.h:337 msgid "how to strip spaces and #comments from message" msgstr "iletiden boşlukları ve #yorumları çıkart" -#: parse-options.h:337 +#: parse-options.h:338 msgid "read pathspec from file" msgstr "yol belirtecini dosyadan oku" -#: parse-options.h:338 +#: parse-options.h:339 msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "" @@ -24178,7 +24632,7 @@ msgstr "Birleştirme için olabildiğince en iyi ortak ataları bul" #: command-list.h:126 msgid "Run a three-way file merge" -msgstr "Bir üç yönlü dosya birleştirmesi çalıştır" +msgstr "Bir 3 yönlü dosya birleştirmesi çalıştır" #: command-list.h:127 msgid "Run a merge for files needing merging" @@ -25509,26 +25963,31 @@ msgstr "yerel dilim GMT'den bir dakikadan az bir aralıkla ayrımlı\n" msgid "local time offset greater than or equal to 24 hours\n" msgstr "yerel saat ofseti 24 saate eşit veya daha büyük\n" -#: git-send-email.perl:223 git-send-email.perl:229 +#: git-send-email.perl:222 +#, perl-format +msgid "fatal: command '%s' died with exit code %d" +msgstr "onulmaz: '%s' komutu %d çıkış koduyla sonlandı" + +#: git-send-email.perl:235 msgid "the editor exited uncleanly, aborting everything" msgstr "düzenleyici düzgünce çıkmadı, her şey iptal ediliyor" -#: git-send-email.perl:312 +#: git-send-email.perl:321 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' yazmakta olduğunuz e-postanın orta düzey bir sürümünü içeriyor.\n" -#: git-send-email.perl:317 +#: git-send-email.perl:326 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' yazılan e-postayı içeriyor.\n" -#: git-send-email.perl:410 +#: git-send-email.perl:419 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases diğer seçeneklerle uyumsuz\n" -#: git-send-email.perl:484 +#: git-send-email.perl:493 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -25539,11 +25998,11 @@ msgstr "" "'e'ye dikkat edin. sendemail.forbidSendmailVariables seçeneğini 'false'\n" "yaparak bu denetimi devre dışı bırakabilirsiniz.\n" -#: git-send-email.perl:489 git-send-email.perl:691 +#: git-send-email.perl:498 git-send-email.perl:700 msgid "Cannot run git format-patch from outside a repository\n" msgstr "'git format-patch' bir deponun dışından çalıştırılamıyor\n" -#: git-send-email.perl:492 +#: git-send-email.perl:501 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -25551,37 +26010,37 @@ msgstr "" "'batch-size' ve 'relogin' birlikte belirtilmeli (komut satırı veya " "yapılandırma seçeneklerinden)\n" -#: git-send-email.perl:505 +#: git-send-email.perl:514 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Bilinmeyen --suppress-cc alanı: '%s'\n" -#: git-send-email.perl:536 +#: git-send-email.perl:545 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Bilinmeyen --confirm ayarı: '%s'\n" -#: git-send-email.perl:564 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "uyarı: tırnak içine alınmış sendmail arması desteklenmiyor: %s\n" -#: git-send-email.perl:566 +#: git-send-email.perl:575 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "uyarı: ':include:' desteklenmiyor: %s\n" -#: git-send-email.perl:568 +#: git-send-email.perl:577 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "uyarı: '/file' veya '|pipe' yeniden yönlendirmesi desteklenmiyor: %s\n" -#: git-send-email.perl:573 +#: git-send-email.perl:582 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "uyarı: sendmail satırı tanımlanamadı: %s\n" -#: git-send-email.perl:657 +#: git-send-email.perl:666 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -25596,21 +26055,12 @@ msgstr "" "\t* Bir dosya demek istiyorsanız \"./%s\" diyerek veya\n" "\t* Bir erim demek istiyorsanız --format-patch seçeneğini vererek\n" -#: git-send-email.perl:678 +#: git-send-email.perl:687 #, perl-format msgid "Failed to opendir %s: %s" msgstr "%s opendir yapılamadı: %s" -#: git-send-email.perl:702 -#, perl-format -msgid "" -"fatal: %s: %s\n" -"warning: no patches were sent\n" -msgstr "" -"onulmaz: %s: %s\n" -"uyarı: hiçbir yama gönderilmedi\n" - -#: git-send-email.perl:713 +#: git-send-email.perl:720 msgid "" "\n" "No patch files specified!\n" @@ -25620,17 +26070,17 @@ msgstr "" "Hiçbir yama dosyası belirtilmedi!\n" "\n" -#: git-send-email.perl:726 +#: git-send-email.perl:733 #, perl-format msgid "No subject line in %s?" msgstr "%s içinde konu satırı yok mu?" -#: git-send-email.perl:736 +#: git-send-email.perl:743 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "%s yazma için açılamadı: %s" -#: git-send-email.perl:747 +#: git-send-email.perl:754 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -25644,38 +26094,38 @@ msgstr "" "\n" "Bir özet göndermek istemiyorsanız gövde kısmını temizleyin.\n" -#: git-send-email.perl:771 +#: git-send-email.perl:778 #, perl-format msgid "Failed to open %s: %s" msgstr "%s açılamadı: %s" -#: git-send-email.perl:788 +#: git-send-email.perl:795 #, perl-format msgid "Failed to open %s.final: %s" msgstr "%s.final açılamadı: %s" -#: git-send-email.perl:831 +#: git-send-email.perl:838 msgid "Summary email is empty, skipping it\n" msgstr "Özet e-postası boş, atlanıyor\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:866 +#: git-send-email.perl:873 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "<%s> kullanmak istediğinizden emin misiniz [y/N]? " -#: git-send-email.perl:921 +#: git-send-email.perl:928 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" "Aşağıdaki dosyalar 8 bit; ancak Content-Transfer-Encoding desteklemiyorlar.\n" -#: git-send-email.perl:926 +#: git-send-email.perl:933 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Hangi 8 bit kodlamayı beyan etmeliyim [UTF-8]? " -#: git-send-email.perl:934 +#: git-send-email.perl:941 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -25688,22 +26138,22 @@ msgstr "" "içinde '*** SUBJECT HERE ***' konu şablonu var. Yine de göndermek " "istiyorsanız --force kullanın.\n" -#: git-send-email.perl:953 +#: git-send-email.perl:960 msgid "To whom should the emails be sent (if anyone)?" msgstr "E-postalar kime gönderilmeli (eğer gerekliyse)?" -#: git-send-email.perl:971 +#: git-send-email.perl:978 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "onulmaz: '%s' arması kendisine genişliyor\n" -#: git-send-email.perl:983 +#: git-send-email.perl:990 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "İlk e-posta için Message-ID, In-Reply-To olarak kullanılsın mı (eğer " "gerekliyse)?" -#: git-send-email.perl:1041 git-send-email.perl:1049 +#: git-send-email.perl:1048 git-send-email.perl:1056 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "hata: şuradan geçerli bir adres çıkartılamadı: %s\n" @@ -25711,16 +26161,16 @@ msgstr "hata: şuradan geçerli bir adres çıkartılamadı: %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1053 +#: git-send-email.perl:1060 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Bu adresle ne yapılsın? ([q] çık|[d] bırak|düz[e]nle): " -#: git-send-email.perl:1370 +#: git-send-email.perl:1377 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA yolu \"%s\" mevcut değil" -#: git-send-email.perl:1453 +#: git-send-email.perl:1460 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -25746,131 +26196,146 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1468 +#: git-send-email.perl:1475 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "" "Bu e-posta gönderilsin mi? ([y] evet|[n] hayır|düz[e]nle|[q] çık|[a] tümü): " -#: git-send-email.perl:1471 +#: git-send-email.perl:1478 msgid "Send this email reply required" msgstr "Bu e-postayı yanıt gerektirme seçeneğiyle gönder" -#: git-send-email.perl:1499 +#: git-send-email.perl:1506 msgid "The required SMTP server is not properly defined." msgstr "Gerekli SMTP sunucusu düzgünce tanımlanmamış." -#: git-send-email.perl:1546 +#: git-send-email.perl:1553 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Sunucu STARTTLS desteklemiyor! %s" -#: git-send-email.perl:1551 git-send-email.perl:1555 +#: git-send-email.perl:1558 git-send-email.perl:1562 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS başarısız oldu! %s" -#: git-send-email.perl:1564 +#: git-send-email.perl:1571 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "SMTP düzgünce başlatılamıyor. Yapılandırmayı denetleyin ve --smtp-debug " "yapın." -#: git-send-email.perl:1582 +#: git-send-email.perl:1589 #, perl-format msgid "Failed to send %s\n" msgstr "%s gönderilemedi\n" -#: git-send-email.perl:1585 +#: git-send-email.perl:1592 #, perl-format msgid "Dry-Sent %s\n" msgstr "%s gönderilir gibi yapıldı\n" -#: git-send-email.perl:1585 +#: git-send-email.perl:1592 #, perl-format msgid "Sent %s\n" msgstr "%s gönderildi\n" -#: git-send-email.perl:1587 +#: git-send-email.perl:1594 msgid "Dry-OK. Log says:\n" msgstr "Sınama tamam. Günlük çıktısı:\n" -#: git-send-email.perl:1587 +#: git-send-email.perl:1594 msgid "OK. Log says:\n" msgstr "Tamam. Günlük çıktısı:\n" -#: git-send-email.perl:1599 +#: git-send-email.perl:1606 msgid "Result: " msgstr "Sonuç: " -#: git-send-email.perl:1602 +#: git-send-email.perl:1609 msgid "Result: OK\n" msgstr "Sonuç: Tamam\n" -#: git-send-email.perl:1620 +#: git-send-email.perl:1627 #, perl-format msgid "can't open file %s" msgstr "%s dosyası açılamıyor" -#: git-send-email.perl:1667 git-send-email.perl:1687 +#: git-send-email.perl:1674 git-send-email.perl:1694 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Cc: %s, '%s' satırından ekleniyor\n" -#: git-send-email.perl:1673 +#: git-send-email.perl:1680 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) To: %s, '%s' satırından ekleniyor\n" -#: git-send-email.perl:1730 +#: git-send-email.perl:1737 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Cc: %s, '%s' satırından ekleniyor\n" -#: git-send-email.perl:1765 +#: git-send-email.perl:1772 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Cc: %s, '%s' satırından ekleniyor\n" -#: git-send-email.perl:1876 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) '%s' çalıştırılamadı" -#: git-send-email.perl:1883 +#: git-send-email.perl:1890 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) %s: %s, '%s' konumundan ekleniyor\n" -#: git-send-email.perl:1887 +#: git-send-email.perl:1894 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) şuraya olan veri yolu kapatılamadı: '%s'" -#: git-send-email.perl:1917 +#: git-send-email.perl:1924 msgid "cannot send message as 7bit" msgstr "ileti 7 bit olarak gönderilemiyor" -#: git-send-email.perl:1925 +#: git-send-email.perl:1932 msgid "invalid transfer encoding" msgstr "geçersiz aktarım kodlaması" -#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 +#: git-send-email.perl:1966 +#, perl-format +msgid "" +"fatal: %s: rejected by sendemail-validate hook\n" +"%s\n" +"warning: no patches were sent\n" +msgstr "" +"onulmaz: %s: sendemail-validate kancası tarafından reddedildi\n" +"%s\n" +"uyarı: hiçbir yama gönderilmedi\n" + +#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039 #, perl-format msgid "unable to open %s: %s\n" msgstr "%s açılamıyor: %s\n" -#: git-send-email.perl:1969 +#: git-send-email.perl:1979 #, perl-format -msgid "%s: patch contains a line longer than 998 characters" -msgstr "%s: yama 998 karakterden daha uzun bir satır içeriyor" +msgid "" +"fatal: %s:%d is longer than 998 characters\n" +"warning: no patches were sent\n" +msgstr "" +"onulmaz: %s:%d, 998 karakterden uzun\n" +"uyarı: hiçbir yama gönderilmedi\n" -#: git-send-email.perl:1986 +#: git-send-email.perl:1997 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "%s, yedek sonek '%s' ile atlanıyor.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1990 +#: git-send-email.perl:2001 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "%s ögesini gerçekten göndermek istiyor musunuz? [y|N]: " @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git v2.31.0-rc1 rd2\n" +"Project-Id-Version: git v2.32.0-rc0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-03-04 22:41+0800\n" -"PO-Revision-Date: 2021-03-08 08:58+0700\n" +"POT-Creation-Date: 2021-05-17 16:02+0800\n" +"PO-Revision-Date: 2021-05-24 13:49+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" @@ -19,18 +19,16 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n" -"X-Poedit-SourceCharset: UTF-8\n" -"X-Poedit-Basepath: ..\n" -"X-Generator: Poedit 2.4.2\n" +"X-Generator: Poedit 3.0\n" #: add-interactive.c:376 #, c-format msgid "Huh (%s)?" msgstr "Hả (%s)?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292 -#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538 -#: builtin/rebase.c:1963 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 +#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 +#: builtin/rebase.c:1953 msgid "could not read index" msgstr "không thể đọc bảng mục lục" @@ -58,7 +56,7 @@ msgstr "Cập nhật" msgid "could not stage '%s'" msgstr "không thể đưa “%s” lên bệ phóng" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687 msgid "could not write index" msgstr "không thể ghi bảng mục lục" @@ -73,7 +71,7 @@ msgstr[0] "đã cập nhật %d đường dẫn\n" msgid "note: %s is untracked now.\n" msgstr "chú ý: %s giờ đã bỏ theo dõi.\n" -#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" @@ -217,12 +215,12 @@ msgstr "đã đưa lên bệ phóng" msgid "unstaged" msgstr "chưa đưa lên bệ phóng" -#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 -#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 -#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 +#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 +#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327 +#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 #: git-add--interactive.perl:213 msgid "path" msgstr "đường-dẫn" @@ -746,7 +744,7 @@ msgstr "Rất tiếc, không thể sửa khúc này" msgid "'git apply' failed" msgstr "“git apply” gặp lỗi" -#: advice.c:143 +#: advice.c:145 #, c-format msgid "" "\n" @@ -755,45 +753,45 @@ msgstr "" "\n" "Tắt lời nhắn này bằng \"git config advice.%s false\"" -#: advice.c:159 +#: advice.c:161 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sgợi ý: %.*s%s\n" -#: advice.c:250 +#: advice.c:252 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "Cherry-picking là không thể thực hiện bởi vì bạn có những tập tin chưa được " "hòa trộn." -#: advice.c:252 +#: advice.c:254 msgid "Committing is not possible because you have unmerged files." msgstr "" "Commit là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn." -#: advice.c:254 +#: advice.c:256 msgid "Merging is not possible because you have unmerged files." msgstr "" "Merge là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn." -#: advice.c:256 +#: advice.c:258 msgid "Pulling is not possible because you have unmerged files." msgstr "" "Pull là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn." -#: advice.c:258 +#: advice.c:260 msgid "Reverting is not possible because you have unmerged files." msgstr "" "Revert là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn." -#: advice.c:260 +#: advice.c:262 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" "Việc này không thể thực hiện với %s bởi vì bạn có những tập tin chưa được " "hòa trộn." -#: advice.c:268 +#: advice.c:270 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -801,23 +799,41 @@ msgstr "" "Sửa chúng trong cây làm việc, và sau đó dùng lệnh “git add/rm <tập-tin>”\n" "dành riêng cho việc đánh dấu cần giải quyết và tạo lần chuyển giao." -#: advice.c:276 +#: advice.c:278 msgid "Exiting because of an unresolved conflict." msgstr "Thoát ra bởi vì xung đột không thể giải quyết." -#: advice.c:281 builtin/merge.c:1370 +#: advice.c:283 builtin/merge.c:1374 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại)." -#: advice.c:283 +#: advice.c:285 msgid "Please, commit your changes before merging." msgstr "Vui lòng chuyển giao các thay đổi trước khi hòa trộn." -#: advice.c:284 +#: advice.c:286 msgid "Exiting because of unfinished merge." msgstr "Thoát ra bởi vì việc hòa trộn không hoàn tất." -#: advice.c:290 +#: advice.c:296 +#, c-format +msgid "" +"The following pathspecs didn't match any eligible path, but they do match " +"index\n" +"entries outside the current sparse checkout:\n" +msgstr "" +"Các đặc tả đường dẫn sau đây không khớp với bất kỳ đường dẫn thích hợp nào,\n" +"nhưng chúng khớp với các mục mục lục bên ngoài \"sparse checkout\" hiện " +"tại:\n" + +#: advice.c:303 +msgid "" +"Disable or modify the sparsity rules if you intend to update such entries." +msgstr "" +"Vô hiệu hóa hoặc sửa đổi các quy tắc sparsity nếu bạn có ý định cập nhật các " +"mục như vậy." + +#: advice.c:310 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -867,85 +883,81 @@ msgstr "cmdline kết thúc với \\" msgid "unclosed quote" msgstr "chưa có dấu nháy đóng" -#: apply.c:69 +#: apply.c:70 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "không nhận ra tùy chọn về khoảng trắng “%s”" -#: apply.c:85 +#: apply.c:86 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "không nhận ra tùy chọn bỏ qua khoảng trắng “%s”" -#: apply.c:135 +#: apply.c:136 msgid "--reject and --3way cannot be used together." msgstr "--reject và --3way không thể dùng cùng nhau." -#: apply.c:137 -msgid "--cached and --3way cannot be used together." -msgstr "--cached và --3way không thể dùng cùng nhau." - -#: apply.c:140 +#: apply.c:139 msgid "--3way outside a repository" msgstr "--3way ở ngoài một kho chứa" -#: apply.c:151 +#: apply.c:150 msgid "--index outside a repository" msgstr "--index ở ngoài một kho chứa" -#: apply.c:154 +#: apply.c:153 msgid "--cached outside a repository" msgstr "--cached ở ngoài một kho chứa" -#: apply.c:801 +#: apply.c:800 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" "Không thể chuẩn bị biểu thức chính qui dấu vết thời gian (timestamp regexp) " "%s" -#: apply.c:810 +#: apply.c:809 #, c-format msgid "regexec returned %d for input: %s" msgstr "thi hành biểu thức chính quy trả về %d cho đầu vào: %s" -#: apply.c:884 +#: apply.c:883 #, c-format msgid "unable to find filename in patch at line %d" msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d" -#: apply.c:922 +#: apply.c:921 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: git-diff sai - cần /dev/null, nhưng lại nhận được %s trên dòng %d" -#: apply.c:928 +#: apply.c:927 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: git-diff sai - tên tập tin mới không nhất quán trên dòng %d" -#: apply.c:929 +#: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: git-diff sai - tên tập tin cũ không nhất quán trên dòng %d" -#: apply.c:934 +#: apply.c:933 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff sai - cần “/dev/null” trên dòng %d" -#: apply.c:963 +#: apply.c:962 #, c-format msgid "invalid mode on line %d: %s" msgstr "chế độ không hợp lệ trên dòng %d: %s" -#: apply.c:1282 +#: apply.c:1281 #, c-format msgid "inconsistent header lines %d and %d" msgstr "phần đầu mâu thuẫn dòng %d và %d" -#: apply.c:1372 +#: apply.c:1371 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -957,91 +969,91 @@ msgstr[0] "" "phần đầu diff cho git thiếu thông tin tên tập tin khi gỡ bỏ đi %d trong " "thành phần dẫn đầu tên của đường dẫn (dòng %d)" -#: apply.c:1385 +#: apply.c:1384 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "phần đầu diff cho git thiếu thông tin tên tập tin (dòng %d)" -#: apply.c:1481 +#: apply.c:1480 #, c-format msgid "recount: unexpected line: %.*s" msgstr "chi tiết: dòng không cần: %.*s" -#: apply.c:1550 +#: apply.c:1549 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s" -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "tập tin mới phụ thuộc vào nội dung cũ" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "tập tin đã xóa vẫn còn nội dung" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "miếng vá hỏng tại dòng %d" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "tập tin mới %s phụ thuộc vào nội dung cũ" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "tập tin đã xóa %s vẫn còn nội dung" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa" -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "miếng vá định dạng nhị phân sai hỏng tại dòng %d: %.*s" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "vá chỉ với “rác” tại dòng %d" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "không thể đọc liên kết mềm %s" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "không thể mở hay đọc %s" -#: apply.c:2936 +#: apply.c:2935 #, c-format msgid "invalid start of line: '%c'" msgstr "sai khởi đầu dòng: “%c”" -#: apply.c:3057 +#: apply.c:3056 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)." -#: apply.c:3069 +#: apply.c:3068 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Ngữ cảnh bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d" -#: apply.c:3075 +#: apply.c:3074 #, c-format msgid "" "while searching for:\n" @@ -1050,440 +1062,448 @@ msgstr "" "trong khi đang tìm kiếm cho:\n" "%.*s" -#: apply.c:3097 +#: apply.c:3096 #, c-format msgid "missing binary patch data for '%s'" msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%s”" -#: apply.c:3105 +#: apply.c:3104 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "không thể reverse-apply một miếng vá nhị phân mà không đảo ngược khúc thành " "“%s”" -#: apply.c:3152 +#: apply.c:3151 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "không thể áp dụng miếng vá nhị phân thành “%s” mà không có dòng chỉ mục đầy " "đủ" -#: apply.c:3163 +#: apply.c:3162 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" "miếng vá áp dụng cho “%s” (%s), cái mà không khớp với các nội dung hiện tại." -#: apply.c:3171 +#: apply.c:3170 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "miếng vá áp dụng cho một “%s” trống rỗng nhưng nó lại không trống" -#: apply.c:3189 +#: apply.c:3188 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "không thể đọc postimage %s cần thiết cho “%s”" -#: apply.c:3202 +#: apply.c:3201 #, c-format msgid "binary patch does not apply to '%s'" msgstr "miếng vá định dạng nhị phân không được áp dụng cho “%s”" -#: apply.c:3209 +#: apply.c:3208 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "vá nhị phân cho “%s” tạo ra kết quả không chính xác (mong chờ %s, lại nhận " "%s)" -#: apply.c:3230 +#: apply.c:3229 #, c-format msgid "patch failed: %s:%ld" msgstr "gặp lỗi khi vá: %s:%ld" -#: apply.c:3353 +#: apply.c:3352 #, c-format msgid "cannot checkout %s" msgstr "không thể lấy ra %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213 +#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214 #: setup.c:308 #, c-format msgid "failed to read %s" msgstr "gặp lỗi khi đọc %s" -#: apply.c:3413 +#: apply.c:3412 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "đọc từ “%s” vượt ra ngoài liên kết mềm" -#: apply.c:3442 apply.c:3685 +#: apply.c:3441 apply.c:3687 #, c-format msgid "path %s has been renamed/deleted" msgstr "đường dẫn %s đã bị xóa hoặc đổi tên" -#: apply.c:3528 apply.c:3700 +#: apply.c:3527 apply.c:3702 #, c-format msgid "%s: does not exist in index" msgstr "%s: không tồn tại trong bảng mục lục" -#: apply.c:3537 apply.c:3708 apply.c:3952 +#: apply.c:3536 apply.c:3710 apply.c:3954 #, c-format msgid "%s: does not match index" msgstr "%s: không khớp trong mục lục" -#: apply.c:3572 -msgid "repository lacks the necessary blob to fall back on 3-way merge." -msgstr "kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”." +#: apply.c:3571 +msgid "repository lacks the necessary blob to perform 3-way merge." +msgstr "kho thiếu đối tượng blob cần thiết để thực hiện hòa trộn “3-way”." -#: apply.c:3575 +#: apply.c:3574 #, c-format -msgid "Falling back to three-way merge...\n" -msgstr "Đang trở lại hòa trộn “3-đường”…\n" +msgid "Performing three-way merge...\n" +msgstr "Đang thực hiện hòa trộn “3-đường”…\n" -#: apply.c:3591 apply.c:3595 +#: apply.c:3590 apply.c:3594 #, c-format msgid "cannot read the current contents of '%s'" msgstr "không thể đọc nội dung hiện hành của “%s”" -#: apply.c:3607 +#: apply.c:3606 #, c-format -msgid "Failed to fall back on three-way merge...\n" -msgstr "Gặp lỗi khi quay trở lại để hòa trộn kiểu “three-way”…\n" +msgid "Failed to perform three-way merge...\n" +msgstr "Gặp lỗi khi thực hiện hòa trộn kiểu “three-way”…\n" -#: apply.c:3621 +#: apply.c:3620 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Đã áp dụng miếng vá %s với các xung đột.\n" -#: apply.c:3626 +#: apply.c:3625 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ.\n" -#: apply.c:3652 +#: apply.c:3642 +#, c-format +msgid "Falling back to direct application...\n" +msgstr "Đang trở lại ứng dụng chi phối…\n" + +#: apply.c:3654 msgid "removal patch leaves file contents" msgstr "loại bỏ miếng vá để lại nội dung tập tin" -#: apply.c:3725 +#: apply.c:3727 #, c-format msgid "%s: wrong type" msgstr "%s: sai kiểu" -#: apply.c:3727 +#: apply.c:3729 #, c-format msgid "%s has type %o, expected %o" msgstr "%s có kiểu %o, cần %o" -#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 -#: read-cache.c:1313 +#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 +#: read-cache.c:1351 #, c-format msgid "invalid path '%s'" msgstr "đường dẫn không hợp lệ “%s”" -#: apply.c:3950 +#: apply.c:3952 #, c-format msgid "%s: already exists in index" msgstr "%s: đã có từ trước trong bảng mục lục" -#: apply.c:3954 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "%s: đã sẵn có trong thư mục đang làm việc" -#: apply.c:3974 +#: apply.c:3976 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)" -#: apply.c:3979 +#: apply.c:3981 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s" -#: apply.c:3999 +#: apply.c:4001 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "tập tin chịu tác động “%s” vượt ra ngoài liên kết mềm" -#: apply.c:4003 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "%s: miếng vá không được áp dụng" -#: apply.c:4018 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "Đang kiểm tra miếng vá %s…" -#: apply.c:4110 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "thông tin sha1 thiếu hoặc không dùng được cho mô-đun %s" -#: apply.c:4117 +#: apply.c:4119 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "thay đổi chế độ cho %s, cái mà không phải là HEAD hiện tại" -#: apply.c:4120 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "thông tin sha1 còn thiếu hay không dùng được(%s)." -#: apply.c:4129 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "không thể thêm %s vào chỉ mục tạm thời" -#: apply.c:4139 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "không thể ghi mục lục tạm vào %s" -#: apply.c:4277 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "không thể gỡ bỏ %s từ mục lục" -#: apply.c:4311 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "miếng vá sai hỏng cho mô-đun-con %s" -#: apply.c:4317 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "không thể lấy thống kê về tập tin %s mới hơn đã được tạo" -#: apply.c:4325 +#: apply.c:4327 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "không thể tạo “kho lưu đằng sau” cho tập tin được tạo mới hơn %s" -#: apply.c:4331 apply.c:4476 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "không thể thêm mục nhớ đệm cho %s" -#: apply.c:4374 builtin/bisect--helper.c:523 +#: apply.c:4376 builtin/bisect--helper.c:523 #, c-format msgid "failed to write to '%s'" msgstr "gặp lỗi khi ghi vào “%s”" -#: apply.c:4378 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "đang đóng tập tin “%s”" -#: apply.c:4448 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "không thể ghi vào tập tin “%s” chế độ %o" -#: apply.c:4546 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ." -#: apply.c:4554 +#: apply.c:4556 msgid "internal error" msgstr "lỗi nội bộ" -#: apply.c:4557 +#: apply.c:4559 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Đang áp dụng miếng vá %%s với %d lần từ chối…" -#: apply.c:4568 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej" -#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334 +#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394 #, c-format msgid "cannot open %s" msgstr "không mở được “%s”" -#: apply.c:4590 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Khối nhớ #%d được áp dụng gọn gàng." -#: apply.c:4594 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "Đoạn dữ liệu #%d bị từ chối." -#: apply.c:4718 +#: apply.c:4725 #, c-format msgid "Skipped patch '%s'." msgstr "Bỏ qua đường dẫn “%s”." -#: apply.c:4726 +#: apply.c:4733 msgid "unrecognized input" msgstr "không thừa nhận đầu vào" -#: apply.c:4746 +#: apply.c:4753 msgid "unable to read index file" msgstr "không thể đọc tập tin lưu bảng mục lục" -#: apply.c:4903 +#: apply.c:4910 #, c-format msgid "can't open patch '%s': %s" msgstr "không thể mở miếng vá “%s”: %s" -#: apply.c:4930 +#: apply.c:4937 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "đã chấm dứt %d lỗi khoảng trắng" -#: apply.c:4936 apply.c:4951 +#: apply.c:4943 apply.c:4958 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d dòng thêm khoảng trắng lỗi." -#: apply.c:4944 +#: apply.c:4951 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d dòng được áp dụng sau khi sửa các lỗi khoảng trắng." -#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "Không thể ghi tập tin lưu bảng mục lục mới" -#: apply.c:4988 +#: apply.c:4995 msgid "don't apply changes matching the given path" msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho" -#: apply.c:4991 +#: apply.c:4998 msgid "apply changes matching the given path" msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho" -#: apply.c:4993 builtin/am.c:2266 +#: apply.c:5000 builtin/am.c:2317 msgid "num" msgstr "số" -#: apply.c:4994 +#: apply.c:5001 msgid "remove <num> leading slashes from traditional diff paths" msgstr "gỡ bỏ <số> dấu gạch chéo dẫn đầu từ đường dẫn diff cổ điển" -#: apply.c:4997 +#: apply.c:5004 msgid "ignore additions made by the patch" msgstr "lờ đi phần bổ xung được tạo ra bởi miếng vá" -#: apply.c:4999 +#: apply.c:5006 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra" -#: apply.c:5003 +#: apply.c:5010 msgid "show number of added and deleted lines in decimal notation" msgstr "" "hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân" -#: apply.c:5005 +#: apply.c:5012 msgid "instead of applying the patch, output a summary for the input" msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào" -#: apply.c:5007 +#: apply.c:5014 msgid "instead of applying the patch, see if the patch is applicable" msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không" -#: apply.c:5009 +#: apply.c:5016 msgid "make sure the patch is applicable to the current index" msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành" -#: apply.c:5011 +#: apply.c:5018 msgid "mark new files with `git add --intent-to-add`" msgstr "đánh dấu các tập tin mới với “git add --intent-to-add”" -#: apply.c:5013 +#: apply.c:5020 msgid "apply a patch without touching the working tree" msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc" -#: apply.c:5015 +#: apply.c:5022 msgid "accept a patch that touches outside the working area" msgstr "chấp nhận một miếng vá mà không động chạm đến cây làm việc" -#: apply.c:5018 +#: apply.c:5025 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "đồng thời áp dụng miếng vá (dùng với tùy chọn --stat/--summary/--check)" -#: apply.c:5020 -msgid "attempt three-way merge if a patch does not apply" -msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được" +#: apply.c:5027 +msgid "attempt three-way merge, fall back on normal patch if that fails" +msgstr "" +"thử hòa trộn kiểu three-way, quay lại dán bình thường nếu không thể thực " +"hiện được" -#: apply.c:5022 +#: apply.c:5029 msgid "build a temporary index based on embedded index information" msgstr "" "xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng" -#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540 +#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617 msgid "paths are separated with NUL character" msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL" -#: apply.c:5027 +#: apply.c:5034 msgid "ensure at least <n> lines of context match" msgstr "đảm bảo rằng có ít nhất <n> dòng ngữ cảnh khớp" -#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 -#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3577 builtin/rebase.c:1352 +#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 +#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831 +#: builtin/rebase.c:1347 msgid "action" msgstr "hành động" -#: apply.c:5029 +#: apply.c:5036 msgid "detect new or modified lines that have whitespace errors" msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng" -#: apply.c:5032 apply.c:5035 +#: apply.c:5039 apply.c:5042 msgid "ignore changes in whitespace when finding context" msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi tìm ngữ cảnh" -#: apply.c:5038 +#: apply.c:5045 msgid "apply the patch in reverse" msgstr "áp dụng miếng vá theo chiều ngược" -#: apply.c:5040 +#: apply.c:5047 msgid "don't expect at least one line of context" msgstr "đừng hy vọng có ít nhất một dòng ngữ cảnh" -#: apply.c:5042 +#: apply.c:5049 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng" -#: apply.c:5044 +#: apply.c:5051 msgid "allow overlapping hunks" msgstr "cho phép chồng khối nhớ" -#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757 -#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 +#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 +#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "chi tiết" -#: apply.c:5047 +#: apply.c:5054 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin" -#: apply.c:5050 +#: apply.c:5057 msgid "do not trust the line counts in the hunk headers" msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu" -#: apply.c:5052 builtin/am.c:2254 +#: apply.c:5059 builtin/am.c:2305 msgid "root" msgstr "gốc" -#: apply.c:5053 +#: apply.c:5060 msgid "prepend <root> to all filenames" msgstr "treo thêm <root> vào tất cả các tên tập tin" @@ -1550,141 +1570,141 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <kho> [--exec <lệnh>] --list" -#: archive.c:192 +#: archive.c:188 #, c-format msgid "cannot read %s" msgstr "không thể đọc %s" -#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894 -#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786 -#: builtin/merge.c:1139 +#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 +#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 +#: builtin/merge.c:1143 #, c-format msgid "could not read '%s'" msgstr "không thể đọc “%s”" -#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315 +#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào" -#: archive.c:454 +#: archive.c:451 #, c-format msgid "no such ref: %.*s" msgstr "không có tham chiếu nào như thế: %.*s" -#: archive.c:460 +#: archive.c:457 #, c-format msgid "not a valid object name: %s" msgstr "không phải là tên đối tượng hợp lệ: “%s”" -#: archive.c:473 +#: archive.c:470 #, c-format msgid "not a tree object: %s" msgstr "không phải là đối tượng cây: “%s”" -#: archive.c:485 +#: archive.c:482 msgid "current working directory is untracked" msgstr "thư mục làm việc hiện hành chưa được theo dõi" -#: archive.c:526 +#: archive.c:523 #, c-format msgid "File not found: %s" msgstr "Không tìm thấy tập tin: %s" -#: archive.c:528 +#: archive.c:525 #, c-format msgid "Not a regular file: %s" msgstr "Không phải một tập tin thường: %s" -#: archive.c:555 +#: archive.c:552 msgid "fmt" msgstr "định_dạng" -#: archive.c:555 +#: archive.c:552 msgid "archive format" msgstr "định dạng lưu trữ" -#: archive.c:556 builtin/log.c:1764 +#: archive.c:553 builtin/log.c:1772 msgid "prefix" msgstr "tiền_tố" -#: archive.c:557 +#: archive.c:554 msgid "prepend prefix to each pathname in the archive" msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu" -#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888 +#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105 -#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 +#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105 +#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" msgstr "tập_tin" -#: archive.c:559 +#: archive.c:556 msgid "add untracked file to archive" msgstr "thêm các tập tin không được theo dõi vào kho lưu" -#: archive.c:562 builtin/archive.c:90 +#: archive.c:559 builtin/archive.c:90 msgid "write the archive to this file" msgstr "ghi kho lưu vào tập tin này" -#: archive.c:564 +#: archive.c:561 msgid "read .gitattributes in working directory" msgstr "đọc .gitattributes trong thư mục làm việc" -#: archive.c:565 +#: archive.c:562 msgid "report archived files on stderr" msgstr "liệt kê các tập tin được lưu trữ vào stderr (đầu ra lỗi tiêu chuẩn)" -#: archive.c:567 +#: archive.c:564 msgid "set compression level" msgstr "đặt mức nén" -#: archive.c:570 +#: archive.c:567 msgid "list supported archive formats" msgstr "liệt kê các kiểu nén được hỗ trợ" -#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 +#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 +#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 msgid "repo" msgstr "kho" -#: archive.c:573 builtin/archive.c:92 +#: archive.c:570 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "nhận kho nén từ kho chứa <kho> trên máy chủ" -#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 #: builtin/notes.c:498 msgid "command" msgstr "lệnh" -#: archive.c:575 builtin/archive.c:94 +#: archive.c:572 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "đường dẫn đến lệnh git-upload-pack trên máy chủ" -#: archive.c:582 +#: archive.c:579 msgid "Unexpected option --remote" msgstr "Gặp tùy chọn không cần --remote" -#: archive.c:584 +#: archive.c:581 msgid "Option --exec can only be used together with --remote" msgstr "Tùy chọn --exec chỉ có thể được dùng cùng với --remote" -#: archive.c:586 +#: archive.c:583 msgid "Unexpected option --output" msgstr "Gặp tùy chọn không cần --output" -#: archive.c:588 +#: archive.c:585 msgid "Options --add-file and --remote cannot be used together" msgstr "Các tùy chọn --add-file và --remote không thể sử dụng cùng với nhau" -#: archive.c:610 +#: archive.c:607 #, c-format msgid "Unknown archive format '%s'" msgstr "Không hiểu định dạng “%s”" -#: archive.c:619 +#: archive.c:616 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Tham số không được hỗ trợ cho định dạng “%s”: -%d" @@ -1694,12 +1714,12 @@ msgstr "Tham số không được hỗ trợ cho định dạng “%s”: -%d" msgid "%.*s is not a valid attribute name" msgstr "%.*s không phải tên thuộc tính hợp lệ" -#: attr.c:359 +#: attr.c:363 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s không được phép: %s:%d" -#: attr.c:399 +#: attr.c:403 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1782,7 +1802,7 @@ msgstr "Bisecting: nền hòa trộn cần phải được kiểm tra\n" msgid "a %s revision is needed" msgstr "cần một điểm xét duyệt %s" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298 #, c-format msgid "could not create file '%s'" msgstr "không thể tạo tập tin “%s”" @@ -1825,40 +1845,40 @@ msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bisecting: còn %d điểm xét duyệt để kiểm sau %s này\n" -#: blame.c:2777 +#: blame.c:2776 msgid "--contents and --reverse do not blend well." msgstr "tùy chọn--contents và --reverse không được trộn vào nhau." -#: blame.c:2791 +#: blame.c:2790 msgid "cannot use --contents with final commit object name" msgstr "không thể dùng --contents với tên đối tượng chuyển giao cuối cùng" -#: blame.c:2812 +#: blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "cùng sử dụng --reverse và --first-parent cần chỉ định lần chuyển giao cuối" -#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146 -#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411 -#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335 -#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410 -#: builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 +#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 +#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 +#: builtin/pack-objects.c:3661 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi" -#: blame.c:2839 +#: blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "cùng sử dụng --reverse --first-parent yêu cầu vùng cùng với chuỗi cha-mẹ-đầu-" "tiên" -#: blame.c:2850 +#: blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "không có đường dẫn %s trong “%s”" -#: blame.c:2861 +#: blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "không thể đọc blob %s cho đường dẫn “%s”" @@ -1994,12 +2014,12 @@ msgstr "Tên đối tượng chưa rõ ràng: “%s”." msgid "Not a valid branch point: '%s'." msgstr "Nhánh không hợp lệ: “%s”." -#: branch.c:365 +#: branch.c:366 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "“%s” đã được lấy ra tại “%s” rồi" -#: branch.c:388 +#: branch.c:389 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD của cây làm việc %s chưa được cập nhật" @@ -2024,8 +2044,8 @@ msgstr "“%s” không giống như tập tin v2 hay v3 bundle (định dạng msgid "unrecognized header: %s%s (%d)" msgstr "phần đầu không được thừa nhận: %s%s (%d)" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184 -#: builtin/commit.c:814 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "không thể mở “%s”" @@ -2081,7 +2101,7 @@ msgstr "phiên bản bundle %d không được hỗ trợ" msgid "cannot write bundle version %d with algorithm %s" msgstr "không thể ghi phiên bản bundle %d với thuật toán %s" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "đối số không được thừa nhận: %s" @@ -2123,249 +2143,249 @@ msgstr "mảnh cuối cùng có id không bằng không %<PRIx32>" msgid "invalid color value: %.*s" msgstr "giá trị màu không hợp lệ: %.*s" -#: commit-graph.c:197 midx.c:46 +#: commit-graph.c:204 midx.c:47 msgid "invalid hash version" msgstr "phiên bản băm không hợp lệ" -#: commit-graph.c:255 +#: commit-graph.c:262 msgid "commit-graph file is too small" msgstr "tập tin đồ-thị-các-lần-chuyển-giao quá nhỏ" -#: commit-graph.c:348 +#: commit-graph.c:355 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "chữ ký đồ-thị-các-lần-chuyển-giao %X không khớp chữ ký %X" -#: commit-graph.c:355 +#: commit-graph.c:362 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "phiên bản đồ-thị-các-lần-chuyển-giao %X không khớp phiên bản %X" -#: commit-graph.c:362 +#: commit-graph.c:369 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "phiên bản đồ-thị-các-lần-chuyển-giao %X không khớp phiên bản %X" -#: commit-graph.c:379 +#: commit-graph.c:386 #, c-format msgid "commit-graph file is too small to hold %u chunks" msgstr "tập tin đồ-thị-các-lần-chuyển-giao quá nhỏ để giữ %u mảnh dữ liệu" -#: commit-graph.c:472 +#: commit-graph.c:482 msgid "commit-graph has no base graphs chunk" msgstr "đồ-thị-các-lần-chuyển-giao có không có mảnh các đồ họa cơ sở" -#: commit-graph.c:482 +#: commit-graph.c:492 msgid "commit-graph chain does not match" msgstr "móc xích đồ-thị-các-lần-chuyển-giao không khớp" -#: commit-graph.c:530 +#: commit-graph.c:540 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" "móc xích đồ-thị-các-lần-chuyển-giao không hợp lệ: dòng “%s” không phải là " "một mã băm" -#: commit-graph.c:554 +#: commit-graph.c:564 msgid "unable to find all commit-graph files" msgstr "không thể tìm thấy tất cả các tập tin đồ-thị-các-lần-chuyển-giao" -#: commit-graph.c:735 commit-graph.c:772 +#: commit-graph.c:745 commit-graph.c:782 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "vị trí lần chuyển giao không hợp lệ. đồ-thị-các-lần-chuyển-giao có vẻ như đã " "bị hỏng" -#: commit-graph.c:756 +#: commit-graph.c:766 #, c-format msgid "could not find commit %s" msgstr "không thể tìm thấy lần chuyển giao %s" -#: commit-graph.c:789 +#: commit-graph.c:799 msgid "commit-graph requires overflow generation data but has none" msgstr "commit-graph yêu cầu dữ liệu tạo tràn nhưng không có" -#: commit-graph.c:1065 builtin/am.c:1292 +#: commit-graph.c:1075 builtin/am.c:1340 #, c-format msgid "unable to parse commit %s" msgstr "không thể phân tích lần chuyển giao “%s”" -#: commit-graph.c:1327 builtin/pack-objects.c:2872 +#: commit-graph.c:1337 builtin/pack-objects.c:2897 #, c-format msgid "unable to get type of object %s" msgstr "không thể lấy kiểu của đối tượng “%s”" -#: commit-graph.c:1358 +#: commit-graph.c:1368 msgid "Loading known commits in commit graph" msgstr "Đang tải các lần chuyển giao chưa biết trong đồ thị lần chuyển giao" -#: commit-graph.c:1375 +#: commit-graph.c:1385 msgid "Expanding reachable commits in commit graph" msgstr "" "Mở rộng các lần chuyển giao có thể tiếp cận được trong trong đồ thị lần " "chuyển giao" -#: commit-graph.c:1395 +#: commit-graph.c:1405 msgid "Clearing commit marks in commit graph" msgstr "Đang dọn dẹp các đánh dấu lần chuyển giao trong đồ thị lần chuyển giao" -#: commit-graph.c:1414 +#: commit-graph.c:1424 msgid "Computing commit graph topological levels" msgstr "Đang tính mức hình học tô-pô tạo đồ thị các lần chuyển giao" -#: commit-graph.c:1467 +#: commit-graph.c:1477 msgid "Computing commit graph generation numbers" msgstr "Đang tính toán số tạo đồ thị các lần chuyển giao" -#: commit-graph.c:1548 +#: commit-graph.c:1558 msgid "Computing commit changed paths Bloom filters" msgstr "Đang tính toán chuyển giao các bộ lọc Bloom đường dẫn bị thay đổi" -#: commit-graph.c:1625 +#: commit-graph.c:1635 msgid "Collecting referenced commits" msgstr "Đang sưu tập các lần chuyển giao được tham chiếu" -#: commit-graph.c:1650 +#: commit-graph.c:1660 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "" "Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong %d gói" -#: commit-graph.c:1663 +#: commit-graph.c:1673 #, c-format msgid "error adding pack %s" msgstr "gặp lỗi thêm gói %s" -#: commit-graph.c:1667 +#: commit-graph.c:1677 #, c-format msgid "error opening index for %s" msgstr "gặp lỗi khi mở mục lục cho “%s”" -#: commit-graph.c:1704 +#: commit-graph.c:1714 msgid "Finding commits for commit graph among packed objects" msgstr "" "Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong số các đối " "tượng đã đóng gói" -#: commit-graph.c:1722 +#: commit-graph.c:1732 msgid "Finding extra edges in commit graph" msgstr "Đang tìm các cạnh mở tộng trong đồ thị lần chuyển giao" -#: commit-graph.c:1771 +#: commit-graph.c:1781 msgid "failed to write correct number of base graph ids" msgstr "gặp lỗi khi ghi số đúng của mã đồ họa cơ sở" -#: commit-graph.c:1802 midx.c:794 +#: commit-graph.c:1812 midx.c:906 #, c-format msgid "unable to create leading directories of %s" msgstr "không thể tạo các thư mục dẫn đầu của “%s”" -#: commit-graph.c:1815 +#: commit-graph.c:1825 msgid "unable to create temporary graph layer" msgstr "không thể tạo lớp sơ đồ tạm thời" -#: commit-graph.c:1820 +#: commit-graph.c:1830 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "không thể chỉnh sửa quyền chia sẻ thành “%s”" -#: commit-graph.c:1879 +#: commit-graph.c:1887 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Đang ghi ra đồ thị các lần chuyển giao trong lần %d" -#: commit-graph.c:1915 +#: commit-graph.c:1923 msgid "unable to open commit-graph chain file" msgstr "không thể mở tập tin mắt xích đồ thị chuyển giao" -#: commit-graph.c:1931 +#: commit-graph.c:1939 msgid "failed to rename base commit-graph file" msgstr "gặp lỗi khi đổi tên tập tin đồ-thị-các-lần-chuyển-giao" -#: commit-graph.c:1951 +#: commit-graph.c:1959 msgid "failed to rename temporary commit-graph file" msgstr "gặp lỗi khi đổi tên tập tin đồ-thị-các-lần-chuyển-giao tạm thời" -#: commit-graph.c:2084 +#: commit-graph.c:2092 msgid "Scanning merged commits" msgstr "Đang quét các lần chuyển giao đã hòa trộn" -#: commit-graph.c:2128 +#: commit-graph.c:2136 msgid "Merging commit-graph" msgstr "Đang hòa trộn đồ-thị-các-lần-chuyển-giao" -#: commit-graph.c:2235 +#: commit-graph.c:2244 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" "cố gắng để ghi một đồ thị các lần chuyển giao, nhưng “core.commitGraph” bị " "vô hiệu hóa" -#: commit-graph.c:2342 +#: commit-graph.c:2351 msgid "too many commits to write graph" msgstr "có quá nhiều lần chuyển giao để ghi đồ thị" -#: commit-graph.c:2440 +#: commit-graph.c:2450 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "tập tin đồ-thị-các-lần-chuyển-giao có tổng kiểm không đúng và có vẻ như là " "đã hỏng" -#: commit-graph.c:2450 +#: commit-graph.c:2460 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "đồ-thị-các-lần-chuyển-giao có thứ tự OID không đúng: %s sau %s" -#: commit-graph.c:2460 commit-graph.c:2475 +#: commit-graph.c:2470 commit-graph.c:2485 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "đồ-thị-các-lần-chuyển-giao có giá trị fanout không đúng: fanout[%d] = %u != " "%u" -#: commit-graph.c:2467 +#: commit-graph.c:2477 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "gặp lỗi khi phân tích lần chuyển giao từ %s đồ-thị-các-lần-chuyển-giao" -#: commit-graph.c:2485 +#: commit-graph.c:2495 msgid "Verifying commits in commit graph" msgstr "Đang thẩm tra các lần chuyển giao trong đồ thị lần chuyển giao" -#: commit-graph.c:2500 +#: commit-graph.c:2510 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "gặp lỗi khi phân tích lần chuyển giao %s từ cơ sở dữ liệu đối tượng cho đồ " "thị lần chuyển giao" -#: commit-graph.c:2507 +#: commit-graph.c:2517 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "OID cây gốc cho lần chuyển giao %s trong đồ-thị-các-lần-chuyển-giao là %s != " "%s" -#: commit-graph.c:2517 +#: commit-graph.c:2527 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" "danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là quá dài" -#: commit-graph.c:2526 +#: commit-graph.c:2536 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "cha mẹ đồ-thị-các-lần-chuyển-giao cho %s là %s != %s" -#: commit-graph.c:2540 +#: commit-graph.c:2550 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s bị chấm " "dứt quá sớm" -#: commit-graph.c:2545 +#: commit-graph.c:2555 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2373,7 +2393,7 @@ msgstr "" "đồ-thị-các-lần-chuyển-giao có con số không lần tạo cho lần chuyển giao %s, " "nhưng không phải số không ở chỗ khác" -#: commit-graph.c:2549 +#: commit-graph.c:2559 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2381,22 +2401,22 @@ msgstr "" "đồ-thị-các-lần-chuyển-giao có con số không phải không lần tạo cho lần chuyển " "giao %s, nhưng số không ở chỗ khác" -#: commit-graph.c:2566 +#: commit-graph.c:2576 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "" "tạo đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là %<PRIuMAX> < " "%<PRIuMAX>" -#: commit-graph.c:2572 +#: commit-graph.c:2582 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "ngày chuyển giao cho lần chuyển giao %s trong đồ-thị-các-lần-chuyển-giao là " "%<PRIuMAX> != %<PRIuMAX>" -#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416 +#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "không thể phân tích cú pháp %s" @@ -2426,28 +2446,28 @@ msgstr "" "Tắt lời nhắn này bằng cách chạy\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1223 +#: commit.c:1237 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Lần chuyển giao %s có một chữ ký GPG không đáng tin, được cho là bởi %s." -#: commit.c:1227 +#: commit.c:1241 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Lần chuyển giao %s có một chữ ký GPG sai, được cho là bởi %s." -#: commit.c:1230 +#: commit.c:1244 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Lần chuyển giao %s không có chữ ký GPG." -#: commit.c:1233 +#: commit.c:1247 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Lần chuyển giao %s có một chữ ký GPG tốt bởi %s\n" -#: commit.c:1487 +#: commit.c:1501 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2514,7 +2534,7 @@ msgstr "khóa không chứa một phần: %s" msgid "key does not contain variable name: %s" msgstr "khóa không chứa bất kỳ một tên biến nào: %s" -#: config.c:472 sequencer.c:2588 +#: config.c:472 sequencer.c:2785 #, c-format msgid "invalid key: %s" msgstr "khóa không đúng: %s" @@ -2633,70 +2653,70 @@ msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "sai giá trị bằng số của cấu hình “%s” cho “%s” trong %s: %s" -#: config.c:1194 +#: config.c:1257 #, c-format msgid "bad boolean config value '%s' for '%s'" msgstr "sai giá trị kiểu lô-gíc của cấu hình “%s” cho “%s”" -#: config.c:1289 +#: config.c:1275 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "gặp lỗi mở rộng thư mục người dùng trong: “%s”" -#: config.c:1298 +#: config.c:1284 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "“%s” dành cho “%s” không phải là dấu vết thời gian hợp lệ" -#: config.c:1391 +#: config.c:1377 #, c-format msgid "abbrev length out of range: %d" msgstr "chiều dài abbrev nằm ngoài phạm vi: %d" -#: config.c:1405 config.c:1416 +#: config.c:1391 config.c:1402 #, c-format msgid "bad zlib compression level %d" msgstr "mức nén zlib %d là sai" -#: config.c:1508 +#: config.c:1494 msgid "core.commentChar should only be one character" msgstr "core.commentChar chỉ được có một ký tự" -#: config.c:1541 +#: config.c:1527 #, c-format msgid "invalid mode for object creation: %s" msgstr "chế độ không hợp lệ đối với việc tạo đối tượng: %s" -#: config.c:1613 +#: config.c:1599 #, c-format msgid "malformed value for %s" msgstr "giá trị cho %s sai dạng" -#: config.c:1639 +#: config.c:1625 #, c-format msgid "malformed value for %s: %s" msgstr "giá trị cho %s sai dạng: %s" -#: config.c:1640 +#: config.c:1626 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "phải là một trong số nothing, matching, simple, upstream hay current" -#: config.c:1701 builtin/pack-objects.c:3666 +#: config.c:1687 builtin/pack-objects.c:3924 #, c-format msgid "bad pack compression level %d" msgstr "mức nén gói %d không hợp lệ" -#: config.c:1823 +#: config.c:1809 #, c-format msgid "unable to load config blob object '%s'" msgstr "không thể tải đối tượng blob cấu hình “%s”" -#: config.c:1826 +#: config.c:1812 #, c-format msgid "reference '%s' does not point to a blob" msgstr "tham chiếu “%s” không chỉ đến một blob nào cả" -#: config.c:1843 +#: config.c:1829 #, c-format msgid "unable to resolve config blob '%s'" msgstr "không thể phân giải điểm xét duyệt “%s”" @@ -2706,105 +2726,105 @@ msgstr "không thể phân giải điểm xét duyệt “%s”" msgid "failed to parse %s" msgstr "gặp lỗi khi phân tích cú pháp %s" -#: config.c:1927 +#: config.c:1929 msgid "unable to parse command-line config" msgstr "không thể phân tích cấu hình dòng lệnh" -#: config.c:2290 +#: config.c:2293 msgid "unknown error occurred while reading the configuration files" msgstr "đã có lỗi chưa biết xảy ra trong khi đọc các tập tin cấu hình" -#: config.c:2464 +#: config.c:2467 #, c-format msgid "Invalid %s: '%s'" msgstr "%s không hợp lệ: “%s”" -#: config.c:2509 +#: config.c:2512 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "giá trị splitIndex.maxPercentChange “%d” phải nằm giữa 0 và 100" -#: config.c:2555 +#: config.c:2558 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "không thể phân tích “%s” từ cấu hình dòng lệnh" -#: config.c:2557 +#: config.c:2560 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "sai biến cấu hình “%s” trong tập tin “%s” tại dòng %d" -#: config.c:2641 +#: config.c:2644 #, c-format msgid "invalid section name '%s'" msgstr "tên của phần không hợp lệ “%s”" -#: config.c:2673 +#: config.c:2676 #, c-format msgid "%s has multiple values" msgstr "%s có đa giá trị" -#: config.c:2702 +#: config.c:2705 #, c-format msgid "failed to write new configuration file %s" msgstr "gặp lỗi khi ghi tập tin cấu hình “%s”" -#: config.c:2954 config.c:3280 +#: config.c:2957 config.c:3283 #, c-format msgid "could not lock config file %s" msgstr "không thể khóa tập tin cấu hình %s" -#: config.c:2965 +#: config.c:2968 #, c-format msgid "opening %s" msgstr "đang mở “%s”" -#: config.c:3002 builtin/config.c:361 +#: config.c:3005 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "mẫu không hợp lệ: %s" -#: config.c:3027 +#: config.c:3030 #, c-format msgid "invalid config file %s" msgstr "tập tin cấu hình “%s” không hợp lệ" -#: config.c:3040 config.c:3293 +#: config.c:3043 config.c:3296 #, c-format msgid "fstat on %s failed" msgstr "fstat trên %s gặp lỗi" -#: config.c:3051 +#: config.c:3054 #, c-format msgid "unable to mmap '%s'" msgstr "không thể mmap “%s”" -#: config.c:3060 config.c:3298 +#: config.c:3063 config.c:3301 #, c-format msgid "chmod on %s failed" msgstr "chmod trên %s gặp lỗi" -#: config.c:3145 config.c:3395 +#: config.c:3148 config.c:3398 #, c-format msgid "could not write config file %s" msgstr "không thể ghi tập tin cấu hình “%s”" -#: config.c:3179 +#: config.c:3182 #, c-format msgid "could not set '%s' to '%s'" msgstr "không thể đặt “%s” thành “%s”" -#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "không thể thôi đặt “%s”" -#: config.c:3271 +#: config.c:3274 #, c-format msgid "invalid section name: %s" msgstr "tên của phần không hợp lệ: %s" -#: config.c:3438 +#: config.c:3441 #, c-format msgid "missing value for '%s'" msgstr "thiếu giá trị cho cho “%s”" @@ -2981,7 +3001,7 @@ msgstr "đã khóa tên đường dẫn lạ “%s”" msgid "unable to fork" msgstr "không thể rẽ nhánh tiến trình con" -#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Đang kiểm tra kết nối" @@ -2997,17 +3017,17 @@ msgstr "gặp lỗi khi ghi vào rev-list" msgid "failed to close rev-list's stdin" msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list" -#: convert.c:194 +#: convert.c:183 #, c-format msgid "illegal crlf_action %d" msgstr "crlf_action %d không hợp lệ" -#: convert.c:207 +#: convert.c:196 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF nên được thay bằng LF trong %s" -#: convert.c:209 +#: convert.c:198 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -3016,12 +3036,12 @@ msgstr "" "CRLF sẽ bị thay thế bằng LF trong %s.\n" "Tập tin sẽ có kiểu xuống dòng như bản gốc trong thư mục làm việc của bạn" -#: convert.c:217 +#: convert.c:206 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF nên thay bằng CRLF trong %s" -#: convert.c:219 +#: convert.c:208 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -3030,12 +3050,12 @@ msgstr "" "LF sẽ bị thay thế bằng CRLF trong %s.\n" "Tập tin sẽ có kiểu xuống dòng như bản gốc trong thư mục làm việc của bạn" -#: convert.c:284 +#: convert.c:273 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "BOM bị cấm trong “%s” nếu được mã hóa là %s" -#: convert.c:291 +#: convert.c:280 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " @@ -3044,12 +3064,12 @@ msgstr "" "Tập tin “%s” có chứa ký hiệu thứ tự byte (BOM). Vui lòng dùng UTF-%.*s như " "là bảng mã cây làm việc." -#: convert.c:304 +#: convert.c:293 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "BOM là bắt buộc trong “%s” nếu được mã hóa là %s" -#: convert.c:306 +#: convert.c:295 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -3058,50 +3078,50 @@ msgstr "" "Tập tin “%s” còn thiếu ký hiệu thứ tự byte (BOM). Vui lòng dùng UTF-%sBE hay " "UTF-%sLE (còn phục thuộc vào thứ tự byte) như là bảng mã cây làm việc." -#: convert.c:419 convert.c:490 +#: convert.c:408 convert.c:479 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "gặp lỗi khi mã hóa “%s” từ “%s” sang “%s”" -#: convert.c:462 +#: convert.c:451 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "mã hóa “%s” từ %s thành %s và ngược trở lại không phải là cùng" -#: convert.c:665 +#: convert.c:654 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "không thể rẽ nhánh tiến trình để chạy bộ lọc bên ngoài “%s”" -#: convert.c:685 +#: convert.c:674 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "không thể cấp đầu vào cho bộ lọc bên ngoài “%s”" -#: convert.c:692 +#: convert.c:681 #, c-format msgid "external filter '%s' failed %d" msgstr "chạy bộ lọc bên ngoài “%s” gặp lỗi %d" -#: convert.c:727 convert.c:730 +#: convert.c:716 convert.c:719 #, c-format msgid "read from external filter '%s' failed" msgstr "đọc từ bộ lọc bên ngoài “%s” gặp lỗi" -#: convert.c:733 convert.c:788 +#: convert.c:722 convert.c:777 #, c-format msgid "external filter '%s' failed" msgstr "gặp lỗi khi chạy bộ lọc bên ngoài “%s”" -#: convert.c:837 +#: convert.c:826 msgid "unexpected filter type" msgstr "gặp kiểu bộ lọc thừa" -#: convert.c:848 +#: convert.c:837 msgid "path name too long for external filter" msgstr "tên đường dẫn quá dài cho bộ lọc bên ngoài" -#: convert.c:940 +#: convert.c:934 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3110,16 +3130,16 @@ msgstr "" "bộ lọc bên ngoài “%s” không sẵn sàng nữa mặc dù không phải tất cả các đường " "dẫn đã được lọc" -#: convert.c:1240 +#: convert.c:1234 msgid "true/false are no valid working-tree-encodings" msgstr "true/false là không phải bảng-mã-cây-làm-việc hợp lệ" -#: convert.c:1428 convert.c:1462 +#: convert.c:1414 convert.c:1447 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: gặp lỗi khi xóa bộ lọc “%s”" -#: convert.c:1508 +#: convert.c:1490 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: smudge bộ lọc %s gặp lỗi" @@ -3236,28 +3256,28 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "Đã đánh dấu %d island, xong.\n" -#: diff-merges.c:70 +#: diff-merges.c:80 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "không hiểu giá trị cho --diff-merges: %s" -#: diff-lib.c:534 +#: diff-lib.c:538 msgid "--merge-base does not work with ranges" msgstr "--merge-base không hoạt động với phạm vi" -#: diff-lib.c:536 +#: diff-lib.c:540 msgid "--merge-base only works with commits" msgstr "--merge-base chỉ hoạt động với các lần chuyển giao" -#: diff-lib.c:553 +#: diff-lib.c:557 msgid "unable to get HEAD" msgstr "không thể lấy HEAD" -#: diff-lib.c:560 +#: diff-lib.c:564 msgid "no merge base found" msgstr "không tìm thấy cơ sở để hòa trộn" -#: diff-lib.c:562 +#: diff-lib.c:566 msgid "multiple merge bases found" msgstr "có nhiều cơ sở để hòa trộn" @@ -3323,35 +3343,35 @@ msgstr "" "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n" "%s" -#: diff.c:4276 +#: diff.c:4278 #, c-format msgid "external diff died, stopping at %s" msgstr "phần mềm diff ở bên ngoài đã chết, dừng tại %s" -#: diff.c:4628 +#: diff.c:4630 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check và -s loại từ lẫn nhau" -#: diff.c:4631 +#: diff.c:4633 msgid "-G, -S and --find-object are mutually exclusive" msgstr "Các tùy chọn -G, -S, và --find-object loại từ lẫn nhau" -#: diff.c:4710 +#: diff.c:4712 msgid "--follow requires exactly one pathspec" msgstr "--follow cần chính xác một đặc tả đường dẫn" -#: diff.c:4758 +#: diff.c:4760 #, c-format msgid "invalid --stat value: %s" msgstr "giá trị --stat không hợp lệ: “%s”" -#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306 +#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "tùy chọn “%s” cần một giá trị bằng số" -#: diff.c:4795 +#: diff.c:4797 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3360,42 +3380,42 @@ msgstr "" "Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n" "%s" -#: diff.c:4880 +#: diff.c:4882 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "không hiểu lớp thay đổi “%c” trong --diff-filter=%s" -#: diff.c:4904 +#: diff.c:4906 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "không hiểu giá trị sau ws-error-highlight=%.*s" -#: diff.c:4918 +#: diff.c:4920 #, c-format msgid "unable to resolve '%s'" msgstr "không thể phân giải “%s”" -#: diff.c:4968 diff.c:4974 +#: diff.c:4970 diff.c:4976 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s cần dạng <n>/<m>" -#: diff.c:4986 +#: diff.c:4988 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s cần một ký tự, nhưng lại nhận được “%s”" -#: diff.c:5007 +#: diff.c:5009 #, c-format msgid "bad --color-moved argument: %s" msgstr "đối số --color-moved sai: %s" -#: diff.c:5026 +#: diff.c:5028 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "chế độ “%s” không hợp lệ trong --color-moved-ws" -#: diff.c:5066 +#: diff.c:5068 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3403,155 +3423,155 @@ msgstr "" "tùy chọn diff-algorithm chấp nhận \"myers\", \"minimal\", \"patience\" và " "\"histogram\"" -#: diff.c:5102 diff.c:5122 +#: diff.c:5104 diff.c:5124 #, c-format msgid "invalid argument to %s" msgstr "tham số cho %s không hợp lệ" -#: diff.c:5226 +#: diff.c:5228 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "đưa cho -I biểu thức chính quy không hợp lệ: “%s”" -#: diff.c:5275 +#: diff.c:5277 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "gặp lỗi khi phân tích đối số tùy chọn --submodule: “%s”" -#: diff.c:5331 +#: diff.c:5333 #, c-format msgid "bad --word-diff argument: %s" msgstr "đối số --word-diff sai: %s" -#: diff.c:5367 +#: diff.c:5369 msgid "Diff output format options" msgstr "Các tùy chọn định dạng khi xuất các khác biệt" -#: diff.c:5369 diff.c:5375 +#: diff.c:5371 diff.c:5377 msgid "generate patch" msgstr "tạo miếng vá" -#: diff.c:5372 builtin/log.c:179 +#: diff.c:5374 builtin/log.c:179 msgid "suppress diff output" msgstr "chặn mọi kết xuất từ diff" -#: diff.c:5377 diff.c:5491 diff.c:5498 +#: diff.c:5379 diff.c:5493 diff.c:5500 msgid "<n>" msgstr "<n>" -#: diff.c:5378 diff.c:5381 +#: diff.c:5380 diff.c:5383 msgid "generate diffs with <n> lines context" msgstr "tạo khác biệt với <n> dòng ngữ cảnh" -#: diff.c:5383 +#: diff.c:5385 msgid "generate the diff in raw format" msgstr "tạo khác biệt ở định dạng thô" -#: diff.c:5386 +#: diff.c:5388 msgid "synonym for '-p --raw'" msgstr "đồng nghĩa với “-p --raw”" -#: diff.c:5390 +#: diff.c:5392 msgid "synonym for '-p --stat'" msgstr "đồng nghĩa với “-p --stat”" -#: diff.c:5394 +#: diff.c:5396 msgid "machine friendly --stat" msgstr "--stat thuận tiện cho máy đọc" -#: diff.c:5397 +#: diff.c:5399 msgid "output only the last line of --stat" msgstr "chỉ xuất những dòng cuối của --stat" -#: diff.c:5399 diff.c:5407 +#: diff.c:5401 diff.c:5409 msgid "<param1,param2>..." msgstr "<tham_số_1,tham_số_2>…" -#: diff.c:5400 +#: diff.c:5402 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "đầu ra phân phối của số lượng thay đổi tương đối cho mỗi thư mục con" -#: diff.c:5404 +#: diff.c:5406 msgid "synonym for --dirstat=cumulative" msgstr "đồng nghĩa với --dirstat=cumulative" -#: diff.c:5408 +#: diff.c:5410 msgid "synonym for --dirstat=files,param1,param2..." msgstr "đồng nghĩa với --dirstat=files,param1,param2…" -#: diff.c:5412 +#: diff.c:5414 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "cảnh báo nếu các thay đổi đưa ra các bộ tạo xung đột hay lỗi khoảng trắng" -#: diff.c:5415 +#: diff.c:5417 msgid "condensed summary such as creations, renames and mode changes" msgstr "tổng hợp dạng xúc tích như là tạo, đổi tên và các thay đổi chế độ" -#: diff.c:5418 +#: diff.c:5420 msgid "show only names of changed files" msgstr "chỉ hiển thị tên của các tập tin đổi" -#: diff.c:5421 +#: diff.c:5423 msgid "show only names and status of changed files" msgstr "chỉ hiển thị tên tập tin và tình trạng của các tập tin bị thay đổi" -#: diff.c:5423 +#: diff.c:5425 msgid "<width>[,<name-width>[,<count>]]" msgstr "<rộng>[,<name-width>[,<số-lượng>]]" -#: diff.c:5424 +#: diff.c:5426 msgid "generate diffstat" msgstr "tạo diffstat" -#: diff.c:5426 diff.c:5429 diff.c:5432 +#: diff.c:5428 diff.c:5431 diff.c:5434 msgid "<width>" msgstr "<rộng>" -#: diff.c:5427 +#: diff.c:5429 msgid "generate diffstat with a given width" msgstr "tạo diffstat với độ rộng đã cho" -#: diff.c:5430 +#: diff.c:5432 msgid "generate diffstat with a given name width" msgstr "tạo diffstat với tên độ rộng đã cho" -#: diff.c:5433 +#: diff.c:5435 msgid "generate diffstat with a given graph width" msgstr "tạo diffstat với độ rộng đồ thị đã cho" -#: diff.c:5435 +#: diff.c:5437 msgid "<count>" msgstr "<số_lượng>" -#: diff.c:5436 +#: diff.c:5438 msgid "generate diffstat with limited lines" msgstr "tạo diffstat với các dòng bị giới hạn" -#: diff.c:5439 +#: diff.c:5441 msgid "generate compact summary in diffstat" msgstr "tạo tổng hợp xúc tích trong diffstat" -#: diff.c:5442 +#: diff.c:5444 msgid "output a binary diff that can be applied" msgstr "xuất ra một khác biệt dạng nhị phân cái mà có thể được áp dụng" -#: diff.c:5445 +#: diff.c:5447 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "hiển thị đầy đủ các tên đối tượng pre- và post-image trên các dòng \"mục lục" "\"" -#: diff.c:5447 +#: diff.c:5449 msgid "show colored diff" msgstr "hiển thị thay đổi được tô màu" -#: diff.c:5448 +#: diff.c:5450 msgid "<kind>" msgstr "<kiểu>" -#: diff.c:5449 +#: diff.c:5451 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3559,7 +3579,7 @@ msgstr "" "tô sáng các lỗi về khoảng trắng trong các dòng “context”, “old” và “new” " "trong khác biệt" -#: diff.c:5452 +#: diff.c:5454 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3567,89 +3587,89 @@ msgstr "" "không munge tên đường dẫn và sử dụng NUL làm bộ phân tách trường đầu ra " "trong --raw hay --numstat" -#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570 +#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572 msgid "<prefix>" msgstr "<tiền_tố>" -#: diff.c:5456 +#: diff.c:5458 msgid "show the given source prefix instead of \"a/\"" msgstr "hiển thị tiền tố nguồn đã cho thay cho \"a/\"" -#: diff.c:5459 +#: diff.c:5461 msgid "show the given destination prefix instead of \"b/\"" msgstr "hiển thị tiền tố đích đã cho thay cho \"b/\"" -#: diff.c:5462 +#: diff.c:5464 msgid "prepend an additional prefix to every line of output" msgstr "treo vào trước một tiền tố bổ sung cho mỗi dòng kết xuất" -#: diff.c:5465 +#: diff.c:5467 msgid "do not show any source or destination prefix" msgstr "đừng hiển thị bất kỳ tiền tố nguồn hay đích" -#: diff.c:5468 +#: diff.c:5470 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "hiển thị ngữ cảnh giữa các khúc khác biệt khi đạt đến số lượng dòng đã chỉ " "định" -#: diff.c:5472 diff.c:5477 diff.c:5482 +#: diff.c:5474 diff.c:5479 diff.c:5484 msgid "<char>" msgstr "<ký_tự>" -#: diff.c:5473 +#: diff.c:5475 msgid "specify the character to indicate a new line instead of '+'" msgstr "chỉ định một ký tự để biểu thị một dòng được thêm mới thay cho “+”" -#: diff.c:5478 +#: diff.c:5480 msgid "specify the character to indicate an old line instead of '-'" msgstr "chỉ định một ký tự để biểu thị một dòng đã cũ thay cho “-”" -#: diff.c:5483 +#: diff.c:5485 msgid "specify the character to indicate a context instead of ' '" msgstr "chỉ định một ký tự để biểu thị một ngữ cảnh thay cho “”" -#: diff.c:5486 +#: diff.c:5488 msgid "Diff rename options" msgstr "Tùy chọn khác biệt đổi tên" -#: diff.c:5487 +#: diff.c:5489 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5488 +#: diff.c:5490 msgid "break complete rewrite changes into pairs of delete and create" msgstr "ngắt các thay đổi ghi lại hoàn thiện thành cặp của xóa và tạo" -#: diff.c:5492 +#: diff.c:5494 msgid "detect renames" msgstr "dò tìm các tên thay đổi" -#: diff.c:5496 +#: diff.c:5498 msgid "omit the preimage for deletes" msgstr "bỏ qua preimage (tiền ảnh??) cho các việc xóa" -#: diff.c:5499 +#: diff.c:5501 msgid "detect copies" msgstr "dò bản sao" -#: diff.c:5503 +#: diff.c:5505 msgid "use unmodified files as source to find copies" msgstr "dùng các tập tin không bị chỉnh sửa như là nguồn để tìm các bản sao" -#: diff.c:5505 +#: diff.c:5507 msgid "disable rename detection" msgstr "tắt dò tìm đổi tên" -#: diff.c:5508 +#: diff.c:5510 msgid "use empty blobs as rename source" msgstr "dùng các blob trống rống như là nguồn đổi tên" -#: diff.c:5510 +#: diff.c:5512 msgid "continue listing the history of a file beyond renames" msgstr "tiếp tục liệt kê lịch sử của một tập tin ngoài đổi tên" -#: diff.c:5513 +#: diff.c:5515 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3657,160 +3677,160 @@ msgstr "" "ngăn cản dò tìm đổi tên/bản sao nếu số lượng của đích đổi tên/bản sao vượt " "quá giới hạn đưa ra" -#: diff.c:5515 +#: diff.c:5517 msgid "Diff algorithm options" msgstr "Tùy chọn thuật toán khác biệt" -#: diff.c:5517 +#: diff.c:5519 msgid "produce the smallest possible diff" msgstr "sản sinh khác biệt ít nhất có thể" -#: diff.c:5520 +#: diff.c:5522 msgid "ignore whitespace when comparing lines" msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi so sánh các dòng" -#: diff.c:5523 +#: diff.c:5525 msgid "ignore changes in amount of whitespace" msgstr "lờ đi sự thay đổi do số lượng khoảng trắng gây ra" -#: diff.c:5526 +#: diff.c:5528 msgid "ignore changes in whitespace at EOL" msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi ở cuối dòng EOL" -#: diff.c:5529 +#: diff.c:5531 msgid "ignore carrier-return at the end of line" msgstr "bỏ qua ký tự về đầu dòng tại cuối dòng" -#: diff.c:5532 +#: diff.c:5534 msgid "ignore changes whose lines are all blank" msgstr "bỏ qua các thay đổi cho toàn bộ các dòng là trống" -#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604 +#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606 msgid "<regex>" msgstr "<regex>" -#: diff.c:5535 +#: diff.c:5537 msgid "ignore changes whose all lines match <regex>" msgstr "bỏ qua các thay đổi có tất cả các dòng khớp <regex>" -#: diff.c:5538 +#: diff.c:5540 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "heuristic để dịch hạn biên của khối khác biệt cho dễ đọc" -#: diff.c:5541 +#: diff.c:5543 msgid "generate diff using the \"patience diff\" algorithm" msgstr "tạo khác biệt sử dung thuật toán \"patience diff\"" -#: diff.c:5545 +#: diff.c:5547 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "tạo khác biệt sử dung thuật toán \"histogram diff\"" -#: diff.c:5547 +#: diff.c:5549 msgid "<algorithm>" msgstr "<thuật toán>" -#: diff.c:5548 +#: diff.c:5550 msgid "choose a diff algorithm" msgstr "chọn một thuật toán khác biệt" -#: diff.c:5550 +#: diff.c:5552 msgid "<text>" msgstr "<văn bản>" -#: diff.c:5551 +#: diff.c:5553 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "tạo khác biệt sử dung thuật toán \"anchored diff\"" -#: diff.c:5553 diff.c:5562 diff.c:5565 +#: diff.c:5555 diff.c:5564 diff.c:5567 msgid "<mode>" msgstr "<chế độ>" -#: diff.c:5554 +#: diff.c:5556 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "hiển thị khác biệt từ, sử dụng <chế độ> để bỏ giới hạn các từ bị thay đổi" -#: diff.c:5557 +#: diff.c:5559 msgid "use <regex> to decide what a word is" msgstr "dùng <regex> để quyết định từ là cái gì" -#: diff.c:5560 +#: diff.c:5562 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "tương đương với --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5563 +#: diff.c:5565 msgid "moved lines of code are colored differently" msgstr "các dòng di chuyển của mã mà được tô màu khác nhau" -#: diff.c:5566 +#: diff.c:5568 msgid "how white spaces are ignored in --color-moved" msgstr "cách bỏ qua khoảng trắng trong --color-moved" -#: diff.c:5569 +#: diff.c:5571 msgid "Other diff options" msgstr "Các tùy chọn khác biệt khác" -#: diff.c:5571 +#: diff.c:5573 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "khi chạy từ thư mục con, thực thi các thay đổi bên ngoài và hiển thị các " "đường dẫn liên quan" -#: diff.c:5575 +#: diff.c:5577 msgid "treat all files as text" msgstr "coi mọi tập tin là dạng văn bản thường" -#: diff.c:5577 +#: diff.c:5579 msgid "swap two inputs, reverse the diff" msgstr "tráo đổi hai đầu vào, đảo ngược khác biệt" -#: diff.c:5579 +#: diff.c:5581 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "thoát với mã 1 nếu không có khác biệt gì, 0 nếu ngược lại" -#: diff.c:5581 +#: diff.c:5583 msgid "disable all output of the program" msgstr "tắt mọi kết xuất của chương trình" -#: diff.c:5583 +#: diff.c:5585 msgid "allow an external diff helper to be executed" msgstr "cho phép mộ bộ hỗ trợ xuất khác biệt ở bên ngoài được phép thực thi" -#: diff.c:5585 +#: diff.c:5587 msgid "run external text conversion filters when comparing binary files" msgstr "" "chạy các bộ lọc văn bản thông thường bên ngoài khi so sánh các tập tin nhị " "phân" -#: diff.c:5587 +#: diff.c:5589 msgid "<when>" msgstr "<khi>" -#: diff.c:5588 +#: diff.c:5590 msgid "ignore changes to submodules in the diff generation" msgstr "bỏ qua các thay đổi trong mô-đun-con trong khi tạo khác biệt" -#: diff.c:5591 +#: diff.c:5593 msgid "<format>" msgstr "<định dạng>" -#: diff.c:5592 +#: diff.c:5594 msgid "specify how differences in submodules are shown" msgstr "chi định khác biệt bao nhiêu trong các mô đun con được hiển thị" -#: diff.c:5596 +#: diff.c:5598 msgid "hide 'git add -N' entries from the index" msgstr "ẩn các mục “git add -N” từ bảng mục lục" -#: diff.c:5599 +#: diff.c:5601 msgid "treat 'git add -N' entries as real in the index" msgstr "coi các mục “git add -N” như là có thật trong bảng mục lục" -#: diff.c:5601 +#: diff.c:5603 msgid "<string>" msgstr "<chuỗi>" -#: diff.c:5602 +#: diff.c:5604 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3818,7 +3838,7 @@ msgstr "" "tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của " "chuỗi được chỉ ra" -#: diff.c:5605 +#: diff.c:5607 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3826,35 +3846,35 @@ msgstr "" "tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của biểu " "thức chính quy được chỉ ra" -#: diff.c:5608 +#: diff.c:5610 msgid "show all changes in the changeset with -S or -G" msgstr "hiển thị tất cả các thay đổi trong một bộ các thay đổi với -S hay -G" -#: diff.c:5611 +#: diff.c:5613 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "coi <chuỗi> trong -S như là biểu thức chính qui POSIX có mở rộng" -#: diff.c:5614 +#: diff.c:5616 msgid "control the order in which files appear in the output" msgstr "điều khiển thứ tự xuát hiện các tập tin trong kết xuất" -#: diff.c:5615 diff.c:5618 +#: diff.c:5617 diff.c:5620 msgid "<path>" msgstr "<đường-dẫn>" -#: diff.c:5616 +#: diff.c:5618 msgid "show the change in the specified path first" msgstr "hiển thị các thay đổi trong đường dẫn đã cho đầu tiên" -#: diff.c:5619 +#: diff.c:5621 msgid "skip the output to the specified path" msgstr "bỏ qua đầu ra đến đường dẫn đã cho" -#: diff.c:5621 +#: diff.c:5623 msgid "<object-id>" msgstr "<mã-số-đối-tượng>" -#: diff.c:5622 +#: diff.c:5624 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3862,33 +3882,33 @@ msgstr "" "tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của đối " "tượng được chỉ ra" -#: diff.c:5624 +#: diff.c:5626 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]" -#: diff.c:5625 +#: diff.c:5627 msgid "select files by diff type" msgstr "chọn các tập tin theo kiểu khác biệt" -#: diff.c:5627 +#: diff.c:5629 msgid "<file>" msgstr "<tập_tin>" -#: diff.c:5628 +#: diff.c:5630 msgid "Output to a specific file" msgstr "Xuất ra một tập tin cụ thể" -#: diff.c:6285 +#: diff.c:6287 msgid "inexact rename detection was skipped due to too many files." msgstr "" "nhận thấy đổi tên không chính xác đã bị bỏ qua bởi có quá nhiều tập tin." -#: diff.c:6288 +#: diff.c:6290 msgid "only found copies from modified paths due to too many files." msgstr "" "chỉ tìm thấy các bản sao từ đường dẫn đã sửa đổi bởi vì có quá nhiều tập tin." -#: diff.c:6291 +#: diff.c:6293 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3901,7 +3921,7 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”" -#: diffcore-rename.c:786 +#: diffcore-rename.c:1418 msgid "Performing inexact rename detection" msgstr "Đang thực hiện dò tìm đổi tên không chính xác" @@ -3934,35 +3954,35 @@ msgstr "tập tin sparse-checkout của bạn có lẽ gặp lỗi: mẫu “%s msgid "disabling cone pattern matching" msgstr "vô hiệu khớp mẫu nón" -#: dir.c:1198 +#: dir.c:1206 #, c-format msgid "cannot use %s as an exclude file" msgstr "không thể dùng %s như là một tập tin loại trừ" -#: dir.c:2305 +#: dir.c:2314 #, c-format msgid "could not open directory '%s'" msgstr "không thể mở thư mục “%s”" -#: dir.c:2605 +#: dir.c:2614 msgid "failed to get kernel name and information" msgstr "gặp lỗi khi lấy tên và thông tin của nhân" -#: dir.c:2729 +#: dir.c:2738 msgid "untracked cache is disabled on this system or location" msgstr "bộ nhớ tạm không theo vết bị tắt trên hệ thống hay vị trí này" -#: dir.c:3534 +#: dir.c:3543 #, c-format msgid "index file corrupt in repo %s" msgstr "tập tin ghi bảng mục lục bị hỏng trong kho %s" -#: dir.c:3579 dir.c:3584 +#: dir.c:3590 dir.c:3595 #, c-format msgid "could not create directories for %s" msgstr "không thể tạo thư mục cho %s" -#: dir.c:3613 +#: dir.c:3624 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "không thể di dời thư mục git từ “%s” sang “%s”" @@ -3972,11 +3992,11 @@ msgstr "không thể di dời thư mục git từ “%s” sang “%s”" msgid "hint: Waiting for your editor to close the file...%c" msgstr "gợi ý: Chờ trình biên soạn của bạn đóng tập tin…%c" -#: entry.c:177 +#: entry.c:179 msgid "Filtering content" msgstr "Nội dung lọc" -#: entry.c:478 +#: entry.c:500 #, c-format msgid "could not stat file '%s'" msgstr "không thể lấy thống kê tập tin “%s”" @@ -3996,249 +4016,257 @@ msgstr "không thể đặt GIT_DIR thành “%s”" msgid "too many args to run %s" msgstr "quá nhiều tham số để chạy %s" -#: fetch-pack.c:177 +#: fetch-pack.c:182 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: cần danh sách shallow" -#: fetch-pack.c:180 +#: fetch-pack.c:185 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: cần một gói đẩy sau danh sách shallow" -#: fetch-pack.c:191 +#: fetch-pack.c:196 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được một gói flush" -#: fetch-pack.c:211 +#: fetch-pack.c:216 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được “%s”" -#: fetch-pack.c:222 +#: fetch-pack.c:227 msgid "unable to write to remote" msgstr "không thể ghi lên máy phục vụ" -#: fetch-pack.c:283 +#: fetch-pack.c:288 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc cần multi_ack_detailed" -#: fetch-pack.c:378 fetch-pack.c:1457 +#: fetch-pack.c:383 fetch-pack.c:1423 #, c-format msgid "invalid shallow line: %s" msgstr "dòng shallow không hợp lệ: %s" -#: fetch-pack.c:384 fetch-pack.c:1463 +#: fetch-pack.c:389 fetch-pack.c:1429 #, c-format msgid "invalid unshallow line: %s" msgstr "dòng unshallow không hợp lệ: %s" -#: fetch-pack.c:386 fetch-pack.c:1465 +#: fetch-pack.c:391 fetch-pack.c:1431 #, c-format msgid "object not found: %s" msgstr "không tìm thấy đối tượng: %s" -#: fetch-pack.c:389 fetch-pack.c:1468 +#: fetch-pack.c:394 fetch-pack.c:1434 #, c-format msgid "error in object: %s" msgstr "lỗi trong đối tượng: %s" -#: fetch-pack.c:391 fetch-pack.c:1470 +#: fetch-pack.c:396 fetch-pack.c:1436 #, c-format msgid "no shallow found: %s" msgstr "không tìm shallow nào: %s" -#: fetch-pack.c:394 fetch-pack.c:1474 +#: fetch-pack.c:399 fetch-pack.c:1440 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "cần shallow/unshallow, nhưng lại nhận được %s" -#: fetch-pack.c:434 +#: fetch-pack.c:439 #, c-format msgid "got %s %d %s" msgstr "nhận %s %d - %s" -#: fetch-pack.c:451 +#: fetch-pack.c:456 #, c-format msgid "invalid commit %s" msgstr "lần chuyển giao %s không hợp lệ" -#: fetch-pack.c:482 +#: fetch-pack.c:487 msgid "giving up" msgstr "chịu thua" -#: fetch-pack.c:495 progress.c:339 +#: fetch-pack.c:500 progress.c:339 msgid "done" msgstr "xong" -#: fetch-pack.c:507 +#: fetch-pack.c:512 #, c-format msgid "got %s (%d) %s" msgstr "nhận %s (%d) %s" -#: fetch-pack.c:543 +#: fetch-pack.c:548 #, c-format msgid "Marking %s as complete" msgstr "Đánh dấu %s là đã hoàn thành" -#: fetch-pack.c:758 +#: fetch-pack.c:763 #, c-format msgid "already have %s (%s)" msgstr "đã sẵn có %s (%s)" -#: fetch-pack.c:844 +#: fetch-pack.c:849 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: không thể rẽ nhánh sideband demultiplexer" -#: fetch-pack.c:852 +#: fetch-pack.c:857 msgid "protocol error: bad pack header" msgstr "lỗi giao thức: phần đầu gói bị sai" -#: fetch-pack.c:946 +#: fetch-pack.c:951 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: không thể rẽ nhánh %s" -#: fetch-pack.c:952 +#: fetch-pack.c:957 msgid "fetch-pack: invalid index-pack output" msgstr "fetch-pack: kết xuất index-pack không hợp lệ" -#: fetch-pack.c:969 +#: fetch-pack.c:974 #, c-format msgid "%s failed" msgstr "%s gặp lỗi" -#: fetch-pack.c:971 +#: fetch-pack.c:976 msgid "error in sideband demultiplexer" msgstr "có lỗi trong sideband demultiplexer" -#: fetch-pack.c:1031 +#: fetch-pack.c:1019 #, c-format msgid "Server version is %.*s" msgstr "Phiên bản máy chủ là %.*s" -#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054 -#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 -#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 -#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108 +#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042 +#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 +#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096 #, c-format msgid "Server supports %s" msgstr "Máy chủ hỗ trợ %s" -#: fetch-pack.c:1041 +#: fetch-pack.c:1029 msgid "Server does not support shallow clients" msgstr "Máy chủ không hỗ trợ máy khách shallow" -#: fetch-pack.c:1101 +#: fetch-pack.c:1089 msgid "Server does not support --shallow-since" msgstr "Máy chủ không hỗ trợ --shallow-since" -#: fetch-pack.c:1106 +#: fetch-pack.c:1094 msgid "Server does not support --shallow-exclude" msgstr "Máy chủ không hỗ trợ --shallow-exclude" -#: fetch-pack.c:1110 +#: fetch-pack.c:1098 msgid "Server does not support --deepen" msgstr "Máy chủ không hỗ trợ --deepen" -#: fetch-pack.c:1112 +#: fetch-pack.c:1100 msgid "Server does not support this repository's object format" msgstr "Máy chủ không hỗ trợ định dạng đối tượng của kho này" -#: fetch-pack.c:1125 +#: fetch-pack.c:1113 msgid "no common commits" msgstr "không có lần chuyển giao chung nào" -#: fetch-pack.c:1138 fetch-pack.c:1682 +#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238 +msgid "source repository is shallow, reject to clone." +msgstr "kho nguồn là nông, nên bỏ từ chối nhân bản." + +#: fetch-pack.c:1128 fetch-pack.c:1651 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: fetch gặp lỗi." -#: fetch-pack.c:1265 +#: fetch-pack.c:1242 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "các thuật toán không khớp nhau: máy khách %s; máy chủ %s" -#: fetch-pack.c:1269 +#: fetch-pack.c:1246 #, c-format msgid "the server does not support algorithm '%s'" msgstr "máy chủ không hỗ trợ thuật toán “%s”" -#: fetch-pack.c:1289 +#: fetch-pack.c:1279 msgid "Server does not support shallow requests" msgstr "Máy chủ không hỗ trợ yêu cầu shallow" -#: fetch-pack.c:1296 +#: fetch-pack.c:1286 msgid "Server supports filter" msgstr "Máy chủ hỗ trợ bộ lọc" -#: fetch-pack.c:1335 +#: fetch-pack.c:1329 fetch-pack.c:2034 msgid "unable to write request to remote" msgstr "không thể ghi các yêu cầu lên máy phục vụ" -#: fetch-pack.c:1353 +#: fetch-pack.c:1347 #, c-format msgid "error reading section header '%s'" msgstr "gặp lỗi khi đọc phần đầu của đoạn %s" -#: fetch-pack.c:1359 +#: fetch-pack.c:1353 #, c-format msgid "expected '%s', received '%s'" msgstr "cần “%s”, nhưng lại nhận “%s”" -#: fetch-pack.c:1420 +#: fetch-pack.c:1387 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "gặp dòng không được thừa nhận: “%s”" -#: fetch-pack.c:1425 +#: fetch-pack.c:1392 #, c-format msgid "error processing acks: %d" msgstr "gặp lỗi khi xử lý tín hiệu trả lời: %d" -#: fetch-pack.c:1435 +#: fetch-pack.c:1402 msgid "expected packfile to be sent after 'ready'" msgstr "cần tập tin gói để gửi sau “ready”" -#: fetch-pack.c:1437 +#: fetch-pack.c:1404 msgid "expected no other sections to be sent after no 'ready'" msgstr "không cần thêm phần nào để gửi sau “ready”" -#: fetch-pack.c:1479 +#: fetch-pack.c:1445 #, c-format msgid "error processing shallow info: %d" msgstr "lỗi xử lý thông tin shallow: %d" -#: fetch-pack.c:1526 +#: fetch-pack.c:1494 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "cần wanted-ref, nhưng lại nhận được “%s”" -#: fetch-pack.c:1531 +#: fetch-pack.c:1499 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref không được mong đợi: “%s”" -#: fetch-pack.c:1536 +#: fetch-pack.c:1504 #, c-format msgid "error processing wanted refs: %d" msgstr "lỗi khi xử lý wanted refs: %d" -#: fetch-pack.c:1566 +#: fetch-pack.c:1534 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: cần nhận được trả lời là kết thúc gói" -#: fetch-pack.c:1960 +#: fetch-pack.c:1930 msgid "no matching remote head" msgstr "không khớp phần đầu máy chủ" -#: fetch-pack.c:1983 builtin/clone.c:693 +#: fetch-pack.c:1953 builtin/clone.c:697 msgid "remote did not send all necessary objects" msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết" -#: fetch-pack.c:2010 +#: fetch-pack.c:2056 +msgid "unexpected 'ready' from remote" +msgstr "gặp 'ready' đột xuất từ máy chủ" + +#: fetch-pack.c:2079 #, c-format msgid "no such remote ref %s" msgstr "không có máy chủ tham chiếu nào như %s" -#: fetch-pack.c:2013 +#: fetch-pack.c:2082 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" @@ -4262,7 +4290,7 @@ msgstr "gpg gặp lỗi khi ký dữ liệu" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "bỏ qua màu không hợp lệ “%.*s” trong log.graphColors" -#: grep.c:543 +#: grep.c:531 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4270,18 +4298,18 @@ msgstr "" "mẫu đã cho có chứa NULL byte (qua -f <file>). Điều này chỉ được hỗ trợ với -" "P dưới PCRE v2" -#: grep.c:1906 +#: grep.c:1893 #, c-format msgid "'%s': unable to read %s" msgstr "“%s”: không thể đọc %s" -#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90 -#: builtin/rm.c:135 +#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "gặp lỗi khi lấy thống kê về “%s”" -#: grep.c:1934 +#: grep.c:1921 #, c-format msgid "'%s': short read" msgstr "“%s”: đọc ngắn" @@ -4498,47 +4526,52 @@ msgstr "không cho phép tên định danh là rỗng (cho <%s>)" msgid "name consists only of disallowed characters: %s" msgstr "tên chỉ được phép bao gồm các ký tự sau: %s" -#: ident.c:454 builtin/commit.c:634 +#: ident.c:454 builtin/commit.c:647 #, c-format msgid "invalid date format: %s" msgstr "ngày tháng không hợp lệ: %s" -#: list-objects-filter-options.c:81 +#: list-objects-filter-options.c:83 msgid "expected 'tree:<depth>'" msgstr "cần “tree:<depth>”" -#: list-objects-filter-options.c:96 +#: list-objects-filter-options.c:98 msgid "sparse:path filters support has been dropped" msgstr "việc hỗ trợ bộ lọc sparse:đường/dẫn đã bị bỏ" -#: list-objects-filter-options.c:109 +#: list-objects-filter-options.c:105 +#, c-format +msgid "'%s' for 'object:type=<type>' isnot a valid object type" +msgstr "“%s” dành cho “object:type=<type>” không phải là kiểu đối tượng hợp lệ" + +#: list-objects-filter-options.c:124 #, c-format msgid "invalid filter-spec '%s'" msgstr "đặc tả bộ lọc không hợp lệ “%s”" -#: list-objects-filter-options.c:125 +#: list-objects-filter-options.c:140 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "phải thoát char trong sub-filter-spec: “%c”" -#: list-objects-filter-options.c:167 +#: list-objects-filter-options.c:182 msgid "expected something after combine:" msgstr "mong đợi một cái gì đó sau khi kết hợp:" -#: list-objects-filter-options.c:249 +#: list-objects-filter-options.c:264 msgid "multiple filter-specs cannot be combined" msgstr "không thể tổ hợp nhiều đặc tả kiểu lọc" -#: list-objects-filter-options.c:361 +#: list-objects-filter-options.c:376 msgid "unable to upgrade repository format to support partial clone" msgstr "không thể nâng cấp định định dạng kho chứa để hỗ trợ nhân bản cục bộ" -#: list-objects-filter.c:492 +#: list-objects-filter.c:532 #, c-format msgid "unable to access sparse blob in '%s'" msgstr "không thể truy cập các blob rải rác trong “%s”" -#: list-objects-filter.c:495 +#: list-objects-filter.c:535 #, c-format msgid "unable to parse sparse filter data in %s" msgstr "không thể phân tích dữ liệu bộ lọc rải rác trong %s" @@ -4553,7 +4586,7 @@ msgstr "mục “%s” trong cây %s có nút cây, nhưng không phải là m msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "mục “%s” trong cây %s có nút blob, nhưng không phải là một blob" -#: list-objects.c:375 +#: list-objects.c:395 #, c-format msgid "unable to load root tree for commit %s" msgstr "không thể tải cây gốc cho lần chuyển giao “%s”" @@ -4591,34 +4624,43 @@ msgstr "giá trị '%s' không hợp lệ cho lsrefs.unborn" msgid "expected flush after ls-refs arguments" msgstr "cần đẩy dữ liệu lên đĩa sau tham số ls-refs (liệt kê tham chiếu)" -#: merge-ort.c:888 merge-recursive.c:1191 +#: mailinfo.c:1050 +msgid "quoted CRLF detected" +msgstr "phát hiện CRLF được trích dẫn" + +#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46 +#, c-format +msgid "bad action '%s' for '%s'" +msgstr "thao tác sai “%s” cho “%s”" + +#: merge-ort.c:1116 merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không lấy ra được)" -#: merge-ort.c:897 merge-recursive.c:1198 +#: merge-ort.c:1125 merge-recursive.c:1212 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (lần chuyển giao không hiện diện)" -#: merge-ort.c:906 merge-recursive.c:1205 +#: merge-ort.c:1134 merge-recursive.c:1219 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Gặp lỗi khi hòa trộn mô-đun-con “%s” (lần chuyển giao không theo sau nền-hòa-" "trộn)" -#: merge-ort.c:916 merge-ort.c:923 +#: merge-ort.c:1144 merge-ort.c:1151 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "Chú ý: Chuyển-tiếp-nhanh mô-đun-con “%s” sang “%s”" -#: merge-ort.c:944 +#: merge-ort.c:1172 #, c-format msgid "Failed to merge submodule %s" msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s”" -#: merge-ort.c:951 +#: merge-ort.c:1179 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4627,7 +4669,7 @@ msgstr "" "Gặp lỗi khi hòa trộn mô-đun-con “%s”, nhưng có cách giải quyết:\n" "%s\n" -#: merge-ort.c:955 merge-recursive.c:1259 +#: merge-ort.c:1183 merge-recursive.c:1273 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4644,7 +4686,7 @@ msgstr "" "\n" "cái mà sẽ chấp nhận gợi ý này.\n" -#: merge-ort.c:968 +#: merge-ort.c:1196 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4653,21 +4695,21 @@ msgstr "" "Gặp lỗi khi hòa trộn mô-đun-con “%s”, nhưng có nhiều cách giải quyết:\n" "%s" -#: merge-ort.c:1127 merge-recursive.c:1341 +#: merge-ort.c:1415 merge-recursive.c:1362 msgid "Failed to execute internal merge" msgstr "Gặp lỗi khi thực hiện trộn nội bộ" -#: merge-ort.c:1132 merge-recursive.c:1346 +#: merge-ort.c:1420 merge-recursive.c:1367 #, c-format msgid "Unable to add %s to database" msgstr "Không thể thêm %s vào cơ sở dữ liệu" -#: merge-ort.c:1139 merge-recursive.c:1378 +#: merge-ort.c:1427 merge-recursive.c:1400 #, c-format msgid "Auto-merging %s" msgstr "Tự-động-hòa-trộn %s" -#: merge-ort.c:1278 merge-recursive.c:2100 +#: merge-ort.c:1566 merge-recursive.c:2122 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4676,7 +4718,7 @@ msgstr "" "XUNG ĐỘT: (ngầm đổi tên thư mục): Tập tin/thư mục đã sẵn có tại %s theo cách " "của các đổi tên thư mục ngầm đặt (các) đường dẫn sau ở đây: %s." -#: merge-ort.c:1288 merge-recursive.c:2110 +#: merge-ort.c:1576 merge-recursive.c:2132 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4685,7 +4727,7 @@ msgstr "" "XUNG ĐỘT: (ngầm đổi tên thư mục): Không thể ánh xạ một đường dẫn thành %s; " "các đổi tên thư mục ngầm cố đặt các đường dẫn ở đây: %s" -#: merge-ort.c:1471 +#: merge-ort.c:1634 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4696,7 +4738,7 @@ msgstr "" "thành; nó đã bị đổi tên thành nhiều thư mục khác, với không đích đến nhận " "một phần nhiều của các tập tin." -#: merge-ort.c:1637 merge-recursive.c:2447 +#: merge-ort.c:1788 merge-recursive.c:2468 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4705,7 +4747,7 @@ msgstr "" "CẢNH BÁO: tránh áp dụng %s -> %s đổi thên thành %s, bởi vì bản thân %s cũng " "bị đổi tên." -#: merge-ort.c:1781 merge-recursive.c:3215 +#: merge-ort.c:1932 merge-recursive.c:3244 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4714,7 +4756,7 @@ msgstr "" "Đường dẫn đã được cập nhật: %s được thêm vào trong %s bên trong một thư mục " "đã được đổi tên trong %s; di chuyển nó đến %s." -#: merge-ort.c:1788 merge-recursive.c:3222 +#: merge-ort.c:1939 merge-recursive.c:3251 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4723,7 +4765,7 @@ msgstr "" "Đường dẫn đã được cập nhật: %s được đổi tên thành %s trong %s, bên trong một " "thư mục đã được đổi tên trong %s; di chuyển nó đến %s." -#: merge-ort.c:1801 merge-recursive.c:3218 +#: merge-ort.c:1952 merge-recursive.c:3247 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4732,7 +4774,7 @@ msgstr "" "XUNG ĐỘT (vị trí tệp): %s được thêm vào trong %s trong một thư mục đã được " "đổi tên thành %s, đoán là nó nên được di chuyển đến %s." -#: merge-ort.c:1809 merge-recursive.c:3225 +#: merge-ort.c:1960 merge-recursive.c:3254 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4741,13 +4783,13 @@ msgstr "" "XUNG ĐỘT (vị trí tệp): %s được đổi tên thành %s trong %s, bên trong một thư " "mục đã được đổi tên thành %s, đoán là nó nên được di chuyển đến %s." -#: merge-ort.c:1952 +#: merge-ort.c:2103 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s và thành %s trong %s." -#: merge-ort.c:2047 +#: merge-ort.c:2198 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4758,13 +4800,23 @@ msgstr "" "VÀ va chạm với một đường dẫn khác; điều này có thể dẫn đến tạo ra các xung " "đột lồng nhau." -#: merge-ort.c:2066 merge-ort.c:2090 +#: merge-ort.c:2217 merge-ort.c:2241 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" "XUNG ĐỘT (đổi-tên/xóa): Đổi tên %s->%s trong %s, nhưng lại bị xóa trong %s." -#: merge-ort.c:2735 +#: merge-ort.c:2550 merge-recursive.c:3002 +#, c-format +msgid "cannot read object %s" +msgstr "không thể đọc đối tượng %s" + +#: merge-ort.c:2553 merge-recursive.c:3005 +#, c-format +msgid "object %s is not a blob" +msgstr "đối tượng %s không phải là một blob" + +#: merge-ort.c:2981 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " @@ -4773,41 +4825,42 @@ msgstr "" "XUNG ĐỘT (tập tin/thư mục): thư mục theo cách của %s từ %s; thay vào đó, di " "chuyển nó đến %s." -#: merge-ort.c:2808 +#: merge-ort.c:3055 #, c-format msgid "" -"CONFLICT (distinct types): %s had different types on each side; renamed %s " +"CONFLICT (distinct types): %s had different types on each side; renamed both " "of them so each can be recorded somewhere." msgstr "" -"CONFLICT (các loại riêng biệt): %s có các loại khác nhau ở mỗi bên; được đổi " -"tên %s trong số chúng để mỗi cái có thể được ghi lại ở đâu đó." +"XUNG ĐỘT (các kiểu riêng biệt): %s có các kiểu khác nhau ở mỗi bên; đã đổi " +"tên cả hai trong số chúng để mỗi cái có thể được ghi lại ở đâu đó." -#: merge-ort.c:2812 -msgid "both" -msgstr "cả hai" - -#: merge-ort.c:2812 -msgid "one" -msgstr "một" +#: merge-ort.c:3062 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed one " +"of them so each can be recorded somewhere." +msgstr "" +"XUNG ĐỘT (các kiểu riêng biệt): %s có các loại khác nhau ở mỗi bên; đã đổi " +"tên một trong số chúng để mỗi cái có thể được ghi lại ở đâu đó." -#: merge-ort.c:2907 merge-recursive.c:3052 +#: merge-ort.c:3162 merge-recursive.c:3081 msgid "content" msgstr "nội dung" -#: merge-ort.c:2909 merge-recursive.c:3056 +#: merge-ort.c:3164 merge-recursive.c:3085 msgid "add/add" msgstr "thêm/thêm" -#: merge-ort.c:2911 merge-recursive.c:3101 +#: merge-ort.c:3166 merge-recursive.c:3130 msgid "submodule" msgstr "mô-đun-con" -#: merge-ort.c:2913 merge-recursive.c:3102 +#: merge-ort.c:3168 merge-recursive.c:3131 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s" -#: merge-ort.c:2938 +#: merge-ort.c:3198 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4816,15 +4869,24 @@ msgstr "" "XUNG ĐỘT (sửa/xóa): %s bị xóa trong %s và sửa trong %s. Phiên bản %s của %s " "còn lại trong cây (tree)." +#: merge-ort.c:3433 +#, c-format +msgid "" +"Note: %s not up to date and in way of checking out conflicted version; old " +"copy renamed to %s" +msgstr "" +"Lưu ý: %s không được cập nhật và theo cách lấy ra phiên bản xung đột; bản " +"sao cũ được đổi tên thành %s" + #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:3406 +#: merge-ort.c:3730 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "thu thập thông tin hòa trộn gặp lỗi cho cây %s, %s, %s" -#: merge-ort-wrappers.c:13 merge-recursive.c:3661 +#: merge-ort-wrappers.c:13 merge-recursive.c:3699 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4834,10 +4896,9 @@ msgstr "" "hòa trộn:\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3436 -#, c-format -msgid "Already up to date!" -msgstr "Đã cập nhật rồi!" +#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402 +msgid "Already up to date." +msgstr "Đã cập nhật rồi." #: merge-recursive.c:356 msgid "(bad commit)\n" @@ -4855,89 +4916,89 @@ msgstr "" "addinfo_cache gặp lỗi khi làm mới đối với đường dẫn “%s”; việc hòa trộn bị " "bãi bỏ." -#: merge-recursive.c:874 +#: merge-recursive.c:876 #, c-format msgid "failed to create path '%s'%s" msgstr "gặp lỗi khi tạo đường dẫn “%s”%s" -#: merge-recursive.c:885 +#: merge-recursive.c:887 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Gỡ bỏ %s để tạo chỗ (room) cho thư mục con\n" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:901 merge-recursive.c:920 msgid ": perhaps a D/F conflict?" msgstr ": có lẽ là một xung đột D/F?" -#: merge-recursive.c:908 +#: merge-recursive.c:910 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "từ chối đóng tập tin không được theo dõi tại “%s”" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:951 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "không thể đọc đối tượng %s “%s”" -#: merge-recursive.c:954 +#: merge-recursive.c:956 #, c-format msgid "blob expected for %s '%s'" msgstr "mong đợi đối tượng blob cho %s “%s”" -#: merge-recursive.c:979 +#: merge-recursive.c:981 #, c-format msgid "failed to open '%s': %s" msgstr "gặp lỗi khi mở “%s”: %s" -#: merge-recursive.c:990 +#: merge-recursive.c:992 #, c-format msgid "failed to symlink '%s': %s" msgstr "gặp lỗi khi tạo liên kết mềm (symlink) “%s”: %s" -#: merge-recursive.c:995 +#: merge-recursive.c:997 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "không hiểu phải làm gì với %06o %s “%s”" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1227 merge-recursive.c:1239 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s” đến lần chuyển giao sau đây:" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1230 merge-recursive.c:1242 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s”" -#: merge-recursive.c:1251 +#: merge-recursive.c:1265 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không tìm thấy các lần chuyển giao " "theo sau hòa trộn)" -#: merge-recursive.c:1255 +#: merge-recursive.c:1269 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không chuyển tiếp nhanh được)" -#: merge-recursive.c:1256 +#: merge-recursive.c:1270 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Tìm thấy một giải pháp hòa trộn có thể cho mô-đun-con:\n" -#: merge-recursive.c:1268 +#: merge-recursive.c:1282 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (thấy nhiều hòa trộn đa trùng)" -#: merge-recursive.c:1402 +#: merge-recursive.c:1424 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Lỗi: từ chối đóng tập tin không được theo dõi tại “%s”; thay vào đó ghi vào " "%s." -#: merge-recursive.c:1474 +#: merge-recursive.c:1496 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4946,7 +5007,7 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s " "còn lại trong cây (tree)." -#: merge-recursive.c:1479 +#: merge-recursive.c:1501 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4955,7 +5016,7 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s " "của %s còn lại trong cây (tree)." -#: merge-recursive.c:1486 +#: merge-recursive.c:1508 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4964,7 +5025,7 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s " "còn lại trong cây (tree) tại %s." -#: merge-recursive.c:1491 +#: merge-recursive.c:1513 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4973,45 +5034,45 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s " "của %s còn lại trong cây (tree) tại %s." -#: merge-recursive.c:1526 +#: merge-recursive.c:1548 msgid "rename" msgstr "đổi tên" -#: merge-recursive.c:1526 +#: merge-recursive.c:1548 msgid "renamed" msgstr "đã đổi tên" -#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 +#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Từ chối đóng tập tin không được theo dõi tại “%s”" -#: merge-recursive.c:1587 +#: merge-recursive.c:1609 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Từ chối đóng tập tin không được theo dõi tại “%s”, ngay cả khi nó ở trên " "đường." -#: merge-recursive.c:1645 +#: merge-recursive.c:1667 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm trong %s" -#: merge-recursive.c:1676 +#: merge-recursive.c:1698 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s là một thư mục trong %s thay vào đó thêm vào như là %s" -#: merge-recursive.c:1681 +#: merge-recursive.c:1703 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "Từ chối đóng tập tin không được theo dõi tại “%s”; thay vào đó đang thêm " "thành %s" -#: merge-recursive.c:1708 +#: merge-recursive.c:1730 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5020,17 +5081,17 @@ msgstr "" "XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi " "tên \"%s\"->\"%s\" trong \"%s\"%s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1735 msgid " (left unresolved)" msgstr " (cần giải quyết)" -#: merge-recursive.c:1805 +#: merge-recursive.c:1827 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s. Đổi tên %s->%s trong %s" -#: merge-recursive.c:2068 +#: merge-recursive.c:2090 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5041,7 +5102,7 @@ msgstr "" "vì thư mục %s đã bị đổi tên thành nhiều thư mục khác, với không đích đến " "nhận một phần nhiều của các tập tin." -#: merge-recursive.c:2202 +#: merge-recursive.c:2224 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5050,90 +5111,80 @@ msgstr "" "XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên thư mục %s->%s trong %s. Đổi tên thư mục " "%s->%s trong %s" -#: merge-recursive.c:2973 -#, c-format -msgid "cannot read object %s" -msgstr "không thể đọc đối tượng %s" - -#: merge-recursive.c:2976 -#, c-format -msgid "object %s is not a blob" -msgstr "đối tượng %s không phải là một blob" - -#: merge-recursive.c:3040 +#: merge-recursive.c:3069 msgid "modify" msgstr "sửa đổi" -#: merge-recursive.c:3040 +#: merge-recursive.c:3069 msgid "modified" msgstr "đã sửa" -#: merge-recursive.c:3079 +#: merge-recursive.c:3108 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)" -#: merge-recursive.c:3132 +#: merge-recursive.c:3161 #, c-format msgid "Adding as %s instead" msgstr "Thay vào đó thêm vào %s" -#: merge-recursive.c:3339 +#: merge-recursive.c:3368 #, c-format msgid "Removing %s" msgstr "Đang xóa %s" -#: merge-recursive.c:3362 +#: merge-recursive.c:3391 msgid "file/directory" msgstr "tập-tin/thư-mục" -#: merge-recursive.c:3367 +#: merge-recursive.c:3396 msgid "directory/file" msgstr "thư-mục/tập-tin" -#: merge-recursive.c:3374 +#: merge-recursive.c:3403 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "XUNG ĐỘT (%s): Ở đây không có thư mục nào có tên %s trong %s. Thêm %s như là " "%s" -#: merge-recursive.c:3383 +#: merge-recursive.c:3412 #, c-format msgid "Adding %s" msgstr "Thêm \"%s\"" -#: merge-recursive.c:3392 +#: merge-recursive.c:3421 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "XUNG ĐỘT (thêm/thêm): Xung đột hòa trộn trong %s" -#: merge-recursive.c:3445 +#: merge-recursive.c:3474 #, c-format msgid "merging of trees %s and %s failed" msgstr "hòa trộn các cây %s và %s gặp lỗi" -#: merge-recursive.c:3539 +#: merge-recursive.c:3568 msgid "Merging:" msgstr "Đang trộn:" -#: merge-recursive.c:3552 +#: merge-recursive.c:3581 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "tìm thấy %u tổ tiên chung:" -#: merge-recursive.c:3602 +#: merge-recursive.c:3631 msgid "merge returned no commit" msgstr "hòa trộn không trả về lần chuyển giao nào" -#: merge-recursive.c:3758 +#: merge-recursive.c:3796 #, c-format msgid "Could not parse object '%s'" msgstr "Không thể phân tích đối tượng “%s”" -#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896 -#: builtin/stash.c:471 +#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900 +#: builtin/stash.c:473 msgid "Unable to write index." msgstr "Không thể ghi bảng mục lục." @@ -5141,177 +5192,196 @@ msgstr "Không thể ghi bảng mục lục." msgid "failed to read the cache" msgstr "gặp lỗi khi đọc bộ nhớ đệm" -#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917 -#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817 -#: builtin/stash.c:265 +#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965 +#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 +#: builtin/stash.c:267 msgid "unable to write new index file" msgstr "không thể ghi tập tin lưu bảng mục lục mới" -#: midx.c:62 +#: midx.c:74 msgid "multi-pack-index OID fanout is of the wrong size" msgstr "fanout OID nhiều gói chỉ mục có kích thước sai" -#: midx.c:93 +#: midx.c:105 #, c-format msgid "multi-pack-index file %s is too small" msgstr "tập tin đồ thị multi-pack-index %s quá nhỏ" -#: midx.c:109 +#: midx.c:121 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "chữ ký multi-pack-index 0x%08x không khớp chữ ký 0x%08x" -#: midx.c:114 +#: midx.c:126 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "không nhận ra phiên bản %d của multi-pack-index" -#: midx.c:119 +#: midx.c:131 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "phiên bản băm multi-pack-index %u không khớp phiên bản %u" -#: midx.c:136 +#: midx.c:148 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index thiếu mảnh pack-name cần thiết" -#: midx.c:138 +#: midx.c:150 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index thiếu mảnh OID fanout cần thiết" -#: midx.c:140 +#: midx.c:152 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index thiếu mảnh OID lookup cần thiết" -#: midx.c:142 +#: midx.c:154 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index thiếu mảnh các khoảng bù đối tượng cần thiết" -#: midx.c:158 +#: midx.c:170 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "các tên gói multi-pack-index không đúng thứ tự: “%s” trước “%s”" -#: midx.c:202 +#: midx.c:214 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "pack-int-id sai: %u (%u các gói tổng)" -#: midx.c:252 +#: midx.c:264 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "multi-pack-index lưu trữ một khoảng bù 64-bít, nhưng off_t là quá nhỏ" -#: midx.c:467 +#: midx.c:490 #, c-format msgid "failed to add packfile '%s'" msgstr "gặp lỗi khi thêm tập tin gói “%s”" -#: midx.c:473 +#: midx.c:496 #, c-format msgid "failed to open pack-index '%s'" msgstr "gặp lỗi khi mở pack-index “%s”" -#: midx.c:533 +#: midx.c:564 #, c-format msgid "failed to locate object %d in packfile" msgstr "gặp lỗi khi phân bổ đối tượng “%d” trong tập tin gói" -#: midx.c:821 +#: midx.c:880 builtin/index-pack.c:1535 +msgid "cannot store reverse index file" +msgstr "không thể lưu trữ tập tin ghi mục lục đảo ngược" + +#: midx.c:933 msgid "Adding packfiles to multi-pack-index" msgstr "Đang thêm tập tin gói từ multi-pack-index" -#: midx.c:855 +#: midx.c:979 #, c-format msgid "did not see pack-file %s to drop" msgstr "đã không thấy tập tin gói %s để mà xóa" -#: midx.c:904 +#: midx.c:1024 +#, c-format +msgid "unknown preferred pack: '%s'" +msgstr "không hiểu \"preferred pack\": %s" + +#: midx.c:1029 +#, c-format +msgid "preferred pack '%s' is expired" +msgstr "\"preferred pack\" “%s” đã hết hạn" + +#: midx.c:1045 msgid "no pack files to index." msgstr "không có tập tin gói để đánh mục lục." -#: midx.c:965 +#: midx.c:1125 builtin/clean.c:37 +#, c-format +msgid "failed to remove %s" +msgstr "gặp lỗi khi gỡ bỏ %s" + +#: midx.c:1156 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "gặp lỗi khi xóa multi-pack-index tại %s" -#: midx.c:1021 +#: midx.c:1214 msgid "multi-pack-index file exists, but failed to parse" msgstr "đã có tập tin multi-pack-index, nhưng gặp lỗi khi phân tích cú pháp" -#: midx.c:1029 +#: midx.c:1222 msgid "Looking for referenced packfiles" msgstr "Đang khóa cho các gói bị tham chiếu" -#: midx.c:1044 +#: midx.c:1237 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "fanout cũ sai thứ tự: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1049 +#: midx.c:1242 msgid "the midx contains no oid" msgstr "midx chẳng chứa oid nào" -#: midx.c:1058 +#: midx.c:1251 msgid "Verifying OID order in multi-pack-index" msgstr "Thẩm tra thứ tự OID trong multi-pack-index" -#: midx.c:1067 +#: midx.c:1260 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "lookup cũ sai thứ tự: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1087 +#: midx.c:1280 msgid "Sorting objects by packfile" msgstr "Đang sắp xếp các đối tượng theo tập tin gói" -#: midx.c:1094 +#: midx.c:1287 msgid "Verifying object offsets" msgstr "Đang thẩm tra các khoảng bù đối tượng" -#: midx.c:1110 +#: midx.c:1303 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "gặp lỗi khi tải mục gói cho oid[%d] = %s" -#: midx.c:1116 +#: midx.c:1309 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "gặp lỗi khi tải pack-index cho tập tin gói %s" -#: midx.c:1125 +#: midx.c:1318 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" "khoảng bù đối tượng không đúng cho oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1150 +#: midx.c:1343 msgid "Counting referenced objects" msgstr "Đang đếm các đối tượng được tham chiếu" -#: midx.c:1160 +#: midx.c:1353 msgid "Finding and deleting unreferenced packfiles" msgstr "Đang tìm và xóa các gói không được tham chiếu" -#: midx.c:1351 +#: midx.c:1544 msgid "could not start pack-objects" msgstr "không thể lấy thông tin thống kê về các đối tượng gói" -#: midx.c:1371 +#: midx.c:1564 msgid "could not finish pack-objects" msgstr "không thể hoàn thiện các đối tượng gói" -#: name-hash.c:538 +#: name-hash.c:542 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "không thể tạo tuyến lazy_dir: %s" -#: name-hash.c:560 +#: name-hash.c:564 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "không thể tạo tuyến lazy_name: %s" -#: name-hash.c:566 +#: name-hash.c:570 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "không thể gia nhập tuyến lazy_name: %s" @@ -5358,258 +5428,258 @@ msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Giá trị %s sai: “%s”" -#: object-file.c:480 +#: object-file.c:526 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "thư mục đối tượng %s không tồn tại; kiểm tra .git/objects/info/alternates" -#: object-file.c:531 +#: object-file.c:577 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "không thể thường hóa đường dẫn đối tượng thay thế: “%s”" -#: object-file.c:603 +#: object-file.c:649 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: đang bỏ qua kho đối tượng thay thế, lồng nhau quá sâu" -#: object-file.c:610 +#: object-file.c:656 #, c-format msgid "unable to normalize object directory: %s" msgstr "không thể chuẩn hóa thư mục đối tượng: “%s”" -#: object-file.c:653 +#: object-file.c:699 msgid "unable to fdopen alternates lockfile" msgstr "không thể fdopen tập tin khóa thay thế" -#: object-file.c:671 +#: object-file.c:717 msgid "unable to read alternates file" msgstr "không thể đọc tập tin thay thế" -#: object-file.c:678 +#: object-file.c:724 msgid "unable to move new alternates file into place" msgstr "không thể di chuyển tập tin thay thế vào chỗ" -#: object-file.c:713 +#: object-file.c:759 #, c-format msgid "path '%s' does not exist" msgstr "đường dẫn “%s” không tồn tại" -#: object-file.c:734 +#: object-file.c:780 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "kho tham chiếu “%s” như là lấy ra liên kết vẫn chưa được hỗ trợ." -#: object-file.c:740 +#: object-file.c:786 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "kho tham chiếu “%s” không phải là một kho nội bộ." -#: object-file.c:746 +#: object-file.c:792 #, c-format msgid "reference repository '%s' is shallow" msgstr "kho tham chiếu “%s” là nông" -#: object-file.c:754 +#: object-file.c:800 #, c-format msgid "reference repository '%s' is grafted" msgstr "kho tham chiếu “%s” bị cấy ghép" -#: object-file.c:814 +#: object-file.c:860 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "dòng không hợp lệ trong khi phân tích các tham chiếu thay thế: %s" -#: object-file.c:964 +#: object-file.c:1010 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "đang cố để mmap %<PRIuMAX> vượt quá giới hạn %<PRIuMAX>" -#: object-file.c:985 +#: object-file.c:1031 msgid "mmap failed" msgstr "mmap gặp lỗi" -#: object-file.c:1149 +#: object-file.c:1195 #, c-format msgid "object file %s is empty" msgstr "tập tin đối tượng %s trống rỗng" -#: object-file.c:1284 object-file.c:2477 +#: object-file.c:1330 object-file.c:2524 #, c-format msgid "corrupt loose object '%s'" msgstr "đối tượng mất hỏng “%s”" -#: object-file.c:1286 object-file.c:2481 +#: object-file.c:1332 object-file.c:2528 #, c-format msgid "garbage at end of loose object '%s'" msgstr "gặp rác tại cuối của đối tượng bị mất “%s”" -#: object-file.c:1328 +#: object-file.c:1374 msgid "invalid object type" msgstr "kiểu đối tượng không hợp lệ" -#: object-file.c:1412 +#: object-file.c:1458 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "không thể giải nén phần đầu gói %s với --allow-unknown-type" -#: object-file.c:1415 +#: object-file.c:1461 #, c-format msgid "unable to unpack %s header" msgstr "không thể giải gói phần đầu %s" -#: object-file.c:1421 +#: object-file.c:1467 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "không thể phân tích phần đầu gói %s với --allow-unknown-type" -#: object-file.c:1424 +#: object-file.c:1470 #, c-format msgid "unable to parse %s header" msgstr "không thể phân tích phần đầu của “%s”" -#: object-file.c:1651 +#: object-file.c:1697 #, c-format msgid "failed to read object %s" msgstr "gặp lỗi khi đọc đối tượng “%s”" -#: object-file.c:1655 +#: object-file.c:1701 #, c-format msgid "replacement %s not found for %s" msgstr "c%s thay thế không được tìm thấy cho %s" -#: object-file.c:1659 +#: object-file.c:1705 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "đối tượng mất %s (được lưu trong %s) bị hỏng" -#: object-file.c:1663 +#: object-file.c:1709 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "đối tượng đã đóng gói %s (được lưu trong %s) bị hỏng" -#: object-file.c:1768 +#: object-file.c:1814 #, c-format msgid "unable to write file %s" msgstr "không thể ghi tập tin %s" -#: object-file.c:1775 +#: object-file.c:1821 #, c-format msgid "unable to set permission to '%s'" msgstr "không thể đặt quyền thành “%s”" -#: object-file.c:1782 +#: object-file.c:1828 msgid "file write error" msgstr "lỗi ghi tập tin" -#: object-file.c:1802 +#: object-file.c:1848 msgid "error when closing loose object file" msgstr "gặp lỗi trong khi đóng tập tin đối tượng" -#: object-file.c:1867 +#: object-file.c:1913 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "không đủ thẩm quyền để thêm một đối tượng vào cơ sở dữ liệu kho chứa %s" -#: object-file.c:1869 +#: object-file.c:1915 msgid "unable to create temporary file" msgstr "không thể tạo tập tin tạm thời" -#: object-file.c:1893 +#: object-file.c:1939 msgid "unable to write loose object file" msgstr "không thể ghi tập tin đối tượng đã mất" -#: object-file.c:1899 +#: object-file.c:1945 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "không thể xả nén đối tượng mới %s (%d)" -#: object-file.c:1903 +#: object-file.c:1949 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd trên đối tượng %s gặp lỗi (%d)" -#: object-file.c:1907 +#: object-file.c:1953 #, c-format msgid "confused by unstable object source data for %s" msgstr "chưa rõ ràng baowir dữ liệu nguồn đối tượng không ổn định cho %s" -#: object-file.c:1917 builtin/pack-objects.c:1097 +#: object-file.c:1963 builtin/pack-objects.c:1097 #, c-format msgid "failed utime() on %s" msgstr "gặp lỗi utime() trên “%s”" -#: object-file.c:1994 +#: object-file.c:2040 #, c-format msgid "cannot read object for %s" msgstr "không thể đọc đối tượng cho %s" -#: object-file.c:2045 +#: object-file.c:2091 msgid "corrupt commit" msgstr "lần chuyển giao sai hỏng" -#: object-file.c:2053 +#: object-file.c:2099 msgid "corrupt tag" msgstr "thẻ sai hỏng" -#: object-file.c:2153 +#: object-file.c:2199 #, c-format msgid "read error while indexing %s" msgstr "gặp lỗi đọc khi đánh mục lục %s" -#: object-file.c:2156 +#: object-file.c:2202 #, c-format msgid "short read while indexing %s" msgstr "không đọc ngắn khi đánh mục lục %s" -#: object-file.c:2229 object-file.c:2239 +#: object-file.c:2275 object-file.c:2285 #, c-format msgid "%s: failed to insert into database" msgstr "%s: gặp lỗi khi thêm vào cơ sở dữ liệu" -#: object-file.c:2245 +#: object-file.c:2291 #, c-format msgid "%s: unsupported file type" msgstr "%s: kiểu tập tin không được hỗ trợ" -#: object-file.c:2269 +#: object-file.c:2315 #, c-format msgid "%s is not a valid object" msgstr "%s không phải là một đối tượng hợp lệ" -#: object-file.c:2271 +#: object-file.c:2317 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s không phải là một đối tượng “%s” hợp lệ" -#: object-file.c:2298 builtin/index-pack.c:192 +#: object-file.c:2344 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "không thể mở %s" -#: object-file.c:2488 object-file.c:2541 +#: object-file.c:2535 object-file.c:2588 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "mã băm không khớp cho %s (cần %s)" -#: object-file.c:2512 +#: object-file.c:2559 #, c-format msgid "unable to mmap %s" msgstr "không thể mmap %s" -#: object-file.c:2517 +#: object-file.c:2564 #, c-format msgid "unable to unpack header of %s" msgstr "không thể giải gói phần đầu của “%s”" -#: object-file.c:2523 +#: object-file.c:2570 #, c-format msgid "unable to parse header of %s" msgstr "không thể phân tích phần đầu của “%s”" -#: object-file.c:2534 +#: object-file.c:2581 #, c-format msgid "unable to unpack contents of %s" msgstr "không thể giải gói nội dung của “%s”" @@ -5723,71 +5793,71 @@ msgstr "kiểu đối tượng \"%s\" không hợp lệ" msgid "object %s is a %s, not a %s" msgstr "đối tượng %s là một %s, không phải là một %s" -#: object.c:233 +#: object.c:232 #, c-format msgid "object %s has unknown type id %d" msgstr "đối tượng %s có mã kiểu %d chưa biết" -#: object.c:246 +#: object.c:245 #, c-format msgid "unable to parse object: %s" msgstr "không thể phân tích đối tượng: “%s”" -#: object.c:266 object.c:278 +#: object.c:265 object.c:277 #, c-format msgid "hash mismatch %s" msgstr "mã băm không khớp %s" -#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226 +#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251 #, c-format msgid "unable to get size of %s" msgstr "không thể lấy kích cỡ của %s" -#: pack-bitmap.c:1489 builtin/rev-list.c:92 +#: pack-bitmap.c:1547 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "không thể dung lượng đĩa đã dùng của %s" -#: pack-revindex.c:220 +#: pack-revindex.c:221 #, c-format msgid "reverse-index file %s is too small" msgstr "tập tin reverse-index %s quá nhỏ" -#: pack-revindex.c:225 +#: pack-revindex.c:226 #, c-format msgid "reverse-index file %s is corrupt" msgstr "tập tin reverse-index %s bị hỏng" -#: pack-revindex.c:233 +#: pack-revindex.c:234 #, c-format msgid "reverse-index file %s has unknown signature" msgstr "tập tin reverse-index %s có chữ ký chưa biết" -#: pack-revindex.c:237 +#: pack-revindex.c:238 #, c-format msgid "reverse-index file %s has unsupported version %<PRIu32>" msgstr "tệp chỉ mục ngược %s có phiên bản không được hỗ trợ %<PRIu32>" -#: pack-revindex.c:242 +#: pack-revindex.c:243 #, c-format msgid "reverse-index file %s has unsupported hash id %<PRIu32>" msgstr "tệp chỉ mục ngược %s có id mã băm không được hỗ trợ %<PRIu32>" -#: pack-write.c:236 +#: pack-write.c:250 msgid "cannot both write and verify reverse index" msgstr "không thể cùng lúc đọc và xác minh được bảng mục lục đảo ngược" -#: pack-write.c:257 +#: pack-write.c:271 #, c-format msgid "could not stat: %s" msgstr "không thể lấy thông tin thống kê: %s" -#: pack-write.c:269 +#: pack-write.c:283 #, c-format msgid "failed to make %s readable" msgstr "gặp lỗi làm cho %s đọc được" -#: pack-write.c:508 +#: pack-write.c:522 #, c-format msgid "could not write '%s' promisor file" msgstr "không thể ghi tập tin promisor “%s”" @@ -5796,12 +5866,12 @@ msgstr "không thể ghi tập tin promisor “%s”" msgid "offset before end of packfile (broken .idx?)" msgstr "vị trí tương đối trước điểm kết thúc của tập tin gói (.idx hỏng à?)" -#: packfile.c:1934 +#: packfile.c:1937 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "vị trí tương đối nằm trước chỉ mục gói cho %s (mục lục bị hỏng à?)" -#: packfile.c:1938 +#: packfile.c:1941 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -5867,31 +5937,31 @@ msgstr "tùy chọn chưa rõ rang: %s (nên là --%s%s hay --%s%s)" msgid "did you mean `--%s` (with two dashes)?" msgstr "có phải ý bạn là “--%s“ (với hai dấu gạch ngang)?" -#: parse-options.c:666 parse-options.c:971 +#: parse-options.c:668 parse-options.c:988 #, c-format msgid "alias of --%s" msgstr "bí danh của --%s" -#: parse-options.c:862 +#: parse-options.c:879 #, c-format msgid "unknown option `%s'" msgstr "không hiểu tùy chọn “%s”" -#: parse-options.c:864 +#: parse-options.c:881 #, c-format msgid "unknown switch `%c'" msgstr "không hiểu tùy chọn “%c”" -#: parse-options.c:866 +#: parse-options.c:883 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "không hiểu tùy chọn non-ascii trong chuỗi: “%s”" -#: parse-options.c:890 +#: parse-options.c:907 msgid "..." msgstr "…" -#: parse-options.c:909 +#: parse-options.c:926 #, c-format msgid "usage: %s" msgstr "cách dùng: %s" @@ -5899,17 +5969,17 @@ msgstr "cách dùng: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:915 +#: parse-options.c:932 #, c-format msgid " or: %s" msgstr " hoặc: %s" -#: parse-options.c:918 +#: parse-options.c:935 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:957 +#: parse-options.c:974 msgid "-NUM" msgstr "-SỐ" @@ -5918,30 +5988,30 @@ msgstr "-SỐ" msgid "Could not make %s writable by group" msgstr "Không thể làm %s được ghi bởi nhóm" -#: pathspec.c:130 +#: pathspec.c:151 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" "Ký tự thoát chuỗi “\\” không được phép là ký tự cuối trong giá trị thuộc tính" -#: pathspec.c:148 +#: pathspec.c:169 msgid "Only one 'attr:' specification is allowed." msgstr "Chỉ có một đặc tả “attr:” là được phép." -#: pathspec.c:151 +#: pathspec.c:172 msgid "attr spec must not be empty" msgstr "đặc tả attr phải không được để trống" -#: pathspec.c:194 +#: pathspec.c:215 #, c-format msgid "invalid attribute name %s" msgstr "tên thuộc tính không hợp lệ %s" -#: pathspec.c:259 +#: pathspec.c:280 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "các cài đặt đặc tả đường dẫn “glob” và “noglob” toàn cục là xung khắc nhau" -#: pathspec.c:266 +#: pathspec.c:287 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -5949,51 +6019,51 @@ msgstr "" "cài đặt đặc tả đường dẫn “literal” toàn cục là xung khắc với các cài đặt đặc " "tả đường dẫn toàn cục khác" -#: pathspec.c:306 +#: pathspec.c:327 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "tham số không hợp lệ cho “tiền tố” màu nhiệm đặc tả đường đẫn" -#: pathspec.c:327 +#: pathspec.c:348 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Số màu nhiệm đặc tả đường dẫn không hợp lệ “%.*s” trong “%s”" -#: pathspec.c:332 +#: pathspec.c:353 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Thiếu “)” tại cuối của số màu nhiệm đặc tả đường dẫn trong “%s”" -#: pathspec.c:370 +#: pathspec.c:391 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Chưa viết mã cho số màu nhiệm đặc tả đường dẫn “%c” trong “%s”" -#: pathspec.c:429 +#: pathspec.c:450 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: “literal” và “glob” xung khắc nhau" -#: pathspec.c:445 +#: pathspec.c:466 #, c-format msgid "%s: '%s' is outside repository at '%s'" msgstr "%s: “%s” ngoài một kho chứa tại “%s”" -#: pathspec.c:521 +#: pathspec.c:542 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "“%s” (mnemonic: “%c”)" -#: pathspec.c:531 +#: pathspec.c:552 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: số mầu nhiệm đặc tả đường dẫn chưa được hỗ trợ bởi lệnh này: %s" -#: pathspec.c:598 +#: pathspec.c:619 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "đặc tả đường dẫn “%s” vượt ra ngoài liên kết mềm" -#: pathspec.c:643 +#: pathspec.c:664 #, c-format msgid "line is badly quoted: %s" msgstr "dòng được trích dẫn sai: %s" @@ -6014,7 +6084,7 @@ msgstr "không thể ghi gói phân tách không trạng thái" msgid "flush packet write failed" msgstr "gặp lỗi khi ghi vào tập tin gói lúc đẩy dữ liệu lên bộ nhớ" -#: pkt-line.c:153 pkt-line.c:239 +#: pkt-line.c:153 pkt-line.c:265 msgid "protocol error: impossibly long line" msgstr "lỗi giao thức: không thể làm được dòng dài" @@ -6022,33 +6092,34 @@ msgstr "lỗi giao thức: không thể làm được dòng dài" msgid "packet write with format failed" msgstr "gặp lỗi khi ghi gói có định dạng" -#: pkt-line.c:203 +#: pkt-line.c:204 msgid "packet write failed - data exceeds max packet size" msgstr "gặp lỗi khi ghi gói - dữ liệu vượt quá cỡ vói tối đa" -#: pkt-line.c:210 pkt-line.c:217 -msgid "packet write failed" -msgstr "gặp lỗi khi ghi gói" +#: pkt-line.c:222 +#, c-format +msgid "packet write failed: %s" +msgstr "gặp lỗi khi ghi gói: %s" -#: pkt-line.c:302 +#: pkt-line.c:328 pkt-line.c:329 msgid "read error" msgstr "lỗi đọc" -#: pkt-line.c:310 +#: pkt-line.c:339 pkt-line.c:340 msgid "the remote end hung up unexpectedly" msgstr "máy chủ bị treo bất ngờ" -#: pkt-line.c:338 +#: pkt-line.c:369 pkt-line.c:371 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "lỗi giao thức: ký tự chiều dài dòng bị sai: %.4s" -#: pkt-line.c:352 pkt-line.c:357 +#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396 #, c-format msgid "protocol error: bad line length %d" msgstr "lỗi giao thức: chiều dài dòng bị sai %d" -#: pkt-line.c:373 sideband.c:165 +#: pkt-line.c:413 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "lỗi máy chủ: %s" @@ -6062,7 +6133,7 @@ msgstr "Làm mới bảng mục lục" msgid "unable to create threaded lstat: %s" msgstr "không thể tạo tuyến trình lstat: %s" -#: pretty.c:984 +#: pretty.c:988 msgid "unable to parse --pretty format" msgstr "không thể phân tích định dạng --pretty" @@ -6084,6 +6155,10 @@ msgstr "" msgid "promisor remote name cannot begin with '/': %s" msgstr "tên máy chủ hứa hẹn không thể bắt đầu bằng “/”: %s" +#: protocol-caps.c:103 +msgid "object-info: expected flush after arguments" +msgstr "object-info: cần đẩy dữ liệu lên đĩa sau các tham số" + #: prune-packed.c:35 msgid "Removing duplicate objects" msgstr "Đang gỡ các đối tượng trùng lặp" @@ -6096,7 +6171,7 @@ msgstr "không thể lấy thông tin thống kê về “log“" msgid "could not read `log` output" msgstr "không thể đọc kết xuất “log”" -#: range-diff.c:101 sequencer.c:5318 +#: range-diff.c:101 sequencer.c:5551 #, c-format msgid "could not parse commit '%s'" msgstr "không thể phân tích lần chuyển giao “%s”" @@ -6128,52 +6203,52 @@ msgstr "--left-only và --right-only loại từ lẫn nhau" msgid "could not parse log for '%s'" msgstr "không thể phân tích nhật ký cho “%s”" -#: read-cache.c:682 +#: read-cache.c:708 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" "sẽ không thêm các bí danh “%s” (“%s” đã có từ trước trong bảng mục lục)" -#: read-cache.c:698 +#: read-cache.c:724 msgid "cannot create an empty blob in the object database" msgstr "không thể tạo một blob rỗng trong cơ sở dữ liệu đối tượng" -#: read-cache.c:720 +#: read-cache.c:746 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%s: chỉ có thể thêm tập tin thông thường, liên kết mềm hoặc git-directories" -#: read-cache.c:725 +#: read-cache.c:751 #, c-format msgid "'%s' does not have a commit checked out" msgstr "“%s” không có một lần chuyển giao nào được lấy ra" -#: read-cache.c:777 +#: read-cache.c:803 #, c-format msgid "unable to index file '%s'" msgstr "không thể đánh mục lục tập tin “%s”" -#: read-cache.c:796 +#: read-cache.c:822 #, c-format msgid "unable to add '%s' to index" msgstr "không thể thêm %s vào bảng mục lục" -#: read-cache.c:807 +#: read-cache.c:833 #, c-format msgid "unable to stat '%s'" msgstr "không thể lấy thống kê “%s”" -#: read-cache.c:1318 +#: read-cache.c:1356 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "%s có vẻ không phải là tập tin và cũng chẳng phải là một thư mục" -#: read-cache.c:1532 +#: read-cache.c:1571 msgid "Refresh index" msgstr "Làm tươi mới bảng mục lục" -#: read-cache.c:1657 +#: read-cache.c:1700 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6182,7 +6257,7 @@ msgstr "" "index.version được đặt, nhưng giá trị của nó lại không hợp lệ.\n" "Dùng phiên bản %i" -#: read-cache.c:1667 +#: read-cache.c:1710 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6191,139 +6266,143 @@ msgstr "" "GIT_INDEX_VERSION được đặt, nhưng giá trị của nó lại không hợp lệ.\n" "Dùng phiên bản %i" -#: read-cache.c:1723 +#: read-cache.c:1766 #, c-format msgid "bad signature 0x%08x" msgstr "chữ ký sai 0x%08x" -#: read-cache.c:1726 +#: read-cache.c:1769 #, c-format msgid "bad index version %d" msgstr "phiên bản mục lục sai %d" -#: read-cache.c:1735 +#: read-cache.c:1778 msgid "bad index file sha1 signature" msgstr "chữ ký dạng sha1 cho tập tin mục lục không đúng" -#: read-cache.c:1765 +#: read-cache.c:1812 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "mục lục dùng phần mở rộng %.4s, cái mà chúng tôi không hiểu được" -#: read-cache.c:1767 +#: read-cache.c:1814 #, c-format msgid "ignoring %.4s extension" msgstr "đang lờ đi phần mở rộng %.4s" -#: read-cache.c:1804 +#: read-cache.c:1851 #, c-format msgid "unknown index entry format 0x%08x" msgstr "không hiểu định dạng mục lục 0x%08x" -#: read-cache.c:1820 +#: read-cache.c:1867 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "trường tên sai sạng trong mục lục, gần đường dẫn “%s”" -#: read-cache.c:1877 +#: read-cache.c:1924 msgid "unordered stage entries in index" msgstr "các mục tin stage không đúng thứ tự trong mục lục" -#: read-cache.c:1880 +#: read-cache.c:1927 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "nhiều mục stage cho tập tin hòa trộn “%s”" -#: read-cache.c:1883 +#: read-cache.c:1930 #, c-format msgid "unordered stage entries for '%s'" msgstr "các mục tin stage không đúng thứ tự cho “%s”" -#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181 -#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991 +#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 #: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "tập tin ghi bảng mục lục bị hỏng" -#: read-cache.c:2133 +#: read-cache.c:2180 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "không thể tạo tuyến load_cache_entries: %s" -#: read-cache.c:2146 +#: read-cache.c:2193 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "không thể gia nhập tuyến load_cache_entries: %s" -#: read-cache.c:2179 +#: read-cache.c:2226 #, c-format msgid "%s: index file open failed" msgstr "%s: mở tập tin mục lục gặp lỗi" -#: read-cache.c:2183 +#: read-cache.c:2230 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: không thể lấy thống kê bảng mục lục đã mở" -#: read-cache.c:2187 +#: read-cache.c:2234 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: tập tin mục lục nhỏ hơn mong đợi" -#: read-cache.c:2191 +#: read-cache.c:2238 #, c-format msgid "%s: unable to map index file" msgstr "%s: không thể ánh xạ tập tin mục lục" -#: read-cache.c:2233 +#: read-cache.c:2280 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "không thể tạo tuyến load_index_extensions: %s" -#: read-cache.c:2260 +#: read-cache.c:2307 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "không thể gia nhập tuyến load_index_extensions: %s" -#: read-cache.c:2292 +#: read-cache.c:2345 #, c-format msgid "could not freshen shared index '%s'" msgstr "không thể làm tươi mới mục lục đã chia sẻ “%s”" -#: read-cache.c:2339 +#: read-cache.c:2392 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "mục lục bị hỏng, cần %s trong %s, nhưng lại nhận được %s" -#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141 +#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 #, c-format msgid "could not close '%s'" msgstr "không thể đóng “%s”" -#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239 +#: read-cache.c:3138 +msgid "failed to convert to a sparse-index" +msgstr "gặp lỗi khi chuyển đổi sang \"sparse-index\"" + +#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441 #, c-format msgid "could not stat '%s'" msgstr "không thể lấy thông tin thống kê về “%s”" -#: read-cache.c:3151 +#: read-cache.c:3222 #, c-format msgid "unable to open git dir: %s" msgstr "không thể mở thư mục git: %s" -#: read-cache.c:3163 +#: read-cache.c:3234 #, c-format msgid "unable to unlink: %s" msgstr "không thể bỏ liên kết (unlink): “%s”" -#: read-cache.c:3188 +#: read-cache.c:3263 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "không thể sửa các bít phân quyền trên “%s”" -#: read-cache.c:3337 +#: read-cache.c:3412 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: không thể xóa bỏ stage #0" @@ -6353,7 +6432,10 @@ msgid "" "r, reword <commit> = use commit, but edit the commit message\n" "e, edit <commit> = use commit, but stop for amending\n" "s, squash <commit> = use commit, but meld into previous commit\n" -"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n" +" commit's log message, unless -C is used, in which case\n" +" keep only this commit's message; -c is same as -C but\n" +" opens the editor\n" "x, exec <command> = run command (the rest of the line) using shell\n" "b, break = stop here (continue rebase later with 'git rebase --continue')\n" "d, drop <commit> = remove commit\n" @@ -6362,7 +6444,7 @@ msgid "" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" ". create a merge commit using the original merge commit's\n" ". message (or the oneline, if no original merge commit was\n" -". specified). Use -c <commit> to reword the commit message.\n" +". specified); use -c <commit> to reword the commit message\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -6371,14 +6453,19 @@ msgstr "" "p, pick <commit> = dùng lần chuyển giao\n" "r, reword <commit> = dùng lần chuyển giao, nhưng sửa lại phần chú thích\n" "e, edit <commit> = dùng lần chuyển giao, nhưng dừng lại để tu bổ (amend)\n" -"s, squash <commit> = dùng lần chuyển giao, nhưng meld vào lần chuyển giao kế " +"s, squash <commit> = dùng lần chuyển giao, nhưng trộn vào lần chuyển giao kế " "trước\n" -"f, fixup <commit> = giống như \"squash\", nhưng loại bỏ chú thích nhật ký " -"của lần chuyển giao này\n" +"f, fixup [-C | -c] <commit> = giống như \"squash\", nhưng chỉ giữ lại phần " +"lời nhắn\n" +" nhật ký của lần chuyển giao kế trước, trừ phi -C được " +"dùng, trong trường hợp\n" +" chỉ giữ ghi chú của lần chuyển giao này; -c giống như -C " +"nhưng\n" +" mở trình biên soạn\n" "x, exec <commit> = chạy lệnh (phần còn lại của dòng) dùng hệ vỏ\n" "b, break = dừng tại đây (tiếp tục cải tổ sau này bằng “git rebase --" "continue”)\n" -"d, drop <commit> = xóa lần chuyển giao\n" +"d, drop <commit> = xóa bỏ lần chuyển giao\n" "l, label <label> = đánh nhãn HEAD hiện tại bằng một tên\n" "t, reset <label> = đặt lại HEAD thành một nhãn\n" "m, merge [-C <commit> | -c <commit>] <nhãn> [# <một_dòng>]\n" @@ -6388,16 +6475,16 @@ msgstr "" ". trộn gốc). Dùng -c <commit> để reword chú thích của lần chuyển " "giao.\n" "\n" -"Những dòng này có thể đảo ngược thứ tự; chúng chạy từ trên đỉnh xuống dưới " -"đáy.\n" +"Những dòng này có thể được thay đổi thứ tự; chúng chạy từ trên đỉnh xuống " +"dưới đáy.\n" -#: rebase-interactive.c:63 +#: rebase-interactive.c:66 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Cải tổ %s vào %s (%d lệnh )" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -6406,7 +6493,7 @@ msgstr "" "Đừng xóa bất kỳ dòng nào. Dùng “drop” một cách rõ ràng để xóa bỏ một lần " "chuyển giao.\n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 +#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -6414,7 +6501,7 @@ msgstr "" "\n" "Nếu bạn xóa bỏ một dòng ở đây thì LẦN CHUYỂN GIAO ĐÓ SẼ MẤT.\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 +#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -6428,7 +6515,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 +#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -6438,19 +6525,19 @@ msgstr "" "Tuy nhiên, nếu bạn xóa bỏ mọi thứ, việc cải tổ sẽ bị bãi bỏ.\n" "\n" -#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615 -#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816 +#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271 #, c-format msgid "could not write '%s'" msgstr "không thể ghi “%s”" -#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230 -#: builtin/rebase.c:254 +#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229 +#: builtin/rebase.c:253 #, c-format msgid "could not write '%s'." msgstr "không thể ghi “%s”." -#: rebase-interactive.c:193 +#: rebase-interactive.c:196 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -6459,7 +6546,7 @@ msgstr "" "Cảnh báo: một số lần chuyển giao có lẽ đã bị xóa một cách tình cờ.\n" "Các lần chuyển giao bị xóa (từ mới đến cũ):\n" -#: rebase-interactive.c:200 +#: rebase-interactive.c:203 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -6477,14 +6564,14 @@ msgstr "" "Cánh ứng xử có thể là: ignore, warn, error.\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402 -#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241 -#: builtin/rebase.c:266 +#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597 +#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240 +#: builtin/rebase.c:265 #, c-format msgid "could not read '%s'." msgstr "không thể đọc “%s”." -#: ref-filter.c:42 wt-status.c:1975 +#: ref-filter.c:42 wt-status.c:1978 msgid "gone" msgstr "đã ra đi" @@ -6641,111 +6728,111 @@ msgstr "" msgid "format: %%(if) atom used without a %%(then) atom" msgstr "định dạng: nguyên tử %%(if) được dùng mà không có nguyên tử %%(then)" -#: ref-filter.c:806 +#: ref-filter.c:807 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "định dạng: nguyên tử %%(then) được dùng mà không có nguyên tử %%(if)" -#: ref-filter.c:808 +#: ref-filter.c:809 #, c-format msgid "format: %%(then) atom used more than once" msgstr "định dạng: nguyên tử %%(then) được dùng nhiều hơn một lần" -#: ref-filter.c:810 +#: ref-filter.c:811 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "định dạng: nguyên tử %%(then) được dùng sau %%(else)" -#: ref-filter.c:838 +#: ref-filter.c:839 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(if)" -#: ref-filter.c:840 +#: ref-filter.c:841 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(then)" -#: ref-filter.c:842 +#: ref-filter.c:843 #, c-format msgid "format: %%(else) atom used more than once" msgstr "định dạng: nguyên tử %%(else) được dùng nhiều hơn một lần" -#: ref-filter.c:857 +#: ref-filter.c:858 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "định dạng: nguyên tử %%(end) được dùng mà không có nguyên tử tương ứng" -#: ref-filter.c:914 +#: ref-filter.c:915 #, c-format msgid "malformed format string %s" msgstr "chuỗi định dạng dị hình %s" -#: ref-filter.c:1555 +#: ref-filter.c:1556 #, c-format msgid "(no branch, rebasing %s)" msgstr "(không nhánh, đang cải tổ %s)" -#: ref-filter.c:1558 +#: ref-filter.c:1559 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(không nhánh, đang cải tổ HEAD %s đã tách rời)" -#: ref-filter.c:1561 +#: ref-filter.c:1562 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s)" -#: ref-filter.c:1565 +#: ref-filter.c:1566 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD được tách rời tại %s)" -#: ref-filter.c:1568 +#: ref-filter.c:1569 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD được tách rời từ %s)" -#: ref-filter.c:1571 +#: ref-filter.c:1572 msgid "(no branch)" msgstr "(không nhánh)" -#: ref-filter.c:1603 ref-filter.c:1812 +#: ref-filter.c:1604 ref-filter.c:1813 #, c-format msgid "missing object %s for %s" msgstr "thiếu đối tượng %s cho %s" -#: ref-filter.c:1613 +#: ref-filter.c:1614 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer gặp lỗi trên %s cho %s" -#: ref-filter.c:1996 +#: ref-filter.c:1997 #, c-format msgid "malformed object at '%s'" msgstr "đối tượng dị hình tại “%s”" -#: ref-filter.c:2085 +#: ref-filter.c:2086 #, c-format msgid "ignoring ref with broken name %s" msgstr "đang lờ đi tham chiếu với tên hỏng %s" -#: ref-filter.c:2090 refs.c:676 +#: ref-filter.c:2091 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "đang lờ đi tham chiếu hỏng %s" -#: ref-filter.c:2430 +#: ref-filter.c:2431 #, c-format msgid "format: %%(end) atom missing" msgstr "định dạng: thiếu nguyên tử %%(end)" -#: ref-filter.c:2529 +#: ref-filter.c:2525 #, c-format msgid "malformed object name %s" msgstr "tên đối tượng dị hình %s" -#: ref-filter.c:2534 +#: ref-filter.c:2530 #, c-format msgid "option `%s' must point to a commit" msgstr "tùy chọn “%s” phải chỉ đến một lần chuyển giao" @@ -7203,8 +7290,8 @@ msgstr "không thể unlink stray “%s”" msgid "Recorded preimage for '%s'" msgstr "Preimage đã được ghi lại cho “%s”" -#: rerere.c:865 submodule.c:2088 builtin/log.c:1991 -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 +#: rerere.c:865 submodule.c:2089 builtin/log.c:2000 +#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891 #, c-format msgid "could not create directory '%s'" msgstr "không thể tạo thư mục “%s”" @@ -7242,25 +7329,25 @@ msgstr "không thể mở thư mục rr-cache" msgid "could not determine HEAD revision" msgstr "không thể dò tìm điểm xét duyệt HEAD" -#: reset.c:70 reset.c:76 sequencer.c:3468 +#: reset.c:70 reset.c:76 sequencer.c:3669 #, c-format msgid "failed to find tree of %s" msgstr "gặp lỗi khi tìm cây của %s" -#: revision.c:2338 +#: revision.c:2343 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<packfile> không còn được hỗ trợ nữa" -#: revision.c:2668 +#: revision.c:2683 msgid "your current branch appears to be broken" msgstr "nhánh hiện tại của bạn có vẻ như bị hỏng" -#: revision.c:2671 +#: revision.c:2686 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "nhánh hiện tại của bạn “%s” không có một lần chuyển giao nào cả" -#: revision.c:2877 +#: revision.c:2892 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L vẫn chưa hỗ trợ định dạng khác biệt nào ngoài -p và -s" @@ -7268,12 +7355,12 @@ msgstr "-L vẫn chưa hỗ trợ định dạng khác biệt nào ngoài -p và msgid "open /dev/null failed" msgstr "gặp lỗi khi mở “/dev/null”" -#: run-command.c:1274 +#: run-command.c:1275 #, c-format msgid "cannot create async thread: %s" msgstr "không thể tạo tuyến async: %s" -#: run-command.c:1338 +#: run-command.c:1345 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -7282,34 +7369,42 @@ msgstr "" "Móc “%s” bị bỏ qua bởi vì nó không thể đặt là thực thi được.\n" "Bạn có thể tắt cảnh báo này bằng “git config advice.ignoredHook false“." -#: send-pack.c:146 +#: send-pack.c:150 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "gặp gói flush không cần trong khi đọc tình trạng giải nén gói trên máy chủ" -#: send-pack.c:148 +#: send-pack.c:152 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "không thể phân tích tình trạng unpack máy chủ: %s" -#: send-pack.c:150 +#: send-pack.c:154 #, c-format msgid "remote unpack failed: %s" msgstr "máy chủ gặp lỗi unpack: %s" -#: send-pack.c:374 +#: send-pack.c:378 msgid "failed to sign the push certificate" msgstr "gặp lỗi khi ký chứng thực đẩy" -#: send-pack.c:467 +#: send-pack.c:433 +msgid "send-pack: unable to fork off fetch subprocess" +msgstr "send-pack: không thể rẽ nhánh tuyến trình con fetch" + +#: send-pack.c:455 +msgid "push negotiation failed; proceeding anyway with push" +msgstr "đẩy đàm phán thất bại; vẫn tiếp tục xử lý bằng lệnh đẩy" + +#: send-pack.c:520 msgid "the receiving end does not support this repository's hash algorithm" msgstr "kết thúc nhận không hỗ trợ các tùy chọn của lệnh push" -#: send-pack.c:476 +#: send-pack.c:529 msgid "the receiving end does not support --signed push" msgstr "kết thúc nhận không hỗ trợ đẩy --signed" -#: send-pack.c:478 +#: send-pack.c:531 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -7317,47 +7412,47 @@ msgstr "" "đừng gửi giấy chứng nhận đẩy trước khi kết thúc nhận không hỗ trợ đẩy --" "signed" -#: send-pack.c:490 +#: send-pack.c:543 msgid "the receiving end does not support --atomic push" msgstr "kết thúc nhận không hỗ trợ đẩy --atomic" -#: send-pack.c:495 +#: send-pack.c:548 msgid "the receiving end does not support push options" msgstr "kết thúc nhận không hỗ trợ các tùy chọn của lệnh push" -#: sequencer.c:195 +#: sequencer.c:196 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "chế độ dọn dẹp ghi chú các lần chuyển giao không hợp lệ “%s”" -#: sequencer.c:323 +#: sequencer.c:324 #, c-format msgid "could not delete '%s'" msgstr "không thể xóa bỏ “%s”" -#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385 +#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402 #, c-format msgid "could not remove '%s'" msgstr "không thể gỡ bỏ “%s”" -#: sequencer.c:353 +#: sequencer.c:354 msgid "revert" msgstr "hoàn nguyên" -#: sequencer.c:355 +#: sequencer.c:356 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:357 +#: sequencer.c:358 msgid "rebase" msgstr "rebase" -#: sequencer.c:359 +#: sequencer.c:360 #, c-format msgid "unknown action: %d" msgstr "không nhận ra thao tác: %d" -#: sequencer.c:418 +#: sequencer.c:419 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -7365,7 +7460,7 @@ msgstr "" "sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n" "với lệnh “git add </các/đường/dẫn>” hoặc “git rm </các/đường/dẫn>”" -#: sequencer.c:421 +#: sequencer.c:422 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -7375,43 +7470,43 @@ msgstr "" "với lệnh “git add </các/đường/dẫn>” hoặc “git rm </các/đường/dẫn>”\n" "và chuyển giao kết quả bằng lệnh “git commit”" -#: sequencer.c:434 sequencer.c:3070 +#: sequencer.c:435 sequencer.c:3271 #, c-format msgid "could not lock '%s'" msgstr "không thể khóa “%s”" -#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088 -#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 +#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "không thể ghi vào “%s”" -#: sequencer.c:441 +#: sequencer.c:442 #, c-format msgid "could not write eol to '%s'" msgstr "không thể ghi eol vào “%s”" -#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090 -#: sequencer.c:3353 +#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 +#: sequencer.c:3554 #, c-format msgid "failed to finalize '%s'" msgstr "gặp lỗi khi hoàn thành “%s”" -#: sequencer.c:485 +#: sequencer.c:486 #, c-format msgid "your local changes would be overwritten by %s." msgstr "các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh %s." -#: sequencer.c:489 +#: sequencer.c:490 msgid "commit your changes or stash them to proceed." msgstr "chuyển giao các thay đổi của bạn hay tạm cất (stash) chúng để xử lý." -#: sequencer.c:521 +#: sequencer.c:522 #, c-format msgid "%s: fast-forward" msgstr "%s: chuyển-tiếp-nhanh" -#: sequencer.c:560 builtin/tag.c:598 +#: sequencer.c:561 builtin/tag.c:609 #, c-format msgid "Invalid cleanup mode %s" msgstr "Chế độ dọn dẹp không hợp lệ %s" @@ -7419,65 +7514,65 @@ msgstr "Chế độ dọn dẹp không hợp lệ %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:670 +#: sequencer.c:671 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Không thể ghi tập tin lưu bảng mục lục mới" -#: sequencer.c:684 +#: sequencer.c:685 msgid "unable to update cache tree" msgstr "không thể cập nhật cây bộ nhớ đệm" -#: sequencer.c:698 +#: sequencer.c:699 msgid "could not resolve HEAD commit" msgstr "không thể phân giải lần chuyển giao HEAD" -#: sequencer.c:778 +#: sequencer.c:779 #, c-format msgid "no key present in '%.*s'" msgstr "không có khóa hiện diện trong “%.*s”" -#: sequencer.c:789 +#: sequencer.c:790 #, c-format msgid "unable to dequote value of '%s'" msgstr "không thể giải trích dẫn giá trị của “%s”" -#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728 +#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "không thể mở “%s” để đọc" -#: sequencer.c:836 +#: sequencer.c:837 msgid "'GIT_AUTHOR_NAME' already given" msgstr "“GIT_AUTHOR_NAME” đã sẵn đưa ra rồi" -#: sequencer.c:841 +#: sequencer.c:842 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "“GIT_AUTHOR_EMAIL” đã sẵn đưa ra rồi" -#: sequencer.c:846 +#: sequencer.c:847 msgid "'GIT_AUTHOR_DATE' already given" msgstr "“GIT_AUTHOR_DATE” đã sẵn đưa ra rồi" -#: sequencer.c:850 +#: sequencer.c:851 #, c-format msgid "unknown variable '%s'" msgstr "không hiểu biến “%s”" -#: sequencer.c:855 +#: sequencer.c:856 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "thiếu “GIT_AUTHOR_NAME”" -#: sequencer.c:857 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "thiếu “GIT_AUTHOR_EMAIL”" -#: sequencer.c:859 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "thiếu “GIT_AUTHOR_DATE”" -#: sequencer.c:924 +#: sequencer.c:925 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -7506,11 +7601,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1211 +#: sequencer.c:1212 msgid "'prepare-commit-msg' hook failed" msgstr "móc “prepare-commit-msg” bị lỗi" -#: sequencer.c:1217 +#: sequencer.c:1218 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7541,7 +7636,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1230 +#: sequencer.c:1231 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7569,341 +7664,345 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1272 +#: sequencer.c:1273 msgid "couldn't look up newly created commit" msgstr "không thể tìm thấy lần chuyển giao mới hơn đã được tạo" -#: sequencer.c:1274 +#: sequencer.c:1275 msgid "could not parse newly created commit" msgstr "" "không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo" -#: sequencer.c:1320 +#: sequencer.c:1321 msgid "unable to resolve HEAD after creating commit" msgstr "không thể phân giải HEAD sau khi tạo lần chuyển giao" -#: sequencer.c:1322 +#: sequencer.c:1323 msgid "detached HEAD" msgstr "đã rời khỏi HEAD" -#: sequencer.c:1326 +#: sequencer.c:1327 msgid " (root-commit)" msgstr " (root-commit)" -#: sequencer.c:1347 +#: sequencer.c:1348 msgid "could not parse HEAD" msgstr "không thể phân tích HEAD" -#: sequencer.c:1349 +#: sequencer.c:1350 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s không phải là một lần chuyển giao!" -#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692 msgid "could not parse HEAD commit" msgstr "không thể phân tích commit (lần chuyển giao) HEAD" -#: sequencer.c:1409 sequencer.c:2108 +#: sequencer.c:1410 sequencer.c:2295 msgid "unable to parse commit author" msgstr "không thể phân tích tác giả của lần chuyển giao" -#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702 +#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706 msgid "git write-tree failed to write a tree" msgstr "lệnh git write-tree gặp lỗi khi ghi một cây" -#: sequencer.c:1453 sequencer.c:1573 +#: sequencer.c:1454 sequencer.c:1574 #, c-format msgid "unable to read commit message from '%s'" msgstr "không thể đọc phần chú thích (message) từ “%s”" -#: sequencer.c:1484 sequencer.c:1516 +#: sequencer.c:1485 sequencer.c:1517 #, c-format msgid "invalid author identity '%s'" msgstr "định danh tác giả không hợp lệ “%s”" -#: sequencer.c:1490 +#: sequencer.c:1491 msgid "corrupt author: missing date information" msgstr "tác giả sai hỏng: thiếu thông tin này tháng" -#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905 -#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909 +#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "gặp lỗi khi ghi đối tượng chuyển giao" -#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "không thể cập nhật %s" -#: sequencer.c:1605 +#: sequencer.c:1606 #, c-format msgid "could not parse commit %s" msgstr "không thể phân tích lần chuyển giao %s" -#: sequencer.c:1610 +#: sequencer.c:1611 #, c-format msgid "could not parse parent commit %s" msgstr "không thể phân tích lần chuyển giao cha mẹ “%s”" -#: sequencer.c:1693 sequencer.c:1804 +#: sequencer.c:1694 sequencer.c:1975 #, c-format msgid "unknown command: %d" msgstr "không hiểu câu lệnh %d" -#: sequencer.c:1751 sequencer.c:1776 +#: sequencer.c:1736 git-rebase--preserve-merges.sh:486 +msgid "This is the 1st commit message:" +msgstr "Đây là chú thích cho lần chuyển giao thứ nhất:" + +#: sequencer.c:1737 +#, c-format +msgid "This is the commit message #%d:" +msgstr "Đây là chú thích cho lần chuyển giao thứ #%d:" + +#: sequencer.c:1738 +msgid "The 1st commit message will be skipped:" +msgstr "Chú thích cho lần chuyển giao thứ nhất sẽ bị bỏ qua:" + +#: sequencer.c:1739 +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "Chú thích cho lần chuyển giao thứ #%d sẽ bị bỏ qua:" + +#: sequencer.c:1740 #, c-format msgid "This is a combination of %d commits." msgstr "Đây là tổ hợp của %d lần chuyển giao." -#: sequencer.c:1761 +#: sequencer.c:1887 sequencer.c:1944 +#, c-format +msgid "cannot write '%s'" +msgstr "không thể ghi “%s”" + +#: sequencer.c:1934 msgid "need a HEAD to fixup" msgstr "cần một HEAD để sửa" -#: sequencer.c:1763 sequencer.c:3380 +#: sequencer.c:1936 sequencer.c:3581 msgid "could not read HEAD" msgstr "không thể đọc HEAD" -#: sequencer.c:1765 +#: sequencer.c:1938 msgid "could not read HEAD's commit message" msgstr "không thể đọc phần chú thích (message) của HEAD" -#: sequencer.c:1771 -#, c-format -msgid "cannot write '%s'" -msgstr "không thể ghi “%s”" - -#: sequencer.c:1778 git-rebase--preserve-merges.sh:486 -msgid "This is the 1st commit message:" -msgstr "Đây là chú thích cho lần chuyển giao thứ nhất:" - -#: sequencer.c:1786 +#: sequencer.c:1962 #, c-format msgid "could not read commit message of %s" msgstr "không thể đọc phần chú thích (message) của %s" -#: sequencer.c:1793 -#, c-format -msgid "This is the commit message #%d:" -msgstr "Đây là chú thích cho lần chuyển giao thứ #%d:" - -#: sequencer.c:1799 -#, c-format -msgid "The commit message #%d will be skipped:" -msgstr "Chú thích cho lần chuyển giao thứ #%d sẽ bị bỏ qua:" - -#: sequencer.c:1887 +#: sequencer.c:2072 msgid "your index file is unmerged." msgstr "tập tin lưu mục lục của bạn không được hòa trộn." -#: sequencer.c:1894 +#: sequencer.c:2079 msgid "cannot fixup root commit" msgstr "không thể sửa chữa lần chuyển giao gốc" -#: sequencer.c:1913 +#: sequencer.c:2098 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "lần chuyển giao %s là một lần hòa trộn nhưng không đưa ra tùy chọn -m." -#: sequencer.c:1921 sequencer.c:1929 +#: sequencer.c:2106 sequencer.c:2114 #, c-format msgid "commit %s does not have parent %d" msgstr "lần chuyển giao %s không có cha mẹ %d" -#: sequencer.c:1935 +#: sequencer.c:2120 #, c-format msgid "cannot get commit message for %s" msgstr "không thể lấy ghi chú lần chuyển giao cho %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1954 +#: sequencer.c:2139 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s" -#: sequencer.c:2019 +#: sequencer.c:2205 #, c-format msgid "could not rename '%s' to '%s'" msgstr "không thể đổi tên “%s” thành “%s”" -#: sequencer.c:2079 +#: sequencer.c:2265 #, c-format msgid "could not revert %s... %s" msgstr "không thể hoàn nguyên %s… %s" -#: sequencer.c:2080 +#: sequencer.c:2266 #, c-format msgid "could not apply %s... %s" msgstr "không thể áp dụng miếng vá %s… %s" -#: sequencer.c:2100 +#: sequencer.c:2287 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "xóa %s %s -- vá nội dung thượng nguồn đã có\n" -#: sequencer.c:2158 +#: sequencer.c:2345 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: gặp lỗi đọc bảng mục lục" -#: sequencer.c:2165 +#: sequencer.c:2352 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục" -#: sequencer.c:2242 +#: sequencer.c:2425 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s không nhận các đối số: “%s”" -#: sequencer.c:2251 +#: sequencer.c:2434 #, c-format msgid "missing arguments for %s" msgstr "thiếu đối số cho %s" -#: sequencer.c:2282 +#: sequencer.c:2477 #, c-format msgid "could not parse '%s'" msgstr "không thể phân tích cú pháp “%s”" -#: sequencer.c:2343 +#: sequencer.c:2538 #, c-format msgid "invalid line %d: %.*s" msgstr "dòng không hợp lệ %d: %.*s" -#: sequencer.c:2354 +#: sequencer.c:2549 #, c-format msgid "cannot '%s' without a previous commit" msgstr "không thể “%s” thể mà không có lần chuyển giao kế trước" -#: sequencer.c:2440 +#: sequencer.c:2635 msgid "cancelling a cherry picking in progress" msgstr "đang hủy bỏ thao tác cherry pick đang thực hiện" -#: sequencer.c:2449 +#: sequencer.c:2644 msgid "cancelling a revert in progress" msgstr "đang hủy bỏ các thao tác hoàn nguyên đang thực hiện" -#: sequencer.c:2493 +#: sequencer.c:2690 msgid "please fix this using 'git rebase --edit-todo'." msgstr "vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo”." -#: sequencer.c:2495 +#: sequencer.c:2692 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "bảng chỉ thị không thể dùng được: %s" -#: sequencer.c:2500 +#: sequencer.c:2697 msgid "no commits parsed." msgstr "không có lần chuyển giao nào được phân tích." -#: sequencer.c:2511 +#: sequencer.c:2708 msgid "cannot cherry-pick during a revert." msgstr "không thể cherry-pick trong khi hoàn nguyên." -#: sequencer.c:2513 +#: sequencer.c:2710 msgid "cannot revert during a cherry-pick." msgstr "không thể thực hiện việc hoàn nguyên trong khi đang cherry-pick." -#: sequencer.c:2591 +#: sequencer.c:2788 #, c-format msgid "invalid value for %s: %s" msgstr "giá trị cho %s không hợp lệ: %s" -#: sequencer.c:2698 +#: sequencer.c:2897 msgid "unusable squash-onto" msgstr "squash-onto không dùng được" -#: sequencer.c:2718 +#: sequencer.c:2917 #, c-format msgid "malformed options sheet: '%s'" msgstr "bảng tùy chọn dị hình: “%s”" -#: sequencer.c:2811 sequencer.c:4644 +#: sequencer.c:3012 sequencer.c:4869 msgid "empty commit set passed" msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách" -#: sequencer.c:2828 +#: sequencer.c:3029 msgid "revert is already in progress" msgstr "có thao tác hoàn nguyên đang được thực hiện" -#: sequencer.c:2830 +#: sequencer.c:3031 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "hãy thử \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2833 +#: sequencer.c:3034 msgid "cherry-pick is already in progress" msgstr "có thao tác “cherry-pick” đang được thực hiện" -#: sequencer.c:2835 +#: sequencer.c:3036 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "hãy thử \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2849 +#: sequencer.c:3050 #, c-format msgid "could not create sequencer directory '%s'" msgstr "không thể tạo thư mục xếp dãy “%s”" -#: sequencer.c:2864 +#: sequencer.c:3065 msgid "could not lock HEAD" msgstr "không thể khóa HEAD" -#: sequencer.c:2924 sequencer.c:4379 +#: sequencer.c:3125 sequencer.c:4582 msgid "no cherry-pick or revert in progress" msgstr "không cherry-pick hay hoàn nguyên trong tiến trình" -#: sequencer.c:2926 sequencer.c:2937 +#: sequencer.c:3127 sequencer.c:3138 msgid "cannot resolve HEAD" msgstr "không thể phân giải HEAD" -#: sequencer.c:2928 sequencer.c:2972 +#: sequencer.c:3129 sequencer.c:3173 msgid "cannot abort from a branch yet to be born" msgstr "không thể hủy bỏ từ một nhánh mà nó còn chưa được tạo ra" -#: sequencer.c:2958 builtin/grep.c:757 +#: sequencer.c:3159 builtin/grep.c:759 #, c-format msgid "cannot open '%s'" msgstr "không mở được “%s”" -#: sequencer.c:2960 +#: sequencer.c:3161 #, c-format msgid "cannot read '%s': %s" msgstr "không thể đọc “%s”: %s" -#: sequencer.c:2961 +#: sequencer.c:3162 msgid "unexpected end of file" msgstr "gặp kết thúc tập tin đột xuất" -#: sequencer.c:2967 +#: sequencer.c:3168 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "tập tin HEAD “pre-cherry-pick” đã lưu “%s” bị hỏng" -#: sequencer.c:2978 +#: sequencer.c:3179 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Bạn có lẽ đã có HEAD đã bị di chuyển đi, Không thể tua, kiểm tra HEAD của " "bạn!" -#: sequencer.c:3019 +#: sequencer.c:3220 msgid "no revert in progress" msgstr "không có tiến trình hoàn nguyên nào" -#: sequencer.c:3028 +#: sequencer.c:3229 msgid "no cherry-pick in progress" msgstr "không có cherry-pick đang được thực hiện" -#: sequencer.c:3038 +#: sequencer.c:3239 msgid "failed to skip the commit" msgstr "gặp lỗi khi bỏ qua đối tượng chuyển giao" -#: sequencer.c:3045 +#: sequencer.c:3246 msgid "there is nothing to skip" msgstr "ở đây không có gì để mà bỏ qua cả" -#: sequencer.c:3048 +#: sequencer.c:3249 #, c-format msgid "" "have you committed already?\n" @@ -7912,16 +8011,16 @@ msgstr "" "bạn đã sẵn sàng chuyển giao chưa?\n" "thử \"git %s --continue\"" -#: sequencer.c:3210 sequencer.c:4271 +#: sequencer.c:3411 sequencer.c:4473 msgid "cannot read HEAD" msgstr "không thể đọc HEAD" -#: sequencer.c:3227 +#: sequencer.c:3428 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "không thể chép “%s” sang “%s”" -#: sequencer.c:3235 +#: sequencer.c:3436 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7940,27 +8039,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3245 +#: sequencer.c:3446 #, c-format msgid "Could not apply %s... %.*s" msgstr "Không thể áp dụng %s… %.*s" -#: sequencer.c:3252 +#: sequencer.c:3453 #, c-format msgid "Could not merge %.*s" msgstr "Không hòa trộn %.*s" -#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640 +#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644 #, c-format msgid "could not copy '%s' to '%s'" msgstr "không thể chép “%s” sang “%s”" -#: sequencer.c:3282 +#: sequencer.c:3483 #, c-format msgid "Executing: %s\n" msgstr "Đang thực thi: %s\n" -#: sequencer.c:3297 +#: sequencer.c:3498 #, c-format msgid "" "execution failed: %s\n" @@ -7975,11 +8074,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3303 +#: sequencer.c:3504 msgid "and made changes to the index and/or the working tree\n" msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc\n" -#: sequencer.c:3309 +#: sequencer.c:3510 #, c-format msgid "" "execution succeeded: %s\n" @@ -7996,90 +8095,90 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3370 +#: sequencer.c:3571 #, c-format msgid "illegal label name: '%.*s'" msgstr "tên nhãn dị hình: “%.*s”" -#: sequencer.c:3424 +#: sequencer.c:3625 msgid "writing fake root commit" msgstr "ghi lần chuyển giao gốc giả" -#: sequencer.c:3429 +#: sequencer.c:3630 msgid "writing squash-onto" msgstr "đang ghi squash-onto" -#: sequencer.c:3513 +#: sequencer.c:3714 #, c-format msgid "could not resolve '%s'" msgstr "không thể phân giải “%s”" -#: sequencer.c:3546 +#: sequencer.c:3747 msgid "cannot merge without a current revision" msgstr "không thể hòa trộn mà không có một điểm xét duyệt hiện tại" -#: sequencer.c:3568 +#: sequencer.c:3769 #, c-format msgid "unable to parse '%.*s'" msgstr "không thể phân tích “%.*s”" -#: sequencer.c:3577 +#: sequencer.c:3778 #, c-format msgid "nothing to merge: '%.*s'" msgstr "chẳng có gì để hòa trộn: “%.*s”" -#: sequencer.c:3589 +#: sequencer.c:3790 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "hòa trộn octopus không thể được thực thi trên đỉnh của một [new root]" -#: sequencer.c:3605 +#: sequencer.c:3806 #, c-format msgid "could not get commit message of '%s'" msgstr "không thể lấy chú thích của lần chuyển giao của “%s”" -#: sequencer.c:3788 +#: sequencer.c:3989 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "không thể ngay cả khi thử hòa trộn “%.*s”" -#: sequencer.c:3804 +#: sequencer.c:4005 msgid "merge: Unable to write new index file" msgstr "merge: Không thể ghi tập tin lưu bảng mục lục mới" -#: sequencer.c:3878 +#: sequencer.c:4079 msgid "Cannot autostash" msgstr "Không thể autostash" -#: sequencer.c:3881 +#: sequencer.c:4082 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Gặp đáp ứng stash không cần: “%s”" -#: sequencer.c:3887 +#: sequencer.c:4088 #, c-format msgid "Could not create directory for '%s'" msgstr "Không thể tạo thư mục cho “%s”" -#: sequencer.c:3890 +#: sequencer.c:4091 #, c-format msgid "Created autostash: %s\n" msgstr "Đã tạo autostash: %s\n" -#: sequencer.c:3894 +#: sequencer.c:4095 msgid "could not reset --hard" msgstr "không thể reset --hard" -#: sequencer.c:3919 +#: sequencer.c:4120 #, c-format msgid "Applied autostash.\n" msgstr "Đã áp dụng autostash.\n" -#: sequencer.c:3931 +#: sequencer.c:4132 #, c-format msgid "cannot store %s" msgstr "không thử lưu “%s”" -#: sequencer.c:3934 +#: sequencer.c:4135 #, c-format msgid "" "%s\n" @@ -8091,29 +8190,29 @@ msgstr "" "Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc " "nào.\n" -#: sequencer.c:3939 +#: sequencer.c:4140 msgid "Applying autostash resulted in conflicts." msgstr "Áp dụng autostash có hiệu quả trong các xung đột." -#: sequencer.c:3940 +#: sequencer.c:4141 msgid "Autostash exists; creating a new stash entry." msgstr "Autostash đã sẵn có; nên tạo một mục stash mới." -#: sequencer.c:4033 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4234 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "không thể tách rời HEAD" -#: sequencer.c:4048 +#: sequencer.c:4249 #, c-format msgid "Stopped at HEAD\n" msgstr "Dừng lại ở HEAD\n" -#: sequencer.c:4050 +#: sequencer.c:4251 #, c-format msgid "Stopped at %s\n" msgstr "Dừng lại ở %s\n" -#: sequencer.c:4058 +#: sequencer.c:4259 #, c-format msgid "" "Could not execute the todo command\n" @@ -8134,58 +8233,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4104 +#: sequencer.c:4305 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Đang cải tổ (%d/%d)%s" -#: sequencer.c:4149 +#: sequencer.c:4351 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Dừng lại ở %s… %.*s\n" -#: sequencer.c:4220 +#: sequencer.c:4422 #, c-format msgid "unknown command %d" msgstr "không hiểu câu lệnh %d" -#: sequencer.c:4279 +#: sequencer.c:4481 msgid "could not read orig-head" msgstr "không thể đọc orig-head" -#: sequencer.c:4284 +#: sequencer.c:4486 msgid "could not read 'onto'" msgstr "không thể đọc “onto”." -#: sequencer.c:4298 +#: sequencer.c:4500 #, c-format msgid "could not update HEAD to %s" msgstr "không thể cập nhật HEAD thành %s" -#: sequencer.c:4358 +#: sequencer.c:4560 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Cài tổ và cập nhật %s một cách thành công.\n" -#: sequencer.c:4391 +#: sequencer.c:4612 msgid "cannot rebase: You have unstaged changes." msgstr "không thể cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng." -#: sequencer.c:4400 +#: sequencer.c:4621 msgid "cannot amend non-existing commit" msgstr "không thể tu bỏ một lần chuyển giao không tồn tại" -#: sequencer.c:4402 +#: sequencer.c:4623 #, c-format msgid "invalid file: '%s'" msgstr "tập tin không hợp lệ: “%s”" -#: sequencer.c:4404 +#: sequencer.c:4625 #, c-format msgid "invalid contents: '%s'" msgstr "nội dung không hợp lệ: “%s”" -#: sequencer.c:4407 +#: sequencer.c:4628 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8195,50 +8294,50 @@ msgstr "" "Bạn có các thay đổi chưa chuyển giao trong thư mục làm việc. Vui lòng\n" "chuyển giao chúng trước và sau đó chạy lệnh “git rebase --continue” lần nữa." -#: sequencer.c:4443 sequencer.c:4482 +#: sequencer.c:4664 sequencer.c:4703 #, c-format msgid "could not write file: '%s'" msgstr "không thể ghi tập tin: “%s”" -#: sequencer.c:4498 +#: sequencer.c:4719 msgid "could not remove CHERRY_PICK_HEAD" msgstr "không thể xóa bỏ CHERRY_PICK_HEAD" -#: sequencer.c:4505 +#: sequencer.c:4726 msgid "could not commit staged changes." msgstr "không thể chuyển giao các thay đổi đã đưa lên bệ phóng." -#: sequencer.c:4621 +#: sequencer.c:4846 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: không thể cherry-pick một %s" -#: sequencer.c:4625 +#: sequencer.c:4850 #, c-format msgid "%s: bad revision" msgstr "%s: điểm xét duyệt sai" -#: sequencer.c:4660 +#: sequencer.c:4885 msgid "can't revert as initial commit" msgstr "không thể hoàn nguyên một lần chuyển giao khởi tạo" -#: sequencer.c:5137 +#: sequencer.c:5362 msgid "make_script: unhandled options" msgstr "make_script: các tùy chọn được không xử lý" -#: sequencer.c:5140 +#: sequencer.c:5365 msgid "make_script: error preparing revisions" msgstr "make_script: lỗi chuẩn bị điểm hiệu chỉnh" -#: sequencer.c:5382 sequencer.c:5399 +#: sequencer.c:5615 sequencer.c:5632 msgid "nothing to do" msgstr "không có gì để làm" -#: sequencer.c:5418 +#: sequencer.c:5651 msgid "could not skip unnecessary pick commands" msgstr "không thể bỏ qua các lệnh cậy (pick) không cần thiết" -#: sequencer.c:5512 +#: sequencer.c:5751 msgid "the script was already rearranged." msgstr "văn lệnh đã sẵn được sắp đặt rồi." @@ -8384,7 +8483,7 @@ msgstr "" "Dừng tại biên của hệ thống tập tin (GIT_DISCOVERY_ACROSS_FILESYSTEM chưa " "đặt)." -#: setup.c:1362 +#: setup.c:1370 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -8393,75 +8492,88 @@ msgstr "" "gặp vấn đề với giá trị chế độ tập tin core.sharedRepository (0%.3o).\n" "người sở hữu tập tin phải luôn có quyền đọc và ghi." -#: setup.c:1409 +#: setup.c:1417 msgid "open /dev/null or dup failed" msgstr "gặp lỗi khi mở “/dev/null” hay dup" -#: setup.c:1424 +#: setup.c:1432 msgid "fork failed" msgstr "gặp lỗi khi rẽ nhánh tiến trình" -#: setup.c:1429 +#: setup.c:1437 t/helper/test-simple-ipc.c:285 msgid "setsid failed" msgstr "setsid gặp lỗi" +#: sparse-index.c:151 +msgid "attempting to use sparse-index without cone mode" +msgstr "cố gắng sử dụng chỉ mục thưa thớt mà không có chế độ hình nón" + +#: sparse-index.c:156 +msgid "unable to update cache-tree, staying full" +msgstr "không thể cập nhật cây bộ nhớ đệm, chỗ chứa bị đầy" + +#: sparse-index.c:239 +#, c-format +msgid "index entry is a directory, but not sparse (%08x)" +msgstr "mục tin mục lục là một thư mục, nhưng không \"sparse\" (%08x)" + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:848 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:850 +#: strbuf.c:852 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/giây" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:858 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:860 +#: strbuf.c:862 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/giây" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:867 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:869 +#: strbuf.c:871 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/giây" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:875 +#: strbuf.c:877 #, c-format msgid "%u byte" msgid_plural "%u bytes" msgstr[0] "%u byte" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:877 +#: strbuf.c:879 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u byte/giây" -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737 #: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" msgstr "không thể mở “%s” để ghi" -#: strbuf.c:1175 +#: strbuf.c:1177 #, c-format msgid "could not edit '%s'" msgstr "không thể sửa “%s”" @@ -8512,22 +8624,22 @@ msgstr "Không thể gỡ bỏ mục .gitmodules dành cho %s" msgid "staging updated .gitmodules failed" msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật" -#: submodule.c:327 +#: submodule.c:328 #, c-format msgid "in unpopulated submodule '%s'" msgstr "trong mô-đun-con không có gì “%s”" -#: submodule.c:358 +#: submodule.c:359 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s”" -#: submodule.c:435 +#: submodule.c:436 #, c-format msgid "bad --ignore-submodules argument: %s" msgstr "đối số --ignore-submodules sai: %s" -#: submodule.c:817 +#: submodule.c:818 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " @@ -8536,13 +8648,13 @@ msgstr "" "Mô-đun-con trong lần chuyển giao %s tại đường dẫn: “%s” va chạm với mô-đun-" "con cùng tên. Nên bỏ qua nó." -#: submodule.c:920 +#: submodule.c:921 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" "mục tin mô-đun-con “%s” (%s) là một %s, không phải là một lần chuyển giao" -#: submodule.c:1005 +#: submodule.c:1006 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " @@ -8551,36 +8663,36 @@ msgstr "" "Không thể chạy lệnh “git rev-list <các lần chuyển giao> --not --remotes -n " "1” trong mô-đun-con “%s”" -#: submodule.c:1128 +#: submodule.c:1129 #, c-format msgid "process for submodule '%s' failed" msgstr "xử lý cho mô-đun-con “%s” gặp lỗi" -#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469 +#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470 msgid "Failed to resolve HEAD as a valid ref." msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu hợp lệ." -#: submodule.c:1168 +#: submodule.c:1169 #, c-format msgid "Pushing submodule '%s'\n" msgstr "Đẩy lên mô-đun-con “%s”\n" -#: submodule.c:1171 +#: submodule.c:1172 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "Không thể đẩy lên mô-đun-con “%s”\n" -#: submodule.c:1463 +#: submodule.c:1464 #, c-format msgid "Fetching submodule %s%s\n" msgstr "Đang lấy về mô-đun-con %s%s\n" -#: submodule.c:1497 +#: submodule.c:1498 #, c-format msgid "Could not access submodule '%s'\n" msgstr "Không thể truy cập mô-đun-con “%s”\n" -#: submodule.c:1652 +#: submodule.c:1653 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8589,61 +8701,61 @@ msgstr "" "Có lỗi khi lấy về mô-đun-con:\n" " “%s”" -#: submodule.c:1677 +#: submodule.c:1678 #, c-format msgid "'%s' not recognized as a git repository" msgstr "không nhận ra “%s” là một kho git" -#: submodule.c:1694 +#: submodule.c:1695 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "Không thể chạy “git status --porcelain=2” trong mô-đun-con “%s”" -#: submodule.c:1735 +#: submodule.c:1736 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "“git status --porcelain=2” gặp lỗi trong mô-đun-con “%s”" -#: submodule.c:1810 +#: submodule.c:1811 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "không thể lấy thống kê “git status” trong mô-đun-con “%s”" -#: submodule.c:1823 +#: submodule.c:1824 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "không thể chạy “git status” trong mô-đun-con “%s”" -#: submodule.c:1838 +#: submodule.c:1839 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Không thể đặt core.worktree trong mô-đun-con “%s”" -#: submodule.c:1865 submodule.c:2175 +#: submodule.c:1866 submodule.c:2176 #, c-format msgid "could not recurse into submodule '%s'" msgstr "không thể đệ quy vào trong mô-đun-con “%s”" -#: submodule.c:1886 +#: submodule.c:1887 msgid "could not reset submodule index" msgstr "không thể đặt lại mục lục của mô-đun-con" -#: submodule.c:1928 +#: submodule.c:1929 #, c-format msgid "submodule '%s' has dirty index" msgstr "mô-đun-con “%s” có mục lục còn bẩn" -#: submodule.c:1980 +#: submodule.c:1981 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Mô-đun-con “%s” không thể được cập nhật." -#: submodule.c:2048 +#: submodule.c:2049 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "thư mục git mô đun con “%s” là bên trong git DIR “%.*s”" -#: submodule.c:2069 +#: submodule.c:2070 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8651,17 +8763,17 @@ msgstr "" "relocate_gitdir cho mô-đun-con “%s” với nhiều hơn một cây làm việc là chưa " "được hỗ trợ" -#: submodule.c:2081 submodule.c:2140 +#: submodule.c:2082 submodule.c:2141 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "không thể tìm kiếm tên cho mô-đun-con “%s”" -#: submodule.c:2085 +#: submodule.c:2086 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "từ chối di chuyển “%s” vào trong một thư mục git sẵn có" -#: submodule.c:2092 +#: submodule.c:2093 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8672,65 +8784,71 @@ msgstr "" "“%s” sang\n" "“%s”\n" -#: submodule.c:2220 +#: submodule.c:2221 msgid "could not start ls-files in .." msgstr "không thể lấy thông tin thống kê về ls-files trong .." -#: submodule.c:2260 +#: submodule.c:2261 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree trả về mã không như mong đợi %d" -#: trailer.c:236 +#: symlinks.c:244 +#, c-format +msgid "failed to lstat '%s'" +msgstr "gặp lỗi khi lstat “%s”" + +#: trailer.c:244 #, c-format msgid "running trailer command '%s' failed" msgstr "chạy lệnh kéo theo “%s” gặp lỗi" -#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 -#: trailer.c:555 +#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566 +#: trailer.c:570 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "không hiểu giá trị “%s” cho khóa “%s”" -#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 +#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299 +#: builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "nhiều hơn một %s" -#: trailer.c:728 +#: trailer.c:743 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "thẻ thừa trống rỗng trong phần thừa “%.*s”" -#: trailer.c:748 +#: trailer.c:763 #, c-format msgid "could not read input file '%s'" msgstr "không đọc được tập tin đầu vào “%s”" -#: trailer.c:751 builtin/mktag.c:91 +#: trailer.c:766 builtin/mktag.c:88 msgid "could not read from stdin" msgstr "không thể đọc từ đầu vào tiêu chuẩn" -#: trailer.c:1009 wrapper.c:676 +#: trailer.c:1024 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "không thể lấy thông tin thống kê về %s" -#: trailer.c:1011 +#: trailer.c:1026 #, c-format msgid "file %s is not a regular file" msgstr "\"%s\" không phải là tập tin bình thường" -#: trailer.c:1013 +#: trailer.c:1028 #, c-format msgid "file %s is not writable by user" msgstr "tập tin %s người dùng không thể ghi được" -#: trailer.c:1025 +#: trailer.c:1040 msgid "could not open temporary file" msgstr "không thể tạo tập tin tạm thời" -#: trailer.c:1065 +#: trailer.c:1080 #, c-format msgid "could not rename temporary file to %s" msgstr "không thể đổi tên tập tin tạm thời thành %s" @@ -8779,7 +8897,7 @@ msgstr "không thể chạy fast-import" msgid "error while running fast-import" msgstr "gặp lỗi trong khi chạy fast-import" -#: transport-helper.c:549 transport-helper.c:1237 +#: transport-helper.c:549 transport-helper.c:1247 #, c-format msgid "could not read ref %s" msgstr "không thể đọc tham chiếu %s" @@ -8797,7 +8915,7 @@ msgstr "giao thức này không hỗ trợ cài đặt đường dẫn dịch v msgid "invalid remote service path" msgstr "đường dẫn dịch vụ máy chủ không hợp lệ" -#: transport-helper.c:661 transport.c:1447 +#: transport-helper.c:661 transport.c:1471 msgid "operation not supported by protocol" msgstr "thao tác không được gia thức hỗ trợ" @@ -8806,68 +8924,72 @@ msgstr "thao tác không được gia thức hỗ trợ" msgid "can't connect to subservice %s" msgstr "không thể kết nối đến dịch vụ phụ %s" -#: transport-helper.c:745 +#: transport-helper.c:693 transport.c:397 +msgid "--negotiate-only requires protocol v2" +msgstr "--negotiate-only cần giao thức v2" + +#: transport-helper.c:755 msgid "'option' without a matching 'ok/error' directive" msgstr "“option” không có chỉ thị “ok/error” tương ứng" -#: transport-helper.c:788 +#: transport-helper.c:798 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "cần ok/error, nhưng bộ hỗ trợ lại nói “%s”" -#: transport-helper.c:845 +#: transport-helper.c:855 #, c-format msgid "helper reported unexpected status of %s" msgstr "bộ hỗ trợ báo cáo rằng không cần tình trạng của %s" -#: transport-helper.c:928 +#: transport-helper.c:938 #, c-format msgid "helper %s does not support dry-run" msgstr "helper %s không hỗ trợ dry-run" -#: transport-helper.c:931 +#: transport-helper.c:941 #, c-format msgid "helper %s does not support --signed" msgstr "helper %s không hỗ trợ --signed" -#: transport-helper.c:934 +#: transport-helper.c:944 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "helper %s không hỗ trợ --signed=if-asked" -#: transport-helper.c:939 +#: transport-helper.c:949 #, c-format msgid "helper %s does not support --atomic" msgstr "helper %s không hỗ trợ --atomic" -#: transport-helper.c:943 +#: transport-helper.c:953 #, c-format msgid "helper %s does not support --%s" msgstr "helper %s không hỗ trợ --%s" -#: transport-helper.c:950 +#: transport-helper.c:960 #, c-format msgid "helper %s does not support 'push-option'" msgstr "helper %s không hỗ trợ “push-option”" -#: transport-helper.c:1050 +#: transport-helper.c:1060 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-helper không hỗ trợ push; cần đặc tả tham chiếu" -#: transport-helper.c:1055 +#: transport-helper.c:1065 #, c-format msgid "helper %s does not support 'force'" msgstr "helper %s không hỗ trợ “force”" -#: transport-helper.c:1102 +#: transport-helper.c:1112 msgid "couldn't run fast-export" msgstr "không thể chạy fast-export" -#: transport-helper.c:1107 +#: transport-helper.c:1117 msgid "error while running fast-export" msgstr "gặp lỗi trong khi chạy fast-export" -#: transport-helper.c:1132 +#: transport-helper.c:1142 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8877,52 +8999,52 @@ msgstr "" "cả.\n" "Tuy nhiên bạn nên chỉ định một nhánh.\n" -#: transport-helper.c:1214 +#: transport-helper.c:1224 #, c-format msgid "unsupported object format '%s'" msgstr "không hỗ trợ định dạng đối tượng “%s”" -#: transport-helper.c:1223 +#: transport-helper.c:1233 #, c-format msgid "malformed response in ref list: %s" msgstr "đáp ứng sai dạng trong danh sách tham chiếu: %s" -#: transport-helper.c:1375 +#: transport-helper.c:1385 #, c-format msgid "read(%s) failed" msgstr "read(%s) gặp lỗi" -#: transport-helper.c:1402 +#: transport-helper.c:1412 #, c-format msgid "write(%s) failed" msgstr "write(%s) gặp lỗi" -#: transport-helper.c:1451 +#: transport-helper.c:1461 #, c-format msgid "%s thread failed" msgstr "tuyến trình %s gặp lỗi" -#: transport-helper.c:1455 +#: transport-helper.c:1465 #, c-format msgid "%s thread failed to join: %s" msgstr "tuyến trình %s gặp lỗi khi gia nhập: %s" -#: transport-helper.c:1474 transport-helper.c:1478 +#: transport-helper.c:1484 transport-helper.c:1488 #, c-format msgid "can't start thread for copying data: %s" msgstr "không thể khởi chạy tuyến trình để sao chép dữ liệu: %s" -#: transport-helper.c:1515 +#: transport-helper.c:1525 #, c-format msgid "%s process failed to wait" msgstr "xử lý %s gặp lỗi khi đợi" -#: transport-helper.c:1519 +#: transport-helper.c:1529 #, c-format msgid "%s process failed" msgstr "xử lý %s gặp lỗi" -#: transport-helper.c:1537 transport-helper.c:1546 +#: transport-helper.c:1547 transport-helper.c:1556 msgid "can't start thread for copying data" msgstr "không thể khởi chạy tuyến trình cho việc chép dữ liệu" @@ -8941,37 +9063,41 @@ msgstr "không thể đọc bó “%s”" msgid "transport: invalid depth option '%s'" msgstr "vận chuyển: tùy chọn độ sâu “%s” không hợp lệ" -#: transport.c:269 +#: transport.c:272 msgid "see protocol.version in 'git help config' for more details" msgstr "xem protocol.version trong “git help config” để có thêm thông tin" -#: transport.c:270 +#: transport.c:273 msgid "server options require protocol version 2 or later" msgstr "các tùy chọn máy chủ yêu cầu giao thức phiên bản 2 hoặc mới hơn" -#: transport.c:727 +#: transport.c:400 +msgid "server does not support wait-for-done" +msgstr "Máy chủ không hỗ trợ wait-for-done" + +#: transport.c:751 msgid "could not parse transport.color.* config" msgstr "không thể phân tích cú pháp cấu hình transport.color.*" -#: transport.c:802 +#: transport.c:826 msgid "support for protocol v2 not implemented yet" msgstr "việc hỗ trợ giao thức v2 chưa được thực hiện" -#: transport.c:936 +#: transport.c:960 #, c-format msgid "unknown value for config '%s': %s" msgstr "không hiểu giá trị cho cho cấu hình “%s”: %s" -#: transport.c:1002 +#: transport.c:1026 #, c-format msgid "transport '%s' not allowed" msgstr "không cho phép phương thức vận chuyển “%s”" -#: transport.c:1055 +#: transport.c:1079 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync không còn được hỗ trợ nữa" -#: transport.c:1157 +#: transport.c:1181 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8980,7 +9106,7 @@ msgstr "" "Các đường dẫn mô-đun-con sau đây có chứa các thay đổi cái mà\n" "có thể được tìm thấy trên mọi máy phục vụ:\n" -#: transport.c:1161 +#: transport.c:1185 #, c-format msgid "" "\n" @@ -9007,11 +9133,11 @@ msgstr "" "để đẩy chúng lên máy phục vụ.\n" "\n" -#: transport.c:1169 +#: transport.c:1193 msgid "Aborting." msgstr "Bãi bỏ." -#: transport.c:1316 +#: transport.c:1340 msgid "failed to push all needed submodules" msgstr "gặp lỗi khi đẩy dữ liệu của tất cả các mô-đun-con cần thiết" @@ -9031,7 +9157,7 @@ msgstr "tên tập tin trống rỗng trong mục tin cây" msgid "too-short tree file" msgstr "tập tin cây quá ngắn" -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -9042,7 +9168,7 @@ msgstr "" "%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn " "chuyển nhánh." -#: unpack-trees.c:115 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -9052,7 +9178,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9063,7 +9189,7 @@ msgstr "" "%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn hòa " "trộn." -#: unpack-trees.c:120 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9073,7 +9199,7 @@ msgstr "" "hòa trộn:\n" "%%s" -#: unpack-trees.c:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9083,7 +9209,7 @@ msgstr "" "%s:\n" "%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn %s." -#: unpack-trees.c:125 +#: unpack-trees.c:127 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9093,7 +9219,7 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:130 +#: unpack-trees.c:132 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -9103,7 +9229,7 @@ msgstr "" "trong nó:\n" "%s" -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -9113,7 +9239,7 @@ msgstr "" "checkout:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh." -#: unpack-trees.c:136 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -9123,7 +9249,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9133,7 +9259,7 @@ msgstr "" "trộn:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn." -#: unpack-trees.c:141 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9143,7 +9269,7 @@ msgstr "" "trộn:\n" "%%s" -#: unpack-trees.c:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9152,7 +9278,7 @@ msgstr "" "Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s." -#: unpack-trees.c:146 +#: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9161,7 +9287,7 @@ msgstr "" "Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n" "%%s" -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9172,7 +9298,7 @@ msgstr "" "checkout:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh." -#: unpack-trees.c:154 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9183,7 +9309,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9193,7 +9319,7 @@ msgstr "" "hòa trộn:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn." -#: unpack-trees.c:159 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9203,7 +9329,7 @@ msgstr "" "hòa trộn:\n" "%%s" -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9213,7 +9339,7 @@ msgstr "" "%s:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s." -#: unpack-trees.c:164 +#: unpack-trees.c:166 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9223,12 +9349,12 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:172 +#: unpack-trees.c:174 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Mục “%s” đè lên “%s”. Không thể buộc." -#: unpack-trees.c:175 +#: unpack-trees.c:177 #, c-format msgid "" "Cannot update submodule:\n" @@ -9237,7 +9363,7 @@ msgstr "" "Không thể cập nhật mô-đun-con:\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:180 #, c-format msgid "" "The following paths are not up to date and were left despite sparse " @@ -9248,7 +9374,7 @@ msgstr "" "mẫu sparse:\n" "%s" -#: unpack-trees.c:180 +#: unpack-trees.c:182 #, c-format msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" @@ -9258,7 +9384,7 @@ msgstr "" "sparse:\n" "%s" -#: unpack-trees.c:182 +#: unpack-trees.c:184 #, c-format msgid "" "The following paths were already present and thus not updated despite sparse " @@ -9269,12 +9395,12 @@ msgstr "" "cấp các mẫu sparse:\n" "%s" -#: unpack-trees.c:262 +#: unpack-trees.c:264 #, c-format msgid "Aborting\n" msgstr "Bãi bỏ\n" -#: unpack-trees.c:289 +#: unpack-trees.c:291 #, c-format msgid "" "After fixing the above paths, you may want to run `git sparse-checkout " @@ -9283,11 +9409,11 @@ msgstr "" "Sau khi sửa các đường dẫn phía trên, bạn có thể chạy “git sparse-checkout " "reapply“.\n" -#: unpack-trees.c:350 +#: unpack-trees.c:352 msgid "Updating files" msgstr "Đang cập nhật các tập tin" -#: unpack-trees.c:382 +#: unpack-trees.c:384 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -9297,11 +9423,17 @@ msgstr "" "HOA/thường trên một hệ thống tập tin không phân biệt HOA/thường)\n" "và chỉ một từ cùng một nhóm xung đột là trong cây làm việc hiện tại:\n" -#: unpack-trees.c:1498 +#: unpack-trees.c:1519 msgid "Updating index flags" msgstr "Đang cập nhật các cờ mục lục" -#: upload-pack.c:1543 +#: unpack-trees.c:2608 +#, c-format +msgid "worktree and untracked commit have duplicate entries: %s" +msgstr "" +"cây làm việc và lần chuyển giao không được theo dõi có các mục trùng lặp: %s" + +#: upload-pack.c:1548 msgid "expected flush after fetch arguments" msgstr "cần đẩy dữ liệu lên đĩa sau các tham số của lệnh fetch" @@ -9338,7 +9470,7 @@ msgstr "đoạn đường dẫn “..” không hợp lệ" msgid "Fetching objects" msgstr "Đang lấy về các đối tượng" -#: worktree.c:238 builtin/am.c:2103 +#: worktree.c:238 builtin/am.c:2151 #, c-format msgid "failed to read '%s'" msgstr "gặp lỗi khi đọc “%s”" @@ -9482,11 +9614,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (dùng \"git rm <tập-tin>…\" để đánh dấu là cần giải quyết)" -#: wt-status.c:211 wt-status.c:1072 +#: wt-status.c:211 wt-status.c:1075 msgid "Changes to be committed:" msgstr "Những thay đổi sẽ được chuyển giao:" -#: wt-status.c:234 wt-status.c:1081 +#: wt-status.c:234 wt-status.c:1084 msgid "Changes not staged for commit:" msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:" @@ -9590,21 +9722,21 @@ msgstr "nội dung bị sửa đổi, " msgid "untracked content, " msgstr "nội dung chưa được theo dõi, " -#: wt-status.c:905 +#: wt-status.c:908 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Bạn hiện nay ở trong phần cất đi đang có %d mục" -#: wt-status.c:936 +#: wt-status.c:939 msgid "Submodules changed but not updated:" msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:" -#: wt-status.c:938 +#: wt-status.c:941 msgid "Submodule changes to be committed:" msgstr "Những mô-đun-con thay đổi đã được chuyển giao:" -#: wt-status.c:1020 +#: wt-status.c:1023 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9612,7 +9744,7 @@ msgstr "" "Không sửa hay xóa bỏ đường ở trên.\n" "Mọi thứ phía dưới sẽ được xóa bỏ." -#: wt-status.c:1112 +#: wt-status.c:1115 #, c-format msgid "" "\n" @@ -9623,109 +9755,109 @@ msgstr "" "Nó cần %.2f giây để tính toán giá trị của trước/sau của nhánh.\n" "Bạn có thể dùng “--no-ahead-behind” tránh phải điều này.\n" -#: wt-status.c:1142 +#: wt-status.c:1145 msgid "You have unmerged paths." msgstr "Bạn có những đường dẫn chưa được hòa trộn." -#: wt-status.c:1145 +#: wt-status.c:1148 msgid " (fix conflicts and run \"git commit\")" msgstr " (sửa các xung đột rồi chạy \"git commit\")" -#: wt-status.c:1147 +#: wt-status.c:1150 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (dùng \"git merge --abort\" để bãi bỏ việc hòa trộn)" -#: wt-status.c:1151 +#: wt-status.c:1154 msgid "All conflicts fixed but you are still merging." msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn." -#: wt-status.c:1154 +#: wt-status.c:1157 msgid " (use \"git commit\" to conclude merge)" msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)" -#: wt-status.c:1163 +#: wt-status.c:1166 msgid "You are in the middle of an am session." msgstr "Bạn đang ở giữa của một phiên “am”." -#: wt-status.c:1166 +#: wt-status.c:1169 msgid "The current patch is empty." msgstr "Miếng vá hiện tại bị trống rỗng." -#: wt-status.c:1170 +#: wt-status.c:1173 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")" -#: wt-status.c:1172 +#: wt-status.c:1175 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (dùng \"git am --skip\" để bỏ qua miếng vá này)" -#: wt-status.c:1174 +#: wt-status.c:1177 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)" -#: wt-status.c:1307 +#: wt-status.c:1310 msgid "git-rebase-todo is missing." msgstr "thiếu git-rebase-todo." -#: wt-status.c:1309 +#: wt-status.c:1312 msgid "No commands done." msgstr "Không thực hiện lệnh nào." -#: wt-status.c:1312 +#: wt-status.c:1315 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Lệnh thực hiện cuối (%d lệnh được thực thi):" -#: wt-status.c:1323 +#: wt-status.c:1326 #, c-format msgid " (see more in file %s)" msgstr " (xem thêm trong %s)" -#: wt-status.c:1328 +#: wt-status.c:1331 msgid "No commands remaining." msgstr "Không có lệnh nào còn lại." -#: wt-status.c:1331 +#: wt-status.c:1334 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Lệnh cần làm kế tiếp (%d lệnh còn lại):" -#: wt-status.c:1339 +#: wt-status.c:1342 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (dùng lệnh \"git rebase --edit-todo\" để xem và sửa)" -#: wt-status.c:1351 +#: wt-status.c:1354 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Bạn hiện nay đang thực hiện việc “rebase” nhánh “%s” trên “%s”." -#: wt-status.c:1356 +#: wt-status.c:1359 msgid "You are currently rebasing." msgstr "Bạn hiện nay đang thực hiện việc “rebase” (cải tổ)." -#: wt-status.c:1369 +#: wt-status.c:1372 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (sửa các xung đột và sau đó chạy lệnh “cải tổ” \"git rebase --continue\")" -#: wt-status.c:1371 +#: wt-status.c:1374 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (dùng lệnh “cải tổ” \"git rebase --skip\" để bỏ qua lần vá này)" -#: wt-status.c:1373 +#: wt-status.c:1376 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (dùng lệnh “cải tổ” \"git rebase --abort\" để check-out nhánh nguyên thủy)" -#: wt-status.c:1380 +#: wt-status.c:1383 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh “cải tổ” \"git rebase --" "continue\")" -#: wt-status.c:1384 +#: wt-status.c:1387 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -9733,165 +9865,165 @@ msgstr "" "Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao trong khi " "đang “rebase” nhánh “%s” trên “%s”." -#: wt-status.c:1389 +#: wt-status.c:1392 msgid "You are currently splitting a commit during a rebase." msgstr "" "Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc " "rebase." -#: wt-status.c:1392 +#: wt-status.c:1395 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Một khi thư mục làm việc của bạn đã gọn gàng, chạy lệnh “cải tổ” \"git " "rebase --continue\")" -#: wt-status.c:1396 +#: wt-status.c:1399 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao trong khi đang " "rebase nhánh “%s” trên “%s”." -#: wt-status.c:1401 +#: wt-status.c:1404 msgid "You are currently editing a commit during a rebase." msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase." -#: wt-status.c:1404 +#: wt-status.c:1407 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (dùng \"git commit --amend\" để “tu bổ” lần chuyển giao hiện tại)" -#: wt-status.c:1406 +#: wt-status.c:1409 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (chạy lệnh “cải tổ” \"git rebase --continue\" một khi bạn cảm thấy hài " "lòng về những thay đổi của mình)" -#: wt-status.c:1417 +#: wt-status.c:1420 msgid "Cherry-pick currently in progress." msgstr "Cherry-pick hiện tại đang được thực hiện." -#: wt-status.c:1420 +#: wt-status.c:1423 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Bạn hiện nay đang thực hiện việc cherry-pick lần chuyển giao %s." -#: wt-status.c:1427 +#: wt-status.c:1430 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" " (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")" -#: wt-status.c:1430 +#: wt-status.c:1433 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (chạy lệnh \"git cherry-pick --continue\" để tiếp tục)" -#: wt-status.c:1433 +#: wt-status.c:1436 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git cherry-pick --" "continue\")" -#: wt-status.c:1435 +#: wt-status.c:1438 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (dùng \"git cherry-pick --skip\" để bỏ qua miếng vá này)" -#: wt-status.c:1437 +#: wt-status.c:1440 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (dùng \"git cherry-pick --abort\" để hủy bỏ thao tác cherry-pick)" -#: wt-status.c:1447 +#: wt-status.c:1450 msgid "Revert currently in progress." msgstr "Hoàn nguyên hiện tại đang thực hiện." -#: wt-status.c:1450 +#: wt-status.c:1453 #, c-format msgid "You are currently reverting commit %s." msgstr "Bạn hiện nay đang thực hiện thao tác hoàn nguyên lần chuyển giao “%s”." -#: wt-status.c:1456 +#: wt-status.c:1459 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")" -#: wt-status.c:1459 +#: wt-status.c:1462 msgid " (run \"git revert --continue\" to continue)" msgstr " (chạy lệnh \"git revert --continue\" để tiếp tục)" -#: wt-status.c:1462 +#: wt-status.c:1465 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")" -#: wt-status.c:1464 +#: wt-status.c:1467 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (dùng lệnh \"git revert --skip\" để bỏ qua lần vá này)" -#: wt-status.c:1466 +#: wt-status.c:1469 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (dùng \"git revert --abort\" để hủy bỏ thao tác hoàn nguyên)" -#: wt-status.c:1476 +#: wt-status.c:1479 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" "Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ " "nhánh “%s”." -#: wt-status.c:1480 +#: wt-status.c:1483 msgid "You are currently bisecting." msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa bước)." -#: wt-status.c:1483 +#: wt-status.c:1486 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)" -#: wt-status.c:1494 +#: wt-status.c:1497 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "" "Bạn đang ở trong lần lấy ra sparser %d%% của các tập tin được theo dõi hiện " "tại." -#: wt-status.c:1733 +#: wt-status.c:1736 msgid "On branch " msgstr "Trên nhánh " -#: wt-status.c:1740 +#: wt-status.c:1743 msgid "interactive rebase in progress; onto " msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên " -#: wt-status.c:1742 +#: wt-status.c:1745 msgid "rebase in progress; onto " msgstr "rebase đang được thực hiện: lên trên " -#: wt-status.c:1747 +#: wt-status.c:1750 msgid "HEAD detached at " msgstr "HEAD được tách rời tại " -#: wt-status.c:1749 +#: wt-status.c:1752 msgid "HEAD detached from " msgstr "HEAD được tách rời từ " -#: wt-status.c:1752 +#: wt-status.c:1755 msgid "Not currently on any branch." msgstr "Hiện tại chẳng ở nhánh nào cả." -#: wt-status.c:1769 +#: wt-status.c:1772 msgid "Initial commit" msgstr "Lần chuyển giao khởi tạo" -#: wt-status.c:1770 +#: wt-status.c:1773 msgid "No commits yet" msgstr "Vẫn chưa chuyển giao" -#: wt-status.c:1784 +#: wt-status.c:1787 msgid "Untracked files" msgstr "Những tập tin chưa được theo dõi" -#: wt-status.c:1786 +#: wt-status.c:1789 msgid "Ignored files" msgstr "Những tập tin bị lờ đi" -#: wt-status.c:1790 +#: wt-status.c:1793 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9903,32 +10035,32 @@ msgstr "" "có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n" "tự thêm các tập tin mới (xem “git help status”.." -#: wt-status.c:1796 +#: wt-status.c:1799 #, c-format msgid "Untracked files not listed%s" msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s" -#: wt-status.c:1798 +#: wt-status.c:1801 msgid " (use -u option to show untracked files)" msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)" -#: wt-status.c:1804 +#: wt-status.c:1807 msgid "No changes" msgstr "Không có thay đổi nào" -#: wt-status.c:1809 +#: wt-status.c:1812 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "không có thay đổi nào được thêm vào để chuyển giao (dùng \"git add\" và/hoặc " "\"git commit -a\")\n" -#: wt-status.c:1813 +#: wt-status.c:1816 #, c-format msgid "no changes added to commit\n" msgstr "không có thay đổi nào được thêm vào để chuyển giao\n" -#: wt-status.c:1817 +#: wt-status.c:1820 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9937,74 +10069,92 @@ msgstr "" "không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được " "theo dõi hiện diện (dùng \"git add\" để đưa vào theo dõi)\n" -#: wt-status.c:1821 +#: wt-status.c:1824 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được " "theo dõi hiện diện\n" -#: wt-status.c:1825 +#: wt-status.c:1828 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "không có gì để chuyển giao (tạo/sao-chép các tập tin và dùng \"git add\" để " "đưa vào theo dõi)\n" -#: wt-status.c:1829 wt-status.c:1835 +#: wt-status.c:1832 wt-status.c:1838 #, c-format msgid "nothing to commit\n" msgstr "không có gì để chuyển giao\n" -#: wt-status.c:1832 +#: wt-status.c:1835 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "không có gì để chuyển giao (dùng -u xem các tập tin chưa được theo dõi)\n" -#: wt-status.c:1837 +#: wt-status.c:1840 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n" -#: wt-status.c:1942 +#: wt-status.c:1945 msgid "No commits yet on " msgstr "Vẫn không thực hiện lệnh chuyển giao nào " -#: wt-status.c:1946 +#: wt-status.c:1949 msgid "HEAD (no branch)" msgstr "HEAD (không nhánh)" -#: wt-status.c:1977 +#: wt-status.c:1980 msgid "different" msgstr "khác" -#: wt-status.c:1979 wt-status.c:1987 +#: wt-status.c:1982 wt-status.c:1990 msgid "behind " msgstr "đằng sau " -#: wt-status.c:1982 wt-status.c:1985 +#: wt-status.c:1985 wt-status.c:1988 msgid "ahead " msgstr "phía trước " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2507 +#: wt-status.c:2511 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "không thể %s: Bạn có các thay đổi chưa được đưa lên bệ phóng." -#: wt-status.c:2513 +#: wt-status.c:2517 msgid "additionally, your index contains uncommitted changes." msgstr "" "thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao." -#: wt-status.c:2515 +#: wt-status.c:2519 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" "không thể %s: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao." -#: compat/precompose_utf8.c:58 builtin/clone.c:457 +#: compat/simple-ipc/ipc-unix-socket.c:178 +msgid "could not send IPC command" +msgstr "không thể gửi lệnh IPC" + +#: compat/simple-ipc/ipc-unix-socket.c:185 +msgid "could not read IPC response" +msgstr "không thể đọc đáp ứng IPC" + +#: compat/simple-ipc/ipc-unix-socket.c:862 +#, c-format +msgid "could not start accept_thread '%s'" +msgstr "không thể khởi chạy accept_thread “%s”" + +#: compat/simple-ipc/ipc-unix-socket.c:874 +#, c-format +msgid "could not start worker[0] for '%s'" +msgstr "không thể khởi chạy bộ làm việc worker[0] cho “%s”" + +#: compat/precompose_utf8.c:58 builtin/clone.c:461 #, c-format msgid "failed to unlink '%s'" msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”" @@ -10013,138 +10163,138 @@ msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<các tùy chọn>] [--] <pathspec>…" -#: builtin/add.c:58 +#: builtin/add.c:61 #, c-format msgid "cannot chmod %cx '%s'" msgstr "không thể chmod %cx '%s'" -#: builtin/add.c:96 +#: builtin/add.c:99 #, c-format msgid "unexpected diff status %c" msgstr "trạng thái lệnh diff không như mong đợi %c" -#: builtin/add.c:101 builtin/commit.c:285 +#: builtin/add.c:104 builtin/commit.c:297 msgid "updating files failed" msgstr "cập nhật tập tin gặp lỗi" -#: builtin/add.c:111 +#: builtin/add.c:114 #, c-format msgid "remove '%s'\n" msgstr "gỡ bỏ “%s”\n" -#: builtin/add.c:186 +#: builtin/add.c:198 msgid "Unstaged changes after refreshing the index:" msgstr "" "Đưa ra khỏi bệ phóng các thay đổi sau khi làm tươi mới lại bảng mục lục:" -#: builtin/add.c:280 builtin/rev-parse.c:991 +#: builtin/add.c:307 builtin/rev-parse.c:991 msgid "Could not read the index" msgstr "Không thể đọc bảng mục lục" -#: builtin/add.c:291 +#: builtin/add.c:318 #, c-format msgid "Could not open '%s' for writing." msgstr "Không thể mở “%s” để ghi." -#: builtin/add.c:295 +#: builtin/add.c:322 msgid "Could not write patch" msgstr "Không thể ghi ra miếng vá" -#: builtin/add.c:298 +#: builtin/add.c:325 msgid "editing patch failed" msgstr "gặp lỗi khi sửa miếng vá" -#: builtin/add.c:301 +#: builtin/add.c:328 #, c-format msgid "Could not stat '%s'" msgstr "Không thể lấy thông tin thống kê về “%s”" -#: builtin/add.c:303 +#: builtin/add.c:330 msgid "Empty patch. Aborted." msgstr "Miếng vá trống rỗng. Nên bỏ qua." -#: builtin/add.c:308 +#: builtin/add.c:335 #, c-format msgid "Could not apply '%s'" msgstr "Không thể áp dụng miếng vá “%s”" -#: builtin/add.c:316 +#: builtin/add.c:343 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore " "của bạn:\n" -#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124 +#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124 #: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 -#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 +#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 msgid "dry run" msgstr "chạy thử" -#: builtin/add.c:339 +#: builtin/add.c:366 msgid "interactive picking" msgstr "sửa bằng cách tương tác" -#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 msgid "select hunks interactively" msgstr "chọn “hunks” theo kiểu tương tác" -#: builtin/add.c:341 +#: builtin/add.c:368 msgid "edit current diff and apply" msgstr "sửa diff hiện nay và áp dụng nó" -#: builtin/add.c:342 +#: builtin/add.c:369 msgid "allow adding otherwise ignored files" msgstr "cho phép thêm các tập tin bị bỏ qua khác" -#: builtin/add.c:343 +#: builtin/add.c:370 msgid "update tracked files" msgstr "cập nhật các tập tin được theo dõi" -#: builtin/add.c:344 +#: builtin/add.c:371 msgid "renormalize EOL of tracked files (implies -u)" msgstr "thường hóa lại EOL của các tập tin được theo dõi (ý là -u)" -#: builtin/add.c:345 +#: builtin/add.c:372 msgid "record only the fact that the path will be added later" msgstr "chỉ ghi lại sự việc mà đường dẫn sẽ được thêm vào sau" -#: builtin/add.c:346 +#: builtin/add.c:373 msgid "add changes from all tracked and untracked files" msgstr "" "thêm các thay đổi từ tất cả các tập tin có cũng như không được theo dõi dấu " "vết" -#: builtin/add.c:349 +#: builtin/add.c:376 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "lờ đi các đường dẫn bị gỡ bỏ trong cây thư mục làm việc (giống với --no-all)" -#: builtin/add.c:351 +#: builtin/add.c:378 msgid "don't add, only refresh the index" msgstr "không thêm, chỉ làm tươi mới bảng mục lục" -#: builtin/add.c:352 +#: builtin/add.c:379 msgid "just skip files which cannot be added because of errors" msgstr "chie bỏ qua những tập tin mà nó không thể được thêm vào bởi vì gặp lỗi" -#: builtin/add.c:353 +#: builtin/add.c:380 msgid "check if - even missing - files are ignored in dry run" msgstr "" "kiểm tra xem - thậm chí thiếu - tập tin bị bỏ qua trong quá trình chạy thử" -#: builtin/add.c:355 builtin/update-index.c:1004 +#: builtin/add.c:382 builtin/update-index.c:1006 msgid "override the executable bit of the listed files" msgstr "ghi đè lên bít thi hành của các tập tin được liệt kê" -#: builtin/add.c:357 +#: builtin/add.c:384 msgid "warn when adding an embedded repository" msgstr "cảnh báo khi thêm một kho nhúng" -#: builtin/add.c:359 +#: builtin/add.c:386 msgid "backend for `git stash -p`" msgstr "ứng dụng chạy phía sau cho “git stash -p”" -#: builtin/add.c:377 +#: builtin/add.c:404 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -10175,12 +10325,12 @@ msgstr "" "\n" "Xem \"git help submodule\" để biết thêm chi tiết." -#: builtin/add.c:405 +#: builtin/add.c:432 #, c-format msgid "adding embedded git repository: %s" msgstr "thêm cần một kho git nhúng: %s" -#: builtin/add.c:424 +#: builtin/add.c:451 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -10190,47 +10340,51 @@ msgstr "" "Tắt thông báo này bằng cách chạy lệnh\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:433 +#: builtin/add.c:460 msgid "adding files failed" msgstr "thêm tập tin gặp lỗi" -#: builtin/add.c:461 builtin/commit.c:345 +#: builtin/add.c:488 +msgid "--dry-run is incompatible with --interactive/--patch" +msgstr "--dry-run xung khắc với --interactive/--patch" + +#: builtin/add.c:490 builtin/commit.c:357 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file xung khắc với --interactive/--patch" -#: builtin/add.c:478 +#: builtin/add.c:507 msgid "--pathspec-from-file is incompatible with --edit" msgstr "--pathspec-from-file xung khắc với --edit" -#: builtin/add.c:490 +#: builtin/add.c:519 msgid "-A and -u are mutually incompatible" msgstr "-A và -u xung khắc nhau" -#: builtin/add.c:493 +#: builtin/add.c:522 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Tùy chọn --ignore-missing chỉ có thể được dùng cùng với --dry-run" -#: builtin/add.c:497 +#: builtin/add.c:526 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod tham số “%s” phải hoặc là -x hay +x" -#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569 +#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 +#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file xung khắc với các tham số đặc tả đường dẫn" -#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575 +#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 +#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul cần --pathspec-from-file" -#: builtin/add.c:526 +#: builtin/add.c:555 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n" -#: builtin/add.c:528 +#: builtin/add.c:557 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -10240,109 +10394,109 @@ msgstr "" "Tắt thông báo này bằng cách chạy lệnh\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:352 +#: builtin/am.c:364 msgid "could not parse author script" msgstr "không thể phân tích cú pháp văn lệnh tác giả" -#: builtin/am.c:436 +#: builtin/am.c:454 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "“%s” bị xóa bởi móc applypatch-msg" -#: builtin/am.c:478 +#: builtin/am.c:496 #, c-format msgid "Malformed input line: '%s'." msgstr "Dòng đầu vào dị hình: “%s”." -#: builtin/am.c:516 +#: builtin/am.c:534 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Gặp lỗi khi sao chép ghi chú (note) từ “%s” tới “%s”" -#: builtin/am.c:542 +#: builtin/am.c:560 msgid "fseek failed" msgstr "fseek gặp lỗi" -#: builtin/am.c:730 +#: builtin/am.c:748 #, c-format msgid "could not parse patch '%s'" msgstr "không thể phân tích cú pháp “%s”" -#: builtin/am.c:795 +#: builtin/am.c:813 msgid "Only one StGIT patch series can be applied at once" msgstr "Chỉ có một sê-ri miếng vá StGIT được áp dụng một lúc" -#: builtin/am.c:843 +#: builtin/am.c:861 msgid "invalid timestamp" msgstr "dấu thời gian không hợp lệ" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:866 builtin/am.c:878 msgid "invalid Date line" msgstr "dòng Ngày tháng không hợp lệ" -#: builtin/am.c:855 +#: builtin/am.c:873 msgid "invalid timezone offset" msgstr "độ lệch múi giờ không hợp lệ" -#: builtin/am.c:948 +#: builtin/am.c:966 msgid "Patch format detection failed." msgstr "Dò tìm định dạng miếng vá gặp lỗi." -#: builtin/am.c:953 builtin/clone.c:410 +#: builtin/am.c:971 builtin/clone.c:414 #, c-format msgid "failed to create directory '%s'" msgstr "tạo thư mục \"%s\" gặp lỗi" -#: builtin/am.c:958 +#: builtin/am.c:976 msgid "Failed to split patches." msgstr "Gặp lỗi khi chia nhỏ các miếng vá." -#: builtin/am.c:1089 +#: builtin/am.c:1125 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Khi bạn đã giải quyết xong trục trặc này, hãy chạy \"%s --continue\"." -#: builtin/am.c:1090 +#: builtin/am.c:1126 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "Nếu bạn muốn bỏ qua miếng vá này, hãy chạy lệnh \"%s --skip\" để thay thế." -#: builtin/am.c:1091 +#: builtin/am.c:1127 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "Để phục hồi lại nhánh gốc và dừng vá, hãy chạy \"%s --abort\"." -#: builtin/am.c:1174 +#: builtin/am.c:1222 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Miếng vá được gửi với format=flowed; khoảng trống ở cuối của các dòng có thể " "bị mất." -#: builtin/am.c:1202 +#: builtin/am.c:1250 msgid "Patch is empty." msgstr "Miếng vá trống rỗng." -#: builtin/am.c:1267 +#: builtin/am.c:1315 #, c-format msgid "missing author line in commit %s" msgstr "thiếu dòng tác giả trong lần chuyển gia %s" -#: builtin/am.c:1270 +#: builtin/am.c:1318 #, c-format msgid "invalid ident line: %.*s" msgstr "dòng định danh không hợp lệ: %.*s" -#: builtin/am.c:1489 +#: builtin/am.c:1537 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "Kho thiếu đối tượng blob cần thiết để thực hiện “3-way merge”." -#: builtin/am.c:1491 +#: builtin/am.c:1539 msgid "Using index info to reconstruct a base tree..." msgstr "" "Sử dụng thông tin trong bảng mục lục để cấu trúc lại một cây (tree) cơ sở…" -#: builtin/am.c:1510 +#: builtin/am.c:1558 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10350,24 +10504,24 @@ msgstr "" "Bạn đã sửa miếng vá của mình bằng cách thủ công à?\n" "Nó không thể áp dụng các blob đã được ghi lại trong bảng mục lục của nó." -#: builtin/am.c:1516 +#: builtin/am.c:1564 msgid "Falling back to patching base and 3-way merge..." msgstr "Đang dùng phương án dự phòng: vá bản cơ sở và “hòa trộn 3-đường”…" -#: builtin/am.c:1542 +#: builtin/am.c:1590 msgid "Failed to merge in the changes." msgstr "Gặp lỗi khi trộn vào các thay đổi." -#: builtin/am.c:1574 +#: builtin/am.c:1622 msgid "applying to an empty history" msgstr "áp dụng vào một lịch sử trống rỗng" -#: builtin/am.c:1626 builtin/am.c:1630 +#: builtin/am.c:1674 builtin/am.c:1678 #, c-format msgid "cannot resume: %s does not exist." msgstr "không thể phục hồi: %s không tồn tại." -#: builtin/am.c:1648 +#: builtin/am.c:1696 msgid "Commit Body is:" msgstr "Thân của lần chuyển giao là:" @@ -10375,41 +10529,41 @@ msgstr "Thân của lần chuyển giao là:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1658 +#: builtin/am.c:1706 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Áp dụng? đồng ý [y]/khô[n]g/chỉnh sửa [e]/hiển thị miếng [v]á/chấp nhận tất " "cả [a]: " -#: builtin/am.c:1704 builtin/commit.c:395 +#: builtin/am.c:1752 builtin/commit.c:408 msgid "unable to write index file" msgstr "không thể ghi tập tin lưu mục lục" -#: builtin/am.c:1708 +#: builtin/am.c:1756 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Bảng mục lục bẩn: không thể áp dụng các miếng vá (bẩn: %s)" -#: builtin/am.c:1748 builtin/am.c:1816 +#: builtin/am.c:1796 builtin/am.c:1864 #, c-format msgid "Applying: %.*s" msgstr "Áp dụng: %.*s" -#: builtin/am.c:1765 +#: builtin/am.c:1813 msgid "No changes -- Patch already applied." msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi." -#: builtin/am.c:1771 +#: builtin/am.c:1819 #, c-format msgid "Patch failed at %s %.*s" msgstr "Gặp lỗi khi vá tại %s %.*s" -#: builtin/am.c:1775 +#: builtin/am.c:1823 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "Dùng “git am --show-current-patch=diff” để xem miếng vá bị lỗi" -#: builtin/am.c:1819 +#: builtin/am.c:1867 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10420,7 +10574,7 @@ msgstr "" "đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỏ qua miếng " "vá này." -#: builtin/am.c:1826 +#: builtin/am.c:1874 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10433,17 +10587,17 @@ msgstr "" "Bạn có lẽ muốn chạy “git rm“ trên một tập tin để chấp nhận \"được xóa bởi họ" "\" cho nó." -#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 +#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Không thể phân tích đối tượng “%s”." -#: builtin/am.c:1985 +#: builtin/am.c:2033 msgid "failed to clean index" msgstr "gặp lỗi khi dọn bảng mục lục" -#: builtin/am.c:2029 +#: builtin/am.c:2077 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10451,156 +10605,160 @@ msgstr "" "Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần “am” thất bại cuối cùng.\n" "Không thể chuyển tới ORIG_HEAD" -#: builtin/am.c:2136 +#: builtin/am.c:2184 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Giá trị không hợp lệ cho --patch-format: %s" -#: builtin/am.c:2178 +#: builtin/am.c:2226 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Giá trị không hợp lệ cho --show-current-patch: %s" -#: builtin/am.c:2182 +#: builtin/am.c:2230 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s xung khắc với --show-current-patch=%s" -#: builtin/am.c:2213 +#: builtin/am.c:2261 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<các tùy chọn>] [(<mbox>|<Maildir>)…]" -#: builtin/am.c:2214 +#: builtin/am.c:2262 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<các tùy chọn>] (--continue | --skip | --abort)" -#: builtin/am.c:2220 +#: builtin/am.c:2268 msgid "run interactively" msgstr "chạy kiểu tương tác" -#: builtin/am.c:2222 +#: builtin/am.c:2270 msgid "historical option -- no-op" msgstr "tùy chọn lịch sử -- không-toán-tử" -#: builtin/am.c:2224 +#: builtin/am.c:2272 msgid "allow fall back on 3way merging if needed" msgstr "cho phép quay trở lại để hòa trộn kiểu “3way” nếu cần" -#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 -#: builtin/repack.c:334 builtin/stash.c:882 +#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16 +#: builtin/repack.c:472 builtin/stash.c:948 msgid "be quiet" msgstr "im lặng" -#: builtin/am.c:2227 +#: builtin/am.c:2275 msgid "add a Signed-off-by trailer to the commit message" msgstr "thêm dòng Signed-off-by vào cuối ghi chú của lần chuyển giao" -#: builtin/am.c:2230 +#: builtin/am.c:2278 msgid "recode into utf8 (default)" msgstr "chuyển mã thành utf8 (mặc định)" -#: builtin/am.c:2232 +#: builtin/am.c:2280 msgid "pass -k flag to git-mailinfo" msgstr "chuyển cờ -k cho git-mailinfo" -#: builtin/am.c:2234 +#: builtin/am.c:2282 msgid "pass -b flag to git-mailinfo" msgstr "chuyển cờ -b cho git-mailinfo" -#: builtin/am.c:2236 +#: builtin/am.c:2284 msgid "pass -m flag to git-mailinfo" msgstr "chuyển cờ -m cho git-mailinfo" -#: builtin/am.c:2238 +#: builtin/am.c:2286 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "chuyển cờ --keep-cr cho git-mailsplit với định dạng mbox" -#: builtin/am.c:2241 +#: builtin/am.c:2289 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "đừng chuyển cờ --keep-cr cho git-mailsplit không phụ thuộc vào am.keepcr" -#: builtin/am.c:2244 +#: builtin/am.c:2292 msgid "strip everything before a scissors line" msgstr "cắt mọi thứ trước dòng scissors" -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2273 +#: builtin/am.c:2294 +msgid "pass it through git-mailinfo" +msgstr "chuyển nó qua git-mailinfo" + +#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 +#: builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 +#: builtin/am.c:2324 msgid "pass it through git-apply" msgstr "chuyển nó qua git-apply" -#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261 +#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349 -#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172 -#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175 -#: parse-options.h:316 +#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 +#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176 +#: parse-options.h:317 msgid "n" msgstr "n" -#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136 -#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470 +#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137 +#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 #: builtin/verify-tag.c:38 msgid "format" msgstr "định dạng" -#: builtin/am.c:2270 +#: builtin/am.c:2321 msgid "format the patch(es) are in" msgstr "định dạng (các) miếng vá theo" -#: builtin/am.c:2276 +#: builtin/am.c:2327 msgid "override error message when patch failure occurs" msgstr "đè lên các lời nhắn lỗi khi xảy ra lỗi vá nghiêm trọng" -#: builtin/am.c:2278 +#: builtin/am.c:2329 msgid "continue applying patches after resolving a conflict" msgstr "tiếp tục áp dụng các miếng vá sau khi giải quyết xung đột" -#: builtin/am.c:2281 +#: builtin/am.c:2332 msgid "synonyms for --continue" msgstr "đồng nghĩa với --continue" -#: builtin/am.c:2284 +#: builtin/am.c:2335 msgid "skip the current patch" msgstr "bỏ qua miếng vá hiện hành" -#: builtin/am.c:2287 +#: builtin/am.c:2338 msgid "restore the original branch and abort the patching operation" msgstr "phục hồi lại nhánh gốc và loại bỏ thao tác vá" -#: builtin/am.c:2290 +#: builtin/am.c:2341 msgid "abort the patching operation but keep HEAD where it is" msgstr "bỏ qua thao tác vá nhưng vẫn giữ HEAD nơi nó chỉ đến" -#: builtin/am.c:2294 +#: builtin/am.c:2345 msgid "show the patch being applied" msgstr "hiển thị miếng vá đã được áp dụng rồi" -#: builtin/am.c:2299 +#: builtin/am.c:2350 msgid "lie about committer date" msgstr "nói dối về ngày chuyển giao" -#: builtin/am.c:2301 +#: builtin/am.c:2352 msgid "use current timestamp for author date" msgstr "dùng dấu thời gian hiện tại cho ngày tác giả" -#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 -#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538 -#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451 +#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630 +#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 +#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 msgid "key-id" msgstr "mã-số-khóa" -#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401 +#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396 msgid "GPG-sign commits" msgstr "Các lần chuyển giao ký-GPG" -#: builtin/am.c:2307 +#: builtin/am.c:2358 msgid "(internal use for git-rebase)" msgstr "(dùng nội bộ cho git-rebase)" -#: builtin/am.c:2325 +#: builtin/am.c:2376 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -10608,16 +10766,16 @@ msgstr "" "Tùy chọn -b/--binary đã không dùng từ lâu rồi, và\n" "nó sẽ được bỏ đi. Xin đừng sử dụng nó thêm nữa." -#: builtin/am.c:2332 +#: builtin/am.c:2383 msgid "failed to read the index" msgstr "gặp lỗi đọc bảng mục lục" -#: builtin/am.c:2347 +#: builtin/am.c:2398 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "thư mục rebase trước %s không sẵn có nhưng mbox lại đưa ra." -#: builtin/am.c:2371 +#: builtin/am.c:2422 #, c-format msgid "" "Stray %s directory found.\n" @@ -10626,11 +10784,11 @@ msgstr "" "Tìm thấy thư mục lạc %s.\n" "Dùng \"git am --abort\" để loại bỏ nó đi." -#: builtin/am.c:2377 +#: builtin/am.c:2428 msgid "Resolve operation not in progress, we are not resuming." msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại." -#: builtin/am.c:2387 +#: builtin/am.c:2438 msgid "interactive mode requires patches on the command line" msgstr "chế độ tương tác yêu cầu có các miếng vá trên dòng lệnh" @@ -10836,7 +10994,7 @@ msgstr "" "tham số không hợp lệ %s cho “git bisect terms”.\n" "Các tùy chọn hỗ trợ là: --term-good|--term-old và --term-bad|--term-new." -#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014 +#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021 msgid "revision walk setup failed\n" msgstr "gặp lỗi cài đặt việc di chuyển qua các điểm xét duyệt\n" @@ -10902,87 +11060,92 @@ msgstr "Hãy gọi “--bisect-state” với ít nhất một đối số" msgid "'git bisect %s' can take only one argument." msgstr "“git bisect %s” có thể lấy chỉ một đối số." -#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878 +#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880 #, c-format msgid "Bad rev input: %s" msgstr "Đầu vào rev sai: %s" -#: builtin/bisect--helper.c:912 +#: builtin/bisect--helper.c:887 +#, c-format +msgid "Bad rev input (not a commit): %s" +msgstr "Đầu vào rev sai (không phải là lần chuyển giao): %s" + +#: builtin/bisect--helper.c:919 msgid "We are not bisecting." msgstr "Chúng tôi không bisect." -#: builtin/bisect--helper.c:962 +#: builtin/bisect--helper.c:969 #, c-format msgid "'%s'?? what are you talking about?" msgstr "'%s'?? bạn đang nói gì thế?" -#: builtin/bisect--helper.c:974 +#: builtin/bisect--helper.c:981 #, c-format msgid "cannot read file '%s' for replaying" msgstr "không thể đọc tập tin '%s' để thao diễn lại" -#: builtin/bisect--helper.c:1047 +#: builtin/bisect--helper.c:1054 msgid "reset the bisection state" msgstr "đặt lại trạng di chuyển nửa bước" -#: builtin/bisect--helper.c:1049 +#: builtin/bisect--helper.c:1056 msgid "check whether bad or good terms exist" msgstr "kiểm tra xem các thời điểm xấu/tốt có tồn tại không" -#: builtin/bisect--helper.c:1051 +#: builtin/bisect--helper.c:1058 msgid "print out the bisect terms" msgstr "in ra các thời điểm di chuyển nửa bước" -#: builtin/bisect--helper.c:1053 +#: builtin/bisect--helper.c:1060 msgid "start the bisect session" msgstr "bắt đầu phiên di chuyển nửa bước" -#: builtin/bisect--helper.c:1055 +#: builtin/bisect--helper.c:1062 msgid "find the next bisection commit" msgstr "tìm lần chuyển giao không di chuyển phân đôi" -#: builtin/bisect--helper.c:1057 +#: builtin/bisect--helper.c:1064 msgid "mark the state of ref (or refs)" msgstr "đánh dấu trạng thái ref (hoặc refs)" -#: builtin/bisect--helper.c:1059 +#: builtin/bisect--helper.c:1066 msgid "list the bisection steps so far" msgstr "liệt kê các bước bisection đi quá xa" -#: builtin/bisect--helper.c:1061 +#: builtin/bisect--helper.c:1068 msgid "replay the bisection process from the given file" msgstr "phát lại quá trình bisection từ tệp đã cho" -#: builtin/bisect--helper.c:1063 +#: builtin/bisect--helper.c:1070 msgid "skip some commits for checkout" msgstr "bỏ qua một số lần chuyển giao để lấy ra" -#: builtin/bisect--helper.c:1065 +#: builtin/bisect--helper.c:1072 msgid "no log for BISECT_WRITE" msgstr "không có nhật ký cho BISECT_WRITE" -#: builtin/bisect--helper.c:1080 +#: builtin/bisect--helper.c:1087 msgid "--bisect-reset requires either no argument or a commit" msgstr "" "--bisect-reset requires không nhận đối số cũng không nhận lần chuyển giao" -#: builtin/bisect--helper.c:1085 +#: builtin/bisect--helper.c:1092 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check cần 2 hoặc 3 tham số" -#: builtin/bisect--helper.c:1091 +#: builtin/bisect--helper.c:1098 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms cần 0 hoặc 1 tham số" -#: builtin/bisect--helper.c:1100 +#: builtin/bisect--helper.c:1107 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next cần 0 tham số" -#: builtin/bisect--helper.c:1111 +#: builtin/bisect--helper.c:1118 msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log cần 0 tham số" -#: builtin/bisect--helper.c:1116 +#: builtin/bisect--helper.c:1123 msgid "no logfile given" msgstr "chưa chỉ ra tập tin ghi nhật ký" @@ -11035,9 +11198,9 @@ msgstr "không coi các lần chuyển giao gốc là giới hạn (Mặc địn msgid "show work cost statistics" msgstr "hiển thị thống kê công sức làm việc" -#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92 -#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175 -#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119 +#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 +#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 +#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 #: builtin/push.c:575 builtin/send-pack.c:198 msgid "force progress reporting" msgstr "ép buộc báo cáo tiến triển công việc" @@ -11086,7 +11249,7 @@ msgstr "hiển thị thư điện tử của tác giả thay cho tên (Mặc đ msgid "ignore whitespace differences" msgstr "bỏ qua các khác biệt do khoảng trắng gây ra" -#: builtin/blame.c:883 builtin/log.c:1812 +#: builtin/blame.c:883 builtin/log.c:1820 msgid "rev" msgstr "rev" @@ -11263,74 +11426,74 @@ msgstr "Đã xóa nhánh theo dõi máy chủ \"%s\" (từng là %s).\n" msgid "Deleted branch %s (was %s).\n" msgstr "Nhánh “%s” đã bị xóa (từng là %s)\n" -#: builtin/branch.c:438 builtin/tag.c:61 +#: builtin/branch.c:440 builtin/tag.c:63 msgid "unable to parse format string" msgstr "không thể phân tích chuỗi định dạng" -#: builtin/branch.c:469 +#: builtin/branch.c:471 msgid "could not resolve HEAD" msgstr "không thể phân giải HEAD" -#: builtin/branch.c:475 +#: builtin/branch.c:477 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) chỉ bên ngoài của refs/heads/" -#: builtin/branch.c:490 +#: builtin/branch.c:492 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Nhánh %s đang được cải tổ lại tại %s" -#: builtin/branch.c:494 +#: builtin/branch.c:496 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Nhánh %s đang được di chuyển phân đôi (bisect) tại %s" -#: builtin/branch.c:511 +#: builtin/branch.c:513 msgid "cannot copy the current branch while not on any." msgstr "không thể sao chép nhánh hiện hành trong khi nó chẳng ở đâu cả." -#: builtin/branch.c:513 +#: builtin/branch.c:515 msgid "cannot rename the current branch while not on any." msgstr "không thể đổi tên nhánh hiện hành trong khi nó chẳng ở đâu cả." -#: builtin/branch.c:524 +#: builtin/branch.c:526 #, c-format msgid "Invalid branch name: '%s'" msgstr "Tên nhánh không hợp lệ: “%s”" -#: builtin/branch.c:553 +#: builtin/branch.c:555 msgid "Branch rename failed" msgstr "Gặp lỗi khi đổi tên nhánh" -#: builtin/branch.c:555 +#: builtin/branch.c:557 msgid "Branch copy failed" msgstr "Gặp lỗi khi sao chép nhánh" -#: builtin/branch.c:559 +#: builtin/branch.c:561 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Đã tạo một bản sao của nhánh khuyết danh “%s”" -#: builtin/branch.c:562 +#: builtin/branch.c:564 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Đã đổi tên nhánh khuyết danh “%s” đi" -#: builtin/branch.c:568 +#: builtin/branch.c:570 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Nhánh bị đổi tên thành %s, nhưng HEAD lại không được cập nhật!" -#: builtin/branch.c:577 +#: builtin/branch.c:579 msgid "Branch is renamed, but update of config-file failed" msgstr "Nhánh bị đổi tên, nhưng cập nhật tập tin cấu hình gặp lỗi" -#: builtin/branch.c:579 +#: builtin/branch.c:581 msgid "Branch is copied, but update of config-file failed" msgstr "Nhánh đã được sao chép, nhưng cập nhật tập tin cấu hình gặp lỗi" -#: builtin/branch.c:595 +#: builtin/branch.c:597 #, c-format msgid "" "Please edit the description for the branch\n" @@ -11341,180 +11504,180 @@ msgstr "" " %s\n" "Những dòng được bắt đầu bằng “%c” sẽ được cắt bỏ.\n" -#: builtin/branch.c:629 +#: builtin/branch.c:631 msgid "Generic options" msgstr "Tùy chọn chung" -#: builtin/branch.c:631 +#: builtin/branch.c:633 msgid "show hash and subject, give twice for upstream branch" msgstr "hiển thị mã băm và chủ đề, đưa ra hai lần cho nhánh thượng nguồn" -#: builtin/branch.c:632 +#: builtin/branch.c:634 msgid "suppress informational messages" msgstr "không xuất các thông tin" -#: builtin/branch.c:633 +#: builtin/branch.c:635 msgid "set up tracking mode (see git-pull(1))" msgstr "cài đặt chế độ theo dõi (xem git-pull(1))" -#: builtin/branch.c:635 +#: builtin/branch.c:637 msgid "do not use" msgstr "không dùng" -#: builtin/branch.c:637 builtin/rebase.c:534 +#: builtin/branch.c:639 builtin/rebase.c:533 msgid "upstream" msgstr "thượng nguồn" -#: builtin/branch.c:637 +#: builtin/branch.c:639 msgid "change the upstream info" msgstr "thay đổi thông tin thượng nguồn" -#: builtin/branch.c:638 +#: builtin/branch.c:640 msgid "unset the upstream info" msgstr "bỏ đặt thông tin thượng nguồn" -#: builtin/branch.c:639 +#: builtin/branch.c:641 msgid "use colored output" msgstr "tô màu kết xuất" -#: builtin/branch.c:640 +#: builtin/branch.c:642 msgid "act on remote-tracking branches" msgstr "thao tác trên nhánh “remote-tracking”" -#: builtin/branch.c:642 builtin/branch.c:644 +#: builtin/branch.c:644 builtin/branch.c:646 msgid "print only branches that contain the commit" msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao" -#: builtin/branch.c:643 builtin/branch.c:645 +#: builtin/branch.c:645 builtin/branch.c:647 msgid "print only branches that don't contain the commit" msgstr "chỉ hiển thị những nhánh mà nó không chứa lần chuyển giao" -#: builtin/branch.c:648 +#: builtin/branch.c:650 msgid "Specific git-branch actions:" msgstr "Hành động git-branch:" -#: builtin/branch.c:649 +#: builtin/branch.c:651 msgid "list both remote-tracking and local branches" msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ" -#: builtin/branch.c:651 +#: builtin/branch.c:653 msgid "delete fully merged branch" msgstr "xóa một toàn bộ nhánh đã hòa trộn" -#: builtin/branch.c:652 +#: builtin/branch.c:654 msgid "delete branch (even if not merged)" msgstr "xóa nhánh (cho dù là chưa được hòa trộn)" -#: builtin/branch.c:653 +#: builtin/branch.c:655 msgid "move/rename a branch and its reflog" msgstr "di chuyển hay đổi tên một nhánh và reflog của nó" -#: builtin/branch.c:654 +#: builtin/branch.c:656 msgid "move/rename a branch, even if target exists" msgstr "di chuyển hoặc đổi tên một nhánh ngay cả khi đích đã có sẵn" -#: builtin/branch.c:655 +#: builtin/branch.c:657 msgid "copy a branch and its reflog" msgstr "sao chép một nhánh và reflog của nó" -#: builtin/branch.c:656 +#: builtin/branch.c:658 msgid "copy a branch, even if target exists" msgstr "sao chép một nhánh ngay cả khi đích đã có sẵn" -#: builtin/branch.c:657 +#: builtin/branch.c:659 msgid "list branch names" msgstr "liệt kê các tên nhánh" -#: builtin/branch.c:658 +#: builtin/branch.c:660 msgid "show current branch name" msgstr "hiển thị nhánh hiện hành" -#: builtin/branch.c:659 +#: builtin/branch.c:661 msgid "create the branch's reflog" msgstr "tạo reflog của nhánh" -#: builtin/branch.c:661 +#: builtin/branch.c:663 msgid "edit the description for the branch" msgstr "sửa mô tả cho nhánh" -#: builtin/branch.c:662 +#: builtin/branch.c:664 msgid "force creation, move/rename, deletion" msgstr "buộc tạo, di chuyển/đổi tên, xóa" -#: builtin/branch.c:663 +#: builtin/branch.c:665 msgid "print only branches that are merged" msgstr "chỉ hiển thị những nhánh mà nó được hòa trộn" -#: builtin/branch.c:664 +#: builtin/branch.c:666 msgid "print only branches that are not merged" msgstr "chỉ hiển thị những nhánh mà nó không được hòa trộn" -#: builtin/branch.c:665 +#: builtin/branch.c:667 msgid "list branches in columns" msgstr "liệt kê các nhánh trong các cột" -#: builtin/branch.c:667 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:466 +#: builtin/tag.c:477 msgid "object" msgstr "đối tượng" -#: builtin/branch.c:668 +#: builtin/branch.c:670 msgid "print only branches of the object" msgstr "chỉ hiển thị các nhánh của đối tượng" -#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473 +#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484 msgid "sorting and filtering are case insensitive" msgstr "sắp xếp và lọc là phân biệt HOA thường" -#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471 +#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "định dạng sẽ dùng cho đầu ra" -#: builtin/branch.c:693 builtin/clone.c:790 +#: builtin/branch.c:695 builtin/clone.c:794 msgid "HEAD not found below refs/heads!" msgstr "Không tìm thấy HEAD ở dưới refs/heads!" -#: builtin/branch.c:717 +#: builtin/branch.c:719 msgid "--column and --verbose are incompatible" msgstr "tùy chọn --column và --verbose xung khắc nhau" -#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797 +#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799 msgid "branch name required" msgstr "cần chỉ ra tên nhánh" -#: builtin/branch.c:764 +#: builtin/branch.c:766 msgid "Cannot give description to detached HEAD" msgstr "Không thể đưa ra mô tả HEAD đã tách rời" -#: builtin/branch.c:769 +#: builtin/branch.c:771 msgid "cannot edit description of more than one branch" msgstr "không thể sửa mô tả cho nhiều hơn một nhánh" -#: builtin/branch.c:776 +#: builtin/branch.c:778 #, c-format msgid "No commit on branch '%s' yet." msgstr "Vẫn chưa chuyển giao trên nhánh “%s”." -#: builtin/branch.c:779 +#: builtin/branch.c:781 #, c-format msgid "No branch named '%s'." msgstr "Không có nhánh nào có tên “%s”." -#: builtin/branch.c:794 +#: builtin/branch.c:796 msgid "too many branches for a copy operation" msgstr "quá nhiều nhánh dành cho thao tác sao chép" -#: builtin/branch.c:803 +#: builtin/branch.c:805 msgid "too many arguments for a rename operation" msgstr "quá nhiều tham số cho thao tác đổi tên" -#: builtin/branch.c:808 +#: builtin/branch.c:810 msgid "too many arguments to set new upstream" msgstr "quá nhiều tham số để đặt thượng nguồn mới" -#: builtin/branch.c:812 +#: builtin/branch.c:814 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -11522,30 +11685,30 @@ msgstr "" "không thể đặt thượng nguồn của HEAD thành %s khi mà nó chẳng chỉ đến nhánh " "nào cả." -#: builtin/branch.c:815 builtin/branch.c:838 +#: builtin/branch.c:817 builtin/branch.c:840 #, c-format msgid "no such branch '%s'" msgstr "không có nhánh nào như thế “%s”" -#: builtin/branch.c:819 +#: builtin/branch.c:821 #, c-format msgid "branch '%s' does not exist" msgstr "chưa có nhánh “%s”" -#: builtin/branch.c:832 +#: builtin/branch.c:834 msgid "too many arguments to unset upstream" msgstr "quá nhiều tham số để bỏ đặt thượng nguồn" -#: builtin/branch.c:836 +#: builtin/branch.c:838 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "không thể bỏ đặt thượng nguồn của HEAD không chỉ đến một nhánh nào cả." -#: builtin/branch.c:842 +#: builtin/branch.c:844 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Nhánh “%s” không có thông tin thượng nguồn" -#: builtin/branch.c:852 +#: builtin/branch.c:854 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11554,7 +11717,7 @@ msgstr "" "nhánh.\n" "Có phải ý bạn là dùng: -a|-r --list <mẫu>?" -#: builtin/branch.c:856 +#: builtin/branch.c:858 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -11622,39 +11785,39 @@ msgstr "" "Vui lòng xen xét phần còn lại của báo cáo lỗi bên dưới.\n" "Bạn có thể xóa bất kỳ dòng nào bạn không muốn chia sẻ.\n" -#: builtin/bugreport.c:135 +#: builtin/bugreport.c:136 msgid "specify a destination for the bugreport file" msgstr "chỉ định thư mục định để tạo tập tin báo cáo lỗi" -#: builtin/bugreport.c:137 +#: builtin/bugreport.c:138 msgid "specify a strftime format suffix for the filename" msgstr "" "chỉ định chuỗi định dạng thời gian strftime dùng làm hậu tố cho tên tập tin" -#: builtin/bugreport.c:159 +#: builtin/bugreport.c:160 #, c-format msgid "could not create leading directories for '%s'" msgstr "không thể tạo các thư mục dẫn đầu cho “%s”" -#: builtin/bugreport.c:166 +#: builtin/bugreport.c:167 msgid "System Info" msgstr "Thông tin hệ thống" -#: builtin/bugreport.c:169 +#: builtin/bugreport.c:170 msgid "Enabled Hooks" msgstr "Các Móc đã được bật" -#: builtin/bugreport.c:176 +#: builtin/bugreport.c:177 #, c-format msgid "couldn't create a new file at '%s'" msgstr "không thể tạo tập tin mới tại “%s”" -#: builtin/bugreport.c:179 +#: builtin/bugreport.c:180 #, c-format msgid "unable to write to %s" msgstr "không thể ghi vào %s" -#: builtin/bugreport.c:189 +#: builtin/bugreport.c:190 #, c-format msgid "Created new report at '%s'.\n" msgstr "Đã tạo báo cáo mới tại “%s”\n" @@ -11675,19 +11838,19 @@ msgstr "git bundle list-heads <tập tin> [<tên tham chiếu>…]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <tập tin> [<tên tham chiếu>…]" -#: builtin/bundle.c:67 builtin/pack-objects.c:3495 +#: builtin/bundle.c:67 builtin/pack-objects.c:3747 msgid "do not show progress meter" msgstr "không hiển thị bộ đo tiến trình" -#: builtin/bundle.c:69 builtin/pack-objects.c:3497 +#: builtin/bundle.c:69 builtin/pack-objects.c:3749 msgid "show progress meter" msgstr "hiển thị bộ đo tiến trình" -#: builtin/bundle.c:71 builtin/pack-objects.c:3499 +#: builtin/bundle.c:71 builtin/pack-objects.c:3751 msgid "show progress meter during object writing phase" msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng" -#: builtin/bundle.c:74 builtin/pack-objects.c:3502 +#: builtin/bundle.c:74 builtin/pack-objects.c:3754 msgid "similar to --all-progress when progress meter is shown" msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện" @@ -11830,8 +11993,8 @@ msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn" msgid "terminate input and output records by a NUL character" msgstr "chấm dứt các bản ghi vào và ra bằng ký tự NULL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549 -#: builtin/worktree.c:489 +#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 +#: builtin/worktree.c:491 msgid "suppress progress reporting" msgstr "chặn các báo cáo tiến trình hoạt động" @@ -11843,27 +12006,27 @@ msgstr "hiển thị những đường dẫn đầu vào không khớp với m msgid "ignore index when checking" msgstr "bỏ qua mục lục khi kiểm tra" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:165 msgid "cannot specify pathnames with --stdin" msgstr "không thể chỉ định các tên đường dẫn với --stdin" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:168 msgid "-z only makes sense with --stdin" msgstr "-z chỉ hợp lý với --stdin" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:170 msgid "no path specified" msgstr "chưa chỉ ra đường dẫn" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:174 msgid "--quiet is only valid with a single pathname" msgstr "--quiet chỉ hợp lệ với tên đường dẫn đơn" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:176 msgid "cannot have both --quiet and --verbose" msgstr "không thể dùng cả hai tùy chọn --quiet và --verbose" -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:179 msgid "--non-matching is only valid with --verbose" msgstr "tùy-chọn --non-matching chỉ hợp lệ khi dùng với --verbose" @@ -11884,6 +12047,21 @@ msgstr "không thể phân tích danh bạ: “%s”" msgid "no contacts specified" msgstr "chưa chỉ ra danh bạ" +#: builtin/checkout--worker.c:110 +msgid "git checkout--worker [<options>]" +msgstr "git checkout--worker [<các tùy chọn>]" + +#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 +#: builtin/column.c:31 builtin/submodule--helper.c:1825 +#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836 +#: builtin/submodule--helper.c:2334 builtin/worktree.c:719 +msgid "string" +msgstr "chuỗi" + +#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202 +msgid "when creating files, prepend <string>" +msgstr "khi tạo các tập tin, nối thêm <chuỗi>" + #: builtin/checkout-index.c:152 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<các tùy chọn>] [--] [<tập-tin>…]" @@ -11892,156 +12070,145 @@ msgstr "git checkout-index [<các tùy chọn>] [--] [<tập-tin>…]" msgid "stage should be between 1 and 3 or all" msgstr "stage nên giữa 1 và 3 hay all" -#: builtin/checkout-index.c:186 +#: builtin/checkout-index.c:187 msgid "check out all files in the index" msgstr "lấy ra toàn bộ các tập tin trong bảng mục lục" -#: builtin/checkout-index.c:187 +#: builtin/checkout-index.c:188 msgid "force overwrite of existing files" msgstr "ép buộc ghi đè lên tập tin đã sẵn có từ trước" -#: builtin/checkout-index.c:189 +#: builtin/checkout-index.c:190 msgid "no warning for existing files and files not in index" msgstr "" "không cảnh báo cho những tập tin tồn tại và không có trong bảng mục lục" -#: builtin/checkout-index.c:191 +#: builtin/checkout-index.c:192 msgid "don't checkout new files" msgstr "không checkout các tập tin mới" -#: builtin/checkout-index.c:193 +#: builtin/checkout-index.c:194 msgid "update stat information in the index file" msgstr "cập nhật thông tin thống kê trong tập tin lưu bảng mục lục mới" -#: builtin/checkout-index.c:197 +#: builtin/checkout-index.c:198 msgid "read list of paths from the standard input" msgstr "đọc danh sách đường dẫn từ đầu vào tiêu chuẩn" -#: builtin/checkout-index.c:199 +#: builtin/checkout-index.c:200 msgid "write the content to temporary files" msgstr "ghi nội dung vào tập tin tạm" -#: builtin/checkout-index.c:200 builtin/column.c:31 -#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 -#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:717 -msgid "string" -msgstr "chuỗi" - -#: builtin/checkout-index.c:201 -msgid "when creating files, prepend <string>" -msgstr "khi tạo các tập tin, nối thêm <chuỗi>" - -#: builtin/checkout-index.c:203 +#: builtin/checkout-index.c:204 msgid "copy out the files from named stage" msgstr "sao chép ra các tập tin từ bệ phóng có tên" -#: builtin/checkout.c:31 +#: builtin/checkout.c:33 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<các tùy chọn>] <nhánh>" -#: builtin/checkout.c:32 +#: builtin/checkout.c:34 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<các tùy chọn>] [<nhánh>] -- <tập-tin>…" -#: builtin/checkout.c:37 +#: builtin/checkout.c:39 msgid "git switch [<options>] [<branch>]" msgstr "git switch [<các tùy chọn>] [<nhánh>]" -#: builtin/checkout.c:42 +#: builtin/checkout.c:44 msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<các tùy chọn>] [--source=<nhánh>] <tập tin>…" -#: builtin/checkout.c:188 builtin/checkout.c:227 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have our version" msgstr "đường dẫn “%s” không có các phiên bản của chúng ta" -#: builtin/checkout.c:190 builtin/checkout.c:229 +#: builtin/checkout.c:192 builtin/checkout.c:231 #, c-format msgid "path '%s' does not have their version" msgstr "đường dẫn “%s” không có các phiên bản của chúng" -#: builtin/checkout.c:206 +#: builtin/checkout.c:208 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "đường dẫn “%s” không có tất cả các phiên bản cần thiết" -#: builtin/checkout.c:258 +#: builtin/checkout.c:261 #, c-format msgid "path '%s' does not have necessary versions" msgstr "đường dẫn “%s” không có các phiên bản cần thiết" -#: builtin/checkout.c:275 +#: builtin/checkout.c:278 #, c-format msgid "path '%s': cannot merge" msgstr "đường dẫn “%s”: không thể hòa trộn" -#: builtin/checkout.c:291 +#: builtin/checkout.c:294 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Không thể thêm kết quả hòa trộn cho “%s”" -#: builtin/checkout.c:396 +#: builtin/checkout.c:414 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Đã tạo lại %d xung đột hòa trộn" -#: builtin/checkout.c:401 +#: builtin/checkout.c:419 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Đã cập nhật đường dẫn %d từ %s" -#: builtin/checkout.c:408 +#: builtin/checkout.c:426 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Đã cập nhật đường dẫn %d từ mục lục" -#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 -#: builtin/checkout.c:441 +#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 +#: builtin/checkout.c:459 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "không được dùng “%s” với các đường dẫn cập nhật" -#: builtin/checkout.c:444 builtin/checkout.c:447 +#: builtin/checkout.c:462 builtin/checkout.c:465 #, c-format msgid "'%s' cannot be used with %s" msgstr "không được dùng “%s” với %s" -#: builtin/checkout.c:451 +#: builtin/checkout.c:469 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Không thể cập nhật các đường dẫn và chuyển đến nhánh “%s” cùng một lúc." -#: builtin/checkout.c:455 +#: builtin/checkout.c:473 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "không chỉ định “%s” cũng không “%s”" -#: builtin/checkout.c:459 +#: builtin/checkout.c:477 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "phải có “%s” khi không chỉ định “%s”" -#: builtin/checkout.c:464 builtin/checkout.c:469 +#: builtin/checkout.c:482 builtin/checkout.c:487 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "“%s” hay “%s” không thể được sử dụng với %s" -#: builtin/checkout.c:543 builtin/checkout.c:550 +#: builtin/checkout.c:563 builtin/checkout.c:570 #, c-format msgid "path '%s' is unmerged" msgstr "đường dẫn “%s” không được hòa trộn" -#: builtin/checkout.c:718 +#: builtin/checkout.c:739 msgid "you need to resolve your current index first" msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã" -#: builtin/checkout.c:772 +#: builtin/checkout.c:793 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12051,50 +12218,50 @@ msgstr "" "sau:\n" "%s" -#: builtin/checkout.c:865 +#: builtin/checkout.c:886 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Không thể thực hiện reflog cho “%s”: %s\n" -#: builtin/checkout.c:907 +#: builtin/checkout.c:928 msgid "HEAD is now at" msgstr "HEAD hiện giờ tại" -#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "không thể cập nhật HEAD" -#: builtin/checkout.c:915 +#: builtin/checkout.c:936 #, c-format msgid "Reset branch '%s'\n" msgstr "Đặt lại nhánh “%s”\n" -#: builtin/checkout.c:918 +#: builtin/checkout.c:939 #, c-format msgid "Already on '%s'\n" msgstr "Đã sẵn sàng trên “%s”\n" -#: builtin/checkout.c:922 +#: builtin/checkout.c:943 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Đã chuyển tới và đặt lại nhánh “%s”\n" -#: builtin/checkout.c:924 builtin/checkout.c:1355 +#: builtin/checkout.c:945 builtin/checkout.c:1376 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Đã chuyển đến nhánh mới “%s”\n" -#: builtin/checkout.c:926 +#: builtin/checkout.c:947 #, c-format msgid "Switched to branch '%s'\n" msgstr "Đã chuyển đến nhánh “%s”\n" -#: builtin/checkout.c:977 +#: builtin/checkout.c:998 #, c-format msgid " ... and %d more.\n" msgstr " … và nhiều hơn %d.\n" -#: builtin/checkout.c:983 +#: builtin/checkout.c:1004 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12113,7 +12280,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:1002 +#: builtin/checkout.c:1023 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12134,19 +12301,19 @@ msgstr[0] "" " git branch <tên_nhánh_mới> %s\n" "\n" -#: builtin/checkout.c:1037 +#: builtin/checkout.c:1058 msgid "internal error in revision walk" msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét duyệt" -#: builtin/checkout.c:1041 +#: builtin/checkout.c:1062 msgid "Previous HEAD position was" msgstr "Vị trí trước kia của HEAD là" -#: builtin/checkout.c:1081 builtin/checkout.c:1350 +#: builtin/checkout.c:1102 builtin/checkout.c:1371 msgid "You are on a branch yet to be born" msgstr "Bạn tại nhánh mà nó chưa hề được sinh ra" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1184 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12155,7 +12322,7 @@ msgstr "" "“%s” không thể là cả tập tin nội bộ và một nhánh theo dõi.\n" "Vui long dùng -- (và tùy chọn thêm --no-guess) để tránh lẫn lộn" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1191 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12175,51 +12342,51 @@ msgstr "" "chưa rõ ràng, ví dụ máy chủ “origin”, cân nhắc cài đặt\n" "checkout.defaultRemote=origin trong cấu hình của bạn." -#: builtin/checkout.c:1180 +#: builtin/checkout.c:1201 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "“%s” khớp với nhiều (%d) nhánh máy chủ được theo dõi" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1267 msgid "only one reference expected" msgstr "chỉ cần một tham chiếu" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1284 #, c-format msgid "only one reference expected, %d given." msgstr "chỉ cần một tham chiếu, nhưng lại đưa ra %d." -#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438 +#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438 #, c-format msgid "invalid reference: %s" msgstr "tham chiếu không hợp lệ: %s" -#: builtin/checkout.c:1322 builtin/checkout.c:1688 +#: builtin/checkout.c:1343 builtin/checkout.c:1709 #, c-format msgid "reference is not a tree: %s" msgstr "tham chiếu không phải là một cây:%s" -#: builtin/checkout.c:1369 +#: builtin/checkout.c:1390 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "cần một nhánh, nhưng lại nhận được thẻ “%s”" -#: builtin/checkout.c:1371 +#: builtin/checkout.c:1392 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "cần một nhánh, nhưng lại nhận được nhánh máy phục vụ “%s”" -#: builtin/checkout.c:1372 builtin/checkout.c:1380 +#: builtin/checkout.c:1393 builtin/checkout.c:1401 #, c-format msgid "a branch is expected, got '%s'" msgstr "cần một nhánh, nhưng lại nhận được “%s”" -#: builtin/checkout.c:1375 +#: builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "cần một nhánh, nhưng lại nhận được “%s”" -#: builtin/checkout.c:1391 +#: builtin/checkout.c:1412 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12227,7 +12394,7 @@ msgstr "" "không thể chuyển nhánh trong khi đang hòa trộn\n" "Cân nhắc dung \"git merge --quit\" hoặc \"git worktree add\"." -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1416 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12235,7 +12402,7 @@ msgstr "" "không thể chuyển nhanh ở giữa một phiên am\n" "Cân nhắc dùng \"git am --quit\" hoặc \"git worktree add\"." -#: builtin/checkout.c:1399 +#: builtin/checkout.c:1420 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12243,7 +12410,7 @@ msgstr "" "không thể chuyển nhánh trong khi cải tổ\n" "Cân nhắc dùng \"git rebase --quit\" hay \"git worktree add\"." -#: builtin/checkout.c:1403 +#: builtin/checkout.c:1424 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12251,7 +12418,7 @@ msgstr "" "không thể chuyển nhánh trong khi cherry-picking\n" "Cân nhắc dùng \"git cherry-pick --quit\" hay \"git worktree add\"." -#: builtin/checkout.c:1407 +#: builtin/checkout.c:1428 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12259,143 +12426,143 @@ msgstr "" "không thể chuyển nhánh trong khi hoàn nguyên\n" "Cân nhắc dùng \"git revert --quit\" hoặc \"git worktree add\"." -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1432 msgid "you are switching branch while bisecting" msgstr "" "bạn hiện tại đang thực hiện việc chuyển nhánh trong khi đang di chuyển nửa " "bước" -#: builtin/checkout.c:1418 +#: builtin/checkout.c:1439 msgid "paths cannot be used with switching branches" msgstr "các đường dẫn không thể dùng cùng với các nhánh chuyển" -#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429 +#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "“%s” không thể được sử dụng với các nhánh chuyển" -#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439 -#: builtin/checkout.c:1444 builtin/checkout.c:1449 +#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 +#: builtin/checkout.c:1465 builtin/checkout.c:1470 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "“%s” không thể được dùng với “%s”" -#: builtin/checkout.c:1446 +#: builtin/checkout.c:1467 #, c-format msgid "'%s' cannot take <start-point>" msgstr "“%s” không thể nhận <điểm-đầu>" -#: builtin/checkout.c:1454 +#: builtin/checkout.c:1475 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Không thể chuyển nhánh đến một thứ không phải là lần chuyển giao “%s”" -#: builtin/checkout.c:1461 +#: builtin/checkout.c:1482 msgid "missing branch or commit argument" msgstr "thiếu tham số là nhánh hoặc lần chuyển giao" -#: builtin/checkout.c:1504 +#: builtin/checkout.c:1525 msgid "perform a 3-way merge with the new branch" msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới" -#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322 +#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323 msgid "style" msgstr "kiểu" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1527 msgid "conflict style (merge or diff3)" msgstr "xung đột kiểu (hòa trộn hoặc diff3)" -#: builtin/checkout.c:1518 builtin/worktree.c:486 +#: builtin/checkout.c:1539 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "rời bỏ HEAD tại lần chuyển giao theo tên" -#: builtin/checkout.c:1519 +#: builtin/checkout.c:1540 msgid "set upstream info for new branch" msgstr "đặt thông tin thượng nguồn cho nhánh mới" -#: builtin/checkout.c:1521 +#: builtin/checkout.c:1542 msgid "force checkout (throw away local modifications)" msgstr "ép buộc lấy ra (bỏ đi những thay đổi nội bộ)" -#: builtin/checkout.c:1523 +#: builtin/checkout.c:1544 msgid "new-branch" msgstr "nhánh-mới" -#: builtin/checkout.c:1523 +#: builtin/checkout.c:1544 msgid "new unparented branch" msgstr "nhánh không cha mới" -#: builtin/checkout.c:1525 builtin/merge.c:301 +#: builtin/checkout.c:1546 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "cập nhật các tập tin bị bỏ qua (mặc định)" -#: builtin/checkout.c:1528 +#: builtin/checkout.c:1549 msgid "do not check if another worktree is holding the given ref" msgstr "không kiểm tra nếu cây làm việc khác đang giữ tham chiếu đã cho" -#: builtin/checkout.c:1541 +#: builtin/checkout.c:1562 msgid "checkout our version for unmerged files" msgstr "" "lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1565 msgid "checkout their version for unmerged files" msgstr "" "lấy ra (checkout) phiên bản của chúng họ cho các tập tin chưa được hòa trộn" -#: builtin/checkout.c:1548 +#: builtin/checkout.c:1569 msgid "do not limit pathspecs to sparse entries only" msgstr "không giới hạn đặc tả đường dẫn thành chỉ các mục rải rác" -#: builtin/checkout.c:1603 +#: builtin/checkout.c:1624 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c và --orphan loại từ lẫn nhau" -#: builtin/checkout.c:1607 +#: builtin/checkout.c:1628 msgid "-p and --overlay are mutually exclusive" msgstr "-p và --overlay loại từ lẫn nhau" -#: builtin/checkout.c:1644 +#: builtin/checkout.c:1665 msgid "--track needs a branch name" msgstr "--track cần tên một nhánh" -#: builtin/checkout.c:1649 +#: builtin/checkout.c:1670 #, c-format msgid "missing branch name; try -%c" msgstr "thiếu tên nhánh; hãy thử -%c" -#: builtin/checkout.c:1681 +#: builtin/checkout.c:1702 #, c-format msgid "could not resolve %s" msgstr "không thể phân giải “%s”" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1718 msgid "invalid path specification" msgstr "đường dẫn đã cho không hợp lệ" -#: builtin/checkout.c:1704 +#: builtin/checkout.c:1725 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "“%s” không phải là một lần chuyển giao và một nhánh'%s” không thể được tạo " "từ đó" -#: builtin/checkout.c:1708 +#: builtin/checkout.c:1729 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach không nhận một đối số đường dẫn “%s”" -#: builtin/checkout.c:1717 +#: builtin/checkout.c:1738 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file xung khắc với --detach" -#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566 +#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file xung khắc với --patch" -#: builtin/checkout.c:1733 +#: builtin/checkout.c:1754 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12403,70 +12570,70 @@ msgstr "" "git checkout: --ours/--theirs, --force và --merge là xung khắc với nhau khi\n" "checkout bảng mục lục (index)." -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1759 msgid "you must specify path(s) to restore" msgstr "bạn phải chỉ định các thư mục muốn hồi phục" -#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815 -#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482 -#: builtin/worktree.c:484 +#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 +#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484 +#: builtin/worktree.c:486 msgid "branch" msgstr "nhánh" -#: builtin/checkout.c:1765 +#: builtin/checkout.c:1786 msgid "create and checkout a new branch" msgstr "tạo và checkout một nhánh mới" -#: builtin/checkout.c:1767 +#: builtin/checkout.c:1788 msgid "create/reset and checkout a branch" msgstr "tạo/đặt_lại và checkout một nhánh" -#: builtin/checkout.c:1768 +#: builtin/checkout.c:1789 msgid "create reflog for new branch" msgstr "tạo reflog cho nhánh mới" -#: builtin/checkout.c:1770 +#: builtin/checkout.c:1791 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "đoán thứ hai “git checkout <không-nhánh-nào-như-vậy>” (mặc định)" -#: builtin/checkout.c:1771 +#: builtin/checkout.c:1792 msgid "use overlay mode (default)" msgstr "dùng chế độ che phủ (mặc định)" -#: builtin/checkout.c:1816 +#: builtin/checkout.c:1837 msgid "create and switch to a new branch" msgstr "tạo và chuyển đến một nhánh mới" -#: builtin/checkout.c:1818 +#: builtin/checkout.c:1839 msgid "create/reset and switch to a branch" msgstr "tạo/đặt_lại và chuyển đến một nhánh" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1841 msgid "second guess 'git switch <no-such-branch>'" msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\"" -#: builtin/checkout.c:1822 +#: builtin/checkout.c:1843 msgid "throw away local modifications" msgstr "vứt bỏ các sửa đổi địa phương" -#: builtin/checkout.c:1856 +#: builtin/checkout.c:1877 msgid "which tree-ish to checkout from" msgstr "lấy ra từ tree-ish nào" -#: builtin/checkout.c:1858 +#: builtin/checkout.c:1879 msgid "restore the index" msgstr "phục hồi bảng mục lục" -#: builtin/checkout.c:1860 +#: builtin/checkout.c:1881 msgid "restore the working tree (default)" msgstr "phục hồi cây làm việc (mặc định)" -#: builtin/checkout.c:1862 +#: builtin/checkout.c:1883 msgid "ignore unmerged entries" msgstr "bỏ qua những thứ chưa hòa trộn: %s" -#: builtin/checkout.c:1863 +#: builtin/checkout.c:1884 msgid "use overlay mode" msgstr "dùng chế độ che phủ" @@ -12497,11 +12664,6 @@ msgstr "Đang bỏ qua kho chứa %s\n" msgid "Would skip repository %s\n" msgstr "Nên bỏ qua kho chứa %s\n" -#: builtin/clean.c:37 -#, c-format -msgid "failed to remove %s" -msgstr "gặp lỗi khi gỡ bỏ %s" - #: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" @@ -12611,8 +12773,8 @@ msgid "remove whole directories" msgstr "gỡ bỏ toàn bộ thư mục" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186 -#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "mẫu" @@ -12653,164 +12815,169 @@ msgstr "-x và -X không thể dùng cùng nhau" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<các tùy chọn>] [--] <kho> [<t.mục>]" -#: builtin/clone.c:94 +#: builtin/clone.c:96 +msgid "don't clone shallow repository" +msgstr "đừng nhân bản từ kho nông" + +#: builtin/clone.c:98 msgid "don't create a checkout" msgstr "không tạo một checkout" -#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541 msgid "create a bare repository" msgstr "tạo kho thuần" -#: builtin/clone.c:99 +#: builtin/clone.c:103 msgid "create a mirror repository (implies bare)" msgstr "tạo kho bản sao (ý là kho thuần)" -#: builtin/clone.c:101 +#: builtin/clone.c:105 msgid "to clone from a local repository" msgstr "để nhân bản từ kho nội bộ" -#: builtin/clone.c:103 +#: builtin/clone.c:107 msgid "don't use local hardlinks, always copy" msgstr "không sử dụng liên kết cứng nội bộ, luôn sao chép" -#: builtin/clone.c:105 +#: builtin/clone.c:109 msgid "setup as shared repository" msgstr "cài đặt đây là kho chia sẻ" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "pathspec" msgstr "đặc-tả-đường-dẫn" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "initialize submodules in the clone" msgstr "khởi tạo mô-đun-con trong bản sao" -#: builtin/clone.c:111 +#: builtin/clone.c:115 msgid "number of submodules cloned in parallel" msgstr "số lượng mô-đun-con được nhân bản đồng thời" -#: builtin/clone.c:112 builtin/init-db.c:552 +#: builtin/clone.c:116 builtin/init-db.c:538 msgid "template-directory" msgstr "thư-mục-mẫu" -#: builtin/clone.c:113 builtin/init-db.c:553 +#: builtin/clone.c:117 builtin/init-db.c:539 msgid "directory from which templates will be used" msgstr "thư mục mà tại đó các mẫu sẽ được dùng" -#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 -#: builtin/submodule--helper.c:2336 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832 +#: builtin/submodule--helper.c:2337 msgid "reference repository" msgstr "kho tham chiếu" -#: builtin/clone.c:119 builtin/submodule--helper.c:1833 -#: builtin/submodule--helper.c:2338 +#: builtin/clone.c:123 builtin/submodule--helper.c:1834 +#: builtin/submodule--helper.c:2339 msgid "use --reference only while cloning" msgstr "chỉ dùng --reference khi nhân bản" -#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357 +#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495 +#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 msgid "name" msgstr "tên" -#: builtin/clone.c:121 +#: builtin/clone.c:125 msgid "use <name> instead of 'origin' to track upstream" msgstr "dùng <tên> thay cho “origin” để theo dõi thượng nguồn" -#: builtin/clone.c:123 +#: builtin/clone.c:127 msgid "checkout <branch> instead of the remote's HEAD" msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ" -#: builtin/clone.c:125 +#: builtin/clone.c:129 msgid "path to git-upload-pack on the remote" msgstr "đường dẫn đến git-upload-pack trên máy chủ" -#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863 #: builtin/pull.c:208 msgid "depth" msgstr "độ-sâu" -#: builtin/clone.c:127 +#: builtin/clone.c:131 msgid "create a shallow clone of that depth" msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho" -#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804 #: builtin/pull.c:211 msgid "time" msgstr "thời-gian" -#: builtin/clone.c:129 +#: builtin/clone.c:133 msgid "create a shallow clone since a specific time" msgstr "tạo bản sao không đầy đủ từ thời điểm đã cho" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323 +#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318 msgid "revision" msgstr "điểm xét duyệt" -#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215 +#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "làm sâu hơn lịch sử của bản sao shallow, bằng điểm xét duyệt loại trừ" -#: builtin/clone.c:133 builtin/submodule--helper.c:1843 -#: builtin/submodule--helper.c:2352 +#: builtin/clone.c:137 builtin/submodule--helper.c:1844 +#: builtin/submodule--helper.c:2353 msgid "clone only one branch, HEAD or --branch" msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch" -#: builtin/clone.c:135 +#: builtin/clone.c:139 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" "đứng có nhân bản bất kỳ nhánh nào, và làm cho những lần lấy về sau không " "theo chúng nữa" -#: builtin/clone.c:137 +#: builtin/clone.c:141 msgid "any cloned submodules will be shallow" msgstr "mọi mô-đun-con nhân bản sẽ là shallow (nông)" -#: builtin/clone.c:138 builtin/init-db.c:561 +#: builtin/clone.c:142 builtin/init-db.c:547 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:139 builtin/init-db.c:562 +#: builtin/clone.c:143 builtin/init-db.c:548 msgid "separate git dir from working tree" msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc" -#: builtin/clone.c:140 +#: builtin/clone.c:144 msgid "key=value" msgstr "khóa=giá_trị" -#: builtin/clone.c:141 +#: builtin/clone.c:145 msgid "set config inside the new repository" msgstr "đặt cấu hình bên trong một kho chứa mới" -#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 #: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "đặc-tả-máy-phục-vụ" -#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 #: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "tùy chọn để chuyển giao" -#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234 +#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 #: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "chỉ dùng địa chỉ IPv4" -#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237 +#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 #: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "chỉ dùng địa chỉ IPv6" -#: builtin/clone.c:150 +#: builtin/clone.c:154 msgid "any cloned submodules will use their remote-tracking branch" msgstr "mọi mô-đun-con nhân bản sẽ dung nhánh theo dõi máy chủ của chúng" -#: builtin/clone.c:152 +#: builtin/clone.c:156 msgid "initialize sparse-checkout file to include only files at root" msgstr "khởi tạo tập tin sparse-checkout để bao gồm chỉ các tập tin ở gốc" -#: builtin/clone.c:288 +#: builtin/clone.c:292 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12818,42 +12985,42 @@ msgstr "" "Không đoán được thư mục tên là gì.\n" "Vui lòng chỉ định tên một thư mục trên dòng lệnh" -#: builtin/clone.c:341 +#: builtin/clone.c:345 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "thông tin: không thể thêm thay thế cho “%s”: %s\n" -#: builtin/clone.c:414 +#: builtin/clone.c:418 #, c-format msgid "%s exists and is not a directory" msgstr "%s có tồn tại nhưng lại không phải là một thư mục" -#: builtin/clone.c:432 +#: builtin/clone.c:436 #, c-format msgid "failed to start iterator over '%s'" msgstr "gặp lỗi khi bắt đầu lặp qua “%s”" -#: builtin/clone.c:463 +#: builtin/clone.c:467 #, c-format msgid "failed to create link '%s'" msgstr "gặp lỗi khi tạo được liên kết mềm %s" -#: builtin/clone.c:467 +#: builtin/clone.c:471 #, c-format msgid "failed to copy file to '%s'" msgstr "gặp lỗi khi sao chép tập tin và “%s”" -#: builtin/clone.c:472 +#: builtin/clone.c:476 #, c-format msgid "failed to iterate over '%s'" msgstr "gặp lỗi khi lặp qua “%s”" -#: builtin/clone.c:499 +#: builtin/clone.c:503 #, c-format msgid "done.\n" msgstr "hoàn tất.\n" -#: builtin/clone.c:513 +#: builtin/clone.c:517 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12863,105 +13030,105 @@ msgstr "" "Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status”\n" "và thử lấy ra với lệnh “git restore --source=HEAD :/”\n" -#: builtin/clone.c:590 +#: builtin/clone.c:594 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)." -#: builtin/clone.c:709 +#: builtin/clone.c:713 #, c-format msgid "unable to update %s" msgstr "không thể cập nhật %s" -#: builtin/clone.c:757 +#: builtin/clone.c:761 msgid "failed to initialize sparse-checkout" msgstr "gặp lỗi khi khởi tạo sparse-checkout" -#: builtin/clone.c:780 +#: builtin/clone.c:784 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "refers HEAD máy chủ chỉ đến ref không tồn tại, không thể lấy ra.\n" -#: builtin/clone.c:812 +#: builtin/clone.c:816 msgid "unable to checkout working tree" msgstr "không thể lấy ra (checkout) cây làm việc" -#: builtin/clone.c:887 +#: builtin/clone.c:894 msgid "unable to write parameters to config file" msgstr "không thể ghi các tham số vào tập tin cấu hình" -#: builtin/clone.c:950 +#: builtin/clone.c:957 msgid "cannot repack to clean up" msgstr "không thể đóng gói để dọn dẹp" -#: builtin/clone.c:952 +#: builtin/clone.c:959 msgid "cannot unlink temporary alternates file" msgstr "không thể bỏ liên kết tập tin thay thế tạm thời" -#: builtin/clone.c:993 builtin/receive-pack.c:2493 +#: builtin/clone.c:1001 builtin/receive-pack.c:2491 msgid "Too many arguments." msgstr "Có quá nhiều đối số." -#: builtin/clone.c:997 +#: builtin/clone.c:1005 msgid "You must specify a repository to clone." msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)." -#: builtin/clone.c:1010 +#: builtin/clone.c:1018 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "tùy chọn --bare và --origin %s xung khắc nhau." -#: builtin/clone.c:1013 +#: builtin/clone.c:1021 msgid "--bare and --separate-git-dir are incompatible." msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau." -#: builtin/clone.c:1026 +#: builtin/clone.c:1035 #, c-format msgid "repository '%s' does not exist" msgstr "kho chứa “%s” chưa tồn tại" -#: builtin/clone.c:1030 builtin/fetch.c:1951 +#: builtin/clone.c:1039 builtin/fetch.c:2011 #, c-format msgid "depth %s is not a positive number" msgstr "độ sâu %s không phải là một số nguyên dương" -#: builtin/clone.c:1040 +#: builtin/clone.c:1049 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "đường dẫn đích “%s” đã có từ trước và không phải là một thư mục rỗng." -#: builtin/clone.c:1046 +#: builtin/clone.c:1055 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "" "đường dẫn kho chứa “%s” đã có từ trước và không phải là một thư mục rỗng." -#: builtin/clone.c:1060 +#: builtin/clone.c:1069 #, c-format msgid "working tree '%s' already exists." msgstr "cây làm việc “%s” đã sẵn tồn tại rồi." -#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271 -#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 +#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314 #, c-format msgid "could not create leading directories of '%s'" msgstr "không thể tạo các thư mục dẫn đầu của “%s”" -#: builtin/clone.c:1080 +#: builtin/clone.c:1089 #, c-format msgid "could not create work tree dir '%s'" msgstr "không thể tạo cây thư mục làm việc dir “%s”" -#: builtin/clone.c:1100 +#: builtin/clone.c:1109 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Đang nhân bản thành kho chứa bare “%s”…\n" -#: builtin/clone.c:1102 +#: builtin/clone.c:1111 #, c-format msgid "Cloning into '%s'...\n" msgstr "Đang nhân bản thành “%s”…\n" -#: builtin/clone.c:1126 +#: builtin/clone.c:1135 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -12969,46 +13136,46 @@ msgstr "" "nhân bản --recursive không tương thích với cả hai --reference và --reference-" "if-able" -#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705 +#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705 #, c-format msgid "'%s' is not a valid remote name" msgstr "“%s” không phải tên máy chủ hợp lệ" -#: builtin/clone.c:1211 +#: builtin/clone.c:1229 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế." -#: builtin/clone.c:1213 +#: builtin/clone.c:1231 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay " "thế." -#: builtin/clone.c:1215 +#: builtin/clone.c:1233 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay " "thế." -#: builtin/clone.c:1217 +#: builtin/clone.c:1235 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" "--filter bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế." -#: builtin/clone.c:1220 +#: builtin/clone.c:1240 msgid "source repository is shallow, ignoring --local" msgstr "kho nguồn là nông, nên bỏ qua --local" -#: builtin/clone.c:1225 +#: builtin/clone.c:1245 msgid "--local is ignored" msgstr "--local bị lờ đi" -#: builtin/clone.c:1315 builtin/clone.c:1323 +#: builtin/clone.c:1337 builtin/clone.c:1345 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s" -#: builtin/clone.c:1326 +#: builtin/clone.c:1348 msgid "You appear to have cloned an empty repository." msgstr "Bạn hình như là đã nhân bản một kho trống rỗng." @@ -13025,20 +13192,20 @@ msgid "layout to use" msgstr "bố cục để dùng" #: builtin/column.c:30 -msgid "Maximum width" -msgstr "Độ rộng tối đa" +msgid "maximum width" +msgstr "độ rộng tối đa" #: builtin/column.c:31 -msgid "Padding space on left border" -msgstr "Chèn thêm khoảng trống vào bên trái" +msgid "padding space on left border" +msgstr "chèn thêm khoảng trống vào bên trái" #: builtin/column.c:32 -msgid "Padding space on right border" -msgstr "Chèn thêm khoảng trắng vào bên phải" +msgid "padding space on right border" +msgstr "chèn thêm khoảng trắng vào bên phải" #: builtin/column.c:33 -msgid "Padding space between columns" -msgstr "Chèn thêm khoảng trắng giữa các cột" +msgid "padding space between columns" +msgstr "chèn thêm khoảng trắng giữa các cột" #: builtin/column.c:51 msgid "--command must be the first argument" @@ -13068,7 +13235,7 @@ msgid "could not find object directory matching %s" msgstr "không thể tìm thấy thư mục đối tượng khớp với “%s”" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768 +#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776 msgid "dir" msgstr "tmục" @@ -13171,7 +13338,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "cha mẹ bị trùng lặp %s đã bị bỏ qua" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559 #, c-format msgid "not a valid object name %s" msgstr "không phải là tên đối tượng hợp lệ “%s”" @@ -13199,13 +13366,13 @@ msgstr "cha-mẹ" msgid "id of a parent commit object" msgstr "mã số của đối tượng chuyển giao cha mẹ" -#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537 -#: builtin/tag.c:445 +#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605 +#: builtin/tag.c:456 msgid "message" msgstr "chú thích" -#: builtin/commit-tree.c:115 builtin/commit.c:1504 +#: builtin/commit-tree.c:115 builtin/commit.c:1614 msgid "commit message" msgstr "chú thích của lần chuyển giao" @@ -13213,7 +13380,7 @@ msgstr "chú thích của lần chuyển giao" msgid "read commit log message from file" msgstr "đọc chú thích nhật ký lần chuyển giao từ tập tin" -#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299 +#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "Ký lần chuyển giao dùng GPG" @@ -13292,76 +13459,76 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c:312 +#: builtin/commit.c:324 msgid "failed to unpack HEAD tree object" msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây" -#: builtin/commit.c:348 +#: builtin/commit.c:360 msgid "--pathspec-from-file with -a does not make sense" msgstr "--pathspec-from-file với -a là không có ý nghĩa gì" -#: builtin/commit.c:361 +#: builtin/commit.c:374 msgid "No paths with --include/--only does not make sense." msgstr "Không đường dẫn với các tùy chọn --include/--only không hợp lý." -#: builtin/commit.c:373 +#: builtin/commit.c:386 msgid "unable to create temporary index" msgstr "không thể tạo bảng mục lục tạm thời" -#: builtin/commit.c:382 +#: builtin/commit.c:395 msgid "interactive add failed" msgstr "gặp lỗi khi thêm bằng cách tương" -#: builtin/commit.c:397 +#: builtin/commit.c:410 msgid "unable to update temporary index" msgstr "không thể cập nhật bảng mục lục tạm thời" -#: builtin/commit.c:399 +#: builtin/commit.c:412 msgid "Failed to update main cache tree" msgstr "Gặp lỗi khi cập nhật cây bộ nhớ đệm" -#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 +#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508 msgid "unable to write new_index file" msgstr "không thể ghi tập tin lưu bảng mục lục mới (new_index)" -#: builtin/commit.c:476 +#: builtin/commit.c:489 msgid "cannot do a partial commit during a merge." msgstr "" "không thể thực hiện việc chuyển giao cục bộ trong khi đang được hòa trộn." -#: builtin/commit.c:478 +#: builtin/commit.c:491 msgid "cannot do a partial commit during a cherry-pick." msgstr "" "không thể thực hiện việc chuyển giao bộ phận trong khi đang cherry-pick." -#: builtin/commit.c:480 +#: builtin/commit.c:493 msgid "cannot do a partial commit during a rebase." msgstr "" "không thể thực hiện việc chuyển giao cục bộ trong khi đang thực hiện cải tổ." -#: builtin/commit.c:488 +#: builtin/commit.c:501 msgid "cannot read the index" msgstr "không đọc được bảng mục lục" -#: builtin/commit.c:507 +#: builtin/commit.c:520 msgid "unable to write temporary index file" msgstr "không thể ghi tập tin lưu bảng mục lục tạm thời" -#: builtin/commit.c:605 +#: builtin/commit.c:618 #, c-format msgid "commit '%s' lacks author header" msgstr "lần chuyển giao “%s” thiếu phần tác giả ở đầu" -#: builtin/commit.c:607 +#: builtin/commit.c:620 #, c-format msgid "commit '%s' has malformed author line" msgstr "lần chuyển giao “%s” có phần tác giả ở đầu dị dạng" -#: builtin/commit.c:626 +#: builtin/commit.c:639 msgid "malformed --author parameter" msgstr "đối số cho --author bị dị hình" -#: builtin/commit.c:679 +#: builtin/commit.c:692 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -13369,38 +13536,43 @@ msgstr "" "không thể chọn một ký tự ghi chú cái mà không được dùng\n" "trong phần ghi chú hiện tại" -#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 +#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158 #, c-format msgid "could not lookup commit %s" msgstr "không thể tìm kiếm commit (lần chuyển giao) %s" -#: builtin/commit.c:729 builtin/shortlog.c:413 +#: builtin/commit.c:758 builtin/shortlog.c:413 #, c-format msgid "(reading log message from standard input)\n" msgstr "(đang đọc thông điệp nhật ký từ đầu vào tiêu chuẩn)\n" -#: builtin/commit.c:731 +#: builtin/commit.c:760 msgid "could not read log from standard input" msgstr "không thể đọc nhật ký từ đầu vào tiêu chuẩn" -#: builtin/commit.c:735 +#: builtin/commit.c:764 #, c-format msgid "could not read log file '%s'" msgstr "không đọc được tệp nhật ký “%s”" -#: builtin/commit.c:766 builtin/commit.c:782 +#: builtin/commit.c:801 +#, c-format +msgid "cannot combine -m with --fixup:%s" +msgstr "không thể kết hợp “-m” với “--fixup”:%s" + +#: builtin/commit.c:813 builtin/commit.c:829 msgid "could not read SQUASH_MSG" msgstr "không thể đọc SQUASH_MSG" -#: builtin/commit.c:773 +#: builtin/commit.c:820 msgid "could not read MERGE_MSG" msgstr "không thể đọc MERGE_MSG" -#: builtin/commit.c:833 +#: builtin/commit.c:880 msgid "could not write commit template" msgstr "không thể ghi mẫu chuyển giao" -#: builtin/commit.c:853 +#: builtin/commit.c:900 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -13414,7 +13586,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "và thử lại.\n" -#: builtin/commit.c:858 +#: builtin/commit.c:905 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13428,7 +13600,7 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "và thử lại.\n" -#: builtin/commit.c:868 +#: builtin/commit.c:915 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13439,7 +13611,7 @@ msgstr "" "bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần " "chuyển giao.\n" -#: builtin/commit.c:876 +#: builtin/commit.c:923 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13451,153 +13623,186 @@ msgstr "" "bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n" "Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/commit.c:893 +#: builtin/commit.c:940 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sTác giả: %.*s <%.*s>" -#: builtin/commit.c:901 +#: builtin/commit.c:948 #, c-format msgid "%sDate: %s" msgstr "%sNgày tháng: %s" -#: builtin/commit.c:908 +#: builtin/commit.c:955 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sNgười chuyển giao: %.*s <%.*s>" -#: builtin/commit.c:926 +#: builtin/commit.c:973 msgid "Cannot read index" msgstr "Không đọc được bảng mục lục" -#: builtin/commit.c:997 +#: builtin/commit.c:1018 +msgid "unable to pass trailers to --trailers" +msgstr "không thể chuyển phần đuôi cho “--trailers”" + +#: builtin/commit.c:1058 msgid "Error building trees" msgstr "Gặp lỗi khi xây dựng cây" -#: builtin/commit.c:1011 builtin/tag.c:308 +#: builtin/commit.c:1072 builtin/tag.c:319 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Xin hãy cung cấp lời chú giải hoặc là dùng tùy chọn -m hoặc là -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1116 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author “%s” không phải là “Họ và tên <thư điện tửl>” và không khớp bất kỳ " "tác giả nào sẵn có" -#: builtin/commit.c:1069 +#: builtin/commit.c:1130 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Chế độ bỏ qua không hợp lệ “%s”" -#: builtin/commit.c:1087 builtin/commit.c:1331 +#: builtin/commit.c:1148 builtin/commit.c:1441 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Chế độ cho các tập tin chưa được theo dõi không hợp lệ “%s”" -#: builtin/commit.c:1127 +#: builtin/commit.c:1188 msgid "--long and -z are incompatible" msgstr "hai tùy chọn -long và -z không tương thích với nhau" -#: builtin/commit.c:1171 +#: builtin/commit.c:1219 +msgid "You are in the middle of a merge -- cannot reword." +msgstr "" +"Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “reword”." + +#: builtin/commit.c:1221 +msgid "You are in the middle of a cherry-pick -- cannot reword." +msgstr "" +"Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc " +"“reword”." + +#: builtin/commit.c:1224 +#, c-format +msgid "cannot combine reword option of --fixup with path '%s'" +msgstr "không thể tổ hợp tùy chọn \"reword\" của --fixup với đường dẫn '%s'" + +#: builtin/commit.c:1226 +msgid "" +"reword option of --fixup is mutually exclusive with --patch/--interactive/--" +"all/--include/--only" +msgstr "" +"tùy chọn \"reword\" của --fixup là loại trừ qua lại với --patch/--" +"interactive/--all/--include/--only" + +#: builtin/commit.c:1245 msgid "Using both --reset-author and --author does not make sense" msgstr "Sử dụng cả hai tùy chọn --reset-author và --author không hợp lý" -#: builtin/commit.c:1180 +#: builtin/commit.c:1254 msgid "You have nothing to amend." msgstr "Không có gì để mà “tu bổ” cả." -#: builtin/commit.c:1183 +#: builtin/commit.c:1257 msgid "You are in the middle of a merge -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “tu bổ”." -#: builtin/commit.c:1185 +#: builtin/commit.c:1259 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc “tu " "bổ”." -#: builtin/commit.c:1187 +#: builtin/commit.c:1261 msgid "You are in the middle of a rebase -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình cải tổ -- nên không thể thực hiện việc “tu bổ”." -#: builtin/commit.c:1190 +#: builtin/commit.c:1264 msgid "Options --squash and --fixup cannot be used together" msgstr "Các tùy chọn --squash và --fixup không thể sử dụng cùng với nhau" -#: builtin/commit.c:1200 +#: builtin/commit.c:1274 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Chỉ được dùng một trong số tùy chọn trong số -c/-C/-F/--fixup." -#: builtin/commit.c:1202 +#: builtin/commit.c:1276 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Tùy chọn -m không thể được tổ hợp cùng với -c/-C/-F." -#: builtin/commit.c:1211 +#: builtin/commit.c:1285 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "--reset-author chỉ có thể được sử dụng với tùy chọn -C, -c hay --amend." -#: builtin/commit.c:1229 +#: builtin/commit.c:1303 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Chỉ một trong các tùy chọn --include/--only/--all/--interactive/--patch được " "sử dụng." -#: builtin/commit.c:1235 +#: builtin/commit.c:1331 +#, c-format +msgid "unknown option: --fixup=%s:%s" +msgstr "không hiểu tùy chọn: --fixup=%s:%s" + +#: builtin/commit.c:1345 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "các đường dẫn “%s …” với tùy chọn -a không hợp lý" -#: builtin/commit.c:1366 builtin/commit.c:1527 +#: builtin/commit.c:1476 builtin/commit.c:1642 msgid "show status concisely" msgstr "hiển thị trạng thái ở dạng súc tích" -#: builtin/commit.c:1368 builtin/commit.c:1529 +#: builtin/commit.c:1478 builtin/commit.c:1644 msgid "show branch information" msgstr "hiển thị thông tin nhánh" -#: builtin/commit.c:1370 +#: builtin/commit.c:1480 msgid "show stash information" msgstr "hiển thị thông tin về tạm cất" -#: builtin/commit.c:1372 builtin/commit.c:1531 +#: builtin/commit.c:1482 builtin/commit.c:1646 msgid "compute full ahead/behind values" msgstr "tính đầy đủ giá trị trước/sau" -#: builtin/commit.c:1374 +#: builtin/commit.c:1484 msgid "version" msgstr "phiên bản" -#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 -#: builtin/worktree.c:679 +#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560 +#: builtin/worktree.c:681 msgid "machine-readable output" msgstr "kết xuất dạng máy-có-thể-đọc" -#: builtin/commit.c:1377 builtin/commit.c:1535 +#: builtin/commit.c:1487 builtin/commit.c:1650 msgid "show status in long format (default)" msgstr "hiển thị trạng thái ở định dạng dài (mặc định)" -#: builtin/commit.c:1380 builtin/commit.c:1538 +#: builtin/commit.c:1490 builtin/commit.c:1653 msgid "terminate entries with NUL" msgstr "chấm dứt các mục bằng NUL" -#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656 #: builtin/fast-export.c:1198 builtin/fast-export.c:1201 -#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336 +#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 msgid "mode" msgstr "chế độ" -#: builtin/commit.c:1383 builtin/commit.c:1541 +#: builtin/commit.c:1493 builtin/commit.c:1656 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "hiển thị các tập tin chưa được theo dõi dấu vết, các chế độ tùy chọn: all, " "normal, no. (Mặc định: all)" -#: builtin/commit.c:1387 +#: builtin/commit.c:1497 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13605,11 +13810,11 @@ msgstr "" "hiển thị các tập tin bị bỏ qua, các chế độ tùy chọn: traditional, matching, " "no. (Mặc định: traditional)" -#: builtin/commit.c:1389 parse-options.h:192 +#: builtin/commit.c:1499 parse-options.h:193 msgid "when" msgstr "khi" -#: builtin/commit.c:1390 +#: builtin/commit.c:1500 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -13617,176 +13822,199 @@ msgstr "" "bỏ qua các thay đổi trong mô-đun-con, tùy chọn khi: all, dirty, untracked. " "(Mặc định: all)" -#: builtin/commit.c:1392 +#: builtin/commit.c:1502 msgid "list untracked files in columns" msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong các cột" -#: builtin/commit.c:1393 +#: builtin/commit.c:1503 msgid "do not detect renames" msgstr "không dò tìm các tên thay đổi" -#: builtin/commit.c:1395 +#: builtin/commit.c:1505 msgid "detect renames, optionally set similarity index" msgstr "dò các tên thay đổi, tùy ý đặt mục lục tương tự" -#: builtin/commit.c:1415 +#: builtin/commit.c:1525 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Không hỗ trỡ tổ hợp các tham số các tập tin bị bỏ qua và không được theo dõi" -#: builtin/commit.c:1497 +#: builtin/commit.c:1607 msgid "suppress summary after successful commit" msgstr "không hiển thị tổng kết sau khi chuyển giao thành công" -#: builtin/commit.c:1498 +#: builtin/commit.c:1608 msgid "show diff in commit message template" msgstr "hiển thị sự khác biệt trong mẫu tin nhắn chuyển giao" -#: builtin/commit.c:1500 +#: builtin/commit.c:1610 msgid "Commit message options" msgstr "Các tùy chọn ghi chú commit" -#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447 +#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458 msgid "read message from file" msgstr "đọc chú thích từ tập tin" -#: builtin/commit.c:1502 +#: builtin/commit.c:1612 msgid "author" msgstr "tác giả" -#: builtin/commit.c:1502 +#: builtin/commit.c:1612 msgid "override author for commit" msgstr "ghi đè tác giả cho commit" -#: builtin/commit.c:1503 builtin/gc.c:550 +#: builtin/commit.c:1613 builtin/gc.c:550 msgid "date" msgstr "ngày tháng" -#: builtin/commit.c:1503 +#: builtin/commit.c:1613 msgid "override date for commit" msgstr "ghi đè ngày tháng cho lần chuyển giao" -#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 -#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90 +#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622 +#: parse-options.h:329 ref-filter.h:90 msgid "commit" msgstr "lần_chuyển_giao" -#: builtin/commit.c:1505 +#: builtin/commit.c:1615 msgid "reuse and edit message from specified commit" msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho nhưng có cho sửa chữa" -#: builtin/commit.c:1506 +#: builtin/commit.c:1616 msgid "reuse message from specified commit" msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho" -#: builtin/commit.c:1507 -msgid "use autosquash formatted message to fixup specified commit" +#. TRANSLATORS: Leave "[(amend|reword):]" as-is, +#. and only translate <commit>. +#. +#: builtin/commit.c:1621 +msgid "[(amend|reword):]commit" +msgstr "[(amend|reword):]commit" + +#: builtin/commit.c:1621 +msgid "" +"use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" -"dùng ghi chú có định dạng autosquash để sửa chữa lần chuyển giao đã chỉ ra" +"dùng ghi chú có định dạng autosquash để sửa chữa hoặc tu bổ/reword lần " +"chuyển giao đã chỉ ra" -#: builtin/commit.c:1508 +#: builtin/commit.c:1622 msgid "use autosquash formatted message to squash specified commit" msgstr "" "dùng lời nhắn có định dạng tự động nén để nén lại các lần chuyển giao đã chỉ " "ra" -#: builtin/commit.c:1509 +#: builtin/commit.c:1623 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "lần chuyển giao nhận tôi là tác giả (được dùng với tùy chọn -C/-c/--amend)" -#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302 +#: builtin/commit.c:1624 builtin/interpret-trailers.c:111 +msgid "trailer" +msgstr "bộ dò vết" + +#: builtin/commit.c:1624 +msgid "add custom trailer(s)" +msgstr "thêm đuôi tự chọn" + +#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "thêm dòng Signed-off-by vào cuối" -#: builtin/commit.c:1511 +#: builtin/commit.c:1626 msgid "use specified template file" msgstr "sử dụng tập tin mẫu đã cho" -#: builtin/commit.c:1512 +#: builtin/commit.c:1627 msgid "force edit of commit" msgstr "ép buộc sửa lần commit" -#: builtin/commit.c:1514 +#: builtin/commit.c:1629 msgid "include status in commit message template" msgstr "bao gồm các trạng thái trong mẫu ghi chú chuyển giao" -#: builtin/commit.c:1519 +#: builtin/commit.c:1634 msgid "Commit contents options" msgstr "Các tùy nội dung ghi chú commit" -#: builtin/commit.c:1520 +#: builtin/commit.c:1635 msgid "commit all changed files" msgstr "chuyển giao tất cả các tập tin có thay đổi" -#: builtin/commit.c:1521 +#: builtin/commit.c:1636 msgid "add specified files to index for commit" msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao" -#: builtin/commit.c:1522 +#: builtin/commit.c:1637 msgid "interactively add files" msgstr "thêm các tập-tin bằng tương tác" -#: builtin/commit.c:1523 +#: builtin/commit.c:1638 msgid "interactively add changes" msgstr "thêm các thay đổi bằng tương tác" -#: builtin/commit.c:1524 +#: builtin/commit.c:1639 msgid "commit only specified files" msgstr "chỉ chuyển giao các tập tin đã chỉ ra" -#: builtin/commit.c:1525 +#: builtin/commit.c:1640 msgid "bypass pre-commit and commit-msg hooks" msgstr "vòng qua móc (hook) pre-commit và commit-msg" -#: builtin/commit.c:1526 +#: builtin/commit.c:1641 msgid "show what would be committed" msgstr "hiển thị xem cái gì có thể được chuyển giao" -#: builtin/commit.c:1539 +#: builtin/commit.c:1654 msgid "amend previous commit" msgstr "“tu bổ” (amend) lần commit trước" -#: builtin/commit.c:1540 +#: builtin/commit.c:1655 msgid "bypass post-rewrite hook" msgstr "vòng qua móc (hook) post-rewrite" -#: builtin/commit.c:1547 +#: builtin/commit.c:1662 msgid "ok to record an empty change" msgstr "ok để ghi lại một thay đổi trống rỗng" -#: builtin/commit.c:1549 +#: builtin/commit.c:1664 msgid "ok to record a change with an empty message" msgstr "ok để ghi các thay đổi với lời nhắn trống rỗng" -#: builtin/commit.c:1622 +#: builtin/commit.c:1737 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Tập tin MERGE_HEAD sai hỏng (%s)" -#: builtin/commit.c:1629 +#: builtin/commit.c:1744 msgid "could not read MERGE_MODE" msgstr "không thể đọc MERGE_MODE" -#: builtin/commit.c:1650 +#: builtin/commit.c:1765 #, c-format msgid "could not read commit message: %s" msgstr "không thể đọc phần chú thích (message) của lần chuyển giao: %s" -#: builtin/commit.c:1657 +#: builtin/commit.c:1772 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Bãi bỏ việc chuyển giao bởi vì phần chú thích của nó trống rỗng.\n" -#: builtin/commit.c:1662 +#: builtin/commit.c:1777 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" "Đang bỏ qua việc chuyển giao; bạn đã không biên soạn phần chú thích " "(message).\n" -#: builtin/commit.c:1696 +#: builtin/commit.c:1788 +#, c-format +msgid "Aborting commit due to empty commit message body.\n" +msgstr "" +"Bãi bỏ việc chuyển giao bởi vì phần thân chú thích của nó trống rỗng.\n" + +#: builtin/commit.c:1824 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -14132,7 +14360,7 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "hiển thị kích cỡ theo định dạng dành cho người đọc" -#: builtin/credential-cache--daemon.c:226 +#: builtin/credential-cache--daemon.c:227 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -14145,11 +14373,11 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: builtin/credential-cache--daemon.c:275 +#: builtin/credential-cache--daemon.c:276 msgid "print debugging messages to stderr" msgstr "in thông tin gỡ lỗi ra đầu ra lỗi tiêu chuẩn" -#: builtin/credential-cache--daemon.c:315 +#: builtin/credential-cache--daemon.c:316 msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "credential-cache--daemon không sẵn có; không hỗ trợ unix socket" @@ -14353,7 +14581,7 @@ msgstr "%s…%s: không có cơ sở hòa trộn" msgid "Not a git repository" msgstr "Không phải là kho git" -#: builtin/diff.c:532 builtin/grep.c:682 +#: builtin/diff.c:532 builtin/grep.c:684 #, c-format msgid "invalid object '%s' given." msgstr "đối tượng đã cho “%s” không hợp lệ." @@ -14373,33 +14601,33 @@ msgstr "đã cho đối tượng không thể nắm giữ “%s”." msgid "%s...%s: multiple merge bases, using %s" msgstr "%s…%s: có nhiều cơ sở để hòa trộn, nên dùng %s" -#: builtin/difftool.c:30 +#: builtin/difftool.c:31 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" "git difftool [<các tùy chọn>] [<lần_chuyển_giao> [<lần_chuyển_giao>]] [--] </" "đường/dẫn>…]" -#: builtin/difftool.c:260 +#: builtin/difftool.c:261 #, c-format msgid "failed: %d" msgstr "gặp lỗi: %d" -#: builtin/difftool.c:302 +#: builtin/difftool.c:303 #, c-format msgid "could not read symlink %s" msgstr "không thể đọc liên kết mềm %s" -#: builtin/difftool.c:304 +#: builtin/difftool.c:305 #, c-format msgid "could not read symlink file %s" msgstr "không đọc được tập tin liên kết mềm %s" -#: builtin/difftool.c:312 +#: builtin/difftool.c:313 #, c-format msgid "could not read object %s for symlink %s" msgstr "không thể đọc đối tượng %s cho liên kết mềm %s" -#: builtin/difftool.c:412 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -14407,53 +14635,53 @@ msgstr "" "các định dạng diff tổ hợp(“-c” và “--cc”) chưa được hỗ trợ trong\n" "chế độ diff thư mục(“-d” và “--dir-diff”)." -#: builtin/difftool.c:633 +#: builtin/difftool.c:637 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "cả hai tập tin đã bị sửa: “%s” và “%s”." -#: builtin/difftool.c:635 +#: builtin/difftool.c:639 msgid "working tree file has been left." msgstr "cây làm việc ở bên trái." -#: builtin/difftool.c:646 +#: builtin/difftool.c:650 #, c-format msgid "temporary files exist in '%s'." msgstr "các tập tin tạm đã sẵn có trong “%s”." -#: builtin/difftool.c:647 +#: builtin/difftool.c:651 msgid "you may want to cleanup or recover these." msgstr "bạn có lẽ muốn dọn dẹp hay phục hồi ở đây." -#: builtin/difftool.c:696 +#: builtin/difftool.c:700 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "dùng “diff.guitool“ thay vì dùng “diff.tool“" -#: builtin/difftool.c:698 +#: builtin/difftool.c:702 msgid "perform a full-directory diff" msgstr "thực hiện một diff toàn thư mục" -#: builtin/difftool.c:700 +#: builtin/difftool.c:704 msgid "do not prompt before launching a diff tool" msgstr "đừng nhắc khi khởi chạy công cụ diff" -#: builtin/difftool.c:705 +#: builtin/difftool.c:709 msgid "use symlinks in dir-diff mode" msgstr "dùng liên kết mềm trong diff-thư-mục" -#: builtin/difftool.c:706 +#: builtin/difftool.c:710 msgid "tool" msgstr "công cụ" -#: builtin/difftool.c:707 +#: builtin/difftool.c:711 msgid "use the specified diff tool" msgstr "dùng công cụ diff đã cho" -#: builtin/difftool.c:709 +#: builtin/difftool.c:713 msgid "print a list of diff tools that may be used with `--tool`" msgstr "in ra danh sách các công cụ dif cái mà có thẻ dùng với “--tool“" -#: builtin/difftool.c:712 +#: builtin/difftool.c:716 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -14461,31 +14689,31 @@ msgstr "" "làm cho “git-difftool” thoát khi gọi công cụ diff trả về mã không phải số " "không" -#: builtin/difftool.c:715 +#: builtin/difftool.c:719 msgid "specify a custom command for viewing diffs" msgstr "chỉ định một lệnh tùy ý để xem diff" -#: builtin/difftool.c:716 +#: builtin/difftool.c:720 msgid "passed to `diff`" msgstr "chuyển cho “diff”" -#: builtin/difftool.c:731 +#: builtin/difftool.c:735 msgid "difftool requires worktree or --no-index" msgstr "difftool cần cây làm việc hoặc --no-index" -#: builtin/difftool.c:738 +#: builtin/difftool.c:742 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff xung khắc với --no-index" -#: builtin/difftool.c:741 +#: builtin/difftool.c:745 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool và --extcmd loại từ lẫn nhau" -#: builtin/difftool.c:749 +#: builtin/difftool.c:753 msgid "no <tool> given for --tool=<tool>" msgstr "chưa đưa ra <công_cụ> cho --tool=<công_cụ>" -#: builtin/difftool.c:756 +#: builtin/difftool.c:760 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>" @@ -14577,7 +14805,7 @@ msgstr "sử dụng tính năng done để chấm dứt luồng dữ liệu" msgid "skip output of blob data" msgstr "bỏ qua kết xuất của dữ liệu blob" -#: builtin/fast-export.c:1222 builtin/log.c:1815 +#: builtin/fast-export.c:1222 builtin/log.c:1823 msgid "refspec" msgstr "refspec" @@ -14670,98 +14898,103 @@ msgstr "git fetch --multiple [<các tùy chọn>] [(<kho> | <nhóm>)…]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<các tùy chọn>]" -#: builtin/fetch.c:120 +#: builtin/fetch.c:122 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel không thể âm" -#: builtin/fetch.c:143 builtin/pull.c:185 +#: builtin/fetch.c:145 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "lấy về từ tất cả các máy chủ" -#: builtin/fetch.c:145 builtin/pull.c:245 +#: builtin/fetch.c:147 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "đặt thượng nguồn cho git pull/fetch" -#: builtin/fetch.c:147 builtin/pull.c:188 +#: builtin/fetch.c:149 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "nối thêm vào .git/FETCH_HEAD thay vì ghi đè lên nó" -#: builtin/fetch.c:149 +#: builtin/fetch.c:151 msgid "use atomic transaction to update references" msgstr "sử dụng giao dịch hạt nhân bên phía máy chủ" -#: builtin/fetch.c:151 builtin/pull.c:191 +#: builtin/fetch.c:153 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "đường dẫn đến gói tải lên trên máy chủ cuối" -#: builtin/fetch.c:152 +#: builtin/fetch.c:154 msgid "force overwrite of local reference" msgstr "ép buộc ghi đè lên tham chiếu nội bộ" -#: builtin/fetch.c:154 +#: builtin/fetch.c:156 msgid "fetch from multiple remotes" msgstr "lấy từ nhiều máy chủ cùng lúc" -#: builtin/fetch.c:156 builtin/pull.c:195 +#: builtin/fetch.c:158 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "lấy tất cả các thẻ cùng với các đối tượng liên quan đến nó" -#: builtin/fetch.c:158 +#: builtin/fetch.c:160 msgid "do not fetch all tags (--no-tags)" msgstr "không lấy tất cả các thẻ (--no-tags)" -#: builtin/fetch.c:160 +#: builtin/fetch.c:162 msgid "number of submodules fetched in parallel" msgstr "số lượng mô-đun-con được lấy đồng thời" -#: builtin/fetch.c:162 builtin/pull.c:198 +#: builtin/fetch.c:164 +msgid "modify the refspec to place all refs within refs/prefetch/" +msgstr "" +"sửa đặc tả đường dẫn cho các tham chiếu mọi chỗ có trong refs/prefetch/" + +#: builtin/fetch.c:166 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "" "cắt cụt (prune) các nhánh “remote-tracking” không còn tồn tại trên máy chủ " "nữa" -#: builtin/fetch.c:164 +#: builtin/fetch.c:168 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "cắt xém các thẻ nội bộ không còn ở máy chủ và xóa các thẻ đã thay đổi" -#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122 +#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122 msgid "on-demand" msgstr "khi-cần" -#: builtin/fetch.c:166 +#: builtin/fetch.c:170 msgid "control recursive fetching of submodules" msgstr "điều khiển việc lấy về đệ quy trong các mô-đun-con" -#: builtin/fetch.c:171 +#: builtin/fetch.c:175 msgid "write fetched references to the FETCH_HEAD file" msgstr "ghi các tham chiếu lấy về vào tập tin FETCH_HEAD" -#: builtin/fetch.c:172 builtin/pull.c:206 +#: builtin/fetch.c:176 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "giữ lại gói đã tải về" -#: builtin/fetch.c:174 +#: builtin/fetch.c:178 msgid "allow updating of HEAD ref" msgstr "cho phép cập nhật th.chiếu HEAD" -#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209 +#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "làm sâu hơn lịch sử của bản sao" -#: builtin/fetch.c:179 builtin/pull.c:212 +#: builtin/fetch.c:183 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "làm sâu hơn lịch sử của kho bản sao shallow dựa trên thời gian" -#: builtin/fetch.c:185 builtin/pull.c:221 +#: builtin/fetch.c:189 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "chuyển đổi hoàn toàn sang kho git" -#: builtin/fetch.c:188 +#: builtin/fetch.c:192 msgid "prepend this to submodule path output" msgstr "soạn sẵn cái này cho kết xuất đường dẫn mô-đun-con" -#: builtin/fetch.c:191 +#: builtin/fetch.c:195 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -14769,99 +15002,104 @@ msgstr "" "mặc định cho việc lấy đệ quy các mô-đun-con (có mức ưu tiên thấp hơn các tập " "tin cấu hình config)" -#: builtin/fetch.c:195 builtin/pull.c:224 +#: builtin/fetch.c:199 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "chấp nhận tham chiếu cập nhật .git/shallow" -#: builtin/fetch.c:196 builtin/pull.c:226 +#: builtin/fetch.c:200 builtin/pull.c:226 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:197 builtin/pull.c:227 +#: builtin/fetch.c:201 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "chỉ ra refmap cần lấy về" -#: builtin/fetch.c:204 builtin/pull.c:240 +#: builtin/fetch.c:208 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "" "báo cáo rằng chúng ta chỉ có các đối tượng tiếp cận được từ đối tượng này" -#: builtin/fetch.c:207 builtin/fetch.c:209 +#: builtin/fetch.c:210 +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "" +"không lấy về một packfile; thay vào đó, hãy in tổ tiên của đỉnh đàm phán" + +#: builtin/fetch.c:213 builtin/fetch.c:215 msgid "run 'maintenance --auto' after fetching" msgstr "chạy “maintenance --auto” sau khi lấy về" -#: builtin/fetch.c:211 builtin/pull.c:243 +#: builtin/fetch.c:217 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "kiểm cho các-cập-nhật-bắt-buộc trên mọi nhánh đã cập nhật" -#: builtin/fetch.c:213 +#: builtin/fetch.c:219 msgid "write the commit-graph after fetching" msgstr "ghi ra đồ thị các lần chuyển giao sau khi lấy về" -#: builtin/fetch.c:215 +#: builtin/fetch.c:221 msgid "accept refspecs from stdin" msgstr "chấp nhận tham chiếu từ đầu vào tiêu chuẩn" -#: builtin/fetch.c:526 +#: builtin/fetch.c:586 msgid "Couldn't find remote ref HEAD" msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD" -#: builtin/fetch.c:697 +#: builtin/fetch.c:757 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "phần cấu hình fetch.output có chứa giá-trị không hợp lệ %s" -#: builtin/fetch.c:796 +#: builtin/fetch.c:856 #, c-format msgid "object %s not found" msgstr "không tìm thấy đối tượng %s" -#: builtin/fetch.c:800 +#: builtin/fetch.c:860 msgid "[up to date]" msgstr "[đã cập nhật]" -#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901 +#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961 msgid "[rejected]" msgstr "[Bị từ chối]" -#: builtin/fetch.c:814 +#: builtin/fetch.c:874 msgid "can't fetch in current branch" msgstr "không thể fetch (lấy) về nhánh hiện hành" -#: builtin/fetch.c:824 +#: builtin/fetch.c:884 msgid "[tag update]" msgstr "[cập nhật thẻ]" -#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884 -#: builtin/fetch.c:896 +#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944 +#: builtin/fetch.c:956 msgid "unable to update local ref" msgstr "không thể cập nhật tham chiếu nội bộ" -#: builtin/fetch.c:829 +#: builtin/fetch.c:889 msgid "would clobber existing tag" msgstr "nên xóa chồng các thẻ có sẵn" -#: builtin/fetch.c:851 +#: builtin/fetch.c:911 msgid "[new tag]" msgstr "[thẻ mới]" -#: builtin/fetch.c:854 +#: builtin/fetch.c:914 msgid "[new branch]" msgstr "[nhánh mới]" -#: builtin/fetch.c:857 +#: builtin/fetch.c:917 msgid "[new ref]" msgstr "[ref (tham chiếu) mới]" -#: builtin/fetch.c:896 +#: builtin/fetch.c:956 msgid "forced update" msgstr "cưỡng bức cập nhật" -#: builtin/fetch.c:901 +#: builtin/fetch.c:961 msgid "non-fast-forward" msgstr "không-phải-chuyển-tiếp-nhanh" -#: builtin/fetch.c:1005 +#: builtin/fetch.c:1065 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -14871,7 +15109,7 @@ msgstr "" "nhưng lựa chọn bị tắt. Để kích hoạt lại, sử dụng cờ\n" "“--show-forced-updates” hoặc chạy “git config fetch.showForcedUpdates true”." -#: builtin/fetch.c:1009 +#: builtin/fetch.c:1069 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14884,22 +15122,22 @@ msgstr "" "false”\n" "để tránh kiểm tra này.\n" -#: builtin/fetch.c:1041 +#: builtin/fetch.c:1101 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n" -#: builtin/fetch.c:1069 +#: builtin/fetch.c:1129 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "từ chối %s bởi vì các gốc nông thì không được phép cập nhật" -#: builtin/fetch.c:1146 builtin/fetch.c:1297 +#: builtin/fetch.c:1206 builtin/fetch.c:1357 #, c-format msgid "From %.*s\n" msgstr "Từ %.*s\n" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1228 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14908,58 +15146,58 @@ msgstr "" "một số tham chiếu nội bộ không thể được cập nhật; hãy thử chạy\n" " “git remote prune %s” để bỏ đi những nhánh cũ, hay bị xung đột" -#: builtin/fetch.c:1267 +#: builtin/fetch.c:1327 #, c-format msgid " (%s will become dangling)" msgstr " (%s sẽ trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:1268 +#: builtin/fetch.c:1328 #, c-format msgid " (%s has become dangling)" msgstr " (%s đã trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:1300 +#: builtin/fetch.c:1360 msgid "[deleted]" msgstr "[đã xóa]" -#: builtin/fetch.c:1301 builtin/remote.c:1118 +#: builtin/fetch.c:1361 builtin/remote.c:1118 msgid "(none)" msgstr "(không)" -#: builtin/fetch.c:1324 +#: builtin/fetch.c:1384 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Từ chối việc lấy vào trong nhánh hiện tại %s của một kho chứa không phải kho " "trần (bare)" -#: builtin/fetch.c:1343 +#: builtin/fetch.c:1403 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Tùy chọn \"%s\" có giá trị \"%s\" là không hợp lệ cho %s" -#: builtin/fetch.c:1346 +#: builtin/fetch.c:1406 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Tùy chọn \"%s\" bị bỏ qua với %s\n" -#: builtin/fetch.c:1558 +#: builtin/fetch.c:1618 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "phát hiện nhiều nhánh, không tương thích với --set-upstream" -#: builtin/fetch.c:1573 +#: builtin/fetch.c:1633 msgid "not setting upstream for a remote remote-tracking branch" msgstr "không cài đặt thượng nguồn cho một nhánh được theo dõi trên máy chủ" -#: builtin/fetch.c:1575 +#: builtin/fetch.c:1635 msgid "not setting upstream for a remote tag" msgstr "không cài đặt thượng nguồn cho một thẻ nhánh trên máy chủ" -#: builtin/fetch.c:1577 +#: builtin/fetch.c:1637 msgid "unknown branch type" msgstr "không hiểu kiểu nhánh" -#: builtin/fetch.c:1579 +#: builtin/fetch.c:1639 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -14967,22 +15205,22 @@ msgstr "" "không tìm thấy nhánh nguồn.\n" "bạn cần phải chỉ định chính xác một nhánh với tùy chọn --set-upstream." -#: builtin/fetch.c:1708 builtin/fetch.c:1771 +#: builtin/fetch.c:1768 builtin/fetch.c:1831 #, c-format msgid "Fetching %s\n" msgstr "Đang lấy “%s” về\n" -#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101 +#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Không thể lấy“%s” về" -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1790 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "không thể lấy “%s” (mã thoát: %d)\n" -#: builtin/fetch.c:1834 +#: builtin/fetch.c:1894 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14990,44 +15228,52 @@ msgstr "" "Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n" "tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)." -#: builtin/fetch.c:1870 +#: builtin/fetch.c:1930 msgid "You need to specify a tag name." msgstr "Bạn phải định rõ tên thẻ." -#: builtin/fetch.c:1935 +#: builtin/fetch.c:1995 msgid "Negative depth in --deepen is not supported" msgstr "Mức sâu là số âm trong --deepen là không được hỗ trợ" -#: builtin/fetch.c:1937 +#: builtin/fetch.c:1997 msgid "--deepen and --depth are mutually exclusive" msgstr "Các tùy chọn--deepen và --depth loại từ lẫn nhau" -#: builtin/fetch.c:1942 +#: builtin/fetch.c:2002 msgid "--depth and --unshallow cannot be used together" msgstr "tùy chọn --depth và --unshallow không thể sử dụng cùng với nhau" -#: builtin/fetch.c:1944 +#: builtin/fetch.c:2004 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý" -#: builtin/fetch.c:1961 +#: builtin/fetch.c:2021 msgid "fetch --all does not take a repository argument" msgstr "lệnh lấy về \"fetch --all\" không lấy đối số kho chứa" -#: builtin/fetch.c:1963 +#: builtin/fetch.c:2023 msgid "fetch --all does not make sense with refspecs" msgstr "lệnh lấy về \"fetch --all\" không hợp lý với refspecs" -#: builtin/fetch.c:1972 +#: builtin/fetch.c:2032 #, c-format msgid "No such remote or remote group: %s" msgstr "Không có nhóm máy chủ hay máy chủ như thế: %s" -#: builtin/fetch.c:1979 +#: builtin/fetch.c:2039 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Việc lấy về cả một nhóm và chỉ định refspecs không hợp lý" -#: builtin/fetch.c:1997 +#: builtin/fetch.c:2055 +msgid "must supply remote when using --negotiate-only" +msgstr "phải cung cấp máy chủ khi sử dụng --negotiate-only" + +#: builtin/fetch.c:2060 +msgid "Protocol does not support --negotiate-only, exiting." +msgstr "Giao thức không hỗ trợ --negotiate-only, nên thoát." + +#: builtin/fetch.c:2079 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -15035,11 +15281,11 @@ msgstr "" "--filter chỉ có thể được dùng với máy chủ được cấu hình bằng extensions." "partialclone" -#: builtin/fetch.c:2001 +#: builtin/fetch.c:2083 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic chỉ có thể dùng khi lấy về từ một máy chủ" -#: builtin/fetch.c:2005 +#: builtin/fetch.c:2087 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin chỉ có thể dùng khi lấy về từ một máy chủ" @@ -15090,47 +15336,47 @@ msgstr "" "git for-each-ref [--contains [<lần-chuyển-giao>]] [--no-contains [<lần-" "chuyển-giao>]]" -#: builtin/for-each-ref.c:28 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for shells" msgstr "trích dẫn để phù hợp cho hệ vỏ (shell)" -#: builtin/for-each-ref.c:30 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for perl" msgstr "trích dẫn để phù hợp cho perl" -#: builtin/for-each-ref.c:32 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for python" msgstr "trích dẫn để phù hợp cho python" -#: builtin/for-each-ref.c:34 +#: builtin/for-each-ref.c:36 msgid "quote placeholders suitably for Tcl" msgstr "trích dẫn để phù hợp cho Tcl" -#: builtin/for-each-ref.c:37 +#: builtin/for-each-ref.c:39 msgid "show only <n> matched refs" msgstr "hiển thị chỉ <n> tham chiếu khớp" -#: builtin/for-each-ref.c:39 builtin/tag.c:472 +#: builtin/for-each-ref.c:41 builtin/tag.c:483 msgid "respect format colors" msgstr "các màu định dạng lưu tâm" -#: builtin/for-each-ref.c:42 +#: builtin/for-each-ref.c:44 msgid "print only refs which points at the given object" msgstr "chỉ hiển thị các tham chiếu mà nó chỉ đến đối tượng đã cho" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:46 msgid "print only refs that are merged" msgstr "chỉ hiển thị những tham chiếu mà nó được hòa trộn" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:47 msgid "print only refs that are not merged" msgstr "chỉ hiển thị những tham chiếu mà nó không được hòa trộn" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:48 msgid "print only refs which contain the commit" msgstr "chỉ hiển thị những tham chiếu mà nó chứa lần chuyển giao" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:49 msgid "print only refs which don't contain the commit" msgstr "chỉ hiển thị những tham chiếu mà nó không chứa lần chuyển giao" @@ -15150,32 +15396,32 @@ msgstr "khóa cấu hình lưu trữ danh sách đường dẫn kho lưu trữ" msgid "missing --config=<config>" msgstr "thiếu --config=<config>" -#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131 +#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128 msgid "unknown" msgstr "không hiểu" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:83 builtin/fsck.c:103 +#: builtin/fsck.c:78 builtin/fsck.c:100 #, c-format msgid "error in %s %s: %s" msgstr "lỗi trong %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:97 +#: builtin/fsck.c:94 #, c-format msgid "warning in %s %s: %s" msgstr "có cảnh báo trong %s %s: %s" -#: builtin/fsck.c:126 builtin/fsck.c:129 +#: builtin/fsck.c:123 builtin/fsck.c:126 #, c-format msgid "broken link from %7s %s" msgstr "liên kết gãy từ %7s %s" -#: builtin/fsck.c:138 +#: builtin/fsck.c:135 msgid "wrong object type in link" msgstr "kiểu đối tượng sai trong liên kết" -#: builtin/fsck.c:154 +#: builtin/fsck.c:151 #, c-format msgid "" "broken link from %7s %s\n" @@ -15184,211 +15430,211 @@ msgstr "" "liên kết gãy từ %7s %s \n" " tới %7s %s" -#: builtin/fsck.c:265 +#: builtin/fsck.c:263 #, c-format msgid "missing %s %s" msgstr "thiếu %s %s" -#: builtin/fsck.c:292 +#: builtin/fsck.c:290 #, c-format msgid "unreachable %s %s" msgstr "không tiếp cận được %s %s" -#: builtin/fsck.c:312 +#: builtin/fsck.c:310 #, c-format msgid "dangling %s %s" msgstr "dangling %s %s" -#: builtin/fsck.c:322 +#: builtin/fsck.c:320 msgid "could not create lost-found" msgstr "không thể tạo lost-found" -#: builtin/fsck.c:333 +#: builtin/fsck.c:331 #, c-format msgid "could not finish '%s'" msgstr "không thể hoàn thành “%s”" -#: builtin/fsck.c:350 +#: builtin/fsck.c:348 #, c-format msgid "Checking %s" msgstr "Đang kiểm tra %s" -#: builtin/fsck.c:388 +#: builtin/fsck.c:386 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Đang kiểm tra kết nối (%d đối tượng)" -#: builtin/fsck.c:407 +#: builtin/fsck.c:405 #, c-format msgid "Checking %s %s" msgstr "Đang kiểm tra %s %s" -#: builtin/fsck.c:412 +#: builtin/fsck.c:410 msgid "broken links" msgstr "các liên kết bị gẫy" -#: builtin/fsck.c:421 +#: builtin/fsck.c:419 #, c-format msgid "root %s" msgstr "gốc %s" -#: builtin/fsck.c:429 +#: builtin/fsck.c:427 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "đã đánh thẻ %s %s (%s) trong %s" -#: builtin/fsck.c:458 +#: builtin/fsck.c:456 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: đối tượng thiếu hay hỏng" -#: builtin/fsck.c:483 +#: builtin/fsck.c:481 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: mục reflog không hợp lệ %s" -#: builtin/fsck.c:497 +#: builtin/fsck.c:495 #, c-format msgid "Checking reflog %s->%s" msgstr "Đang kiểm tra việc đổi tên của “%s” thành “%s”" -#: builtin/fsck.c:531 +#: builtin/fsck.c:529 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: con trỏ sha1 không hợp lệ %s" -#: builtin/fsck.c:538 +#: builtin/fsck.c:536 #, c-format msgid "%s: not a commit" msgstr "%s: không phải là một lần chuyển giao" -#: builtin/fsck.c:592 +#: builtin/fsck.c:590 msgid "notice: No default references" msgstr "cảnh báo: Không có các tham chiếu mặc định" -#: builtin/fsck.c:607 +#: builtin/fsck.c:605 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: thiếu đối tượng hoặc hỏng: %s" -#: builtin/fsck.c:620 +#: builtin/fsck.c:618 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: không thể phân tích cú đối tượng: %s" -#: builtin/fsck.c:640 +#: builtin/fsck.c:638 #, c-format msgid "bad sha1 file: %s" msgstr "tập tin sha1 sai: %s" -#: builtin/fsck.c:655 +#: builtin/fsck.c:653 msgid "Checking object directory" msgstr "Đang kiểm tra thư mục đối tượng" -#: builtin/fsck.c:658 +#: builtin/fsck.c:656 msgid "Checking object directories" msgstr "Đang kiểm tra các thư mục đối tượng" -#: builtin/fsck.c:673 +#: builtin/fsck.c:671 #, c-format msgid "Checking %s link" msgstr "Đang lấy liên kết %s" -#: builtin/fsck.c:678 builtin/index-pack.c:865 +#: builtin/fsck.c:676 builtin/index-pack.c:866 #, c-format msgid "invalid %s" msgstr "%s không hợp lệ" -#: builtin/fsck.c:685 +#: builtin/fsck.c:683 #, c-format msgid "%s points to something strange (%s)" msgstr "%s chỉ đến thứ gì đó xa lạ (%s)" -#: builtin/fsck.c:691 +#: builtin/fsck.c:689 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: HEAD đã tách rời không chỉ vào đâu cả" -#: builtin/fsck.c:695 +#: builtin/fsck.c:693 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "chú ý: %s chỉ đến một nhánh chưa sinh (%s)" -#: builtin/fsck.c:707 +#: builtin/fsck.c:705 msgid "Checking cache tree" msgstr "Đang kiểm tra cây nhớ tạm" -#: builtin/fsck.c:712 +#: builtin/fsck.c:710 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: con trỏ sha1 không hợp lệ trong cache-tree" -#: builtin/fsck.c:721 +#: builtin/fsck.c:719 msgid "non-tree in cache-tree" msgstr "non-tree trong cache-tree" -#: builtin/fsck.c:752 +#: builtin/fsck.c:750 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<các tùy chọn>] [<đối-tượng>…]" -#: builtin/fsck.c:758 +#: builtin/fsck.c:756 msgid "show unreachable objects" msgstr "hiển thị các đối tượng không thể đọc được" -#: builtin/fsck.c:759 +#: builtin/fsck.c:757 msgid "show dangling objects" msgstr "hiển thị các đối tượng không được quản lý" -#: builtin/fsck.c:760 +#: builtin/fsck.c:758 msgid "report tags" msgstr "báo cáo các thẻ" -#: builtin/fsck.c:761 +#: builtin/fsck.c:759 msgid "report root nodes" msgstr "báo cáo node gốc" -#: builtin/fsck.c:762 +#: builtin/fsck.c:760 msgid "make index objects head nodes" msgstr "tạo “index objects head nodes”" -#: builtin/fsck.c:763 +#: builtin/fsck.c:761 msgid "make reflogs head nodes (default)" msgstr "tạo “reflogs head nodes” (mặc định)" -#: builtin/fsck.c:764 +#: builtin/fsck.c:762 msgid "also consider packs and alternate objects" msgstr "cũng cân nhắc đến các đối tượng gói và thay thế" -#: builtin/fsck.c:765 +#: builtin/fsck.c:763 msgid "check only connectivity" msgstr "chỉ kiểm tra kết nối" -#: builtin/fsck.c:766 builtin/mktag.c:78 +#: builtin/fsck.c:764 builtin/mktag.c:75 msgid "enable more strict checking" msgstr "cho phép kiểm tra hạn chế hơn" -#: builtin/fsck.c:768 +#: builtin/fsck.c:766 msgid "write dangling objects in .git/lost-found" msgstr "ghi các đối tượng không được quản lý trong .git/lost-found" -#: builtin/fsck.c:769 builtin/prune.c:134 +#: builtin/fsck.c:767 builtin/prune.c:134 msgid "show progress" msgstr "hiển thị quá trình" -#: builtin/fsck.c:770 +#: builtin/fsck.c:768 msgid "show verbose names for reachable objects" msgstr "hiển thị tên chi tiết cho các đối tượng đọc được" -#: builtin/fsck.c:829 builtin/index-pack.c:261 +#: builtin/fsck.c:827 builtin/index-pack.c:262 msgid "Checking objects" msgstr "Đang kiểm tra các đối tượng" -#: builtin/fsck.c:857 +#: builtin/fsck.c:855 #, c-format msgid "%s: object missing" msgstr "%s: thiếu đối tượng" -#: builtin/fsck.c:868 +#: builtin/fsck.c:866 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "tham số không hợp lệ: cần sha1, nhưng lại nhận được “%s”" @@ -15407,12 +15653,12 @@ msgstr "Gặp lỗi khi lấy thông tin thống kê về tập tin %s: %s" msgid "failed to parse '%s' value '%s'" msgstr "gặp lỗi khi phân tích “%s” giá trị “%s”" -#: builtin/gc.c:487 builtin/init-db.c:58 +#: builtin/gc.c:487 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "không thể lấy thông tin thống kê về “%s”" -#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562 +#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573 #, c-format msgid "cannot read '%s'" msgstr "không thể đọc “%s”" @@ -15513,144 +15759,144 @@ msgstr "đối số --schedule không được thừa nhận %s" msgid "failed to write commit-graph" msgstr "gặp lỗi khi ghi đồ thị các lần chuyển giao" -#: builtin/gc.c:914 -msgid "failed to fill remotes" -msgstr "gặp lỗi khi điền đầy các máy chủ" +#: builtin/gc.c:905 +msgid "failed to prefetch remotes" +msgstr "gặp lỗi khi tải trước các máy chủ" -#: builtin/gc.c:1037 +#: builtin/gc.c:1022 msgid "failed to start 'git pack-objects' process" msgstr "gặp lỗi khi lấy thông tin thống kê về tiến trình “git pack-objects”" -#: builtin/gc.c:1054 +#: builtin/gc.c:1039 msgid "failed to finish 'git pack-objects' process" msgstr "gặp lỗi khi hoàn tất tiến trình “git pack-objects”" -#: builtin/gc.c:1106 +#: builtin/gc.c:1091 msgid "failed to write multi-pack-index" msgstr "gặp lỗi khi ghi multi-pack-index" -#: builtin/gc.c:1124 +#: builtin/gc.c:1109 msgid "'git multi-pack-index expire' failed" msgstr "gặp lỗi khi chạy “git multi-pack-index expire”" -#: builtin/gc.c:1185 +#: builtin/gc.c:1170 msgid "'git multi-pack-index repack' failed" msgstr "gặp lỗi khi chạy “git multi-pack-index repack”" -#: builtin/gc.c:1194 +#: builtin/gc.c:1179 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "bỏ qua tác vụ incremental-repack vì core.multiPackIndex bị vô hiệu hóa" -#: builtin/gc.c:1298 +#: builtin/gc.c:1283 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "đã có khóa của tập tin “%s”, bỏ qua bảo trì" -#: builtin/gc.c:1328 +#: builtin/gc.c:1313 #, c-format msgid "task '%s' failed" msgstr "gặp lỗi khi thực hiện nhiệm vụ “%s”" -#: builtin/gc.c:1410 +#: builtin/gc.c:1395 #, c-format msgid "'%s' is not a valid task" msgstr "“%s” không phải một nhiệm vụ hợp lệ" -#: builtin/gc.c:1415 +#: builtin/gc.c:1400 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "nhiệm vụ “%s” không được chọn nhiều lần" -#: builtin/gc.c:1430 +#: builtin/gc.c:1415 msgid "run tasks based on the state of the repository" msgstr "chạy nhiệm vụ dựa trên trạng thái của kho chứa" -#: builtin/gc.c:1431 +#: builtin/gc.c:1416 msgid "frequency" msgstr "tần số" -#: builtin/gc.c:1432 +#: builtin/gc.c:1417 msgid "run tasks based on frequency" msgstr "chạy nhiệm vụ dựa trên tần suất" -#: builtin/gc.c:1435 +#: builtin/gc.c:1420 msgid "do not report progress or other information over stderr" msgstr "đừng báo cáo diễn tiến hay các thông tin khác ra đầu lỗi tiêu chuẩn" -#: builtin/gc.c:1436 +#: builtin/gc.c:1421 msgid "task" msgstr "tác vụ" -#: builtin/gc.c:1437 +#: builtin/gc.c:1422 msgid "run a specific task" msgstr "chạy một nhiệm vụ cụ thể" -#: builtin/gc.c:1454 +#: builtin/gc.c:1439 msgid "use at most one of --auto and --schedule=<frequency>" msgstr "dùng nhiều nhất là một trong --auto và --schedule=<frequency>" -#: builtin/gc.c:1497 +#: builtin/gc.c:1482 msgid "failed to run 'git config'" msgstr "gặp lỗi khi chạy “git config”" -#: builtin/gc.c:1562 +#: builtin/gc.c:1547 #, c-format msgid "failed to expand path '%s'" msgstr "gặp lỗi khi khai triển đường dẫn “%s”" -#: builtin/gc.c:1591 +#: builtin/gc.c:1576 msgid "failed to start launchctl" msgstr "gặp lỗi khi khởi chạy launchctl" -#: builtin/gc.c:1628 +#: builtin/gc.c:1613 #, c-format msgid "failed to create directories for '%s'" msgstr "gặp lỗi khi tạo thư mục cho \"%s\"" -#: builtin/gc.c:1689 +#: builtin/gc.c:1674 #, c-format msgid "failed to bootstrap service %s" msgstr "gặp lỗi khi mồi dịch vụ %s" -#: builtin/gc.c:1760 +#: builtin/gc.c:1745 msgid "failed to create temp xml file" msgstr "gặp lỗi khi tạo tập tin xml tạm thời" -#: builtin/gc.c:1850 +#: builtin/gc.c:1835 msgid "failed to start schtasks" msgstr "gặp lỗi khi lấy thông tin thống kê về schtasks" -#: builtin/gc.c:1894 +#: builtin/gc.c:1879 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" "gặp lỗi khi chạy “crontab -l”; hệ thống của bạn có thể không hỗ trợ “cron”" -#: builtin/gc.c:1911 +#: builtin/gc.c:1896 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "gặp lỗi khi chạy “crontab”; hiển thị của bạn có lẽ không hỗ trợ “cron”" -#: builtin/gc.c:1915 +#: builtin/gc.c:1900 msgid "failed to open stdin of 'crontab'" msgstr "gặp lỗi khi mở đầu vào tiêu chuẩn của “crontab”" -#: builtin/gc.c:1956 +#: builtin/gc.c:1942 msgid "'crontab' died" msgstr "“crontab” đã chết" -#: builtin/gc.c:1990 +#: builtin/gc.c:1976 msgid "another process is scheduling background maintenance" msgstr "một tiến trình khác được lập kế hoạch chạy nền để bảo trì" -#: builtin/gc.c:2009 +#: builtin/gc.c:2000 msgid "failed to add repo to global config" msgstr "gặp lỗi khi thêm cấu hình toàn cục" -#: builtin/gc.c:2019 +#: builtin/gc.c:2010 msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance run <lệnh_con> [<các tùy chọn>]" -#: builtin/gc.c:2038 +#: builtin/gc.c:2029 #, c-format msgid "invalid subcommand: %s" msgstr "lện con không hợp lệ: %s" @@ -15673,259 +15919,259 @@ msgstr "số tuyến đã cho không hợp lệ (%d) cho %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808 -#: builtin/pack-objects.c:2944 +#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793 +#: builtin/pack-objects.c:2969 #, c-format msgid "no threads support, ignoring %s" msgstr "không hỗ trợ đa tuyến, bỏ qua %s" -#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641 +#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643 #, c-format msgid "unable to read tree (%s)" msgstr "không thể đọc cây (%s)" -#: builtin/grep.c:656 +#: builtin/grep.c:658 #, c-format msgid "unable to grep from object of type %s" msgstr "không thể thực hiện lệnh grep (lọc tìm) từ đối tượng thuộc kiểu %s" -#: builtin/grep.c:737 +#: builtin/grep.c:739 #, c-format msgid "switch `%c' expects a numerical value" msgstr "chuyển đến “%c” cần một giá trị bằng số" -#: builtin/grep.c:836 +#: builtin/grep.c:838 msgid "search in index instead of in the work tree" msgstr "tìm trong bảng mục lục thay vì trong cây làm việc" -#: builtin/grep.c:838 +#: builtin/grep.c:840 msgid "find in contents not managed by git" msgstr "tìm trong nội dung không được quản lý bởi git" -#: builtin/grep.c:840 +#: builtin/grep.c:842 msgid "search in both tracked and untracked files" msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết" -#: builtin/grep.c:842 +#: builtin/grep.c:844 msgid "ignore files specified via '.gitignore'" msgstr "các tập tin bị bỏ qua được chỉ định thông qua “.gitignore”" -#: builtin/grep.c:844 +#: builtin/grep.c:846 msgid "recursively search in each submodule" msgstr "tìm kiếm đệ quy trong từng mô-đun-con" -#: builtin/grep.c:847 +#: builtin/grep.c:849 msgid "show non-matching lines" msgstr "hiển thị những dòng không khớp với mẫu" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "case insensitive matching" msgstr "phân biệt HOA/thường" -#: builtin/grep.c:851 +#: builtin/grep.c:853 msgid "match patterns only at word boundaries" msgstr "chỉ khớp mẫu tại đường ranh giới từ" -#: builtin/grep.c:853 +#: builtin/grep.c:855 msgid "process binary files as text" msgstr "xử lý tập tin nhị phân như là dạng văn bản thường" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "don't match patterns in binary files" msgstr "không khớp mẫu trong các tập tin nhị phân" -#: builtin/grep.c:858 +#: builtin/grep.c:860 msgid "process binary files with textconv filters" msgstr "xử lý tập tin nhị phân với các bộ lọc “textconv”" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "search in subdirectories (default)" msgstr "tìm kiếm trong thư mục con (mặc định)" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "descend at most <depth> levels" msgstr "hạ xuống ít nhất là mức <sâu>" -#: builtin/grep.c:866 +#: builtin/grep.c:868 msgid "use extended POSIX regular expressions" msgstr "dùng biểu thức chính qui POSIX có mở rộng" -#: builtin/grep.c:869 +#: builtin/grep.c:871 msgid "use basic POSIX regular expressions (default)" msgstr "sử dụng biểu thức chính quy kiểu POSIX (mặc định)" -#: builtin/grep.c:872 +#: builtin/grep.c:874 msgid "interpret patterns as fixed strings" msgstr "diễn dịch các mẫu như là chuỗi cố định" -#: builtin/grep.c:875 +#: builtin/grep.c:877 msgid "use Perl-compatible regular expressions" msgstr "sử dụng biểu thức chính quy tương thích Perl" -#: builtin/grep.c:878 +#: builtin/grep.c:880 msgid "show line numbers" msgstr "hiển thị số của dòng" -#: builtin/grep.c:879 +#: builtin/grep.c:881 msgid "show column number of first match" msgstr "hiển thị số cột của khớp với mẫu đầu tiên" -#: builtin/grep.c:880 +#: builtin/grep.c:882 msgid "don't show filenames" msgstr "không hiển thị tên tập tin" -#: builtin/grep.c:881 +#: builtin/grep.c:883 msgid "show filenames" msgstr "hiển thị các tên tập tin" -#: builtin/grep.c:883 +#: builtin/grep.c:885 msgid "show filenames relative to top directory" msgstr "hiển thị tên tập tin tương đối với thư mục đỉnh (top)" -#: builtin/grep.c:885 +#: builtin/grep.c:887 msgid "show only filenames instead of matching lines" msgstr "chỉ hiển thị tên tập tin thay vì những dòng khớp với mẫu" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "synonym for --files-with-matches" msgstr "đồng nghĩa với --files-with-matches" -#: builtin/grep.c:890 +#: builtin/grep.c:892 msgid "show only the names of files without match" msgstr "chỉ hiển thị tên cho những tập tin không khớp với mẫu" -#: builtin/grep.c:892 +#: builtin/grep.c:894 msgid "print NUL after filenames" msgstr "thêm NUL vào sau tên tập tin" -#: builtin/grep.c:895 +#: builtin/grep.c:897 msgid "show only matching parts of a line" msgstr "chỉ hiển thị những phần khớp với mẫu của một dòng" -#: builtin/grep.c:897 +#: builtin/grep.c:899 msgid "show the number of matches instead of matching lines" msgstr "hiển thị số lượng khớp thay vì những dòng khớp với mẫu" -#: builtin/grep.c:898 +#: builtin/grep.c:900 msgid "highlight matches" msgstr "tô sáng phần khớp mẫu" -#: builtin/grep.c:900 +#: builtin/grep.c:902 msgid "print empty line between matches from different files" msgstr "hiển thị dòng trống giữa các lần khớp từ các tập tin khác biệt" -#: builtin/grep.c:902 +#: builtin/grep.c:904 msgid "show filename only once above matches from same file" msgstr "" "hiển thị tên tập tin một lần phía trên các lần khớp từ cùng một tập tin" -#: builtin/grep.c:905 +#: builtin/grep.c:907 msgid "show <n> context lines before and after matches" msgstr "hiển thị <n> dòng nội dung phía trước và sau các lần khớp" -#: builtin/grep.c:908 +#: builtin/grep.c:910 msgid "show <n> context lines before matches" msgstr "hiển thị <n> dòng nội dung trước khớp" -#: builtin/grep.c:910 +#: builtin/grep.c:912 msgid "show <n> context lines after matches" msgstr "hiển thị <n> dòng nội dung sau khớp" -#: builtin/grep.c:912 +#: builtin/grep.c:914 msgid "use <n> worker threads" msgstr "dùng <n> tuyến trình làm việc" -#: builtin/grep.c:913 +#: builtin/grep.c:915 msgid "shortcut for -C NUM" msgstr "dạng viết tắt của -C SỐ" -#: builtin/grep.c:916 +#: builtin/grep.c:918 msgid "show a line with the function name before matches" msgstr "hiển thị dòng vói tên hàm trước các lần khớp" -#: builtin/grep.c:918 +#: builtin/grep.c:920 msgid "show the surrounding function" msgstr "hiển thị hàm bao quanh" -#: builtin/grep.c:921 +#: builtin/grep.c:923 msgid "read patterns from file" msgstr "đọc mẫu từ tập-tin" -#: builtin/grep.c:923 +#: builtin/grep.c:925 msgid "match <pattern>" msgstr "match <mẫu>" -#: builtin/grep.c:925 +#: builtin/grep.c:927 msgid "combine patterns specified with -e" msgstr "tổ hợp mẫu được chỉ ra với tùy chọn -e" -#: builtin/grep.c:937 +#: builtin/grep.c:939 msgid "indicate hit with exit status without output" msgstr "đưa ra gợi ý với trạng thái thoát mà không có kết xuất" -#: builtin/grep.c:939 +#: builtin/grep.c:941 msgid "show only matches from files that match all patterns" msgstr "chỉ hiển thị những cái khớp từ tập tin mà nó khớp toàn bộ các mẫu" -#: builtin/grep.c:942 +#: builtin/grep.c:944 msgid "pager" msgstr "dàn trang" -#: builtin/grep.c:942 +#: builtin/grep.c:944 msgid "show matching files in the pager" msgstr "hiển thị các tập tin khớp trong trang giấy" -#: builtin/grep.c:946 +#: builtin/grep.c:948 msgid "allow calling of grep(1) (ignored by this build)" msgstr "cho phép gọi grep(1) (bị bỏ qua bởi lần dịch này)" -#: builtin/grep.c:1012 +#: builtin/grep.c:1014 msgid "no pattern given" msgstr "chưa chỉ ra mẫu" -#: builtin/grep.c:1048 +#: builtin/grep.c:1050 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index hay --untracked không được sử dụng cùng với revs" -#: builtin/grep.c:1056 +#: builtin/grep.c:1058 #, c-format msgid "unable to resolve revision: %s" msgstr "không thể phân giải điểm xét duyệt: %s" -#: builtin/grep.c:1086 +#: builtin/grep.c:1088 msgid "--untracked not supported with --recurse-submodules" msgstr "tùy chọn --untracked không được hỗ trợ với --recurse-submodules" -#: builtin/grep.c:1090 +#: builtin/grep.c:1092 msgid "invalid option combination, ignoring --threads" msgstr "tổ hợp tùy chọn không hợp lệ, bỏ qua --threads" -#: builtin/grep.c:1093 builtin/pack-objects.c:3672 +#: builtin/grep.c:1095 builtin/pack-objects.c:3930 msgid "no threads support, ignoring --threads" msgstr "không hỗ trợ đa tuyến, bỏ qua --threads" -#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941 +#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966 #, c-format msgid "invalid number of threads specified (%d)" msgstr "số tuyến chỉ ra không hợp lệ (%d)" -#: builtin/grep.c:1130 +#: builtin/grep.c:1132 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager chỉ làm việc trên cây-làm-việc" -#: builtin/grep.c:1156 +#: builtin/grep.c:1158 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached hay --untracked không được sử dụng với --no-index" -#: builtin/grep.c:1159 +#: builtin/grep.c:1161 msgid "--untracked cannot be used with --cached" msgstr "--untracked không thể được sử dụng với tùy chọn --cached" -#: builtin/grep.c:1165 +#: builtin/grep.c:1167 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu dấu vết" -#: builtin/grep.c:1173 +#: builtin/grep.c:1175 msgid "both --cached and trees are given" msgstr "cả hai --cached và các cây phải được chỉ ra" @@ -16056,12 +16302,12 @@ msgstr "không có trình xem trợ giúp dạng manpage tiếp hợp với yêu msgid "no info viewer handled the request" msgstr "không có trình xem trợ giúp dạng info tiếp hợp với yêu cầu" -#: builtin/help.c:520 builtin/help.c:531 git.c:340 +#: builtin/help.c:520 builtin/help.c:531 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "“%s” được đặt bí danh thành “%s”" -#: builtin/help.c:534 git.c:372 +#: builtin/help.c:534 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "chuỗi alias.%s sai: %s" @@ -16075,390 +16321,386 @@ msgstr "cách dùng: %s%s" msgid "'git help config' for more information" msgstr "Chạy lệnh “git help config” để có thêm thông tin" -#: builtin/index-pack.c:221 +#: builtin/index-pack.c:222 #, c-format msgid "object type mismatch at %s" msgstr "kiểu đối tượng không khớp tại %s" -#: builtin/index-pack.c:241 +#: builtin/index-pack.c:242 #, c-format msgid "did not receive expected object %s" msgstr "không thể lấy về đối tượng cần %s" -#: builtin/index-pack.c:244 +#: builtin/index-pack.c:245 #, c-format msgid "object %s: expected type %s, found %s" msgstr "đối tượng %s: cần kiểu %s nhưng lại nhận được %s" -#: builtin/index-pack.c:294 +#: builtin/index-pack.c:295 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "không thể điền thêm vào %d byte" -#: builtin/index-pack.c:304 +#: builtin/index-pack.c:305 msgid "early EOF" msgstr "gặp kết thúc tập tin EOF quá sớm" -#: builtin/index-pack.c:305 +#: builtin/index-pack.c:306 msgid "read error on input" msgstr "lỗi đọc ở đầu vào" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:318 msgid "used more bytes than were available" msgstr "sử dụng nhiều hơn số lượng byte mà nó sẵn có" -#: builtin/index-pack.c:324 builtin/pack-objects.c:624 +#: builtin/index-pack.c:325 builtin/pack-objects.c:624 msgid "pack too large for current definition of off_t" msgstr "gói quá lớn so với định nghĩa hiện tại của kiểu off_t" -#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:328 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "gói đã vượt quá cỡ tối đa được phép" -#: builtin/index-pack.c:342 +#: builtin/index-pack.c:343 #, c-format msgid "unable to create '%s'" msgstr "không thể tạo “%s”" -#: builtin/index-pack.c:348 +#: builtin/index-pack.c:349 #, c-format msgid "cannot open packfile '%s'" msgstr "không thể mở packfile “%s”" -#: builtin/index-pack.c:362 +#: builtin/index-pack.c:363 msgid "pack signature mismatch" msgstr "chữ ký cho gói không khớp" -#: builtin/index-pack.c:364 +#: builtin/index-pack.c:365 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "không hỗ trợ phiên bản gói %<PRIu32>" -#: builtin/index-pack.c:382 +#: builtin/index-pack.c:383 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "gói có đối tượng sai tại khoảng bù %<PRIuMAX>: %s" -#: builtin/index-pack.c:488 +#: builtin/index-pack.c:489 #, c-format msgid "inflate returned %d" msgstr "xả nén trả về %d" -#: builtin/index-pack.c:537 +#: builtin/index-pack.c:538 msgid "offset value overflow for delta base object" msgstr "tràn giá trị khoảng bù cho đối tượng delta cơ sở" -#: builtin/index-pack.c:545 +#: builtin/index-pack.c:546 msgid "delta base offset is out of bound" msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm vi" -#: builtin/index-pack.c:553 +#: builtin/index-pack.c:554 #, c-format msgid "unknown object type %d" msgstr "không hiểu kiểu đối tượng %d" -#: builtin/index-pack.c:584 +#: builtin/index-pack.c:585 msgid "cannot pread pack file" msgstr "không thể chạy hàm pread cho tập tin gói" -#: builtin/index-pack.c:586 +#: builtin/index-pack.c:587 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "tập tin gói bị kết thúc sớm, thiếu %<PRIuMAX> byte" -#: builtin/index-pack.c:612 +#: builtin/index-pack.c:613 msgid "serious inflate inconsistency" msgstr "sự mâu thuẫn xả nén nghiêm trọng" -#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 -#: builtin/index-pack.c:826 builtin/index-pack.c:835 +#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788 +#: builtin/index-pack.c:827 builtin/index-pack.c:836 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!" -#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/index-pack.c:761 builtin/pack-objects.c:171 #: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "không thể đọc %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:825 #, c-format msgid "cannot read existing object info %s" msgstr "không thể đọc thông tin đối tượng sẵn có %s" -#: builtin/index-pack.c:832 +#: builtin/index-pack.c:833 #, c-format msgid "cannot read existing object %s" msgstr "không thể đọc đối tượng đã tồn tại %s" -#: builtin/index-pack.c:846 +#: builtin/index-pack.c:847 #, c-format msgid "invalid blob object %s" msgstr "đối tượng blob không hợp lệ %s" -#: builtin/index-pack.c:849 builtin/index-pack.c:868 +#: builtin/index-pack.c:850 builtin/index-pack.c:869 msgid "fsck error in packed object" msgstr "lỗi fsck trong đối tượng đóng gói" -#: builtin/index-pack.c:870 +#: builtin/index-pack.c:871 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Không phải tất cả các đối tượng con của %s là có thể với tới được" -#: builtin/index-pack.c:931 builtin/index-pack.c:978 +#: builtin/index-pack.c:932 builtin/index-pack.c:979 msgid "failed to apply delta" msgstr "gặp lỗi khi áp dụng delta" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1162 msgid "Receiving objects" msgstr "Đang nhận về các đối tượng" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1162 msgid "Indexing objects" msgstr "Các đối tượng bảng mục lục" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1196 msgid "pack is corrupted (SHA1 mismatch)" msgstr "gói bị sai hỏng (SHA1 không khớp)" -#: builtin/index-pack.c:1200 +#: builtin/index-pack.c:1201 msgid "cannot fstat packfile" msgstr "không thể lấy thông tin thống kê packfile" -#: builtin/index-pack.c:1203 +#: builtin/index-pack.c:1204 msgid "pack has junk at the end" msgstr "pack có phần thừa ở cuối" -#: builtin/index-pack.c:1215 +#: builtin/index-pack.c:1216 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()" -#: builtin/index-pack.c:1238 +#: builtin/index-pack.c:1239 msgid "Resolving deltas" msgstr "Đang phân giải các delta" -#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707 +#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732 #, c-format msgid "unable to create thread: %s" msgstr "không thể tạo tuyến: %s" -#: builtin/index-pack.c:1282 +#: builtin/index-pack.c:1283 msgid "confusion beyond insanity" msgstr "lộn xộn hơn cả điên rồ" -#: builtin/index-pack.c:1288 +#: builtin/index-pack.c:1289 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "đầy đủ với %d đối tượng nội bộ" -#: builtin/index-pack.c:1300 +#: builtin/index-pack.c:1301 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Gặp tổng kiểm tra tail không cần cho %s (đĩa hỏng?)" -#: builtin/index-pack.c:1304 +#: builtin/index-pack.c:1305 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "gói có %d delta chưa được giải quyết" -#: builtin/index-pack.c:1328 +#: builtin/index-pack.c:1329 #, c-format msgid "unable to deflate appended object (%d)" msgstr "không thể xả nén đối tượng nối thêm (%d)" -#: builtin/index-pack.c:1424 +#: builtin/index-pack.c:1425 #, c-format msgid "local object %s is corrupt" msgstr "đối tượng nội bộ %s bị hỏng" -#: builtin/index-pack.c:1445 +#: builtin/index-pack.c:1446 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "tên tập tin tập tin gói “%s” không được kết thúc “.%s”" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1470 #, c-format msgid "cannot write %s file '%s'" msgstr "không thể ghi %s tập tin “%s”" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1478 #, c-format msgid "cannot close written %s file '%s'" msgstr "không thể đóng tập tin được ghi %s “%s”" -#: builtin/index-pack.c:1503 +#: builtin/index-pack.c:1504 msgid "error while closing pack file" msgstr "gặp lỗi trong khi đóng tập tin gói" -#: builtin/index-pack.c:1517 +#: builtin/index-pack.c:1518 msgid "cannot store pack file" msgstr "không thể lưu tập tin gói" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1526 msgid "cannot store index file" msgstr "không thể lưu trữ tập tin ghi mục lục" -#: builtin/index-pack.c:1534 -msgid "cannot store reverse index file" -msgstr "không thể lưu trữ tập tin ghi mục lục đảo ngược" - -#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952 +#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "sai pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1651 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Không thể mở tập tin gói đã sẵn có “%s”" -#: builtin/index-pack.c:1652 +#: builtin/index-pack.c:1653 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Không thể mở tập tin idx của gói cho “%s”" -#: builtin/index-pack.c:1700 +#: builtin/index-pack.c:1701 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "không delta: %d đối tượng" -#: builtin/index-pack.c:1707 +#: builtin/index-pack.c:1708 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "chiều dài xích = %d: %lu đối tượng" -#: builtin/index-pack.c:1765 +#: builtin/index-pack.c:1750 msgid "Cannot come back to cwd" msgstr "Không thể quay lại cwd" -#: builtin/index-pack.c:1819 builtin/index-pack.c:1822 -#: builtin/index-pack.c:1838 builtin/index-pack.c:1842 +#: builtin/index-pack.c:1804 builtin/index-pack.c:1807 +#: builtin/index-pack.c:1823 builtin/index-pack.c:1827 #, c-format msgid "bad %s" msgstr "%s sai" -#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625 +#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613 #, c-format msgid "unknown hash algorithm '%s'" msgstr "không hiểu thuật toán băm dữ liệu “%s”" -#: builtin/index-pack.c:1867 +#: builtin/index-pack.c:1852 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin không thể được dùng mà không có --stdin" -#: builtin/index-pack.c:1869 +#: builtin/index-pack.c:1854 msgid "--stdin requires a git repository" msgstr "--stdin cần một kho git" -#: builtin/index-pack.c:1871 +#: builtin/index-pack.c:1856 msgid "--object-format cannot be used with --stdin" msgstr "--object-format không thể được dùng với --stdin" -#: builtin/index-pack.c:1886 +#: builtin/index-pack.c:1871 msgid "--verify with no packfile name given" msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile" -#: builtin/index-pack.c:1956 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "lỗi fsck trong các đối tượng gói" -#: builtin/init-db.c:64 +#: builtin/init-db.c:63 #, c-format msgid "cannot stat template '%s'" msgstr "không thể lấy thông tin thống kê về mẫu “%s”" -#: builtin/init-db.c:69 +#: builtin/init-db.c:68 #, c-format msgid "cannot opendir '%s'" msgstr "không thể opendir() “%s”" -#: builtin/init-db.c:81 +#: builtin/init-db.c:80 #, c-format msgid "cannot readlink '%s'" msgstr "không thể readlink “%s”" -#: builtin/init-db.c:83 +#: builtin/init-db.c:82 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "không thể tạo liên kết mềm (symlink) “%s” “%s”" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "không thể sao chép “%s” sang “%s”" -#: builtin/init-db.c:93 +#: builtin/init-db.c:92 #, c-format msgid "ignoring template %s" msgstr "đang lờ đi mẫu “%s”" -#: builtin/init-db.c:124 +#: builtin/init-db.c:123 #, c-format msgid "templates not found in %s" msgstr "các mẫu không được tìm thấy trong %s" -#: builtin/init-db.c:139 +#: builtin/init-db.c:138 #, c-format msgid "not copying templates from '%s': %s" msgstr "không sao chép các mẫu từ “%s”: %s" -#: builtin/init-db.c:275 +#: builtin/init-db.c:262 #, c-format msgid "invalid initial branch name: '%s'" msgstr "tên nhánh khởi tạo không hợp lệ: “%s”" -#: builtin/init-db.c:367 +#: builtin/init-db.c:353 #, c-format msgid "unable to handle file type %d" msgstr "không thể xử lý (handle) tập tin kiểu %d" -#: builtin/init-db.c:370 +#: builtin/init-db.c:356 #, c-format msgid "unable to move %s to %s" msgstr "không di chuyển được %s vào %s" -#: builtin/init-db.c:386 +#: builtin/init-db.c:372 msgid "attempt to reinitialize repository with different hash" msgstr "cố để khởi tạo lại một kho với kiểu băm dữ liệu khác" -#: builtin/init-db.c:410 builtin/init-db.c:413 +#: builtin/init-db.c:396 builtin/init-db.c:399 #, c-format msgid "%s already exists" msgstr "%s đã có từ trước rồi" -#: builtin/init-db.c:445 +#: builtin/init-db.c:431 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: --initial-branch=%s bị bỏ qua" -#: builtin/init-db.c:476 +#: builtin/init-db.c:462 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Đã khởi tạo lại kho Git chia sẻ sẵn có trong %s%s\n" -#: builtin/init-db.c:477 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Đã khởi tạo lại kho Git sẵn có trong %s%s\n" -#: builtin/init-db.c:481 +#: builtin/init-db.c:467 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Đã khởi tạo lại kho Git chia sẻ trống rỗng sẵn có trong %s%s\n" -#: builtin/init-db.c:482 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Đã khởi tạo lại kho Git trống rỗng sẵn có trong %s%s\n" -#: builtin/init-db.c:531 +#: builtin/init-db.c:517 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -16466,41 +16708,41 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-" "quyền>]] [thư-mục]" -#: builtin/init-db.c:557 +#: builtin/init-db.c:543 msgid "permissions" msgstr "các quyền" -#: builtin/init-db.c:558 +#: builtin/init-db.c:544 msgid "specify that the git repository is to be shared amongst several users" msgstr "chỉ ra cái mà kho git được chia sẻ giữa nhiều người dùng" -#: builtin/init-db.c:564 +#: builtin/init-db.c:550 msgid "override the name of the initial branch" msgstr "ghi đè lên tên của nhánh khởi tạo" -#: builtin/init-db.c:565 builtin/verify-pack.c:74 +#: builtin/init-db.c:551 builtin/verify-pack.c:74 msgid "hash" msgstr "băm" -#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "chỉ định thuật toán băm dữ liệu muốn dùng" -#: builtin/init-db.c:573 +#: builtin/init-db.c:559 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "Các tùy chọn --separate-git-dir và --bare loại từ lẫn nhau" -#: builtin/init-db.c:602 builtin/init-db.c:607 +#: builtin/init-db.c:590 builtin/init-db.c:595 #, c-format msgid "cannot mkdir %s" msgstr "không thể mkdir (tạo thư mục): %s" -#: builtin/init-db.c:611 builtin/init-db.c:666 +#: builtin/init-db.c:599 builtin/init-db.c:654 #, c-format msgid "cannot chdir to %s" msgstr "không thể chdir (chuyển đổi thư mục) sang %s" -#: builtin/init-db.c:638 +#: builtin/init-db.c:626 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -16509,12 +16751,12 @@ msgstr "" "%s (hoặc --work-tree=<thư-mục>) không cho phép không chỉ định %s (hoặc --git-" "dir=<thư-mục>)" -#: builtin/init-db.c:690 +#: builtin/init-db.c:678 #, c-format msgid "Cannot access work tree '%s'" msgstr "Không thể truy cập cây (tree) làm việc “%s”" -#: builtin/init-db.c:695 +#: builtin/init-db.c:683 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir xung khắc với kho thuần" @@ -16566,10 +16808,6 @@ msgstr "đặt các tùy chọn phân tích cú pháp" msgid "do not treat --- specially" msgstr "không coi --- là đặc biệt" -#: builtin/interpret-trailers.c:111 -msgid "trailer" -msgstr "bộ dò vết" - #: builtin/interpret-trailers.c:112 msgid "trailer(s) to add" msgstr "bộ dò vết cần thêm" @@ -16632,80 +16870,80 @@ msgstr "-L<vùng>:<tập_tin> không thể được sử dụng với đặc t msgid "Final output: %d %s\n" msgstr "Kết xuất cuối cùng: %d %s\n" -#: builtin/log.c:566 +#: builtin/log.c:568 #, c-format msgid "git show %s: bad file" msgstr "git show %s: sai tập tin" -#: builtin/log.c:581 builtin/log.c:671 +#: builtin/log.c:583 builtin/log.c:673 #, c-format msgid "could not read object %s" msgstr "không thể đọc đối tượng %s" -#: builtin/log.c:696 +#: builtin/log.c:698 #, c-format msgid "unknown type: %d" msgstr "không nhận ra kiểu: %d" -#: builtin/log.c:841 +#: builtin/log.c:843 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: bao bọc không hợp lệ từ chế độ mô tả" -#: builtin/log.c:848 +#: builtin/log.c:850 msgid "format.headers without value" msgstr "format.headers không có giá trị cụ thể" -#: builtin/log.c:977 +#: builtin/log.c:979 #, c-format msgid "cannot open patch file %s" msgstr "không thể mở tập tin miếng vá: %s" -#: builtin/log.c:994 +#: builtin/log.c:996 msgid "need exactly one range" msgstr "cần chính xác một vùng" -#: builtin/log.c:1004 +#: builtin/log.c:1006 msgid "not a range" msgstr "không phải là một vùng" -#: builtin/log.c:1168 +#: builtin/log.c:1170 msgid "cover letter needs email format" msgstr "“cover letter” cần cho định dạng thư" -#: builtin/log.c:1174 +#: builtin/log.c:1176 msgid "failed to create cover-letter file" msgstr "gặp lỗi khi tạo các tập tin cover-letter" -#: builtin/log.c:1261 +#: builtin/log.c:1263 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to điên rồ: %s" -#: builtin/log.c:1288 +#: builtin/log.c:1290 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<các tùy chọn>] [<kể-từ> | <vùng-xem-xét>]" -#: builtin/log.c:1346 +#: builtin/log.c:1348 msgid "two output directories?" msgstr "hai thư mục kết xuất?" -#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331 +#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340 #, c-format msgid "unknown commit %s" msgstr "không hiểu lần chuyển giao %s" -#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ" -#: builtin/log.c:1517 +#: builtin/log.c:1519 msgid "could not find exact merge base" msgstr "không tìm thấy nền hòa trộn chính xác" -#: builtin/log.c:1527 +#: builtin/log.c:1529 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -16716,289 +16954,293 @@ msgstr "" "nhánh máy chủ. Hoặc là bạn có thể chỉ định lần chuyển giao nền bằng\n" "\"--base=<base-commit-id>\" một cách thủ công" -#: builtin/log.c:1550 +#: builtin/log.c:1552 msgid "failed to find exact merge base" msgstr "gặp lỗi khi tìm nền hòa trộn chính xác" -#: builtin/log.c:1567 +#: builtin/log.c:1569 msgid "base commit should be the ancestor of revision list" msgstr "lần chuyển giao nền không là tổ tiên của danh sách điểm xét duyệt" -#: builtin/log.c:1577 +#: builtin/log.c:1579 msgid "base commit shouldn't be in revision list" msgstr "lần chuyển giao nền không được trong danh sách điểm xét duyệt" -#: builtin/log.c:1635 +#: builtin/log.c:1637 msgid "cannot get patch id" msgstr "không thể lấy mã miếng vá" -#: builtin/log.c:1692 +#: builtin/log.c:1700 msgid "failed to infer range-diff origin of current series" msgstr "" "gặp lỗi khi suy luận range-diff (vùng khác biệt) gốc của sê-ri hiện tại" -#: builtin/log.c:1694 +#: builtin/log.c:1702 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "dùng “%s” như là gốc range-diff của sê-ri hiện tại" -#: builtin/log.c:1738 +#: builtin/log.c:1746 msgid "use [PATCH n/m] even with a single patch" msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn" -#: builtin/log.c:1741 +#: builtin/log.c:1749 msgid "use [PATCH] even with multiple patches" msgstr "dùng [VÁ] ngay cả với các miếng vá phức tạp" -#: builtin/log.c:1745 +#: builtin/log.c:1753 msgid "print patches to standard out" msgstr "hiển thị miếng vá ra đầu ra chuẩn" -#: builtin/log.c:1747 +#: builtin/log.c:1755 msgid "generate a cover letter" msgstr "tạo bì thư" -#: builtin/log.c:1749 +#: builtin/log.c:1757 msgid "use simple number sequence for output file names" msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra" -#: builtin/log.c:1750 +#: builtin/log.c:1758 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1751 +#: builtin/log.c:1759 msgid "use <sfx> instead of '.patch'" msgstr "sử dụng <sfx> thay cho “.patch”" -#: builtin/log.c:1753 +#: builtin/log.c:1761 msgid "start numbering patches at <n> instead of 1" msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1" -#: builtin/log.c:1755 +#: builtin/log.c:1762 +msgid "reroll-count" +msgstr "đếm reroll" + +#: builtin/log.c:1763 msgid "mark the series as Nth re-roll" msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll" -#: builtin/log.c:1757 +#: builtin/log.c:1765 msgid "max length of output filename" msgstr "chiều dài tên tập tin đầu ra tối đa" -#: builtin/log.c:1759 +#: builtin/log.c:1767 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "dùng [VÁ RFC] thay cho [VÁ]" -#: builtin/log.c:1762 +#: builtin/log.c:1770 msgid "cover-from-description-mode" msgstr "cover-from-description-mode" -#: builtin/log.c:1763 +#: builtin/log.c:1771 msgid "generate parts of a cover letter based on a branch's description" msgstr "tạo ra các phần của một lá thư bao gồm dựa trên mô tả của nhánh" -#: builtin/log.c:1765 +#: builtin/log.c:1773 msgid "use [<prefix>] instead of [PATCH]" msgstr "dùng [<tiền-tố>] thay cho [VÁ]" -#: builtin/log.c:1768 +#: builtin/log.c:1776 msgid "store resulting files in <dir>" msgstr "lưu các tập tin kết quả trong <t.mục>" -#: builtin/log.c:1771 +#: builtin/log.c:1779 msgid "don't strip/add [PATCH]" msgstr "không strip/add [VÁ]" -#: builtin/log.c:1774 +#: builtin/log.c:1782 msgid "don't output binary diffs" msgstr "không kết xuất diff (những khác biệt) nhị phân" -#: builtin/log.c:1776 +#: builtin/log.c:1784 msgid "output all-zero hash in From header" msgstr "xuất mọi mã băm all-zero trong phần đầu From" -#: builtin/log.c:1778 +#: builtin/log.c:1786 msgid "don't include a patch matching a commit upstream" msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn" -#: builtin/log.c:1780 +#: builtin/log.c:1788 msgid "show patch format instead of default (patch + stat)" msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)" -#: builtin/log.c:1782 +#: builtin/log.c:1790 msgid "Messaging" msgstr "Lời nhắn" -#: builtin/log.c:1783 +#: builtin/log.c:1791 msgid "header" msgstr "đầu đề thư" -#: builtin/log.c:1784 +#: builtin/log.c:1792 msgid "add email header" msgstr "thêm đầu đề thư" -#: builtin/log.c:1785 builtin/log.c:1786 +#: builtin/log.c:1793 builtin/log.c:1794 msgid "email" msgstr "thư điện tử" -#: builtin/log.c:1785 +#: builtin/log.c:1793 msgid "add To: header" msgstr "thêm To: đầu đề thư" -#: builtin/log.c:1786 +#: builtin/log.c:1794 msgid "add Cc: header" msgstr "thêm Cc: đầu đề thư" -#: builtin/log.c:1787 +#: builtin/log.c:1795 msgid "ident" msgstr "thụt lề" -#: builtin/log.c:1788 +#: builtin/log.c:1796 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "đặt “Địa chỉ gửi” thành <thụ lề> (hoặc thụt lề người commit nếu bỏ quên)" -#: builtin/log.c:1790 +#: builtin/log.c:1798 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1791 +#: builtin/log.c:1799 msgid "make first mail a reply to <message-id>" msgstr "dùng thư đầu tiên để trả lời <message-id>" -#: builtin/log.c:1792 builtin/log.c:1795 +#: builtin/log.c:1800 builtin/log.c:1803 msgid "boundary" msgstr "ranh giới" -#: builtin/log.c:1793 +#: builtin/log.c:1801 msgid "attach the patch" msgstr "đính kèm miếng vá" -#: builtin/log.c:1796 +#: builtin/log.c:1804 msgid "inline the patch" msgstr "dùng miếng vá làm nội dung" -#: builtin/log.c:1800 +#: builtin/log.c:1808 msgid "enable message threading, styles: shallow, deep" msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”" -#: builtin/log.c:1802 +#: builtin/log.c:1810 msgid "signature" msgstr "chữ ký" -#: builtin/log.c:1803 +#: builtin/log.c:1811 msgid "add a signature" msgstr "thêm chữ ký" -#: builtin/log.c:1804 +#: builtin/log.c:1812 msgid "base-commit" msgstr "lần_chuyển_giao_nền" -#: builtin/log.c:1805 +#: builtin/log.c:1813 msgid "add prerequisite tree info to the patch series" msgstr "add trước hết đòi hỏi thông tin cây tới sê-ri miếng vá" -#: builtin/log.c:1808 +#: builtin/log.c:1816 msgid "add a signature from a file" msgstr "thêm chữ ký từ một tập tin" -#: builtin/log.c:1809 +#: builtin/log.c:1817 msgid "don't print the patch filenames" msgstr "không hiển thị các tên tập tin của miếng vá" -#: builtin/log.c:1811 +#: builtin/log.c:1819 msgid "show progress while generating patches" msgstr "hiển thị bộ đo tiến triển trong khi tạo các miếng vá" -#: builtin/log.c:1813 +#: builtin/log.c:1821 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "hiển thị các thay đổi dựa trên <rev> trong các chữ bao bọc hoặc miếng vá đơn" -#: builtin/log.c:1816 +#: builtin/log.c:1824 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "hiển thị các thay đổi dựa trên <refspec> trong các chữ bao bọc hoặc miếng vá " "đơn" -#: builtin/log.c:1818 +#: builtin/log.c:1826 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "tỷ lệ phần trăm theo cái tạo là weighted" -#: builtin/log.c:1904 +#: builtin/log.c:1913 #, c-format msgid "invalid ident line: %s" msgstr "dòng định danh không hợp lệ: %s" -#: builtin/log.c:1919 +#: builtin/log.c:1928 msgid "-n and -k are mutually exclusive" msgstr "-n và -k loại trừ lẫn nhau" -#: builtin/log.c:1921 +#: builtin/log.c:1930 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc và -k xung khắc nhau" -#: builtin/log.c:1929 +#: builtin/log.c:1938 msgid "--name-only does not make sense" msgstr "--name-only không hợp lý" -#: builtin/log.c:1931 +#: builtin/log.c:1940 msgid "--name-status does not make sense" msgstr "--name-status không hợp lý" -#: builtin/log.c:1933 +#: builtin/log.c:1942 msgid "--check does not make sense" msgstr "--check không hợp lý" -#: builtin/log.c:1955 +#: builtin/log.c:1964 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "Các tùy chọn--stdout, --output, và --output-directory loại từ lẫn nhau" -#: builtin/log.c:2078 +#: builtin/log.c:2087 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff cần --cover-letter hoặc vá đơn" -#: builtin/log.c:2082 +#: builtin/log.c:2091 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:2083 +#: builtin/log.c:2092 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff dựa trên v%d:" -#: builtin/log.c:2089 +#: builtin/log.c:2098 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor yêu cầu --range-diff" -#: builtin/log.c:2093 +#: builtin/log.c:2102 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff yêu cầu --cover-letter hoặc miếng vá đơn" -#: builtin/log.c:2101 +#: builtin/log.c:2110 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:2102 +#: builtin/log.c:2111 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff dựa trên v%d:" -#: builtin/log.c:2113 +#: builtin/log.c:2122 #, c-format msgid "unable to read signature file '%s'" msgstr "không thể đọc tập tin chữ ký “%s”" -#: builtin/log.c:2149 +#: builtin/log.c:2158 msgid "Generating patches" msgstr "Đang tạo các miếng vá" -#: builtin/log.c:2193 +#: builtin/log.c:2202 msgid "failed to create output files" msgstr "gặp lỗi khi tạo các tập tin kết xuất" -#: builtin/log.c:2252 +#: builtin/log.c:2261 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]" -#: builtin/log.c:2306 +#: builtin/log.c:2315 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -17006,114 +17248,114 @@ msgstr "" "Không tìm thấy nhánh mạng được theo dõi, hãy chỉ định <thượng-nguồn> một " "cách thủ công.\n" -#: builtin/ls-files.c:486 +#: builtin/ls-files.c:563 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<các tùy chọn>] [<tập-tin>…]" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:619 msgid "identify the file status with tags" msgstr "nhận dạng các trạng thái tập tin với thẻ" -#: builtin/ls-files.c:544 +#: builtin/ls-files.c:621 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "dùng chữ cái viết thường cho các tập tin “assume unchanged” (giả định không " "thay đổi)" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:623 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "dùng chữ cái viết thường cho các tập tin “fsmonitor clean”" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:625 msgid "show cached files in the output (default)" msgstr "hiển thị các tập tin được nhớ tạm vào đầu ra (mặc định)" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:627 msgid "show deleted files in the output" msgstr "hiển thị các tập tin đã xóa trong kết xuất" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:629 msgid "show modified files in the output" msgstr "hiển thị các tập tin đã bị sửa đổi ra kết xuất" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:631 msgid "show other files in the output" msgstr "hiển thị các tập tin khác trong kết xuất" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:633 msgid "show ignored files in the output" msgstr "hiển thị các tập tin bị bỏ qua trong kết xuất" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:636 msgid "show staged contents' object name in the output" msgstr "hiển thị tên đối tượng của nội dung được đặt lên bệ phóng ra kết xuất" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:638 msgid "show files on the filesystem that need to be removed" msgstr "hiển thị các tập tin trên hệ thống tập tin mà nó cần được gỡ bỏ" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:640 msgid "show 'other' directories' names only" msgstr "chỉ hiển thị tên của các thư mục “khác”" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:642 msgid "show line endings of files" msgstr "hiển thị kết thúc dòng của các tập tin" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:644 msgid "don't show empty directories" msgstr "không hiển thị thư mục rỗng" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:647 msgid "show unmerged files in the output" msgstr "hiển thị các tập tin chưa hòa trộn trong kết xuất" -#: builtin/ls-files.c:572 +#: builtin/ls-files.c:649 msgid "show resolve-undo information" msgstr "hiển thị thông tin resolve-undo" -#: builtin/ls-files.c:574 +#: builtin/ls-files.c:651 msgid "skip files matching pattern" msgstr "bỏ qua những tập tin khớp với một mẫu" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:654 msgid "exclude patterns are read from <file>" msgstr "mẫu loại trừ được đọc từ <tập tin>" -#: builtin/ls-files.c:580 +#: builtin/ls-files.c:657 msgid "read additional per-directory exclude patterns in <file>" msgstr "đọc thêm các mẫu ngoại trừ mỗi thư mục trong <tập tin>" -#: builtin/ls-files.c:582 +#: builtin/ls-files.c:659 msgid "add the standard git exclusions" msgstr "thêm loại trừ tiêu chuẩn kiểu git" -#: builtin/ls-files.c:586 +#: builtin/ls-files.c:663 msgid "make the output relative to the project top directory" msgstr "làm cho kết xuất liên quan đến thư mục ở mức cao nhất (gốc) của dự án" -#: builtin/ls-files.c:589 +#: builtin/ls-files.c:666 msgid "recurse through submodules" msgstr "đệ quy xuyên qua mô-đun con" -#: builtin/ls-files.c:591 +#: builtin/ls-files.c:668 msgid "if any <file> is not in the index, treat this as an error" msgstr "nếu <tập tin> bất kỳ không ở trong bảng mục lục, xử lý nó như một lỗi" -#: builtin/ls-files.c:592 +#: builtin/ls-files.c:669 msgid "tree-ish" msgstr "tree-ish" -#: builtin/ls-files.c:593 +#: builtin/ls-files.c:670 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "giả định rằng các đường dẫn đã bị gỡ bỏ kể từ <tree-ish> nay vẫn hiện diện" -#: builtin/ls-files.c:595 +#: builtin/ls-files.c:672 msgid "show debugging data" msgstr "hiển thị dữ liệu gỡ lỗi" -#: builtin/ls-files.c:597 +#: builtin/ls-files.c:674 msgid "suppress duplicate entries" msgstr "chặn các mục tin trùng lặp" @@ -17131,7 +17373,7 @@ msgstr "" msgid "do not print remote URL" msgstr "không hiển thị URL máy chủ" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399 msgid "exec" msgstr "thực thi" @@ -17199,6 +17441,55 @@ msgstr "dùng tên đường dẫn đầy đủ" msgid "list entire tree; not just current directory (implies --full-name)" msgstr "liệt kê cây mục tin; không chỉ thư mục hiện hành (ngụ ý --full-name)" +#. TRANSLATORS: keep <> in "<" mail ">" info. +#: builtin/mailinfo.c:14 +msgid "git mailinfo [<options>] <msg> <patch> < mail >info" +msgstr "git mailinfo [<các tùy chọn>] <msg> <patch> < mail >info" + +#: builtin/mailinfo.c:58 +msgid "keep subject" +msgstr "giữ lại phần chủ đề" + +#: builtin/mailinfo.c:60 +msgid "keep non patch brackets in subject" +msgstr "giữ không dấu ngoặc vá trong chủ đề" + +#: builtin/mailinfo.c:62 +msgid "copy Message-ID to the end of commit message" +msgstr "sao chép Message-ID vào cuối của ghi chú lần chuyển giao" + +#: builtin/mailinfo.c:64 +msgid "re-code metadata to i18n.commitEncoding" +msgstr "mã hóa lại siêu dữ liệu thành i18n.commitEncoding" + +#: builtin/mailinfo.c:67 +msgid "disable charset re-coding of metadata" +msgstr "vô hiệu hóa mã hóa lại bộ ký tự của siêu dữ liệu" + +#: builtin/mailinfo.c:69 +msgid "encoding" +msgstr "bảng mã" + +#: builtin/mailinfo.c:70 +msgid "re-code metadata to this encoding" +msgstr "mã hóa lại siêu dữ liệu vào bảng mã này" + +#: builtin/mailinfo.c:72 +msgid "use scissors" +msgstr "dùng \"scissor\"" + +#: builtin/mailinfo.c:73 +msgid "<action>" +msgstr "<hành động>" + +#: builtin/mailinfo.c:74 +msgid "action when quoted CR is found" +msgstr "hành động khi CR được trích dẫn được tìm thấy" + +#: builtin/mailinfo.c:77 +msgid "use headers in message's body" +msgstr "sử dụng phần đầu trong nội dung thư" + #: builtin/mailsplit.c:241 #, c-format msgid "empty mbox: '%s'" @@ -17391,7 +17682,7 @@ msgid "verify that the named commit has a valid GPG signature" msgstr "thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không" #: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114 +#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114 msgid "strategy" msgstr "chiến lược" @@ -17450,57 +17741,57 @@ msgstr "không phải là một đối tượng hợp lệ: %s" msgid "read-tree failed" msgstr "read-tree gặp lỗi" -#: builtin/merge.c:399 -msgid " (nothing to squash)" -msgstr " (không có gì để squash)" +#: builtin/merge.c:400 +msgid "Already up to date. (nothing to squash)" +msgstr "Đã cập nhật rồi. (không có gì để squash)" -#: builtin/merge.c:410 +#: builtin/merge.c:414 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Squash commit -- không cập nhật HEAD\n" -#: builtin/merge.c:460 +#: builtin/merge.c:464 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Không có lời chú thích hòa trộn -- nên không cập nhật HEAD\n" -#: builtin/merge.c:511 +#: builtin/merge.c:515 #, c-format msgid "'%s' does not point to a commit" msgstr "“%s” không chỉ đến một lần chuyển giao nào cả" -#: builtin/merge.c:598 +#: builtin/merge.c:602 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Chuỗi branch.%s.mergeoptions sai: %s" -#: builtin/merge.c:724 +#: builtin/merge.c:728 msgid "Not handling anything other than two heads merge." msgstr "Không cầm nắm gì ngoài hai head hòa trộn." -#: builtin/merge.c:737 +#: builtin/merge.c:741 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Không hiểu tùy chọn cho merge-recursive: -X%s" -#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "không thể ghi %s" -#: builtin/merge.c:808 +#: builtin/merge.c:812 #, c-format msgid "Could not read from '%s'" msgstr "Không thể đọc từ “%s”" -#: builtin/merge.c:817 +#: builtin/merge.c:821 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Vẫn chưa hòa trộn các lần chuyển giao; sử dụng lệnh “git commit” để hoàn tất " "việc hòa trộn.\n" -#: builtin/merge.c:823 +#: builtin/merge.c:827 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -17512,11 +17803,11 @@ msgstr "" "topic.\n" "\n" -#: builtin/merge.c:828 +#: builtin/merge.c:832 msgid "An empty message aborts the commit.\n" msgstr "Nếu phần chú thích rỗng sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/merge.c:831 +#: builtin/merge.c:835 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -17525,75 +17816,75 @@ msgstr "" "Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua, và nếu phần chú\n" "thích rỗng sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/merge.c:884 +#: builtin/merge.c:888 msgid "Empty commit message." msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng." -#: builtin/merge.c:899 +#: builtin/merge.c:903 #, c-format msgid "Wonderful.\n" msgstr "Tuyệt vời.\n" -#: builtin/merge.c:960 +#: builtin/merge.c:964 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao kết " "quả.\n" -#: builtin/merge.c:999 +#: builtin/merge.c:1003 msgid "No current branch." msgstr "Không phải nhánh hiện hành." -#: builtin/merge.c:1001 +#: builtin/merge.c:1005 msgid "No remote for the current branch." msgstr "Không có máy chủ cho nhánh hiện hành." -#: builtin/merge.c:1003 +#: builtin/merge.c:1007 msgid "No default upstream defined for the current branch." msgstr "Không có thượng nguồn mặc định được định nghĩa cho nhánh hiện hành." -#: builtin/merge.c:1008 +#: builtin/merge.c:1012 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Không nhánh mạng theo dõi cho %s từ %s" -#: builtin/merge.c:1065 +#: builtin/merge.c:1069 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Giá trị sai “%s” trong biến môi trường “%s”" -#: builtin/merge.c:1168 +#: builtin/merge.c:1172 #, c-format msgid "not something we can merge in %s: %s" msgstr "không phải là một thứ gì đó mà chúng tôi có thể hòa trộn trong %s: %s" -#: builtin/merge.c:1202 +#: builtin/merge.c:1206 msgid "not something we can merge" msgstr "không phải là thứ gì đó mà chúng tôi có thể hòa trộn" -#: builtin/merge.c:1312 +#: builtin/merge.c:1316 msgid "--abort expects no arguments" msgstr "--abort không nhận các đối số" -#: builtin/merge.c:1316 +#: builtin/merge.c:1320 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Ở đây không có lần hòa trộn nào được hủy bỏ giữa chừng cả (thiếu MERGE_HEAD)." -#: builtin/merge.c:1334 +#: builtin/merge.c:1338 msgid "--quit expects no arguments" msgstr "--quit không nhận các đối số" -#: builtin/merge.c:1347 +#: builtin/merge.c:1351 msgid "--continue expects no arguments" msgstr "--continue không nhận đối số" -#: builtin/merge.c:1351 +#: builtin/merge.c:1355 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ở đây không có lần hòa trộn nào đang được xử lý cả (thiếu MERGE_HEAD)." -#: builtin/merge.c:1367 +#: builtin/merge.c:1371 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17601,7 +17892,7 @@ msgstr "" "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại).\n" "Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn." -#: builtin/merge.c:1374 +#: builtin/merge.c:1378 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17609,98 +17900,90 @@ msgstr "" "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n" "Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn." -#: builtin/merge.c:1377 +#: builtin/merge.c:1381 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)." -#: builtin/merge.c:1391 +#: builtin/merge.c:1395 msgid "You cannot combine --squash with --no-ff." msgstr "Bạn không thể kết hợp --squash với --no-ff." -#: builtin/merge.c:1393 +#: builtin/merge.c:1397 msgid "You cannot combine --squash with --commit." msgstr "Bạn không thể kết hợp --squash với --commit." -#: builtin/merge.c:1409 +#: builtin/merge.c:1413 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Không chỉ ra lần chuyển giao và merge.defaultToUpstream chưa được đặt." -#: builtin/merge.c:1426 +#: builtin/merge.c:1430 msgid "Squash commit into empty head not supported yet" msgstr "Squash commit vào một head trống rỗng vẫn chưa được hỗ trợ" -#: builtin/merge.c:1428 +#: builtin/merge.c:1432 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Chuyển giao không-chuyển-tiếp-nhanh không hợp lý ở trong một head trống rỗng" -#: builtin/merge.c:1433 +#: builtin/merge.c:1437 #, c-format msgid "%s - not something we can merge" msgstr "%s - không phải là thứ gì đó mà chúng tôi có thể hòa trộn" -#: builtin/merge.c:1435 +#: builtin/merge.c:1439 msgid "Can merge only exactly one commit into empty head" msgstr "" "Không thể hòa trộn một cách đúng đắn một lần chuyển giao vào một head rỗng" -#: builtin/merge.c:1516 +#: builtin/merge.c:1520 msgid "refusing to merge unrelated histories" msgstr "từ chối hòa trộn lịch sử không liên quan" -#: builtin/merge.c:1525 -msgid "Already up to date." -msgstr "Đã cập nhật rồi." - -#: builtin/merge.c:1535 +#: builtin/merge.c:1539 #, c-format msgid "Updating %s..%s\n" msgstr "Đang cập nhật %s..%s\n" -#: builtin/merge.c:1581 +#: builtin/merge.c:1585 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Đang thử hòa trộn kiểu “trivial in-index”…\n" -#: builtin/merge.c:1588 +#: builtin/merge.c:1592 #, c-format msgid "Nope.\n" msgstr "Không.\n" -#: builtin/merge.c:1613 -msgid "Already up to date. Yeeah!" -msgstr "Đã cập nhật rồi. Yeeah!" - -#: builtin/merge.c:1619 +#: builtin/merge.c:1623 msgid "Not possible to fast-forward, aborting." msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang bỏ qua." -#: builtin/merge.c:1647 builtin/merge.c:1712 +#: builtin/merge.c:1651 builtin/merge.c:1716 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Đang tua lại cây thành thời xa xưa…\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1655 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Đang thử chiến lược hòa trộn %s…\n" -#: builtin/merge.c:1703 +#: builtin/merge.c:1707 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n" -#: builtin/merge.c:1705 +#: builtin/merge.c:1709 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n" -#: builtin/merge.c:1714 +#: builtin/merge.c:1718 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n" -#: builtin/merge.c:1728 +#: builtin/merge.c:1732 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -17711,42 +17994,42 @@ msgstr "" msgid "git mktag" msgstr "git mktag" -#: builtin/mktag.c:30 +#: builtin/mktag.c:27 #, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "cảnh báo: đầu vào thẻ không qua kiểm tra fsck: %s" -#: builtin/mktag.c:41 +#: builtin/mktag.c:38 #, c-format msgid "error: tag input does not pass fsck: %s" msgstr "lỗi: đầu vào thẻ không vượt qua fsck: %s" -#: builtin/mktag.c:44 +#: builtin/mktag.c:41 #, c-format msgid "%d (FSCK_IGNORE?) should never trigger this callback" msgstr "%d (FSCK_IGNORE?) không bao giờ nên kích hoạt cuộc gọi ngược này" -#: builtin/mktag.c:59 +#: builtin/mktag.c:56 #, c-format msgid "could not read tagged object '%s'" msgstr "không thể đọc đối tượng được đánh thẻ %s" -#: builtin/mktag.c:62 +#: builtin/mktag.c:59 #, c-format msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "đối tượng %s được đánh thẻ là %s, không phải là kiểu %s" -#: builtin/mktag.c:99 +#: builtin/mktag.c:97 msgid "tag on stdin did not pass our strict fsck check" msgstr "" "thẻ trên stdin đã không vượt qua kiểm tra fsck nghiêm ngặt của chúng tôi" -#: builtin/mktag.c:102 +#: builtin/mktag.c:100 msgid "tag on stdin did not refer to a valid object" msgstr "" "thẻ trên đầu vào tiêu chuẩn không chỉ đến một lần chuyển giao hợp lệ nào cả" -#: builtin/mktag.c:105 builtin/tag.c:232 +#: builtin/mktag.c:103 builtin/tag.c:243 msgid "unable to write tag file" msgstr "không thể ghi vào tập tin lưu thẻ" @@ -17766,19 +18049,35 @@ msgstr "cho phép thiếu đối tượng" msgid "allow creation of more than one tree" msgstr "cho phép tạo nhiều hơn một cây" -#: builtin/multi-pack-index.c:9 -msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" -msgstr "" -"git multi-pack-index [<các-tùy-chọn>] (write|verify|expire|repack --batch-" -"size=<cỡ>)" +#: builtin/multi-pack-index.c:10 +msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]" +msgstr "git multi-pack-index [<các tùy chọn>] write [--preferred-pack=<cỡ>]" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:13 +msgid "git multi-pack-index [<options>] verify" +msgstr "git multi-pack-index [<các tùy chọn>] verify" + +#: builtin/multi-pack-index.c:16 +msgid "git multi-pack-index [<options>] expire" +msgstr "git multi-pack-index [<các tùy chọn>] expire" + +#: builtin/multi-pack-index.c:19 +msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" +msgstr "git multi-pack-index [<các-tùy-chọn>] repack [--batch-size=<cỡ>]" + +#: builtin/multi-pack-index.c:54 msgid "object directory containing set of packfile and pack-index pairs" msgstr "thư mục đối tượng có chứa một bộ các tập tin gói và cặp pack-index" -#: builtin/multi-pack-index.c:29 +#: builtin/multi-pack-index.c:69 +msgid "preferred-pack" +msgstr "preferred-pack" + +#: builtin/multi-pack-index.c:70 +msgid "pack for reuse when computing a multi-pack bitmap" +msgstr "gói được sử dụng khi tính toán một \"multi-pack bitmap\"" + +#: builtin/multi-pack-index.c:128 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -17786,18 +18085,7 @@ msgstr "" "trong suốt quá trình đóng gói lại, gom các tập tin gói có kích cỡ nhỏ hơn " "vào một bó cái mà lớn hơn kích thước này" -#: builtin/multi-pack-index.c:50 builtin/notes.c:376 builtin/notes.c:431 -#: builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598 -#: builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963 -#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:575 -msgid "too many arguments" -msgstr "có quá nhiều đối số" - -#: builtin/multi-pack-index.c:60 -msgid "--batch-size option is only for 'repack' subcommand" -msgstr "tùy chọn --batch-size chỉ cho lệnh con “repack”" - -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:180 #, c-format msgid "unrecognized subcommand: %s" msgstr "không hiểu câu lệnh con: %s" @@ -17894,7 +18182,7 @@ msgstr "%s, nguồn=%s, đích=%s" msgid "Renaming %s to %s\n" msgstr "Đổi tên %s thành %s\n" -#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667 #, c-format msgid "renaming '%s' failed" msgstr "gặp lỗi khi đổi tên “%s”" @@ -18086,7 +18374,7 @@ msgstr "không thể ghi đối tượng ghi chú (note)" msgid "the note contents have been left in %s" msgstr "nội dung ghi chú còn lại %s" -#: builtin/notes.c:242 builtin/tag.c:565 +#: builtin/notes.c:242 builtin/tag.c:576 #, c-format msgid "could not open or read '%s'" msgstr "không thể mở hay đọc “%s”" @@ -18126,6 +18414,13 @@ msgstr "gặp lỗi khi sao chép ghi chú (note) từ “%s” sang “%s”" msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "từ chối %s ghi chú trong %s (nằm ngoài refs/notes/)" +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 +#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 +#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 +#: builtin/prune-packed.c:25 builtin/tag.c:586 +msgid "too many arguments" +msgstr "có quá nhiều đối số" + #: builtin/notes.c:389 builtin/notes.c:678 #, c-format msgid "no note found for object %s." @@ -18314,7 +18609,7 @@ msgstr "" "chuyển giao kết quả bằng “git notes merge --commit”, hoặc bãi bỏ việc hòa " "trộn bằng “git notes merge --abort”.\n" -#: builtin/notes.c:897 builtin/tag.c:578 +#: builtin/notes.c:897 builtin/tag.c:589 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ." @@ -18348,7 +18643,7 @@ msgstr "notes-ref" msgid "use notes from <notes-ref>" msgstr "dùng “notes” từ <notes-ref>" -#: builtin/notes.c:1034 builtin/stash.c:1671 +#: builtin/notes.c:1034 builtin/stash.c:1739 #, c-format msgid "unknown subcommand: %s" msgstr "không hiểu câu lệnh con: %s" @@ -18419,65 +18714,65 @@ msgstr "gặp lỗi khi lấy thông tin thống kê về %s" msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "đã ghi %<PRIu32> đối tượng trong khi cần %<PRIu32>" -#: builtin/pack-objects.c:1358 +#: builtin/pack-objects.c:1383 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "tắt ghi bitmap, như vậy một số đối tượng sẽ không được đóng gói" -#: builtin/pack-objects.c:1806 +#: builtin/pack-objects.c:1831 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "khoảng bù cơ sở cho delta bị tràn trong gói cho %s" -#: builtin/pack-objects.c:1815 +#: builtin/pack-objects.c:1840 #, c-format msgid "delta base offset out of bound for %s" msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm cho %s" -#: builtin/pack-objects.c:2096 +#: builtin/pack-objects.c:2121 msgid "Counting objects" msgstr "Đang đếm các đối tượng" -#: builtin/pack-objects.c:2241 +#: builtin/pack-objects.c:2266 #, c-format msgid "unable to parse object header of %s" msgstr "không thể phân tích phần đầu đối tượng của “%s”" -#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327 -#: builtin/pack-objects.c:2337 +#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352 +#: builtin/pack-objects.c:2362 #, c-format msgid "object %s cannot be read" msgstr "không thể đọc đối tượng %s" -#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341 +#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "đối tượng %s không nhất quán về chiều dài đối tượng (%<PRIuMAX> so với " "%<PRIuMAX>)" -#: builtin/pack-objects.c:2351 +#: builtin/pack-objects.c:2376 msgid "suboptimal pack - out of memory" msgstr "suboptimal pack - hết bộ nhớ" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2691 #, c-format msgid "Delta compression using up to %d threads" msgstr "Nén delta dùng tới %d tuyến trình" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:2830 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "không thể đóng gói các đối tượng tiếp cận được từ thẻ “%s”" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2916 msgid "Compressing objects" msgstr "Đang nén các đối tượng" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2922 msgid "inconsistency with delta count" msgstr "mâu thuẫn với số lượng delta" -#: builtin/pack-objects.c:2976 +#: builtin/pack-objects.c:3001 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -18486,7 +18781,7 @@ msgstr "" "giá trị của uploadpack.blobpackfileuri phải có dạng “<object-hash> <pack-" "hash> <uri>” (nhận “%s”)" -#: builtin/pack-objects.c:2979 +#: builtin/pack-objects.c:3004 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" @@ -18494,7 +18789,17 @@ msgstr "" "đối tượng đã được cấu hình trong một uploadpack.blobpackfileuri khác (đã " "nhận “%s”)" -#: builtin/pack-objects.c:3008 +#: builtin/pack-objects.c:3039 +#, c-format +msgid "could not get type of object %s in pack %s" +msgstr "không thể lấy kiểu của đối tượng “%s” trong gói “%s”" + +#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175 +#, c-format +msgid "could not find pack '%s'" +msgstr "không thể tìm thấy gói “%s”" + +#: builtin/pack-objects.c:3218 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18503,7 +18808,7 @@ msgstr "" "cần ID đối tượng cạnh, nhận được rác:\n" " %s" -#: builtin/pack-objects.c:3014 +#: builtin/pack-objects.c:3224 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18512,236 +18817,248 @@ msgstr "" "cần ID đối tượng, nhận được rác:\n" " %s" -#: builtin/pack-objects.c:3112 +#: builtin/pack-objects.c:3322 msgid "invalid value for --missing" msgstr "giá trị cho --missing không hợp lệ" -#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279 +#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490 msgid "cannot open pack index" msgstr "không thể mở mục lục của gói" -#: builtin/pack-objects.c:3202 +#: builtin/pack-objects.c:3412 #, c-format msgid "loose object at %s could not be examined" msgstr "đối tượng mất tại %s không thể đã kiểm tra" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3498 msgid "unable to force loose object" msgstr "không thể buộc mất đối tượng" -#: builtin/pack-objects.c:3380 +#: builtin/pack-objects.c:3628 #, c-format msgid "not a rev '%s'" msgstr "không phải một rev “%s”" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3631 #, c-format msgid "bad revision '%s'" msgstr "điểm xem xét sai “%s”" -#: builtin/pack-objects.c:3408 +#: builtin/pack-objects.c:3659 msgid "unable to add recent objects" msgstr "không thể thêm các đối tượng mới dùng" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3712 #, c-format msgid "unsupported index version %s" msgstr "phiên bản mục lục không được hỗ trợ %s" -#: builtin/pack-objects.c:3465 +#: builtin/pack-objects.c:3716 #, c-format msgid "bad index version '%s'" msgstr "phiên bản mục lục sai “%s”" -#: builtin/pack-objects.c:3503 +#: builtin/pack-objects.c:3755 msgid "<version>[,<offset>]" msgstr "<phiên bản>[,offset]" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3756 msgid "write the pack index file in the specified idx format version" msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho" -#: builtin/pack-objects.c:3507 +#: builtin/pack-objects.c:3759 msgid "maximum size of each output pack file" msgstr "kcíh thước tối đa cho tập tin gói được tạo" -#: builtin/pack-objects.c:3509 +#: builtin/pack-objects.c:3761 msgid "ignore borrowed objects from alternate object store" msgstr "bỏ qua các đối tượng vay mượn từ kho đối tượng thay thế" -#: builtin/pack-objects.c:3511 +#: builtin/pack-objects.c:3763 msgid "ignore packed objects" msgstr "bỏ qua các đối tượng đóng gói" -#: builtin/pack-objects.c:3513 +#: builtin/pack-objects.c:3765 msgid "limit pack window by objects" msgstr "giới hạn cửa sổ đóng gói theo đối tượng" -#: builtin/pack-objects.c:3515 +#: builtin/pack-objects.c:3767 msgid "limit pack window by memory in addition to object limit" msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng" -#: builtin/pack-objects.c:3517 +#: builtin/pack-objects.c:3769 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "độ dài tối đa của chuỗi móc xích “delta” được phép trong gói kết quả" -#: builtin/pack-objects.c:3519 +#: builtin/pack-objects.c:3771 msgid "reuse existing deltas" msgstr "dùng lại các delta sẵn có" -#: builtin/pack-objects.c:3521 +#: builtin/pack-objects.c:3773 msgid "reuse existing objects" msgstr "dùng lại các đối tượng sẵn có" -#: builtin/pack-objects.c:3523 +#: builtin/pack-objects.c:3775 msgid "use OFS_DELTA objects" msgstr "dùng các đối tượng OFS_DELTA" -#: builtin/pack-objects.c:3525 +#: builtin/pack-objects.c:3777 msgid "use threads when searching for best delta matches" msgstr "sử dụng các tuyến trình khi tìm kiếm cho các mẫu khớp delta tốt nhất" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3779 msgid "do not create an empty pack output" msgstr "không thể tạo kết xuất gói trống rỗng" -#: builtin/pack-objects.c:3529 +#: builtin/pack-objects.c:3781 msgid "read revision arguments from standard input" msgstr "đọc tham số “revision” từ thiết bị nhập chuẩn" -#: builtin/pack-objects.c:3531 +#: builtin/pack-objects.c:3783 msgid "limit the objects to those that are not yet packed" msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3786 msgid "include objects reachable from any reference" msgstr "bao gồm các đối tượng có thể đọc được từ bất kỳ tham chiếu nào" -#: builtin/pack-objects.c:3537 +#: builtin/pack-objects.c:3789 msgid "include objects referred by reflog entries" msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog" -#: builtin/pack-objects.c:3540 +#: builtin/pack-objects.c:3792 msgid "include objects referred to by the index" msgstr "bao gồm các đối tượng được tham chiếu bởi mục lục" -#: builtin/pack-objects.c:3543 +#: builtin/pack-objects.c:3795 +msgid "read packs from stdin" +msgstr "đọc các gói từ đầu vào tiêu chuẩn" + +#: builtin/pack-objects.c:3797 msgid "output pack to stdout" msgstr "xuất gói ra đầu ra tiêu chuẩn" -#: builtin/pack-objects.c:3545 +#: builtin/pack-objects.c:3799 msgid "include tag objects that refer to objects to be packed" msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói" -#: builtin/pack-objects.c:3547 +#: builtin/pack-objects.c:3801 msgid "keep unreachable objects" msgstr "giữ lại các đối tượng không thể đọc được" -#: builtin/pack-objects.c:3549 +#: builtin/pack-objects.c:3803 msgid "pack loose unreachable objects" msgstr "pack mất các đối tượng không thể đọc được" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3805 msgid "unpack unreachable objects newer than <time>" msgstr "" "xả nén (gỡ khỏi gói) các đối tượng không thể đọc được mới hơn <thời-gian>" -#: builtin/pack-objects.c:3554 +#: builtin/pack-objects.c:3808 msgid "use the sparse reachability algorithm" msgstr "sử dụng thuật toán “sparse reachability”" -#: builtin/pack-objects.c:3556 +#: builtin/pack-objects.c:3810 msgid "create thin packs" msgstr "tạo gói nhẹ" -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3812 msgid "create packs suitable for shallow fetches" msgstr "tạo gói để phù hợp cho lấy về nông (shallow)" -#: builtin/pack-objects.c:3560 +#: builtin/pack-objects.c:3814 msgid "ignore packs that have companion .keep file" msgstr "bỏ qua các gói mà nó có tập tin .keep đi kèm" -#: builtin/pack-objects.c:3562 +#: builtin/pack-objects.c:3816 msgid "ignore this pack" msgstr "bỏ qua gói này" -#: builtin/pack-objects.c:3564 +#: builtin/pack-objects.c:3818 msgid "pack compression level" msgstr "mức nén gói" -#: builtin/pack-objects.c:3566 +#: builtin/pack-objects.c:3820 msgid "do not hide commits by grafts" msgstr "không ẩn các lần chuyển giao bởi “grafts”" -#: builtin/pack-objects.c:3568 +#: builtin/pack-objects.c:3822 msgid "use a bitmap index if available to speed up counting objects" msgstr "dùng mục lục ánh xạ nếu có thể được để nâng cao tốc độ đếm đối tượng" -#: builtin/pack-objects.c:3570 +#: builtin/pack-objects.c:3824 msgid "write a bitmap index together with the pack index" msgstr "ghi một mục lục ánh xạ cùng với mục lục gói" -#: builtin/pack-objects.c:3574 +#: builtin/pack-objects.c:3828 msgid "write a bitmap index if possible" msgstr "ghi mục lục ánh xạ nếu được" -#: builtin/pack-objects.c:3578 +#: builtin/pack-objects.c:3832 msgid "handling for missing objects" msgstr "xử lý cho thiếu đối tượng" -#: builtin/pack-objects.c:3581 +#: builtin/pack-objects.c:3835 msgid "do not pack objects in promisor packfiles" msgstr "không thể đóng gói các đối tượng trong các tập tin gói hứa hẹn" -#: builtin/pack-objects.c:3583 +#: builtin/pack-objects.c:3837 msgid "respect islands during delta compression" msgstr "tôn trọng island trong suốt quá trình nén “delta”" -#: builtin/pack-objects.c:3585 +#: builtin/pack-objects.c:3839 msgid "protocol" msgstr "giao thức" -#: builtin/pack-objects.c:3586 +#: builtin/pack-objects.c:3840 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "loại trừ bất kỳ cấu hình uploadpack.blobpackfileuri với giao thức này" -#: builtin/pack-objects.c:3617 +#: builtin/pack-objects.c:3873 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "mức sau xích delta %d là quá sâu, buộc dùng %d" -#: builtin/pack-objects.c:3622 +#: builtin/pack-objects.c:3878 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit là quá cao, ép dùng %d" -#: builtin/pack-objects.c:3676 +#: builtin/pack-objects.c:3934 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size không thể được sử dụng để xây dựng một gói để vận chuyển" -#: builtin/pack-objects.c:3678 +#: builtin/pack-objects.c:3936 msgid "minimum pack size limit is 1 MiB" msgstr "giới hạn kích thước tối thiểu của gói là 1 MiB" -#: builtin/pack-objects.c:3683 +#: builtin/pack-objects.c:3941 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin không thể được dùng để xây dựng gói đánh mục lục được" -#: builtin/pack-objects.c:3686 +#: builtin/pack-objects.c:3944 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable và --unpack-unreachable xung khắc nhau" -#: builtin/pack-objects.c:3692 +#: builtin/pack-objects.c:3950 msgid "cannot use --filter without --stdout" msgstr "không thể dùng tùy chọn --filter mà không có --stdout" -#: builtin/pack-objects.c:3752 +#: builtin/pack-objects.c:3952 +msgid "cannot use --filter with --stdin-packs" +msgstr "không thể dùng tùy chọn --filter với --stdin-packs" + +#: builtin/pack-objects.c:3956 +msgid "cannot use internal rev list with --stdin-packs" +msgstr "không thể dùng danh sách rev bên trong với --stdin-packs" + +#: builtin/pack-objects.c:4015 msgid "Enumerating objects" msgstr "Đánh số các đối tượng" -#: builtin/pack-objects.c:3783 +#: builtin/pack-objects.c:4052 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -18821,11 +19138,11 @@ msgstr "Các tùy chọn liên quan đến hòa trộn" msgid "incorporate changes by rebasing rather than merging" msgstr "các thay đổi hợp nhất bằng cải tổ thay vì hòa trộn" -#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126 msgid "allow fast-forward" msgstr "cho phép chuyển-tiếp-nhanh" -#: builtin/pull.c:167 parse-options.h:339 +#: builtin/pull.c:167 parse-options.h:340 msgid "automatically stash/stash pop before and after" msgstr "tự động stash/stash pop trước và sau" @@ -18882,7 +19199,7 @@ msgstr "" "theo mặc định cho nhánh hiện tại của bạn, bạn phải chỉ định\n" "một nhánh trên dòng lệnh." -#: builtin/pull.c:456 builtin/rebase.c:1253 +#: builtin/pull.c:456 builtin/rebase.c:1248 msgid "You are not currently on a branch." msgstr "Hiện tại bạn chẳng ở nhánh nào cả." @@ -18899,7 +19216,7 @@ msgid "See git-pull(1) for details." msgstr "Xem git-pull(1) để biết thêm chi tiết." #: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 -#: builtin/rebase.c:1259 +#: builtin/rebase.c:1254 msgid "<remote>" msgstr "<máy chủ>" @@ -18907,7 +19224,7 @@ msgstr "<máy chủ>" msgid "<branch>" msgstr "<nhánh>" -#: builtin/pull.c:471 builtin/rebase.c:1251 +#: builtin/pull.c:471 builtin/rebase.c:1246 msgid "There is no tracking information for the current branch." msgstr "Ở đây không có thông tin theo dõi cho nhánh hiện hành." @@ -19347,10 +19664,6 @@ msgstr "git range-diff [<các tùy chọn>] <old-tip>…<new-tip>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<các tùy chọn>] <base> <old-tip> <new-tip>" -#: builtin/range-diff.c:28 -msgid "Percentage by which creation is weighted" -msgstr "Tỷ lệ phần trăm cái tạo là weighted" - #: builtin/range-diff.c:30 msgid "use simple diff colors" msgstr "dùng màu diff đơn giản" @@ -19487,188 +19800,188 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246 +#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245 #, c-format msgid "unusable todo list: '%s'" msgstr "danh sách cần làm không dùng được: “%s”" -#: builtin/rebase.c:312 +#: builtin/rebase.c:311 #, c-format msgid "could not create temporary %s" msgstr "không thể tạo %s tạm thời" -#: builtin/rebase.c:318 +#: builtin/rebase.c:317 msgid "could not mark as interactive" msgstr "không thể đánh dấu là tương tác" -#: builtin/rebase.c:371 +#: builtin/rebase.c:370 msgid "could not generate todo list" msgstr "không thể tạo danh sách cần làm" -#: builtin/rebase.c:413 +#: builtin/rebase.c:412 msgid "a base commit must be provided with --upstream or --onto" msgstr "lần chuyển giao cơ sỏ phải được chỉ định với --upstream hoặc --onto" -#: builtin/rebase.c:482 +#: builtin/rebase.c:481 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<các tùy chọn>]" -#: builtin/rebase.c:495 builtin/rebase.c:1394 +#: builtin/rebase.c:494 builtin/rebase.c:1389 msgid "keep commits which start empty" msgstr "bỏ qua các lần chuyển giao mà nó bắt đầu trống rỗng" -#: builtin/rebase.c:499 builtin/revert.c:128 +#: builtin/rebase.c:498 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "chấp nhận chuyển giao mà không ghi chú gì" -#: builtin/rebase.c:501 +#: builtin/rebase.c:500 msgid "rebase merge commits" msgstr "cải tổ các lần chuyển giao hòa trộn" -#: builtin/rebase.c:503 +#: builtin/rebase.c:502 msgid "keep original branch points of cousins" msgstr "giữ các điểm nhánh nguyên bản của các anh em họ" -#: builtin/rebase.c:505 +#: builtin/rebase.c:504 msgid "move commits that begin with squash!/fixup!" msgstr "di chuyển các lần chuyển giao bắt đầu bằng squash!/fixup!" -#: builtin/rebase.c:506 +#: builtin/rebase.c:505 msgid "sign commits" msgstr "ký các lần chuyển giao" -#: builtin/rebase.c:508 builtin/rebase.c:1333 +#: builtin/rebase.c:507 builtin/rebase.c:1328 msgid "display a diffstat of what changed upstream" msgstr "hiển thị một diffstat của những thay đổi thượng nguồn" -#: builtin/rebase.c:510 +#: builtin/rebase.c:509 msgid "continue rebase" msgstr "tiếp tục cải tổ" -#: builtin/rebase.c:512 +#: builtin/rebase.c:511 msgid "skip commit" msgstr "bỏ qua lần chuyển giao" -#: builtin/rebase.c:513 +#: builtin/rebase.c:512 msgid "edit the todo list" msgstr "sửa danh sách cần làm" -#: builtin/rebase.c:515 +#: builtin/rebase.c:514 msgid "show the current patch" msgstr "hiển thị miếng vá hiện hành" -#: builtin/rebase.c:518 +#: builtin/rebase.c:517 msgid "shorten commit ids in the todo list" msgstr "rút ngắn mã chuyển giao trong danh sách cần làm" -#: builtin/rebase.c:520 +#: builtin/rebase.c:519 msgid "expand commit ids in the todo list" msgstr "khai triển mã chuyển giao trong danh sách cần làm" -#: builtin/rebase.c:522 +#: builtin/rebase.c:521 msgid "check the todo list" msgstr "kiểm tra danh sách cần làm" -#: builtin/rebase.c:524 +#: builtin/rebase.c:523 msgid "rearrange fixup/squash lines" msgstr "sắp xếp lại các dòng fixup/squash" -#: builtin/rebase.c:526 +#: builtin/rebase.c:525 msgid "insert exec commands in todo list" msgstr "chèn các lệnh thực thi trong danh sách cần làm" -#: builtin/rebase.c:527 +#: builtin/rebase.c:526 msgid "onto" msgstr "lên trên" -#: builtin/rebase.c:530 +#: builtin/rebase.c:529 msgid "restrict-revision" msgstr "điểm-xét-duyệt-hạn-chế" -#: builtin/rebase.c:530 +#: builtin/rebase.c:529 msgid "restrict revision" msgstr "điểm xét duyệt hạn chế" -#: builtin/rebase.c:532 +#: builtin/rebase.c:531 msgid "squash-onto" msgstr "squash-lên-trên" -#: builtin/rebase.c:533 +#: builtin/rebase.c:532 msgid "squash onto" msgstr "squash lên trên" -#: builtin/rebase.c:535 +#: builtin/rebase.c:534 msgid "the upstream commit" msgstr "lần chuyển giao thượng nguồn" -#: builtin/rebase.c:537 +#: builtin/rebase.c:536 msgid "head-name" msgstr "tên-đầu" -#: builtin/rebase.c:537 +#: builtin/rebase.c:536 msgid "head name" msgstr "tên đầu" -#: builtin/rebase.c:542 +#: builtin/rebase.c:541 msgid "rebase strategy" msgstr "chiến lược cải tổ" -#: builtin/rebase.c:543 +#: builtin/rebase.c:542 msgid "strategy-opts" msgstr "tùy-chọn-chiến-lược" -#: builtin/rebase.c:544 +#: builtin/rebase.c:543 msgid "strategy options" msgstr "các tùy chọn chiến lược" -#: builtin/rebase.c:545 +#: builtin/rebase.c:544 msgid "switch-to" msgstr "chuyển-đến" -#: builtin/rebase.c:546 +#: builtin/rebase.c:545 msgid "the branch or commit to checkout" msgstr "nhánh hay lần chuyển giao lần lấy ra" -#: builtin/rebase.c:547 +#: builtin/rebase.c:546 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:547 +#: builtin/rebase.c:546 msgid "onto name" msgstr "tên lên trên" -#: builtin/rebase.c:548 +#: builtin/rebase.c:547 msgid "cmd" msgstr "lệnh" -#: builtin/rebase.c:548 +#: builtin/rebase.c:547 msgid "the command to run" msgstr "lệnh muốn chạy" -#: builtin/rebase.c:551 builtin/rebase.c:1427 +#: builtin/rebase.c:550 builtin/rebase.c:1422 msgid "automatically re-schedule any `exec` that fails" msgstr "lập lịch lại một cách tự động bất kỳ “exec“ bị lỗi" -#: builtin/rebase.c:567 +#: builtin/rebase.c:566 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins không có tác dụng khi không có --rebase-merges" -#: builtin/rebase.c:583 +#: builtin/rebase.c:582 #, c-format msgid "%s requires the merge backend" msgstr "%s cần một ứng dụng hòa trộn chạy phía sau" -#: builtin/rebase.c:626 +#: builtin/rebase.c:625 #, c-format msgid "could not get 'onto': '%s'" msgstr "không thể đặt lấy “onto”: “%s”" -#: builtin/rebase.c:643 +#: builtin/rebase.c:642 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head không hợp lệ: “%s”" -#: builtin/rebase.c:668 +#: builtin/rebase.c:667 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "đang bỏ qua allow_rerere_autoupdate không hợp lệ: “%s”" @@ -19707,7 +20020,7 @@ msgstr "" "\n" "Kết quả là git không thể cải tổ lại chúng." -#: builtin/rebase.c:1227 +#: builtin/rebase.c:1222 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -19716,7 +20029,7 @@ msgstr "" "kiểu rỗng không được nhận dạng “%s”; giá trị hợp lệ là \"drop\", \"keep\", " "và \"ask\"." -#: builtin/rebase.c:1245 +#: builtin/rebase.c:1240 #, c-format msgid "" "%s\n" @@ -19733,7 +20046,7 @@ msgstr "" " git rebase “<nhánh>”\n" "\n" -#: builtin/rebase.c:1261 +#: builtin/rebase.c:1256 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -19747,196 +20060,188 @@ msgstr "" " git branch --set-upstream-to=%s/<nhánh> %s\n" "\n" -#: builtin/rebase.c:1291 +#: builtin/rebase.c:1286 msgid "exec commands cannot contain newlines" msgstr "các lệnh thực thi không thể chứa các ký tự dòng mới" -#: builtin/rebase.c:1295 +#: builtin/rebase.c:1290 msgid "empty exec command" msgstr "lệnh thực thi trống rỗng" -#: builtin/rebase.c:1324 +#: builtin/rebase.c:1319 msgid "rebase onto given branch instead of upstream" msgstr "cải tổ vào nhánh đã cho thay cho thượng nguồn" -#: builtin/rebase.c:1326 +#: builtin/rebase.c:1321 msgid "use the merge-base of upstream and branch as the current base" msgstr "" "sử dụng các cơ sở hòa trộn của thượng nguồn và nhánh như là cơ sở hiện tại" -#: builtin/rebase.c:1328 +#: builtin/rebase.c:1323 msgid "allow pre-rebase hook to run" msgstr "cho phép móc (hook) pre-rebase được chạy" -#: builtin/rebase.c:1330 +#: builtin/rebase.c:1325 msgid "be quiet. implies --no-stat" msgstr "hãy im lặng. ý là --no-stat" -#: builtin/rebase.c:1336 +#: builtin/rebase.c:1331 msgid "do not show diffstat of what changed upstream" msgstr "đừng hiển thị diffstat của những thay đổi thượng nguồn" -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1334 msgid "add a Signed-off-by trailer to each commit" msgstr "thêm dòng Signed-off-by vào cuối cho từng lần chuyển giao" -#: builtin/rebase.c:1342 +#: builtin/rebase.c:1337 msgid "make committer date match author date" msgstr "làm ngày tháng chuyển giao khớp với ngày của tác giả" -#: builtin/rebase.c:1344 +#: builtin/rebase.c:1339 msgid "ignore author date and use current date" msgstr "bỏ qua ngày tác giả và sử dụng ngày tháng hiện tại" -#: builtin/rebase.c:1346 +#: builtin/rebase.c:1341 msgid "synonym of --reset-author-date" msgstr "đồng nghĩa với --reset-author-date" -#: builtin/rebase.c:1348 builtin/rebase.c:1352 +#: builtin/rebase.c:1343 builtin/rebase.c:1347 msgid "passed to 'git apply'" msgstr "chuyển cho “git apply”" -#: builtin/rebase.c:1350 +#: builtin/rebase.c:1345 msgid "ignore changes in whitespace" msgstr "lờ đi sự thay đổi do khoảng trắng gây ra" -#: builtin/rebase.c:1354 builtin/rebase.c:1357 +#: builtin/rebase.c:1349 builtin/rebase.c:1352 msgid "cherry-pick all commits, even if unchanged" msgstr "" "cherry-pick tất cả các lần chuyển giao, ngay cả khi không có thay đổi gì" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1354 msgid "continue" msgstr "tiếp tục" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1357 msgid "skip current patch and continue" msgstr "bỏ qua miếng vá hiện hành và tiếp tục" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1359 msgid "abort and check out the original branch" msgstr "bãi bỏ và lấy ra nhánh nguyên thủy" -#: builtin/rebase.c:1367 +#: builtin/rebase.c:1362 msgid "abort but keep HEAD where it is" msgstr "bãi bỏ nhưng vẫn vẫn giữ HEAD chỉ đến nó" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1363 msgid "edit the todo list during an interactive rebase" msgstr "sửa danh sách cần làm trong quá trình “rebase” (cải tổ) tương tác" -#: builtin/rebase.c:1371 +#: builtin/rebase.c:1366 msgid "show the patch file being applied or merged" msgstr "hiển thị miếng vá đã được áp dụng hay hòa trộn" -#: builtin/rebase.c:1374 +#: builtin/rebase.c:1369 msgid "use apply strategies to rebase" msgstr "dùng chiến lược áp dụng để cải tổ" -#: builtin/rebase.c:1378 +#: builtin/rebase.c:1373 msgid "use merging strategies to rebase" msgstr "dùng chiến lược hòa trộn để cải tổ" -#: builtin/rebase.c:1382 +#: builtin/rebase.c:1377 msgid "let the user edit the list of commits to rebase" msgstr "để người dùng sửa danh sách các lần chuyển giao muốn cải tổ" -#: builtin/rebase.c:1386 +#: builtin/rebase.c:1381 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(ĐÃ LẠC HẬU) hay thử tạo lại các hòa trộn thay vì bỏ qua chúng" -#: builtin/rebase.c:1391 +#: builtin/rebase.c:1386 msgid "how to handle commits that become empty" msgstr "xử lý các lần chuyển giao mà nó trở thành trống rỗng như thế nào" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1393 msgid "move commits that begin with squash!/fixup! under -i" msgstr "di chuyển các lần chuyển giao mà bắt đầu bằng squash!/fixup! dưới -i" -#: builtin/rebase.c:1405 +#: builtin/rebase.c:1400 msgid "add exec lines after each commit of the editable list" msgstr "thêm các dòng thực thi sau từng lần chuyển giao của danh sách sửa được" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1404 msgid "allow rebasing commits with empty messages" msgstr "chấp nhận cải tổ các chuyển giao mà không ghi chú gì" -#: builtin/rebase.c:1413 +#: builtin/rebase.c:1408 msgid "try to rebase merges instead of skipping them" msgstr "cố thử cải tổ các hòa trộn thay vì bỏ qua chúng" -#: builtin/rebase.c:1416 +#: builtin/rebase.c:1411 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "dùng “merge-base --fork-point” để định nghĩa lại thượng nguồn" -#: builtin/rebase.c:1418 +#: builtin/rebase.c:1413 msgid "use the given merge strategy" msgstr "dùng chiến lược hòa trộn đã cho" -#: builtin/rebase.c:1420 builtin/revert.c:115 +#: builtin/rebase.c:1415 builtin/revert.c:115 msgid "option" msgstr "tùy chọn" -#: builtin/rebase.c:1421 +#: builtin/rebase.c:1416 msgid "pass the argument through to the merge strategy" msgstr "chuyển thao số đến chiến lược hòa trộn" -#: builtin/rebase.c:1424 +#: builtin/rebase.c:1419 msgid "rebase all reachable commits up to the root(s)" msgstr "cải tổ tất các các lần chuyển giao cho đến root" -#: builtin/rebase.c:1429 +#: builtin/rebase.c:1424 msgid "apply all changes, even those already present upstream" msgstr "" "áp dụng mọi thay đổi, ngay cả khi những thứ đó đã sẵn có ở thượng nguồn" -#: builtin/rebase.c:1446 -msgid "" -"the rebase.useBuiltin support has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"việc hỗ trợ rebase.useBuiltin đã bị xóa!\n" -"Xem mục tin của nó trong “ git help config” để biết chi tiết." - -#: builtin/rebase.c:1452 +#: builtin/rebase.c:1442 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" "Hình như đang trong quá trình thực hiện lệnh “git-am”. Không thể rebase." -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1483 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges đã lạc hậu. Hãy dùng --rebase-merges để thay " "thế." -#: builtin/rebase.c:1498 +#: builtin/rebase.c:1488 msgid "cannot combine '--keep-base' with '--onto'" msgstr "không thể kết hợp “--keep-base” với “--onto”" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1490 msgid "cannot combine '--keep-base' with '--root'" msgstr "không thể kết hợp “--keep-base” với “--root”" -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1494 msgid "cannot combine '--root' with '--fork-point'" msgstr "không thể kết hợp “--root” với “--fork-point”" -#: builtin/rebase.c:1507 +#: builtin/rebase.c:1497 msgid "No rebase in progress?" msgstr "Không có tiến trình rebase nào phải không?" -#: builtin/rebase.c:1511 +#: builtin/rebase.c:1501 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Hành động “--edit-todo” chỉ có thể dùng trong quá trình “rebase” (sửa lịch " "sử) tương tác." -#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "Không thể đọc HEAD" -#: builtin/rebase.c:1546 +#: builtin/rebase.c:1536 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -19944,16 +20249,16 @@ msgstr "" "Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n" "đó đánh dấu chúng là cần xử lý sử dụng lệnh git add" -#: builtin/rebase.c:1565 +#: builtin/rebase.c:1555 msgid "could not discard worktree changes" msgstr "không thể loại bỏ các thay đổi cây-làm-việc" -#: builtin/rebase.c:1584 +#: builtin/rebase.c:1574 #, c-format msgid "could not move back to %s" msgstr "không thể quay trở lại %s" -#: builtin/rebase.c:1630 +#: builtin/rebase.c:1620 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -19974,132 +20279,132 @@ msgstr "" "và chạy TÔI lần nữa. TÔI dừng lại trong trường hợp bạn vẫn\n" "có một số thứ quý giá ở đây.\n" -#: builtin/rebase.c:1658 +#: builtin/rebase.c:1648 msgid "switch `C' expects a numerical value" msgstr "tùy chọn “%c” cần một giá trị bằng số" -#: builtin/rebase.c:1700 +#: builtin/rebase.c:1690 #, c-format msgid "Unknown mode: %s" msgstr "Không hiểu chế độ: %s" -#: builtin/rebase.c:1739 +#: builtin/rebase.c:1729 msgid "--strategy requires --merge or --interactive" msgstr "--strategy cần --merge hay --interactive" -#: builtin/rebase.c:1769 +#: builtin/rebase.c:1759 msgid "cannot combine apply options with merge options" msgstr "không thể tổ hợp các tùy chọn áp dụng với các tùy chọn hòa trộn" -#: builtin/rebase.c:1782 +#: builtin/rebase.c:1772 #, c-format msgid "Unknown rebase backend: %s" msgstr "Không hiểu ứng dụng chạy phía sau lệnh cải tổ: %s" -#: builtin/rebase.c:1812 +#: builtin/rebase.c:1802 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec cần --exec hay --interactive" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1822 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "không thể kết hợp “--preserve-merges” với “--rebase-merges”" -#: builtin/rebase.c:1836 +#: builtin/rebase.c:1826 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "không thể kết hợp “--preserve-merges” với “--reschedule-failed-exec”" -#: builtin/rebase.c:1860 +#: builtin/rebase.c:1850 #, c-format msgid "invalid upstream '%s'" msgstr "thượng nguồn không hợp lệ “%s”" -#: builtin/rebase.c:1866 +#: builtin/rebase.c:1856 msgid "Could not create new root commit" msgstr "Không thể tạo lần chuyển giao gốc mới" -#: builtin/rebase.c:1892 +#: builtin/rebase.c:1882 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "“%s”: cần chính xác một cơ sở hòa trộn với nhánh" -#: builtin/rebase.c:1895 +#: builtin/rebase.c:1885 #, c-format msgid "'%s': need exactly one merge base" msgstr "“%s”: cần chính xác một cơ sở hòa trộn" -#: builtin/rebase.c:1903 +#: builtin/rebase.c:1893 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Không chỉ đến một lần chuyển giao không hợp lệ “%s”" -#: builtin/rebase.c:1931 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "nghiêm trọng: không có nhánh/lần chuyển giao “%s” như thế" -#: builtin/rebase.c:1939 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:2414 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2415 #, c-format msgid "No such ref: %s" msgstr "Không có tham chiếu nào như thế: %s" -#: builtin/rebase.c:1950 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" msgstr "Không thể phân giải lần chuyển giao HEAD đến một điểm xét duyệt" -#: builtin/rebase.c:1971 +#: builtin/rebase.c:1961 msgid "Please commit or stash them." msgstr "Xin hãy chuyển giao hoặc tạm cất (stash) chúng." -#: builtin/rebase.c:2007 +#: builtin/rebase.c:1997 #, c-format msgid "could not switch to %s" msgstr "không thể chuyển đến %s" -#: builtin/rebase.c:2018 +#: builtin/rebase.c:2008 msgid "HEAD is up to date." msgstr "HEAD đã cập nhật." -#: builtin/rebase.c:2020 +#: builtin/rebase.c:2010 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Nhánh hiện tại %s đã được cập nhật rồi.\n" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:2018 msgid "HEAD is up to date, rebase forced." msgstr "HEAD hiện đã được cập nhật rồi, bị ép buộc rebase." -#: builtin/rebase.c:2030 +#: builtin/rebase.c:2020 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Nhánh hiện tại %s đã được cập nhật rồi, lệnh rebase ép buộc.\n" -#: builtin/rebase.c:2038 +#: builtin/rebase.c:2028 msgid "The pre-rebase hook refused to rebase." msgstr "Móc (hook) pre-rebase từ chối rebase." -#: builtin/rebase.c:2045 +#: builtin/rebase.c:2035 #, c-format msgid "Changes to %s:\n" msgstr "Thay đổi thành %s:\n" -#: builtin/rebase.c:2048 +#: builtin/rebase.c:2038 #, c-format msgid "Changes from %s to %s:\n" msgstr "Thay đổi từ %s thành %s:\n" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:2063 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…\n" -#: builtin/rebase.c:2082 +#: builtin/rebase.c:2072 msgid "Could not detach HEAD" msgstr "Không thể tách rời HEAD" -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2081 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Chuyển-tiếp-nhanh %s đến %s.\n" @@ -20159,11 +20464,11 @@ msgstr "" "\n" "Để chấm dứt lời nhắn này, bạn hãy đặt nó thành “refuse”." -#: builtin/receive-pack.c:2481 +#: builtin/receive-pack.c:2479 msgid "quiet" msgstr "im lặng" -#: builtin/receive-pack.c:2495 +#: builtin/receive-pack.c:2493 msgid "You must specify a directory." msgstr "Bạn phải chỉ định thư mục." @@ -20398,7 +20703,7 @@ msgstr "" "\t%s:%d\n" "bây giờ tên trên máy chủ không tồn tại “%s”" -#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 +#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943 #, c-format msgid "No such remote: '%s'" msgstr "Không có máy chủ nào như vậy: “%s”" @@ -20749,7 +21054,7 @@ msgstr "" "không thể lấy thông tin thống kê pack-objects để mà đóng gói lại các đối " "tượng hứa hẹn" -#: builtin/repack.c:270 builtin/repack.c:446 +#: builtin/repack.c:270 builtin/repack.c:630 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Đang chỉ cần các dòng ID đối tượng dạng thập lục phân đầy dủ từ pack-" @@ -20759,104 +21064,127 @@ msgstr "" msgid "could not finish pack-objects to repack promisor objects" msgstr "không thể hoàn tất pack-objects để đóng gói các đối tượng hứa hẹn" -#: builtin/repack.c:322 +#: builtin/repack.c:309 +#, c-format +msgid "cannot open index for %s" +msgstr "không thể mở mục lục cho “%s”" + +#: builtin/repack.c:368 +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "gói %s là quá lớn để được xem là trong tiến trình hình học" + +#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413 +#, c-format +msgid "pack %s too large to roll up" +msgstr "gói %s là quá lớn để được cuộn lại" + +#: builtin/repack.c:460 msgid "pack everything in a single pack" msgstr "đóng gói mọi thứ trong một gói đơn" -#: builtin/repack.c:324 +#: builtin/repack.c:462 msgid "same as -a, and turn unreachable objects loose" msgstr "giống với -a, và chỉnh sửa các đối tượng không đọc được thiếu sót" -#: builtin/repack.c:327 +#: builtin/repack.c:465 msgid "remove redundant packs, and run git-prune-packed" msgstr "xóa bỏ các gói dư thừa, và chạy git-prune-packed" -#: builtin/repack.c:329 +#: builtin/repack.c:467 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "chuyển --no-reuse-delta cho git-pack-objects" -#: builtin/repack.c:331 +#: builtin/repack.c:469 msgid "pass --no-reuse-object to git-pack-objects" msgstr "chuyển --no-reuse-object cho git-pack-objects" -#: builtin/repack.c:333 +#: builtin/repack.c:471 msgid "do not run git-update-server-info" msgstr "không chạy git-update-server-info" -#: builtin/repack.c:336 +#: builtin/repack.c:474 msgid "pass --local to git-pack-objects" msgstr "chuyển --local cho git-pack-objects" -#: builtin/repack.c:338 +#: builtin/repack.c:476 msgid "write bitmap index" msgstr "ghi mục lục ánh xạ" -#: builtin/repack.c:340 +#: builtin/repack.c:478 msgid "pass --delta-islands to git-pack-objects" msgstr "chuyển --delta-islands cho git-pack-objects" -#: builtin/repack.c:341 +#: builtin/repack.c:479 msgid "approxidate" msgstr "ngày ước tính" -#: builtin/repack.c:342 +#: builtin/repack.c:480 msgid "with -A, do not loosen objects older than this" msgstr "với -A, các đối tượng cũ hơn khoảng thời gian này thì không bị mất" -#: builtin/repack.c:344 +#: builtin/repack.c:482 msgid "with -a, repack unreachable objects" msgstr "với -a, đóng gói lại các đối tượng không thể đọc được" -#: builtin/repack.c:346 +#: builtin/repack.c:484 msgid "size of the window used for delta compression" msgstr "kích thước cửa sổ được dùng cho nén “delta”" -#: builtin/repack.c:347 builtin/repack.c:353 +#: builtin/repack.c:485 builtin/repack.c:491 msgid "bytes" msgstr "byte" -#: builtin/repack.c:348 +#: builtin/repack.c:486 msgid "same as the above, but limit memory size instead of entries count" msgstr "giống như trên, nhưng giới hạn kích thước bộ nhớ hay vì số lượng" -#: builtin/repack.c:350 +#: builtin/repack.c:488 msgid "limits the maximum delta depth" msgstr "giới hạn độ sâu tối đa của “delta”" -#: builtin/repack.c:352 +#: builtin/repack.c:490 msgid "limits the maximum number of threads" msgstr "giới hạn số lượng tối đa tuyến trình" -#: builtin/repack.c:354 +#: builtin/repack.c:492 msgid "maximum size of each packfile" msgstr "kích thước tối đa cho từng tập tin gói" -#: builtin/repack.c:356 +#: builtin/repack.c:494 msgid "repack objects in packs marked with .keep" msgstr "đóng gói lại các đối tượng trong các gói đã đánh dấu bằng .keep" -#: builtin/repack.c:358 +#: builtin/repack.c:496 msgid "do not repack this pack" msgstr "đừng đóng gói lại gói này" -#: builtin/repack.c:368 +#: builtin/repack.c:498 +msgid "find a geometric progression with factor <N>" +msgstr "tìm một tiến trình hình học với hệ số <N>" + +#: builtin/repack.c:508 msgid "cannot delete packs in a precious-objects repo" msgstr "không thể xóa các gói trong một kho đối_tượng_vĩ_đại" -#: builtin/repack.c:372 +#: builtin/repack.c:512 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable và -A xung khắc nhau" -#: builtin/repack.c:455 +#: builtin/repack.c:527 +msgid "--geometric is incompatible with -A, -a" +msgstr "--geometric là xung khắc với tùy chọn -A, -a" + +#: builtin/repack.c:639 msgid "Nothing new to pack." msgstr "Không có gì mới để mà đóng gói." -#: builtin/repack.c:485 +#: builtin/repack.c:669 #, c-format msgid "missing required file: %s" msgstr "thiếu tập tin cần thiết: %s" -#: builtin/repack.c:487 +#: builtin/repack.c:671 #, c-format msgid "could not unlink: %s" msgstr "không thể bỏ liên kết: %s" @@ -21190,8 +21518,8 @@ msgstr "HEAD hiện giờ tại %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "Không thể thực hiện một %s reset ở giữa của quá trình hòa trộn." -#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661 -#: builtin/stash.c:685 +#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663 +#: builtin/stash.c:687 msgid "be quiet, only report errors" msgstr "làm việc ở chế độ im lặng, chỉ hiển thị khi có lỗi" @@ -21276,19 +21604,19 @@ msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét msgid "Could not write new index file." msgstr "Không thể ghi tập tin lưu bảng mục lục mới." -#: builtin/rev-list.c:534 +#: builtin/rev-list.c:538 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "không thể tổ hợp --exclude-promisor-objects và --missing" -#: builtin/rev-list.c:595 +#: builtin/rev-list.c:599 msgid "object filtering requires --objects" msgstr "lọc đối tượng yêu cầu --objects" -#: builtin/rev-list.c:651 +#: builtin/rev-list.c:659 msgid "rev-list does not support display of notes" msgstr "rev-list không hỗ trợ hiển thị các ghi chú" -#: builtin/rev-list.c:656 +#: builtin/rev-list.c:664 msgid "marked counting is incompatible with --objects" msgstr "được đánh dấu đếm là xung khắc với --objects" @@ -21400,19 +21728,19 @@ msgstr "cấm khởi tạo lần chuyển giao trống rỗng" msgid "keep redundant, empty commits" msgstr "giữ lại các lần chuyển giao dư thừa, rỗng" -#: builtin/revert.c:239 +#: builtin/revert.c:237 msgid "revert failed" msgstr "hoàn nguyên gặp lỗi" -#: builtin/revert.c:252 +#: builtin/revert.c:250 msgid "cherry-pick failed" msgstr "cherry-pick gặp lỗi" -#: builtin/rm.c:19 +#: builtin/rm.c:20 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<các tùy chọn>] [--] <tập-tin>…" -#: builtin/rm.c:207 +#: builtin/rm.c:208 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -21423,7 +21751,7 @@ msgstr[0] "" "các tập tin sau đây có khác biệt nội dung đã đưa lên bệ phóng\n" "từ cả tập tin và cả HEAD:" -#: builtin/rm.c:212 +#: builtin/rm.c:213 msgid "" "\n" "(use -f to force removal)" @@ -21431,12 +21759,12 @@ msgstr "" "\n" "(dùng -f để buộc gỡ bỏ)" -#: builtin/rm.c:216 +#: builtin/rm.c:217 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "các tập tin sau đây có thay đổi trạng thái trong bảng mục lục:" -#: builtin/rm.c:220 builtin/rm.c:229 +#: builtin/rm.c:221 builtin/rm.c:230 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -21444,46 +21772,46 @@ msgstr "" "\n" "(dùng tùy chọn --cached để giữ tập tin, hoặc -f để ép buộc gỡ bỏ)" -#: builtin/rm.c:226 +#: builtin/rm.c:227 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "những tập tin sau đây có những thay đổi nội bộ:" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "do not list removed files" msgstr "không liệt kê các tập tin đã gỡ bỏ" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "only remove from the index" msgstr "chỉ gỡ bỏ từ mục lục" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "override the up-to-date check" msgstr "ghi đè lên kiểm tra cập nhật" -#: builtin/rm.c:246 +#: builtin/rm.c:247 msgid "allow recursive removal" msgstr "cho phép gỡ bỏ đệ qui" -#: builtin/rm.c:248 +#: builtin/rm.c:249 msgid "exit with a zero status even if nothing matched" msgstr "thoát ra với trạng thái khác không thậm chí nếu không có gì khớp" -#: builtin/rm.c:282 +#: builtin/rm.c:283 msgid "No pathspec was given. Which files should I remove?" msgstr "Không đưa ra đặc tả đường dẫn. Tôi nên loại bỏ các tập tin nào?" -#: builtin/rm.c:305 +#: builtin/rm.c:310 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "hãy đưa các thay đổi của bạn vào .gitmodules hay tạm cất chúng đi để xử lý" -#: builtin/rm.c:323 +#: builtin/rm.c:331 #, c-format msgid "not removing '%s' recursively without -r" msgstr "không thể gỡ bỏ “%s” một cách đệ qui mà không có tùy chọn -r" -#: builtin/rm.c:362 +#: builtin/rm.c:379 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: không thể gỡ bỏ %s" @@ -21763,104 +22091,112 @@ msgstr "" "hiển thị các tham chiếu từ đầu vào tiêu chuẩn (stdin) cái mà không ở kho nội " "bộ" -#: builtin/sparse-checkout.c:21 +#: builtin/sparse-checkout.c:22 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <các-tùy-chọn>" -#: builtin/sparse-checkout.c:45 +#: builtin/sparse-checkout.c:46 msgid "git sparse-checkout list" msgstr "git sparse-checkout list" -#: builtin/sparse-checkout.c:71 +#: builtin/sparse-checkout.c:72 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" "không thể phân tích cú pháp cây làm việc này (tập tin sparse-checkout có lẽ " "không tồn tại)" -#: builtin/sparse-checkout.c:223 +#: builtin/sparse-checkout.c:227 msgid "failed to create directory for sparse-checkout file" msgstr "gặp lỗi khi tạo thư mục cho tập tin sparse-checkout" -#: builtin/sparse-checkout.c:264 +#: builtin/sparse-checkout.c:268 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "không thể nâng cấp định dạng kho lưu trữ để kích hoạt worktreeConfig" -#: builtin/sparse-checkout.c:266 +#: builtin/sparse-checkout.c:270 msgid "failed to set extensions.worktreeConfig setting" msgstr "gặp lỗi khi đặt cài đặt extensions.worktreeConfig" -#: builtin/sparse-checkout.c:283 -msgid "git sparse-checkout init [--cone]" -msgstr "git sparse-checkout init [--cone]" +#: builtin/sparse-checkout.c:290 +msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" +msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" -#: builtin/sparse-checkout.c:302 +#: builtin/sparse-checkout.c:310 msgid "initialize the sparse-checkout in cone mode" msgstr "khởi tạo sparse-checkout trong chế độ nón" -#: builtin/sparse-checkout.c:339 +#: builtin/sparse-checkout.c:312 +msgid "toggle the use of a sparse index" +msgstr "bật tắt việc sử dụng một \"sparse index\"" + +#: builtin/sparse-checkout.c:340 +msgid "failed to modify sparse-index config" +msgstr "gặp lỗi khi sửa cấu hình \"sparse-index\"" + +#: builtin/sparse-checkout.c:361 #, c-format msgid "failed to open '%s'" msgstr "gặp lỗi khi mở “%s”" -#: builtin/sparse-checkout.c:396 +#: builtin/sparse-checkout.c:419 #, c-format msgid "could not normalize path %s" msgstr "không thể thường hóa đường dẫn “%s”" -#: builtin/sparse-checkout.c:408 +#: builtin/sparse-checkout.c:431 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <các mẫu>)" -#: builtin/sparse-checkout.c:433 +#: builtin/sparse-checkout.c:456 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "không thể bỏ trích dẫn chuỗi kiểu C “%s”" -#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511 +#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 msgid "unable to load existing sparse-checkout patterns" msgstr "không thể tải các mẫu sparse-checkout" -#: builtin/sparse-checkout.c:556 +#: builtin/sparse-checkout.c:579 msgid "read patterns from standard in" msgstr "đọc các mẫu từ đầu vào tiêu chuẩn" -#: builtin/sparse-checkout.c:571 +#: builtin/sparse-checkout.c:594 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:590 +#: builtin/sparse-checkout.c:613 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:618 +#: builtin/sparse-checkout.c:644 msgid "error while refreshing working directory" msgstr "gặp lỗi khi đọc lại thư mục làm việc" -#: builtin/stash.c:22 builtin/stash.c:38 +#: builtin/stash.c:24 builtin/stash.c:40 msgid "git stash list [<options>]" msgstr "git stash list [<các tùy chọn>]" -#: builtin/stash.c:23 builtin/stash.c:43 +#: builtin/stash.c:25 builtin/stash.c:45 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<các tùy chọn>] <stash>" -#: builtin/stash.c:24 builtin/stash.c:48 +#: builtin/stash.c:26 builtin/stash.c:50 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" -#: builtin/stash.c:25 +#: builtin/stash.c:27 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:26 builtin/stash.c:63 +#: builtin/stash.c:28 builtin/stash.c:65 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <tên-nhánh> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:68 +#: builtin/stash.c:29 builtin/stash.c:70 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 +#: builtin/stash.c:30 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" @@ -21872,7 +22208,7 @@ msgstr "" " [--pathspec-from-file=<tập_tin> [--pathspec-file-nul]]\n" " [--] [<đặc/tả/đường/dẫn>…]]" -#: builtin/stash.c:32 builtin/stash.c:85 +#: builtin/stash.c:34 builtin/stash.c:87 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -21880,19 +22216,19 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<ghi chú>]" -#: builtin/stash.c:53 +#: builtin/stash.c:55 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:58 +#: builtin/stash.c:60 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:73 +#: builtin/stash.c:75 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <ghi chú>] [-q|--quiet] <commit>" -#: builtin/stash.c:78 +#: builtin/stash.c:80 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" @@ -21902,30 +22238,30 @@ msgstr "" " [-u|--include-untracked] [-a|--all] [-m|--message <lời nhắn>]\n" " [--] [<đặc/tả/đường/dẫn>…]]" -#: builtin/stash.c:128 +#: builtin/stash.c:130 #, c-format msgid "'%s' is not a stash-like commit" msgstr "“%s” không phải là lần chuyển giao kiểu-stash (cất đi)" -#: builtin/stash.c:148 +#: builtin/stash.c:150 #, c-format msgid "Too many revisions specified:%s" msgstr "Chỉ ra quá nhiều điểm xét duyệt: %s" -#: builtin/stash.c:162 +#: builtin/stash.c:164 msgid "No stash entries found." msgstr "Không tìm thấy các mục tạm cất (stash) nào." -#: builtin/stash.c:176 +#: builtin/stash.c:178 #, c-format msgid "%s is not a valid reference" msgstr "“%s” không phải một tham chiếu hợp lệ" -#: builtin/stash.c:225 +#: builtin/stash.c:227 msgid "git stash clear with arguments is unimplemented" msgstr "git stash clear với các tham số là chưa được thực hiện" -#: builtin/stash.c:429 +#: builtin/stash.c:431 #, c-format msgid "" "WARNING: Untracked file in way of tracked file! Renaming\n" @@ -21936,150 +22272,166 @@ msgstr "" " %s -> %s\n" " để nhường chỗ.\n" -#: builtin/stash.c:490 +#: builtin/stash.c:492 msgid "cannot apply a stash in the middle of a merge" msgstr "không thể áp dụng một stash ở giữa của quá trình hòa trộn" -#: builtin/stash.c:501 +#: builtin/stash.c:503 #, c-format msgid "could not generate diff %s^!." msgstr "không thể tạo diff %s^!." -#: builtin/stash.c:508 +#: builtin/stash.c:510 msgid "conflicts in index. Try without --index." msgstr "xung đột trong bảng mục lục. Hãy thử mà không dùng tùy chọn --index." -#: builtin/stash.c:514 +#: builtin/stash.c:516 msgid "could not save index tree" msgstr "không thể ghi lại cây chỉ mục" -#: builtin/stash.c:523 +#: builtin/stash.c:525 msgid "could not restore untracked files from stash" msgstr "không thể phục hồi các tập tin chưa theo dõi từ mục cất đi (stash)" -#: builtin/stash.c:537 +#: builtin/stash.c:539 #, c-format msgid "Merging %s with %s" msgstr "Đang hòa trộn %s với %s" -#: builtin/stash.c:547 +#: builtin/stash.c:549 msgid "Index was not unstashed." msgstr "Bảng mục lục đã không được bỏ stash." -#: builtin/stash.c:589 builtin/stash.c:687 +#: builtin/stash.c:591 builtin/stash.c:689 msgid "attempt to recreate the index" msgstr "gặp lỗi đọc bảng mục lục" -#: builtin/stash.c:633 +#: builtin/stash.c:635 #, c-format msgid "Dropped %s (%s)" msgstr "Đã xóa %s (%s)" -#: builtin/stash.c:636 +#: builtin/stash.c:638 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Không thể xóa bỏ mục stash" -#: builtin/stash.c:649 +#: builtin/stash.c:651 #, c-format msgid "'%s' is not a stash reference" msgstr "”%s” không phải tham chiếu đến stash" -#: builtin/stash.c:699 +#: builtin/stash.c:701 msgid "The stash entry is kept in case you need it again." msgstr "Các mục tạm cất (stash) được giữ trong trường hợp bạn lại cần nó." -#: builtin/stash.c:722 +#: builtin/stash.c:724 msgid "No branch name specified" msgstr "Chưa chỉ ra tên của nhánh" -#: builtin/stash.c:866 builtin/stash.c:903 +#: builtin/stash.c:808 +msgid "failed to parse tree" +msgstr "gặp lỗi khi phân tích cây" + +#: builtin/stash.c:819 +msgid "failed to unpack trees" +msgstr "gặp lỗi khi tháo dỡ cây" + +#: builtin/stash.c:839 +msgid "include untracked files in the stash" +msgstr "bao gồm các tập tin không được theo dõi trong stash" + +#: builtin/stash.c:842 +msgid "only show untracked files in the stash" +msgstr "chỉ hiển thị các tập tin không được theo dõi trong stash" + +#: builtin/stash.c:932 builtin/stash.c:969 #, c-format msgid "Cannot update %s with %s" msgstr "Không thể cập nhật %s với %s" -#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603 +#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671 msgid "stash message" msgstr "phần chú thích cho stash" -#: builtin/stash.c:894 +#: builtin/stash.c:960 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" cần một đối số <lần chuyển giao>" -#: builtin/stash.c:1109 +#: builtin/stash.c:1175 msgid "No changes selected" msgstr "Chưa có thay đổi nào được chọn" -#: builtin/stash.c:1209 +#: builtin/stash.c:1275 msgid "You do not have the initial commit yet" msgstr "Bạn chưa còn có lần chuyển giao khởi tạo" -#: builtin/stash.c:1236 +#: builtin/stash.c:1302 msgid "Cannot save the current index state" msgstr "Không thể ghi lại trạng thái bảng mục lục hiện hành" -#: builtin/stash.c:1245 +#: builtin/stash.c:1311 msgid "Cannot save the untracked files" msgstr "Không thể ghi lại các tập tin chưa theo dõi" -#: builtin/stash.c:1256 builtin/stash.c:1265 +#: builtin/stash.c:1322 builtin/stash.c:1331 msgid "Cannot save the current worktree state" msgstr "Không thể ghi lại trạng thái cây-làm-việc hiện hành" -#: builtin/stash.c:1293 +#: builtin/stash.c:1359 msgid "Cannot record working tree state" msgstr "Không thể ghi lại trạng thái cây làm việc hiện hành" -#: builtin/stash.c:1342 +#: builtin/stash.c:1408 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Không thể dùng --patch và --include-untracked hay --all cùng một lúc" -#: builtin/stash.c:1358 +#: builtin/stash.c:1426 msgid "Did you forget to 'git add'?" msgstr "Có lẽ bạn đã quên “git add ” phải không?" -#: builtin/stash.c:1373 +#: builtin/stash.c:1441 msgid "No local changes to save" msgstr "Không có thay đổi nội bộ nào được ghi lại" -#: builtin/stash.c:1380 +#: builtin/stash.c:1448 msgid "Cannot initialize stash" msgstr "Không thể khởi tạo stash" -#: builtin/stash.c:1395 +#: builtin/stash.c:1463 msgid "Cannot save the current status" msgstr "Không thể ghi lại trạng thái hiện hành" -#: builtin/stash.c:1400 +#: builtin/stash.c:1468 #, c-format msgid "Saved working directory and index state %s" msgstr "Đã ghi lại thư mục làm việc và trạng thái mục lục %s" -#: builtin/stash.c:1490 +#: builtin/stash.c:1558 msgid "Cannot remove worktree changes" msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc" -#: builtin/stash.c:1529 builtin/stash.c:1594 +#: builtin/stash.c:1597 builtin/stash.c:1662 msgid "keep index" msgstr "giữ nguyên bảng mục lục" -#: builtin/stash.c:1531 builtin/stash.c:1596 +#: builtin/stash.c:1599 builtin/stash.c:1664 msgid "stash in patch mode" msgstr "cất đi ở chế độ miếng vá" -#: builtin/stash.c:1532 builtin/stash.c:1597 +#: builtin/stash.c:1600 builtin/stash.c:1665 msgid "quiet mode" msgstr "chế độ im lặng" -#: builtin/stash.c:1534 builtin/stash.c:1599 +#: builtin/stash.c:1602 builtin/stash.c:1667 msgid "include untracked files in stash" msgstr "bao gồm các tập tin không được theo dõi trong stash" -#: builtin/stash.c:1536 builtin/stash.c:1601 +#: builtin/stash.c:1604 builtin/stash.c:1669 msgid "include ignore files" msgstr "bao gồm các tập tin bị bỏ qua" -#: builtin/stash.c:1636 +#: builtin/stash.c:1704 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -22103,7 +22455,7 @@ msgstr "giữ và xóa bỏ mọi dòng bắt đầu bằng ký tự ghi chú" msgid "prepend comment character and space to each line" msgstr "treo trước ký tự ghi chú và ký tự khoảng trắng cho từng dòng" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Cần tên tham chiếu dạng đầy đủ, nhưng lại nhận được %s" @@ -22117,7 +22469,7 @@ msgstr "submodule--helper print-default-remote takes không nhận tham số" msgid "cannot strip one component off url '%s'" msgstr "không thể cắt bỏ một thành phần ra khỏi “%s” url" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820 msgid "alternative anchor for relative paths" msgstr "điểm neo thay thế cho các đường dẫn tương đối" @@ -22125,18 +22477,18 @@ msgstr "điểm neo thay thế cho các đường dẫn tương đối" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=</đường/dẫn>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:652 +#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:653 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Không tìm thấy url cho đường dẫn mô-đun-con “%s” trong .gitmodules" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:525 #, c-format msgid "Entering '%s'\n" msgstr "Đang vào “%s”\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:528 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22145,7 +22497,7 @@ msgstr "" "run_command trả về trạng thái khác không cho %s\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:550 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22156,20 +22508,20 @@ msgstr "" "con lồng nhau của %s\n" "." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:566 msgid "suppress output of entering each submodule command" msgstr "chặn kết xuất của từng lệnh mô-đun-con" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 -#: builtin/submodule--helper.c:1487 +#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:1488 msgid "recurse into nested submodules" msgstr "đệ quy vào trong mô-đun-con lồng nhau" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:573 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <lệnh>" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:600 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -22178,56 +22530,56 @@ msgstr "" "không thể tìm thấy cấu hình “%s”. Coi rằng đây là kho thượng nguồn có quyền " "sở hữu chính nó." -#: builtin/submodule--helper.c:666 +#: builtin/submodule--helper.c:667 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:670 +#: builtin/submodule--helper.c:671 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n" -#: builtin/submodule--helper.c:680 +#: builtin/submodule--helper.c:681 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "cảnh báo: chế độ lệnh cập nhật được gợi ý cho mô-đun-con “%s”\n" -#: builtin/submodule--helper.c:687 +#: builtin/submodule--helper.c:688 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:709 +#: builtin/submodule--helper.c:710 msgid "suppress output for initializing a submodule" msgstr "chặn kết xuất của khởi tạo một mô-đun-con" -#: builtin/submodule--helper.c:714 +#: builtin/submodule--helper.c:715 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<các tùy chọn>] [</đường/dẫn>]" -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 +#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đường dẫn " "“%s”" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:836 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "không thể phân giải tham chiếu HEAD bên trong mô-đun-con “%s”" -#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "gặp lỗi khi đệ quy vào trong mô-đun-con “%s”" -#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 +#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624 msgid "suppress submodule status output" msgstr "chặn kết xuất về tình trạng mô-đun-con" -#: builtin/submodule--helper.c:887 +#: builtin/submodule--helper.c:888 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -22235,103 +22587,103 @@ msgstr "" "dùng lần chuyển giao lưu trong mục lục thay cho cái được lưu trong HEAD mô-" "đun-con" -#: builtin/submodule--helper.c:893 +#: builtin/submodule--helper.c:894 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "" "git submodule status [--quiet] [--cached] [--recursive] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:917 +#: builtin/submodule--helper.c:918 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name </đường/dẫn>" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:990 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "" "* %s %s(blob)->%s(\n" ")" -#: builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:993 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(mô-đun-con)->%s(blob)" -#: builtin/submodule--helper.c:1005 +#: builtin/submodule--helper.c:1006 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1056 #, c-format msgid "couldn't hash object from '%s'" msgstr "không thể băm đối tượng từ “%s”" -#: builtin/submodule--helper.c:1059 +#: builtin/submodule--helper.c:1060 #, c-format msgid "unexpected mode %o\n" msgstr "gặp chế độ không như mong chờ %o\n" -#: builtin/submodule--helper.c:1300 +#: builtin/submodule--helper.c:1301 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "hùng lần chuyển giao đã lưu trong mục lục thay cho HEAD mô-đun-con" -#: builtin/submodule--helper.c:1302 +#: builtin/submodule--helper.c:1303 msgid "to compare the commit in the index with that in the submodule HEAD" msgstr "" "để so sánh lần chuyển giao lưu trong mục lục với cái trong HEAD mô-đun-con" -#: builtin/submodule--helper.c:1304 +#: builtin/submodule--helper.c:1305 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "" "bỏ qua các mô-đun-con với giá trị của “ignore_config” được đặt thành “all”" -#: builtin/submodule--helper.c:1306 +#: builtin/submodule--helper.c:1307 msgid "limit the summary size" msgstr "giới hạn kích cỡ tổng hợp" -#: builtin/submodule--helper.c:1311 +#: builtin/submodule--helper.c:1312 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "" "git submodule--helper summary [<các tùy chọn>] [<lần_chuyển_giao>] [--] [</" "đường/dẫn>]" -#: builtin/submodule--helper.c:1335 +#: builtin/submodule--helper.c:1336 msgid "could not fetch a revision for HEAD" msgstr "không thể lấy về một điểm xem xét cho HEAD" -#: builtin/submodule--helper.c:1340 +#: builtin/submodule--helper.c:1341 msgid "--cached and --files are mutually exclusive" msgstr "Các tùy chọn --cached và --files loại từ lẫn nhau" -#: builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1408 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Url mô-đun-con đồng bộ hóa cho “%s”\n" -#: builtin/submodule--helper.c:1413 +#: builtin/submodule--helper.c:1414 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:1427 +#: builtin/submodule--helper.c:1428 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "gặp lỗi khi lấy máy chủ mặc định cho mô-đun-con “%s”" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1439 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "gặp lỗi khi cập nhật cho mô-đun-con “%s”" -#: builtin/submodule--helper.c:1485 +#: builtin/submodule--helper.c:1486 msgid "suppress output of synchronizing submodule url" msgstr "chặn kết xuất của url mô-đun-con đồng bộ" -#: builtin/submodule--helper.c:1492 +#: builtin/submodule--helper.c:1493 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [</đường/dẫn>]" -#: builtin/submodule--helper.c:1546 +#: builtin/submodule--helper.c:1547 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -22340,7 +22692,7 @@ msgstr "" "Cây làm việc mô-đun-con “%s” có chứa thư mục .git (dùng “rm -rf” nếu bạn " "thực sự muốn gỡ bỏ nó cùng với toàn bộ lịch sử của chúng)" -#: builtin/submodule--helper.c:1558 +#: builtin/submodule--helper.c:1559 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -22349,45 +22701,45 @@ msgstr "" "Cây làm việc mô-đun-con “%s” chứa các thay đổi nội bộ; hãy dùng “-f” để loại " "bỏ chúng đi" -#: builtin/submodule--helper.c:1566 +#: builtin/submodule--helper.c:1567 #, c-format msgid "Cleared directory '%s'\n" msgstr "Đã xóa thư mục “%s”\n" -#: builtin/submodule--helper.c:1568 +#: builtin/submodule--helper.c:1569 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Không thể gỡ bỏ cây làm việc mô-đun-con “%s”\n" -#: builtin/submodule--helper.c:1579 +#: builtin/submodule--helper.c:1580 #, c-format msgid "could not create empty submodule directory %s" msgstr "không thể tạo thư mục mô-đun-con rỗng “%s”" -#: builtin/submodule--helper.c:1595 +#: builtin/submodule--helper.c:1596 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n" -#: builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:1625 msgid "remove submodule working trees even if they contain local changes" msgstr "gỡ bỏ cây làm việc của mô-đun-con ngay cả khi nó có thay đổi nội bộ" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1626 msgid "unregister all submodules" msgstr "bỏ đăng ký tất cả các trong mô-đun-con" -#: builtin/submodule--helper.c:1630 +#: builtin/submodule--helper.c:1631 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [</đường/dẫn>…]]" -#: builtin/submodule--helper.c:1644 +#: builtin/submodule--helper.c:1645 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Dùng “--all” nếu bạn thực sự muốn hủy khởi tạo mọi mô-đun-con" -#: builtin/submodule--helper.c:1713 +#: builtin/submodule--helper.c:1714 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -22402,46 +22754,46 @@ msgstr "" "bằng\n" "“--reference-if-able” thay vì dùng “--reference”." -#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 +#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "mô-đun-con “%s” không thể thêm thay thế: %s" -#: builtin/submodule--helper.c:1791 +#: builtin/submodule--helper.c:1792 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Giá trị “%s” cho submodule.alternateErrorStrategy không được thừa nhận" -#: builtin/submodule--helper.c:1798 +#: builtin/submodule--helper.c:1799 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Giá trị “%s” cho submodule.alternateLocation không được thừa nhận" -#: builtin/submodule--helper.c:1822 +#: builtin/submodule--helper.c:1823 msgid "where the new submodule will be cloned to" msgstr "nhân bản mô-đun-con mới vào chỗ nào" -#: builtin/submodule--helper.c:1825 +#: builtin/submodule--helper.c:1826 msgid "name of the new submodule" msgstr "tên của mô-đun-con mới" -#: builtin/submodule--helper.c:1828 +#: builtin/submodule--helper.c:1829 msgid "url where to clone the submodule from" msgstr "url nơi mà nhân bản mô-đun-con từ đó" -#: builtin/submodule--helper.c:1836 +#: builtin/submodule--helper.c:1837 msgid "depth for shallow clones" msgstr "chiều sâu lịch sử khi tạo bản sao" -#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 +#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349 msgid "force cloning progress" msgstr "ép buộc tiến trình nhân bản" -#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351 msgid "disallow cloning into non-empty directory" msgstr "làm đầy đủ dữ liệu cho bản sao vào trong một thư mục trống rỗng" -#: builtin/submodule--helper.c:1848 +#: builtin/submodule--helper.c:1849 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22451,105 +22803,105 @@ msgstr "" "<kho>] [--name <tên>] [--depth <sâu>] [--single-branch] [--url <url>] --path " "</đường/dẫn>" -#: builtin/submodule--helper.c:1873 +#: builtin/submodule--helper.c:1874 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "từ chối tạo/dùng “%s” trong một thư mục git của mô đun con" -#: builtin/submodule--helper.c:1884 +#: builtin/submodule--helper.c:1885 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "việc sao “%s” vào đường dẫn mô-đun-con “%s” gặp lỗi" -#: builtin/submodule--helper.c:1888 +#: builtin/submodule--helper.c:1889 #, c-format msgid "directory not empty: '%s'" msgstr "thư mục không trống: “%s”" -#: builtin/submodule--helper.c:1900 +#: builtin/submodule--helper.c:1901 #, c-format msgid "could not get submodule directory for '%s'" msgstr "không thể lấy thư mục mô-đun-con cho “%s”" -#: builtin/submodule--helper.c:1936 +#: builtin/submodule--helper.c:1937 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Chế độ cập nhật “%s” không hợp lệ cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:1940 +#: builtin/submodule--helper.c:1941 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Chế độ cập nhật “%s” không hợp lệ được cấu hình cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:2041 +#: builtin/submodule--helper.c:2042 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Đường dẫn mô-đun-con “%s” chưa được khởi tạo" -#: builtin/submodule--helper.c:2045 +#: builtin/submodule--helper.c:2046 msgid "Maybe you want to use 'update --init'?" msgstr "Có lẽ bạn là bạn muốn dùng \"update --init\" phải không?" -#: builtin/submodule--helper.c:2075 +#: builtin/submodule--helper.c:2076 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Bỏ qua các mô-đun-con chưa được hòa trộn %s" -#: builtin/submodule--helper.c:2104 +#: builtin/submodule--helper.c:2105 #, c-format msgid "Skipping submodule '%s'" msgstr "Bỏ qua mô-đun-con “%s”" -#: builtin/submodule--helper.c:2254 +#: builtin/submodule--helper.c:2255 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Gặp lỗi khi nhân bản “%s”. Thử lại lịch trình" -#: builtin/submodule--helper.c:2265 +#: builtin/submodule--helper.c:2266 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Gặp lỗi khi nhân bản “%s” lần thứ hai nên bãi bỏ" -#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574 msgid "path into the working tree" msgstr "đường dẫn đến cây làm việc" -#: builtin/submodule--helper.c:2330 +#: builtin/submodule--helper.c:2331 msgid "path into the working tree, across nested submodule boundaries" msgstr "đường dẫn đến cây làm việc, chéo biên giới mô-đun-con lồng nhau" -#: builtin/submodule--helper.c:2334 +#: builtin/submodule--helper.c:2335 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout hoặc không làm gì cả" -#: builtin/submodule--helper.c:2340 +#: builtin/submodule--helper.c:2341 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "" "tạo một bản sao nông được cắt ngắn thành số lượng điểm xét duyệt đã cho" -#: builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2344 msgid "parallel jobs" msgstr "công việc đồng thời" -#: builtin/submodule--helper.c:2345 +#: builtin/submodule--helper.c:2346 msgid "whether the initial clone should follow the shallow recommendation" msgstr "nhân bản lần đầu có nên theo khuyến nghị là nông hay không" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2347 msgid "don't print cloning progress" msgstr "đừng in tiến trình nhân bản" -#: builtin/submodule--helper.c:2357 +#: builtin/submodule--helper.c:2358 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "" "git submodule--helper update-clone [--prefix=</đường/dẫn>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:2370 +#: builtin/submodule--helper.c:2371 msgid "bad value for update parameter" msgstr "giá trị cho tham số cập nhật bị sai" -#: builtin/submodule--helper.c:2418 +#: builtin/submodule--helper.c:2419 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -22558,86 +22910,86 @@ msgstr "" "Nhánh mô-đun-con (%s) được cấu hình kế thừa nhánh từ siêu dự án, nhưng siêu " "dự án lại không trên bất kỳ nhánh nào" -#: builtin/submodule--helper.c:2541 +#: builtin/submodule--helper.c:2542 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "không thể lấy thẻ quản kho cho mô-đun-con “%s”" -#: builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2575 msgid "recurse into submodules" msgstr "đệ quy vào trong mô-đun-con" -#: builtin/submodule--helper.c:2580 +#: builtin/submodule--helper.c:2581 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<các tùy chọn>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:2636 +#: builtin/submodule--helper.c:2637 msgid "check if it is safe to write to the .gitmodules file" msgstr "chọn nếu nó là an toàn để ghi vào tập tin .gitmodules" -#: builtin/submodule--helper.c:2639 +#: builtin/submodule--helper.c:2640 msgid "unset the config in the .gitmodules file" msgstr "bỏ đặt cấu hình trong tập tin .gitmodules" -#: builtin/submodule--helper.c:2644 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <tên> [<giá trị>]" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <tên>" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2647 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2665 git-submodule.sh:150 +#: builtin/submodule--helper.c:2666 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "hãy đảm bảo rằng tập tin .gitmodules có trong cây làm việc" -#: builtin/submodule--helper.c:2681 +#: builtin/submodule--helper.c:2682 msgid "suppress output for setting url of a submodule" msgstr "chặn kết xuất cho cài đặt url của một mô-đun-con" -#: builtin/submodule--helper.c:2685 +#: builtin/submodule--helper.c:2686 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] </đường/dẫn> <url_mới>" -#: builtin/submodule--helper.c:2718 +#: builtin/submodule--helper.c:2719 msgid "set the default tracking branch to master" msgstr "đặt nhánh theo dõi mặc định thành master" -#: builtin/submodule--helper.c:2720 +#: builtin/submodule--helper.c:2721 msgid "set the default tracking branch" msgstr "đặt nhánh theo dõi mặc định" -#: builtin/submodule--helper.c:2724 +#: builtin/submodule--helper.c:2725 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet](-d|--default)</đường/dẫn>" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2726 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <nhánh> </đường/" "dẫn>" -#: builtin/submodule--helper.c:2732 +#: builtin/submodule--helper.c:2733 msgid "--branch or --default required" msgstr "cần --branch hoặc --default" -#: builtin/submodule--helper.c:2735 +#: builtin/submodule--helper.c:2736 msgid "--branch and --default are mutually exclusive" msgstr "Các tùy chọn --branch và --default loại từ lẫn nhau" -#: builtin/submodule--helper.c:2792 git.c:441 git.c:714 +#: builtin/submodule--helper.c:2793 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s không hỗ trợ --super-prefix" -#: builtin/submodule--helper.c:2798 +#: builtin/submodule--helper.c:2799 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "“%s” không phải là lệnh con submodule--helper hợp lệ" @@ -22650,23 +23002,23 @@ msgstr "git symbolic-ref [<các tùy chọn>] <tên> [<t.chiếu>]" msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <tên>" -#: builtin/symbolic-ref.c:40 +#: builtin/symbolic-ref.c:42 msgid "suppress error message for non-symbolic (detached) refs" msgstr "chặn các thông tin lỗi cho các tham chiếu “không-mềm” (bị tách ra)" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:43 msgid "delete symbolic ref" msgstr "xóa tham chiếu mềm" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:44 msgid "shorten ref output" msgstr "làm ngắn kết xuất ref (tham chiếu)" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 msgid "reason" msgstr "lý do" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 msgid "reason of the update" msgstr "lý do cập nhật" @@ -22698,17 +23050,17 @@ msgstr "" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<định_dạng>] <tên-thẻ>…" -#: builtin/tag.c:89 +#: builtin/tag.c:100 #, c-format msgid "tag '%s' not found." msgstr "không tìm thấy tìm thấy thẻ “%s”." -#: builtin/tag.c:124 +#: builtin/tag.c:135 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Thẻ đã bị xóa “%s” (từng là %s)\n" -#: builtin/tag.c:159 +#: builtin/tag.c:170 #, c-format msgid "" "\n" @@ -22721,7 +23073,7 @@ msgstr "" " %s\n" "Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua.\n" -#: builtin/tag.c:163 +#: builtin/tag.c:174 #, c-format msgid "" "\n" @@ -22736,11 +23088,11 @@ msgstr "" "Những dòng được bắt đầu bằng “%c” sẽ được giữ lại; bạn có thể xóa chúng đi " "nếu muốn.\n" -#: builtin/tag.c:230 +#: builtin/tag.c:241 msgid "unable to sign the tag" msgstr "không thể ký thẻ" -#: builtin/tag.c:248 +#: builtin/tag.c:259 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -22753,140 +23105,140 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:264 +#: builtin/tag.c:275 msgid "bad object type." msgstr "kiểu đối tượng sai." -#: builtin/tag.c:317 +#: builtin/tag.c:328 msgid "no tag message?" msgstr "không có chú thích gì cho cho thẻ à?" -#: builtin/tag.c:324 +#: builtin/tag.c:335 #, c-format msgid "The tag message has been left in %s\n" msgstr "Nội dung ghi chú còn lại %s\n" -#: builtin/tag.c:435 +#: builtin/tag.c:446 msgid "list tag names" msgstr "chỉ liệt kê tên các thẻ" -#: builtin/tag.c:437 +#: builtin/tag.c:448 msgid "print <n> lines of each tag message" msgstr "hiển thị <n> dòng cho mỗi ghi chú" -#: builtin/tag.c:439 +#: builtin/tag.c:450 msgid "delete tags" msgstr "xóa thẻ" -#: builtin/tag.c:440 +#: builtin/tag.c:451 msgid "verify tags" msgstr "thẩm tra thẻ" -#: builtin/tag.c:442 +#: builtin/tag.c:453 msgid "Tag creation options" msgstr "Tùy chọn tạo thẻ" -#: builtin/tag.c:444 +#: builtin/tag.c:455 msgid "annotated tag, needs a message" msgstr "để chú giải cho thẻ, cần một lời ghi chú" -#: builtin/tag.c:446 +#: builtin/tag.c:457 msgid "tag message" msgstr "phần chú thích cho thẻ" -#: builtin/tag.c:448 +#: builtin/tag.c:459 msgid "force edit of tag message" msgstr "ép buộc sửa thẻ lần commit" -#: builtin/tag.c:449 +#: builtin/tag.c:460 msgid "annotated and GPG-signed tag" msgstr "thẻ chú giải và ký kiểu GPG" -#: builtin/tag.c:452 +#: builtin/tag.c:463 msgid "use another key to sign the tag" msgstr "dùng kháo khác để ký thẻ" -#: builtin/tag.c:453 +#: builtin/tag.c:464 msgid "replace the tag if exists" msgstr "thay thế nếu thẻ đó đã có trước" -#: builtin/tag.c:454 builtin/update-ref.c:505 +#: builtin/tag.c:465 builtin/update-ref.c:505 msgid "create a reflog" msgstr "tạo một reflog" -#: builtin/tag.c:456 +#: builtin/tag.c:467 msgid "Tag listing options" msgstr "Các tùy chọn liệt kê thẻ" -#: builtin/tag.c:457 +#: builtin/tag.c:468 msgid "show tag list in columns" msgstr "hiển thị danh sách thẻ trong các cột" -#: builtin/tag.c:458 builtin/tag.c:460 +#: builtin/tag.c:469 builtin/tag.c:471 msgid "print only tags that contain the commit" msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao" -#: builtin/tag.c:459 builtin/tag.c:461 +#: builtin/tag.c:470 builtin/tag.c:472 msgid "print only tags that don't contain the commit" msgstr "chỉ hiển thị những thẻ mà nó không chứa lần chuyển giao" -#: builtin/tag.c:462 +#: builtin/tag.c:473 msgid "print only tags that are merged" msgstr "chỉ hiển thị những thẻ mà nó được hòa trộn" -#: builtin/tag.c:463 +#: builtin/tag.c:474 msgid "print only tags that are not merged" msgstr "chỉ hiển thị những thẻ mà nó không được hòa trộn" -#: builtin/tag.c:467 +#: builtin/tag.c:478 msgid "print only tags of the object" msgstr "chỉ hiển thị các thẻ của đối tượng" -#: builtin/tag.c:515 +#: builtin/tag.c:526 msgid "--column and -n are incompatible" msgstr "--column và -n xung khắc nhau" -#: builtin/tag.c:537 +#: builtin/tag.c:548 msgid "-n option is only allowed in list mode" msgstr "tùy chọn -n chỉ cho phép dùng trong chế độ liệt kê" -#: builtin/tag.c:539 +#: builtin/tag.c:550 msgid "--contains option is only allowed in list mode" msgstr "tùy chọn --contains chỉ cho phép dùng trong chế độ liệt kê" -#: builtin/tag.c:541 +#: builtin/tag.c:552 msgid "--no-contains option is only allowed in list mode" msgstr "tùy chọn --no-contains chỉ cho phép dùng trong chế độ liệt kê" -#: builtin/tag.c:543 +#: builtin/tag.c:554 msgid "--points-at option is only allowed in list mode" msgstr "tùy chọn --points-at chỉ cho phép dùng trong chế độ liệt kê" -#: builtin/tag.c:545 +#: builtin/tag.c:556 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" "tùy chọn --merged và --no-merged chỉ cho phép dùng trong chế độ liệt kê" -#: builtin/tag.c:556 +#: builtin/tag.c:567 msgid "only one -F or -m option is allowed." msgstr "chỉ có một tùy chọn -F hoặc -m là được phép." -#: builtin/tag.c:581 +#: builtin/tag.c:592 #, c-format msgid "'%s' is not a valid tag name." msgstr "“%s” không phải thẻ hợp lệ." -#: builtin/tag.c:586 +#: builtin/tag.c:597 #, c-format msgid "tag '%s' already exists" msgstr "thẻ “%s” đã tồn tại rồi" -#: builtin/tag.c:617 +#: builtin/tag.c:628 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n" -#: builtin/unpack-objects.c:502 +#: builtin/unpack-objects.c:504 msgid "Unpacking objects" msgstr "Đang giải nén các đối tượng" @@ -22949,147 +23301,147 @@ msgstr " Đồng ý" msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<các tùy chọn>] [--] [<tập-tin>…]" -#: builtin/update-index.c:974 +#: builtin/update-index.c:976 msgid "continue refresh even when index needs update" msgstr "tiếp tục làm mới ngay cả khi bảng mục lục cần được cập nhật" -#: builtin/update-index.c:977 +#: builtin/update-index.c:979 msgid "refresh: ignore submodules" msgstr "refresh: lờ đi mô-đun-con" -#: builtin/update-index.c:980 +#: builtin/update-index.c:982 msgid "do not ignore new files" msgstr "không bỏ qua các tập tin mới tạo" -#: builtin/update-index.c:982 +#: builtin/update-index.c:984 msgid "let files replace directories and vice-versa" msgstr "để các tập tin thay thế các thư mục và “vice-versa”" -#: builtin/update-index.c:984 +#: builtin/update-index.c:986 msgid "notice files missing from worktree" msgstr "thông báo các tập-tin thiếu trong thư-mục làm việc" -#: builtin/update-index.c:986 +#: builtin/update-index.c:988 msgid "refresh even if index contains unmerged entries" msgstr "" "làm tươi mới thậm chí khi bảng mục lục chứa các mục tin chưa được hòa trộn" -#: builtin/update-index.c:989 +#: builtin/update-index.c:991 msgid "refresh stat information" msgstr "lấy lại thông tin thống kê" -#: builtin/update-index.c:993 +#: builtin/update-index.c:995 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "giống --refresh, nhưng bỏ qua các cài đặt “assume-unchanged”" -#: builtin/update-index.c:997 +#: builtin/update-index.c:999 msgid "<mode>,<object>,<path>" msgstr "<chế_độ>,<đối_tượng>,<đường_dẫn>" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1000 msgid "add the specified entry to the index" msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1010 msgid "mark files as \"not changing\"" msgstr "đánh dấu các tập tin là \"không thay đổi\"" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1013 msgid "clear assumed-unchanged bit" msgstr "xóa bít assumed-unchanged (giả định là không thay đổi)" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1016 msgid "mark files as \"index-only\"" msgstr "đánh dấu các tập tin là “chỉ-đọc”" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1019 msgid "clear skip-worktree bit" msgstr "xóa bít skip-worktree" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1022 msgid "do not touch index-only entries" msgstr "đừng động vào các mục index-only" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1024 msgid "add to index only; do not add content to object database" msgstr "" "chỉ thêm vào bảng mục lục; không thêm nội dung vào cơ sở dữ liệu đối tượng" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1026 msgid "remove named paths even if present in worktree" msgstr "" "gỡ bỏ các đường dẫn được đặt tên thậm chí cả khi nó hiện diện trong thư mục " "làm việc" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1028 msgid "with --stdin: input lines are terminated by null bytes" msgstr "với tùy chọn --stdin: các dòng đầu vào được chấm dứt bởi ký tự null" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1030 msgid "read list of paths to be updated from standard input" msgstr "đọc danh sách đường dẫn cần cập nhật từ đầu vào tiêu chuẩn" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1034 msgid "add entries from standard input to the index" msgstr "không thể đọc các mục từ đầu vào tiêu chuẩn vào bảng mục lục" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1038 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "phục hồi các trạng thái #2 và #3 cho các đường dẫn được liệt kê" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1042 msgid "only update entries that differ from HEAD" msgstr "chỉ cập nhật các mục tin mà nó khác biệt so với HEAD" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1046 msgid "ignore files missing from worktree" msgstr "bỏ qua các tập-tin thiếu trong thư-mục làm việc" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1049 msgid "report actions to standard output" msgstr "báo cáo các thao tác ra thiết bị xuất chuẩn" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1051 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(cho “porcelains”) quên các xung đột chưa được giải quyết đã ghi" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1055 msgid "write index in this format" msgstr "ghi mục lục ở định dạng này" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1057 msgid "enable or disable split index" msgstr "bật/tắt chia cắt bảng mục lục" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1059 msgid "enable/disable untracked cache" msgstr "bật/tắt bộ đệm không theo vết" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1061 msgid "test if the filesystem supports untracked cache" msgstr "kiểm tra xem hệ thống tập tin có hỗ trợ đệm không theo dõi hay không" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1063 msgid "enable untracked cache without testing the filesystem" msgstr "bật bộ đệm không theo vết mà không kiểm tra hệ thống tập tin" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1065 msgid "write out the index even if is not flagged as changed" msgstr "ghi ra mục lục ngay cả khi không được đánh cờ là có thay đổi" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1067 msgid "enable or disable file system monitor" msgstr "bật/tắt theo dõi hệ thống tập tin" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1069 msgid "mark files as fsmonitor valid" msgstr "đánh dấu các tập tin là hợp lệ fsmonitor" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1072 msgid "clear fsmonitor valid bit" msgstr "xóa bít hợp lệ fsmonitor" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1175 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -23097,7 +23449,7 @@ msgstr "" "core.splitIndex được đặt là sai; xóa bỏ hay thay đổi nó, nếu bạn thực sự " "muốn bật chia tách mục lục" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1184 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -23105,7 +23457,7 @@ msgstr "" "core.splitIndex được đặt là đúng; xóa bỏ hay thay đổi nó, nếu bạn thực sự " "muốn tắt chia tách mục lục" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1196 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -23113,11 +23465,11 @@ msgstr "" "core.untrackedCache được đặt là đúng; xóa bỏ hay thay đổi nó, nếu bạn thực " "sự muốn tắt bộ đệm chưa theo dõi" -#: builtin/update-index.c:1198 +#: builtin/update-index.c:1200 msgid "Untracked cache disabled" msgstr "Nhớ đệm không theo vết bị tắt" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1208 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -23125,29 +23477,29 @@ msgstr "" "core.untrackedCache được đặt là sai; xóa bỏ hay thay đổi nó, nếu bạn thực sự " "muốn bật bộ đệm chưa theo dõi" -#: builtin/update-index.c:1210 +#: builtin/update-index.c:1212 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Nhớ đệm không theo vết được bật cho “%s”" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1220 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "core.fsmonitor chưa được đặt; đặt nó nếu bạn thực sự muốn bật theo dõi hệ " "thống tập tin" -#: builtin/update-index.c:1222 +#: builtin/update-index.c:1224 msgid "fsmonitor enabled" msgstr "fsmonitor được bật" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1227 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor đã được đặt; bỏ đặt nó nếu bạn thực sự muốn bật theo dõi hệ " "thống tập tin" -#: builtin/update-index.c:1229 +#: builtin/update-index.c:1231 msgid "fsmonitor disabled" msgstr "fsmonitor bị tắt" @@ -23267,7 +23619,7 @@ msgstr "git worktree remove [<các tùy chọn>] <worktree>" msgid "git worktree unlock <path>" msgstr "git worktree unlock </đường/dẫn>" -#: builtin/worktree.c:61 builtin/worktree.c:933 +#: builtin/worktree.c:61 builtin/worktree.c:935 #, c-format msgid "failed to delete '%s'" msgstr "gặp lỗi khi xóa “%s”" @@ -23338,104 +23690,104 @@ msgstr "Đang chuẩn bị cây làm việc (đang lấy ra “%s”)" msgid "Preparing worktree (detached HEAD %s)" msgstr "Đang chuẩn bị cây làm việc (HEAD đã tách rời “%s”)" -#: builtin/worktree.c:480 +#: builtin/worktree.c:482 msgid "checkout <branch> even if already checked out in other worktree" msgstr "lấy ra <nhánh> ngay cả khi nó đã được lấy ra ở cây làm việc khác" -#: builtin/worktree.c:483 +#: builtin/worktree.c:485 msgid "create a new branch" msgstr "tạo nhánh mới" -#: builtin/worktree.c:485 +#: builtin/worktree.c:487 msgid "create or reset a branch" msgstr "tạo hay đặt lại một nhánh" -#: builtin/worktree.c:487 +#: builtin/worktree.c:489 msgid "populate the new working tree" msgstr "di chuyển cây làm việc mới" -#: builtin/worktree.c:488 +#: builtin/worktree.c:490 msgid "keep the new working tree locked" msgstr "giữ cây làm việc mới bị khóa" -#: builtin/worktree.c:491 +#: builtin/worktree.c:493 msgid "set up tracking mode (see git-branch(1))" msgstr "cài đặt chế độ theo dõi (xem git-branch(1))" -#: builtin/worktree.c:494 +#: builtin/worktree.c:496 msgid "try to match the new branch name with a remote-tracking branch" msgstr "có khớp tên tên nhánh mới với một nhánh theo dõi máy chủ" -#: builtin/worktree.c:502 +#: builtin/worktree.c:504 msgid "-b, -B, and --detach are mutually exclusive" msgstr "Các tùy chọn -b, -B, và --detach loại từ lẫn nhau" -#: builtin/worktree.c:563 +#: builtin/worktree.c:565 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track chỉ có thể được dùng nếu một nhánh mới được tạo" -#: builtin/worktree.c:680 +#: builtin/worktree.c:682 msgid "show extended annotations and reasons, if available" msgstr "hiển thị chú thích và lý do mở rộng, nếu có" -#: builtin/worktree.c:682 +#: builtin/worktree.c:684 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "" "thêm chú thích kiểu 'prunable' cho các cây làm việc hết hạn cũ hơn khoảng " "<thời gian>" -#: builtin/worktree.c:691 +#: builtin/worktree.c:693 msgid "--verbose and --porcelain are mutually exclusive" msgstr "--verbose và --porcelain loại từ lẫn nhau" -#: builtin/worktree.c:718 +#: builtin/worktree.c:720 msgid "reason for locking" msgstr "lý do khóa" -#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837 -#: builtin/worktree.c:961 +#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839 +#: builtin/worktree.c:963 #, c-format msgid "'%s' is not a working tree" msgstr "%s không phải là cây làm việc" -#: builtin/worktree.c:732 builtin/worktree.c:765 +#: builtin/worktree.c:734 builtin/worktree.c:767 msgid "The main working tree cannot be locked or unlocked" msgstr "Cây thư mục làm việc chính không thể khóa hay bỏ khóa được" -#: builtin/worktree.c:737 +#: builtin/worktree.c:739 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "“%s” đã được khóa rồi, lý do: %s" -#: builtin/worktree.c:739 +#: builtin/worktree.c:741 #, c-format msgid "'%s' is already locked" msgstr "“%s” đã được khóa rồi" -#: builtin/worktree.c:767 +#: builtin/worktree.c:769 #, c-format msgid "'%s' is not locked" msgstr "“%s” chưa bị khóa" -#: builtin/worktree.c:808 +#: builtin/worktree.c:810 msgid "working trees containing submodules cannot be moved or removed" msgstr "cây làm việc có chứa mô-đun-con không thể di chuyển hay xóa bỏ" -#: builtin/worktree.c:816 +#: builtin/worktree.c:818 msgid "force move even if worktree is dirty or locked" msgstr "ép buộc ngay cả khi cây làm việc đang bẩn hay bị khóa" -#: builtin/worktree.c:839 builtin/worktree.c:963 +#: builtin/worktree.c:841 builtin/worktree.c:965 #, c-format msgid "'%s' is a main working tree" msgstr "“%s” là cây làm việc chính" -#: builtin/worktree.c:844 +#: builtin/worktree.c:846 #, c-format msgid "could not figure out destination name from '%s'" msgstr "không thể phác họa ra tên đích đến “%s”" -#: builtin/worktree.c:857 +#: builtin/worktree.c:859 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23444,7 +23796,7 @@ msgstr "" "không thể di chuyển một cây-làm-việc bị khóa, khóa vì: %s\n" "dùng “move -f -f” để ghi đè hoặc mở khóa trước đã" -#: builtin/worktree.c:859 +#: builtin/worktree.c:861 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23452,38 +23804,38 @@ msgstr "" "không thể di chuyển một cây-làm-việc bị khóa;\n" "dùng “move -f -f” để ghi đè hoặc mở khóa trước đã" -#: builtin/worktree.c:862 +#: builtin/worktree.c:864 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "thẩm tra gặp lỗi, không thể di chuyển một cây-làm-việc: %s" -#: builtin/worktree.c:867 +#: builtin/worktree.c:869 #, c-format msgid "failed to move '%s' to '%s'" msgstr "gặp lỗi khi chuyển “%s” sang “%s”" -#: builtin/worktree.c:913 +#: builtin/worktree.c:915 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "gặp lỗi khi chạy “git status” vào “%s”" -#: builtin/worktree.c:917 +#: builtin/worktree.c:919 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" "“%s” có chứa các tập tin đã bị sửa chữa hoặc chưa được theo dõi, hãy dùng --" "force để xóa nó" -#: builtin/worktree.c:922 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "gặp lỗi khi chạy “git status” trong “%s”, mã %d" -#: builtin/worktree.c:945 +#: builtin/worktree.c:947 msgid "force removal even if worktree is dirty or locked" msgstr "ép buộc di chuyển thậm chí cả khi cây làm việc đang bẩn hay bị khóa" -#: builtin/worktree.c:968 +#: builtin/worktree.c:970 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23492,7 +23844,7 @@ msgstr "" "không thể xóa bỏ một cây-làm-việc bị khóa, khóa vì: %s\n" "dùng “remove -f -f” để ghi đè hoặc mở khóa trước đã" -#: builtin/worktree.c:970 +#: builtin/worktree.c:972 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23500,17 +23852,17 @@ msgstr "" "không thể xóa bỏ một cây-làm-việc bị khóa;\n" "dùng “remove -f -f” để ghi đè hoặc mở khóa trước đã" -#: builtin/worktree.c:973 +#: builtin/worktree.c:975 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "thẩm tra gặp lỗi, không thể gỡ bỏ một cây-làm-việc: %s" -#: builtin/worktree.c:997 +#: builtin/worktree.c:999 #, c-format msgid "repair: %s: %s" msgstr "sửa chữa: %s: %s" -#: builtin/worktree.c:1000 +#: builtin/worktree.c:1002 #, c-format msgid "error: %s: %s" msgstr "lỗi: %s: %s" @@ -23531,49 +23883,6 @@ msgstr "ghi đối tượng cây (tree) cho <tiền tố> thư mục con" msgid "only useful for debugging" msgstr "chỉ hữu ích khi cần gỡ lỗi" -#: http-fetch.c:118 -#, c-format -msgid "argument to --packfile must be a valid hash (got '%s')" -msgstr "tham số cho --packfile phải là một giá trị băm hợp lệ (nhận được “%s”)" - -#: http-fetch.c:128 -msgid "not a git repository" -msgstr "không phải là kho git" - -#: http-fetch.c:134 -#| msgid "--pathspec-file-nul requires --pathspec-from-file" -msgid "--packfile requires --index-pack-args" -msgstr "--packfile cần --index-pack-args" - -#: http-fetch.c:143 -msgid "--index-pack-args can only be used with --packfile" -msgstr "--index-pack-args chỉ được dùng khi có --packfile" - -#: t/helper/test-fast-rebase.c:141 -msgid "unhandled options" -msgstr "các tùy chọn được không xử lý" - -#: t/helper/test-fast-rebase.c:146 -msgid "error preparing revisions" -msgstr "gặp lỗi khi chuẩn bị các điểm xét duyệt" - -#: t/helper/test-reach.c:154 -#, c-format -msgid "commit %s is not marked reachable" -msgstr "lần chuyển giao %s chưa được đánh dấu là tiếp cận được" - -#: t/helper/test-reach.c:164 -msgid "too many commits marked reachable" -msgstr "có quá nhiều lần chuyển giao được đánh dấu là tiếp cận được" - -#: t/helper/test-serve-v2.c:7 -msgid "test-tool serve-v2 [<options>]" -msgstr "test-tool serve-v2 [<các tùy chọn>]" - -#: t/helper/test-serve-v2.c:19 -msgid "exit immediately after advertising capabilities" -msgstr "thoát ngay sau khi khởi tạo quảng cáo capabilities" - #: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" @@ -23631,22 +23940,27 @@ msgstr "chưa đưa ra tiền tố cho --super-prefix\n" msgid "-c expects a configuration string\n" msgstr "-c cần một chuỗi cấu hình\n" -#: git.c:292 +#: git.c:260 +#, c-format +msgid "no config key given for --config-env\n" +msgstr "không đưa ra khóa cấu hình cho --config-env\n" + +#: git.c:300 #, c-format msgid "no directory given for -C\n" msgstr "chưa đưa ra thư mục cho -C\n" -#: git.c:318 +#: git.c:326 #, c-format msgid "unknown option: %s\n" msgstr "không hiểu tùy chọn: %s\n" -#: git.c:367 +#: git.c:375 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "trong khi triển khai bí danh “%s”: “%s”" -#: git.c:376 +#: git.c:384 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -23655,40 +23969,40 @@ msgstr "" "bí danh “%s” thay đổi biến môi trường.\n" "Bạn có thể sử dụng “!git” trong đặt bí danh để làm việc này" -#: git.c:383 +#: git.c:391 #, c-format msgid "empty alias for %s" msgstr "làm trống bí danh cho %s" -#: git.c:386 +#: git.c:394 #, c-format msgid "recursive alias: %s" msgstr "đệ quy các bí danh: %s" -#: git.c:468 +#: git.c:476 msgid "write failure on standard output" msgstr "lỗi ghi nghiêm trong trên đầu ra tiêu chuẩn" -#: git.c:470 +#: git.c:478 msgid "unknown write failure on standard output" msgstr "lỗi nghiêm trọng chưa biết khi ghi ra đầu ra tiêu chuẩn" -#: git.c:472 +#: git.c:480 msgid "close failed on standard output" msgstr "gặp lỗi khi đóng đầu ra tiêu chuẩn" -#: git.c:823 +#: git.c:833 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "" "dò tìm thấy các bí danh quẩn tròn: biểu thức của “%s” không có điểm kết:%s" -#: git.c:873 +#: git.c:883 #, c-format msgid "cannot handle %s as a builtin" msgstr "không thể xử lý %s như là một phần bổ sung" -#: git.c:886 +#: git.c:896 #, c-format msgid "" "usage: %s\n" @@ -23697,16 +24011,165 @@ msgstr "" "cách dùng: %s\n" "\n" -#: git.c:906 +#: git.c:916 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "gặp lỗi khi khai triển bí danh “%s”; “%s” không phải là lệnh git\n" -#: git.c:918 +#: git.c:928 #, c-format msgid "failed to run command '%s': %s\n" msgstr "gặp lỗi khi chạy lệnh “%s”: %s\n" +#: http-fetch.c:118 +#, c-format +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "tham số cho --packfile phải là một giá trị băm hợp lệ (nhận được “%s”)" + +#: http-fetch.c:128 +msgid "not a git repository" +msgstr "không phải là kho git" + +#: http-fetch.c:134 +msgid "--packfile requires --index-pack-args" +msgstr "--packfile cần --index-pack-args" + +#: http-fetch.c:143 +msgid "--index-pack-args can only be used with --packfile" +msgstr "--index-pack-args chỉ được dùng khi có --packfile" + +#: t/helper/test-fast-rebase.c:141 +msgid "unhandled options" +msgstr "các tùy chọn được không xử lý" + +#: t/helper/test-fast-rebase.c:146 +msgid "error preparing revisions" +msgstr "gặp lỗi khi chuẩn bị các điểm xét duyệt" + +#: t/helper/test-reach.c:154 +#, c-format +msgid "commit %s is not marked reachable" +msgstr "lần chuyển giao %s chưa được đánh dấu là tiếp cận được" + +#: t/helper/test-reach.c:164 +msgid "too many commits marked reachable" +msgstr "có quá nhiều lần chuyển giao được đánh dấu là tiếp cận được" + +#: t/helper/test-serve-v2.c:7 +msgid "test-tool serve-v2 [<options>]" +msgstr "test-tool serve-v2 [<các tùy chọn>]" + +#: t/helper/test-serve-v2.c:19 +msgid "exit immediately after advertising capabilities" +msgstr "thoát ngay sau khi khởi tạo quảng cáo capabilities" + +#: t/helper/test-simple-ipc.c:262 +#, c-format +msgid "socket/pipe already in use: '%s'" +msgstr "socket/pipe đã đang được sử dụng rồi: '%s'" + +#: t/helper/test-simple-ipc.c:264 +#, c-format +msgid "could not start server on: '%s'" +msgstr "không thể khởi động máy phục vụ lên: “%s”" + +#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331 +msgid "could not spawn daemon in the background" +msgstr "không thể sinh ra daemon trong nền" + +#: t/helper/test-simple-ipc.c:356 +msgid "waitpid failed" +msgstr "waitpid gặp lỗi" + +#: t/helper/test-simple-ipc.c:376 +msgid "daemon not online yet" +msgstr "\"daemon\" vẫn chưa trực tuyến" + +#: t/helper/test-simple-ipc.c:406 +msgid "daemon failed to start" +msgstr "daemon gặp lỗi khi khởi động" + +#: t/helper/test-simple-ipc.c:410 +msgid "waitpid is confused" +msgstr "waitpid là chưa rõ ràng" + +#: t/helper/test-simple-ipc.c:541 +msgid "daemon has not shutdown yet" +msgstr "\"daemon\" vẫn chưa được tắt đi" + +#: t/helper/test-simple-ipc.c:682 +msgid "test-helper simple-ipc is-active [<name>] [<options>]" +msgstr "test-helper simple-ipc is-active [<tên>] [<các tùy chọn>]" + +#: t/helper/test-simple-ipc.c:683 +msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]" +msgstr "test-helper simple-ipc run-daemon [<tên>] [<các tiến trình>]" + +#: t/helper/test-simple-ipc.c:684 +msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" +msgstr "" +"test-helper simple-ipc start-daemon [<tên>] [<các tiến trình>] [<chờ tối đa>]" + +#: t/helper/test-simple-ipc.c:685 +msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" +msgstr "test-helper simple-ipc stop-daemon [<tên>] [<chờ tối đa>]" + +#: t/helper/test-simple-ipc.c:686 +msgid "test-helper simple-ipc send [<name>] [<token>]" +msgstr "test-helper simple-ipc send [<tên>] [<thẻ>]" + +#: t/helper/test-simple-ipc.c:687 +msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" +msgstr "test-helper simple-ipc sendbytes [<tên>] [<số lượng byte>] [<byte>]" + +#: t/helper/test-simple-ipc.c:688 +msgid "" +"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " +"[<batchsize>]" +msgstr "" +"test-helper simple-ipc multiple [<tên>] [<các tiến trình>] [<số lượng " +"byte>] [<cỡ bó>]" + +#: t/helper/test-simple-ipc.c:696 +msgid "name or pathname of unix domain socket" +msgstr "tên hoặc tên đường dẫn của ổ cắm miền unix" + +#: t/helper/test-simple-ipc.c:698 +msgid "named-pipe name" +msgstr "tên named-pipe" + +#: t/helper/test-simple-ipc.c:700 +msgid "number of threads in server thread pool" +msgstr "số lượng tiến trình trong kho tiến trình máy phục vụ" + +#: t/helper/test-simple-ipc.c:701 +msgid "seconds to wait for daemon to start or stop" +msgstr "số giây mà dịch vụ chạy nền chờ khi khởi động hoặc dừng" + +#: t/helper/test-simple-ipc.c:703 +msgid "number of bytes" +msgstr "số lượng byte" + +#: t/helper/test-simple-ipc.c:704 +msgid "number of requests per thread" +msgstr "số lượng yêu cầu mỗi tiến trình" + +#: t/helper/test-simple-ipc.c:706 +msgid "byte" +msgstr "byte" + +#: t/helper/test-simple-ipc.c:706 +msgid "ballast character" +msgstr "ký tự ballast" + +#: t/helper/test-simple-ipc.c:707 +msgid "token" +msgstr "thẻ bài" + +#: t/helper/test-simple-ipc.c:707 +msgid "command token to send to the server" +msgstr "thẻ bài lệnh để gửi lên cho máy phục vụ" + #: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" @@ -23747,7 +24210,7 @@ msgstr "" msgid "Could not set SSL backend to '%s': already set" msgstr "Không thể đặt ứng dụng chạy sau SSL cho “%s”: đã đặt rồi" -#: http.c:2025 +#: http.c:2035 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -23900,43 +24363,43 @@ msgstr "hiện không có thông tin về trình biên dịch\n" msgid "no libc information available\n" msgstr "không có thông tin về libc\n" -#: list-objects-filter-options.h:91 +#: list-objects-filter-options.h:94 msgid "args" msgstr "các_tham_số" -#: list-objects-filter-options.h:92 +#: list-objects-filter-options.h:95 msgid "object filtering" msgstr "lọc đối tượng" -#: parse-options.h:183 +#: parse-options.h:184 msgid "expiry-date" msgstr "ngày hết hạn" -#: parse-options.h:197 +#: parse-options.h:198 msgid "no-op (backward compatibility)" msgstr "no-op (tương thích ngược)" -#: parse-options.h:309 +#: parse-options.h:310 msgid "be more verbose" msgstr "chi tiết hơn nữa" -#: parse-options.h:311 +#: parse-options.h:312 msgid "be more quiet" msgstr "im lặng hơn nữa" -#: parse-options.h:317 +#: parse-options.h:318 msgid "use <n> digits to display object names" msgstr "sử dụng <n> chữ số để hiển thị tên đối tượng" -#: parse-options.h:336 +#: parse-options.h:337 msgid "how to strip spaces and #comments from message" msgstr "làm thế nào để cắt bỏ khoảng trắng và #ghichú từ mẩu tin nhắn" -#: parse-options.h:337 +#: parse-options.h:338 msgid "read pathspec from file" msgstr "đọc đặc tả đường dẫn từ tập tin" -#: parse-options.h:338 +#: parse-options.h:339 msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "" @@ -25627,26 +26090,31 @@ msgstr "múi giờ nội bộ khác biệt với GMT bởi khoảng thời gian msgid "local time offset greater than or equal to 24 hours\n" msgstr "khoảng bù thời gian nội bộ lớn hơn hoặc bằng 24 giờ\n" -#: git-send-email.perl:223 git-send-email.perl:229 +#: git-send-email.perl:222 +#, perl-format +msgid "fatal: command '%s' died with exit code %d" +msgstr "lỗi nghiêm trọng: lệnh '%s' chết với mã thoát %d" + +#: git-send-email.perl:235 msgid "the editor exited uncleanly, aborting everything" msgstr "trình soạn thảo thoát không sạch sẽ, bãi bỏ mọi thứ" -#: git-send-email.perl:312 +#: git-send-email.perl:321 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "“%s” có chưa một phiên bản trung gian của thư bạn đã soạn.\n" -#: git-send-email.perl:317 +#: git-send-email.perl:326 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "“%s.final” chứa thư điện tử đã soạn thảo.\n" -#: git-send-email.perl:410 +#: git-send-email.perl:419 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases xung khắc với các tùy chọn khác\n" -#: git-send-email.perl:484 +#: git-send-email.perl:493 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -25656,11 +26124,11 @@ msgstr "" "git-send-email được cấu hình với các tùy chọn sendemail.* - chú ý “e”.\n" "Đặt sendemail.forbidSendmailVariables thành false để tắt kiểm tra này.\n" -#: git-send-email.perl:489 git-send-email.perl:691 +#: git-send-email.perl:498 git-send-email.perl:700 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Không thể chạy git format-patch ở ngoài một kho chứa\n" -#: git-send-email.perl:492 +#: git-send-email.perl:501 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -25668,37 +26136,37 @@ msgstr "" "“batch-size” và “relogin” phải được chỉ định cùng với nhau (thông qua dòng " "lệnh hoặc tùy chọn cấu hình)\n" -#: git-send-email.perl:505 +#: git-send-email.perl:514 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Không hiểu trường --suppress-cc: “%s”\n" -#: git-send-email.perl:536 +#: git-send-email.perl:545 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Không hiểu cài đặt --confirm: “%s”\n" -#: git-send-email.perl:564 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "cảnh báo: bí danh sendmail với dấu trích dẫn không được hỗ trợ: %s\n" -#: git-send-email.perl:566 +#: git-send-email.perl:575 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "cảnh báo: “:include:“ không được hỗ trợ: %s\n" -#: git-send-email.perl:568 +#: git-send-email.perl:577 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "cảnh báo: chuyển hướng “/file“ hay “|pipe“ không được hỗ trợ: %s\n" -#: git-send-email.perl:573 +#: git-send-email.perl:582 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "cảnh báo: dòng sendmail không nhận ra được: %s\n" -#: git-send-email.perl:657 +#: git-send-email.perl:666 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -25713,21 +26181,12 @@ msgstr "" " * Nói \"./%s\" nếu ý bạn là một tập tin; hoặc\n" " * Đưa ra tùy chọn --format-patch nếu ý bạn là chuẩn bị.\n" -#: git-send-email.perl:678 +#: git-send-email.perl:687 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Gặp lỗi khi mở thư mục “%s”: %s" -#: git-send-email.perl:702 -#, perl-format -msgid "" -"fatal: %s: %s\n" -"warning: no patches were sent\n" -msgstr "" -"nghiêm trọng: %s: %s\n" -"cảnh báo: không có miếng vá nào được gửi đi\n" - -#: git-send-email.perl:713 +#: git-send-email.perl:720 msgid "" "\n" "No patch files specified!\n" @@ -25737,17 +26196,17 @@ msgstr "" "Chưa chỉ định các tập tin miếng vá!\n" "\n" -#: git-send-email.perl:726 +#: git-send-email.perl:733 #, perl-format msgid "No subject line in %s?" msgstr "Không có dòng chủ đề trong %s?" -#: git-send-email.perl:736 +#: git-send-email.perl:743 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Gặp lỗi khi mở “%s” để ghi: %s" -#: git-send-email.perl:747 +#: git-send-email.perl:754 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -25761,27 +26220,27 @@ msgstr "" "\n" "Xóa nội dung phần thân nếu bạn không muốn gửi tóm tắt.\n" -#: git-send-email.perl:771 +#: git-send-email.perl:778 #, perl-format msgid "Failed to open %s: %s" msgstr "Gặp lỗi khi mở “%s”: %s" -#: git-send-email.perl:788 +#: git-send-email.perl:795 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Gặp lỗi khi mở %s.final: %s" -#: git-send-email.perl:831 +#: git-send-email.perl:838 msgid "Summary email is empty, skipping it\n" msgstr "Thư tổng thể là trống rỗng, nên bỏ qua nó\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:866 +#: git-send-email.perl:873 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Bạn có chắc muốn dùng <%s> [y/N]? " -#: git-send-email.perl:921 +#: git-send-email.perl:928 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -25789,11 +26248,11 @@ msgstr "" "Các trường sau đây là 8bit, nhưng không khai báo một Content-Transfer-" "Encoding.\n" -#: git-send-email.perl:926 +#: git-send-email.perl:933 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Bảng mã 8bit nào tôi nên khai báo [UTF-8]? " -#: git-send-email.perl:934 +#: git-send-email.perl:941 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -25806,20 +26265,20 @@ msgstr "" "có chủ đề ở dạng mẫu “*** SUBJECT HERE ***”. Dùng --force nếu bạn thực sự " "muốn gửi.\n" -#: git-send-email.perl:953 +#: git-send-email.perl:960 msgid "To whom should the emails be sent (if anyone)?" msgstr "Tới người mà thư được gửi (nếu có)?" -#: git-send-email.perl:971 +#: git-send-email.perl:978 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "nghiêm trọng: bí danh “%s” được khai triển thành chính nó\n" -#: git-send-email.perl:983 +#: git-send-email.perl:990 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "Message-ID được dùng như là In-Reply-To cho thư đầu tiên (nếu có)? " -#: git-send-email.perl:1041 git-send-email.perl:1049 +#: git-send-email.perl:1048 git-send-email.perl:1056 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "lỗi: không thể rút trích một địa chỉ hợp lệ từ: %s\n" @@ -25827,16 +26286,16 @@ msgstr "lỗi: không thể rút trích một địa chỉ hợp lệ từ: %s\n #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1053 +#: git-send-email.perl:1060 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Làm gì với địa chỉ này? (thoát[q]|xóa[d]|sửa[e]): " -#: git-send-email.perl:1370 +#: git-send-email.perl:1377 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "Đường dẫn CA “%s” không tồn tại" -#: git-send-email.perl:1453 +#: git-send-email.perl:1460 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -25863,134 +26322,182 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1468 +#: git-send-email.perl:1475 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Gửi thư này chứ? ([y]có|[n]không|[e]sửa|[q]thoát|[a]tất): " -#: git-send-email.perl:1471 +#: git-send-email.perl:1478 msgid "Send this email reply required" msgstr "Gửi thư này trả lời yêu cầu" -#: git-send-email.perl:1499 +#: git-send-email.perl:1506 msgid "The required SMTP server is not properly defined." msgstr "Máy phục vụ SMTP chưa được định nghĩa một cách thích hợp." -#: git-send-email.perl:1546 +#: git-send-email.perl:1553 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Máy chủ không hỗ trợ STARTTLS! %s" -#: git-send-email.perl:1551 git-send-email.perl:1555 +#: git-send-email.perl:1558 git-send-email.perl:1562 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS gặp lỗi! %s" -#: git-send-email.perl:1564 +#: git-send-email.perl:1571 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Không thể khởi tạo SMTP một cách đúng đắn. Kiểm tra cấu hình và dùng --smtp-" "debug." -#: git-send-email.perl:1582 +#: git-send-email.perl:1589 #, perl-format msgid "Failed to send %s\n" msgstr "Gặp lỗi khi gửi %s\n" -#: git-send-email.perl:1585 +#: git-send-email.perl:1592 #, perl-format msgid "Dry-Sent %s\n" msgstr "Thử gửi %s\n" -#: git-send-email.perl:1585 +#: git-send-email.perl:1592 #, perl-format msgid "Sent %s\n" msgstr "Gửi %s\n" -#: git-send-email.perl:1587 +#: git-send-email.perl:1594 msgid "Dry-OK. Log says:\n" msgstr "Dry-OK. Nhật ký nói rằng:\n" -#: git-send-email.perl:1587 +#: git-send-email.perl:1594 msgid "OK. Log says:\n" msgstr "OK. Nhật ký nói rằng:\n" -#: git-send-email.perl:1599 +#: git-send-email.perl:1606 msgid "Result: " msgstr "Kết quả: " -#: git-send-email.perl:1602 +#: git-send-email.perl:1609 msgid "Result: OK\n" msgstr "Kết quả: Tốt\n" -#: git-send-email.perl:1620 +#: git-send-email.perl:1627 #, perl-format msgid "can't open file %s" msgstr "không thể mở tập tin “%s”" -#: git-send-email.perl:1667 git-send-email.perl:1687 +#: git-send-email.perl:1674 git-send-email.perl:1694 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Thêm cc: %s từ dòng “%s”\n" -#: git-send-email.perl:1673 +#: git-send-email.perl:1680 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Đang thêm to: %s từ dòng “%s”\n" -#: git-send-email.perl:1730 +#: git-send-email.perl:1737 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Thêm cc: %s từ dòng “%s”\n" -#: git-send-email.perl:1765 +#: git-send-email.perl:1772 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Thêm cc: %s từ dòng “%s”\n" -#: git-send-email.perl:1876 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Không thể thực thi “%s”" -#: git-send-email.perl:1883 +#: git-send-email.perl:1890 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Đang thêm %s: %s từ: “%s”\n" -#: git-send-email.perl:1887 +#: git-send-email.perl:1894 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) gặp lỗi khi đóng đường ống đến “%s”" -#: git-send-email.perl:1917 +#: git-send-email.perl:1924 msgid "cannot send message as 7bit" msgstr "không thể lấy gửi thư dạng 7 bít" -#: git-send-email.perl:1925 +#: git-send-email.perl:1932 msgid "invalid transfer encoding" msgstr "bảng mã truyền không hợp lệ" -#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 +#: git-send-email.perl:1966 +#, perl-format +msgid "" +"fatal: %s: rejected by sendemail-validate hook\n" +"%s\n" +"warning: no patches were sent\n" +msgstr "" +"nghiêm trọng: %s: bị từ chối bởi móc sendemail-validate\n" +"%s\n" +"cảnh báo: không có miếng vá nào được gửi đi\n" + +#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039 #, perl-format msgid "unable to open %s: %s\n" msgstr "không thể mở %s: %s\n" -#: git-send-email.perl:1969 +#: git-send-email.perl:1979 #, perl-format -msgid "%s: patch contains a line longer than 998 characters" -msgstr "%s: miếng vá có chứa dòng dài hơn 998 ký tự" +msgid "" +"fatal: %s:%d is longer than 998 characters\n" +"warning: no patches were sent\n" +msgstr "" +"nghiêm trọng: %s: %d là dài hơn 998 ký tự\n" +"cảnh báo: không có miếng vá nào được gửi đi\n" -#: git-send-email.perl:1986 +#: git-send-email.perl:1997 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Bỏ qua %s với hậu tố sao lưu dự phòng “%s”.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1990 +#: git-send-email.perl:2001 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): " +#~ msgid "--cached and --3way cannot be used together." +#~ msgstr "--cached và --3way không thể dùng cùng nhau." + +#~ msgid "both" +#~ msgstr "cả hai" + +#~ msgid "one" +#~ msgstr "một" + +#, c-format +#~ msgid "Already up to date!" +#~ msgstr "Đã cập nhật rồi!" + +#~ msgid "Already up to date. Yeeah!" +#~ msgstr "Đã cập nhật rồi. Yeeah!" + +#~ msgid "--batch-size option is only for 'repack' subcommand" +#~ msgstr "tùy chọn --batch-size chỉ cho lệnh con “repack”" + +#~ msgid "Percentage by which creation is weighted" +#~ msgstr "Tỷ lệ phần trăm cái tạo là weighted" + +#~ msgid "" +#~ "the rebase.useBuiltin support has been removed!\n" +#~ "See its entry in 'git help config' for details." +#~ msgstr "" +#~ "việc hỗ trợ rebase.useBuiltin đã bị xóa!\n" +#~ "Xem mục tin của nó trong “ git help config” để biết chi tiết." + +#, perl-format +#~ msgid "%s: patch contains a line longer than 998 characters" +#~ msgstr "%s: miếng vá có chứa dòng dài hơn 998 ký tự" + #~ msgid "repository contains replace objects; skipping commit-graph" #~ msgstr "" #~ "kho lưu trữ chứa các đối tượng thay thế; bỏ qua sơ đồ lần chuyển giao" @@ -27020,9 +27527,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): " #~ msgid "commit object" #~ msgstr "đối tượng lần chuyển giao" -#~ msgid "tree object" -#~ msgstr "đối tượng cây" - #~ msgid "blob object" #~ msgstr "đối tượng blob" @@ -27063,9 +27567,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): " #~ msgid "insanely long object directory %.*s" #~ msgstr "thư mục đối tượng dài một cách điên rồ %.*s" -#~ msgid "git merge [<options>] <msg> HEAD <commit>" -#~ msgstr "git merge [<các-tùy-chọn>] <tin-nhắn> HEAD <commit>" - #~ msgid "tag name too long: %.*s..." #~ msgstr "tên thẻ quá dài: %.*s…" @@ -27162,9 +27663,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): " #~ "sai giá trị bằng số của cấu hình “%s” cho “%s” trong %s: đơn vị không hợp " #~ "lệ" -#~ msgid "This is the 2nd commit message:" -#~ msgstr "Đây là chú thích cho lần chuyển giao thứ 2:" - #~ msgid "This is the 3rd commit message:" #~ msgstr "Đây là chú thích cho lần chuyển giao thứ 3:" @@ -27201,9 +27699,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): " #~ msgid "This is the ${n}rd commit message:" #~ msgstr "Đây là chú thích cho lần chuyển giao thứ ${n}:" -#~ msgid "The 1st commit message will be skipped:" -#~ msgstr "Chú thích cho lần chuyển giao thứ nhất sẽ bị bỏ qua:" - #~ msgid "The 2nd commit message will be skipped:" #~ msgstr "Chú thích cho lần chuyển giao thứ 2 sẽ bị bỏ qua:" |