summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/it.po251
-rw-r--r--po/zh_TW.po7847
2 files changed, 4305 insertions, 3793 deletions
diff --git a/po/it.po b/po/it.po
index acabb0d..769d9e0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-05-15 09:11+0800\n"
-"PO-Revision-Date: 2020-05-15 08:28+0200\n"
+"POT-Creation-Date: 2020-05-27 07:23+0800\n"
+"PO-Revision-Date: 2020-05-27 18:21+0200\n"
"Last-Translator: Alessandro Menti <alessandro.menti@alessandromenti.it>\n"
"Language-Team: Italian <>\n"
"Language: it\n"
@@ -20,7 +20,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 20.04.0\n"
+"X-Generator: Lokalize 20.04.1\n"
#: add-interactive.c:368
#, c-format
@@ -1462,7 +1462,7 @@ msgid "allow overlapping hunks"
msgstr "consenti la sovrapposizione dei frammenti"
#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
-#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:774
+#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775
#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "visualizza ulteriori dettagli"
@@ -2913,7 +2913,7 @@ msgstr "percorso strano '%s' bloccato"
msgid "unable to fork"
msgstr "impossibile eseguire fork"
-#: connected.c:107 builtin/fsck.c:208 builtin/prune.c:45
+#: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Controllo connessione in corso"
@@ -3976,7 +3976,7 @@ msgstr "commit non valido: %s"
msgid "giving up"
msgstr "smetto di provare"
-#: fetch-pack.c:476 progress.c:340
+#: fetch-pack.c:476 progress.c:336
msgid "done"
msgstr "fatto"
@@ -4665,7 +4665,7 @@ msgstr "ridenominazione"
msgid "renamed"
msgstr "rinominato"
-#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
+#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Mi rifiuto di perdere un file sporco in %s"
@@ -4706,14 +4706,14 @@ msgstr ""
msgid " (left unresolved)"
msgstr " (lasciato irrisolto)"
-#: merge-recursive.c:1793
+#: merge-recursive.c:1805
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLITTO (ridenominazione/ridenominazione): file ridenominato %s->%s in %s. "
"Ridenominato %s->%s in %s"
-#: merge-recursive.c:2056
+#: merge-recursive.c:2068
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4724,7 +4724,7 @@ msgstr ""
"perché la directory %s è stata ridenominata in più directory diverse e "
"nessuna directory di destinazione contiene la maggior parte dei file."
-#: merge-recursive.c:2088
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4734,7 +4734,7 @@ msgstr ""
"%s è d'ostacolo alle seguenti ridenominazioni directory che spostano in tale "
"posizione i seguenti percorsi: %s."
-#: merge-recursive.c:2098
+#: merge-recursive.c:2110
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4744,7 +4744,7 @@ msgstr ""
"un percorso in %s; delle ridenominazioni directory implicite hanno tentato "
"di spostare in tale posizione i seguenti percorsi: %s"
-#: merge-recursive.c:2190
+#: merge-recursive.c:2202
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4753,7 +4753,7 @@ msgstr ""
"CONFLITTO (ridenominazione/ridenominazione): directory ridenominata %s->%s "
"in %s. Directory ridenominata %s->%s in %s"
-#: merge-recursive.c:2435
+#: merge-recursive.c:2447
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4762,52 +4762,52 @@ msgstr ""
"ATTENZIONE: evito di applicare la ridenominazione %s -> %s a %s perché %s "
"stesso è stato ridenominato."
-#: merge-recursive.c:2961
+#: merge-recursive.c:2973
#, c-format
msgid "cannot read object %s"
msgstr "impossibile leggere l'oggetto %s"
-#: merge-recursive.c:2964
+#: merge-recursive.c:2976
#, c-format
msgid "object %s is not a blob"
msgstr "l'oggetto %s non è un blob"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modify"
msgstr "modifica"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modified"
msgstr "modificato"
-#: merge-recursive.c:3040
+#: merge-recursive.c:3052
msgid "content"
msgstr "contenuto"
-#: merge-recursive.c:3044
+#: merge-recursive.c:3056
msgid "add/add"
msgstr "aggiunta/aggiunta"
-#: merge-recursive.c:3067
+#: merge-recursive.c:3079
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Omesso %s (elemento sottoposto a merge uguale a quello esistente)"
-#: merge-recursive.c:3089 git-submodule.sh:985
+#: merge-recursive.c:3101 git-submodule.sh:985
msgid "submodule"
msgstr "sottomodulo"
-#: merge-recursive.c:3090
+#: merge-recursive.c:3102
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLITTO (%s): conflitto di merge in %s"
-#: merge-recursive.c:3120
+#: merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr "Lo aggiungo come %s"
-#: merge-recursive.c:3203
+#: merge-recursive.c:3215
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4816,7 +4816,7 @@ msgstr ""
"Percorso aggiornato: %s aggiunto in %s in una directory ridenominata in %s; "
"lo sposto in %s."
-#: merge-recursive.c:3206
+#: merge-recursive.c:3218
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4825,7 +4825,7 @@ msgstr ""
"CONFLITTO (posizione file): %s aggiunto in %s in una directory ridenominata "
"in %s, il che suggerisce che forse dovrebbe essere spostato in %s."
-#: merge-recursive.c:3210
+#: merge-recursive.c:3222
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4834,7 +4834,7 @@ msgstr ""
"Percorso aggiornato: %s ridenominato in %s in %s in una directory "
"ridenominata in %s; lo sposto in %s."
-#: merge-recursive.c:3213
+#: merge-recursive.c:3225
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4844,61 +4844,61 @@ msgstr ""
"ridenominata in %s, il che suggerisce che forse dovrebbe essere spostato in "
"%s."
-#: merge-recursive.c:3327
+#: merge-recursive.c:3339
#, c-format
msgid "Removing %s"
msgstr "Rimozione di %s"
-#: merge-recursive.c:3350
+#: merge-recursive.c:3362
msgid "file/directory"
msgstr "file/directory"
-#: merge-recursive.c:3355
+#: merge-recursive.c:3367
msgid "directory/file"
msgstr "directory/file"
-#: merge-recursive.c:3362
+#: merge-recursive.c:3374
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLITTO (%s): una directory denominata %s esiste già in %s. Aggiungo %s "
"come %s"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3383
#, c-format
msgid "Adding %s"
msgstr "Aggiunta %s"
-#: merge-recursive.c:3380
+#: merge-recursive.c:3392
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "CONFLITTO (aggiungi/aggiungi): conflitto di merge in %s"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3436
msgid "Already up to date!"
msgstr "Già aggiornato!"
-#: merge-recursive.c:3433
+#: merge-recursive.c:3445
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "merge degli alberi %s e %s non riuscito"
-#: merge-recursive.c:3537
+#: merge-recursive.c:3549
msgid "Merging:"
msgstr "Merge in corso:"
-#: merge-recursive.c:3550
+#: merge-recursive.c:3562
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "trovato %u antenato comune:"
msgstr[1] "trovati %u antenati comuni:"
-#: merge-recursive.c:3600
+#: merge-recursive.c:3612
msgid "merge returned no commit"
msgstr "il merge non ha restituito alcun commit"
-#: merge-recursive.c:3659
+#: merge-recursive.c:3671
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4907,12 +4907,12 @@ msgstr ""
"Le tue modifiche locali ai seguenti file sarebbero sovrascritte dal merge:\n"
" %s"
-#: merge-recursive.c:3756
+#: merge-recursive.c:3768
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossibile analizzare l'oggetto '%s'"
-#: merge-recursive.c:3774 builtin/merge.c:705 builtin/merge.c:885
+#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885
msgid "Unable to write index."
msgstr "Impossibile scrivere l'indice."
@@ -5485,8 +5485,8 @@ msgid ""
"could not parse first line of `log` output: did not start with 'commit ': "
"'%s'"
msgstr ""
-"impossibile analizzare la prima riga dell'output di `log`: non inizia con"
-" 'commit ': %s"
+"impossibile analizzare la prima riga dell'output di `log`: non inizia con "
+"'commit ': %s"
#: range-diff.c:137
#, c-format
@@ -5814,7 +5814,7 @@ msgstr ""
"\n"
#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463
-#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:346 builtin/rebase.c:258
+#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258
#, c-format
msgid "could not write '%s'"
msgstr "impossibile scrivere '%s'"
@@ -8973,8 +8973,8 @@ msgid ""
"patterns:\n"
"%s"
msgstr ""
-"I seguenti percorsi non sono aggiornati e sono stati mantenuti nonostante vi"
-" siano dei pattern sparse:\n"
+"I seguenti percorsi non sono aggiornati e sono stati mantenuti nonostante vi "
+"siano dei pattern sparse:\n"
"%s"
#: unpack-trees.c:180
@@ -8983,8 +8983,8 @@ msgid ""
"The following paths are unmerged and were left despite sparse patterns:\n"
"%s"
msgstr ""
-"I seguenti percorsi non sono stati sottoposti a merge e sono stati mantenuti"
-" nonostante vi siano dei pattern sparse:\n"
+"I seguenti percorsi non sono stati sottoposti a merge e sono stati mantenuti "
+"nonostante vi siano dei pattern sparse:\n"
"%s"
#: unpack-trees.c:182
@@ -8994,8 +8994,8 @@ msgid ""
"patterns:\n"
"%s"
msgstr ""
-"I seguenti percorsi erano già presenti e pertanto non sono stati aggiornati"
-" nonostante vi siano dei pattern sparse:\n"
+"I seguenti percorsi erano già presenti e pertanto non sono stati aggiornati "
+"nonostante vi siano dei pattern sparse:\n"
"%s"
#: unpack-trees.c:262
@@ -9009,8 +9009,8 @@ msgid ""
"After fixing the above paths, you may want to run `git sparse-checkout "
"reapply`.\n"
msgstr ""
-"Dopo aver corretto i percorsi sopra menzionati, potresti voler eseguire `git"
-" sparse-checkout reapply`.\n"
+"Dopo aver corretto i percorsi sopra menzionati, potresti voler eseguire `git "
+"sparse-checkout reapply`.\n"
#: unpack-trees.c:350
msgid "Updating files"
@@ -12640,9 +12640,9 @@ msgid ""
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]progress] <split options>"
msgstr ""
-"git commit-graph write [--object-dir <directory oggetti>] [--append]"
-" [--split[=<strategia>]] [--reachable|--stdin-packs|--stdin-commits]"
-" [--changed-paths] [--[no-]progress] <opzioni split>"
+"git commit-graph write [--object-dir <directory oggetti>] [--append] [--"
+"split[=<strategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]progress] <opzioni split>"
#: builtin/commit-graph.c:60
#, c-format
@@ -14567,32 +14567,32 @@ msgstr "stampa solo i riferimenti contenenti il commit"
msgid "print only refs which don't contain the commit"
msgstr "stampa solo i riferimenti che non contengono il commit"
-#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
+#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149
msgid "unknown"
msgstr "sconosciuto"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:100 builtin/fsck.c:120
+#: builtin/fsck.c:101 builtin/fsck.c:121
#, c-format
msgid "error in %s %s: %s"
msgstr "errore in %s %s: %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:114
+#: builtin/fsck.c:115
#, c-format
msgid "warning in %s %s: %s"
msgstr "avviso in %s %s: %s"
-#: builtin/fsck.c:143 builtin/fsck.c:146
+#: builtin/fsck.c:144 builtin/fsck.c:147
#, c-format
msgid "broken link from %7s %s"
msgstr "collegamento rotto da %7s %s"
-#: builtin/fsck.c:155
+#: builtin/fsck.c:156
msgid "wrong object type in link"
msgstr "tipo oggetto errato nel collegamento"
-#: builtin/fsck.c:171
+#: builtin/fsck.c:172
#, c-format
msgid ""
"broken link from %7s %s\n"
@@ -14601,211 +14601,211 @@ msgstr ""
"collegamento rotto da %7s %s\n"
" a %7s %s"
-#: builtin/fsck.c:282
+#: builtin/fsck.c:283
#, c-format
msgid "missing %s %s"
msgstr "%s mancante %s"
-#: builtin/fsck.c:309
+#: builtin/fsck.c:310
#, c-format
msgid "unreachable %s %s"
msgstr "%s non raggiungibile %s"
-#: builtin/fsck.c:329
+#: builtin/fsck.c:330
#, c-format
msgid "dangling %s %s"
msgstr "%s pendente %s"
-#: builtin/fsck.c:339
+#: builtin/fsck.c:340
msgid "could not create lost-found"
msgstr "impossibile creare lost-found"
-#: builtin/fsck.c:350
+#: builtin/fsck.c:351
#, c-format
msgid "could not finish '%s'"
msgstr "impossibile terminare '%s'"
-#: builtin/fsck.c:367
+#: builtin/fsck.c:368
#, c-format
msgid "Checking %s"
msgstr "Controllo di %s in corso"
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "Controllo connessione in corso (%d oggetti)"
-#: builtin/fsck.c:424
+#: builtin/fsck.c:425
#, c-format
msgid "Checking %s %s"
msgstr "Controllo di %s in corso %s"
-#: builtin/fsck.c:429
+#: builtin/fsck.c:430
msgid "broken links"
msgstr "collegamenti rotti"
-#: builtin/fsck.c:438
+#: builtin/fsck.c:439
#, c-format
msgid "root %s"
msgstr "radice %s"
-#: builtin/fsck.c:446
+#: builtin/fsck.c:447
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr "eseguito tag di %s %s (%s) in %s"
-#: builtin/fsck.c:475
+#: builtin/fsck.c:476
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s: oggetto corrotto o mancante"
-#: builtin/fsck.c:500
+#: builtin/fsck.c:501
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s: voce registro riferimenti non valida: %s"
-#: builtin/fsck.c:514
+#: builtin/fsck.c:515
#, c-format
msgid "Checking reflog %s->%s"
msgstr "Controllo registro riferimenti %s->%s"
-#: builtin/fsck.c:548
+#: builtin/fsck.c:549
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s: puntatore SHA1 non valido: %s"
-#: builtin/fsck.c:555
+#: builtin/fsck.c:556
#, c-format
msgid "%s: not a commit"
msgstr "%s: non è un commit"
-#: builtin/fsck.c:609
+#: builtin/fsck.c:610
msgid "notice: No default references"
msgstr "avviso: nessun riferimento predefinito"
-#: builtin/fsck.c:624
+#: builtin/fsck.c:625
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: oggetto corrotto o mancante: %s"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:638
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: impossibile analizzare l'oggetto: %s"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:658
#, c-format
msgid "bad sha1 file: %s"
msgstr "file SHA1 non valido: %s"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:673
msgid "Checking object directory"
msgstr "Controllo directory oggetti in corso"
-#: builtin/fsck.c:675
+#: builtin/fsck.c:676
msgid "Checking object directories"
msgstr "Controllo directory oggetti in corso"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:691
#, c-format
msgid "Checking %s link"
msgstr "Controllo collegamento %s"
-#: builtin/fsck.c:695 builtin/index-pack.c:843
+#: builtin/fsck.c:696 builtin/index-pack.c:843
#, c-format
msgid "invalid %s"
msgstr "%s non valido"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:703
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s punta a qualcosa di strano (%s)"
-#: builtin/fsck.c:708
+#: builtin/fsck.c:709
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: l'HEAD scollegato non punta a niente"
-#: builtin/fsck.c:712
+#: builtin/fsck.c:713
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "avviso: %s punta a un branch non nato (%s)"
-#: builtin/fsck.c:724
+#: builtin/fsck.c:725
msgid "Checking cache tree"
msgstr "Controllo cache albero in corso"
-#: builtin/fsck.c:729
+#: builtin/fsck.c:730
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: puntatore SHA1 non valido nella cache alberi"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
msgid "non-tree in cache-tree"
msgstr "oggetto non albero nella cache alberi"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:770
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opzioni>] [<oggetto>...]"
-#: builtin/fsck.c:775
+#: builtin/fsck.c:776
msgid "show unreachable objects"
msgstr "visualizza oggetti non raggiungibili"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:777
msgid "show dangling objects"
msgstr "visualizza oggetti pendenti"
-#: builtin/fsck.c:777
+#: builtin/fsck.c:778
msgid "report tags"
msgstr "segnala i tag"
-#: builtin/fsck.c:778
+#: builtin/fsck.c:779
msgid "report root nodes"
msgstr "segnala i nodi radice"
-#: builtin/fsck.c:779
+#: builtin/fsck.c:780
msgid "make index objects head nodes"
msgstr "rendi gli oggetti indice nodi head"
-#: builtin/fsck.c:780
+#: builtin/fsck.c:781
msgid "make reflogs head nodes (default)"
msgstr "rendi i registri dei riferimenti nodi head (impostazione predefinita)"
-#: builtin/fsck.c:781
+#: builtin/fsck.c:782
msgid "also consider packs and alternate objects"
msgstr "considera anche i pack e gli oggetti alternativi"
-#: builtin/fsck.c:782
+#: builtin/fsck.c:783
msgid "check only connectivity"
msgstr "controlla solo la connessione"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
msgid "enable more strict checking"
msgstr "abilita controlli più restrittivi"
-#: builtin/fsck.c:785
+#: builtin/fsck.c:786
msgid "write dangling objects in .git/lost-found"
msgstr "scrivi oggetti pendenti in .git/lost-found"
-#: builtin/fsck.c:786 builtin/prune.c:134
+#: builtin/fsck.c:787 builtin/prune.c:134
msgid "show progress"
msgstr "visualizza l'avanzamento"
-#: builtin/fsck.c:787
+#: builtin/fsck.c:788
msgid "show verbose names for reachable objects"
msgstr "visualizza nomi dettagliati per gli oggetti raggiungibili"
-#: builtin/fsck.c:846 builtin/index-pack.c:225
+#: builtin/fsck.c:847 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "Controllo oggetti in corso"
-#: builtin/fsck.c:874
+#: builtin/fsck.c:875
#, c-format
msgid "%s: object missing"
msgstr "%s: oggetto mancante"
-#: builtin/fsck.c:885
+#: builtin/fsck.c:886
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "parametro non valido: atteso SHA1, presente '%s'"
@@ -18028,7 +18028,8 @@ msgstr ""
" git config pull.rebase true # rebase\n"
" git config pull.ff only # esegui solo fast forward\n"
"\n"
-"Puoi sostituire \"git config\" con \"git config --global\" per impostare una\n"
+"Puoi sostituire \"git config\" con \"git config --global\" per impostare "
+"una\n"
"preferenza predefinita per tutti i repository. Puoi anche passare gli\n"
"argomenti --rebase, --no-rebase o --ff-only sulla riga di comando per\n"
"eseguire l'override del valore predefinito configurato per una singola\n"
@@ -22691,7 +22692,8 @@ msgstr ""
"Grazie per voler compilare una segnalazione d'errore per Git!\n"
"Rispondi alle seguenti domande per consentirci di capire il problema.\n"
"\n"
-"Cos'hai fatto prima che si verificasse l'errore? (Passaggi per riprodurre il\n"
+"Cos'hai fatto prima che si verificasse l'errore? (Passaggi per riprodurre "
+"il\n"
"problema)\n"
"\n"
"Cosa ti aspettavi che succedesse? (Comportamento atteso)\n"
@@ -22761,7 +22763,8 @@ msgstr "Atteso comando 'to', ricevuto %s"
#: fast-import.c:3317
msgid "Expected format name:filename for submodule rewrite option"
msgstr ""
-"Per l'opzione riscrittura sottomodulo ci si attendeva un formato nome:nomefile"
+"Per l'opzione riscrittura sottomodulo ci si attendeva un formato nome:"
+"nomefile"
#: fast-import.c:3371
#, c-format
@@ -23214,8 +23217,8 @@ msgstr "Elenca, crea o elimina branch"
#: command-list.h:59
msgid "Collect information for user to file a bug report"
msgstr ""
-"Raccogli le informazioni necessarie perché l'utente possa inviare una"
-" segnalazione d'errore"
+"Raccogli le informazioni necessarie perché l'utente possa inviare una "
+"segnalazione d'errore"
#: command-list.h:60
msgid "Move objects and refs by archive"
@@ -23811,46 +23814,50 @@ msgid "A useful minimum set of commands for Everyday Git"
msgstr "Un insieme di comandi utile e minimale per l'uso quotidiano di Git"
#: command-list.h:203
+msgid "Frequently asked questions about using Git"
+msgstr "Domande frequenti sull'utilizzo di Git"
+
+#: command-list.h:204
msgid "A Git Glossary"
msgstr "Un glossario di Git"
-#: command-list.h:204
+#: command-list.h:205
msgid "Hooks used by Git"
msgstr "Hook usati da Git"
-#: command-list.h:205
+#: command-list.h:206
msgid "Specifies intentionally untracked files to ignore"
msgstr "Specifica i file intenzionalmente non tracciati da ignorare"
-#: command-list.h:206
+#: command-list.h:207
msgid "Defining submodule properties"
msgstr "Definizione proprietà sottomodulo"
-#: command-list.h:207
+#: command-list.h:208
msgid "Git namespaces"
msgstr "Spazi dei nomi Git"
-#: command-list.h:208
+#: command-list.h:209
msgid "Git Repository Layout"
msgstr "Struttura repository Git"
-#: command-list.h:209
+#: command-list.h:210
msgid "Specifying revisions and ranges for Git"
msgstr "Come specificare revisioni e intervalli in Git"
-#: command-list.h:210
+#: command-list.h:211
msgid "Mounting one repository inside another"
msgstr "Monto un repository dentro un altro"
-#: command-list.h:211
+#: command-list.h:212
msgid "A tutorial introduction to Git: part two"
msgstr "Un tutorial introduttivo per Git: seconda parte"
-#: command-list.h:212
+#: command-list.h:213
msgid "A tutorial introduction to Git"
msgstr "Un tutorial introduttivo per Git"
-#: command-list.h:213
+#: command-list.h:214
msgid "An overview of recommended workflows with Git"
msgstr "Una panoramica dei flussi di lavoro raccomandati in Git"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5efe496..38670cb 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -17,152 +17,304 @@
# - Zhuang Ya <zhuangya AT me.com>
#
# Git glossary for Chinese translators
+# updated on 5/23/2020
#
-# English | Chinese
-# ---------------------------------+--------------------------------------
-# 3-way merge | 三方合併
-# abbreviate | 簡寫(的 SHA-1 值)
-# alternate object database | 備用物件庫
-# amend | 修補
-# ancestor | 祖先,祖先提交
-# annotated tag | 附註標籤
-# bare repository | 純版本庫
-# bisect | 二分尋找
-# blob object | 資料物件
-# branch | 分支
-# bundle | 包
-# bypass | 繞過
-# cache | 索引(的別稱)
-# chain | (提交)鏈
-# changeset | 變更集
-# checkout | 簽出
-# checksum | 校驗,校驗和
-# cherry-picking | 揀選
-# clean | 乾淨(的工作區)
-# clone | 複製
-# commit | 提交
-# commit message | 提交說明
-# commit object | 提交物件
-# commit-ish (also committish) | 提交號
-# conflict | 衝突
-# core Git | 核心 Git 工具
-# cover letter | 附函
-# DAG | 有向無環圖
-# dangling object | 懸空物件
-# detached HEAD | 分離開頭指標
-# directory | 目錄
-# dirty | 髒(的工作區)
-# dumb HTTP protocol | 啞 HTTP 協定
-# evil merge | 壞合併(合併引入了父提交沒有的修改)
-# fast-forward | 快轉
-# fetch | 取得
-# file system | 檔案系統
-# fork | 衍生
-# Git archive | 版本庫(對於 arch 使用者)
-# gitfile | gitfile(版本庫連結檔案)
-# grafts | (提交)移植
-# hash | 雜湊值
-# HEAD | HEAD(開頭指標,亦即目前分支)
-# head | 頭、分支
-# head ref | 分支
-# header | 標頭訊息
-# hook | 掛鉤
-# hunk | 修補檔片段
-# index | 索引
-# index entry | 索引條目
-# loose object | 鬆散物件
-# loose refs | 鬆散引用
-# master | master(預設分支名)
-# merge | 合併
-# object | 物件
-# object database | 物件庫
-# object identifier | 物件識別元
-# object name | 物件名稱
-# object type | 物件類型
-# octopus | 章魚式合併(兩分支以上的合併)
-# origin | origin(預設的遠端名稱)
-# pack | 包
-# pack index | 包索引
-# packfile | 包檔案
-# parent | 父提交
-# patch | 修補檔
-# pathspec | 路徑規格
-# pattern | 模式
-# pickaxe | 挖掘
-# plumbing | 管件(Git 底層核心指令的別稱)
-# porcelain | 瓷件(Git 上層封裝指令的別稱)
-# precious-objects repo | 珍品版本庫
-# prune | 清除
-# pull | 拉,拉取
-# push | 推,推送
-# reachable | 可以取得
-# rebase | 重定基底
-# ref | 引用
-# reflog | 引用日誌
-# refspec | 引用規格
-# remote | 遠端,遠端版本庫
-# remote-tracking branch | 遠端追蹤分支
-# replay | 重放
-# repo | 版本庫
-# repository | 版本庫
-# resolve | (衝突)解決
-# revert | 還原提交
-# revision | 版本
-# rewind | 還原 (Fuzzy)
-# SCM | 原始碼管理(工具)
-# SHA-1 | SHA-1(安全雜湊演算法1)
-# shallow repository | 淺(複製)版本庫
-# signed tag | 簽名標籤
-# smart HTTP protocol | 智慧 HTTP 協定
-# squash | 壓縮
-# stage | n. 暫存區(即索引); v. 暫存
-# stash | n. 儲藏區; v. 儲藏
-# submodule | 子模組
-# symref | 符號引用
-# tag | n. 標籤; v. 打標籤
-# tag object | 標籤物件
-# tagger | 打標籤者
-# topic branch | 主題分支
-# track | 追蹤
-# trailer | 尾部署名
-# tree | 樹(工作區或樹狀物件)
-# tree object | 樹狀物件
-# tree-ish (also treeish) | 樹狀物件(或可以解析為一樹狀物件)
-# unmerged index | 未合併索引
-# unpack | 解包
-# unreachable object | 無法取得物件
-# unstage | 取消暫存
-# upstream | 上游
-# upstream branch | 上游分支
-# working tree | 工作區
+# 原文 翻譯
+# 3 way merge 三方合併
+# ? ?
+# abbreviate 縮寫
+# abort 中止
+# Add 加入
+# all 所有
+# allow 允許
+# alternative 替代
+# Amend 修訂
+# annotate 附註
+# annotated tag 附註標籤
+# Apply 套用
+# argument 引數
+# argument 引數
+# Assume 假設
+# author 作者
+# bad 不良
+# Bare 祼
+# bare repo 祼版本庫
+# Bisect 二分法
+# Blame 究責
+# blob blob
+# bloom filter 布隆過濾器
+# Branch 分支
+# branch (動詞)建立分支
+# Branches 分支
+# browse 瀏覽
+# browser 瀏覽器
+# bug 臭蟲
+# Bug-ID Bug-ID
+# cache 快取
+# certificate 憑證
+# Change 變更
+# change 變更
+# changed 已變更
+# changes 變更
+# Check help file 查看說明檔案
+# checkbox 核取方塊
+# Checkout 檢出
+# checksum 總和檢查碼
+# Cherry Pick 摘取
+# clean 清除
+# cleanup 清理
+# clear 清空
+# click 按一下
+# client 用戶端
+# clipboard 剪貼簿
+# Clone 複製
+# Close 關閉
+# Collapse 收合
+# Color 色彩
+# Combine 結合
+# comment 評註
+# Commit 提交
+# committer 提交者
+# compare 比對
+# comparing 比對
+# Configure 設定
+# confirm 確認
+# Conflict 衝突
+# Context lines 情境列
+# context menu 快顯功能表
+# continue 繼續
+# continuous 持續性
+# copy 複製
+# Corrections 更正
+# Could not start 無法啟動
+# Create 建立
+# Creates 建立
+# Creating 建立中
+# Credential 憑證
+# Credential helper 憑證協助程式
+# Credentials 憑證
+# credentials 憑證
+# current 目前
+# custom 自訂
+# Customize 自訂
+# Daemon 守護程序
+# Date 日期
+# Default 預設
+# Delete 刪除
+# describe describe
+# description 描述
+# Destination 目的地
+# detach 分離
+# detect 偵測
+# Dialogs 對話框
+# Diff 差異
+# differences 差異
+# different 差異
+# dir 目錄
+# directory 目錄
+# Discard 丟棄
+# Display 顯示
+# double click 按兩下
+# edit 編輯
+# editor 編輯器
+# email email
+# Enable 啟用
+# Error code 錯誤碼
+# explicitly 顯式
+# Export 匯出
+# expression 表示式
+# extension 擴充套件
+# external 外部
+# fast forward 快進
+# fast-forward 快進
+# fetch 獲取
+# FETCH_HEAD FETCH_HEAD
+# file 檔案
+# files 檔案
+# filter 篩選
+# find 搜尋
+# Finish 完成
+# folder 資料夾
+# folders 資料夾
+# follow 跟隨
+# Force 強制
+# from 自
+# Git Git
+# Git for Windows Git for Windows
+# hash 雜湊
+# HEAD HEAD
+# highlight 標示
+# Hook 掛鉤
+# hunk 區塊
+# hunks 區塊
+# Ignore 忽略
+# Index 索引
+# Info 資訊
+# information 資訊
+# Init 初始化
+# initial checkout 初始簽出
+# Inline Diff 行內差異
+# inline diff 列內差異
+# is up to date 已最新
+# issue 議題
+# item 項目
+# items 項目
+# Keywords 關鍵字
+# label 標記
+# labels 標記
+# Last 最後
+# later 稍後
+# limitation 限制
+# line 列
+# lines 列
+# local 本地端
+# Local 本地端
+# Log 記錄
+# Merge 合併
+# merge 合併
+# message 訊息
+# Message 訊息
+# modify 修改
+# Name 名稱
+# Note 註
+# note 註
+# Notes 註解
+# Open 開啟
+# Options 選項
+# Ordering 順序
+# ORIG_HEAD ORIG_HEAD
+# Overlay 圖示覆蓋
+# pack 包裝
+# Parent 父
+# patch 補綴
+# patched 補綴
+# paths 路徑
+# pick 取
+# position 位置
+# preview 預覽
+# process 處理
+# program 程式
+# Project 專案
+# Prune 剪除
+# Pull 拉取
+# Pull Request 拉取請求
+# Push 推送
+# rebase 重定基底
+# rebase 重定基底
+# recover 還原
+# recovered 還原
+# recursively 遞迴
+# recycle bin 回收桶
+# redo 重做
+# Ref 參照
+# ref 參照
+# reference 參照
+# RefLog 參照日誌
+# refmap 參照映射
+# refs 參照
+# refspec 參照規格
+# Remote 遠端
+# remote branches 遠端分支
+# Remote-tracking branches 遠端跟蹤分支
+# remote-treacking branches 遠端追蹤分支
+# remove 移除
+# removed 已移除
+# repo 版本庫
+# repositories 版本庫
+# Repository 版本庫
+# request 要求
+# Reset 重設
+# resolve 解決
+# rest 其餘的
+# Restore 還原
+# Revert 復原
+# reverted 已復原
+# review 檢閱
+# revision 修訂版
+# revisions 版本
+# script 指令稿
+# Scripts 指令稿
+# sections 部分
+# Show 顯示
+# sign 簽署
+# signed 已簽署
+# skip 略過
+# special 特殊
+# Squash 壓合
+# stage 暫存
+# stage 暫存
+# staged 已暫存
+# staging area 暫存區
+# Stash 收藏
+# Status 狀態
+# subject 主旨
+# Submodule 子模組
+# Superproject 上層專案
+# Switch 切換
+# tag (動詞)貼標籤
+# Tag 標籤
+# tagger 貼標籤者
+# tags 標籤
+# task 工作
+# thesaurus 同義字
+# three way 三方
+# Track 跟蹤
+# Tracked 跟蹤中
+# tracking 跟蹤
+# tree 樹
+# two 2
+# type 類型
+# unchanged 未變更
+# Undo 復原
+# Unified diff 單一差異
+# unified diff 統合式差異
+# Unknown 未知
+# unstash 取消收藏
+# Untracked 未跟蹤的
+# Unversioned 無版控
+# Update 更新
+# UpStream 上游
+# user 使用者
+# username 使用者名稱
+# vanilla 原
+# verify 核驗
+# view 檢視
+# viewer 檢視器
+# Warning 警告
+# whitespace 空白字元
+# whitespaces 空白字元
+# working 工作
+# working copy 工作複本
+# Working tree 工作目錄
+# You might need 您可能需要
#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-03-11 15:26+0800\n"
-"PO-Revision-Date: 2020-03-15 01:48+0800\n"
+"POT-Creation-Date: 2020-05-27 07:23+0800\n"
+"PO-Revision-Date: 2020-05-30 00:36+0800\n"
"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
-"Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n"
+"Language-Team: Chinese (Traditional) <zh-l10n@lists.linux.org.tw>\n"
"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.3.1\n"
"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
"zhconvert.org\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.3\n"
#: add-interactive.c:368
#, c-format
msgid "Huh (%s)?"
msgstr "嗯(%s)?"
-#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
-#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
-#: builtin/rebase.c:2086 builtin/rebase.c:2130
+#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142
+#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518
+#: builtin/rebase.c:1919
msgid "could not read index"
-msgstr "不能讀取索引"
+msgstr "無法讀取索引"
#: add-interactive.c:576 git-add--interactive.perl:269
#: git-add--interactive.perl:294
@@ -177,7 +329,7 @@ msgstr "無"
#: add-interactive.c:635 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
-msgstr "沒有修改"
+msgstr "未變更"
#: add-interactive.c:672 git-add--interactive.perl:643
msgid "Update"
@@ -186,29 +338,28 @@ msgstr "更新"
#: add-interactive.c:689 add-interactive.c:877
#, c-format
msgid "could not stage '%s'"
-msgstr "不能暫存 '%s'"
+msgstr "無法暫存「%s」"
-#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
-#: builtin/rebase.c:899
+#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336
msgid "could not write index"
-msgstr "不能寫入索引"
+msgstr "無法寫入索引"
#: add-interactive.c:698 git-add--interactive.perl:628
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
-msgstr[0] "更新了 %d 個路徑\n"
+msgstr[0] "已更新 %d 個路徑\n"
#: add-interactive.c:716 git-add--interactive.perl:678
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
-msgstr "說明:%s 現已成為未追蹤的。\n"
+msgstr "註:%s 現已不再追蹤。\n"
-#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
-#: builtin/reset.c:144
+#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294
+#: builtin/reset.c:145
#, c-format
msgid "make_cache_entry failed for path '%s'"
-msgstr "對路徑 '%s' 的 make_cache_entry 動作失敗"
+msgstr "「%s」路徑執行 make_cache_entry 失敗"
#: add-interactive.c:751 git-add--interactive.perl:655
msgid "Revert"
@@ -326,11 +477,11 @@ msgstr "選擇編號過的項目"
msgid "(empty) select nothing"
msgstr "(空)全不選取"
-#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851
msgid "*** Commands ***"
msgstr "*** 指令 ***"
-#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848
msgid "What now"
msgstr "請選擇"
@@ -342,12 +493,13 @@ msgstr "快取"
msgid "unstaged"
msgstr "未快取"
-#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
-#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
-#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250
+#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145
+#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409
#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: builtin/submodule--helper.c:2148 bugreport.c:129
+#: git-add--interactive.perl:213
msgid "path"
msgstr "路徑"
@@ -355,33 +507,33 @@ msgstr "路徑"
msgid "could not refresh index"
msgstr "無法重新整理索引"
-#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765
#, c-format
msgid "Bye.\n"
msgstr "再見。\n"
-#: add-patch.c:33 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1428
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "暫存模式變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1429
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "暫存刪除動作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1430
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "暫存此區塊 [y,n,q,a,d%s,?]? "
-#: add-patch.c:37
+#: add-patch.c:38
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
msgstr "如果修補檔能乾淨地套用,編輯區塊將立即標記為暫存。"
-#: add-patch.c:40
+#: add-patch.c:41
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -395,28 +547,28 @@ msgstr ""
"a - 暫存此區塊和本檔案中後面的全部區塊\n"
"d - 不暫存此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:54 git-add--interactive.perl:1433
+#: add-patch.c:55 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "儲藏模式變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:56 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "儲藏刪除動作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:57 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? "
-#: add-patch.c:58
+#: add-patch.c:59
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
msgstr "如果修補檔能乾淨地套用,編輯區塊將立即標記為儲藏。"
-#: add-patch.c:61
+#: add-patch.c:62
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -430,28 +582,28 @@ msgstr ""
"a - 儲藏此區塊和本檔案中後面的全部區塊\n"
"d - 不儲藏此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:77 git-add--interactive.perl:1438
+#: add-patch.c:78 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:79 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "取消暫存刪除動作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:80 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? "
-#: add-patch.c:81
+#: add-patch.c:82
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
msgstr "如果修補檔能乾淨地套用,編輯區塊將立即標記為未暫存。"
-#: add-patch.c:84
+#: add-patch.c:85
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -465,28 +617,28 @@ msgstr ""
"a - 不暫存此區塊和本檔案中後面的全部區塊\n"
"d - 不要不暫存此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:99 git-add--interactive.perl:1443
+#: add-patch.c:100 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "將模式變更套用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:101 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "將刪除動作套用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:102 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: add-patch.c:104 add-patch.c:169 add-patch.c:212
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"applying."
msgstr "如果修補檔能乾淨地套用,編輯區塊將立即標記為套用。"
-#: add-patch.c:106
+#: add-patch.c:107
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -500,31 +652,31 @@ msgstr ""
"a - 套用此區塊和本檔案中後面的全部區塊\n"
"d - 不要套用此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:121 git-add--interactive.perl:1448
+#: add-patch.c:122 git-add--interactive.perl:1448
#: git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "從工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:122 git-add--interactive.perl:1449
+#: add-patch.c:123 git-add--interactive.perl:1449
#: git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "從工作區中捨棄刪除動作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:123 git-add--interactive.perl:1450
+#: add-patch.c:124 git-add--interactive.perl:1450
#: git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: add-patch.c:126 add-patch.c:148 add-patch.c:191
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"discarding."
msgstr "如果修補檔能乾淨地套用,編輯區塊將立即標記為捨棄。"
-#: add-patch.c:128 add-patch.c:193
+#: add-patch.c:129 add-patch.c:194
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -538,22 +690,22 @@ msgstr ""
"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
"d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "從索引和工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "從索引和工作區中捨棄刪除 [y,n,q,a,d%s,?]? "
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "從索引和工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "
-#: add-patch.c:150
+#: add-patch.c:151
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -567,22 +719,22 @@ msgstr ""
"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
"d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "將模式變更套用到索引和工作區 [y,n,q,a,d%s,?]? "
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "將刪除動作套用到索引和工作區 [y,n,q,a,d%s,?]? "
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? "
-#: add-patch.c:171
+#: add-patch.c:172
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -596,7 +748,7 @@ msgstr ""
"a - 套用此區塊和本檔案中後面的全部區塊\n"
"d - 不要套用此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:214
+#: add-patch.c:215
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -610,40 +762,40 @@ msgstr ""
"a - 套用此區塊和本檔案中後面的全部區塊\n"
"d - 不要套用此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:318
+#: add-patch.c:319
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "無法解析區塊標頭 '%.*s'"
-#: add-patch.c:337 add-patch.c:341
+#: add-patch.c:338 add-patch.c:342
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "無法解析上色過的區塊標頭 '%.*s'"
-#: add-patch.c:395
+#: add-patch.c:396
msgid "could not parse diff"
msgstr "無法解析差異 (diff)"
-#: add-patch.c:414
+#: add-patch.c:415
msgid "could not parse colored diff"
msgstr "無法解析上色過的差異 (diff)"
-#: add-patch.c:428
+#: add-patch.c:429
#, c-format
msgid "failed to run '%s'"
msgstr "無法執行 '%s'"
-#: add-patch.c:587
+#: add-patch.c:588
msgid "mismatched output from interactive.diffFilter"
msgstr "interactive.diffFilter 的輸出不符"
-#: add-patch.c:588
+#: add-patch.c:589
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
msgstr "您的過濾器必須在其輸入及輸出行維持一對一的對應關係。"
-#: add-patch.c:761
+#: add-patch.c:762
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -652,7 +804,7 @@ msgstr ""
"應有上下文行 #%d 於\n"
"%.*s"
-#: add-patch.c:776
+#: add-patch.c:777
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -665,11 +817,11 @@ msgstr ""
"\t不以下述結尾:\n"
"%.*s"
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1053 git-add--interactive.perl:1112
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n"
-#: add-patch.c:1056
+#: add-patch.c:1057
#, c-format
msgid ""
"---\n"
@@ -683,7 +835,7 @@ msgstr ""
"以 %c 開始的行將被刪除。\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1070 git-add--interactive.perl:1126
+#: add-patch.c:1071 git-add--interactive.perl:1126
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -692,11 +844,11 @@ msgstr ""
"如果不能乾淨地套用,您將有機會重新編輯。如果此區塊的全部內容刪除,則\n"
"此次編輯被終止,此區塊不會被修改。\n"
-#: add-patch.c:1103
+#: add-patch.c:1104
msgid "could not parse hunk header"
msgstr "無法解析區塊標頭"
-#: add-patch.c:1148
+#: add-patch.c:1149
msgid "'git apply --cached' failed"
msgstr "「git apply --cached」失敗"
@@ -816,37 +968,46 @@ msgstr "對不起,不能編輯這個區塊"
msgid "'git apply' failed"
msgstr "'git apply' 失敗"
-#: advice.c:115
+#: advice.c:140
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"請使用「git config advice.%s false」來停用此訊息"
+
+#: advice.c:156
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%s提示:%.*s%s\n"
-#: advice.c:168
+#: advice.c:247
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "無法揀選,因為您有未合併的檔案。"
-#: advice.c:170
+#: advice.c:249
msgid "Committing is not possible because you have unmerged files."
msgstr "無法提交,因為您有未合併的檔案。"
-#: advice.c:172
+#: advice.c:251
msgid "Merging is not possible because you have unmerged files."
msgstr "無法合併,因為您有未合併的檔案。"
-#: advice.c:174
+#: advice.c:253
msgid "Pulling is not possible because you have unmerged files."
msgstr "無法拉取,因為您有未合併的檔案。"
-#: advice.c:176
+#: advice.c:255
msgid "Reverting is not possible because you have unmerged files."
msgstr "無法還原提交,因為您有未合併的檔案。"
-#: advice.c:178
+#: advice.c:257
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "無法 %s,因為您有未合併的檔案。"
-#: advice.c:186
+#: advice.c:265
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."
@@ -854,23 +1015,23 @@ msgstr ""
"請在工作區改正檔案,然後酌情使用 'git add/rm <檔案>' 指令標記\n"
"解決方案並提交。"
-#: advice.c:194
+#: advice.c:273
msgid "Exiting because of an unresolved conflict."
msgstr "因為存在未解決的衝突而離開。"
-#: advice.c:199 builtin/merge.c:1335
+#: advice.c:278 builtin/merge.c:1353
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未結束您的合併(存在 MERGE_HEAD)。"
-#: advice.c:201
+#: advice.c:280
msgid "Please, commit your changes before merging."
msgstr "請在合併前先提交您的修改。"
-#: advice.c:202
+#: advice.c:281
msgid "Exiting because of unfinished merge."
msgstr "因為存在未完成的合併而離開。"
-#: advice.c:208
+#: advice.c:287
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -921,12 +1082,12 @@ msgstr "未閉合的引號"
#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
-msgstr "未能識別的空白字元選項 '%s'"
+msgstr "無法識別的空白字元選項 '%s'"
#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
-msgstr "未能識別的空白字元忽略選項 '%s'"
+msgstr "無法識別的空白字元忽略選項 '%s'"
#: apply.c:135
msgid "--reject and --3way cannot be used together."
@@ -1054,7 +1215,7 @@ msgstr "二進位修補檔在第 %d 行損壞:%.*s"
#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
-msgstr "未能識別的二進位修補檔位於第 %d 行"
+msgstr "無法識別的二進位修補檔位於第 %d 行"
#: apply.c:2177
#, c-format
@@ -1080,7 +1241,7 @@ msgstr "無效的行首字元:'%c'"
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
-msgstr[0] "區塊 #%d 成功套用於 %d(位移 %d 行)"
+msgstr[0] "區塊 #%d 成功套用於 %d(位移 %d 行)。"
#: apply.c:3069
#, c-format
@@ -1145,9 +1306,9 @@ msgstr "打修補檔失敗:%s:%ld"
#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
-msgstr "不能簽出 %s"
+msgstr "不能檢出 %s"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "無法讀取 %s"
@@ -1341,7 +1502,7 @@ msgstr[0] "套用 %%s 個修補檔,其中 %d 個被拒絕..."
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 檔案名為 %.*s.rej"
-#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
+#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195
#, c-format
msgid "cannot open %s"
msgstr "不能開啟 %s"
@@ -1363,7 +1524,7 @@ msgstr "略過修補檔 '%s'。"
#: apply.c:4706
msgid "unrecognized input"
-msgstr "未能識別的輸入"
+msgstr "無法識別的輸入"
#: apply.c:4726
msgid "unable to read index file"
@@ -1404,7 +1565,7 @@ msgstr "不要應用與給出路徑向符合的變更"
msgid "apply changes matching the given path"
msgstr "應用與給出路徑向符合的變更"
-#: apply.c:4973 builtin/am.c:2260
+#: apply.c:4973 builtin/am.c:2259
msgid "num"
msgstr "數字"
@@ -1460,7 +1621,7 @@ msgstr "如果一個修補檔不能應用則嘗試三方合併"
msgid "build a temporary index based on embedded index information"
msgstr "建立一個暫時索引基於嵌入的索引訊息"
-#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525
msgid "paths are separated with NUL character"
msgstr "路徑以 NUL 字元分隔"
@@ -1468,9 +1629,9 @@ msgstr "路徑以 NUL 字元分隔"
msgid "ensure at least <n> lines of context match"
msgstr "確保至少符合 <n> 行上下文"
-#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
+#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
+#: builtin/pack-objects.c:3458 builtin/rebase.c:1332
msgid "action"
msgstr "動作"
@@ -1499,8 +1660,8 @@ msgid "allow overlapping hunks"
msgstr "允許重疊的修補檔片段"
#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
-#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
-#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
+#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775
+#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "詳細輸出"
@@ -1512,7 +1673,7 @@ msgstr "允許不正確的檔案末尾換行符號"
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任修補檔片段的標頭訊息中的行號"
-#: apply.c:5032 builtin/am.c:2248
+#: apply.c:5032 builtin/am.c:2247
msgid "root"
msgstr "根目錄"
@@ -1520,6 +1681,55 @@ msgstr "根目錄"
msgid "prepend <root> to all filenames"
msgstr "為所有檔案名前新增 <根目錄>"
+#: archive-tar.c:125 archive-zip.c:351
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "不能開啟資料物件 %s"
+
+#: archive-tar.c:266 archive-zip.c:369
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "不支援的檔案模式:0%o (SHA1: %s)"
+
+#: archive-tar.c:293 archive-zip.c:359
+#, c-format
+msgid "cannot read %s"
+msgstr "不能讀取 %s"
+
+#: archive-tar.c:465
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "無法啟動 '%s' 過濾器"
+
+#: archive-tar.c:468
+msgid "unable to redirect descriptor"
+msgstr "無法重定向描述符"
+
+#: archive-tar.c:475
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "'%s' 過濾器報告了錯誤"
+
+#: archive-zip.c:319
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "路徑不是有效的 UTF-8:%s"
+
+#: archive-zip.c:323
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr "路徑太長(%d 字元,SHA1:%s):%s"
+
+#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235
+#, c-format
+msgid "deflate error (%d)"
+msgstr "壓縮錯誤 (%d)"
+
+#: archive-zip.c:615
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "對於本系統時間戳太大:%<PRIuMAX>"
+
#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<選項>] <樹或提交> [<路徑>...]"
@@ -1538,172 +1748,123 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <版本庫> [--exec <指令>] --list"
-#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
+#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路徑規格 '%s' 未符合任何檔案"
-#: archive.c:396
+#: archive.c:401
#, c-format
msgid "no such ref: %.*s"
msgstr "無此引用:%.*s"
-#: archive.c:401
+#: archive.c:407
#, c-format
msgid "not a valid object name: %s"
msgstr "不是一個有效的物件名:%s"
-#: archive.c:414
+#: archive.c:420
#, c-format
msgid "not a tree object: %s"
msgstr "不是一個樹狀物件:%s"
-#: archive.c:426
+#: archive.c:432
msgid "current working directory is untracked"
msgstr "目前工作目錄未被追蹤"
-#: archive.c:457
+#: archive.c:464
msgid "fmt"
msgstr "格式"
-#: archive.c:457
+#: archive.c:464
msgid "archive format"
msgstr "歸檔格式"
-#: archive.c:458 builtin/log.c:1653
+#: archive.c:465 builtin/log.c:1674
msgid "prefix"
msgstr "前綴"
-#: archive.c:459
+#: archive.c:466
msgid "prepend prefix to each pathname in the archive"
msgstr "為歸檔中每個路徑名加上前綴"
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907
+#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564
#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
#: parse-options.h:190
msgid "file"
msgstr "檔案"
-#: archive.c:461 builtin/archive.c:90
+#: archive.c:468 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "歸檔寫入此檔案"
-#: archive.c:463
+#: archive.c:470
msgid "read .gitattributes in working directory"
msgstr "讀取工作區中的 .gitattributes"
-#: archive.c:464
+#: archive.c:471
msgid "report archived files on stderr"
msgstr "在標準錯誤上報告歸檔檔案"
-#: archive.c:465
+#: archive.c:472
msgid "store only"
msgstr "只儲存"
-#: archive.c:466
+#: archive.c:473
msgid "compress faster"
msgstr "壓縮速度更快"
-#: archive.c:474
+#: archive.c:481
msgid "compress better"
msgstr "壓縮效果更好"
-#: archive.c:477
+#: archive.c:484
msgid "list supported archive formats"
msgstr "列出支援的歸檔格式"
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
msgid "repo"
msgstr "版本庫"
-#: archive.c:480 builtin/archive.c:92
+#: archive.c:487 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "從遠端版本庫(<版本庫>)擷取歸檔檔案"
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
+#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715
#: builtin/notes.c:498
msgid "command"
msgstr "指令"
-#: archive.c:482 builtin/archive.c:94
+#: archive.c:489 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "遠端 git-upload-archive 指令的路徑"
-#: archive.c:489
+#: archive.c:496
msgid "Unexpected option --remote"
msgstr "未知參數 --remote"
-#: archive.c:491
+#: archive.c:498
msgid "Option --exec can only be used together with --remote"
msgstr "選項 --exec 只能和 --remote 同時使用"
-#: archive.c:493
+#: archive.c:500
msgid "Unexpected option --output"
msgstr "未知參數 --output"
-#: archive.c:515
+#: archive.c:522
#, c-format
msgid "Unknown archive format '%s'"
msgstr "未知歸檔格式 '%s'"
-#: archive.c:522
+#: archive.c:529
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "參數不支援此格式 '%s':-%d"
-#: archive-tar.c:125 archive-zip.c:351
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "不能開啟資料物件 %s"
-
-#: archive-tar.c:266 archive-zip.c:369
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "不支援的檔案模式:0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:359
-#, c-format
-msgid "cannot read %s"
-msgstr "不能讀取 %s"
-
-#: archive-tar.c:465
-#, c-format
-msgid "unable to start '%s' filter"
-msgstr "無法啟動 '%s' 過濾器"
-
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "無法重定向描述符"
-
-#: archive-tar.c:475
-#, c-format
-msgid "'%s' filter reported error"
-msgstr "'%s' 過濾器報告了錯誤"
-
-#: archive-zip.c:319
-#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "路徑不是有效的 UTF-8:%s"
-
-#: archive-zip.c:323
-#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "路徑太長(%d 字元,SHA1:%s):%s"
-
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
-#, c-format
-msgid "deflate error (%d)"
-msgstr "壓縮錯誤 (%d)"
-
-#: archive-zip.c:615
-#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "對於本系統時間戳太大:%<PRIuMAX>"
-
#: attr.c:212
#, c-format
msgid "%.*s is not a valid attribute name"
@@ -1720,7 +1881,7 @@ msgid ""
"Use '\\!' for literal leading exclamation."
msgstr ""
"反向模式在 git attributes 中被忽略\n"
-"當字串確實要以驚嘆號開始時,使用 '\\!'。"
+"當字串確定要以驚嘆號開始時,使用 '\\!'。"
#: bisect.c:468
#, c-format
@@ -1796,12 +1957,12 @@ msgstr "二分尋找中:合併基礎必須是經過測試的\n"
msgid "a %s revision is needed"
msgstr "需要一個 %s 版本"
-#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "不能建立檔案 '%s'"
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:966 builtin/merge.c:151
#, c-format
msgid "could not read file '%s'"
msgstr "不能讀取檔案 '%s'"
@@ -1839,37 +2000,37 @@ 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] "二分尋找中:在此之後,還剩 %d 個版本待測試 %s\n"
-#: blame.c:2700
+#: blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents 和 --reverse 不能混用。"
-#: blame.c:2714
+#: blame.c:2791
msgid "cannot use --contents with final commit object name"
msgstr "不能將 --contents 和最終的提交物件名共用"
-#: blame.c:2735
+#: blame.c:2812
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
-#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
-#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
-#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
+#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
+#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405
+#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235
+#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "版本遍歷設定失敗"
-#: blame.c:2762
+#: blame.c:2839
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "--reverse 和 --first-parent 共用,需要第一祖先鏈上的提交範圍"
-#: blame.c:2773
+#: blame.c:2850
#, c-format
msgid "no such path %s in %s"
msgstr "在 %2$s 中無此路徑 %1$s"
-#: blame.c:2784
+#: blame.c:2861
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "不能為路徑 %2$s 讀取資料物件 %1$s"
@@ -1997,12 +2158,12 @@ msgstr "歧義的物件名:'%s'。"
msgid "Not a valid branch point: '%s'."
msgstr "無效的分支點:'%s'。"
-#: branch.c:364
+#: branch.c:365
#, c-format
msgid "'%s' is already checked out at '%s'"
-msgstr "'%s' 已經簽出到 '%s'"
+msgstr "'%s' 已經檢出到 '%s'"
-#: branch.c:387
+#: branch.c:388
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "工作區 %s 的 HEAD 指向沒有被更新"
@@ -2015,10 +2176,10 @@ msgstr "'%s' 不像是一個 v2 版本的包檔案"
#: bundle.c:64
#, c-format
msgid "unrecognized header: %s%s (%d)"
-msgstr "未能識別的包頭:%s%s (%d)"
+msgstr "無法識別的包頭:%s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
+#: builtin/commit.c:814
#, c-format
msgid "could not open '%s'"
msgstr "不能開啟 '%s'"
@@ -2068,10 +2229,10 @@ msgstr "rev-list 終止"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 選項排除"
-#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
+#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
-msgstr "未能識別的參數:%s"
+msgstr "無法識別的參數:%s"
#: bundle.c:469
msgid "Refusing to create empty bundle."
@@ -2091,320 +2252,336 @@ msgstr "index-pack 終止"
msgid "invalid color value: %.*s"
msgstr "無效的顏色值:%.*s"
-#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
-#, c-format
-msgid "could not parse %s"
-msgstr "不能解析 %s"
-
-#: commit.c:53
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s 不是一個提交!"
-
-#: commit.c:193
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"對 <GIT_DIR>/info/grafts 的支援已被棄用,並將在\n"
-"未來的Git版本中被移除。\n"
-"\n"
-"請使用 \"git replace --convert-graft-file\" 將\n"
-"grafts 轉換為取代引用。\n"
-"\n"
-"設定 \"git config advice.graftFileDeprecated false\"\n"
-"可關閉本消息"
-
-#: commit.c:1153
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"
-
-#: commit.c:1157
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"
-
-#: commit.c:1160
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "提交 %s 沒有 GPG 簽名。"
-
-#: commit.c:1163
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"
-
-#: commit.c:1417
-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"
-"variable i18n.commitencoding to the encoding your project uses.\n"
-msgstr ""
-"警告:提交說明不符合 UTF-8 字元編碼。\n"
-"您可以透過修補提交來改正提交說明,或者將設定變數 i18n.commitencoding\n"
-"設定為您項目所用的字元編碼。\n"
-
-#: commit-graph.c:122
+#: commit-graph.c:183
msgid "commit-graph file is too small"
msgstr "提交圖形檔案太小"
-#: commit-graph.c:189
+#: commit-graph.c:248
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr "提交圖形簽名 %X 和簽名 %X 不符合"
-#: commit-graph.c:196
+#: commit-graph.c:255
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr "提交圖形版本 %X 和版本 %X 不符合"
-#: commit-graph.c:203
+#: commit-graph.c:262
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合"
-#: commit-graph.c:226
+#: commit-graph.c:284
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr "提交圖形區塊尋找表條目遺失,檔案可能不完整"
-#: commit-graph.c:237
+#: commit-graph.c:294
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr "提交圖形不正確的區塊位移 %08x%08x"
-#: commit-graph.c:280
+#: commit-graph.c:362
#, c-format
msgid "commit-graph chunk id %08x appears multiple times"
msgstr "提交圖形區塊 id %08x 出現了多次"
-#: commit-graph.c:343
+#: commit-graph.c:436
msgid "commit-graph has no base graphs chunk"
msgstr "提交圖形沒有基礎圖形區塊"
-#: commit-graph.c:353
+#: commit-graph.c:446
msgid "commit-graph chain does not match"
msgstr "提交圖形鏈不符合"
-#: commit-graph.c:401
+#: commit-graph.c:494
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr "無效的提交圖形鏈:行 '%s' 不是一個雜湊值"
-#: commit-graph.c:425
+#: commit-graph.c:518
msgid "unable to find all commit-graph files"
msgstr "無法找到所有提交圖形檔案"
-#: commit-graph.c:558 commit-graph.c:618
+#: commit-graph.c:651 commit-graph.c:711
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "無效的提交位置。提交圖形可能已損壞"
-#: commit-graph.c:579
+#: commit-graph.c:672
#, c-format
msgid "could not find commit %s"
msgstr "無法找到提交 %s"
-#: commit-graph.c:852 builtin/am.c:1292
+#: commit-graph.c:948 builtin/am.c:1292
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
-#: commit-graph.c:1011 builtin/pack-objects.c:2782
+#: commit-graph.c:1096
+msgid "Writing changed paths Bloom filters index"
+msgstr "正在寫入變更路徑的布隆過濾器索引"
+
+#: commit-graph.c:1121
+msgid "Writing changed paths Bloom filters data"
+msgstr "正在寫入變更路徑的布隆過濾器索引"
+
+#: commit-graph.c:1160 builtin/pack-objects.c:2783
#, c-format
msgid "unable to get type of object %s"
msgstr "無法獲得物件 %s 類型"
-#: commit-graph.c:1043
+#: commit-graph.c:1196
msgid "Loading known commits in commit graph"
msgstr "正在載入提交圖中的已知提交"
-#: commit-graph.c:1060
+#: commit-graph.c:1213
msgid "Expanding reachable commits in commit graph"
msgstr "正在擴展提交圖中的可以取得提交"
-#: commit-graph.c:1079
+#: commit-graph.c:1233
msgid "Clearing commit marks in commit graph"
msgstr "正在清除提交圖中的提交標記"
-#: commit-graph.c:1098
+#: commit-graph.c:1252
msgid "Computing commit graph generation numbers"
msgstr "正在計算提交圖世代數字"
-#: commit-graph.c:1173
+#: commit-graph.c:1300
+msgid "Computing commit changed paths Bloom filters"
+msgstr "正在計算提交變更路徑的布隆過濾器"
+
+#: commit-graph.c:1359
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "正在 %d 個包中尋找提交圖的提交"
-#: commit-graph.c:1186
+#: commit-graph.c:1372
#, c-format
msgid "error adding pack %s"
msgstr "新增包 %s 發生錯誤"
-#: commit-graph.c:1190
+#: commit-graph.c:1376
#, c-format
msgid "error opening index for %s"
msgstr "為 %s 開啟索引發生錯誤"
-#: commit-graph.c:1214
+#: commit-graph.c:1405
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[0] "正在從 %d 個引用中尋找提交圖的提交"
-#: commit-graph.c:1234
+#: commit-graph.c:1426
#, c-format
msgid "invalid commit object id: %s"
msgstr "無效的提交物件 ID:%s"
-#: commit-graph.c:1249
+#: commit-graph.c:1442
msgid "Finding commits for commit graph among packed objects"
msgstr "正在打包物件中尋找提交圖的提交"
-#: commit-graph.c:1264
+#: commit-graph.c:1457
msgid "Counting distinct commits in commit graph"
msgstr "正在計算提交圖中不同的提交"
-#: commit-graph.c:1294
+#: commit-graph.c:1489
msgid "Finding extra edges in commit graph"
msgstr "正在尋找提交圖中額外的邊"
-#: commit-graph.c:1340
+#: commit-graph.c:1538
msgid "failed to write correct number of base graph ids"
msgstr "無法寫入正確數量的基礎圖形 ID"
-#: commit-graph.c:1373 midx.c:814
+#: commit-graph.c:1572 midx.c:812
#, c-format
msgid "unable to create leading directories of %s"
msgstr "不能為 %s 建立先導目錄"
-#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
+#: commit-graph.c:1585
+msgid "unable to create temporary graph layer"
+msgstr "無法建立暫時的圖形層"
+
+#: commit-graph.c:1590
#, c-format
-msgid "unable to create '%s'"
-msgstr "不能建立 '%s'"
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "無法調整「%s」的共用權限"
-#: commit-graph.c:1445
+#: commit-graph.c:1667
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "正在用 %d 步寫出提交圖"
-#: commit-graph.c:1486
+#: commit-graph.c:1712
msgid "unable to open commit-graph chain file"
msgstr "無法開啟提交圖形鏈檔案"
-#: commit-graph.c:1498
+#: commit-graph.c:1728
msgid "failed to rename base commit-graph file"
msgstr "無法重新命名基礎提交圖形檔案"
-#: commit-graph.c:1518
+#: commit-graph.c:1748
msgid "failed to rename temporary commit-graph file"
msgstr "無法重新命名暫時提交圖形檔案"
-#: commit-graph.c:1631
+#: commit-graph.c:1874
msgid "Scanning merged commits"
msgstr "正在掃描合併提交"
-#: commit-graph.c:1642
+#: commit-graph.c:1885
#, c-format
msgid "unexpected duplicate commit id %s"
msgstr "意外的重複提交 ID %s"
-#: commit-graph.c:1665
+#: commit-graph.c:1908
msgid "Merging commit-graph"
msgstr "正在合併提交圖形"
-#: commit-graph.c:1844
+#: commit-graph.c:2096
#, c-format
msgid "the commit graph format cannot write %d commits"
msgstr "提交圖格式不能寫入 %d 個提交"
-#: commit-graph.c:1855
+#: commit-graph.c:2107
msgid "too many commits to write graph"
msgstr "提交太多不能畫圖"
-#: commit-graph.c:1944
+#: commit-graph.c:2200
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "提交圖檔案的總和檢查碼錯誤,可能已經損壞"
-#: commit-graph.c:1954
+#: commit-graph.c:2210
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "提交圖形的物件 ID 順序不正確:%s 然後 %s"
-#: commit-graph.c:1964 commit-graph.c:1979
+#: commit-graph.c:2220 commit-graph.c:2235
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "提交圖形有不正確的扇出值:fanout[%d] = %u != %u"
-#: commit-graph.c:1971
+#: commit-graph.c:2227
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "無法從提交圖形中解析提交 %s"
-#: commit-graph.c:1989
+#: commit-graph.c:2245
msgid "Verifying commits in commit graph"
msgstr "正在驗證提交圖中的提交"
-#: commit-graph.c:2003
+#: commit-graph.c:2259
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr "無法從提交圖形的物件庫中解析提交 %s"
-#: commit-graph.c:2010
+#: commit-graph.c:2266
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"
-#: commit-graph.c:2020
+#: commit-graph.c:2276
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "提交 %s 的提交圖形父提交列表太長了"
-#: commit-graph.c:2029
+#: commit-graph.c:2285
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "%s 的提交圖形父提交是 %s != %s"
-#: commit-graph.c:2042
+#: commit-graph.c:2298
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "提交 %s 的提交圖形父提交列表過早終止"
-#: commit-graph.c:2047
+#: commit-graph.c:2303
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr "提交圖形中提交 %s 的世代號是零,但其它地方非零"
-#: commit-graph.c:2051
+#: commit-graph.c:2307
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr "提交圖形中提交 %s 的世代號非零,但其它地方是零"
-#: commit-graph.c:2066
+#: commit-graph.c:2322
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr "提交圖形中的提交 %s 的世代號是 %u != %u"
-#: commit-graph.c:2072
+#: commit-graph.c:2328
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
+#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457
+#, c-format
+msgid "could not parse %s"
+msgstr "不能解析 %s"
+
+#: commit.c:54
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s 不是一個提交!"
+
+#: commit.c:194
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"對 <GIT_DIR>/info/grafts 的支援已被棄用,並將在\n"
+"未來的Git版本中被移除。\n"
+"\n"
+"請使用 \"git replace --convert-graft-file\" 將\n"
+"grafts 轉換為取代引用。\n"
+"\n"
+"設定 \"git config advice.graftFileDeprecated false\"\n"
+"可關閉本消息"
+
+#: commit.c:1168
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"
+
+#: commit.c:1172
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"
+
+#: commit.c:1175
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "提交 %s 沒有 GPG 簽名。"
+
+#: commit.c:1178
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"
+
+#: commit.c:1432
+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"
+"variable i18n.commitencoding to the encoding your project uses.\n"
+msgstr ""
+"警告:提交說明不符合 UTF-8 字元編碼。\n"
+"您可以透過修補提交來改正提交說明,或者將設定變數 i18n.commitencoding\n"
+"設定為您項目所用的字元編碼。\n"
+
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "記憶體耗盡"
-#: config.c:124
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2419,289 +2596,289 @@ msgstr ""
"\t%2$s\n"
"這可能是因為循環包含。"
-#: config.c:140
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "無法擴展包含路徑 '%s'"
-#: config.c:151
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "相對路徑的設定檔案引用必須來自於檔案"
-#: config.c:197
+#: config.c:198
msgid "relative config include conditionals must come from files"
msgstr "相對路徑的設定檔案條件引用必須來自於檔案"
-#: config.c:376
+#: config.c:378
#, c-format
msgid "key does not contain a section: %s"
msgstr "鍵名沒有包含一個小節名稱:%s"
-#: config.c:382
+#: config.c:384
#, c-format
msgid "key does not contain variable name: %s"
msgstr "鍵名沒有包含變數名:%s"
-#: config.c:406 sequencer.c:2444
+#: config.c:408 sequencer.c:2456
#, c-format
msgid "invalid key: %s"
msgstr "無效鍵名:%s"
-#: config.c:412
+#: config.c:414
#, c-format
msgid "invalid key (newline): %s"
msgstr "無效鍵名(有換行符號):%s"
-#: config.c:448 config.c:460
+#: config.c:450 config.c:462
#, c-format
msgid "bogus config parameter: %s"
msgstr "偽設定參數:%s"
-#: config.c:495
+#: config.c:497
#, c-format
msgid "bogus format in %s"
msgstr "%s 中格式錯誤"
-#: config.c:821
+#: config.c:836
#, c-format
msgid "bad config line %d in blob %s"
msgstr "資料物件 %2$s 中錯誤的設定行 %1$d"
-#: config.c:825
+#: config.c:840
#, c-format
msgid "bad config line %d in file %s"
msgstr "檔案 %2$s 中錯誤的設定行 %1$d"
-#: config.c:829
+#: config.c:844
#, c-format
msgid "bad config line %d in standard input"
msgstr "標準輸入中錯誤的設定行 %d"
-#: config.c:833
+#: config.c:848
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模組資料物件 %2$s 中錯誤的設定行 %1$d"
-#: config.c:837
+#: config.c:852
#, c-format
msgid "bad config line %d in command line %s"
msgstr "指令列 %2$s 中錯誤的設定行 %1$d"
-#: config.c:841
+#: config.c:856
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中錯誤的設定行 %1$d"
-#: config.c:978
+#: config.c:993
msgid "out of range"
msgstr "超出範圍"
-#: config.c:978
+#: config.c:993
msgid "invalid unit"
msgstr "無效的單位"
-#: config.c:979
+#: config.c:994
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "設定變數 '%2$s' 的數字取值 '%1$s' 設定錯誤:%3$s"
-#: config.c:998
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "資料物件 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s':%4$s"
-#: config.c:1001
+#: config.c:1016
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "檔案 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s':%4$s"
-#: config.c:1004
+#: config.c:1019
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "標準輸入中設定變數 '%2$s' 錯誤的取值 '%1$s':%3$s"
-#: config.c:1007
+#: config.c:1022
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "子模組資料 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s':%4$s"
-#: config.c:1010
+#: config.c:1025
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "指令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s':%4$s"
-#: config.c:1013
+#: config.c:1028
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s':%4$s"
-#: config.c:1108
+#: config.c:1123
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "無法擴展使用者目錄:'%s'"
-#: config.c:1117
+#: config.c:1132
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%2$s' 的值 '%1$s' 不是一個有效的時間戳"
-#: config.c:1208
+#: config.c:1223
#, c-format
msgid "abbrev length out of range: %d"
msgstr "縮寫長度超出範圍:%d"
-#: config.c:1222 config.c:1233
+#: config.c:1237 config.c:1248
#, c-format
msgid "bad zlib compression level %d"
msgstr "錯誤的 zlib 壓縮級別 %d"
-#: config.c:1325
+#: config.c:1340
msgid "core.commentChar should only be one character"
msgstr "core.commentChar 應該是一個字元"
-#: config.c:1358
+#: config.c:1373
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "無效的物件建立模式:%s"
-#: config.c:1430
+#: config.c:1445
#, c-format
msgid "malformed value for %s"
msgstr "%s 的取值格式錯誤"
-#: config.c:1456
+#: config.c:1471
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s 的取值格式錯誤:%s"
-#: config.c:1457
+#: config.c:1472
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "必須是其中之一:nothing、matching、simple、upstream 或 current"
-#: config.c:1518 builtin/pack-objects.c:3541
+#: config.c:1533 builtin/pack-objects.c:3542
#, c-format
msgid "bad pack compression level %d"
msgstr "錯誤的打包壓縮級別 %d"
-#: config.c:1639
+#: config.c:1655
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "無法從資料物件 '%s' 載入設定"
-#: config.c:1642
+#: config.c:1658
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "引用 '%s' 沒有指向一個資料物件"
-#: config.c:1659
+#: config.c:1675
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "不能解析設定物件 '%s'"
-#: config.c:1689
+#: config.c:1705
#, c-format
msgid "failed to parse %s"
msgstr "解析 %s 失敗"
-#: config.c:1743
+#: config.c:1759
msgid "unable to parse command-line config"
msgstr "無法解析指令列中的設定"
-#: config.c:2097
+#: config.c:2113
msgid "unknown error occurred while reading the configuration files"
msgstr "在讀取設定檔案時遇到未知錯誤"
-#: config.c:2267
+#: config.c:2283
#, c-format
msgid "Invalid %s: '%s'"
msgstr "無效 %s:'%s'"
-#: config.c:2312
+#: config.c:2328
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間"
-#: config.c:2358
+#: config.c:2374
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "無法解析指令列設定中的 '%s'"
-#: config.c:2360
+#: config.c:2376
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'"
-#: config.c:2441
+#: config.c:2457
#, c-format
msgid "invalid section name '%s'"
msgstr "無效的小節名稱 '%s'"
-#: config.c:2473
+#: config.c:2489
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多個取值"
-#: config.c:2502
+#: config.c:2518
#, c-format
msgid "failed to write new configuration file %s"
msgstr "寫入新的設定檔案 %s 失敗"
-#: config.c:2754 config.c:3078
+#: config.c:2770 config.c:3094
#, c-format
msgid "could not lock config file %s"
msgstr "不能鎖定設定檔案 %s"
-#: config.c:2765
+#: config.c:2781
#, c-format
msgid "opening %s"
msgstr "開啟 %s"
-#: config.c:2800 builtin/config.c:344
+#: config.c:2816 builtin/config.c:344
#, c-format
msgid "invalid pattern: %s"
msgstr "無效模式:%s"
-#: config.c:2825
+#: config.c:2841
#, c-format
msgid "invalid config file %s"
msgstr "無效的設定檔案 %s"
-#: config.c:2838 config.c:3091
+#: config.c:2854 config.c:3107
#, c-format
msgid "fstat on %s failed"
msgstr "對 %s 呼叫 fstat 失敗"
-#: config.c:2849
+#: config.c:2865
#, c-format
msgid "unable to mmap '%s'"
msgstr "不能 mmap '%s'"
-#: config.c:2858 config.c:3096
+#: config.c:2874 config.c:3112
#, c-format
msgid "chmod on %s failed"
msgstr "對 %s 呼叫 chmod 失敗"
-#: config.c:2943 config.c:3193
+#: config.c:2959 config.c:3209
#, c-format
msgid "could not write config file %s"
msgstr "不能寫入設定檔案 %s"
-#: config.c:2977
+#: config.c:2993
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能設定 '%s' 為 '%s'"
-#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
+#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消設定 '%s'"
-#: config.c:3069
+#: config.c:3085
#, c-format
msgid "invalid section name: %s"
msgstr "無效的小節名稱:%s"
-#: config.c:3236
+#: config.c:3252
#, c-format
msgid "missing value for '%s'"
msgstr "%s 的取值缺少"
@@ -2783,7 +2960,7 @@ msgstr "無法為 socket 設定 SO_KEEPALIVE"
#: connect.c:635 connect.c:698
#, c-format
msgid "Looking up %s ... "
-msgstr "尋找 %s ..."
+msgstr "尋找 %s ... "
#: connect.c:639
#, c-format
@@ -2864,19 +3041,19 @@ msgstr "已阻止奇怪的路徑名 '%s'"
msgid "unable to fork"
msgstr "無法 fork"
-#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "正在檢查連通性"
-#: connected.c:110
+#: connected.c:119
msgid "Could not run 'git rev-list'"
msgstr "不能執行 'git rev-list'"
-#: connected.c:130
+#: connected.c:139
msgid "failed write to rev-list"
msgstr "寫入 rev-list 失敗"
-#: connected.c:137
+#: connected.c:146
msgid "failed to close rev-list's stdin"
msgstr "關閉 rev-list 的標準輸入失敗"
@@ -2896,8 +3073,8 @@ msgid ""
"CRLF will be replaced by LF in %s.\n"
"The file will have its original line endings in your working directory"
msgstr ""
-"%s 中的 CRLF 將被 LF 取代。<\n"
-"在工作區中該檔案仍保持原有的換行符號。"
+"%s 中的 CRLF 將被 LF 取代。\n"
+"在工作區中該檔案仍保持原有的換行符號"
#: convert.c:217
#, c-format
@@ -2974,35 +3151,63 @@ msgstr "從外部過濾器 '%s' 讀取失敗"
msgid "external filter '%s' failed"
msgstr "外部過濾器 '%s' 失敗"
-#: convert.c:839
+#: convert.c:840
msgid "unexpected filter type"
msgstr "意外的過濾類型"
-#: convert.c:850
+#: convert.c:851
msgid "path name too long for external filter"
msgstr "外部過濾器的路徑名太長"
-#: convert.c:924
+#: convert.c:943
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
"been filtered"
msgstr "外部過濾器 '%s' 不再可用,但並非所有路徑都已過濾"
-#: convert.c:1223
+#: convert.c:1243
msgid "true/false are no valid working-tree-encodings"
msgstr "true/false 不是有效的工作區編碼"
-#: convert.c:1411 convert.c:1445
+#: convert.c:1431 convert.c:1465
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s:clean 過濾器 '%s' 失敗"
-#: convert.c:1489
+#: convert.c:1511
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s:smudge 過濾器 %s 失敗"
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "跳過鍵的憑證查詢:credential.%s"
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr "拒絕使用缺少主機欄位的憑證"
+
+#: credential.c:114
+msgid "refusing to work with credential missing protocol field"
+msgstr "拒絕使用缺少通訊協定欄位的憑證"
+
+#: credential.c:396
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "URL 的 %s 部分有換行:%s"
+
+#: credential.c:440
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "URL 沒有 Scheme:%s"
+
+#: credential.c:513
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "無法解析憑證 URL:%s"
+
#: date.c:138
msgid "in the future"
msgstr "在將來"
@@ -3086,15 +3291,6 @@ msgstr "來自 config 的資料島正規表示式有太多的捕獲組(最多
msgid "Marked %d islands, done.\n"
msgstr "已標記 %d 個資料島,結束。\n"
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "讀取排序檔案 '%s' 失敗"
-
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "正在進行非精確的重新命名偵測"
-
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
msgstr "git diff --no-index [<選項>] <路徑> <路徑>"
@@ -3154,35 +3350,35 @@ msgstr ""
"發現設定變數 'diff.dirstat' 中的錯誤:\n"
"%s"
-#: diff.c:4202
+#: diff.c:4238
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 離開,停止在 %s"
-#: diff.c:4547
+#: diff.c:4583
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
-#: diff.c:4550
+#: diff.c:4586
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G、-S 和 --find-object 是互斥的"
-#: diff.c:4628
+#: diff.c:4664
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明確要求只跟一個路徑規格"
-#: diff.c:4676
+#: diff.c:4712
#, c-format
msgid "invalid --stat value: %s"
msgstr "無效的 --stat 值:%s"
-#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
+#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245
#: parse-options.c:197 parse-options.c:201
#, c-format
msgid "%s expects a numerical value"
msgstr "%s 期望一個數字值"
-#: diff.c:4713
+#: diff.c:4749
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3191,195 +3387,195 @@ msgstr ""
"無法解析 --dirstat/-X 選項的參數:\n"
"%s"
-#: diff.c:4798
+#: diff.c:4834
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"
-#: diff.c:4822
+#: diff.c:4858
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "ws-error-highlight=%.*s 之後未知的值"
-#: diff.c:4836
+#: diff.c:4872
#, c-format
msgid "unable to resolve '%s'"
msgstr "不能解析 '%s'"
-#: diff.c:4886 diff.c:4892
+#: diff.c:4922 diff.c:4928
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s 期望 <n>/<m> 格式"
-#: diff.c:4904
+#: diff.c:4940
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s 期望一個字元,得到 '%s'"
-#: diff.c:4925
+#: diff.c:4961
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "壞的 --color-moved 參數:%s"
-#: diff.c:4944
+#: diff.c:4980
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "--color-moved-ws 中的無效模式 '%s' "
+msgstr "--color-moved-ws 中的無效模式 '%s'"
-#: diff.c:4984
+#: diff.c:5020
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
-#: diff.c:5020 diff.c:5040
+#: diff.c:5056 diff.c:5076
#, c-format
msgid "invalid argument to %s"
msgstr "%s 的參數無效"
-#: diff.c:5178
+#: diff.c:5214
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "無法解析 --submodule 選項的參數:'%s'"
-#: diff.c:5234
+#: diff.c:5270
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "壞的 --word-diff 參數:%s"
-#: diff.c:5257
+#: diff.c:5293
msgid "Diff output format options"
msgstr "差異輸出格式化選項"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5295 diff.c:5301
msgid "generate patch"
msgstr "生成修補檔"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5298 builtin/log.c:177
msgid "suppress diff output"
msgstr "不顯示差異輸出"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5303 diff.c:5417 diff.c:5424
msgid "<n>"
msgstr "<n>"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5304 diff.c:5307
msgid "generate diffs with <n> lines context"
msgstr "生成含 <n> 行上下文的差異"
-#: diff.c:5273
+#: diff.c:5309
msgid "generate the diff in raw format"
msgstr "生成原始格式的差異"
-#: diff.c:5276
+#: diff.c:5312
msgid "synonym for '-p --raw'"
msgstr "和 '-p --raw' 同義"
-#: diff.c:5280
+#: diff.c:5316
msgid "synonym for '-p --stat'"
msgstr "和 '-p --stat' 同義"
-#: diff.c:5284
+#: diff.c:5320
msgid "machine friendly --stat"
msgstr "機器友好的 --stat"
-#: diff.c:5287
+#: diff.c:5323
msgid "output only the last line of --stat"
msgstr "只輸出 --stat 的最後一行"
-#: diff.c:5289 diff.c:5297
+#: diff.c:5325 diff.c:5333
msgid "<param1,param2>..."
msgstr "<參數1,參數2>..."
-#: diff.c:5290
+#: diff.c:5326
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "輸出每個子目錄相對變更的分布"
-#: diff.c:5294
+#: diff.c:5330
msgid "synonym for --dirstat=cumulative"
msgstr "和 --dirstat=cumulative 同義"
-#: diff.c:5298
+#: diff.c:5334
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "是 --dirstat=files,param1,param2... 的同義詞"
-#: diff.c:5302
+#: diff.c:5338
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "如果變更中引入衝突定界符或空白錯誤,給出警告"
-#: diff.c:5305
+#: diff.c:5341
msgid "condensed summary such as creations, renames and mode changes"
msgstr "精簡摘要,例如建立、重新命名和模式變更"
-#: diff.c:5308
+#: diff.c:5344
msgid "show only names of changed files"
msgstr "只顯示變更檔案的檔案名"
-#: diff.c:5311
+#: diff.c:5347
msgid "show only names and status of changed files"
msgstr "只顯示變更檔案的檔案名和狀態"
-#: diff.c:5313
+#: diff.c:5349
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"
-#: diff.c:5314
+#: diff.c:5350
msgid "generate diffstat"
msgstr "生成差異統計(diffstat)"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5352 diff.c:5355 diff.c:5358
msgid "<width>"
msgstr "<寬度>"
-#: diff.c:5317
+#: diff.c:5353
msgid "generate diffstat with a given width"
msgstr "使用提供的長度生成差異統計"
-#: diff.c:5320
+#: diff.c:5356
msgid "generate diffstat with a given name width"
msgstr "使用提供的檔案名長度生成差異統計"
-#: diff.c:5323
+#: diff.c:5359
msgid "generate diffstat with a given graph width"
msgstr "使用提供的圖形長度生成差異統計"
-#: diff.c:5325
+#: diff.c:5361
msgid "<count>"
msgstr "<次數>"
-#: diff.c:5326
+#: diff.c:5362
msgid "generate diffstat with limited lines"
msgstr "生成有限行數的差異統計"
-#: diff.c:5329
+#: diff.c:5365
msgid "generate compact summary in diffstat"
msgstr "生成差異統計的簡潔摘要"
-#: diff.c:5332
+#: diff.c:5368
msgid "output a binary diff that can be applied"
msgstr "輸出一個可以應用的二進位差異"
-#: diff.c:5335
+#: diff.c:5371
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "在 \"index\" 行顯示完整的前後物件名稱"
-#: diff.c:5337
+#: diff.c:5373
msgid "show colored diff"
msgstr "顯示帶顏色的差異"
-#: diff.c:5338
+#: diff.c:5374
msgid "<kind>"
msgstr "<類型>"
-#: diff.c:5339
+#: diff.c:5375
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr "對於差異中的上下文、舊的和新的行,加亮顯示錯誤的空白字元"
-#: diff.c:5342
+#: diff.c:5378
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3387,300 +3583,309 @@ msgstr ""
"在 --raw 或者 --numstat 中,不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"
"符"
-#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
+#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493
msgid "<prefix>"
msgstr "<前綴>"
-#: diff.c:5346
+#: diff.c:5382
msgid "show the given source prefix instead of \"a/\""
msgstr "顯示提供的源前綴取代 \"a/\""
-#: diff.c:5349
+#: diff.c:5385
msgid "show the given destination prefix instead of \"b/\""
msgstr "顯示提供的目標前綴取代 \"b/\""
-#: diff.c:5352
+#: diff.c:5388
msgid "prepend an additional prefix to every line of output"
msgstr "輸出的每一行附加前綴"
-#: diff.c:5355
+#: diff.c:5391
msgid "do not show any source or destination prefix"
msgstr "不顯示任何源和目標前綴"
-#: diff.c:5358
+#: diff.c:5394
msgid "show context between diff hunks up to the specified number of lines"
msgstr "顯示指定行數的差異區塊間的上下文"
-#: diff.c:5362 diff.c:5367 diff.c:5372
+#: diff.c:5398 diff.c:5403 diff.c:5408
msgid "<char>"
msgstr "<字元>"
-#: diff.c:5363
+#: diff.c:5399
msgid "specify the character to indicate a new line instead of '+'"
msgstr "指定一個字元取代 '+' 來表示新的一行"
-#: diff.c:5368
+#: diff.c:5404
msgid "specify the character to indicate an old line instead of '-'"
msgstr "指定一個字元取代 '-' 來表示舊的一行"
-#: diff.c:5373
+#: diff.c:5409
msgid "specify the character to indicate a context instead of ' '"
msgstr "指定一個字元取代 ' ' 來表示一行上下文"
-#: diff.c:5376
+#: diff.c:5412
msgid "Diff rename options"
msgstr "差異重新命名選項"
-#: diff.c:5377
+#: diff.c:5413
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5378
+#: diff.c:5414
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "將完全重寫的變更打破為成對的刪除和建立"
-#: diff.c:5382
+#: diff.c:5418
msgid "detect renames"
msgstr "檢測重新命名"
-#: diff.c:5386
+#: diff.c:5422
msgid "omit the preimage for deletes"
msgstr "省略刪除動作的差異輸出"
-#: diff.c:5389
+#: diff.c:5425
msgid "detect copies"
msgstr "檢測複製"
-#: diff.c:5393
+#: diff.c:5429
msgid "use unmodified files as source to find copies"
msgstr "使用未修改的檔案做為發現複製的源"
-#: diff.c:5395
+#: diff.c:5431
msgid "disable rename detection"
-msgstr "禁用重新命名偵測"
+msgstr "停用重新命名偵測"
-#: diff.c:5398
+#: diff.c:5434
msgid "use empty blobs as rename source"
msgstr "使用空的資料物件做為重新命名的源"
-#: diff.c:5400
+#: diff.c:5436
msgid "continue listing the history of a file beyond renames"
msgstr "繼續列出檔案重新命名以外的歷史記錄"
-#: diff.c:5403
+#: diff.c:5439
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr "如果重新命名/複製目標超過提供的限制,禁止重新命名/複製檢測"
-#: diff.c:5405
+#: diff.c:5441
msgid "Diff algorithm options"
msgstr "差異演算法選項"
-#: diff.c:5407
+#: diff.c:5443
msgid "produce the smallest possible diff"
msgstr "生成儘可能小的差異"
-#: diff.c:5410
+#: diff.c:5446
msgid "ignore whitespace when comparing lines"
msgstr "行比較時忽略空白字元"
-#: diff.c:5413
+#: diff.c:5449
msgid "ignore changes in amount of whitespace"
msgstr "忽略空白字元的變更"
-#: diff.c:5416
+#: diff.c:5452
msgid "ignore changes in whitespace at EOL"
msgstr "忽略行尾的空白字元變更"
-#: diff.c:5419
+#: diff.c:5455
msgid "ignore carrier-return at the end of line"
msgstr "忽略行尾的Enter符(CR)"
-#: diff.c:5422
+#: diff.c:5458
msgid "ignore changes whose lines are all blank"
msgstr "忽略整行都是空白的變更"
-#: diff.c:5425
+#: diff.c:5461
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "啟發式轉換差異邊界以便閱讀"
-#: diff.c:5428
+#: diff.c:5464
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "使用 \"patience diff\" 演算法生成差異"
-#: diff.c:5432
+#: diff.c:5468
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "使用 \"histogram diff\" 演算法生成差異"
-#: diff.c:5434
+#: diff.c:5470
msgid "<algorithm>"
msgstr "<演算法>"
-#: diff.c:5435
+#: diff.c:5471
msgid "choose a diff algorithm"
msgstr "選擇一個差異演算法"
-#: diff.c:5437
+#: diff.c:5473
msgid "<text>"
msgstr "<文字>"
-#: diff.c:5438
+#: diff.c:5474
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "使用 \"anchored diff\" 演算法生成差異"
-#: diff.c:5440 diff.c:5449 diff.c:5452
+#: diff.c:5476 diff.c:5485 diff.c:5488
msgid "<mode>"
msgstr "<模式>"
-#: diff.c:5441
+#: diff.c:5477
msgid "show word diff, using <mode> to delimit changed words"
msgstr "顯示單詞差異,使用 <模式> 分隔變更的單詞"
-#: diff.c:5443 diff.c:5446 diff.c:5491
+#: diff.c:5479 diff.c:5482 diff.c:5527
msgid "<regex>"
msgstr "<正則>"
-#: diff.c:5444
+#: diff.c:5480
msgid "use <regex> to decide what a word is"
msgstr "使用 <正規表示式> 確定何為一個詞"
-#: diff.c:5447
+#: diff.c:5483
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"
-#: diff.c:5450
+#: diff.c:5486
msgid "moved lines of code are colored differently"
msgstr "移動的程式碼行用不同方式著色"
-#: diff.c:5453
+#: diff.c:5489
msgid "how white spaces are ignored in --color-moved"
msgstr "在 --color-moved 下如何忽略空白字元"
-#: diff.c:5456
+#: diff.c:5492
msgid "Other diff options"
msgstr "其它差異選項"
-#: diff.c:5458
+#: diff.c:5494
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr "當從子目錄執行,排除目錄之外的變更並顯示相對路徑"
-#: diff.c:5462
+#: diff.c:5498
msgid "treat all files as text"
msgstr "把所有檔案當做文字處理"
-#: diff.c:5464
+#: diff.c:5500
msgid "swap two inputs, reverse the diff"
msgstr "交換兩個輸入,反轉差異"
-#: diff.c:5466
+#: diff.c:5502
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "有差異時離開碼為 1,否則為 0"
-#: diff.c:5468
+#: diff.c:5504
msgid "disable all output of the program"
-msgstr "禁用本程式的所有輸出"
+msgstr "停用本程式的所有輸出"
-#: diff.c:5470
+#: diff.c:5506
msgid "allow an external diff helper to be executed"
msgstr "允許執行一個外部的差異助手"
-#: diff.c:5472
+#: diff.c:5508
msgid "run external text conversion filters when comparing binary files"
msgstr "當比較二進位檔案時,執行外部的文字轉換過濾器"
-#: diff.c:5474
+#: diff.c:5510
msgid "<when>"
msgstr "<何時>"
-#: diff.c:5475
+#: diff.c:5511
msgid "ignore changes to submodules in the diff generation"
msgstr "在生成差異時,忽略子模組的更改"
-#: diff.c:5478
+#: diff.c:5514
msgid "<format>"
msgstr "<格式>"
-#: diff.c:5479
+#: diff.c:5515
msgid "specify how differences in submodules are shown"
msgstr "指定子模組的差異如何顯示"
-#: diff.c:5483
+#: diff.c:5519
msgid "hide 'git add -N' entries from the index"
msgstr "隱藏索引中 'git add -N' 條目"
-#: diff.c:5486
+#: diff.c:5522
msgid "treat 'git add -N' entries as real in the index"
msgstr "將索引中 'git add -N' 條目當做真實的"
-#: diff.c:5488
+#: diff.c:5524
msgid "<string>"
msgstr "<字串>"
-#: diff.c:5489
+#: diff.c:5525
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "尋找改變了指定字串出現次數的差異"
-#: diff.c:5492
+#: diff.c:5528
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "尋找改變指定正則符合出現次數的差異"
-#: diff.c:5495
+#: diff.c:5531
msgid "show all changes in the changeset with -S or -G"
msgstr "顯示使用 -S 或 -G 的變更集的所有變更"
-#: diff.c:5498
+#: diff.c:5534
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "將 -S 的 <string> 當做擴展的 POSIX 正規表示式"
-#: diff.c:5501
+#: diff.c:5537
msgid "control the order in which files appear in the output"
msgstr "控制輸出中的檔案顯示順序"
-#: diff.c:5502
+#: diff.c:5538
msgid "<object-id>"
msgstr "<物件 ID>"
-#: diff.c:5503
+#: diff.c:5539
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "尋找改變指定物件出現次數的差異"
-#: diff.c:5505
+#: diff.c:5541
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5506
+#: diff.c:5542
msgid "select files by diff type"
msgstr "透過差異類型選擇檔案"
-#: diff.c:5508
+#: diff.c:5544
msgid "<file>"
msgstr "<檔案>"
-#: diff.c:5509
+#: diff.c:5545
msgid "Output to a specific file"
msgstr "輸出到一個指定的檔案"
-#: diff.c:6164
+#: diff.c:6200
msgid "inexact rename detection was skipped due to too many files."
msgstr "因為檔案太多,略過不嚴格的重新命名檢查。"
-#: diff.c:6167
+#: diff.c:6203
msgid "only found copies from modified paths due to too many files."
msgstr "因為檔案太多,只在修改的路徑中尋找複製。"
-#: diff.c:6170
+#: diff.c:6206
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令。"
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "讀取排序檔案 '%s' 失敗"
+
+#: diffcore-rename.c:592
+msgid "Performing inexact rename detection"
+msgstr "正在進行非精確的重新命名偵測"
+
#: dir.c:555
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
@@ -3699,7 +3904,7 @@ msgstr "無法識別反向模式:「%s」"
#: dir.c:786
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
-msgstr "您的稀疏簽出檔案可能有問題:「%s」樣式重複"
+msgstr "您的稀疏檢出檔案可能有問題:「%s」樣式重複"
#: dir.c:796
msgid "disabling cone pattern matching"
@@ -3710,35 +3915,35 @@ msgstr "停用 cone 樣式符合模式"
msgid "cannot use %s as an exclude file"
msgstr "不能將 %s 用作排除檔案"
-#: dir.c:2144
+#: dir.c:2275
#, c-format
msgid "could not open directory '%s'"
msgstr "不能開啟目錄 '%s'"
-#: dir.c:2479
+#: dir.c:2575
msgid "failed to get kernel name and information"
msgstr "無法獲得核心名稱和訊息"
-#: dir.c:2603
+#: dir.c:2699
msgid "untracked cache is disabled on this system or location"
-msgstr "快取未追蹤檔案在本系統或位置中被禁用"
+msgstr "快取未追蹤檔案在本系統或位置中被停用"
-#: dir.c:3407
+#: dir.c:3481
#, c-format
msgid "index file corrupt in repo %s"
msgstr "版本庫 %s 中的索引檔案損壞"
-#: dir.c:3452 dir.c:3457
+#: dir.c:3526 dir.c:3531
#, c-format
msgid "could not create directories for %s"
msgstr "不能為 %s 建立目錄"
-#: dir.c:3486
+#: dir.c:3560
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"
-#: editor.c:73
+#: editor.c:74
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "提示:等待您的編輯器關閉檔案...%c"
@@ -3747,17 +3952,17 @@ msgstr "提示:等待您的編輯器關閉檔案...%c"
msgid "Filtering content"
msgstr "過濾內容"
-#: entry.c:476
+#: entry.c:479
#, c-format
msgid "could not stat file '%s'"
msgstr "不能對檔案 '%s' 呼叫 stat"
-#: environment.c:149
+#: environment.c:150
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "錯誤的 git 名字空間路徑 \"%s\""
-#: environment.c:331
+#: environment.c:337
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "不能設定 GIT_DIR 為 '%s'"
@@ -3767,244 +3972,244 @@ msgstr "不能設定 GIT_DIR 為 '%s'"
msgid "too many args to run %s"
msgstr "執行 %s 的參數太多"
-#: fetch-pack.c:150
+#: fetch-pack.c:151
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack:應為 shallow 列表"
-#: fetch-pack.c:153
+#: fetch-pack.c:154
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack:在淺複製列表之後期望一個 flush 包"
-#: fetch-pack.c:164
+#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack:期望 ACK/NAK,卻得到 flush 包"
-#: fetch-pack.c:184
+#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack:應為 ACK/NAK,卻得到 '%s'"
-#: fetch-pack.c:195
+#: fetch-pack.c:196
msgid "unable to write to remote"
msgstr "無法寫到遠端"
-#: fetch-pack.c:257
+#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:357 fetch-pack.c:1364
#, c-format
msgid "invalid shallow line: %s"
msgstr "無效的 shallow 訊息:%s"
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:363 fetch-pack.c:1370
#, c-format
msgid "invalid unshallow line: %s"
msgstr "無效的 unshallow 訊息:%s"
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:365 fetch-pack.c:1372
#, c-format
msgid "object not found: %s"
msgstr "物件未找到:%s"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:368 fetch-pack.c:1375
#, c-format
msgid "error in object: %s"
msgstr "物件中發生錯誤:%s"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:370 fetch-pack.c:1377
#, c-format
msgid "no shallow found: %s"
msgstr "未發現 shallow:%s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:373 fetch-pack.c:1381
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "應為 shallow/unshallow,卻得到 %s"
-#: fetch-pack.c:414
+#: fetch-pack.c:415
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
-#: fetch-pack.c:431
+#: fetch-pack.c:432
#, c-format
msgid "invalid commit %s"
msgstr "無效提交 %s"
-#: fetch-pack.c:462
+#: fetch-pack.c:463
msgid "giving up"
msgstr "放棄"
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:476 progress.c:336
msgid "done"
msgstr "完成"
-#: fetch-pack.c:487
+#: fetch-pack.c:488
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
-#: fetch-pack.c:533
+#: fetch-pack.c:534
#, c-format
msgid "Marking %s as complete"
msgstr "標記 %s 為完成"
-#: fetch-pack.c:754
+#: fetch-pack.c:755
#, c-format
msgid "already have %s (%s)"
msgstr "已經有 %s(%s)"
-#: fetch-pack.c:818
+#: fetch-pack.c:819
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack:無法衍生 sideband 多路輸出"
-#: fetch-pack.c:826
+#: fetch-pack.c:827
msgid "protocol error: bad pack header"
msgstr "協定錯誤:壞的包頭"
-#: fetch-pack.c:900
+#: fetch-pack.c:901
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack:無法衍生進程 %s"
-#: fetch-pack.c:916
+#: fetch-pack.c:917
#, c-format
msgid "%s failed"
msgstr "%s 失敗"
-#: fetch-pack.c:918
+#: fetch-pack.c:919
msgid "error in sideband demultiplexer"
msgstr "sideband 多路輸出發生錯誤"
-#: fetch-pack.c:965
+#: fetch-pack.c:966
#, c-format
msgid "Server version is %.*s"
msgstr "伺服器版本 %.*s"
-#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
-#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
-#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
-#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
+#: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986
+#: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002
+#: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018
+#: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040
#, c-format
msgid "Server supports %s"
msgstr "伺服器支援 %s"
-#: fetch-pack.c:972
+#: fetch-pack.c:973
msgid "Server does not support shallow clients"
msgstr "伺服器不支援 shalllow 用戶端"
-#: fetch-pack.c:1032
+#: fetch-pack.c:1033
msgid "Server does not support --shallow-since"
msgstr "伺服器不支援 --shallow-since"
-#: fetch-pack.c:1037
+#: fetch-pack.c:1038
msgid "Server does not support --shallow-exclude"
msgstr "伺服器不支援 --shallow-exclude"
-#: fetch-pack.c:1041
+#: fetch-pack.c:1042
msgid "Server does not support --deepen"
msgstr "伺服器不支援 --deepen"
-#: fetch-pack.c:1058
+#: fetch-pack.c:1059
msgid "no common commits"
msgstr "沒有共同的提交"
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1071 fetch-pack.c:1563
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack:取得失敗。"
-#: fetch-pack.c:1209
+#: fetch-pack.c:1211
msgid "Server does not support shallow requests"
msgstr "伺服器不支援 shalllow 請求"
-#: fetch-pack.c:1216
+#: fetch-pack.c:1218
msgid "Server supports filter"
msgstr "伺服器支援 filter"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1242
msgid "unable to write request to remote"
msgstr "無法將請求寫到遠端"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1260
#, c-format
msgid "error reading section header '%s'"
msgstr "讀取節標題 '%s' 發生錯誤"
-#: fetch-pack.c:1263
+#: fetch-pack.c:1266
#, c-format
msgid "expected '%s', received '%s'"
msgstr "預期 '%s',得到 '%s'"
-#: fetch-pack.c:1303
+#: fetch-pack.c:1327
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "意外的確認行:'%s'"
-#: fetch-pack.c:1308
+#: fetch-pack.c:1332
#, c-format
msgid "error processing acks: %d"
msgstr "處理 ack 發生錯誤:%d"
-#: fetch-pack.c:1318
+#: fetch-pack.c:1342
msgid "expected packfile to be sent after 'ready'"
msgstr "預期在 'ready' 之後傳送 packfile"
-#: fetch-pack.c:1320
+#: fetch-pack.c:1344
msgid "expected no other sections to be sent after no 'ready'"
msgstr "在沒有 'ready' 不應該傳送其它小節"
-#: fetch-pack.c:1362
+#: fetch-pack.c:1386
#, c-format
msgid "error processing shallow info: %d"
msgstr "處理淺複製訊息發生錯誤:%d"
-#: fetch-pack.c:1409
+#: fetch-pack.c:1433
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "預期 wanted-ref,得到 '%s'"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1438
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "意外的 wanted-ref:'%s'"
-#: fetch-pack.c:1419
+#: fetch-pack.c:1443
#, c-format
msgid "error processing wanted refs: %d"
msgstr "處理要取得的引用發生錯誤:%d"
-#: fetch-pack.c:1762
+#: fetch-pack.c:1789
msgid "no matching remote head"
msgstr "沒有符合的遠端分支"
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1812 builtin/clone.c:692
msgid "remote did not send all necessary objects"
msgstr "遠端沒有傳送所有必需的物件"
-#: fetch-pack.c:1812
+#: fetch-pack.c:1839
#, c-format
msgid "no such remote ref %s"
msgstr "沒有這樣的遠端引用 %s"
-#: fetch-pack.c:1815
+#: fetch-pack.c:1842
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "伺服器不允許請求未公開的物件 %s"
-#: gpg-interface.c:408
-msgid "gpg failed to sign the data"
-msgstr "gpg 無法為資料簽名"
-
-#: gpg-interface.c:434
+#: gpg-interface.c:272
msgid "could not create temporary file"
msgstr "不能建立暫存檔"
-#: gpg-interface.c:437
+#: gpg-interface.c:275
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "無法將分離式簽名寫入 '%s'"
+#: gpg-interface.c:457
+msgid "gpg failed to sign the data"
+msgstr "gpg 無法為資料簽名"
+
#: graph.c:98
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
@@ -4023,7 +4228,7 @@ msgstr ""
msgid "'%s': unable to read %s"
msgstr "'%s':無法讀取 %s"
-#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
@@ -4099,7 +4304,7 @@ msgstr "在 $PATH 路徑中的其他地方可用的 git 指令"
msgid "These are common Git commands used in various situations:"
msgstr "這些是各種場合常見的 Git 指令:"
-#: help.c:363 git.c:98
+#: help.c:363 git.c:99
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "不支援的指令列表類型 '%s'"
@@ -4108,19 +4313,19 @@ msgstr "不支援的指令列表類型 '%s'"
msgid "The common Git guides are:"
msgstr "最常用的 Git 嚮導有:"
-#: help.c:512
+#: help.c:427
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "執行 'git help <command>' 來檢視特定子指令"
-#: help.c:517
+#: help.c:432
msgid "External commands"
msgstr "外部指令"
-#: help.c:532
+#: help.c:447
msgid "Command aliases"
msgstr "指令別名"
-#: help.c:596
+#: help.c:511
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4129,31 +4334,31 @@ msgstr ""
"'%s' 像是一個 git 指令,但卻無法執行。\n"
"可能是 git-%s 受損?"
-#: help.c:655
+#: help.c:570
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "唉呀,您的系統中未發現 Git 指令。"
-#: help.c:677
+#: help.c:592
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "警告:您執行了一個並不存在的 Git 指令 '%s'。"
-#: help.c:682
+#: help.c:597
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "假定你想要的是 '%s' 並繼續。"
-#: help.c:687
+#: help.c:602
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒鐘後繼續。"
-#: help.c:695
+#: help.c:610
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git:'%s' 不是一個 git 指令。參見 'git --help'。"
-#: help.c:699
+#: help.c:614
msgid ""
"\n"
"The most similar command is"
@@ -4164,16 +4369,16 @@ msgstr[0] ""
"\n"
"最類似的指令有"
-#: help.c:714
+#: help.c:653
msgid "git version [<options>]"
msgstr "git version [<選項>]"
-#: help.c:783
+#: help.c:708
#, c-format
msgid "%s: %s - %s"
msgstr "%s:%s - %s"
-#: help.c:787
+#: help.c:712
msgid ""
"\n"
"Did you mean this?"
@@ -4211,7 +4416,7 @@ msgstr ""
#: ident.c:379
msgid "no email was given and auto-detection is disabled"
-msgstr "未提供信件位址且自動偵測被禁用"
+msgstr "未提供信件位址且自動偵測被停用"
#: ident.c:384
#, c-format
@@ -4220,7 +4425,7 @@ msgstr "無法自動偵測信件位址(得到 '%s')"
#: ident.c:401
msgid "no name was given and auto-detection is disabled"
-msgstr "未提供姓名且自動偵測被禁用"
+msgstr "未提供姓名且自動偵測被停用"
#: ident.c:407
#, c-format
@@ -4235,38 +4440,13 @@ msgstr "不允許空的姓名(對於 <%s>)"
#: ident.c:421
#, c-format
msgid "name consists only of disallowed characters: %s"
-msgstr "姓名中僅包含禁用字元:%s"
+msgstr "姓名中僅包含停用字元:%s"
-#: ident.c:436 builtin/commit.c:635
+#: ident.c:436 builtin/commit.c:634
#, c-format
msgid "invalid date format: %s"
msgstr "無效的日期格式:%s"
-#: list-objects.c:127
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "樹 %2$s 中的條目 '%1$s' 具有樹的屬性,但不是一個樹狀物件"
-
-#: list-objects.c:140
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr "樹 %2$s 中的條目 '%1$s' 具有資料物件的屬性,但不是一個資料物件"
-
-#: list-objects.c:375
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "無法為提交 %s 載入根樹"
-
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "不能存取 '%s' 中的稀疏資料物件"
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "無法解析 %s 中的稀疏過濾器資料"
-
#: list-objects-filter-options.c:58
msgid "expected 'tree:<depth>'"
msgstr "期望 'tree:<深度>'"
@@ -4293,7 +4473,32 @@ msgstr "期望在組合後有一些東西:"
msgid "multiple filter-specs cannot be combined"
msgstr "不能混用多種過濾規格"
-#: lockfile.c:151
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "不能存取 '%s' 中的稀疏資料物件"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "無法解析 %s 中的稀疏過濾器資料"
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "樹 %2$s 中的條目 '%1$s' 具有樹的屬性,但不是一個樹狀物件"
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "樹 %2$s 中的條目 '%1$s' 具有資料物件的屬性,但不是一個資料物件"
+
+#: list-objects.c:375
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "無法為提交 %s 載入根樹"
+
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4311,20 +4516,14 @@ msgstr ""
"可能之前有一個 git 進程在這個版本庫中異常離開:\n"
"手動刪除這個檔案再繼續。"
-#: lockfile.c:159
+#: lockfile.c:160
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "不能建立 '%s.lock':%s"
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "讀取快取失敗"
-
-#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
-#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
-#: builtin/stash.c:265
-msgid "unable to write new index file"
-msgstr "無法寫新的索引檔案"
+#: ls-refs.c:109
+msgid "expected flush after ls-refs arguments"
+msgstr "在 ls-refs 引數之後應該有一個 flush 包"
#: merge-recursive.c:356
msgid "(bad commit)\n"
@@ -4387,7 +4586,7 @@ msgstr "不知道如何處理 %06o %s '%s'"
#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
-msgstr "無法合併子模組 %s (沒有簽出)"
+msgstr "無法合併子模組 %s (沒有檢出)"
#: merge-recursive.c:1198
#, c-format
@@ -4507,7 +4706,7 @@ msgstr "重新命名"
msgid "renamed"
msgstr "重新命名"
-#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
+#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "拒絕遺失髒檔案 '%s'"
@@ -4544,16 +4743,16 @@ msgstr ""
#: merge-recursive.c:1713
msgid " (left unresolved)"
-msgstr "(留下未解決)"
+msgstr " (留下未解決)"
-#: merge-recursive.c:1793
+#: merge-recursive.c:1805
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"衝突(重新命名/重新命名):在 %3$s 中重新命名 %1$s->%2$s,在 %6$s 中重新命名 "
"%4$s->%5$s"
-#: merge-recursive.c:2056
+#: merge-recursive.c:2068
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4563,7 +4762,7 @@ msgstr ""
"衝突(分割的目錄重新命名):不清楚 %s 應該放在哪裡,因為目錄 %s 被重新命名到"
"多個其它目錄,沒有目錄包含大部分檔案。"
-#: merge-recursive.c:2088
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4572,7 +4771,7 @@ msgstr ""
"衝突(隱式目錄重新命名):處於隱式目錄重新命名的現存檔案/目錄 %s,將以下路徑"
"放在:%s。"
-#: merge-recursive.c:2098
+#: merge-recursive.c:2110
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4581,7 +4780,7 @@ msgstr ""
"衝突(隱式目錄重新命名):無法映射一個以上路徑到 %s,隱式目錄重新命名嘗試將這"
"些路徑放置於此:%s"
-#: merge-recursive.c:2190
+#: merge-recursive.c:2202
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4590,59 +4789,59 @@ msgstr ""
"衝突(重新命名/重新命名):在 %3$s 中重新命名目錄 %1$s->%2$s,在 %6$s 中重新"
"命名目錄 %4$s->%5$s"
-#: merge-recursive.c:2435
+#: merge-recursive.c:2447
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr "警告:避免應用 %s -> %s 的重新命名到 %s,因為 %s 本身已被重新命名。"
-#: merge-recursive.c:2961
+#: merge-recursive.c:2973
#, c-format
msgid "cannot read object %s"
msgstr "不能讀取物件 %s"
-#: merge-recursive.c:2964
+#: merge-recursive.c:2976
#, c-format
msgid "object %s is not a blob"
msgstr "物件 %s 不是一個資料物件"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:3040
+#: merge-recursive.c:3052
msgid "content"
msgstr "內容"
-#: merge-recursive.c:3044
+#: merge-recursive.c:3056
msgid "add/add"
msgstr "新增/新增"
-#: merge-recursive.c:3067
+#: merge-recursive.c:3079
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略過 %s(已經做過相同合併)"
-#: merge-recursive.c:3089 git-submodule.sh:1003
+#: merge-recursive.c:3101 git-submodule.sh:985
msgid "submodule"
msgstr "子模組"
-#: merge-recursive.c:3090
+#: merge-recursive.c:3102
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "衝突(%s):合併衝突於 %s"
-#: merge-recursive.c:3120
+#: merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 為名新增"
-#: merge-recursive.c:3203
+#: merge-recursive.c:3215
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4650,7 +4849,7 @@ msgid ""
msgstr ""
"路徑已更新:%s 新增到 %s,位於一個被重新命名到 %s 的目錄中,將其移動到 %s。"
-#: merge-recursive.c:3206
+#: merge-recursive.c:3218
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4659,7 +4858,7 @@ msgstr ""
"衝突(檔案位置):%s 新增到 %s,位於一個被重新命名為 %s 的目錄中,建議將其移"
"動到 %s。"
-#: merge-recursive.c:3210
+#: merge-recursive.c:3222
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4668,7 +4867,7 @@ msgstr ""
"路徑已更新:%1$s 重新命名為 %3$s 中的 %2$s,而該目錄被重新命名到 %4$s 中,將"
"其移動到 %5$s。"
-#: merge-recursive.c:3213
+#: merge-recursive.c:3225
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4677,58 +4876,58 @@ msgstr ""
"衝突(檔案位置):%1$s 重新命名為 %3$s 中的 %2$s,而該目錄被重新命名到 %4$s "
"中,建議將其移動到 %5$s。"
-#: merge-recursive.c:3327
+#: merge-recursive.c:3339
#, c-format
msgid "Removing %s"
msgstr "刪除 %s"
-#: merge-recursive.c:3350
+#: merge-recursive.c:3362
msgid "file/directory"
msgstr "檔案/目錄"
-#: merge-recursive.c:3355
+#: merge-recursive.c:3367
msgid "directory/file"
msgstr "目錄/檔案"
-#: merge-recursive.c:3362
+#: merge-recursive.c:3374
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "衝突(%1$s):在 %3$s 中有一個名為 %2$s 的目錄。以 %5$s 為名新增 %4$s"
-#: merge-recursive.c:3371
+#: merge-recursive.c:3383
#, c-format
msgid "Adding %s"
msgstr "新增 %s"
-#: merge-recursive.c:3380
+#: merge-recursive.c:3392
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "衝突(add/add):合併衝突於 %s"
-#: merge-recursive.c:3424
+#: merge-recursive.c:3436
msgid "Already up to date!"
msgstr "已經是最新的!"
-#: merge-recursive.c:3433
+#: merge-recursive.c:3445
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "無法合併樹 %s 和 %s"
-#: merge-recursive.c:3537
+#: merge-recursive.c:3549
msgid "Merging:"
msgstr "合併:"
-#: merge-recursive.c:3550
+#: merge-recursive.c:3562
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "發現 %u 個共同祖先:"
-#: merge-recursive.c:3600
+#: merge-recursive.c:3612
msgid "merge returned no commit"
msgstr "合併未返回提交"
-#: merge-recursive.c:3659
+#: merge-recursive.c:3671
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4737,15 +4936,25 @@ msgstr ""
"您對下列檔案的本機修改將被合併動作覆蓋:\n"
" %s"
-#: merge-recursive.c:3756
+#: merge-recursive.c:3768
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析物件 '%s'"
-#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
+#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885
msgid "Unable to write index."
msgstr "不能寫入索引。"
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "讀取快取失敗"
+
+#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912
+#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "無法寫新的索引檔案"
+
#: midx.c:68
#, c-format
msgid "multi-pack-index file %s is too small"
@@ -4795,107 +5004,115 @@ msgstr "多包索引缺少必需的物件位移塊"
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "多包索引包名無序:'%s' 在 '%s' 之前"
-#: midx.c:210
+#: midx.c:208
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "錯的 pack-int-id:%u(共有 %u 個包)"
-#: midx.c:260
+#: midx.c:258
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "多包索引儲存一個64位位移,但是 off_t 太小"
-#: midx.c:288
+#: midx.c:286
msgid "error preparing packfile from multi-pack-index"
msgstr "從多包索引準備 packfile 時發生錯誤"
-#: midx.c:472
+#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "新增 packfile '%s' 失敗"
-#: midx.c:478
+#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "開啟包索引 '%s' 失敗"
-#: midx.c:538
+#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "在 packfile 中定位物件 %d 失敗"
-#: midx.c:842
+#: midx.c:840
msgid "Adding packfiles to multi-pack-index"
msgstr "正在新增 packfile 至多包索引"
-#: midx.c:875
+#: midx.c:873
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "沒有看到要捨棄的包檔案 %s"
-#: midx.c:973
+#: midx.c:925
+msgid "no pack files to index."
+msgstr "沒有要索引的 pack 檔案。"
+
+#: midx.c:977
msgid "Writing chunks to multi-pack-index"
msgstr "寫入區塊至多包索引"
-#: midx.c:1052
+#: midx.c:1056
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "清理位於 %s 的多包索引失敗"
-#: midx.c:1108
+#: midx.c:1112
msgid "Looking for referenced packfiles"
msgstr "正在尋找引用的 packfile"
-#: midx.c:1123
+#: midx.c:1127
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "物件 ID 扇出無序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1128
+#: midx.c:1132
+msgid "the midx contains no oid"
+msgstr "midx 沒有 oid"
+
+#: midx.c:1141
msgid "Verifying OID order in multi-pack-index"
msgstr "正在驗證多包索引中的物件 ID 順序"
-#: midx.c:1137
+#: midx.c:1150
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "物件 ID 查詢無序:oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1157
+#: midx.c:1170
msgid "Sorting objects by packfile"
msgstr "透過 packfile 為物件排序"
-#: midx.c:1164
+#: midx.c:1177
msgid "Verifying object offsets"
msgstr "正在驗證物件位移"
-#: midx.c:1180
+#: midx.c:1193
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "為 oid[%d] = %s 載入包條目失敗"
-#: midx.c:1186
+#: midx.c:1199
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "為 packfile %s 載入包索引失敗"
-#: midx.c:1195
+#: midx.c:1208
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "oid[%d] = %s 錯誤的物件位移:%<PRIx64> != %<PRIx64>"
-#: midx.c:1220
+#: midx.c:1233
msgid "Counting referenced objects"
msgstr "正在計算引用物件"
-#: midx.c:1230
+#: midx.c:1243
msgid "Finding and deleting unreferenced packfiles"
msgstr "正在尋找並刪除沒有參考的 packfile"
-#: midx.c:1388
+#: midx.c:1433
msgid "could not start pack-objects"
msgstr "不能開始 pack-objects"
-#: midx.c:1407
+#: midx.c:1452
msgid "could not finish pack-objects"
msgstr "不能結束 pack-objects"
@@ -4978,6 +5195,11 @@ msgstr "不能解析物件:%s"
msgid "hash mismatch %s"
msgstr "雜湊值與 %s 不符合"
+#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135
+#, c-format
+msgid "unable to get size of %s"
+msgstr "不能得到 %s 的大小"
+
#: packfile.c:629
msgid "offset before end of packfile (broken .idx?)"
msgstr "位移量在 packfile 結束之前(損壞的 .idx?)"
@@ -4992,10 +5214,25 @@ msgstr "位移量在 %s 的包索引開始之前(損壞的索引?)"
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "位移量越過了 %s 的包索引的結尾(被截斷的索引?)"
-#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "unable to get size of %s"
-msgstr "不能得到 %s 的大小"
+msgid "option `%s' expects a numerical value"
+msgstr "選項 `%s' 期望一個數字值"
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "格式錯誤的到期時間:'%s'"
+
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
+
+#: parse-options-cb.c:130 parse-options-cb.c:147
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "格式錯誤的物件名 '%s'"
#: parse-options.c:38
#, c-format
@@ -5037,26 +5274,31 @@ msgstr "有歧義的選項:%s(可以是 --%s%s 或 --%s%s)"
msgid "did you mean `--%s` (with two dashes)?"
msgstr "你的意思是 `--%s`(有兩個短線)嗎?"
-#: parse-options.c:857
+#: parse-options.c:663 parse-options.c:963
+#, c-format
+msgid "alias of --%s"
+msgstr "--%s 的別名"
+
+#: parse-options.c:854
#, c-format
msgid "unknown option `%s'"
msgstr "未知選項 `%s'"
-#: parse-options.c:859
+#: parse-options.c:856
#, c-format
msgid "unknown switch `%c'"
msgstr "未知開關 `%c'"
-#: parse-options.c:861
+#: parse-options.c:858
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "字串中未知的非 ascii 字元選項:`%s'"
-#: parse-options.c:885
+#: parse-options.c:882
msgid "..."
msgstr "..."
-#: parse-options.c:904
+#: parse-options.c:901
#, c-format
msgid "usage: %s"
msgstr "用法:%s"
@@ -5064,46 +5306,21 @@ msgstr "用法:%s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:907
#, c-format
msgid " or: %s"
-msgstr " 或:%s"
+msgstr " 或:%s"
# 譯者:為保證在輸出中對齊,注意調整句中空格!
-#: parse-options.c:913
+#: parse-options.c:910
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:952
+#: parse-options.c:949
msgid "-NUM"
msgstr "-數字"
-#: parse-options.c:966
-#, c-format
-msgid "alias of --%s"
-msgstr "--%s 的別名"
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "選項 `%s' 期望一個數字值"
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "格式錯誤的到期時間:'%s'"
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
-
-#: parse-options-cb.c:130 parse-options-cb.c:147
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "格式錯誤的物件名 '%s'"
-
#: path.c:915
#, c-format
msgid "Could not make %s writable by group"
@@ -5160,27 +5377,27 @@ msgstr "路徑規格 '%2$s' 中包含未實現的神奇前綴 '%1$c'"
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s:'literal' 和 'glob' 不相容"
-#: pathspec.c:442
+#: pathspec.c:445
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s:'%s' 在位於 '%s' 的版本庫之外"
-#: pathspec.c:517
+#: pathspec.c:521
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s'(助記符:'%c')"
-#: pathspec.c:527
+#: pathspec.c:531
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s:路徑規格神奇前綴不被此指令支援:%s"
-#: pathspec.c:594
+#: pathspec.c:598
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "路徑規格 '%s' 位於符號連結中"
-#: pathspec.c:639
+#: pathspec.c:643
#, c-format
msgid "line is badly quoted: %s"
msgstr "某行不應該被括號括住:%s"
@@ -5245,7 +5462,7 @@ msgstr "正在重新整理索引"
msgid "unable to create threaded lstat: %s"
msgstr "無法建立執行緒 lstat:%s"
-#: pretty.c:981
+#: pretty.c:982
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
@@ -5258,29 +5475,40 @@ msgstr "遠端未設定 URL"
msgid "promisor remote name cannot begin with '/': %s"
msgstr "promisor 遠端名稱不能以 '/' 開始:%s"
-#: range-diff.c:75
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "正在刪除重複物件"
+
+#: range-diff.c:77
msgid "could not start `log`"
msgstr "不能啟動 `log`"
-#: range-diff.c:77
+#: range-diff.c:79
msgid "could not read `log` output"
msgstr "不能讀取 `log` 的輸出"
-#: range-diff.c:96 sequencer.c:5020
+#: range-diff.c:98 sequencer.c:5143
#, c-format
msgid "could not parse commit '%s'"
msgstr "不能解析提交 '%s'"
-#: range-diff.c:122
+#: range-diff.c:112
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr "無法解析第一行「log」輸出:開頭不是「commit」:「%s」"
+
+#: range-diff.c:137
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "無法解析 git 頭 '%.*s'"
-#: range-diff.c:285
+#: range-diff.c:301
msgid "failed to generate diff"
msgstr "生成 diff 失敗"
-#: range-diff.c:518 range-diff.c:520
+#: range-diff.c:534 range-diff.c:536
#, c-format
msgid "could not parse log for '%s'"
msgstr "不能解析 '%s' 的日誌"
@@ -5302,7 +5530,7 @@ msgstr "%s:只能新增一般檔案、符號連結或 git 目錄"
#: read-cache.c:723
#, c-format
msgid "'%s' does not have a commit checked out"
-msgstr "'%s' 沒有簽出一個提交"
+msgstr "'%s' 沒有檢出一個提交"
#: read-cache.c:775
#, c-format
@@ -5397,9 +5625,9 @@ msgstr "'%s' 的未排序暫存條目"
#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961
+#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
+#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290
#: builtin/submodule--helper.c:332
msgid "index file corrupt"
msgstr "索引檔案損壞"
@@ -5454,12 +5682,12 @@ msgstr "無法重新整理共享索引 '%s'"
msgid "broken index, expect %s in %s, got %s"
msgstr "損壞的索引,期望在 %2$s 中的 %1$s,得到 %3$s"
-#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
+#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130
#, c-format
msgid "could not close '%s'"
msgstr "不能關閉 '%s'"
-#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066
#, c-format
msgid "could not stat '%s'"
msgstr "不能對 '%s' 呼叫 stat"
@@ -5585,14 +5813,14 @@ msgstr ""
"然而,如果您刪除全部內容,重定基底動作將會終止。\n"
"\n"
-#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
-#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463
+#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258
#, c-format
msgid "could not write '%s'"
msgstr "不能寫入 '%s'"
-#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
-#: builtin/rebase.c:234
+#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216
+#: builtin/rebase.c:240
#, c-format
msgid "could not write '%s'."
msgstr "不能寫入 '%s'。"
@@ -5622,132 +5850,14 @@ msgstr ""
"可選值有:ignore、warn、error。\n"
"\n"
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
-#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
-#: builtin/rebase.c:246
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274
+#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227
+#: builtin/rebase.c:252
#, c-format
msgid "could not read '%s'."
msgstr "不能讀取 '%s'。"
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "%s 沒有指向一個有效的物件!"
-
-#: refs.c:667
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "忽略懸空符號引用 %s"
-
-#: refs.c:669 ref-filter.c:2098
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "忽略損壞的引用 %s"
-
-#: refs.c:804
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "無法為寫入開啟 '%s':%s"
-
-#: refs.c:814 refs.c:865
-#, c-format
-msgid "could not read ref '%s'"
-msgstr "無法讀取引用 '%s'"
-
-#: refs.c:820
-#, c-format
-msgid "ref '%s' already exists"
-msgstr "引用 '%s' 已經存在"
-
-#: refs.c:825
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr "寫入 '%s' 時意外的物件 ID"
-
-#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
-#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
-#: wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "不能寫入 '%s'"
-
-#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
-#: builtin/rebase.c:1029
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "無法開啟 '%s' 進行寫入"
-
-#: refs.c:867
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr "刪除 '%s' 時意外的物件 ID"
-
-#: refs.c:998
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr "引用 %s 的日誌在 %s 之後有缺口"
-
-#: refs.c:1004
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "引用 %s 的日誌意外終止於 %s "
-
-#: refs.c:1063
-#, c-format
-msgid "log for %s is empty"
-msgstr "%s 的日誌為空"
-
-#: refs.c:1155
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "拒絕更新有錯誤名稱 '%s' 的引用"
-
-#: refs.c:1231
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "對引用 '%s' 執行 update_ref 失敗:%s"
-
-#: refs.c:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "不允許對引用 '%s' 多次更新"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "在隔離環境中禁止更新引用"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' 已存在,無法建立 '%s'"
-
-#: refs.c:2157 refs.c:2192
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "無法同時處理 '%s' 和 '%s'"
-
-#: refs/files-backend.c:1233
-#, c-format
-msgid "could not remove reference %s"
-msgstr "無法刪除引用 %s"
-
-#: refs/files-backend.c:1247 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "無法刪除引用 %s:%s"
-
-#: refs/files-backend.c:1250 refs/packed-backend.c:1554
-#, c-format
-msgid "could not delete references: %s"
-msgstr "無法刪除引用:%s"
-
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "無效的引用表達式:'%s'"
-
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:1936
msgid "gone"
msgstr "遺失"
@@ -5774,7 +5884,7 @@ msgstr "期望的格式:%%(color:<顏色>)"
#: ref-filter.c:167
#, c-format
msgid "unrecognized color: %%(color:%s)"
-msgstr "未能識別的顏色:%%(color:%s)"
+msgstr "無法識別的顏色:%%(color:%s)"
#: ref-filter.c:189
#, c-format
@@ -5789,7 +5899,7 @@ msgstr "期望整數值 refname:rstrip=%s"
#: ref-filter.c:195
#, c-format
msgid "unrecognized %%(%s) argument: %s"
-msgstr "未能識別的 %%(%s) 參數:%s"
+msgstr "無法識別的 %%(%s) 參數:%s"
#: ref-filter.c:250
#, c-format
@@ -5799,7 +5909,7 @@ msgstr "%%(objecttype) 不帶參數"
#: ref-filter.c:272
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "未能識別的 %%(objectsize) 參數:%s"
+msgstr "無法識別的 %%(objectsize) 參數:%s"
#: ref-filter.c:280
#, c-format
@@ -5829,7 +5939,7 @@ msgstr "期望一個正數 contents:lines=%s"
#: ref-filter.c:354
#, c-format
msgid "unrecognized %%(contents) argument: %s"
-msgstr "未能識別的 %%(contents) 參數:%s"
+msgstr "無法識別的 %%(contents) 參數:%s"
#: ref-filter.c:369
#, c-format
@@ -5839,7 +5949,7 @@ msgstr "期望一個正數 objectname:short=%s"
#: ref-filter.c:373
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
-msgstr "未能識別的 %%(objectname) 參數:%s"
+msgstr "無法識別的 %%(objectname) 參數:%s"
#: ref-filter.c:403
#, c-format
@@ -5849,17 +5959,17 @@ msgstr "期望的格式:%%(align:<寬度>,<位置>)"
#: ref-filter.c:415
#, c-format
msgid "unrecognized position:%s"
-msgstr "未能識別的位置:%s"
+msgstr "無法識別的位置:%s"
#: ref-filter.c:422
#, c-format
msgid "unrecognized width:%s"
-msgstr "未能識別的寬度:%s"
+msgstr "無法識別的寬度:%s"
#: ref-filter.c:431
#, c-format
msgid "unrecognized %%(align) argument: %s"
-msgstr "未能識別的 %%(align) 參數:%s"
+msgstr "無法識別的 %%(align) 參數:%s"
#: ref-filter.c:439
#, c-format
@@ -5869,7 +5979,7 @@ msgstr "元素 %%(align) 需要一個正數的寬度"
#: ref-filter.c:457
#, c-format
msgid "unrecognized %%(if) argument: %s"
-msgstr "未能識別的 %%(if) 參數:%s"
+msgstr "無法識別的 %%(if) 參數:%s"
#: ref-filter.c:559
#, c-format
@@ -5932,114 +6042,232 @@ msgstr "格式:使用了 %%(end) 元素卻沒有它的對應元素"
msgid "malformed format string %s"
msgstr "錯誤的格式化字串 %s"
-#: ref-filter.c:1488
+#: ref-filter.c:1486
#, c-format
msgid "no branch, rebasing %s"
msgstr "非分支,正重定基底 %s"
-#: ref-filter.c:1491
+#: ref-filter.c:1489
#, c-format
msgid "no branch, rebasing detached HEAD %s"
msgstr "非分支,正重定基底分離開頭指標 %s"
-#: ref-filter.c:1494
+#: ref-filter.c:1492
#, c-format
msgid "no branch, bisect started on %s"
msgstr "非分支,二分尋找開始於 %s"
-#: ref-filter.c:1504
+#: ref-filter.c:1502
msgid "no branch"
msgstr "非分支"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1538 ref-filter.c:1747
#, c-format
msgid "missing object %s for %s"
msgstr "缺少 %2$s 的物件 %1$s"
-#: ref-filter.c:1550
+#: ref-filter.c:1548
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s"
-#: ref-filter.c:2004
+#: ref-filter.c:2001
#, c-format
msgid "malformed object at '%s'"
msgstr "格式錯誤的物件 '%s'"
-#: ref-filter.c:2093
+#: ref-filter.c:2090
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略帶有錯誤名稱 %s 的引用"
-#: ref-filter.c:2389
+#: ref-filter.c:2095 refs.c:625
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "忽略損壞的引用 %s"
+
+#: ref-filter.c:2395
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式:缺少 %%(end) 元素"
-#: ref-filter.c:2489
+#: ref-filter.c:2495
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "選項 `%s' 和 --merged 不相容"
-#: ref-filter.c:2492
+#: ref-filter.c:2498
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr "選項 `%s' 和 --no-merged 不相容"
-#: ref-filter.c:2502
+#: ref-filter.c:2508
#, c-format
msgid "malformed object name %s"
msgstr "格式錯誤的物件名 %s"
-#: ref-filter.c:2507
+#: ref-filter.c:2513
#, c-format
msgid "option `%s' must point to a commit"
msgstr "選項 `%s' 必須指向一個提交"
-#: remote.c:366
+#: refs.c:262
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s 沒有指向一個有效的物件!"
+
+#: refs.c:623
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "忽略懸空符號引用 %s"
+
+#: refs.c:760
+#, c-format
+msgid "could not open '%s' for writing: %s"
+msgstr "無法為寫入開啟 '%s':%s"
+
+#: refs.c:770 refs.c:821
+#, c-format
+msgid "could not read ref '%s'"
+msgstr "無法讀取引用 '%s'"
+
+#: refs.c:776
+#, c-format
+msgid "ref '%s' already exists"
+msgstr "引用 '%s' 已經存在"
+
+#: refs.c:781
+#, c-format
+msgid "unexpected object ID when writing '%s'"
+msgstr "寫入 '%s' 時意外的物件 ID"
+
+#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
+#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173
+#: wrapper.c:620
+#, c-format
+msgid "could not write to '%s'"
+msgstr "不能寫入 '%s'"
+
+#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:852
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "無法開啟 '%s' 進行寫入"
+
+#: refs.c:823
+#, c-format
+msgid "unexpected object ID when deleting '%s'"
+msgstr "刪除 '%s' 時意外的物件 ID"
+
+#: refs.c:954
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "引用 %s 的日誌在 %s 之後有缺口"
+
+#: refs.c:960
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "引用 %s 的日誌意外終止於 %s"
+
+#: refs.c:1019
+#, c-format
+msgid "log for %s is empty"
+msgstr "%s 的日誌為空"
+
+#: refs.c:1111
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "拒絕更新有錯誤名稱 '%s' 的引用"
+
+#: refs.c:1187
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "對引用 '%s' 執行 update_ref 失敗:%s"
+
+#: refs.c:1979
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "不允許對引用 '%s' 多次更新"
+
+#: refs.c:2011
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "在隔離環境中禁止更新引用"
+
+#: refs.c:2107 refs.c:2137
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' 已存在,無法建立 '%s'"
+
+#: refs.c:2113 refs.c:2148
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "無法同時處理 '%s' 和 '%s'"
+
+#: refs/files-backend.c:1233
+#, c-format
+msgid "could not remove reference %s"
+msgstr "無法刪除引用 %s"
+
+#: refs/files-backend.c:1247 refs/packed-backend.c:1541
+#: refs/packed-backend.c:1551
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "無法刪除引用 %s:%s"
+
+#: refs/files-backend.c:1250 refs/packed-backend.c:1554
+#, c-format
+msgid "could not delete references: %s"
+msgstr "無法刪除引用:%s"
+
+#: refspec.c:137
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "無效的引用表達式:'%s'"
+
+#: remote.c:355
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr "設定的遠端短名稱不能以 '/' 開始:%s"
-#: remote.c:414
+#: remote.c:403
msgid "more than one receivepack given, using the first"
msgstr "提供了一個以上的 receivepack,使用第一個"
-#: remote.c:422
+#: remote.c:411
msgid "more than one uploadpack given, using the first"
msgstr "提供了一個以上的 uploadpack,使用第一個"
-#: remote.c:612
+#: remote.c:594
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "不能同時取得 %s 和 %s 至 %s"
-#: remote.c:616
+#: remote.c:598
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常追蹤 %s,而非 %s"
-#: remote.c:620
+#: remote.c:602
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s 同時追蹤 %s 和 %s"
-#: remote.c:688
+#: remote.c:670
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "模式的鍵 '%s' 沒有 '*'"
-#: remote.c:698
+#: remote.c:680
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "模式的值 '%s' 沒有 '*'"
-#: remote.c:1004
+#: remote.c:986
#, c-format
msgid "src refspec %s does not match any"
msgstr "源引用表達式 %s 沒有符合"
-#: remote.c:1009
+#: remote.c:991
#, c-format
msgid "src refspec %s matches more than one"
msgstr "源引用表達式 %s 符合超過一個"
@@ -6048,7 +6276,7 @@ msgstr "源引用表達式 %s 符合超過一個"
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1006
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6070,7 +6298,7 @@ msgstr ""
"\n"
"都不行,所以我們已放棄。您必須給出完整的引用。"
-#: remote.c:1044
+#: remote.c:1026
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6080,7 +6308,7 @@ msgstr ""
"引用表達式的 <src> 是一個提交物件。您是想建立一個新的分支而向\n"
"'%s:refs/heads/%s' 推送嗎?"
-#: remote.c:1049
+#: remote.c:1031
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6090,7 +6318,7 @@ msgstr ""
"引用表達式的 <src> 是一個標籤物件。您是想建立一個新的標籤而向\n"
"'%s:refs/tags/%s' 推送嗎?"
-#: remote.c:1054
+#: remote.c:1036
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6100,7 +6328,7 @@ msgstr ""
"引用表達式的 <src> 是一個樹狀物件。您是想為這個樹狀物件建立標籤而向\n"
"'%s:refs/tags/%s' 推送嗎?"
-#: remote.c:1059
+#: remote.c:1041
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6110,113 +6338,113 @@ msgstr ""
"引用表達式的 <src> 是一個資料物件。您是想為這個資料物件建立標籤而向\n"
"'%s:refs/tags/%s' 推送嗎?"
-#: remote.c:1095
+#: remote.c:1077
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s 無法被解析為分支"
-#: remote.c:1106
+#: remote.c:1088
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "無法刪除 '%s':遠端引用不存在"
-#: remote.c:1118
+#: remote.c:1100
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "目標引用表達式 %s 符合超過一個"
-#: remote.c:1125
+#: remote.c:1107
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "目標引用 %s 接收超過一個源"
-#: remote.c:1628 remote.c:1729
+#: remote.c:1610 remote.c:1711
msgid "HEAD does not point to a branch"
msgstr "HEAD 沒有指向一個分支"
-#: remote.c:1637
+#: remote.c:1619
#, c-format
msgid "no such branch: '%s'"
msgstr "沒有此分支:'%s'"
-#: remote.c:1640
+#: remote.c:1622
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未給分支 '%s' 設定上游"
-#: remote.c:1646
+#: remote.c:1628
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 沒有儲存為一個遠端追蹤分支"
-#: remote.c:1661
+#: remote.c:1643
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推送目標 '%s' 至遠端 '%s' 沒有本機追蹤分支"
-#: remote.c:1673
+#: remote.c:1655
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 沒有設定要推送的遠端伺服器"
-#: remote.c:1683
+#: remote.c:1665
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "向 '%s' 推送引用規格未包含 '%s'"
-#: remote.c:1696
+#: remote.c:1678
msgid "push has no destination (push.default is 'nothing')"
msgstr "推送無目標(push.default 是 'nothing')"
-#: remote.c:1718
+#: remote.c:1700
msgid "cannot resolve 'simple' push to a single destination"
msgstr "無法解析 'simple' 推送至一個單獨的目標"
-#: remote.c:1844
+#: remote.c:1826
#, c-format
msgid "couldn't find remote ref %s"
msgstr "無法找到遠端引用 %s"
-#: remote.c:1857
+#: remote.c:1839
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* 在本機忽略可笑的引用 '%s'"
-#: remote.c:2020
+#: remote.c:2002
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基於 '%s',但此上游分支已經不存在。\n"
-#: remote.c:2024
+#: remote.c:2006
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (使用 \"git branch --unset-upstream\" 來修復)\n"
-#: remote.c:2027
+#: remote.c:2009
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "您的分支與上游分支 '%s' 一致。\n"
-#: remote.c:2031
+#: remote.c:2013
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "您的分支和 '%s' 指向不同的提交。\n"
-#: remote.c:2034
+#: remote.c:2016
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (使用 \"%s\" 檢視詳情)\n"
-#: remote.c:2038
+#: remote.c:2020
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "您的分支領先 '%s' 共 %d 個提交。\n"
-#: remote.c:2044
+#: remote.c:2026
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (使用 \"git push\" 來發布您的本機提交)\n"
-#: remote.c:2047
+#: remote.c:2029
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6224,11 +6452,11 @@ msgid_plural ""
msgstr[0] "您的分支落後 '%s' 共 %d 個提交,並且可以快轉。\n"
# 譯者:請維持前導空格
-#: remote.c:2055
+#: remote.c:2037
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (使用 \"git pull\" 來更新您的本機分支)\n"
-#: remote.c:2058
+#: remote.c:2040
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6241,11 +6469,11 @@ msgstr[0] ""
"並且分別有 %d 和 %d 處不同的提交。\n"
# 譯者:請維持前導空格
-#: remote.c:2068
+#: remote.c:2050
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (使用 \"git pull\" 來合併遠端分支)\n"
-#: remote.c:2251
+#: remote.c:2233
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "無法解析期望的物件名 '%s'"
@@ -6265,6 +6493,11 @@ msgstr "重複的取代引用:%s"
msgid "replace depth too high for object %s"
msgstr "物件 %s 的取代層級太深"
+#: repository.c:94 builtin/init-db.c:188
+#, c-format
+msgid "The hash algorithm %s is not supported in this build."
+msgstr "此組建不支援 %s 雜湊算法。"
+
#: rerere.c:217 rerere.c:226 rerere.c:229
msgid "corrupt MERGE_RR"
msgstr "損壞的 MERGE_RR"
@@ -6323,7 +6556,7 @@ msgstr "不能刪除 stray '%s'"
msgid "Recorded preimage for '%s'"
msgstr "為 '%s' 記錄 preimage"
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1891
#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
#, c-format
msgid "could not create directory '%s'"
@@ -6358,20 +6591,29 @@ msgstr "忘記 '%s' 的解決方案\n"
msgid "unable to open rr-cache directory"
msgstr "不能開啟 rr-cache 目錄"
-#: revision.c:2497
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "不能確定 HEAD 版本"
+
+#: reset.c:70 reset.c:76 sequencer.c:3318
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "無法找到 %s 指向的樹"
+
+#: revision.c:2655
msgid "your current branch appears to be broken"
msgstr "您的目前分支好像被損壞"
-#: revision.c:2500
+#: revision.c:2658
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的目前分支 '%s' 尚無任何提交"
-#: revision.c:2708
+#: revision.c:2866
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent 與 --bisect 不相容"
-#: revision.c:2712
+#: revision.c:2870
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"
@@ -6393,75 +6635,75 @@ msgstr ""
"因為沒有將掛鉤 '%s' 設定為可執行,掛鉤被忽略。您可以透過\n"
"設定 `git config advice.ignoredHook false` 來關閉這條警告。"
-#: send-pack.c:144
+#: send-pack.c:145
msgid "unexpected flush packet while reading remote unpack status"
msgstr "讀取遠端解包狀態時收到意外的 flush 包"
-#: send-pack.c:146
+#: send-pack.c:147
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "不能解析遠端解包狀態:%s"
-#: send-pack.c:148
+#: send-pack.c:149
#, c-format
msgid "remote unpack failed: %s"
msgstr "遠端解包失敗:%s"
-#: send-pack.c:309
+#: send-pack.c:308
msgid "failed to sign the push certificate"
msgstr "為推送證書籤名失敗"
-#: send-pack.c:423
+#: send-pack.c:399
msgid "the receiving end does not support --signed push"
msgstr "接收端不支援簽名推送"
-#: send-pack.c:425
+#: send-pack.c:401
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr "未傳送推送證書,因為接收端不支援簽名推送"
-#: send-pack.c:437
+#: send-pack.c:413
msgid "the receiving end does not support --atomic push"
msgstr "接收端不支援原子推送"
-#: send-pack.c:442
+#: send-pack.c:418
msgid "the receiving end does not support push options"
msgstr "接收端不支援推送選項"
-#: sequencer.c:191
+#: sequencer.c:192
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "無效的提交訊息清理模式 '%s'"
-#: sequencer.c:296
+#: sequencer.c:297
#, c-format
msgid "could not delete '%s'"
msgstr "無法刪除 '%s'"
-#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
+#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "無法刪除 '%s'"
-#: sequencer.c:325
+#: sequencer.c:326
msgid "revert"
-msgstr "還原"
+msgstr "復原"
-#: sequencer.c:327
+#: sequencer.c:328
msgid "cherry-pick"
-msgstr "揀選"
+msgstr "摘取"
-#: sequencer.c:329
+#: sequencer.c:330
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:331
+#: sequencer.c:332
#, c-format
msgid "unknown action: %d"
msgstr "未知動作:%d"
-#: sequencer.c:389
+#: sequencer.c:390
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6469,7 +6711,7 @@ msgstr ""
"衝突解決完畢後,用 'git add <路徑>' 或 'git rm <路徑>'\n"
"指令標記修正後的檔案"
-#: sequencer.c:392
+#: sequencer.c:393
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6478,44 +6720,43 @@ msgstr ""
"衝突解決完畢後,用 'git add <路徑>' 或 'git rm <路徑>'\n"
"對修正後的檔案做標記,然後用 'git commit' 提交"
-#: sequencer.c:405 sequencer.c:2901
+#: sequencer.c:406 sequencer.c:2921
#, c-format
msgid "could not lock '%s'"
msgstr "不能鎖定 '%s'"
-#: sequencer.c:412
+#: sequencer.c:413
#, c-format
msgid "could not write eol to '%s'"
msgstr "不能將換行符號寫入 '%s'"
-#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
-#: sequencer.c:3185
+#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941
+#: sequencer.c:3203
#, c-format
msgid "failed to finalize '%s'"
msgstr "無法完成 '%s'"
-#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
+#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185
+#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128
#, c-format
msgid "could not read '%s'"
msgstr "不能讀取 '%s'"
-#: sequencer.c:466
+#: sequencer.c:457
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "您的本機修改將被%s覆蓋。"
-#: sequencer.c:470
+#: sequencer.c:461
msgid "commit your changes or stash them to proceed."
msgstr "提交您的修改或儲藏後再繼續。"
-#: sequencer.c:502
+#: sequencer.c:493
#, c-format
msgid "%s: fast-forward"
msgstr "%s:快轉"
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:532 builtin/tag.c:566
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "無效的清理模式 %s"
@@ -6523,65 +6764,65 @@ msgstr "無效的清理模式 %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:626
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s:無法寫入新索引檔案"
-#: sequencer.c:652
+#: sequencer.c:643
msgid "unable to update cache tree"
msgstr "不能更新快取樹"
-#: sequencer.c:666
+#: sequencer.c:657
msgid "could not resolve HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:746
+#: sequencer.c:737
#, c-format
msgid "no key present in '%.*s'"
msgstr "在 '%.*s' 中沒有 key"
-#: sequencer.c:757
+#: sequencer.c:748
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "無法為 '%s' 的值去引號"
-#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
+#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896
#, c-format
msgid "could not open '%s' for reading"
msgstr "無法開啟 '%s' 進行讀取"
-#: sequencer.c:804
+#: sequencer.c:795
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "已經給出 'GIT_AUTHOR_NAME'"
-#: sequencer.c:809
+#: sequencer.c:800
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "已經給出 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:814
+#: sequencer.c:805
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "已經給出 'GIT_AUTHOR_DATE'"
-#: sequencer.c:818
+#: sequencer.c:809
#, c-format
msgid "unknown variable '%s'"
msgstr "未知變數 '%s'"
-#: sequencer.c:823
+#: sequencer.c:814
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "缺少 'GIT_AUTHOR_NAME'"
-#: sequencer.c:825
+#: sequencer.c:816
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "缺少 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:827
+#: sequencer.c:818
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "缺少 'GIT_AUTHOR_DATE'"
-#: sequencer.c:876
+#: sequencer.c:867
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6610,11 +6851,11 @@ msgstr ""
"\n"
" git rebase --continue\n"
-#: sequencer.c:1148
+#: sequencer.c:1141
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' 掛鉤失敗"
-#: sequencer.c:1154
+#: sequencer.c:1147
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6638,7 +6879,7 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1167
+#: sequencer.c:1160
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6661,325 +6902,330 @@ msgstr ""
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1209
+#: sequencer.c:1202
msgid "couldn't look up newly created commit"
msgstr "無法找到新建立的提交"
-#: sequencer.c:1211
+#: sequencer.c:1204
msgid "could not parse newly created commit"
msgstr "不能解析新建立的提交"
-#: sequencer.c:1257
+#: sequencer.c:1250
msgid "unable to resolve HEAD after creating commit"
msgstr "建立提交後,不能解析 HEAD"
-#: sequencer.c:1259
+#: sequencer.c:1252
msgid "detached HEAD"
-msgstr "分離開頭指標"
+msgstr "分離 HEAD"
# 譯者:中文字串拼接,可刪除前導空格
-#: sequencer.c:1263
+#: sequencer.c:1256
msgid " (root-commit)"
msgstr " (根提交)"
-#: sequencer.c:1284
+#: sequencer.c:1277
msgid "could not parse HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1286
+#: sequencer.c:1279
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s 不是一個提交!"
-#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1335 sequencer.c:1980
msgid "unable to parse commit author"
msgstr "不能解析提交作者"
-#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 無法寫入樹狀物件"
-#: sequencer.c:1386 sequencer.c:1447
+#: sequencer.c:1379 sequencer.c:1450
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "不能從 '%s' 讀取提交說明"
-#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
-#: builtin/merge.c:911
+#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894
+#: builtin/merge.c:919
msgid "failed to write commit object"
msgstr "寫提交物件失敗"
-#: sequencer.c:1474
+#: sequencer.c:1433 sequencer.c:4118
+#, c-format
+msgid "could not update %s"
+msgstr "不能更新 %s"
+
+#: sequencer.c:1481
#, c-format
msgid "could not parse commit %s"
msgstr "不能解析提交 %s"
-#: sequencer.c:1479
+#: sequencer.c:1486
#, c-format
msgid "could not parse parent commit %s"
msgstr "不能解析父提交 %s"
-#: sequencer.c:1562 sequencer.c:1673
+#: sequencer.c:1569 sequencer.c:1680
#, c-format
msgid "unknown command: %d"
msgstr "未知指令:%d"
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1627 sequencer.c:1652
#, c-format
msgid "This is a combination of %d commits."
msgstr "這是一個 %d 個提交的組合。"
-#: sequencer.c:1630
+#: sequencer.c:1637
msgid "need a HEAD to fixup"
msgstr "需要一個 HEAD 來修復"
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1639 sequencer.c:3230
msgid "could not read HEAD"
msgstr "不能讀取 HEAD"
-#: sequencer.c:1634
+#: sequencer.c:1641
msgid "could not read HEAD's commit message"
msgstr "不能讀取 HEAD 的提交說明"
-#: sequencer.c:1640
+#: sequencer.c:1647
#, c-format
msgid "cannot write '%s'"
msgstr "不能寫 '%s'"
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1654 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "這是第一個提交說明:"
-#: sequencer.c:1655
+#: sequencer.c:1662
#, c-format
msgid "could not read commit message of %s"
msgstr "不能讀取 %s 的提交說明"
-#: sequencer.c:1662
+#: sequencer.c:1669
#, c-format
msgid "This is the commit message #%d:"
msgstr "這是提交說明 #%d:"
-#: sequencer.c:1668
+#: sequencer.c:1675
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "提交說明 #%d 將被跳過:"
-#: sequencer.c:1756
+#: sequencer.c:1763
msgid "your index file is unmerged."
msgstr "您的索引檔案未完成合併。"
-#: sequencer.c:1763
+#: sequencer.c:1770
msgid "cannot fixup root commit"
msgstr "不能修復根提交"
-#: sequencer.c:1782
+#: sequencer.c:1789
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一個合併提交但未提供 -m 選項。"
-#: sequencer.c:1790 sequencer.c:1798
+#: sequencer.c:1797 sequencer.c:1805
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 沒有第 %d 個父提交"
-#: sequencer.c:1804
+#: sequencer.c:1811
#, c-format
msgid "cannot get commit message for %s"
msgstr "不能得到 %s 的提交說明"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1823
+#: sequencer.c:1830
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s:不能解析父提交 %s"
-#: sequencer.c:1888
+#: sequencer.c:1895
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能將 '%s' 重新命名為 '%s'"
-#: sequencer.c:1943
+#: sequencer.c:1952
#, c-format
msgid "could not revert %s... %s"
msgstr "不能還原 %s... %s"
-#: sequencer.c:1944
+#: sequencer.c:1953
#, c-format
msgid "could not apply %s... %s"
msgstr "不能應用 %s... %s"
-#: sequencer.c:1961
+#: sequencer.c:1972
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n"
-#: sequencer.c:2018
+#: sequencer.c:2030
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s:無法讀取索引"
-#: sequencer.c:2025
+#: sequencer.c:2037
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s:無法重新整理索引"
-#: sequencer.c:2102
+#: sequencer.c:2114
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s 不接受參數:'%s'"
-#: sequencer.c:2111
+#: sequencer.c:2123
#, c-format
msgid "missing arguments for %s"
msgstr "缺少 %s 的參數"
-#: sequencer.c:2142
+#: sequencer.c:2154
#, c-format
msgid "could not parse '%s'"
msgstr "無法解析 '%s'"
-#: sequencer.c:2203
+#: sequencer.c:2215
#, c-format
msgid "invalid line %d: %.*s"
msgstr "無效行 %d:%.*s"
-#: sequencer.c:2214
+#: sequencer.c:2226
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "沒有父提交的情況下不能 '%s'"
-#: sequencer.c:2298
+#: sequencer.c:2310
msgid "cancelling a cherry picking in progress"
msgstr "正在取消一個進行中的揀選"
-#: sequencer.c:2305
+#: sequencer.c:2317
msgid "cancelling a revert in progress"
msgstr "正在取消一個進行中的還原"
-#: sequencer.c:2349
+#: sequencer.c:2361
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "請用 'git rebase --edit-todo' 來修改。"
-#: sequencer.c:2351
+#: sequencer.c:2363
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清單:'%s'"
-#: sequencer.c:2356
+#: sequencer.c:2368
msgid "no commits parsed."
msgstr "沒有解析提交。"
-#: sequencer.c:2367
+#: sequencer.c:2379
msgid "cannot cherry-pick during a revert."
msgstr "不能在還原提交中執行揀選。"
-#: sequencer.c:2369
+#: sequencer.c:2381
msgid "cannot revert during a cherry-pick."
msgstr "不能在揀選中執行還原提交。"
-#: sequencer.c:2447
+#: sequencer.c:2459
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值無效:%s"
-#: sequencer.c:2540
+#: sequencer.c:2556
msgid "unusable squash-onto"
msgstr "不可用的 squash-onto"
-#: sequencer.c:2556
+#: sequencer.c:2576
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "格式錯誤的選項清單:'%s'"
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2664 sequencer.c:4469
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:2660
+#: sequencer.c:2680
msgid "revert is already in progress"
msgstr "一個還原動作已在進行"
-#: sequencer.c:2662
+#: sequencer.c:2682
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2665
+#: sequencer.c:2685
msgid "cherry-pick is already in progress"
msgstr "揀選動作已在進行"
-#: sequencer.c:2667
+#: sequencer.c:2687
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:2681
+#: sequencer.c:2701
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能建立序列目錄 '%s'"
-#: sequencer.c:2696
+#: sequencer.c:2716
msgid "could not lock HEAD"
msgstr "不能鎖定 HEAD"
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2776 sequencer.c:4206
msgid "no cherry-pick or revert in progress"
msgstr "揀選或還原動作並未進行"
-#: sequencer.c:2758 sequencer.c:2769
+#: sequencer.c:2778 sequencer.c:2789
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2780 sequencer.c:2824
msgid "cannot abort from a branch yet to be born"
msgstr "不能從尚未建立的分支終止"
-#: sequencer.c:2790 builtin/grep.c:724
+#: sequencer.c:2810 builtin/grep.c:744
#, c-format
msgid "cannot open '%s'"
msgstr "不能開啟 '%s'"
-#: sequencer.c:2792
+#: sequencer.c:2812
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能讀取 '%s':%s"
-#: sequencer.c:2793
+#: sequencer.c:2813
msgid "unexpected end of file"
msgstr "意外的檔案結束"
-#: sequencer.c:2799
+#: sequencer.c:2819
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞"
-#: sequencer.c:2810
+#: sequencer.c:2830
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移動了 HEAD。未能還原,檢查您的 HEAD!"
-#: sequencer.c:2851
+#: sequencer.c:2871
msgid "no revert in progress"
msgstr "沒有正在進行的還原"
-#: sequencer.c:2859
+#: sequencer.c:2879
msgid "no cherry-pick in progress"
msgstr "沒有正在進行的揀選"
-#: sequencer.c:2869
+#: sequencer.c:2889
msgid "failed to skip the commit"
msgstr "無法跳過這個提交"
-#: sequencer.c:2876
+#: sequencer.c:2896
msgid "there is nothing to skip"
msgstr "沒有要跳過的"
-#: sequencer.c:2879
+#: sequencer.c:2899
#, c-format
msgid ""
"have you committed already?\n"
@@ -6988,21 +7234,16 @@ msgstr ""
"您已經提交了嗎?\n"
"試試 \"git %s --continue\""
-#: sequencer.c:3003 sequencer.c:4011
-#, c-format
-msgid "could not update %s"
-msgstr "不能更新 %s"
-
-#: sequencer.c:3042 sequencer.c:3991
+#: sequencer.c:3060 sequencer.c:4098
msgid "cannot read HEAD"
msgstr "不能讀取 HEAD"
-#: sequencer.c:3059
+#: sequencer.c:3077
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "無法複製 '%s' 至 '%s'"
-#: sequencer.c:3067
+#: sequencer.c:3085
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7021,23 +7262,28 @@ msgstr ""
"\n"
" git rebase --continue\n"
-#: sequencer.c:3077
+#: sequencer.c:3095
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "不能應用 %s... %.*s"
-#: sequencer.c:3084
+#: sequencer.c:3102
#, c-format
msgid "Could not merge %.*s"
msgstr "不能合併 %.*s"
-#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能複製 '%s' 至 '%s'"
+#: sequencer.c:3132
+#, c-format
+msgid "Executing: %s\n"
+msgstr "執行:%s\n"
+
# 譯者:請維持前導空格
-#: sequencer.c:3129
+#: sequencer.c:3147
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7052,11 +7298,11 @@ msgstr ""
" git rebase --continue\n"
"\n"
-#: sequencer.c:3135
+#: sequencer.c:3153
msgid "and made changes to the index and/or the working tree\n"
msgstr "並且修改索引和/或工作區\n"
-#: sequencer.c:3141
+#: sequencer.c:3159
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7073,102 +7319,128 @@ msgstr ""
" git rebase --continue\n"
"\n"
-#: sequencer.c:3202
+#: sequencer.c:3220
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "非法的標籤名稱:'%.*s'"
-#: sequencer.c:3256
+#: sequencer.c:3274
msgid "writing fake root commit"
msgstr "寫偽根提交"
-#: sequencer.c:3261
+#: sequencer.c:3279
msgid "writing squash-onto"
msgstr "寫入 squash-onto"
-#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "無法找到 %s 指向的樹。"
-
-#: sequencer.c:3344
+#: sequencer.c:3363
#, c-format
msgid "could not resolve '%s'"
msgstr "無法解析 '%s'"
-#: sequencer.c:3375
+#: sequencer.c:3394
msgid "cannot merge without a current revision"
msgstr "沒有目前版本不能合併"
-#: sequencer.c:3397
+#: sequencer.c:3416
#, c-format
msgid "unable to parse '%.*s'"
msgstr "無法解析 '%.*s'"
-#: sequencer.c:3406
+#: sequencer.c:3425
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "無可用合併:'%.*s'"
-#: sequencer.c:3418
+#: sequencer.c:3437
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "章魚合並不能在一個新的根提交上執行"
-#: sequencer.c:3434
+#: sequencer.c:3453
#, c-format
msgid "could not get commit message of '%s'"
msgstr "不能取得 '%s' 的提交說明"
-#: sequencer.c:3594
+#: sequencer.c:3613
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "甚至不能嘗試合併 '%.*s'"
-#: sequencer.c:3610
+#: sequencer.c:3629
msgid "merge: Unable to write new index file"
msgstr "合併:無法寫入新索引檔案"
-#: sequencer.c:3679 builtin/rebase.c:737
+#: sequencer.c:3703
+msgid "Cannot autostash"
+msgstr "無法 autostash"
+
+#: sequencer.c:3706
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "意外的 stash 回應:'%s'"
+
+#: sequencer.c:3712
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "不能為 '%s' 建立目錄"
+
+#: sequencer.c:3715
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "建立了 autostash:%s\n"
+
+#: sequencer.c:3719
+msgid "could not reset --hard"
+msgstr "無法 reset --hard"
+
+#: sequencer.c:3744
#, c-format
msgid "Applied autostash.\n"
msgstr "已應用 autostash。\n"
-#: sequencer.c:3691
+#: sequencer.c:3756
#, c-format
msgid "cannot store %s"
msgstr "不能儲存 %s"
-#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3759
#, c-format
msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%s\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-"應用 autostash 導致衝突。\n"
+"%s\n"
"您的修改安全地儲存在儲藏區中。\n"
"您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:3755
+#: sequencer.c:3764
+msgid "Applying autostash resulted in conflicts."
+msgstr "因套用自動儲藏而導致衝突。"
+
+#: sequencer.c:3765
+msgid "Autostash exists; creating a new stash entry."
+msgstr "已有自動儲藏;建立新儲藏項目。"
+
+#: sequencer.c:3857
#, c-format
msgid "%s: not a valid OID"
msgstr "%s:不是一個有效的物件 ID"
-#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3862 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "不能分離開頭指標"
-#: sequencer.c:3775
+#: sequencer.c:3877
#, c-format
msgid "Stopped at HEAD\n"
msgstr "停止在 HEAD\n"
-#: sequencer.c:3777
+#: sequencer.c:3879
#, c-format
msgid "Stopped at %s\n"
msgstr "停止在 %s\n"
-#: sequencer.c:3785
+#: sequencer.c:3887
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7188,48 +7460,58 @@ msgstr ""
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3869
+#: sequencer.c:3931
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "正在重定基底 (%d/%d)%s"
+
+#: sequencer.c:3976
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:3940
+#: sequencer.c:4047
#, c-format
msgid "unknown command %d"
msgstr "未知指令 %d"
-#: sequencer.c:3999
+#: sequencer.c:4106
msgid "could not read orig-head"
msgstr "不能讀取 orig-head"
-#: sequencer.c:4004
+#: sequencer.c:4111
msgid "could not read 'onto'"
msgstr "不能讀取 'onto'"
-#: sequencer.c:4018
+#: sequencer.c:4125
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 為 %s"
-#: sequencer.c:4111
+#: sequencer.c:4185
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "成功重定基底並更新 %s。\n"
+
+#: sequencer.c:4218
msgid "cannot rebase: You have unstaged changes."
msgstr "不能重定基底:您有未暫存的變更。"
-#: sequencer.c:4120
+#: sequencer.c:4227
msgid "cannot amend non-existing commit"
msgstr "不能修補不存在的提交"
-#: sequencer.c:4122
+#: sequencer.c:4229
#, c-format
msgid "invalid file: '%s'"
msgstr "無效檔案:'%s'"
-#: sequencer.c:4124
+#: sequencer.c:4231
#, c-format
msgid "invalid contents: '%s'"
msgstr "無效內容:'%s'"
-#: sequencer.c:4127
+#: sequencer.c:4234
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7238,59 +7520,59 @@ msgstr ""
"\n"
"您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。"
-#: sequencer.c:4163 sequencer.c:4202
+#: sequencer.c:4270 sequencer.c:4309
#, c-format
msgid "could not write file: '%s'"
msgstr "不能寫入檔案:'%s'"
-#: sequencer.c:4217
+#: sequencer.c:4324
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能刪除 CHERRY_PICK_HEAD"
-#: sequencer.c:4224
+#: sequencer.c:4331
msgid "could not commit staged changes."
msgstr "不能提交暫存的修改。"
-#: sequencer.c:4338
+#: sequencer.c:4446
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s:不能揀選一個%s"
-#: sequencer.c:4342
+#: sequencer.c:4450
#, c-format
msgid "%s: bad revision"
msgstr "%s:錯誤的版本"
-#: sequencer.c:4377
+#: sequencer.c:4485
msgid "can't revert as initial commit"
msgstr "不能作為初始提交還原提交"
-#: sequencer.c:4846
+#: sequencer.c:4962
msgid "make_script: unhandled options"
msgstr "make_script:有未能處理的選項"
-#: sequencer.c:4849
+#: sequencer.c:4965
msgid "make_script: error preparing revisions"
msgstr "make_script:準備版本時錯誤"
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5206 sequencer.c:5223
msgid "nothing to do"
msgstr "無事可做"
-#: sequencer.c:5119
+#: sequencer.c:5242
msgid "could not skip unnecessary pick commands"
msgstr "無法跳過不必要的揀選"
-#: sequencer.c:5213
+#: sequencer.c:5336
msgid "the script was already rearranged."
msgstr "腳本已經重新編排。"
-#: setup.c:124
+#: setup.c:133
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s' 在位於 '%s' 的版本庫之外"
-#: setup.c:175
+#: setup.c:185
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -7299,7 +7581,7 @@ msgstr ""
"%s:工作區中無此路徑。\n"
"使用指令 'git <指令> -- <路徑>...' 來指定本機不存在的路徑。"
-#: setup.c:188
+#: setup.c:198
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -7310,12 +7592,12 @@ msgstr ""
"使用 '--' 來分隔版本和路徑,例如:\n"
"'git <指令> [<版本>...] -- [<檔案>...]'"
-#: setup.c:254
+#: setup.c:264
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "選項 '%s' 必須在其他非選項參數之前"
-#: setup.c:273
+#: setup.c:283
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -7326,92 +7608,92 @@ msgstr ""
"使用 '--' 來分隔版本和路徑,例如:\n"
"'git <指令> [<版本>...] -- [<檔案>...]'"
-#: setup.c:409
+#: setup.c:419
msgid "unable to set up work tree using invalid config"
msgstr "無法使用無效設定來建立工作區"
-#: setup.c:413
+#: setup.c:423
msgid "this operation must be run in a work tree"
msgstr "該動作必須在一個工作區中執行"
-#: setup.c:559
+#: setup.c:569
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "期望 git 版本庫版本 <= %d,卻得到 %d"
-#: setup.c:567
+#: setup.c:577
msgid "unknown repository extensions found:"
msgstr "發現未知的版本庫擴展:"
-#: setup.c:586
+#: setup.c:596
#, c-format
msgid "error opening '%s'"
msgstr "開啟 '%s' 發生錯誤"
-#: setup.c:588
+#: setup.c:598
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "檔案太大,無法作為 .git 檔案:'%s'"
-#: setup.c:590
+#: setup.c:600
#, c-format
msgid "error reading %s"
msgstr "讀取 %s 發生錯誤"
-#: setup.c:592
+#: setup.c:602
#, c-format
msgid "invalid gitfile format: %s"
msgstr "無效的 gitfile 格式:%s"
-#: setup.c:594
+#: setup.c:604
#, c-format
msgid "no path in gitfile: %s"
msgstr "在 gitfile 中沒有路徑:%s"
-#: setup.c:596
+#: setup.c:606
#, c-format
msgid "not a git repository: %s"
msgstr "不是一個 git 版本庫:%s"
-#: setup.c:695
+#: setup.c:708
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' 太大"
-#: setup.c:709
+#: setup.c:722
#, c-format
msgid "not a git repository: '%s'"
msgstr "不是一個 git 版本庫:'%s'"
-#: setup.c:738 setup.c:740 setup.c:771
+#: setup.c:751 setup.c:753 setup.c:784
#, c-format
msgid "cannot chdir to '%s'"
msgstr "不能切換目錄到 '%s'"
-#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
+#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869
msgid "cannot come back to cwd"
msgstr "無法返回目前工作目錄"
-#: setup.c:870
+#: setup.c:883
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "取得 '%*s%s%s' 狀態(stat)失敗"
-#: setup.c:1108
+#: setup.c:1121
msgid "Unable to read current working directory"
msgstr "不能讀取目前工作目錄"
-#: setup.c:1117 setup.c:1123
+#: setup.c:1130 setup.c:1136
#, c-format
msgid "cannot change to '%s'"
msgstr "不能切換到 '%s'"
-#: setup.c:1128
+#: setup.c:1141
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "不是一個 git 版本庫(或者任何父目錄):%s"
-#: setup.c:1134
+#: setup.c:1147
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -7420,7 +7702,7 @@ msgstr ""
"不是一個 git 版本庫(或者直至掛載點 %s 的任何父目錄)\n"
"停止在檔案系統邊界(未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
-#: setup.c:1245
+#: setup.c:1258
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7429,268 +7711,268 @@ msgstr ""
"參數 core.sharedRepository 的檔案屬性值有問題(0%.3o)。\n"
"檔案所有者必須始終擁有讀寫權限。"
-#: setup.c:1289
+#: setup.c:1304
msgid "open /dev/null or dup failed"
msgstr "不能開啟或者複製 /dev/null"
-#: setup.c:1304
+#: setup.c:1319
msgid "fork failed"
msgstr "fork 失敗"
-#: setup.c:1309
+#: setup.c:1324
msgid "setsid failed"
msgstr "setsid 失敗"
-#: sha1-file.c:452
+#: sha1-file.c:470
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "物件目錄 %s 不存在,檢查 .git/objects/info/alternates"
-#: sha1-file.c:503
+#: sha1-file.c:521
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "無法規範化備用物件路徑:%s"
-#: sha1-file.c:575
+#: sha1-file.c:593
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s:忽略備用物件庫,嵌套太深"
-#: sha1-file.c:582
+#: sha1-file.c:600
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "無法規範化物件目錄: %s"
-#: sha1-file.c:625
+#: sha1-file.c:643
msgid "unable to fdopen alternates lockfile"
msgstr "無法 fdopen 取代鎖檔案"
-#: sha1-file.c:643
+#: sha1-file.c:661
msgid "unable to read alternates file"
msgstr "無法讀取替代檔案"
-#: sha1-file.c:650
+#: sha1-file.c:668
msgid "unable to move new alternates file into place"
msgstr "無法將新的替代檔案移動到位"
-#: sha1-file.c:685
+#: sha1-file.c:703
#, c-format
msgid "path '%s' does not exist"
msgstr "路徑 '%s' 不存在"
-#: sha1-file.c:711
+#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "尚不支援將參考版本庫 '%s' 作為一個連結簽出。"
+msgstr "尚不支援將參考版本庫 '%s' 作為一個連結檢出。"
-#: sha1-file.c:717
+#: sha1-file.c:730
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "參考版本庫 '%s' 不是一個本機版本庫。"
-#: sha1-file.c:723
+#: sha1-file.c:736
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "參考版本庫 '%s' 是一個淺複製"
-#: sha1-file.c:731
+#: sha1-file.c:744
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "參考版本庫 '%s' 已被移植"
-#: sha1-file.c:791
+#: sha1-file.c:804
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "解析備用引用時無效的行:%s"
-#: sha1-file.c:943
+#: sha1-file.c:954
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "嘗試 mmap %<PRIuMAX>,超過了最大值 %<PRIuMAX>"
-#: sha1-file.c:964
+#: sha1-file.c:975
msgid "mmap failed"
msgstr "mmap 失敗"
-#: sha1-file.c:1128
+#: sha1-file.c:1139
#, c-format
msgid "object file %s is empty"
msgstr "物件檔案 %s 為空"
-#: sha1-file.c:1263 sha1-file.c:2443
+#: sha1-file.c:1274 sha1-file.c:2454
#, c-format
msgid "corrupt loose object '%s'"
msgstr "損壞的鬆散物件 '%s'"
-#: sha1-file.c:1265 sha1-file.c:2447
+#: sha1-file.c:1276 sha1-file.c:2458
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "鬆散物件 '%s' 後面有垃圾資料"
-#: sha1-file.c:1307
+#: sha1-file.c:1318
msgid "invalid object type"
msgstr "無效的物件類型"
-#: sha1-file.c:1391
+#: sha1-file.c:1402
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息"
-#: sha1-file.c:1394
+#: sha1-file.c:1405
#, c-format
msgid "unable to unpack %s header"
msgstr "無法解開 %s 頭部"
-#: sha1-file.c:1400
+#: sha1-file.c:1411
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息"
-#: sha1-file.c:1403
+#: sha1-file.c:1414
#, c-format
msgid "unable to parse %s header"
msgstr "無法解析 %s 頭部"
-#: sha1-file.c:1629
+#: sha1-file.c:1640
#, c-format
msgid "failed to read object %s"
msgstr "讀取物件 %s 失敗"
-#: sha1-file.c:1633
+#: sha1-file.c:1644
#, c-format
msgid "replacement %s not found for %s"
msgstr "找不到 %2$s 的替代 %1$s"
-#: sha1-file.c:1637
+#: sha1-file.c:1648
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "鬆散物件 %s(儲存在 %s)已損壞"
-#: sha1-file.c:1641
+#: sha1-file.c:1652
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "打包物件 %s(儲存在 %s)已損壞"
-#: sha1-file.c:1746
+#: sha1-file.c:1757
#, c-format
msgid "unable to write file %s"
msgstr "無法寫檔案 %s"
-#: sha1-file.c:1753
+#: sha1-file.c:1764
#, c-format
msgid "unable to set permission to '%s'"
msgstr "無法為 '%s' 設定權限"
-#: sha1-file.c:1760
+#: sha1-file.c:1771
msgid "file write error"
msgstr "檔案寫錯誤"
-#: sha1-file.c:1780
+#: sha1-file.c:1791
msgid "error when closing loose object file"
msgstr "關閉鬆散物件檔案時發生錯誤"
-#: sha1-file.c:1845
+#: sha1-file.c:1856
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr "權限不足,無法在版本庫物件庫 %s 中新增物件"
-#: sha1-file.c:1847
+#: sha1-file.c:1858
msgid "unable to create temporary file"
msgstr "無法建立暫存檔"
-#: sha1-file.c:1871
+#: sha1-file.c:1882
msgid "unable to write loose object file"
msgstr "不能寫鬆散物件檔案"
-#: sha1-file.c:1877
+#: sha1-file.c:1888
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "不能壓縮新物件 %s(%d)"
-#: sha1-file.c:1881
+#: sha1-file.c:1892
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "在物件 %s 上呼叫 deflateEnd 失敗(%d)"
-#: sha1-file.c:1885
+#: sha1-file.c:1896
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "被 %s 的不穩定物件源資料搞糊塗了"
-#: sha1-file.c:1895 builtin/pack-objects.c:1054
+#: sha1-file.c:1906 builtin/pack-objects.c:1055
#, c-format
msgid "failed utime() on %s"
msgstr "在 %s 上呼叫 utime() 失敗"
-#: sha1-file.c:1972
+#: sha1-file.c:1983
#, c-format
msgid "cannot read object for %s"
msgstr "不能讀取物件 %s"
-#: sha1-file.c:2011
+#: sha1-file.c:2022
msgid "corrupt commit"
msgstr "損壞的提交"
-#: sha1-file.c:2019
+#: sha1-file.c:2030
msgid "corrupt tag"
msgstr "損壞的標籤"
-#: sha1-file.c:2119
+#: sha1-file.c:2130
#, c-format
msgid "read error while indexing %s"
msgstr "索引 %s 時讀取錯誤"
-#: sha1-file.c:2122
+#: sha1-file.c:2133
#, c-format
msgid "short read while indexing %s"
msgstr "索引 %s 時讀入不完整"
-#: sha1-file.c:2195 sha1-file.c:2205
+#: sha1-file.c:2206 sha1-file.c:2216
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s:插入資料庫失敗"
-#: sha1-file.c:2211
+#: sha1-file.c:2222
#, c-format
msgid "%s: unsupported file type"
msgstr "%s:不支援的檔案類型"
-#: sha1-file.c:2235
+#: sha1-file.c:2246
#, c-format
msgid "%s is not a valid object"
msgstr "%s 不是一個有效的物件"
-#: sha1-file.c:2237
+#: sha1-file.c:2248
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s 不是一個有效的 '%s' 物件"
-#: sha1-file.c:2264 builtin/index-pack.c:155
+#: sha1-file.c:2275 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "不能開啟 %s"
-#: sha1-file.c:2454 sha1-file.c:2507
+#: sha1-file.c:2465 sha1-file.c:2518
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "%s 的雜湊值不符合(預期 %s)"
-#: sha1-file.c:2478
+#: sha1-file.c:2489
#, c-format
msgid "unable to mmap %s"
msgstr "不能 mmap %s"
-#: sha1-file.c:2483
+#: sha1-file.c:2494
#, c-format
msgid "unable to unpack header of %s"
msgstr "無法解壓縮 %s 的頭部"
-#: sha1-file.c:2489
+#: sha1-file.c:2500
#, c-format
msgid "unable to parse header of %s"
msgstr "無法解析 %s 的頭部"
-#: sha1-file.c:2500
+#: sha1-file.c:2511
#, c-format
msgid "unable to unpack contents of %s"
msgstr "無法解壓縮 %s 的內容"
@@ -7716,14 +7998,15 @@ msgid ""
"examine these refs and maybe delete them. Turn this message off by\n"
"running \"git config advice.objectNameWarning false\""
msgstr ""
-"Git 通常不會建立一個以40個十六進位字元結尾的引用,因為當您只提供40\n"
-"個十六進位字元時將被忽略。這些引用可能被錯誤地建立。例如:\n"
+"Git 通常不會建立以 40 個十六進位字元結尾的引用,\n"
+"因為當您只提供 40 個十六進位字元時,其將被忽略。\n"
+"這些引用可能被意外建立。例如:\n"
"\n"
" git switch -c $br $(git rev-parse ...)\n"
"\n"
-"當 \"$br\" 某種原因空白時,一個40位十六進位的引用將被建立。請檢查這些\n"
-"引用,可能需要刪除它們。執行 \"git config advice.objectNameWarning\n"
-"false\" 指令關閉本消息通知。"
+"當「$br」因為某些原因空白時,會建立出 40 位十六進位的引用。\n"
+"請檢查這些引用,並視需要刪除。執行\n"
+"「git config advice.objectNameWarning false」命令以關閉本訊息通知"
#: sha1-name.c:916
#, c-format
@@ -7792,60 +8075,84 @@ msgid "invalid object name '%.*s'."
msgstr "'%.*s' 物件名稱無效。"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:853
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: strbuf.c:855
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr "%u.%2.2u GiB/s"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:847
+#: strbuf.c:863
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: strbuf.c:865
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr "%u.%2.2u MiB/s"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:856
+#: strbuf.c:872
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: strbuf.c:874
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr "%u.%2.2u KiB/s"
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:864
+#: strbuf.c:880
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
msgstr[0] "%u 位元組"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: strbuf.c:882
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u 位元組/秒"
-#: strbuf.c:1164
+#: strbuf.c:1180
#, c-format
msgid "could not edit '%s'"
msgstr "無法編輯 '%s'"
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "忽略可疑的子模組名稱:%s"
+
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "submodule.fetchjobs 不允許為負值"
+
+#: submodule-config.c:402
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr "忽略可能被解析為指令列選項的 '%s':%s"
+
+#: submodule-config.c:499
+#, c-format
+msgid "invalid value for %s"
+msgstr "%s 的值無效"
+
+#: submodule-config.c:766
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "不能更新 .gitmodules 條目 %s"
+
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr "無法修改未合併的 .gitmodules,先解決合併衝突"
@@ -7867,7 +8174,7 @@ msgstr "將更新後 .gitmodules 新增暫存區失敗"
#: submodule.c:327
#, c-format
msgid "in unpopulated submodule '%s'"
-msgstr "位於未簽出的子模組 '%s'"
+msgstr "位於未檢出的子模組 '%s'"
#: submodule.c:358
#, c-format
@@ -7903,7 +8210,7 @@ msgstr "無法在 %s 子模組執行 'git rev-list <提交> --not --remotes -n 1
msgid "process for submodule '%s' failed"
msgstr "處理 '%s' 子模組失敗"
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045
msgid "Failed to resolve HEAD as a valid ref."
msgstr "無法將 HEAD 解析為有效引用。"
@@ -8017,39 +8324,15 @@ msgstr ""
"'%s' 遷移至\n"
"'%s'\n"
-#: submodule.c:2209
+#: submodule.c:2210
msgid "could not start ls-files in .."
msgstr "無法在 .. 中啟動 ls-files"
-#: submodule.c:2248
+#: submodule.c:2250
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree 返回未知返回值 %d"
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "忽略可疑的子模組名稱:%s"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "submodule.fetchjobs 不允許為負值"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr "忽略可能被解析為指令列選項的 '%s':%s"
-
-#: submodule-config.c:498
-#, c-format
-msgid "invalid value for %s"
-msgstr "%s 的值無效"
-
-#: submodule-config.c:765
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "不能更新 .gitmodules 條目 %s"
-
#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
@@ -8104,97 +8387,6 @@ msgstr "不能開啟暫存檔"
msgid "could not rename temporary file to %s"
msgstr "不能重新命名暫存檔為 %s"
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "將要設定 '%1$s' 的上游為 '%3$s' 的 '%2$s'\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "無法讀取 bundle '%s'"
-
-#: transport.c:214
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "傳輸:無效的深度選項 '%s'"
-
-#: transport.c:266
-msgid "see protocol.version in 'git help config' for more details"
-msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息"
-
-#: transport.c:267
-msgid "server options require protocol version 2 or later"
-msgstr "服務端選項需要版本 2 協定或更高"
-
-#: transport.c:632
-msgid "could not parse transport.color.* config"
-msgstr "不能解析 transport.color.* 設定"
-
-#: transport.c:705
-msgid "support for protocol v2 not implemented yet"
-msgstr "協定 v2 的支援尚未實現"
-
-#: transport.c:831
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "設定 '%s' 的取值未知:%s"
-
-#: transport.c:897
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "傳輸 '%s' 不允許"
-
-#: transport.c:949
-msgid "git-over-rsync is no longer supported"
-msgstr "不再支援 git-over-rsync"
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr "下列子模組路徑所包含的修改在任何遠端源中都找不到:\n"
-
-#: transport.c:1048
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"請嘗試\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"或者進入到子目錄執行\n"
-"\n"
-"\tgit push\n"
-"\n"
-"以推送至遠端。\n"
-"\n"
-
-#: transport.c:1056
-msgid "Aborting."
-msgstr "正在終止。"
-
-#: transport.c:1201
-msgid "failed to push all needed submodules"
-msgstr "不能推送全部需要的子模組"
-
-#: transport.c:1345 transport-helper.c:657
-msgid "operation not supported by protocol"
-msgstr "協定不支援該動作"
-
#: transport-helper.c:61 transport-helper.c:90
msgid "full write to remote helper failed"
msgstr "完整寫入遠端助手失敗"
@@ -8237,7 +8429,7 @@ msgstr "不能執行 fast-import"
msgid "error while running fast-import"
msgstr "執行 fast-import 發生錯誤"
-#: transport-helper.c:545 transport-helper.c:1134
+#: transport-helper.c:545 transport-helper.c:1135
#, c-format
msgid "could not read ref %s"
msgstr "無法讀取引用 %s"
@@ -8255,6 +8447,10 @@ msgstr "協定不支援設定遠端服務路徑"
msgid "invalid remote service path"
msgstr "無效的遠端服務路徑"
+#: transport-helper.c:657 transport.c:1339
+msgid "operation not supported by protocol"
+msgstr "協定不支援該動作"
+
#: transport-helper.c:660
#, c-format
msgid "can't connect to subservice %s"
@@ -8295,24 +8491,24 @@ msgstr "助手 %s 不支援 --atomic"
msgid "helper %s does not support 'push-option'"
msgstr "助手 %s 不支援 'push-option'"
-#: transport-helper.c:965
+#: transport-helper.c:966
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-heper 不支援 push,需要引用表達式"
-#: transport-helper.c:970
+#: transport-helper.c:971
#, c-format
msgid "helper %s does not support 'force'"
msgstr "助手 %s 不支援 'force'"
-#: transport-helper.c:1017
+#: transport-helper.c:1018
msgid "couldn't run fast-export"
msgstr "無法執行 fast-export"
-#: transport-helper.c:1022
+#: transport-helper.c:1023
msgid "error while running fast-export"
msgstr "執行 fast-export 時發生錯誤"
-#: transport-helper.c:1047
+#: transport-helper.c:1048
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
@@ -8321,50 +8517,137 @@ msgstr ""
"沒有共同的引用並且也沒有指定,什麼也不會做。\n"
"可能您應該指定一個分支如 'master'。\n"
-#: transport-helper.c:1120
+#: transport-helper.c:1121
#, c-format
msgid "malformed response in ref list: %s"
msgstr "引用列表中格式錯誤的回應:%s"
-#: transport-helper.c:1272
+#: transport-helper.c:1273
#, c-format
msgid "read(%s) failed"
msgstr "讀取(%s)失敗"
-#: transport-helper.c:1299
+#: transport-helper.c:1300
#, c-format
msgid "write(%s) failed"
msgstr "寫(%s)失敗"
-#: transport-helper.c:1348
+#: transport-helper.c:1349
#, c-format
msgid "%s thread failed"
msgstr "%s 執行緒失敗"
-#: transport-helper.c:1352
+#: transport-helper.c:1353
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s 執行緒等待失敗:%s"
-#: transport-helper.c:1371 transport-helper.c:1375
+#: transport-helper.c:1372 transport-helper.c:1376
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "不能啟動執行緒來複製資料:%s"
-#: transport-helper.c:1412
+#: transport-helper.c:1413
#, c-format
msgid "%s process failed to wait"
msgstr "%s 進程等待失敗"
-#: transport-helper.c:1416
+#: transport-helper.c:1417
#, c-format
msgid "%s process failed"
msgstr "%s 進程失敗"
-#: transport-helper.c:1434 transport-helper.c:1443
+#: transport-helper.c:1435 transport-helper.c:1444
msgid "can't start thread for copying data"
msgstr "不能啟動執行緒來複製資料"
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "將要設定 '%1$s' 的上游為 '%3$s' 的 '%2$s'\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "無法讀取 bundle '%s'"
+
+#: transport.c:214
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "傳輸:無效的深度選項 '%s'"
+
+#: transport.c:266
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息"
+
+#: transport.c:267
+msgid "server options require protocol version 2 or later"
+msgstr "服務端選項需要版本 2 協定或更高"
+
+#: transport.c:632
+msgid "could not parse transport.color.* config"
+msgstr "不能解析 transport.color.* 設定"
+
+#: transport.c:705
+msgid "support for protocol v2 not implemented yet"
+msgstr "協定 v2 的支援尚未實現"
+
+#: transport.c:839
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "設定 '%s' 的取值未知:%s"
+
+#: transport.c:905
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "傳輸 '%s' 不允許"
+
+#: transport.c:957
+msgid "git-over-rsync is no longer supported"
+msgstr "不再支援 git-over-rsync"
+
+#: transport.c:1052
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr "下列子模組路徑所包含的修改在任何遠端源中都找不到:\n"
+
+#: transport.c:1056
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"請嘗試\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"或者進入到子目錄執行\n"
+"\n"
+"\tgit push\n"
+"\n"
+"以推送至遠端。\n"
+"\n"
+
+#: transport.c:1064
+msgid "Aborting."
+msgstr "正在終止。"
+
+#: transport.c:1209
+msgid "failed to push all needed submodules"
+msgstr "不能推送全部需要的子模組"
+
#: tree-walk.c:32
msgid "too-short tree object"
msgstr "太短的樹狀物件"
@@ -8381,25 +8664,25 @@ msgstr "樹狀物件條目中空的檔案名"
msgid "too-short tree file"
msgstr "太短的樹檔案"
-#: unpack-trees.c:110
+#: unpack-trees.c:113
#, 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 ""
-"您對下列檔案的本機修改將被簽出動作覆蓋:\n"
+"您對下列檔案的本機修改將被檢出動作覆蓋:\n"
"%%s請在切換分支前提交或儲藏您的修改。"
-#: unpack-trees.c:112
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-"您對下列檔案的本機修改將被簽出動作覆蓋:\n"
+"您對下列檔案的本機修改將被檢出動作覆蓋:\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8408,7 +8691,7 @@ msgstr ""
"您對下列檔案的本機修改將被合併動作覆蓋:\n"
"%%s請在合併前提交或儲藏您的修改。"
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8417,7 +8700,7 @@ msgstr ""
"您對下列檔案的本機修改將被合併動作覆蓋:\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8426,7 +8709,7 @@ msgstr ""
"您對下列檔案的本機修改將被 %s 覆蓋:\n"
"%%s請在 %s 之前提交或儲藏您的修改。"
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8435,7 +8718,7 @@ msgstr ""
"您對下列檔案的本機修改將被 %s 覆蓋:\n"
"%%s"
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -8444,25 +8727,25 @@ msgstr ""
"更新如下目錄將會遺失其中未追蹤的檔案:\n"
"%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:134
#, 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 ""
-"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除:\n"
+"工作區中下列未追蹤的檔案將會因為檢出動作而被刪除:\n"
"%%s請在切換分支之前移動或刪除。"
-#: unpack-trees.c:133
+#: unpack-trees.c:136
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
-"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除:\n"
+"工作區中下列未追蹤的檔案將會因為檢出動作而被刪除:\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8471,7 +8754,7 @@ msgstr ""
"工作區中下列未追蹤的檔案將會因為合併動作而被刪除:\n"
"%%s請在合併前移動或刪除。"
-#: unpack-trees.c:138
+#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8480,7 +8763,7 @@ msgstr ""
"工作區中下列未追蹤的檔案將會因為合併動作而被刪除:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8489,7 +8772,7 @@ msgstr ""
"工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除:\n"
"%%s請在 %s 前移動或刪除。"
-#: unpack-trees.c:143
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8498,27 +8781,27 @@ msgstr ""
"工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除:\n"
"%%s"
-#: unpack-trees.c:149
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
-"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋:\n"
+"工作區中下列未追蹤的檔案將會因為檢出動作而被覆蓋:\n"
"%%s請在切換分支前移動或刪除。"
-#: unpack-trees.c:151
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%s"
msgstr ""
-"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋:\n"
+"工作區中下列未追蹤的檔案將會因為檢出動作而被覆蓋:\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8527,7 +8810,7 @@ msgstr ""
"工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋:\n"
"%%s請在合併前移動或刪除。"
-#: unpack-trees.c:156
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8536,7 +8819,7 @@ msgstr ""
"工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8545,7 +8828,7 @@ msgstr ""
"工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋:\n"
"%%s請在 %s 前移動或刪除。"
-#: unpack-trees.c:161
+#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8554,59 +8837,66 @@ msgstr ""
"工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋:\n"
"%%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:172
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "條目 '%s' 和 '%s' 重疊。無法合併。"
-#: unpack-trees.c:172
+#: unpack-trees.c:175
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
+"Cannot update submodule:\n"
"%s"
msgstr ""
-"無法更新稀疏簽出:如下條目不是最新:\n"
+"無法更新子模組:\n"
"%s"
-#: unpack-trees.c:174
+#: unpack-trees.c:178
#, c-format
msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
"%s"
msgstr ""
-"工作區中下列檔案將被稀疏簽出更新所覆蓋:\n"
+"即使有稀疏檢出樣板,以下路徑不是最新且保留下來:\n"
"%s"
-#: unpack-trees.c:176
+#: unpack-trees.c:180
#, c-format
msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
+"The following paths are unmerged and were left despite sparse patterns:\n"
"%s"
msgstr ""
-"工作區中下列檔案將被稀疏簽出更新所刪除:\n"
+"即使有稀疏檢出樣板,以下路徑未合併且保留下來:\n"
"%s"
-#: unpack-trees.c:178
+#: unpack-trees.c:182
#, c-format
msgid ""
-"Cannot update submodule:\n"
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
"%s"
msgstr ""
-"無法更新子模組:\n"
+"即使有稀疏檢出樣板,以下路徑已經存在而因此未更新:\n"
"%s"
-#: unpack-trees.c:255
+#: unpack-trees.c:262
#, c-format
msgid "Aborting\n"
msgstr "正在終止\n"
-#: unpack-trees.c:317
+#: unpack-trees.c:289
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr "修正以上路徑後,您可能想要執行「git sparse-checkout reapply」。\n"
+
+#: unpack-trees.c:350
msgid "Updating files"
msgstr "正在更新檔案"
-#: unpack-trees.c:349
+#: unpack-trees.c:382
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
@@ -8615,10 +8905,14 @@ msgstr ""
"以下路徑發生碰撞(如:在不區分大小寫的檔案系統上的區分大小寫的路徑),\n"
"並且碰撞組中只有一個檔案存在工作區中:\n"
-#: unpack-trees.c:1445
+#: unpack-trees.c:1498
msgid "Updating index flags"
msgstr "正在更新索引旗標"
+#: upload-pack.c:1337
+msgid "expected flush after fetch arguments"
+msgstr "在 fetch 引數應為一個 flush 包"
+
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "無效的 URL 方案名稱或遺失 '://' 後綴"
@@ -8652,32 +8946,32 @@ msgstr "無效的 '..' 路徑片段"
msgid "Fetching objects"
msgstr "正在抓取物件"
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:262 builtin/am.c:2098
#, c-format
msgid "failed to read '%s'"
msgstr "讀取 '%s' 失敗"
-#: worktree.c:305
+#: worktree.c:309
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "在主工作區的 '%s' 不是版本庫目錄"
-#: worktree.c:316
+#: worktree.c:320
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "檔案 '%s' 不包含工作區的絕對路徑"
-#: worktree.c:328
+#: worktree.c:332
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' 不存在"
-#: worktree.c:334
+#: worktree.c:338
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' 不是一個 .git 檔案,錯誤碼 %d"
-#: worktree.c:342
+#: worktree.c:347
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' 沒有指回到 '%s'"
@@ -8731,11 +9025,11 @@ msgstr " (酌情使用 \"git add/rm <檔案>...\" 標記解決方案)"
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (使用 \"git rm <檔案>...\" 標記解決方案)"
-#: wt-status.c:211 wt-status.c:1074
+#: wt-status.c:211 wt-status.c:1072
msgid "Changes to be committed:"
msgstr "要提交的變更:"
-#: wt-status.c:234 wt-status.c:1083
+#: wt-status.c:234 wt-status.c:1081
msgid "Changes not staged for commit:"
msgstr "尚未暫存以備提交的變更:"
@@ -8841,21 +9135,21 @@ msgstr "修改的內容, "
msgid "untracked content, "
msgstr "未追蹤的內容, "
-#: wt-status.c:906
+#: wt-status.c:904
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "您的儲藏區目前有 %d 條紀錄"
-#: wt-status.c:938
+#: wt-status.c:936
msgid "Submodules changed but not updated:"
msgstr "子模組已修改但尚未更新:"
-#: wt-status.c:940
+#: wt-status.c:938
msgid "Submodule changes to be committed:"
msgstr "要提交的子模組變更:"
-#: wt-status.c:1022
+#: wt-status.c:1020
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -8863,7 +9157,7 @@ msgstr ""
"不要改動或刪除上面的一行。\n"
"其下所有內容都將被忽略。"
-#: wt-status.c:1114
+#: wt-status.c:1112
#, c-format
msgid ""
"\n"
@@ -8874,265 +9168,265 @@ msgstr ""
"花了 %.2f 秒才計算出分支的領先/落後範圍。\n"
"為避免,您可以使用 '--no-ahead-behind'。\n"
-#: wt-status.c:1144
+#: wt-status.c:1142
msgid "You have unmerged paths."
msgstr "您有尚未合併的路徑。"
# 譯者:請維持前導空格
-#: wt-status.c:1147
+#: wt-status.c:1145
msgid " (fix conflicts and run \"git commit\")"
msgstr " (解決衝突並執行 \"git commit\")"
# 譯者:請維持前導空格
-#: wt-status.c:1149
+#: wt-status.c:1147
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (使用 \"git merge --abort\" 終止合併)"
-#: wt-status.c:1153
+#: wt-status.c:1151
msgid "All conflicts fixed but you are still merging."
msgstr "所有衝突已解決但您仍處於合併中。"
# 譯者:請維持前導空格
-#: wt-status.c:1156
+#: wt-status.c:1154
msgid " (use \"git commit\" to conclude merge)"
msgstr " (使用 \"git commit\" 結束合併)"
-#: wt-status.c:1165
+#: wt-status.c:1163
msgid "You are in the middle of an am session."
msgstr "您正處於 am 動作過程中。"
-#: wt-status.c:1168
+#: wt-status.c:1166
msgid "The current patch is empty."
msgstr "目前的修補檔為空。"
# 譯者:請維持前導空格
-#: wt-status.c:1172
+#: wt-status.c:1170
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (解決衝突,然後執行 \"git am --continue\")"
# 譯者:請維持前導空格
-#: wt-status.c:1174
+#: wt-status.c:1172
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (使用 \"git am --skip\" 跳過此修補檔)"
# 譯者:請維持前導空格
-#: wt-status.c:1176
+#: wt-status.c:1174
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (使用 \"git am --abort\" 復原原有分支)"
-#: wt-status.c:1309
+#: wt-status.c:1307
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo 遺失。"
-#: wt-status.c:1311
+#: wt-status.c:1309
msgid "No commands done."
msgstr "沒有指令被執行。"
-#: wt-status.c:1314
+#: wt-status.c:1312
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "最後一條指令已完成(%d 條指令被執行):"
-#: wt-status.c:1325
+#: wt-status.c:1323
#, c-format
msgid " (see more in file %s)"
msgstr " (更多參見檔案 %s)"
-#: wt-status.c:1330
+#: wt-status.c:1328
msgid "No commands remaining."
msgstr "未剩下任何指令。"
-#: wt-status.c:1333
+#: wt-status.c:1331
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "接下來要執行的指令(剩餘 %d 條指令):"
# 譯者:請維持前導空格
-#: wt-status.c:1341
+#: wt-status.c:1339
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (使用 \"git rebase --edit-todo\" 來檢視和編輯)"
-#: wt-status.c:1353
+#: wt-status.c:1351
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作。"
-#: wt-status.c:1358
+#: wt-status.c:1356
msgid "You are currently rebasing."
msgstr "您在執行重定基底動作。"
# 譯者:請維持前導空格
-#: wt-status.c:1371
+#: wt-status.c:1369
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (解決衝突,然後執行 \"git rebase --continue\")"
# 譯者:請維持前導空格
-#: wt-status.c:1373
+#: wt-status.c:1371
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (使用 \"git rebase --skip\" 跳過此修補檔)"
# 譯者:請維持前導空格
-#: wt-status.c:1375
+#: wt-status.c:1373
msgid " (use \"git rebase --abort\" to check out the original branch)"
-msgstr " (使用 \"git rebase --abort\" 以簽出原有分支)"
+msgstr " (使用 \"git rebase --abort\" 以檢出原有分支)"
# 譯者:請維持前導空格
-#: wt-status.c:1382
+#: wt-status.c:1380
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (所有衝突已解決:執行 \"git rebase --continue\")"
-#: wt-status.c:1386
+#: wt-status.c:1384
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時分割提交。"
-#: wt-status.c:1391
+#: wt-status.c:1389
msgid "You are currently splitting a commit during a rebase."
msgstr "您在執行重定基底動作時分割提交。"
# 譯者:請維持前導空格
-#: wt-status.c:1394
+#: wt-status.c:1392
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (一旦您工作目錄提交乾淨後,執行 \"git rebase --continue\")"
-#: wt-status.c:1398
+#: wt-status.c:1396
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時編輯提交。"
-#: wt-status.c:1403
+#: wt-status.c:1401
msgid "You are currently editing a commit during a rebase."
msgstr "您在執行重定基底動作時編輯提交。"
# 譯者:請維持前導空格
-#: wt-status.c:1406
+#: wt-status.c:1404
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (使用 \"git commit --amend\" 修補目前提交)"
# 譯者:請維持前導空格
-#: wt-status.c:1408
+#: wt-status.c:1406
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (當您對您的修改滿意後執行 \"git rebase --continue\")"
-#: wt-status.c:1419
+#: wt-status.c:1417
msgid "Cherry-pick currently in progress."
msgstr "揀選動作正在進行中。"
-#: wt-status.c:1422
+#: wt-status.c:1420
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "您在執行揀選提交 %s 的動作。"
# 譯者:請維持前導空格
-#: wt-status.c:1429
+#: wt-status.c:1427
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (解決衝突並執行 \"git cherry-pick --continue\")"
# 譯者:請維持前導空格
-#: wt-status.c:1432
+#: wt-status.c:1430
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (執行 \"git cherry-pick --continue\" 以繼續)"
# 譯者:請維持前導空格
-#: wt-status.c:1435
+#: wt-status.c:1433
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (所有衝突已解決:執行 \"git cherry-pick --continue\")"
# 譯者:請維持前導空格
-#: wt-status.c:1437
+#: wt-status.c:1435
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (使用 \"git cherry-pick --skip\" 跳過此修補檔)"
# 譯者:請維持前導空格
-#: wt-status.c:1439
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (使用 \"git cherry-pick --abort\" 以取消揀選動作)"
-#: wt-status.c:1449
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "還原動作正在行中。"
-#: wt-status.c:1452
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您在執行反轉提交 %s 的動作。"
# 譯者:請維持前導空格
-#: wt-status.c:1458
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (解決衝突並執行 \"git revert --continue\")"
# 譯者:請維持前導空格
-#: wt-status.c:1461
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (執行 \"git revert --continue\" 以繼續)"
# 譯者:請維持前導空格
-#: wt-status.c:1464
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (所有衝突已解決:執行 \"git revert --continue\")"
# 譯者:請維持前導空格
-#: wt-status.c:1466
+#: wt-status.c:1464
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (使用 \"git revert --skip\" 跳過此修補檔)"
# 譯者:請維持前導空格
-#: wt-status.c:1468
+#: wt-status.c:1466
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (使用 \"git revert --abort\" 以取消反轉提交動作)"
-#: wt-status.c:1478
+#: wt-status.c:1476
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "您在執行從分支 '%s' 開始的二分尋找動作。"
-#: wt-status.c:1482
+#: wt-status.c:1480
msgid "You are currently bisecting."
msgstr "您在執行二分尋找動作。"
# 譯者:請維持前導空格
-#: wt-status.c:1485
+#: wt-status.c:1483
msgid " (use \"git bisect reset\" to get back to the original branch)"
-msgstr " (使用 \"git bisect reset\" 簽出原有分支)"
+msgstr " (使用 \"git bisect reset\" 檢出原有分支)"
-#: wt-status.c:1694
+#: wt-status.c:1692
msgid "On branch "
msgstr "位於分支 "
-#: wt-status.c:1701
+#: wt-status.c:1699
msgid "interactive rebase in progress; onto "
msgstr "互動式重定基底動作正在進行中;至 "
-#: wt-status.c:1703
+#: wt-status.c:1701
msgid "rebase in progress; onto "
msgstr "重定基底動作正在進行中;至 "
-#: wt-status.c:1713
+#: wt-status.c:1711
msgid "Not currently on any branch."
msgstr "目前不在任何分支上。"
-#: wt-status.c:1730
+#: wt-status.c:1728
msgid "Initial commit"
msgstr "初始提交"
-#: wt-status.c:1731
+#: wt-status.c:1729
msgid "No commits yet"
msgstr "尚無提交"
-#: wt-status.c:1745
+#: wt-status.c:1743
msgid "Untracked files"
msgstr "未追蹤的檔案"
-#: wt-status.c:1747
+#: wt-status.c:1745
msgid "Ignored files"
msgstr "忽略的檔案"
-#: wt-status.c:1751
+#: wt-status.c:1749
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9142,102 +9436,102 @@ msgstr ""
"耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度,\n"
"但您需要小心不要忘了新增新檔案(參見 'git help status')。"
-#: wt-status.c:1757
+#: wt-status.c:1755
#, c-format
msgid "Untracked files not listed%s"
msgstr "未追蹤的檔案沒有列出%s"
# 譯者:中文字串拼接,可刪除前導空格
-#: wt-status.c:1759
+#: wt-status.c:1757
msgid " (use -u option to show untracked files)"
-msgstr "(使用 -u 參數顯示未追蹤的檔案)"
+msgstr " (使用 -u 參數顯示未追蹤的檔案)"
-#: wt-status.c:1765
+#: wt-status.c:1763
msgid "No changes"
msgstr "沒有修改"
-#: wt-status.c:1770
+#: wt-status.c:1768
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
-#: wt-status.c:1773
+#: wt-status.c:1771
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交\n"
-#: wt-status.c:1776
+#: wt-status.c:1774
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "提交為空,但是存在尚未追蹤的檔案(使用 \"git add\" 建立追蹤)\n"
-#: wt-status.c:1779
+#: wt-status.c:1777
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "提交為空,但是存在尚未追蹤的檔案\n"
# 譯者:中文字串拼接,可刪除前導空格
-#: wt-status.c:1782
+#: wt-status.c:1780
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "無檔案要提交(建立/複製檔案並使用 \"git add\" 建立追蹤)\n"
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1783 wt-status.c:1788
#, c-format
msgid "nothing to commit\n"
msgstr "無檔案要提交\n"
# 譯者:中文字串拼接,可刪除前導空格
-#: wt-status.c:1788
+#: wt-status.c:1786
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "無檔案要提交(使用 -u 顯示未追蹤的檔案)\n"
# 譯者:中文字串拼接,可刪除前導空格
-#: wt-status.c:1792
+#: wt-status.c:1790
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "沒有要提交的檔案,工作區為乾淨狀態\n"
-#: wt-status.c:1905
+#: wt-status.c:1903
msgid "No commits yet on "
msgstr "尚無提交在 "
-#: wt-status.c:1909
+#: wt-status.c:1907
msgid "HEAD (no branch)"
msgstr "HEAD(非分支)"
-#: wt-status.c:1940
+#: wt-status.c:1938
msgid "different"
msgstr "不同"
# 譯者:請維持句尾空格
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1940 wt-status.c:1948
msgid "behind "
msgstr "落後 "
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1943 wt-status.c:1946
msgid "ahead "
msgstr "領先 "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2468
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "不能%s:您有未暫存的變更。"
-#: wt-status.c:2476
+#: wt-status.c:2474
msgid "additionally, your index contains uncommitted changes."
msgstr "另外,您的索引中包含未提交的變更。"
-#: wt-status.c:2478
+#: wt-status.c:2476
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s:您的索引中包含未提交的變更。"
-#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#: compat/precompose_utf8.c:58 builtin/clone.c:456
#, c-format
msgid "failed to unlink '%s'"
msgstr "刪除 '%s' 失敗"
@@ -9251,7 +9545,7 @@ msgstr "git add [<選項>] [--] <路徑規格>..."
msgid "unexpected diff status %c"
msgstr "意外的差異狀態 %c"
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:285
msgid "updating files failed"
msgstr "更新檔案失敗"
@@ -9264,7 +9558,7 @@ msgstr "刪除 '%s'\n"
msgid "Unstaged changes after refreshing the index:"
msgstr "重新整理索引之後尚未被暫存的變更:"
-#: builtin/add.c:266 builtin/rev-parse.c:899
+#: builtin/add.c:266 builtin/rev-parse.c:904
msgid "Could not read the index"
msgstr "不能讀取索引"
@@ -9299,8 +9593,8 @@ msgstr "不能應用 '%s'"
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略:\n"
-#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
+#: builtin/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548
#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
msgid "dry run"
msgstr "測試執行"
@@ -9309,7 +9603,7 @@ msgstr "測試執行"
msgid "interactive picking"
msgstr "互動式揀選"
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "互動式挑選資料區塊"
@@ -9413,7 +9707,7 @@ msgstr ""
msgid "adding files failed"
msgstr "新增檔案失敗"
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:447 builtin/commit.c:345
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file 與 --interactive/--patch 不相容"
@@ -9434,13 +9728,13 @@ msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用"
msgid "--chmod param '%s' must be either -x or +x"
msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x"
-#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
-#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+#: builtin/add.c:501 builtin/checkout.c:1703 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容"
-#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
-#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+#: builtin/add.c:508 builtin/checkout.c:1715 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
@@ -9594,36 +9888,36 @@ msgstr "提交內容為:"
#: builtin/am.c:1653
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-msgstr "套用?是[y]/否[n]/編輯[e]/檢視修補檔[v]/應用所有[a]:"
+msgstr "套用?是[y]/否[n]/編輯[e]/檢視修補檔[v]/全部接受[a]: "
-#: builtin/am.c:1700 builtin/commit.c:398
+#: builtin/am.c:1699 builtin/commit.c:395
msgid "unable to write index file"
msgstr "無法寫入索引檔案"
-#: builtin/am.c:1704
+#: builtin/am.c:1703
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "髒索引:不能套用修補檔(髒檔案:%s)"
-#: builtin/am.c:1744 builtin/am.c:1812
+#: builtin/am.c:1743 builtin/am.c:1811
#, c-format
msgid "Applying: %.*s"
msgstr "應用:%.*s"
-#: builtin/am.c:1761
+#: builtin/am.c:1760
msgid "No changes -- Patch already applied."
msgstr "沒有變更 —— 修補檔已經應用過。"
-#: builtin/am.c:1767
+#: builtin/am.c:1766
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打修補檔失敗於 %s %.*s"
-#: builtin/am.c:1771
+#: builtin/am.c:1770
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔"
-#: builtin/am.c:1815
+#: builtin/am.c:1814
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -9633,7 +9927,7 @@ msgstr ""
"如果沒有什麼要新增到暫存區的,則很可能是其它提交已經引入了相同的變更。\n"
"您也許想要跳過這個修補檔。"
-#: builtin/am.c:1822
+#: builtin/am.c:1821
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -9644,169 +9938,171 @@ msgstr ""
"您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n"
"你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。"
-#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
-#: builtin/reset.c:354
+#: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347
+#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析物件 '%s'。"
-#: builtin/am.c:1981
+#: builtin/am.c:1980
msgid "failed to clean index"
msgstr "清空索引失敗"
-#: builtin/am.c:2025
+#: builtin/am.c:2024
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "您好像在上一次 'am' 失敗後移動了 HEAD。未還原至 ORIG_HEAD"
-#: builtin/am.c:2132
+#: builtin/am.c:2131
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "無效的 --patch-format 值:%s"
-#: builtin/am.c:2172
+#: builtin/am.c:2171
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "無效的 --show-current-patch 值:%s"
-#: builtin/am.c:2176
+#: builtin/am.c:2175
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s 與 --show-current-patch=%s 不相容"
-#: builtin/am.c:2207
+#: builtin/am.c:2206
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2208
+#: builtin/am.c:2207
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<選項>] (--continue | --skip | --abort)"
-#: builtin/am.c:2214
+#: builtin/am.c:2213
msgid "run interactively"
msgstr "以互動式方式執行"
-#: builtin/am.c:2216
+#: builtin/am.c:2215
msgid "historical option -- no-op"
msgstr "老的參數 —— 無作用"
-#: builtin/am.c:2218
+#: builtin/am.c:2217
msgid "allow fall back on 3way merging if needed"
-msgstr "如果必要,允許使用三方合併。"
+msgstr "如果必要,允許使用三方合併"
-#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:304 builtin/stash.c:812
+#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16
+#: builtin/repack.c:306 builtin/stash.c:816
msgid "be quiet"
msgstr "靜默模式"
-#: builtin/am.c:2221
+#: builtin/am.c:2220
msgid "add a Signed-off-by line to the commit message"
msgstr "在提交說明中新增一個 Signed-off-by 簽名"
-#: builtin/am.c:2224
+#: builtin/am.c:2223
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字元集(預設)"
-#: builtin/am.c:2226
+#: builtin/am.c:2225
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 傳遞 -k 參數"
-#: builtin/am.c:2228
+#: builtin/am.c:2227
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 傳遞 -b 參數"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 傳遞 -m 參數"
-#: builtin/am.c:2232
+#: builtin/am.c:2231
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "針對 mbox 格式,向 git-mailsplit 傳遞 --keep-cr 參數"
-#: builtin/am.c:2235
+#: builtin/am.c:2234
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數,覆蓋 am.keepcr 的設定"
-#: builtin/am.c:2238
+#: builtin/am.c:2237
msgid "strip everything before a scissors line"
msgstr "捨棄裁切線前的所有內容"
-#: builtin/am.c:2240 builtin/am.c:2243 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:2267
+#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248
+#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260
+#: builtin/am.c:2266
msgid "pass it through git-apply"
msgstr "傳遞給 git-apply"
-#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
-#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
-#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
-#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:154 parse-options.h:175 parse-options.h:316
+#: builtin/am.c:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321
+#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38
+#: bugreport.c:131
msgid "format"
msgstr "格式"
-#: builtin/am.c:2264
+#: builtin/am.c:2263
msgid "format the patch(es) are in"
msgstr "修補檔的格式"
-#: builtin/am.c:2270
+#: builtin/am.c:2269
msgid "override error message when patch failure occurs"
msgstr "打修補檔失敗時顯示的錯誤訊息"
-#: builtin/am.c:2272
+#: builtin/am.c:2271
msgid "continue applying patches after resolving a conflict"
msgstr "衝突解決後繼續套用修補檔"
-#: builtin/am.c:2275
+#: builtin/am.c:2274
msgid "synonyms for --continue"
msgstr "和 --continue 同義"
-#: builtin/am.c:2278
+#: builtin/am.c:2277
msgid "skip the current patch"
msgstr "跳過目前修補檔"
-#: builtin/am.c:2281
+#: builtin/am.c:2280
msgid "restore the original branch and abort the patching operation."
msgstr "復原原始分支並終止打修補檔動作。"
-#: builtin/am.c:2284
+#: builtin/am.c:2283
msgid "abort the patching operation but keep HEAD where it is."
msgstr "終止修補檔動作但保持 HEAD 不變。"
-#: builtin/am.c:2288
+#: builtin/am.c:2287
msgid "show the patch being applied"
msgstr "顯示正在套用的修補檔"
-#: builtin/am.c:2293
+#: builtin/am.c:2292
msgid "lie about committer date"
msgstr "將作者日期作為提交日期"
-#: builtin/am.c:2295
+#: builtin/am.c:2294
msgid "use current timestamp for author date"
msgstr "用目前時間作為作者日期"
-#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
-#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
-#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517
+#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524
+#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381
msgid "GPG-sign commits"
msgstr "使用 GPG 簽名提交"
-#: builtin/am.c:2301
+#: builtin/am.c:2300
msgid "(internal use for git-rebase)"
msgstr "(內部使用,用於 git-rebase)"
-#: builtin/am.c:2319
+#: builtin/am.c:2318
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."
@@ -9814,16 +10110,16 @@ msgstr ""
"參數 -b/--binary 已經很長時間不做任何實質動作了,並且將被移除。\n"
"請不要再使用它了。"
-#: builtin/am.c:2326
+#: builtin/am.c:2325
msgid "failed to read the index"
msgstr "讀取索引失敗"
-#: builtin/am.c:2341
+#: builtin/am.c:2340
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的重定基底目錄 %s 仍然存在,但卻提供了 mbox。"
-#: builtin/am.c:2365
+#: builtin/am.c:2364
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -9832,11 +10128,11 @@ msgstr ""
"發現了錯誤的 %s 目錄。\n"
"使用 \"git am --abort\" 刪除它。"
-#: builtin/am.c:2371
+#: builtin/am.c:2370
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解決動作未進行,我們不會繼續。"
-#: builtin/am.c:2381
+#: builtin/am.c:2380
msgid "interactive mode requires patches on the command line"
msgstr "互動式模式需要指令列上提供修補檔"
@@ -9962,7 +10258,7 @@ msgstr "'%s' 不是一個有效的提交"
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
-msgstr "不能簽出原始 HEAD '%s'。嘗試 'git bisect reset <提交>'。"
+msgstr "不能檢出原始 HEAD '%s'。嘗試 'git bisect reset <提交>'。"
#: builtin/bisect--helper.c:216
#, c-format
@@ -10055,7 +10351,7 @@ msgstr "壞的 HEAD - 我需要一個 HEAD"
#: builtin/bisect--helper.c:529
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
-msgstr "簽出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。"
+msgstr "檢出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。"
#: builtin/bisect--helper.c:550
msgid "won't bisect on cg-seek'ed tree"
@@ -10112,7 +10408,7 @@ msgstr "啟動二分尋找過程"
#: builtin/bisect--helper.c:653
msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "更新 BISECT_HEAD 而非簽出目前提交"
+msgstr "更新 BISECT_HEAD 而非檢出目前提交"
#: builtin/bisect--helper.c:655
msgid "no log for BISECT_WRITE"
@@ -10241,7 +10537,7 @@ msgstr "顯示作者的信箱而不是名字(預設:關閉)"
msgid "Ignore whitespace differences"
msgstr "忽略空白差異"
-#: builtin/blame.c:860 builtin/log.c:1702
+#: builtin/blame.c:860 builtin/log.c:1721
msgid "rev"
msgstr "版本"
@@ -10309,13 +10605,13 @@ msgstr "--progress 不能和 --incremental 或 --porcelain 同時使用"
msgid "4 years, 11 months ago"
msgstr "4 年 11 個月前"
-#: builtin/blame.c:1079
+#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "檔案 %s 只有 %lu 行"
-#: builtin/blame.c:1125
+#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "追蹤程式碼行"
@@ -10396,7 +10692,7 @@ msgstr "無法查詢 HEAD 指向的提交物件"
#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
-msgstr "無法刪除簽出於 '%2$s' 的分支 '%1$s'。"
+msgstr "無法刪除在「%2$s」檢出的「%1$s」分支"
#: builtin/branch.c:255
#, c-format
@@ -10526,7 +10822,7 @@ msgstr "設定追蹤模式(參見 git-pull(1))"
msgid "do not use"
msgstr "不要使用"
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:626 builtin/rebase.c:520
msgid "upstream"
msgstr "上游"
@@ -10618,97 +10914,97 @@ msgstr "只列印尚未合併的分支"
msgid "list branches in columns"
msgstr "以列的方式顯示分支"
-#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:433
+#: builtin/tag.c:434
msgid "object"
msgstr "物件"
-#: builtin/branch.c:658
+#: builtin/branch.c:657
msgid "print only branches of the object"
msgstr "只列印指向該物件的分支"
-#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441
msgid "sorting and filtering are case insensitive"
msgstr "排序和過濾屬於大小寫不敏感"
-#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "輸出格式"
-#: builtin/branch.c:684 builtin/clone.c:785
+#: builtin/branch.c:682 builtin/clone.c:789
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 沒有位於 /refs/heads 之下!"
-#: builtin/branch.c:708
+#: builtin/branch.c:706
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不相容"
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784
msgid "branch name required"
msgstr "必須提供分支名"
-#: builtin/branch.c:753
+#: builtin/branch.c:751
msgid "Cannot give description to detached HEAD"
msgstr "不能向分離開頭指標提供描述"
-#: builtin/branch.c:758
+#: builtin/branch.c:756
msgid "cannot edit description of more than one branch"
msgstr "不能為一個以上的分支編輯描述"
-#: builtin/branch.c:765
+#: builtin/branch.c:763
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚無提交。"
-#: builtin/branch.c:768
+#: builtin/branch.c:766
#, c-format
msgid "No branch named '%s'."
msgstr "沒有分支 '%s'。"
-#: builtin/branch.c:783
+#: builtin/branch.c:781
msgid "too many branches for a copy operation"
msgstr "為複製動作提供了太多的分支名"
-#: builtin/branch.c:792
+#: builtin/branch.c:790
msgid "too many arguments for a rename operation"
msgstr "為重新命名動作提供了太多的參數"
-#: builtin/branch.c:797
+#: builtin/branch.c:795
msgid "too many arguments to set new upstream"
msgstr "為設定新上游提供了太多的參數"
-#: builtin/branch.c:801
+#: builtin/branch.c:799
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "無法設定 HEAD 的上游為 %s,因為 HEAD 沒有指向任何分支。"
-#: builtin/branch.c:804 builtin/branch.c:827
+#: builtin/branch.c:802 builtin/branch.c:825
#, c-format
msgid "no such branch '%s'"
msgstr "沒有此分支 '%s'"
-#: builtin/branch.c:808
+#: builtin/branch.c:806
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:821
+#: builtin/branch.c:819
msgid "too many arguments to unset upstream"
msgstr "為取消上游設定動作提供了太多的參數"
-#: builtin/branch.c:825
+#: builtin/branch.c:823
msgid "could not unset upstream of HEAD when it does not point to any branch."
-msgstr "無法取消 HEAD 的上游設定因為它沒有指向一個分支"
+msgstr "在 HEAD 的上游未指向任何分支時無法取消設定。"
-#: builtin/branch.c:831
+#: builtin/branch.c:829
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 沒有上游訊息"
-#: builtin/branch.c:841
+#: builtin/branch.c:839
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>?"
@@ -10716,7 +11012,7 @@ msgstr ""
"'git branch' 的 -a 和 -r 選項不帶一個分支名。\n"
"您是否想要使用:-a|-r --list <模式>?"
-#: builtin/branch.c:845
+#: builtin/branch.c:843
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -10739,19 +11035,19 @@ msgstr "git bundle list-heads <檔案> [<參考名稱>...]"
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <檔案> [<參考名稱>...]"
-#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+#: builtin/bundle.c:66 builtin/pack-objects.c:3376
msgid "do not show progress meter"
msgstr "不顯示進度表"
-#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+#: builtin/bundle.c:68 builtin/pack-objects.c:3378
msgid "show progress meter"
msgstr "顯示進度表"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: builtin/bundle.c:70 builtin/pack-objects.c:3380
msgid "show progress meter during object writing phase"
msgstr "在物件寫入階段顯示進度表"
-#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+#: builtin/bundle.c:73 builtin/pack-objects.c:3383
msgid "similar to --all-progress when progress meter is shown"
msgstr "當進度表顯示時類似於 --all-progress"
@@ -10781,7 +11077,7 @@ msgstr "詳細輸出;必須置於子指令之前"
msgid "Unknown subcommand: %s"
msgstr "未知子指令:%s"
-#: builtin/cat-file.c:595
+#: builtin/cat-file.c:598
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -10789,7 +11085,7 @@ msgstr ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <類型> | --textconv | --filters) [--path=<路徑>] <物件>"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:599
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -10797,71 +11093,71 @@ msgstr ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:617
+#: builtin/cat-file.c:620
msgid "only one batch option may be specified"
msgstr "只能指定一個批次處理選項"
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:638
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<類型> 可以是其中之一:blob、tree、commit、tag"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:639
msgid "show object type"
msgstr "顯示物件類型"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:640
msgid "show object size"
msgstr "顯示物件大小"
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:642
msgid "exit with zero when there's no error"
msgstr "當沒有錯誤時離開並返回零"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:643
msgid "pretty-print object's content"
msgstr "美觀地列印物件的內容"
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:645
msgid "for blob objects, run textconv on object's content"
msgstr "對於資料物件,對其內容做文字轉換"
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:647
msgid "for blob objects, run filters on object's content"
msgstr "對於資料物件,對其內容做過濾"
-#: builtin/cat-file.c:645 git-submodule.sh:1002
+#: builtin/cat-file.c:648 git-submodule.sh:984
msgid "blob"
-msgstr "資料物件"
+msgstr "blob"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:649
msgid "use a specific path for --textconv/--filters"
msgstr "對於 --textconv/--filters 使用一個特定的路徑"
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:651
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "允許 -s 和 -t 對損壞的物件生效"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:652
msgid "buffer --batch output"
msgstr "緩衝 --batch 的輸出"
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:654
msgid "show info and content of objects fed from the standard input"
msgstr "顯示從標準輸入提供的物件的訊息和內容"
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:658
msgid "show info about objects fed from the standard input"
msgstr "顯示從標準輸入提供的物件的訊息"
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:662
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "跟隨樹內符號連結(和 --batch 或 --batch-check 共用)"
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:664
msgid "show all objects with --batch or --batch-check"
msgstr "使用 --batch 或 --batch-check 參數顯示所有物件"
-#: builtin/cat-file.c:663
+#: builtin/cat-file.c:666
msgid "do not order --batch-all-objects output"
msgstr "不要對 --batch-all-objects 的輸出排序"
@@ -10889,8 +11185,8 @@ msgstr "從標準輸入讀出檔案名"
msgid "terminate input and output records by a NUL character"
msgstr "輸入和輸出的紀錄使用 NUL 字元終結"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537
+#: builtin/worktree.c:502
msgid "suppress progress reporting"
msgstr "不顯示進度報告"
@@ -10953,7 +11249,7 @@ msgstr "索引值應該取值 1 到 3 或者 all"
#: builtin/checkout-index.c:164
msgid "check out all files in the index"
-msgstr "簽出索引區的所有檔案"
+msgstr "檢出索引區的所有檔案"
#: builtin/checkout-index.c:165
msgid "force overwrite of existing files"
@@ -10965,7 +11261,7 @@ msgstr "存在或不在索引中的檔案都沒有警告"
#: builtin/checkout-index.c:169
msgid "don't checkout new files"
-msgstr "不簽出新檔案"
+msgstr "不檢出新檔案"
#: builtin/checkout-index.c:171
msgid "update stat information in the index file"
@@ -10982,7 +11278,7 @@ msgstr "將內容寫入暫存檔"
#: builtin/checkout-index.c:178 builtin/column.c:31
#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
-#: builtin/worktree.c:672
+#: builtin/worktree.c:675
msgid "string"
msgstr "字串"
@@ -11010,95 +11306,95 @@ msgstr "git switch [<選項>] [<分支>]"
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<選項>] [--source=<分支>] <檔案>..."
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c:188 builtin/checkout.c:227
#, c-format
msgid "path '%s' does not have our version"
msgstr "路徑 '%s' 沒有我們的版本"
-#: builtin/checkout.c:177 builtin/checkout.c:216
+#: builtin/checkout.c:190 builtin/checkout.c:229
#, c-format
msgid "path '%s' does not have their version"
msgstr "路徑 '%s' 沒有他們的版本"
-#: builtin/checkout.c:193
+#: builtin/checkout.c:206
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路徑 '%s' 沒有全部必需的版本"
-#: builtin/checkout.c:243
+#: builtin/checkout.c:256
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路徑 '%s' 沒有必需的版本"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:274
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s':無法合併"
-#: builtin/checkout.c:277
+#: builtin/checkout.c:290
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "無法為 '%s' 新增合併結果"
-#: builtin/checkout.c:377
+#: builtin/checkout.c:395
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "重新建立了 %d 個合併衝突"
-#: builtin/checkout.c:382
+#: builtin/checkout.c:400
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "從 %2$s 更新了 %1$d 個路徑"
-#: builtin/checkout.c:389
+#: builtin/checkout.c:407
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "從索引區更新了 %d 個路徑"
-#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
-#: builtin/checkout.c:422
+#: builtin/checkout.c:430 builtin/checkout.c:433 builtin/checkout.c:436
+#: builtin/checkout.c:440
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' 不能在更新路徑時使用"
-#: builtin/checkout.c:425 builtin/checkout.c:428
+#: builtin/checkout.c:443 builtin/checkout.c:446
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' 不能和 %s 同時使用"
-#: builtin/checkout.c:432
+#: builtin/checkout.c:450
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同時更新路徑並切換到分支'%s'。"
-#: builtin/checkout.c:436
+#: builtin/checkout.c:454
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "'%s' 或 '%s' 都沒有指定"
-#: builtin/checkout.c:440
+#: builtin/checkout.c:458
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "未指定 '%2$s' 時,必須使用 '%1$s'"
-#: builtin/checkout.c:445 builtin/checkout.c:450
+#: builtin/checkout.c:463 builtin/checkout.c:468
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
-#: builtin/checkout.c:509 builtin/checkout.c:516
+#: builtin/checkout.c:527 builtin/checkout.c:534
#, c-format
msgid "path '%s' is unmerged"
msgstr "路徑 '%s' 未合併"
-#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
+#: builtin/checkout.c:704
msgid "you need to resolve your current index first"
msgstr "您需要先解決目前索引的衝突"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:758
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11107,51 +11403,51 @@ msgstr ""
"不能繼續,下列檔案有暫存的修改:\n"
"%s"
-#: builtin/checkout.c:837
+#: builtin/checkout.c:861
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能對 '%s' 執行 reflog 動作:%s\n"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:903
msgid "HEAD is now at"
msgstr "HEAD 目前位於"
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:907 builtin/clone.c:720
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:887
+#: builtin/checkout.c:911
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重設分支 '%s'\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:914
#, c-format
msgid "Already on '%s'\n"
msgstr "已經位於 '%s'\n"
-#: builtin/checkout.c:894
+#: builtin/checkout.c:918
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切換並重設分支 '%s'\n"
-#: builtin/checkout.c:896 builtin/checkout.c:1320
+#: builtin/checkout.c:920 builtin/checkout.c:1344
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切換到一個新分支 '%s'\n"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:922
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切換到分支 '%s'\n"
# 譯者:請維持前導空格
-#: builtin/checkout.c:949
+#: builtin/checkout.c:973
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 個。\n"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:979
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11168,7 +11464,7 @@ msgstr[0] ""
"\n"
"%s\n"
-#: builtin/checkout.c:974
+#: builtin/checkout.c:998
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11189,19 +11485,19 @@ msgstr[0] ""
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1033
msgid "internal error in revision walk"
msgstr "在版本遍歷時遇到內部錯誤"
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1037
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: builtin/checkout.c:1077 builtin/checkout.c:1339
msgid "You are on a branch yet to be born"
msgstr "您位於一個尚未初始化的分支"
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1152
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11210,7 +11506,7 @@ msgstr ""
"'%s' 既可以是一個本機檔案,也可以是一個追蹤分支。\n"
"請使用 --(和可選的 --no-guess)來消除歧義"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1159
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"
@@ -11221,7 +11517,7 @@ msgid ""
"one remote, e.g. the 'origin' remote, consider setting\n"
"checkout.defaultRemote=origin in your config."
msgstr ""
-"如果您想要簽出一個遠端追蹤分支,例如 'origin',您可以\n"
+"如果您想要檢出一個遠端追蹤分支,例如 'origin',您可以\n"
"使用 --track 選項寫出全名:\n"
"\n"
" git checkout --track origin/<name>\n"
@@ -11229,51 +11525,51 @@ msgstr ""
"如果您總是喜歡使用模糊的簡短分支名 <name>,而不喜歡如 'origin' 的遠端\n"
"版本庫名,可以在設定中設定 checkout.defaultRemote=origin。"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1169
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' 符合多個 (%d) 遠端追蹤分支"
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1235
msgid "only one reference expected"
msgstr "預期只有一個引用"
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1252
#, c-format
msgid "only one reference expected, %d given."
-msgstr "應只有一個引用,卻給出了 %d 個"
+msgstr "應只有一個引用,卻提供了 %d 個。"
-#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
+#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451
#, c-format
msgid "invalid reference: %s"
msgstr "無效引用:%s"
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1311 builtin/checkout.c:1677
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一個樹:%s"
-#: builtin/checkout.c:1334
+#: builtin/checkout.c:1358
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "期望一個分支,得到標籤 '%s'"
-#: builtin/checkout.c:1336
+#: builtin/checkout.c:1360
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "期望一個分支,得到遠端分支 '%s'"
-#: builtin/checkout.c:1337 builtin/checkout.c:1345
+#: builtin/checkout.c:1361 builtin/checkout.c:1369
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "期望一個分支,得到 '%s'"
-#: builtin/checkout.c:1340
+#: builtin/checkout.c:1364
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "期望一個分支,得到提交 '%s'"
-#: builtin/checkout.c:1356
+#: builtin/checkout.c:1380
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11281,7 +11577,7 @@ msgstr ""
"不能在合併時切換分支\n"
"考慮使用 \"git merge --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1384
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11289,7 +11585,7 @@ msgstr ""
"不能在 am 工作階段期間切換分支\n"
"考慮使用 \"git am --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1388
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11297,7 +11593,7 @@ msgstr ""
"不能在重定基底時切換分支\n"
"考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1392
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11305,7 +11601,7 @@ msgstr ""
"不能在揀選時切換分支\n"
"考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1396
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11313,251 +11609,253 @@ msgstr ""
"不能在還原時切換分支\n"
"考慮使用 \"git revert --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1376
+#: builtin/checkout.c:1400
msgid "you are switching branch while bisecting"
msgstr "您在執行二分尋找時切換分支"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1407
msgid "paths cannot be used with switching branches"
msgstr "路徑不能和切換分支同時使用"
-#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
+#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切換分支同時使用"
-#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
-#: builtin/checkout.c:1409 builtin/checkout.c:1414
+#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428
+#: builtin/checkout.c:1433 builtin/checkout.c:1438
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同時使用"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1435
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' 不帶 <起始點>"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1443
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切換分支到一個非提交 '%s'"
-#: builtin/checkout.c:1426
+#: builtin/checkout.c:1450
msgid "missing branch or commit argument"
msgstr "缺少分支或提交參數"
-#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
-#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
-#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
-#: builtin/send-pack.c:174
+#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80
+#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288
+#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561
+#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "強制顯示進度報告"
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1493
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支執行三方合併"
-#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
+#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322
msgid "style"
msgstr "風格"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1495
msgid "conflict style (merge or diff3)"
msgstr "衝突輸出風格(merge 或 diff3)"
-#: builtin/checkout.c:1483 builtin/worktree.c:496
+#: builtin/checkout.c:1507 builtin/worktree.c:499
msgid "detach HEAD at named commit"
msgstr "HEAD 從指定的提交分離"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1508
msgid "set upstream info for new branch"
msgstr "為新的分支設定上游訊息"
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1510
msgid "force checkout (throw away local modifications)"
-msgstr "強制簽出(捨棄本機修改)"
+msgstr "強制檢出(捨棄本機修改)"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1512
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1512
msgid "new unparented branch"
msgstr "新的沒有父提交的分支"
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1514 builtin/merge.c:292
msgid "update ignored files (default)"
msgstr "更新忽略的檔案(預設)"
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1517
msgid "do not check if another worktree is holding the given ref"
msgstr "不檢查指定的引用是否被其他工作區所占用"
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1530
msgid "checkout our version for unmerged files"
-msgstr "對尚未合併的檔案簽出我們的版本"
+msgstr "對尚未合併的檔案檢出我們的版本"
-#: builtin/checkout.c:1509
+#: builtin/checkout.c:1533
msgid "checkout their version for unmerged files"
-msgstr "對尚未合併的檔案簽出他們的版本"
+msgstr "對尚未合併的檔案檢出他們的版本"
-#: builtin/checkout.c:1513
+#: builtin/checkout.c:1537
msgid "do not limit pathspecs to sparse entries only"
-msgstr "對路徑不做稀疏簽出的限制"
+msgstr "對路徑不做稀疏檢出的限制"
-#: builtin/checkout.c:1565
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b、-B 和 --orphan 是互斥的"
+#: builtin/checkout.c:1592
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c、-%c 和 --orphan 是互斥的"
-#: builtin/checkout.c:1568
+#: builtin/checkout.c:1596
msgid "-p and --overlay are mutually exclusive"
msgstr "-p 和 --overlay 互斥"
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1633
msgid "--track needs a branch name"
msgstr "--track 需要一個分支名"
-#: builtin/checkout.c:1610
-msgid "missing branch name; try -b"
-msgstr "缺少分支名,嘗試 -b"
+#: builtin/checkout.c:1638
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "缺少分支名稱,請嘗試 -%c"
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1670
#, c-format
msgid "could not resolve %s"
msgstr "無法解析 %s"
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1686
msgid "invalid path specification"
msgstr "無效的路徑規格"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1693
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' 不是一個提交,不能基於它建立分支 '%s'"
-#: builtin/checkout.c:1669
+#: builtin/checkout.c:1697
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout:--detach 不能接收路徑參數 '%s'"
-#: builtin/checkout.c:1678
+#: builtin/checkout.c:1706
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file 與 --detach 不相容"
-#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+#: builtin/checkout.c:1709 builtin/reset.c:325 builtin/stash.c:1503
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file 與 --patch 不相容"
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1720
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-"git checkout:在從索引簽出時,--ours/--theirs、--force 和 --merge 不相容。"
+"git checkout:在從索引檢出時,--ours/--theirs、--force 和 --merge 不相容。"
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1725
msgid "you must specify path(s) to restore"
msgstr "您必須指定一個要復原的路徑"
-#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
-#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
+#: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802
+#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1752
msgid "create and checkout a new branch"
-msgstr "建立並簽出一個新的分支"
+msgstr "建立並檢出一個新的分支"
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1754
msgid "create/reset and checkout a branch"
-msgstr "建立/重設並簽出一個分支"
+msgstr "建立/重設並檢出一個分支"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1755
msgid "create reflog for new branch"
msgstr "為新的分支建立引用日誌"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1757
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "二次猜測 'git checkout <無此分支>'(預設)"
-#: builtin/checkout.c:1730
+#: builtin/checkout.c:1758
msgid "use overlay mode (default)"
msgstr "使用疊加模式(預設)"
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1803
msgid "create and switch to a new branch"
msgstr "建立並切換一個新分支"
-#: builtin/checkout.c:1777
+#: builtin/checkout.c:1805
msgid "create/reset and switch to a branch"
msgstr "建立/重設並切換一個分支"
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1807
msgid "second guess 'git switch <no-such-branch>'"
msgstr "二次猜測 'git switch <無此分支>'"
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1809
msgid "throw away local modifications"
msgstr "捨棄本機修改"
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1843
msgid "which tree-ish to checkout from"
-msgstr "要簽出哪一個樹"
+msgstr "要檢出哪一個樹"
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1845
msgid "restore the index"
msgstr "復原索引"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1847
msgid "restore the working tree (default)"
msgstr "復原工作區(預設)"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1849
msgid "ignore unmerged entries"
msgstr "忽略未合併條目"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1850
msgid "use overlay mode"
msgstr "使用疊加模式"
-#: builtin/clean.c:28
+#: builtin/clean.c:29
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路徑>..."
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Removing %s\n"
msgstr "正刪除 %s\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "Would remove %s\n"
msgstr "將刪除 %s\n"
-#: builtin/clean.c:34
+#: builtin/clean.c:35
#, c-format
msgid "Skipping repository %s\n"
msgstr "忽略版本庫 %s\n"
-#: builtin/clean.c:35
+#: builtin/clean.c:36
#, c-format
msgid "Would skip repository %s\n"
msgstr "將忽略版本庫 %s\n"
-#: builtin/clean.c:36
+#: builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "刪除 %s 失敗"
-#: builtin/clean.c:37
+#: builtin/clean.c:38
#, c-format
msgid "could not lstat %s\n"
msgstr "不能對 %s 呼叫 lstat\n"
-#: builtin/clean.c:301 git-add--interactive.perl:595
+#: builtin/clean.c:302 git-add--interactive.perl:595
#, c-format
msgid ""
"Prompt help:\n"
@@ -11570,7 +11868,7 @@ msgstr ""
"foo - 透過唯一前綴選擇一個選項\n"
" - (空)什麼也不選擇\n"
-#: builtin/clean.c:305 git-add--interactive.perl:604
+#: builtin/clean.c:306 git-add--interactive.perl:604
#, c-format
msgid ""
"Prompt help:\n"
@@ -11597,27 +11895,27 @@ msgstr ""
msgid "Huh (%s)?\n"
msgstr "嗯(%s)?\n"
-#: builtin/clean.c:663
+#: builtin/clean.c:661
#, c-format
msgid "Input ignore patterns>> "
msgstr "輸入範本以排除條目>> "
-#: builtin/clean.c:700
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "警告:無法找到和 %s 符合的條目"
-#: builtin/clean.c:721
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "選擇要刪除的條目"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:762
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
-msgstr "刪除 %s [y/N]?"
+msgstr "移除 %s [y/N]? "
-#: builtin/clean.c:795
+#: builtin/clean.c:789
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -11635,62 +11933,62 @@ msgstr ""
"help - 顯示本協助\n"
"? - 顯示如何在提示符下選擇的協助"
-#: builtin/clean.c:831
+#: builtin/clean.c:825
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "將刪除如下條目:"
-#: builtin/clean.c:847
+#: builtin/clean.c:841
msgid "No more files to clean, exiting."
msgstr "沒有要清理的檔案,離開。"
-#: builtin/clean.c:909
+#: builtin/clean.c:903
msgid "do not print names of files removed"
msgstr "不列印刪除檔案的名稱"
-#: builtin/clean.c:911
+#: builtin/clean.c:905
msgid "force"
msgstr "強制"
-#: builtin/clean.c:912
+#: builtin/clean.c:906
msgid "interactive cleaning"
msgstr "互動式清除"
-#: builtin/clean.c:914
+#: builtin/clean.c:908
msgid "remove whole directories"
msgstr "刪除整個目錄"
-#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
-#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
-#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:909 builtin/log.c:182 builtin/log.c:184
+#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "模式"
-#: builtin/clean.c:916
+#: builtin/clean.c:910
msgid "add <pattern> to ignore rules"
msgstr "新增 <模式> 到忽略規則"
-#: builtin/clean.c:917
+#: builtin/clean.c:911
msgid "remove ignored files, too"
msgstr "也刪除忽略的檔案"
-#: builtin/clean.c:919
+#: builtin/clean.c:913
msgid "remove only ignored files"
msgstr "只刪除忽略的檔案"
-#: builtin/clean.c:937
+#: builtin/clean.c:931
msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能同時使用"
-#: builtin/clean.c:941
+#: builtin/clean.c:935
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
"clean.requireForce 設定為 true 且未提供 -i、-n 或 -f 選項,拒絕執行清理動作"
-#: builtin/clean.c:944
+#: builtin/clean.c:938
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -11703,9 +12001,9 @@ msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]"
#: builtin/clone.c:93
msgid "don't create a checkout"
-msgstr "不建立一個簽出"
+msgstr "不建立一個檢出"
-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536
msgid "create a bare repository"
msgstr "建立一個純版本庫"
@@ -11725,11 +12023,11 @@ msgstr "不使用本機硬連結,始終複製"
msgid "setup as shared repository"
msgstr "設定為共享版本庫"
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "pathspec"
msgstr "路徑規格"
-#: builtin/clone.c:107
+#: builtin/clone.c:106
msgid "initialize submodules in the clone"
msgstr "在複製時初始化子模組"
@@ -11737,11 +12035,11 @@ msgstr "在複製時初始化子模組"
msgid "number of submodules cloned in parallel"
msgstr "並發複製的子模組的數量"
-#: builtin/clone.c:111 builtin/init-db.c:486
+#: builtin/clone.c:111 builtin/init-db.c:533
msgid "template-directory"
msgstr "範本目錄"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:534
msgid "directory from which templates will be used"
msgstr "範本目錄將被使用"
@@ -11756,7 +12054,7 @@ msgid "use --reference only while cloning"
msgstr "僅在複製時參考 --reference 指向的本機版本庫"
#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3441 builtin/repack.c:327
+#: builtin/pack-objects.c:3442 builtin/repack.c:329
msgid "name"
msgstr "名稱"
@@ -11766,14 +12064,14 @@ msgstr "使用 <名稱> 而不是 'origin' 去追蹤上游"
#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
-msgstr "簽出 <分支> 而不是遠端 HEAD"
+msgstr "檢出 <分支> 而不是遠端 HEAD"
#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "遠端 git-upload-pack 路徑"
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
-#: builtin/pull.c:207
+#: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848
+#: builtin/pull.c:208
msgid "depth"
msgstr "深度"
@@ -11781,7 +12079,8 @@ msgstr "深度"
msgid "create a shallow clone of that depth"
msgstr "建立一個指定深度的淺複製"
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431
+#: builtin/pull.c:211
msgid "time"
msgstr "時間"
@@ -11789,12 +12088,12 @@ msgstr "時間"
msgid "create a shallow clone since a specific time"
msgstr "從一個特定時間建立一個淺複製"
-#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1480
+#: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304
msgid "revision"
-msgstr "版本"
+msgstr "修訂版"
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215
msgid "deepen history of shallow clone, excluding rev"
msgstr "深化淺複製的歷史,除了特定版本"
@@ -11811,11 +12110,11 @@ msgstr "不要複製任何標籤,並且後續取得動作也不下載它們"
msgid "any cloned submodules will be shallow"
msgstr "子模組將以淺下載模式複製"
-#: builtin/clone.c:137 builtin/init-db.c:495
+#: builtin/clone.c:137 builtin/init-db.c:542
msgid "gitdir"
msgstr "git目錄"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:543
msgid "separate git dir from working tree"
msgstr "git目錄和工作區分離"
@@ -11827,23 +12126,23 @@ msgstr "key=value"
msgid "set config inside the new repository"
msgstr "在新版本庫中設定設定訊息"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76
+#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171
msgid "server-specific"
msgstr "server-specific"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:173
+#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76
+#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172
msgid "option to transmit"
msgstr "傳輸選項"
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234
+#: builtin/push.c:571
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 位址"
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
-#: builtin/push.c:576
+#: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237
+#: builtin/push.c:573
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 位址"
@@ -11853,7 +12152,7 @@ msgstr "任何複製的子模組將使用它們的遠端追蹤分支"
#: builtin/clone.c:151
msgid "initialize sparse-checkout file to include only files at root"
-msgstr "初始化稀疏簽出檔案,只包含根目錄中的檔案"
+msgstr "初始化稀疏檢出檔案,只包含根目錄中的檔案"
#: builtin/clone.c:287
msgid ""
@@ -11873,169 +12172,169 @@ msgstr "info: 不能為 '%s' 新增一個備用:%s\n"
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一個目錄"
-#: builtin/clone.c:430
+#: builtin/clone.c:431
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "無法在 '%s' 上啟動疊代器"
-#: builtin/clone.c:460
+#: builtin/clone.c:462
#, c-format
msgid "failed to create link '%s'"
msgstr "建立連結 '%s' 失敗"
-#: builtin/clone.c:464
+#: builtin/clone.c:466
#, c-format
msgid "failed to copy file to '%s'"
msgstr "複製檔案至 '%s' 失敗"
-#: builtin/clone.c:469
+#: builtin/clone.c:471
#, c-format
msgid "failed to iterate over '%s'"
msgstr "無法在 '%s' 上疊代"
-#: builtin/clone.c:494
+#: builtin/clone.c:498
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:508
+#: builtin/clone.c:512
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
-"複製成功,但是簽出失敗。\n"
-"您可以透過 'git status' 檢查哪些已被簽出,然後使用指令\n"
+"複製成功,但是檢出失敗。\n"
+"您可以透過 'git status' 檢查哪些已被檢出,然後使用指令\n"
"'git restore --source=HEAD :/' 重試\n"
-#: builtin/clone.c:585
+#: builtin/clone.c:589
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能發現要複製的遠端分支 %s。"
-#: builtin/clone.c:705
+#: builtin/clone.c:708
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:753
+#: builtin/clone.c:756
msgid "failed to initialize sparse-checkout"
-msgstr "無法初始化稀疏簽出"
+msgstr "無法初始化稀疏檢出"
-#: builtin/clone.c:776
+#: builtin/clone.c:779
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr "遠端 HEAD 指向一個不存在的引用,無法簽出。\n"
+msgstr "遠端 HEAD 指向一個不存在的引用,無法檢出。\n"
-#: builtin/clone.c:807
+#: builtin/clone.c:811
msgid "unable to checkout working tree"
-msgstr "不能簽出工作區"
+msgstr "不能檢出工作區"
-#: builtin/clone.c:862
+#: builtin/clone.c:868
msgid "unable to write parameters to config file"
msgstr "無法將參數寫入設定檔案"
-#: builtin/clone.c:925
+#: builtin/clone.c:931
msgid "cannot repack to clean up"
msgstr "無法執行 repack 來清理"
-#: builtin/clone.c:927
+#: builtin/clone.c:933
msgid "cannot unlink temporary alternates file"
msgstr "無法刪除暫時的 alternates 檔案"
-#: builtin/clone.c:965 builtin/receive-pack.c:1950
+#: builtin/clone.c:971 builtin/receive-pack.c:1972
msgid "Too many arguments."
msgstr "太多參數。"
-#: builtin/clone.c:969
+#: builtin/clone.c:975
msgid "You must specify a repository to clone."
msgstr "您必須指定一個版本庫來複製。"
-#: builtin/clone.c:982
+#: builtin/clone.c:988
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 選項不相容。"
-#: builtin/clone.c:985
+#: builtin/clone.c:991
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 選項不相容。"
-#: builtin/clone.c:998
+#: builtin/clone.c:1004
#, c-format
msgid "repository '%s' does not exist"
msgstr "版本庫 '%s' 不存在"
-#: builtin/clone.c:1004 builtin/fetch.c:1796
+#: builtin/clone.c:1010 builtin/fetch.c:1789
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一個正數"
-#: builtin/clone.c:1014
+#: builtin/clone.c:1020
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目標路徑 '%s' 已經存在,並且不是一個空目錄。"
-#: builtin/clone.c:1024
+#: builtin/clone.c:1030
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作區 '%s' 已經存在。"
-#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
-#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
+#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271
+#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能為 '%s' 建立先導目錄"
-#: builtin/clone.c:1044
+#: builtin/clone.c:1050
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能建立工作區目錄 '%s'"
-#: builtin/clone.c:1064
+#: builtin/clone.c:1070
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "複製到純版本庫 '%s'...\n"
-#: builtin/clone.c:1066
+#: builtin/clone.c:1072
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正複製到 '%s'...\n"
-#: builtin/clone.c:1090
+#: builtin/clone.c:1096
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不相容"
-#: builtin/clone.c:1154
+#: builtin/clone.c:1160
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本機複製時被忽略,請改用 file:// 協定。"
-#: builtin/clone.c:1156
+#: builtin/clone.c:1162
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since 在本機複製時被忽略,請改用 file:// 協定。"
-#: builtin/clone.c:1158
+#: builtin/clone.c:1164
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude 在本機複製時被忽略,請改用 file:// 協定。"
-#: builtin/clone.c:1160
+#: builtin/clone.c:1166
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter 在本機複製時被忽略,請改用 file:// 協定。"
-#: builtin/clone.c:1163
+#: builtin/clone.c:1169
msgid "source repository is shallow, ignoring --local"
msgstr "源版本庫是淺複製,忽略 --local"
-#: builtin/clone.c:1168
+#: builtin/clone.c:1174
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1249 builtin/clone.c:1257
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "遠端分支 %s 在上游 %s 未發現"
-#: builtin/clone.c:1254
+#: builtin/clone.c:1260
msgid "You appear to have cloned an empty repository."
msgstr "您似乎複製了一個空版本庫。"
@@ -12071,6 +12370,97 @@ msgstr "兩列之間的填充空間"
msgid "--command must be the first argument"
msgstr "--command 必須是第一個參數"
+#: builtin/commit-graph.c:11 builtin/commit-graph.c:19
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+msgstr ""
+"git commit-graph verify [--object-dir <物件目錄>] [--shallow] [--"
+"[no-]progress]"
+
+#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--"
+"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]progress] <split options>"
+msgstr ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--"
+"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]progress] <split options>"
+
+#: builtin/commit-graph.c:60
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "找不到符合 %s 的物件目錄"
+
+#: builtin/commit-graph.c:76 builtin/commit-graph.c:152
+#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678
+msgid "dir"
+msgstr "目錄"
+
+#: builtin/commit-graph.c:77 builtin/commit-graph.c:153
+#: builtin/commit-graph.c:258
+msgid "The object directory to store the graph"
+msgstr "儲存圖形的物件目錄"
+
+#: builtin/commit-graph.c:79
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "如果提交圖形被分割,只驗證頭一個檔案"
+
+#: builtin/commit-graph.c:102
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "無法開啟提交圖形 '%s'"
+
+#: builtin/commit-graph.c:136
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "無法識別的 --split 參數,%s"
+
+#: builtin/commit-graph.c:155
+msgid "start walk at all refs"
+msgstr "開始遍歷所有引用"
+
+#: builtin/commit-graph.c:157
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "從標準輸入中的包索引檔案列表中掃描提交"
+
+#: builtin/commit-graph.c:159
+msgid "start walk at commits listed by stdin"
+msgstr "從標準輸入中的提交開始掃描"
+
+#: builtin/commit-graph.c:161
+msgid "include all commits already in the commit-graph file"
+msgstr "包含 commit-graph 檔案中已有所有提交"
+
+#: builtin/commit-graph.c:163
+msgid "enable computation for changed paths"
+msgstr "啟用已變更路徑的計算"
+
+#: builtin/commit-graph.c:166
+msgid "allow writing an incremental commit-graph file"
+msgstr "允許寫一個增量提交圖形檔案"
+
+#: builtin/commit-graph.c:170
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "在非基本分割提交圖形中的最大提交數"
+
+#: builtin/commit-graph.c:172
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "一個分割提交圖形的兩個級別之間的最大比率"
+
+#: builtin/commit-graph.c:174
+msgid "only expire files older than a given date-time"
+msgstr "只將舊於指定日期與時間的檔案設為過期"
+
+#: builtin/commit-graph.c:190
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs"
+
+#: builtin/commit-graph.c:229
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "非期望的非十六進位物件 ID:%s"
+
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -12084,7 +12474,7 @@ msgstr ""
msgid "duplicate parent %s ignored"
msgstr "忽略重複的父提交 %s"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:547
#, c-format
msgid "not a valid object name %s"
msgstr "不是一個有效的物件名 %s"
@@ -12112,22 +12502,22 @@ msgstr "父提交"
msgid "id of a parent commit object"
msgstr "父提交物件 ID"
-#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
-#: builtin/tag.c:412
+#: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474
+#: builtin/tag.c:413
msgid "message"
-msgstr "說明"
+msgstr "訊息"
-#: builtin/commit-tree.c:115 builtin/commit.c:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1506
msgid "commit message"
-msgstr "提交說明"
+msgstr "提交訊息"
#: builtin/commit-tree.c:118
msgid "read commit log message from file"
msgstr "從檔案中讀取提交說明"
-#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
-#: builtin/pull.c:175 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG 提交簽名"
@@ -12171,10 +12561,14 @@ msgstr ""
"\n"
#: builtin/commit.c:63
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "否則,請使用 'git rebase --skip'\n"
+
+#: builtin/commit.c:66
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "否則,請使用 'git cherry-pick --skip'\n"
-#: builtin/commit.c:66
+#: builtin/commit.c:69
msgid ""
"and then use:\n"
"\n"
@@ -12195,106 +12589,110 @@ msgstr ""
" git cherry-pick --skip\n"
"\n"
-#: builtin/commit.c:315
+#: builtin/commit.c:312
msgid "failed to unpack HEAD tree object"
msgstr "解包 HEAD 樹狀物件失敗"
-#: builtin/commit.c:351
+#: builtin/commit.c:348
msgid "--pathspec-from-file with -a does not make sense"
msgstr "--pathspec-from-file 和 -a 同時使用沒有意義"
-#: builtin/commit.c:364
+#: builtin/commit.c:361
msgid "No paths with --include/--only does not make sense."
msgstr "參數 --include/--only 不跟路徑沒有意義。"
-#: builtin/commit.c:376
+#: builtin/commit.c:373
msgid "unable to create temporary index"
msgstr "不能建立暫時索引"
-#: builtin/commit.c:385
+#: builtin/commit.c:382
msgid "interactive add failed"
msgstr "互動式新增失敗"
-#: builtin/commit.c:400
+#: builtin/commit.c:397
msgid "unable to update temporary index"
msgstr "無法更新暫時索引"
-#: builtin/commit.c:402
+#: builtin/commit.c:399
msgid "Failed to update main cache tree"
msgstr "不能更新樹的主快取"
-#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
+#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
msgid "unable to write new_index file"
msgstr "無法寫 new_index 檔案"
-#: builtin/commit.c:479
+#: builtin/commit.c:476
msgid "cannot do a partial commit during a merge."
msgstr "在合併過程中不能做部分提交。"
-#: builtin/commit.c:481
+#: builtin/commit.c:478
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在揀選過程中不能做部分提交。"
-#: builtin/commit.c:489
+#: builtin/commit.c:480
+msgid "cannot do a partial commit during a rebase."
+msgstr "在重定基底過程中不能做部分提交。"
+
+#: builtin/commit.c:488
msgid "cannot read the index"
msgstr "無法讀取索引"
-#: builtin/commit.c:508
+#: builtin/commit.c:507
msgid "unable to write temporary index file"
msgstr "無法寫暫時索引檔案"
-#: builtin/commit.c:606
+#: builtin/commit.c:605
#, c-format
msgid "commit '%s' lacks author header"
msgstr "提交 '%s' 缺少作者訊息"
-#: builtin/commit.c:608
+#: builtin/commit.c:607
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "提交 '%s' 有格式錯誤的作者訊息"
-#: builtin/commit.c:627
+#: builtin/commit.c:626
msgid "malformed --author parameter"
msgstr "格式錯誤的 --author 參數"
-#: builtin/commit.c:680
+#: builtin/commit.c:679
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "無法選擇一個未被目前提交說明使用的備註字元"
-#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
+#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查詢提交 %s"
-#: builtin/commit.c:730 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(正從標準輸入中讀取日誌訊息)\n"
-#: builtin/commit.c:732
+#: builtin/commit.c:731
msgid "could not read log from standard input"
msgstr "不能從標準輸入中讀取日誌訊息"
-#: builtin/commit.c:736
+#: builtin/commit.c:735
#, c-format
msgid "could not read log file '%s'"
msgstr "不能讀取日誌檔案 '%s'"
-#: builtin/commit.c:767 builtin/commit.c:783
+#: builtin/commit.c:766 builtin/commit.c:782
msgid "could not read SQUASH_MSG"
msgstr "不能讀取 SQUASH_MSG"
-#: builtin/commit.c:774
+#: builtin/commit.c:773
msgid "could not read MERGE_MSG"
msgstr "不能讀取 MERGE_MSG"
-#: builtin/commit.c:834
+#: builtin/commit.c:833
msgid "could not write commit template"
msgstr "不能寫提交範本"
-#: builtin/commit.c:853
+#: builtin/commit.c:852
#, c-format
msgid ""
"\n"
@@ -12308,7 +12706,7 @@ msgstr ""
"\t%s\n"
"然後重試。\n"
-#: builtin/commit.c:858
+#: builtin/commit.c:857
#, c-format
msgid ""
"\n"
@@ -12322,7 +12720,7 @@ msgstr ""
"\t%s\n"
"然後重試。\n"
-#: builtin/commit.c:871
+#: builtin/commit.c:870
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12331,7 +12729,7 @@ msgstr ""
"請為您的變更輸入提交說明。以 '%c' 開始的行將被忽略,而一個空的提交\n"
"說明將會終止提交。\n"
-#: builtin/commit.c:879
+#: builtin/commit.c:878
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12342,320 +12740,324 @@ msgstr ""
"也可以刪除它們。一個空的提交說明將會終止提交。\n"
# 譯者:為保證在輸出中對齊,注意調整句中空格!
-#: builtin/commit.c:896
+#: builtin/commit.c:895
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者: %.*s <%.*s>"
# 譯者:為保證在輸出中對齊,注意調整句中空格!
-#: builtin/commit.c:904
+#: builtin/commit.c:903
#, c-format
msgid "%sDate: %s"
msgstr "%s日期: %s"
# 譯者:為保證在輸出中對齊,注意調整句中空格!
-#: builtin/commit.c:911
+#: builtin/commit.c:910
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s提交者:%.*s <%.*s>"
-#: builtin/commit.c:929
+#: builtin/commit.c:928
msgid "Cannot read index"
msgstr "無法讀取索引"
-#: builtin/commit.c:997
+#: builtin/commit.c:999
msgid "Error building trees"
msgstr "無法建立樹狀物件"
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1013 builtin/tag.c:276
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "請使用 -m 或 -F 選項提供提交說明。\n"
-#: builtin/commit.c:1055
+#: builtin/commit.c:1057
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author '%s' 不是 '姓名 <信箱>' 格式,且未能在現有作者中找到符合"
-#: builtin/commit.c:1069
+#: builtin/commit.c:1071
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "無效的忽略模式 '%s'"
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: builtin/commit.c:1089 builtin/commit.c:1333
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "無效的未追蹤檔案參數 '%s'"
-#: builtin/commit.c:1127
+#: builtin/commit.c:1129
msgid "--long and -z are incompatible"
msgstr "--long 和 -z 選項不相容"
-#: builtin/commit.c:1171
+#: builtin/commit.c:1173
msgid "Using both --reset-author and --author does not make sense"
msgstr "同時使用 --reset-author 和 --author 沒有意義"
-#: builtin/commit.c:1180
+#: builtin/commit.c:1182
msgid "You have nothing to amend."
msgstr "您沒有可修補的提交。"
-#: builtin/commit.c:1183
+#: builtin/commit.c:1185
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正處於一個合併過程中 -- 無法修補提交。"
-#: builtin/commit.c:1185
+#: builtin/commit.c:1187
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正處於一個揀選過程中 -- 無法修補提交。"
-#: builtin/commit.c:1188
+#: builtin/commit.c:1189
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "您正處於重定基底的過程中 -- 無法修訂。"
+
+#: builtin/commit.c:1192
msgid "Options --squash and --fixup cannot be used together"
msgstr "選項 --squash 和 --fixup 不能同時使用"
-#: builtin/commit.c:1198
+#: builtin/commit.c:1202
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一個 -c/-C/-F/--fixup 選項。"
-#: builtin/commit.c:1200
+#: builtin/commit.c:1204
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "選項 -m 不能和 -c/-C/-F 同時使用。"
-#: builtin/commit.c:1208
+#: builtin/commit.c:1213
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同時使用。"
-#: builtin/commit.c:1225
+#: builtin/commit.c:1231
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "只能用一個 --include/--only/--all/--interactive/--patch 選項。"
-#: builtin/commit.c:1231
+#: builtin/commit.c:1237
#, c-format
msgid "paths '%s ...' with -a does not make sense"
-msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義"
+msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義"
-#: builtin/commit.c:1362 builtin/commit.c:1524
+#: builtin/commit.c:1368 builtin/commit.c:1529
msgid "show status concisely"
msgstr "以簡潔的格式顯示狀態"
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1370 builtin/commit.c:1531
msgid "show branch information"
msgstr "顯示分支訊息"
-#: builtin/commit.c:1366
+#: builtin/commit.c:1372
msgid "show stash information"
msgstr "顯示儲藏區訊息"
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: builtin/commit.c:1374 builtin/commit.c:1533
msgid "compute full ahead/behind values"
msgstr "計算完整的領先/落後值"
-#: builtin/commit.c:1370
+#: builtin/commit.c:1376
msgid "version"
msgstr "版本"
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549
+#: builtin/worktree.c:646
msgid "machine-readable output"
msgstr "機器可讀的輸出"
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: builtin/commit.c:1379 builtin/commit.c:1537
msgid "show status in long format (default)"
msgstr "以長格式顯示狀態(預設)"
-#: builtin/commit.c:1376 builtin/commit.c:1535
+#: builtin/commit.c:1382 builtin/commit.c:1540
msgid "terminate entries with NUL"
msgstr "條目以 NUL 字元結尾"
-#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
+#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543
#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336
msgid "mode"
msgstr "模式"
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: builtin/commit.c:1385 builtin/commit.c:1543
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "顯示未追蹤的檔案,「模式」的可選參數:all、normal、no。(預設:all)"
-#: builtin/commit.c:1383
+#: builtin/commit.c:1389
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
"顯示已忽略的檔案,可選模式:traditional、matching、no。(預設:traditional)"
-#: builtin/commit.c:1385 parse-options.h:192
+#: builtin/commit.c:1391 parse-options.h:192
msgid "when"
msgstr "何時"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1392
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略子模組的更改,「何時」的可選參數:all、dirty、untracked。(預設:all)"
-#: builtin/commit.c:1388
+#: builtin/commit.c:1394
msgid "list untracked files in columns"
msgstr "以列的方式顯示未追蹤的檔案"
-#: builtin/commit.c:1389
+#: builtin/commit.c:1395
msgid "do not detect renames"
msgstr "不檢測重新命名"
-#: builtin/commit.c:1391
+#: builtin/commit.c:1397
msgid "detect renames, optionally set similarity index"
msgstr "檢測重新命名,可以設定索引相似度"
-#: builtin/commit.c:1411
+#: builtin/commit.c:1417
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "不支援已忽略和未追蹤檔案參數的組合"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1499
msgid "suppress summary after successful commit"
msgstr "提交成功後不顯示概述訊息"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1500
msgid "show diff in commit message template"
msgstr "在提交說明範本裡顯示差異"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1502
msgid "Commit message options"
msgstr "提交說明選項"
-#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415
msgid "read message from file"
msgstr "從檔案中讀取提交說明"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1504
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1504
msgid "override author for commit"
msgstr "提交時覆蓋作者"
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1505 builtin/gc.c:538
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1505
msgid "override date for commit"
msgstr "提交時覆蓋日期"
-#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
-#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
+#: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509
+#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92
msgid "commit"
msgstr "提交"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1507
msgid "reuse and edit message from specified commit"
msgstr "重用並編輯指定提交的提交說明"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1508
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交說明"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1509
msgid "use autosquash formatted message to fixup specified commit"
msgstr "使用 autosquash 格式的提交說明用以修正指定的提交"
-#: builtin/commit.c:1505
+#: builtin/commit.c:1510
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交"
-#: builtin/commit.c:1506
+#: builtin/commit.c:1511
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "現在將該提交的作者改為我(和 -C/-c/--amend 參數共用)"
-#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 builtin/revert.c:110
+#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293
+#: builtin/pull.c:145 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "新增 Signed-off-by: 簽名"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1513
msgid "use specified template file"
msgstr "使用指定的範本檔案"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1514
msgid "force edit of commit"
msgstr "強制編輯提交"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1516
msgid "include status in commit message template"
msgstr "在提交說明範本裡包含狀態訊息"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1521
msgid "Commit contents options"
msgstr "提交內容選項"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1522
msgid "commit all changed files"
msgstr "提交所有改動的檔案"
-#: builtin/commit.c:1518
+#: builtin/commit.c:1523
msgid "add specified files to index for commit"
msgstr "新增指定的檔案到索引區等待提交"
-#: builtin/commit.c:1519
+#: builtin/commit.c:1524
msgid "interactively add files"
msgstr "互動式新增檔案"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1525
msgid "interactively add changes"
msgstr "互動式新增變更"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1526
msgid "commit only specified files"
msgstr "只提交指定的檔案"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1527
msgid "bypass pre-commit and commit-msg hooks"
msgstr "繞過 pre-commit 和 commit-msg 掛鉤"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1528
msgid "show what would be committed"
msgstr "顯示將要提交的內容"
-#: builtin/commit.c:1536
+#: builtin/commit.c:1541
msgid "amend previous commit"
msgstr "修改先前的提交"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1542
msgid "bypass post-rewrite hook"
msgstr "繞過 post-rewrite 掛鉤"
-#: builtin/commit.c:1544
+#: builtin/commit.c:1549
msgid "ok to record an empty change"
msgstr "允許一個空提交"
-#: builtin/commit.c:1546
+#: builtin/commit.c:1551
msgid "ok to record a change with an empty message"
msgstr "允許空的提交說明"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1624
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "損壞的 MERGE_HEAD 檔案(%s)"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1631
msgid "could not read MERGE_MODE"
msgstr "不能讀取 MERGE_MODE"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1652
#, c-format
msgid "could not read commit message: %s"
msgstr "不能讀取提交說明:%s"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1659
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "終止提交因為提交說明為空。\n"
-#: builtin/commit.c:1657
+#: builtin/commit.c:1664
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "終止提交;您未更改來自範本的提交說明。\n"
-#: builtin/commit.c:1691
+#: builtin/commit.c:1698
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -12664,77 +13066,6 @@ msgstr ""
"版本庫已更新,但無法寫 new_index 檔案。檢查是否磁碟已滿或\n"
"磁碟配額已耗盡,然後執行 \"git restore --staged :/\" 復原。"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-"git commit-graph verify [--object-dir <物件目錄>] [--shallow] [--"
-"[no-]progress]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir <物件目錄>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-
-#: builtin/commit-graph.c:52
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "找不到符合 %s 的物件目錄"
-
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
-#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
-msgid "dir"
-msgstr "目錄"
-
-#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
-#: builtin/commit-graph.c:211
-msgid "The object directory to store the graph"
-msgstr "儲存圖形的物件目錄"
-
-#: builtin/commit-graph.c:71
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr "如果提交圖形被分割,只驗證頭一個檔案"
-
-#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "無法開啟提交圖形 '%s'"
-
-#: builtin/commit-graph.c:128
-msgid "start walk at all refs"
-msgstr "開始遍歷所有引用"
-
-#: builtin/commit-graph.c:130
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr "從標準輸入中的包索引檔案列表中掃描提交"
-
-#: builtin/commit-graph.c:132
-msgid "start walk at commits listed by stdin"
-msgstr "從標準輸入中的提交開始掃描"
-
-#: builtin/commit-graph.c:134
-msgid "include all commits already in the commit-graph file"
-msgstr "包含 commit-graph 檔案中已有所有提交"
-
-#: builtin/commit-graph.c:137
-msgid "allow writing an incremental commit-graph file"
-msgstr "允許寫一個增量提交圖形檔案"
-
-#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr "在非基本分割提交圖形中的最大提交數"
-
-#: builtin/commit-graph.c:141
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr "一個分割提交圖形的兩個級別之間的最大比率"
-
-#: builtin/commit-graph.c:159
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs"
-
#: builtin/config.c:11
msgid "git config [<options>]"
msgstr "git config [<選項>]"
@@ -12742,7 +13073,7 @@ msgstr "git config [<選項>]"
#: builtin/config.c:104 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
-msgstr "未能識別的 --type 參數,%s"
+msgstr "無法識別的 --type 參數,%s"
#: builtin/config.c:116
msgid "only one type at a time"
@@ -13057,49 +13388,44 @@ msgstr "git describe [<選項>] [<提交號>...]"
msgid "git describe [<options>] --dirty"
msgstr "git describe [<選項>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
-msgstr "頭"
+msgstr "HEAD"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "輕量級的"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "附註的"
-#: builtin/describe.c:275
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s not available"
msgstr "附註標籤 %s 無效"
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "附註標籤 %s 沒有嵌入名稱"
-
#: builtin/describe.c:281
#, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "標籤 '%s' 的確是在 '%s'"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "「%s」標籤在外部被認為是「%s」"
-#: builtin/describe.c:325
+#: builtin/describe.c:328
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "沒有標籤準確符合 '%s'"
-#: builtin/describe.c:327
+#: builtin/describe.c:330
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr "沒有精確符合到引用或標籤,繼續搜尋進行描述\n"
-#: builtin/describe.c:394
+#: builtin/describe.c:397
#, c-format
msgid "finished search at %s\n"
msgstr "完成搜尋 %s\n"
-#: builtin/describe.c:421
+#: builtin/describe.c:424
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -13108,7 +13434,7 @@ msgstr ""
"沒有附註標籤能描述 '%s'。\n"
"然而,存在未附註標籤:嘗試 --tags。"
-#: builtin/describe.c:425
+#: builtin/describe.c:428
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -13117,12 +13443,12 @@ msgstr ""
"沒有標籤能描述 '%s'。\n"
"嘗試 --always,或者建立一些標籤。"
-#: builtin/describe.c:455
+#: builtin/describe.c:458
#, c-format
msgid "traversed %lu commits\n"
msgstr "已遍歷 %lu 個提交\n"
-#: builtin/describe.c:458
+#: builtin/describe.c:461
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -13131,90 +13457,90 @@ msgstr ""
"發現多於 %i 個標籤,列出最近的 %i 個\n"
"在 %s 放棄搜尋\n"
-#: builtin/describe.c:526
+#: builtin/describe.c:529
#, c-format
msgid "describe %s\n"
msgstr "描述 %s\n"
-#: builtin/describe.c:529
+#: builtin/describe.c:532
#, c-format
msgid "Not a valid object name %s"
msgstr "不是一個有效的物件名 %s"
-#: builtin/describe.c:537
+#: builtin/describe.c:540
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s 既不是提交也不是資料物件"
-#: builtin/describe.c:551
+#: builtin/describe.c:554
msgid "find the tag that comes after the commit"
msgstr "尋找該提交之後的標籤"
-#: builtin/describe.c:552
+#: builtin/describe.c:555
msgid "debug search strategy on stderr"
msgstr "在標準錯誤上除錯搜尋策略"
-#: builtin/describe.c:553
+#: builtin/describe.c:556
msgid "use any ref"
msgstr "使用任意引用"
-#: builtin/describe.c:554
+#: builtin/describe.c:557
msgid "use any tag, even unannotated"
msgstr "使用任意標籤,即使未附帶備註"
-#: builtin/describe.c:555
+#: builtin/describe.c:558
msgid "always use long format"
msgstr "始終使用長提交號格式"
-#: builtin/describe.c:556
+#: builtin/describe.c:559
msgid "only follow first parent"
msgstr "只跟隨第一個父提交"
-#: builtin/describe.c:559
+#: builtin/describe.c:562
msgid "only output exact matches"
msgstr "只輸出精確符合"
-#: builtin/describe.c:561
+#: builtin/describe.c:564
msgid "consider <n> most recent tags (default: 10)"
msgstr "考慮最近 <n> 個標籤(預設:10)"
-#: builtin/describe.c:563
+#: builtin/describe.c:566
msgid "only consider tags matching <pattern>"
msgstr "只考慮符合 <模式> 的標籤"
-#: builtin/describe.c:565
+#: builtin/describe.c:568
msgid "do not consider tags matching <pattern>"
msgstr "不考慮符合 <模式> 的標籤"
-#: builtin/describe.c:567 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:535
msgid "show abbreviated commit object as fallback"
msgstr "顯示簡寫的提交號作為後備"
-#: builtin/describe.c:568 builtin/describe.c:571
+#: builtin/describe.c:571 builtin/describe.c:574
msgid "mark"
msgstr "標記"
-#: builtin/describe.c:569
+#: builtin/describe.c:572
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "對於髒工作區,追加 <標記>(預設:\"-dirty\")"
-#: builtin/describe.c:572
+#: builtin/describe.c:575
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "對於損壞的工作區,追加 <標記>(預設:\"-broken\")"
-#: builtin/describe.c:590
+#: builtin/describe.c:593
msgid "--long is incompatible with --abbrev=0"
msgstr "--long 與 --abbrev=0 不相容"
-#: builtin/describe.c:619
+#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "沒有發現名稱,無法描述任何東西。"
-#: builtin/describe.c:670
+#: builtin/describe.c:673
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty 與提交號不相容"
-#: builtin/describe.c:672
+#: builtin/describe.c:675
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken 與提交號不相容"
@@ -13439,9 +13765,9 @@ msgstr "使用 done 功能來終止流"
msgid "Skip output of blob data"
msgstr "跳過資料物件的輸出"
-#: builtin/fast-export.c:1177 builtin/log.c:1705
+#: builtin/fast-export.c:1177 builtin/log.c:1724
msgid "refspec"
-msgstr "引用規格"
+msgstr "參照規格"
#: builtin/fast-export.c:1178
msgid "Apply refspec to exported refs"
@@ -13467,207 +13793,208 @@ msgstr "對帶有標記 ID 的標籤做標記"
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "不能同時傳遞參數 --import-marks 和 --import-marks-if-exists"
-#: builtin/fetch.c:34
+#: builtin/fetch.c:35
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<選項>] [<版本庫> [<引用規格>...]]"
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<選項>] <組>"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<選項>] [(<版本庫> | <組>)...]"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<選項>]"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:117
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel 不能為負數"
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:140 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr "從所有的遠端抓取"
-#: builtin/fetch.c:141 builtin/pull.c:228
+#: builtin/fetch.c:142 builtin/pull.c:245
msgid "set upstream for git pull/fetch"
msgstr "為 git pull/fetch 設定上游"
-#: builtin/fetch.c:143 builtin/pull.c:187
+#: builtin/fetch.c:144 builtin/pull.c:188
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它"
-#: builtin/fetch.c:145 builtin/pull.c:190
+#: builtin/fetch.c:146 builtin/pull.c:191
msgid "path to upload pack on remote end"
msgstr "上傳包到遠端的路徑"
-#: builtin/fetch.c:146
+#: builtin/fetch.c:147
msgid "force overwrite of local reference"
msgstr "強制覆蓋本機引用"
-#: builtin/fetch.c:148
+#: builtin/fetch.c:149
msgid "fetch from multiple remotes"
msgstr "從多個遠端抓取"
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: builtin/fetch.c:151 builtin/pull.c:195
msgid "fetch all tags and associated objects"
msgstr "抓取所有的標籤和關聯物件"
-#: builtin/fetch.c:152
+#: builtin/fetch.c:153
msgid "do not fetch all tags (--no-tags)"
msgstr "不抓取任何標籤(--no-tags)"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
msgid "number of submodules fetched in parallel"
msgstr "子模組取得的並發數"
-#: builtin/fetch.c:156 builtin/pull.c:197
+#: builtin/fetch.c:157 builtin/pull.c:198
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除遠端已經不存在的分支的追蹤分支"
-#: builtin/fetch.c:158
+#: builtin/fetch.c:159
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "清除遠端不存在的本機標籤,並且取代變更標籤"
# 譯者:可選值,不能翻譯
-#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
+#: builtin/fetch.c:160 builtin/fetch.c:183 builtin/pull.c:122
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
msgid "control recursive fetching of submodules"
msgstr "控制子模組的遞迴抓取"
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: builtin/fetch.c:165 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "保持下載包"
-#: builtin/fetch.c:166
+#: builtin/fetch.c:167
msgid "allow updating of HEAD ref"
msgstr "允許更新 HEAD 引用"
-#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
+#: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209
+#: builtin/pull.c:218
msgid "deepen history of shallow clone"
msgstr "深化淺複製的歷史"
-#: builtin/fetch.c:171
+#: builtin/fetch.c:172 builtin/pull.c:212
msgid "deepen history of shallow repository based on time"
msgstr "基於時間來深化淺複製的歷史"
-#: builtin/fetch.c:177 builtin/pull.c:211
+#: builtin/fetch.c:178 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "轉換為一個完整的版本庫"
-#: builtin/fetch.c:180
+#: builtin/fetch.c:181
msgid "prepend this to submodule path output"
msgstr "在子模組路徑輸出的前面加上此目錄"
-#: builtin/fetch.c:183
+#: builtin/fetch.c:184
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "遞迴取得子模組的預設值(比設定檔案優先度低)"
-#: builtin/fetch.c:187 builtin/pull.c:214
+#: builtin/fetch.c:188 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr "接受更新 .git/shallow 的引用"
-#: builtin/fetch.c:188 builtin/pull.c:216
+#: builtin/fetch.c:189 builtin/pull.c:226
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:190 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "指定取得動作的引用映射"
-#: builtin/fetch.c:196
+#: builtin/fetch.c:197 builtin/pull.c:240
msgid "report that we have only objects reachable from this object"
msgstr "報告我們只擁有從該物件開始可以取得的物件"
-#: builtin/fetch.c:199
+#: builtin/fetch.c:200
msgid "run 'gc --auto' after fetching"
msgstr "取得後執行 'gc --auto'"
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:202 builtin/pull.c:243
msgid "check for forced-updates on all updated branches"
msgstr "在所有更新分支上檢查強制更新"
-#: builtin/fetch.c:203
+#: builtin/fetch.c:204
msgid "write the commit-graph after fetching"
msgstr "抓取後寫入分支圖"
-#: builtin/fetch.c:513
+#: builtin/fetch.c:514
msgid "Couldn't find remote ref HEAD"
msgstr "無法發現遠端 HEAD 引用"
-#: builtin/fetch.c:653
+#: builtin/fetch.c:654
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "設定變數 fetch.output 包含無效值 %s"
-#: builtin/fetch.c:751
+#: builtin/fetch.c:752
#, c-format
msgid "object %s not found"
msgstr "物件 %s 未發現"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:756
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857
msgid "[rejected]"
msgstr "[已拒絕]"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:770
msgid "can't fetch in current branch"
msgstr "目前分支下不能執行取得動作"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:780
msgid "[tag update]"
msgstr "[標籤更新]"
-#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
-#: builtin/fetch.c:851
+#: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840
+#: builtin/fetch.c:852
msgid "unable to update local ref"
msgstr "不能更新本機引用"
-#: builtin/fetch.c:784
+#: builtin/fetch.c:785
msgid "would clobber existing tag"
msgstr "會破壞現有的標籤"
-#: builtin/fetch.c:806
+#: builtin/fetch.c:807
msgid "[new tag]"
msgstr "[新標籤]"
-#: builtin/fetch.c:809
+#: builtin/fetch.c:810
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:813
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:852
msgid "forced update"
msgstr "強制更新"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:857
msgid "non-fast-forward"
msgstr "非快轉"
-#: builtin/fetch.c:877
+#: builtin/fetch.c:878
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"
"flag or run 'git config fetch.showForcedUpdates true'."
msgstr ""
-"取得動作通常顯示哪些分支發生了強制更新,但該檢查已被禁用。\n"
+"取得動作通常顯示哪些分支發生了強制更新,但該檢查已被停用。\n"
"要重新啟用,請使用 '--show-forced-updates' 選項或執行\n"
"'git config fetch.showForcedUpdates true'。"
-#: builtin/fetch.c:881
+#: builtin/fetch.c:882
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -13678,22 +14005,22 @@ msgstr ""
"花了 %.2f 秒來檢查強制更新。您可以使用 '--no-show-forced-updates'\n"
"或執行 'git config fetch.showForcedUpdates false' 以避免此項檢查。\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:914
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未傳送所有必需的物件\n"
-#: builtin/fetch.c:941
+#: builtin/fetch.c:935
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "拒絕 %s 因為淺複製不允許被更新"
-#: builtin/fetch.c:1026 builtin/fetch.c:1164
+#: builtin/fetch.c:1020 builtin/fetch.c:1158
#, c-format
msgid "From %.*s\n"
msgstr "來自 %.*s\n"
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1031
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -13703,57 +14030,57 @@ msgstr ""
" 'git remote prune %s' 來刪除舊的、有衝突的分支"
# 譯者:請維持前導空格
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1128
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s 將成為懸空狀態)"
# 譯者:請維持前導空格
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1129
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s 已成為懸空狀態)"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1161
msgid "[deleted]"
msgstr "[已刪除]"
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1162 builtin/remote.c:1112
msgid "(none)"
msgstr "(無)"
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1185
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒絕取得到非純版本庫的目前分支 %s"
-#: builtin/fetch.c:1210
+#: builtin/fetch.c:1204
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "選項 \"%s\" 的值 \"%s\" 對於 %s 是無效的"
-#: builtin/fetch.c:1213
+#: builtin/fetch.c:1207
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "選項 \"%s\" 為 %s 所忽略\n"
-#: builtin/fetch.c:1421
+#: builtin/fetch.c:1415
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "檢測到多分支,和 --set-upstream 不相容"
-#: builtin/fetch.c:1436
+#: builtin/fetch.c:1430
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "沒有為一個遠端追蹤分支設定上游"
-#: builtin/fetch.c:1438
+#: builtin/fetch.c:1432
msgid "not setting upstream for a remote tag"
msgstr "沒有為一個遠端標籤設定上游"
-#: builtin/fetch.c:1440
+#: builtin/fetch.c:1434
msgid "unknown branch type"
msgstr "未知的分支類型"
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1436
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -13761,92 +14088,92 @@ msgstr ""
"未發現源分支。\n"
"您需要使用 --set-upstream 選項指定一個分支。"
-#: builtin/fetch.c:1568 builtin/fetch.c:1631
+#: builtin/fetch.c:1562 builtin/fetch.c:1625
#, c-format
msgid "Fetching %s\n"
msgstr "正在取得 %s\n"
-#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
+#: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "不能取得 %s"
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1584
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "無法取得 '%s'(離開碼:%d)\n"
-#: builtin/fetch.c:1693
+#: builtin/fetch.c:1687
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "未指定遠端版本庫。請透過一個 URL 或遠端版本庫名指定,用以取得新提交。"
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1724
msgid "You need to specify a tag name."
msgstr "您需要指定一個標籤名稱。"
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1773
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen 不支援負數深度"
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1775
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen 和 --depth 是互斥的"
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1780
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 和 --unshallow 不能同時使用"
-#: builtin/fetch.c:1789
+#: builtin/fetch.c:1782
msgid "--unshallow on a complete repository does not make sense"
msgstr "對於一個完整的版本庫,參數 --unshallow 沒有意義"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1798
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能帶一個版本庫參數"
-#: builtin/fetch.c:1807
+#: builtin/fetch.c:1800
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 帶引用規格沒有任何意義"
-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1809
#, c-format
msgid "No such remote or remote group: %s"
msgstr "沒有這樣的遠端或遠端組:%s"
-#: builtin/fetch.c:1823
+#: builtin/fetch.c:1816
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "取得組並指定引用規格沒有意義"
-#: builtin/fetch.c:1841
+#: builtin/fetch.c:1834
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr "只可以將 --filter 用於在 extensions.partialClone 中設定的遠端版本庫"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:7
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr "git fmt-merge-msg [-m <說明>] [--log[=<n>] | --no-log] [--file <檔案>]"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:18
msgid "populate log with at most <n> entries from shortlog"
msgstr "向提交說明中最多複製指定條目(合併而來的提交)的簡短說明"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:21
msgid "alias for --log (deprecated)"
msgstr "參數 --log 的別名(已棄用)"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:24
msgid "text"
msgstr "文字"
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:25
msgid "use <text> as start of message"
msgstr "使用 <文字> 作為提交說明的開始"
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:26
msgid "file to read from"
msgstr "從檔案中讀取"
@@ -13886,7 +14213,7 @@ msgstr "引用占位符適用於 Tcl"
msgid "show only <n> matched refs"
msgstr "只顯示 <n> 個符合的引用"
-#: builtin/for-each-ref.c:39 builtin/tag.c:439
+#: builtin/for-each-ref.c:39 builtin/tag.c:440
msgid "respect format colors"
msgstr "遵照格式中的顏色輸出"
@@ -13910,32 +14237,32 @@ msgstr "只列印包含該提交的引用"
msgid "print only refs which don't contain the commit"
msgstr "只列印不包含該提交的引用"
-#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
+#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149
msgid "unknown"
msgstr "未知"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:100 builtin/fsck.c:120
+#: builtin/fsck.c:101 builtin/fsck.c:121
#, c-format
msgid "error in %s %s: %s"
msgstr "%s %s 錯誤:%s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:114
+#: builtin/fsck.c:115
#, c-format
msgid "warning in %s %s: %s"
msgstr "%s %s 警告:%s"
-#: builtin/fsck.c:143 builtin/fsck.c:146
+#: builtin/fsck.c:144 builtin/fsck.c:147
#, c-format
msgid "broken link from %7s %s"
msgstr "來自 %7s %s 的損壞的連結"
-#: builtin/fsck.c:155
+#: builtin/fsck.c:156
msgid "wrong object type in link"
msgstr "連結中錯誤的物件類型"
-#: builtin/fsck.c:171
+#: builtin/fsck.c:172
#, c-format
msgid ""
"broken link from %7s %s\n"
@@ -13944,211 +14271,211 @@ msgstr ""
"損壞的連結來自於 %7s %s\n"
" 到 %7s %s"
-#: builtin/fsck.c:282
+#: builtin/fsck.c:283
#, c-format
msgid "missing %s %s"
msgstr "缺少 %s %s"
-#: builtin/fsck.c:309
+#: builtin/fsck.c:310
#, c-format
msgid "unreachable %s %s"
msgstr "無法取得 %s %s"
-#: builtin/fsck.c:329
+#: builtin/fsck.c:330
#, c-format
msgid "dangling %s %s"
msgstr "懸空 %s %s"
-#: builtin/fsck.c:339
+#: builtin/fsck.c:340
msgid "could not create lost-found"
msgstr "不能建立 lost-found"
-#: builtin/fsck.c:350
+#: builtin/fsck.c:351
#, c-format
msgid "could not finish '%s'"
msgstr "不能完成 '%s'"
-#: builtin/fsck.c:367
+#: builtin/fsck.c:368
#, c-format
msgid "Checking %s"
msgstr "正在檢查 %s"
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "正在檢查連通性(%d 個物件)"
-#: builtin/fsck.c:424
+#: builtin/fsck.c:425
#, c-format
msgid "Checking %s %s"
msgstr "正在檢查 %s %s"
-#: builtin/fsck.c:429
+#: builtin/fsck.c:430
msgid "broken links"
msgstr "損壞的連結"
-#: builtin/fsck.c:438
+#: builtin/fsck.c:439
#, c-format
msgid "root %s"
msgstr "根 %s"
-#: builtin/fsck.c:446
+#: builtin/fsck.c:447
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr "標記 %s %s (%s) 於 %s"
-#: builtin/fsck.c:475
+#: builtin/fsck.c:476
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s:物件損壞或遺失"
-#: builtin/fsck.c:500
+#: builtin/fsck.c:501
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s:無效的引用日誌條目 %s"
-#: builtin/fsck.c:514
+#: builtin/fsck.c:515
#, c-format
msgid "Checking reflog %s->%s"
msgstr "正在檢查引用日誌 %s->%s"
-#: builtin/fsck.c:548
+#: builtin/fsck.c:549
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s:無效的 sha1 指標 %s"
-#: builtin/fsck.c:555
+#: builtin/fsck.c:556
#, c-format
msgid "%s: not a commit"
msgstr "%s:不是一個提交"
-#: builtin/fsck.c:609
+#: builtin/fsck.c:610
msgid "notice: No default references"
msgstr "注意:無預設引用"
-#: builtin/fsck.c:624
+#: builtin/fsck.c:625
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s:物件損壞或遺失:%s"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:638
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s:不能解析物件:%s"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:658
#, c-format
msgid "bad sha1 file: %s"
msgstr "壞的 sha1 檔案:%s"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:673
msgid "Checking object directory"
msgstr "正在檢查物件目錄"
-#: builtin/fsck.c:675
+#: builtin/fsck.c:676
msgid "Checking object directories"
msgstr "正在檢查物件目錄"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:691
#, c-format
msgid "Checking %s link"
msgstr "正在檢查 %s 連結"
-#: builtin/fsck.c:695 builtin/index-pack.c:843
+#: builtin/fsck.c:696 builtin/index-pack.c:843
#, c-format
msgid "invalid %s"
msgstr "無效的 %s"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:703
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s 指向奇怪的東西(%s)"
-#: builtin/fsck.c:708
+#: builtin/fsck.c:709
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s:分離開頭指標的指向不存在"
-#: builtin/fsck.c:712
+#: builtin/fsck.c:713
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "注意:%s 指向一個尚未誕生的分支(%s)"
-#: builtin/fsck.c:724
+#: builtin/fsck.c:725
msgid "Checking cache tree"
msgstr "正在檢查快取樹"
-#: builtin/fsck.c:729
+#: builtin/fsck.c:730
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s:cache-tree 中無效的 sha1 指標"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
msgid "non-tree in cache-tree"
msgstr "cache-tree 中非樹狀物件"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:770
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<選項>] [<物件>...]"
-#: builtin/fsck.c:775
+#: builtin/fsck.c:776
msgid "show unreachable objects"
msgstr "顯示無法取得的物件"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:777
msgid "show dangling objects"
msgstr "顯示懸空的物件"
-#: builtin/fsck.c:777
+#: builtin/fsck.c:778
msgid "report tags"
msgstr "報告標籤"
-#: builtin/fsck.c:778
+#: builtin/fsck.c:779
msgid "report root nodes"
msgstr "報告根節點"
-#: builtin/fsck.c:779
+#: builtin/fsck.c:780
msgid "make index objects head nodes"
msgstr "將索引亦作為檢查的頭節點"
-#: builtin/fsck.c:780
+#: builtin/fsck.c:781
msgid "make reflogs head nodes (default)"
msgstr "將引用日誌作為檢查的頭節點(預設)"
-#: builtin/fsck.c:781
+#: builtin/fsck.c:782
msgid "also consider packs and alternate objects"
msgstr "也考慮包和備用物件"
-#: builtin/fsck.c:782
+#: builtin/fsck.c:783
msgid "check only connectivity"
msgstr "僅檢查連通性"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
msgid "enable more strict checking"
msgstr "啟用更嚴格的檢查"
-#: builtin/fsck.c:785
+#: builtin/fsck.c:786
msgid "write dangling objects in .git/lost-found"
msgstr "將懸空物件寫入 .git/lost-found 中"
-#: builtin/fsck.c:786 builtin/prune.c:132
+#: builtin/fsck.c:787 builtin/prune.c:134
msgid "show progress"
msgstr "顯示進度"
-#: builtin/fsck.c:787
+#: builtin/fsck.c:788
msgid "show verbose names for reachable objects"
msgstr "顯示可以取得物件的詳細名稱"
-#: builtin/fsck.c:846 builtin/index-pack.c:225
+#: builtin/fsck.c:847 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "正在檢查物件"
-#: builtin/fsck.c:874
+#: builtin/fsck.c:875
#, c-format
msgid "%s: object missing"
msgstr "%s:物件缺少"
-#: builtin/fsck.c:885
+#: builtin/fsck.c:886
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "無效的參數:期望 sha1,得到 '%s'"
@@ -14167,12 +14494,12 @@ msgstr "對 %s 呼叫 fstat 失敗:%s"
msgid "failed to parse '%s' value '%s'"
msgstr "無法解析 '%s' 值 '%s'"
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:475 builtin/init-db.c:57
#, c-format
msgid "cannot stat '%s'"
msgstr "不能對 '%s' 呼叫 stat"
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530
#, c-format
msgid "cannot read '%s'"
msgstr "不能讀取 '%s'"
@@ -14265,259 +14592,259 @@ msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
-#: builtin/pack-objects.c:2854
+#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730
+#: builtin/pack-objects.c:2855
#, c-format
msgid "no threads support, ignoring %s"
msgstr "沒有執行緒支援,忽略 %s"
-#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
+#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640
#, c-format
msgid "unable to read tree (%s)"
msgstr "無法讀取樹(%s)"
-#: builtin/grep.c:633
+#: builtin/grep.c:655
#, c-format
msgid "unable to grep from object of type %s"
msgstr "無法抓取來自於 %s 類型的物件"
-#: builtin/grep.c:704
+#: builtin/grep.c:724
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "開關 `%c' 期望一個數字值"
-#: builtin/grep.c:803
+#: builtin/grep.c:823
msgid "search in index instead of in the work tree"
msgstr "在索引區搜尋而不是在工作區"
-#: builtin/grep.c:805
+#: builtin/grep.c:825
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的內容中尋找"
# 譯者:中文字串拼接,可刪除前導空格
-#: builtin/grep.c:807
+#: builtin/grep.c:827
msgid "search in both tracked and untracked files"
msgstr "在追蹤和未追蹤的檔案中搜尋"
-#: builtin/grep.c:809
+#: builtin/grep.c:829
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的檔案"
-#: builtin/grep.c:811
+#: builtin/grep.c:831
msgid "recursively search in each submodule"
msgstr "在每一個子模組中遞迴搜尋"
-#: builtin/grep.c:814
+#: builtin/grep.c:834
msgid "show non-matching lines"
msgstr "顯示未符合的行"
-#: builtin/grep.c:816
+#: builtin/grep.c:836
msgid "case insensitive matching"
msgstr "不區分大小寫符合"
-#: builtin/grep.c:818
+#: builtin/grep.c:838
msgid "match patterns only at word boundaries"
msgstr "只在單詞邊界符合模式"
-#: builtin/grep.c:820
+#: builtin/grep.c:840
msgid "process binary files as text"
msgstr "把二進位檔案當做文字處理"
-#: builtin/grep.c:822
+#: builtin/grep.c:842
msgid "don't match patterns in binary files"
msgstr "不在二進位檔案中符合模式"
-#: builtin/grep.c:825
+#: builtin/grep.c:845
msgid "process binary files with textconv filters"
msgstr "用 textconv 過濾器處理二進位檔案"
-#: builtin/grep.c:827
+#: builtin/grep.c:847
msgid "search in subdirectories (default)"
msgstr "在子目錄中尋找(預設)"
-#: builtin/grep.c:829
+#: builtin/grep.c:849
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下尋找"
-#: builtin/grep.c:833
+#: builtin/grep.c:853
msgid "use extended POSIX regular expressions"
msgstr "使用擴展的 POSIX 正規表示式"
-#: builtin/grep.c:836
+#: builtin/grep.c:856
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正規表示式(預設)"
-#: builtin/grep.c:839
+#: builtin/grep.c:859
msgid "interpret patterns as fixed strings"
msgstr "把模式解析為固定的字串"
-#: builtin/grep.c:842
+#: builtin/grep.c:862
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 相容的正規表示式"
-#: builtin/grep.c:845
+#: builtin/grep.c:865
msgid "show line numbers"
msgstr "顯示行號"
-#: builtin/grep.c:846
+#: builtin/grep.c:866
msgid "show column number of first match"
msgstr "顯示第一個符合的列號"
-#: builtin/grep.c:847
+#: builtin/grep.c:867
msgid "don't show filenames"
msgstr "不顯示檔案名"
-#: builtin/grep.c:848
+#: builtin/grep.c:868
msgid "show filenames"
msgstr "顯示檔案名"
-#: builtin/grep.c:850
+#: builtin/grep.c:870
msgid "show filenames relative to top directory"
msgstr "顯示相對於頂級目錄的檔案名"
-#: builtin/grep.c:852
+#: builtin/grep.c:872
msgid "show only filenames instead of matching lines"
msgstr "只顯示檔案名而不顯示符合的行"
-#: builtin/grep.c:854
+#: builtin/grep.c:874
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同義"
-#: builtin/grep.c:857
+#: builtin/grep.c:877
msgid "show only the names of files without match"
msgstr "只顯示未符合的檔案名"
-#: builtin/grep.c:859
+#: builtin/grep.c:879
msgid "print NUL after filenames"
msgstr "在檔案名後輸出 NUL 字元"
-#: builtin/grep.c:862
+#: builtin/grep.c:882
msgid "show only matching parts of a line"
msgstr "只顯示行中的符合的部分"
-#: builtin/grep.c:864
+#: builtin/grep.c:884
msgid "show the number of matches instead of matching lines"
msgstr "顯示總符合行數,而不顯示符合的行"
-#: builtin/grep.c:865
+#: builtin/grep.c:885
msgid "highlight matches"
msgstr "高亮顯示符合項"
-#: builtin/grep.c:867
+#: builtin/grep.c:887
msgid "print empty line between matches from different files"
msgstr "在不同檔案的符合項之間列印空行"
-#: builtin/grep.c:869
+#: builtin/grep.c:889
msgid "show filename only once above matches from same file"
msgstr "只在同一檔案的符合項的上面顯示一次檔案名"
-#: builtin/grep.c:872
+#: builtin/grep.c:892
msgid "show <n> context lines before and after matches"
msgstr "顯示符合項前後的 <n> 行上下文"
-#: builtin/grep.c:875
+#: builtin/grep.c:895
msgid "show <n> context lines before matches"
msgstr "顯示符合項前 <n> 行上下文"
-#: builtin/grep.c:877
+#: builtin/grep.c:897
msgid "show <n> context lines after matches"
msgstr "顯示符合項後 <n> 行上下文"
-#: builtin/grep.c:879
+#: builtin/grep.c:899
msgid "use <n> worker threads"
msgstr "使用 <n> 個工作執行緒"
-#: builtin/grep.c:880
+#: builtin/grep.c:900
msgid "shortcut for -C NUM"
msgstr "快捷鍵 -C 數字"
-#: builtin/grep.c:883
+#: builtin/grep.c:903
msgid "show a line with the function name before matches"
msgstr "在符合的前面顯示一行函數名"
-#: builtin/grep.c:885
+#: builtin/grep.c:905
msgid "show the surrounding function"
msgstr "顯示所在函數的前後內容"
-#: builtin/grep.c:888
+#: builtin/grep.c:908
msgid "read patterns from file"
msgstr "從檔案讀取模式"
-#: builtin/grep.c:890
+#: builtin/grep.c:910
msgid "match <pattern>"
msgstr "符合 <模式>"
-#: builtin/grep.c:892
+#: builtin/grep.c:912
msgid "combine patterns specified with -e"
msgstr "組合用 -e 參數設定的模式"
-#: builtin/grep.c:904
+#: builtin/grep.c:924
msgid "indicate hit with exit status without output"
msgstr "不輸出,而用離開碼標記命中狀態"
-#: builtin/grep.c:906
+#: builtin/grep.c:926
msgid "show only matches from files that match all patterns"
msgstr "只顯示符合所有模式的檔案中的符合"
-#: builtin/grep.c:908
+#: builtin/grep.c:928
msgid "show parse tree for grep expression"
msgstr "顯示 grep 表達式的解析樹"
-#: builtin/grep.c:912
+#: builtin/grep.c:932
msgid "pager"
msgstr "分頁"
-#: builtin/grep.c:912
+#: builtin/grep.c:932
msgid "show matching files in the pager"
msgstr "分頁顯示符合的檔案"
-#: builtin/grep.c:916
+#: builtin/grep.c:936
msgid "allow calling of grep(1) (ignored by this build)"
-msgstr "允許呼叫 grep(1)(本次構建忽略)"
+msgstr "允許呼叫 grep(1)(本次組建忽略)"
-#: builtin/grep.c:983
+#: builtin/grep.c:1003
msgid "no pattern given"
msgstr "未提供符合模式"
-#: builtin/grep.c:1019
+#: builtin/grep.c:1039
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 或 --untracked 不能和版本同時使用"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1047
#, c-format
msgid "unable to resolve revision: %s"
msgstr "不能解析版本:%s"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1077
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked 不支援與 --recurse-submodules 一起使用"
-#: builtin/grep.c:1061
+#: builtin/grep.c:1081
msgid "invalid option combination, ignoring --threads"
msgstr "無效的選項組合,忽略 --threads"
-#: builtin/grep.c:1064 builtin/pack-objects.c:3547
+#: builtin/grep.c:1084 builtin/pack-objects.c:3548
msgid "no threads support, ignoring --threads"
msgstr "沒有執行緒支援,忽略 --threads"
-#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
+#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的執行緒數無效(%d)"
-#: builtin/grep.c:1101
+#: builtin/grep.c:1121
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 僅用於工作區"
-#: builtin/grep.c:1127
+#: builtin/grep.c:1147
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached 或 --untracked 不能與 --no-index 同時使用"
-#: builtin/grep.c:1133
+#: builtin/grep.c:1153
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard 不能用於已追蹤內容"
-#: builtin/grep.c:1141
+#: builtin/grep.c:1161
msgid "both --cached and trees are given"
msgstr "同時給出了 --cached 和樹狀物件"
@@ -14558,66 +14885,66 @@ msgstr "允許對任意隨機垃圾資料做散列來建立損壞的物件以便
msgid "process file as it were from this path"
msgstr "處理檔案並假設其來自於此路徑"
-#: builtin/help.c:46
+#: builtin/help.c:47
msgid "print all available commands"
msgstr "列印所有可用的指令"
-#: builtin/help.c:47
+#: builtin/help.c:48
msgid "exclude guides"
msgstr "排除嚮導"
-#: builtin/help.c:48
+#: builtin/help.c:49
msgid "print list of useful guides"
msgstr "顯示有用的指南列表"
-#: builtin/help.c:49
+#: builtin/help.c:50
msgid "print all configuration variable names"
msgstr "列印所有設定變數名稱"
-#: builtin/help.c:51
+#: builtin/help.c:52
msgid "show man page"
msgstr "顯示 man 手冊"
-#: builtin/help.c:52
+#: builtin/help.c:53
msgid "show manual in web browser"
msgstr "在 web 瀏覽器中顯示手冊"
-#: builtin/help.c:54
+#: builtin/help.c:55
msgid "show info page"
msgstr "顯示 info 手冊"
-#: builtin/help.c:56
+#: builtin/help.c:57
msgid "print command description"
msgstr "列印指令描述"
-#: builtin/help.c:61
+#: builtin/help.c:62
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<指令>]"
-#: builtin/help.c:77
+#: builtin/help.c:163
#, c-format
msgid "unrecognized help format '%s'"
-msgstr "未能識別的協助格式 '%s'"
+msgstr "無法識別的協助格式 '%s'"
-#: builtin/help.c:104
+#: builtin/help.c:190
msgid "Failed to start emacsclient."
msgstr "無法啟動 emacsclient。"
-#: builtin/help.c:117
+#: builtin/help.c:203
msgid "Failed to parse emacsclient version."
msgstr "無法解析 emacsclient 版本。"
-#: builtin/help.c:125
+#: builtin/help.c:211
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient 版本 '%d' 太老(< 22)。"
-#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
#, c-format
msgid "failed to exec '%s'"
msgstr "執行 '%s' 失敗"
-#: builtin/help.c:221
+#: builtin/help.c:307
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -14626,7 +14953,7 @@ msgstr ""
"'%s':不支援的 man 手冊檢視器的路徑。\n"
"請使用 'man.<工具>.cmd'。"
-#: builtin/help.c:233
+#: builtin/help.c:319
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -14635,35 +14962,35 @@ msgstr ""
"'%s': 支援的 man 手冊檢視器指令。\n"
"請使用 'man.<工具>.path'。"
-#: builtin/help.c:350
+#: builtin/help.c:436
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s':未知的 man 檢視器。"
-#: builtin/help.c:367
+#: builtin/help.c:453
msgid "no man viewer handled the request"
msgstr "沒有 man 檢視器處理此請求"
-#: builtin/help.c:375
+#: builtin/help.c:461
msgid "no info viewer handled the request"
msgstr "沒有 info 檢視器處理此請求"
-#: builtin/help.c:434 builtin/help.c:445 git.c:336
+#: builtin/help.c:520 builtin/help.c:531 git.c:337
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' 是 '%s' 的別名"
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:534 git.c:367
#, c-format
msgid "bad alias.%s string: %s"
msgstr "壞的 alias.%s 字串:%s"
-#: builtin/help.c:477 builtin/help.c:507
+#: builtin/help.c:563 builtin/help.c:593
#, c-format
msgid "usage: %s%s"
msgstr "用法:%s%s"
-#: builtin/help.c:491
+#: builtin/help.c:577
msgid "'git help config' for more information"
msgstr "'git help config' 取得更多訊息"
@@ -14700,7 +15027,7 @@ msgstr "輸入上的讀錯誤"
msgid "used more bytes than were available"
msgstr "用掉了超過可用的位元組"
-#: builtin/index-pack.c:288 builtin/pack-objects.c:606
+#: builtin/index-pack.c:288 builtin/pack-objects.c:607
msgid "pack too large for current definition of off_t"
msgstr "包太大超過了目前 off_t 的定義"
@@ -14708,6 +15035,11 @@ msgstr "包太大超過了目前 off_t 的定義"
msgid "pack exceeds maximum allowed size"
msgstr "包超過了最大允許值"
+#: builtin/index-pack.c:306 builtin/repack.c:250
+#, c-format
+msgid "unable to create '%s'"
+msgstr "不能建立 '%s'"
+
#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
@@ -14765,8 +15097,8 @@ msgstr "解壓縮嚴重的不一致"
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "發現 %s 出現 SHA1 衝突!"
-#: builtin/index-pack.c:738 builtin/pack-objects.c:158
-#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#: builtin/index-pack.c:738 builtin/pack-objects.c:159
+#: builtin/pack-objects.c:219 builtin/pack-objects.c:314
#, c-format
msgid "unable to read %s"
msgstr "不能讀 %s"
@@ -14827,7 +15159,7 @@ msgstr "parse_pack_objects() 中遇到不可理喻的問題"
msgid "Resolving deltas"
msgstr "處理 delta 中"
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616
#, c-format
msgid "unable to create thread: %s"
msgstr "不能建立執行緒:%s"
@@ -14858,167 +15190,176 @@ msgstr[0] "包有 %d 個未解決的 delta"
msgid "unable to deflate appended object (%d)"
msgstr "不能壓縮附加物件(%d)"
-#: builtin/index-pack.c:1392
+#: builtin/index-pack.c:1391
#, c-format
msgid "local object %s is corrupt"
msgstr "本機物件 %s 已損壞"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1405
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "packfile 名稱 '%s' 沒有以 '.pack' 結尾"
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1430
#, c-format
msgid "cannot write %s file '%s'"
msgstr "無法寫入 %s 檔案 '%s'"
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1438
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "無法關閉已寫入的 %s 檔案 '%s'"
-#: builtin/index-pack.c:1463
+#: builtin/index-pack.c:1462
msgid "error while closing pack file"
msgstr "關閉包檔案時發生錯誤"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1476
msgid "cannot store pack file"
msgstr "無法儲存包檔案"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1484
msgid "cannot store index file"
msgstr "無法儲存索引檔案"
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "壞的 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1596
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "無法開啟現存包檔案 '%s'"
-#: builtin/index-pack.c:1599
+#: builtin/index-pack.c:1598
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "無法為 %s 開啟包索引檔案"
-#: builtin/index-pack.c:1647
+#: builtin/index-pack.c:1646
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "非 delta:%d 個物件"
-#: builtin/index-pack.c:1654
+#: builtin/index-pack.c:1653
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "鏈長 = %d: %lu 物件"
-#: builtin/index-pack.c:1693
+#: builtin/index-pack.c:1692
msgid "Cannot come back to cwd"
msgstr "無法返回目前工作目錄"
-#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
-#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
+#: builtin/index-pack.c:1741 builtin/index-pack.c:1744
+#: builtin/index-pack.c:1760 builtin/index-pack.c:1764
#, c-format
msgid "bad %s"
msgstr "錯誤選項 %s"
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1780
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 不能和 --stdin 同時使用"
-#: builtin/index-pack.c:1783
+#: builtin/index-pack.c:1782
msgid "--stdin requires a git repository"
msgstr "--stdin 需要一個 git 版本庫"
-#: builtin/index-pack.c:1789
+#: builtin/index-pack.c:1788
msgid "--verify with no packfile name given"
msgstr "--verify 沒有提供 packfile 名稱參數"
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1836 builtin/unpack-objects.c:582
msgid "fsck error in pack objects"
msgstr "在打包物件中 fsck 檢查發生錯誤"
-#: builtin/init-db.c:61
+#: builtin/init-db.c:63
#, c-format
msgid "cannot stat template '%s'"
msgstr "不能對範本 '%s' 呼叫 stat"
-#: builtin/init-db.c:66
+#: builtin/init-db.c:68
#, c-format
msgid "cannot opendir '%s'"
msgstr "不能開啟目錄 '%s'"
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
#, c-format
msgid "cannot readlink '%s'"
msgstr "不能讀取連結 '%s'"
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "不能自 '%s' 到 '%s' 建立符號連結"
-#: builtin/init-db.c:86
+#: builtin/init-db.c:88
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "不能複製 '%s' 至 '%s'"
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
#, c-format
msgid "ignoring template %s"
msgstr "忽略範本 %s"
-#: builtin/init-db.c:121
+#: builtin/init-db.c:123
#, c-format
msgid "templates not found in %s"
msgstr "沒有在 %s 中找到範本"
-#: builtin/init-db.c:136
+#: builtin/init-db.c:138
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "沒有從 '%s' 複製範本:%s"
-#: builtin/init-db.c:334
+#: builtin/init-db.c:356
#, c-format
msgid "unable to handle file type %d"
msgstr "不能處理 %d 類型的檔案"
-#: builtin/init-db.c:337
+#: builtin/init-db.c:359
#, c-format
msgid "unable to move %s to %s"
msgstr "不能移動 %s 至 %s"
-#: builtin/init-db.c:354 builtin/init-db.c:357
+#: builtin/init-db.c:374
+msgid "attempt to reinitialize repository with different hash"
+msgstr "嘗試以不同的雜湊值重新初始化版本庫"
+
+#: builtin/init-db.c:380 builtin/init-db.c:601
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "未知的「%s」雜湊算法"
+
+#: builtin/init-db.c:397 builtin/init-db.c:400
#, c-format
msgid "%s already exists"
msgstr "%s 已經存在"
-#: builtin/init-db.c:413
+#: builtin/init-db.c:458
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "重新初始化已存在的共享 Git 版本庫於 %s%s\n"
-#: builtin/init-db.c:414
+#: builtin/init-db.c:459
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "重新初始化已存在的 Git 版本庫於 %s%s\n"
-#: builtin/init-db.c:418
+#: builtin/init-db.c:463
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "已初始化空的共享 Git 版本庫於 %s%s\n"
-#: builtin/init-db.c:419
+#: builtin/init-db.c:464
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "已初始化空的 Git 版本庫於 %s%s\n"
-#: builtin/init-db.c:468
+#: builtin/init-db.c:513
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -15026,32 +15367,40 @@ msgstr ""
"git init [-q | --quiet] [--bare] [--template=<範本目錄>] [--shared[=<權限>]] "
"[<目錄>]"
-#: builtin/init-db.c:491
+#: builtin/init-db.c:538
msgid "permissions"
msgstr "權限"
-#: builtin/init-db.c:492
+#: builtin/init-db.c:539
msgid "specify that the git repository is to be shared amongst several users"
msgstr "指定 git 版本庫是多個使用者之間共享的"
-#: builtin/init-db.c:529 builtin/init-db.c:534
+#: builtin/init-db.c:544
+msgid "hash"
+msgstr "雜湊"
+
+#: builtin/init-db.c:545
+msgid "specify the hash algorithm to use"
+msgstr "指定要使用的雜湊算法"
+
+#: builtin/init-db.c:578 builtin/init-db.c:583
#, c-format
msgid "cannot mkdir %s"
msgstr "不能建立目錄 %s"
-#: builtin/init-db.c:538
+#: builtin/init-db.c:587
#, c-format
msgid "cannot chdir to %s"
msgstr "不能切換目錄到 %s"
-#: builtin/init-db.c:559
+#: builtin/init-db.c:614
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr "不允許 %s(或 --work-tree=<目錄>)而沒有指定 %s(或 --git-dir=<目錄>)"
-#: builtin/init-db.c:587
+#: builtin/init-db.c:642
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "不能存取工作區 '%s'"
@@ -15120,126 +15469,126 @@ msgstr "--trailer 和 --only-input 同時使用沒有意義"
msgid "no input file given for in-place editing"
msgstr "沒有給出要原位編輯的檔案"
-#: builtin/log.c:56
+#: builtin/log.c:57
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<選項>] [<版本範圍>] [[--] <路徑>...]"
-#: builtin/log.c:57
+#: builtin/log.c:58
msgid "git show [<options>] <object>..."
msgstr "git show [<選項>] <物件>..."
-#: builtin/log.c:110
+#: builtin/log.c:111
#, c-format
msgid "invalid --decorate option: %s"
msgstr "無效的 --decorate 選項:%s"
-#: builtin/log.c:174
+#: builtin/log.c:178
msgid "show source"
msgstr "顯示源"
-#: builtin/log.c:175
+#: builtin/log.c:179
msgid "Use mail map file"
msgstr "使用信件映射檔案"
-#: builtin/log.c:177
+#: builtin/log.c:182
msgid "only decorate refs that match <pattern>"
msgstr "只修飾與 <模式> 符合的引用"
-#: builtin/log.c:179
+#: builtin/log.c:184
msgid "do not decorate refs that match <pattern>"
msgstr "不修飾和 <模式> 符合的引用"
-#: builtin/log.c:180
+#: builtin/log.c:185
msgid "decorate options"
msgstr "修飾選項"
-#: builtin/log.c:183
+#: builtin/log.c:188
msgid "Process line range n,m in file, counting from 1"
msgstr "處理檔案中第 n 到 m 之間的行,從 1 開始"
-#: builtin/log.c:281
+#: builtin/log.c:298
#, c-format
msgid "Final output: %d %s\n"
msgstr "最終輸出:%d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:556
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 損壞的檔案"
-#: builtin/log.c:550 builtin/log.c:645
+#: builtin/log.c:571 builtin/log.c:666
#, c-format
msgid "could not read object %s"
msgstr "不能讀取物件 %s"
-#: builtin/log.c:670
+#: builtin/log.c:691
#, c-format
msgid "unknown type: %d"
msgstr "未知類型:%d"
-#: builtin/log.c:814
+#: builtin/log.c:835
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s:從描述產生附函的模式無效"
-#: builtin/log.c:821
+#: builtin/log.c:842
msgid "format.headers without value"
msgstr "format.headers 沒有值"
-#: builtin/log.c:936
+#: builtin/log.c:957
msgid "name of output directory is too long"
msgstr "輸出目錄名太長"
-#: builtin/log.c:952
+#: builtin/log.c:973
#, c-format
msgid "cannot open patch file %s"
msgstr "無法開啟修補檔案 %s"
-#: builtin/log.c:969
+#: builtin/log.c:990
msgid "need exactly one range"
msgstr "只需要一個範圍"
-#: builtin/log.c:979
+#: builtin/log.c:1000
msgid "not a range"
msgstr "不是一個範圍"
-#: builtin/log.c:1143
+#: builtin/log.c:1164
msgid "cover letter needs email format"
msgstr "附函需要信件位址格式"
-#: builtin/log.c:1149
+#: builtin/log.c:1170
msgid "failed to create cover-letter file"
msgstr "無法建立附函檔案"
-#: builtin/log.c:1228
+#: builtin/log.c:1249
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to:%s"
-#: builtin/log.c:1255
+#: builtin/log.c:1276
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<選項>] [<從> | <版本範圍>]"
-#: builtin/log.c:1313
+#: builtin/log.c:1334
msgid "two output directories?"
msgstr "兩個輸出目錄?"
-#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
+#: builtin/log.c:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231
#, c-format
msgid "unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1455 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' 解析為一個有效引用"
-#: builtin/log.c:1439
+#: builtin/log.c:1460
msgid "could not find exact merge base"
msgstr "不能找到準確的合併基礎"
-#: builtin/log.c:1443
+#: builtin/log.c:1464
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"
@@ -15249,381 +15598,381 @@ msgstr ""
"git branch --set-upstream-to 來追蹤一個遠端分支。或者你可以透過\n"
"參數 --base=<基礎提交> 手動指定一個基礎提交"
-#: builtin/log.c:1463
+#: builtin/log.c:1484
msgid "failed to find exact merge base"
msgstr "無法找到準確的合併基礎"
-#: builtin/log.c:1474
+#: builtin/log.c:1495
msgid "base commit should be the ancestor of revision list"
msgstr "基礎提交應該是版本列表的祖先"
-#: builtin/log.c:1478
+#: builtin/log.c:1499
msgid "base commit shouldn't be in revision list"
msgstr "基礎提交不應該出現在版本列表中"
-#: builtin/log.c:1531
+#: builtin/log.c:1552
msgid "cannot get patch id"
msgstr "無法得到修補檔 id"
-#: builtin/log.c:1583
+#: builtin/log.c:1604
msgid "failed to infer range-diff ranges"
msgstr "無法推斷 range-diff 範圍"
-#: builtin/log.c:1629
+#: builtin/log.c:1650
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m],即使只有一個修補檔"
-#: builtin/log.c:1632
+#: builtin/log.c:1653
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH],即使有多個修補檔"
-#: builtin/log.c:1636
+#: builtin/log.c:1657
msgid "print patches to standard out"
msgstr "列印修補檔到標準輸出"
-#: builtin/log.c:1638
+#: builtin/log.c:1659
msgid "generate a cover letter"
msgstr "生成一封附函"
-#: builtin/log.c:1640
+#: builtin/log.c:1661
msgid "use simple number sequence for output file names"
msgstr "使用簡單的數字序列作為輸出檔案名"
-#: builtin/log.c:1641
+#: builtin/log.c:1662
msgid "sfx"
msgstr "後綴"
-#: builtin/log.c:1642
+#: builtin/log.c:1663
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <後綴> 代替 '.patch'"
-#: builtin/log.c:1644
+#: builtin/log.c:1665
msgid "start numbering patches at <n> instead of 1"
msgstr "修補檔以 <n> 開始編號,而不是1"
-#: builtin/log.c:1646
+#: builtin/log.c:1667
msgid "mark the series as Nth re-roll"
msgstr "標記修補檔系列是第幾次重製"
-#: builtin/log.c:1648
+#: builtin/log.c:1669
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "使用 [RFC PATCH] 代替 [PATCH]"
-#: builtin/log.c:1651
+#: builtin/log.c:1672
msgid "cover-from-description-mode"
msgstr "從描述產生附函的模式"
-#: builtin/log.c:1652
+#: builtin/log.c:1673
msgid "generate parts of a cover letter based on a branch's description"
msgstr "基於分支描述產生部分附函"
-#: builtin/log.c:1654
+#: builtin/log.c:1675
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前綴>] 代替 [PATCH]"
-#: builtin/log.c:1657
+#: builtin/log.c:1678
msgid "store resulting files in <dir>"
msgstr "把結果檔案儲存在 <目錄>"
-#: builtin/log.c:1660
+#: builtin/log.c:1681
msgid "don't strip/add [PATCH]"
msgstr "不刪除/新增 [PATCH]"
-#: builtin/log.c:1663
+#: builtin/log.c:1684
msgid "don't output binary diffs"
msgstr "不輸出二進位差異"
-#: builtin/log.c:1665
+#: builtin/log.c:1686
msgid "output all-zero hash in From header"
msgstr "在 From 標頭訊息中輸出全為零的雜湊值"
-#: builtin/log.c:1667
+#: builtin/log.c:1688
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的修補檔"
-#: builtin/log.c:1669
+#: builtin/log.c:1690
msgid "show patch format instead of default (patch + stat)"
msgstr "顯示純修補檔格式而非預設的(修補檔+狀態)"
-#: builtin/log.c:1671
+#: builtin/log.c:1692
msgid "Messaging"
msgstr "信件傳送"
-#: builtin/log.c:1672
+#: builtin/log.c:1693
msgid "header"
msgstr "header"
-#: builtin/log.c:1673
+#: builtin/log.c:1694
msgid "add email header"
msgstr "新增信件頭"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1695 builtin/log.c:1696
msgid "email"
msgstr "信件位址"
-#: builtin/log.c:1674
+#: builtin/log.c:1695
msgid "add To: header"
msgstr "新增收件人"
-#: builtin/log.c:1676
+#: builtin/log.c:1696
msgid "add Cc: header"
msgstr "新增抄送"
-#: builtin/log.c:1678
+#: builtin/log.c:1697
msgid "ident"
msgstr "標記"
-#: builtin/log.c:1679
+#: builtin/log.c:1698
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "將 From 位址設定為 <標記>(如若不提供,則用提交者 ID 做為位址)"
-#: builtin/log.c:1681
+#: builtin/log.c:1700
msgid "message-id"
msgstr "信件標記"
-#: builtin/log.c:1682
+#: builtin/log.c:1701
msgid "make first mail a reply to <message-id>"
msgstr "使第一封信件作為對 <信件標記> 的回覆"
-#: builtin/log.c:1683 builtin/log.c:1686
+#: builtin/log.c:1702 builtin/log.c:1705
msgid "boundary"
msgstr "邊界"
-#: builtin/log.c:1684
+#: builtin/log.c:1703
msgid "attach the patch"
msgstr "附件方式新增修補檔"
-#: builtin/log.c:1687
+#: builtin/log.c:1706
msgid "inline the patch"
msgstr "內聯顯示修補檔"
-#: builtin/log.c:1691
+#: builtin/log.c:1710
msgid "enable message threading, styles: shallow, deep"
msgstr "啟用信件線索,風格:淺,深"
-#: builtin/log.c:1693
+#: builtin/log.c:1712
msgid "signature"
msgstr "簽名"
-#: builtin/log.c:1694
+#: builtin/log.c:1713
msgid "add a signature"
msgstr "新增一個簽名"
-#: builtin/log.c:1695
+#: builtin/log.c:1714
msgid "base-commit"
msgstr "基礎提交"
-#: builtin/log.c:1696
+#: builtin/log.c:1715
msgid "add prerequisite tree info to the patch series"
msgstr "為修補檔列表新增前置樹訊息"
-#: builtin/log.c:1698
+#: builtin/log.c:1717
msgid "add a signature from a file"
msgstr "從檔案新增一個簽名"
-#: builtin/log.c:1699
+#: builtin/log.c:1718
msgid "don't print the patch filenames"
msgstr "不要列印修補檔檔案名"
-#: builtin/log.c:1701
+#: builtin/log.c:1720
msgid "show progress while generating patches"
msgstr "在生成修補檔時顯示進度"
-#: builtin/log.c:1703
+#: builtin/log.c:1722
msgid "show changes against <rev> in cover letter or single patch"
msgstr "在附函或單個修補檔中顯示和 <rev> 的差異"
-#: builtin/log.c:1706
+#: builtin/log.c:1725
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異"
-#: builtin/log.c:1708
+#: builtin/log.c:1727
msgid "percentage by which creation is weighted"
msgstr "建立權重的百分比"
-#: builtin/log.c:1792
+#: builtin/log.c:1812
#, c-format
msgid "invalid ident line: %s"
msgstr "包含無效的身份標記:%s"
-#: builtin/log.c:1807
+#: builtin/log.c:1827
msgid "-n and -k are mutually exclusive"
msgstr "-n 和 -k 互斥"
-#: builtin/log.c:1809
+#: builtin/log.c:1829
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc 和 -k 互斥"
-#: builtin/log.c:1817
+#: builtin/log.c:1837
msgid "--name-only does not make sense"
msgstr "--name-only 無意義"
-#: builtin/log.c:1819
+#: builtin/log.c:1839
msgid "--name-status does not make sense"
msgstr "--name-status 無意義"
-#: builtin/log.c:1821
+#: builtin/log.c:1841
msgid "--check does not make sense"
msgstr "--check 無意義"
-#: builtin/log.c:1854
+#: builtin/log.c:1874
msgid "standard output, or directory, which one?"
msgstr "標準輸出或目錄,哪一個?"
-#: builtin/log.c:1958
+#: builtin/log.c:1978
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff 需要 --cover-letter 或單一修補檔"
-#: builtin/log.c:1962
+#: builtin/log.c:1982
msgid "Interdiff:"
msgstr "版本間差異:"
-#: builtin/log.c:1963
+#: builtin/log.c:1983
#, c-format
msgid "Interdiff against v%d:"
msgstr "對 v%d 的版本差異:"
-#: builtin/log.c:1969
+#: builtin/log.c:1989
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor 需要 --range-diff"
-#: builtin/log.c:1973
+#: builtin/log.c:1993
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff 需要 --cover-letter 或單一修補檔"
-#: builtin/log.c:1981
+#: builtin/log.c:2001
msgid "Range-diff:"
msgstr "範圍差異:"
-#: builtin/log.c:1982
+#: builtin/log.c:2002
#, c-format
msgid "Range-diff against v%d:"
msgstr "對 v%d 的範圍差異:"
-#: builtin/log.c:1993
+#: builtin/log.c:2013
#, c-format
msgid "unable to read signature file '%s'"
msgstr "無法讀取簽名檔案 '%s'"
-#: builtin/log.c:2029
+#: builtin/log.c:2049
msgid "Generating patches"
msgstr "生成修補檔"
-#: builtin/log.c:2073
+#: builtin/log.c:2093
msgid "failed to create output files"
msgstr "無法建立輸出檔案"
-#: builtin/log.c:2132
+#: builtin/log.c:2152
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<頭> [<限制>]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2206
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到追蹤的遠端分支,請手動指定 <上游>。\n"
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:471
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<選項>] [<檔案>...]"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:527
msgid "identify the file status with tags"
msgstr "用標籤標記檔案的狀態"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:529
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小寫字母表示 '假設未改變的' 檔案"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:531
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "使用小寫字母表示 'fsmonitor clean' 檔案"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:533
msgid "show cached files in the output (default)"
msgstr "顯示快取的檔案(預設)"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:535
msgid "show deleted files in the output"
msgstr "顯示已刪除的檔案"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:537
msgid "show modified files in the output"
msgstr "顯示已修改的檔案"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:539
msgid "show other files in the output"
msgstr "顯示其它檔案"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:541
msgid "show ignored files in the output"
msgstr "顯示忽略的檔案"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:544
msgid "show staged contents' object name in the output"
msgstr "顯示暫存區內容的物件名稱"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:546
msgid "show files on the filesystem that need to be removed"
msgstr "顯示檔案系統需要刪除的檔案"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:548
msgid "show 'other' directories' names only"
msgstr "只顯示「其他」目錄的名稱"
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:550
msgid "show line endings of files"
msgstr "顯示檔案換行符號格式"
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:552
msgid "don't show empty directories"
msgstr "不顯示空目錄"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:555
msgid "show unmerged files in the output"
msgstr "顯示未合併的檔案"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:557
msgid "show resolve-undo information"
msgstr "顯示 resolve-undo 訊息"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:559
msgid "skip files matching pattern"
msgstr "符合排除檔案的模式"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:562
msgid "exclude patterns are read from <file>"
msgstr "從 <檔案> 中讀取排除模式"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:565
msgid "read additional per-directory exclude patterns in <file>"
msgstr "從 <檔案> 讀取額外的每個目錄的排除模式"
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:567
msgid "add the standard git exclusions"
msgstr "新增標準的 git 排除"
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:571
msgid "make the output relative to the project top directory"
msgstr "顯示相對於頂級目錄的檔案名"
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:574
msgid "recurse through submodules"
msgstr "在子模組中遞迴"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:576
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <檔案> 都不在索引區,視為錯誤"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
msgid "tree-ish"
msgstr "樹或提交"
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:578
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假裝自從 <樹或提交> 之後刪除的路徑仍然存在"
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:580
msgid "show debugging data"
msgstr "顯示除錯資料"
@@ -15641,7 +15990,7 @@ msgstr ""
msgid "do not print remote URL"
msgstr "不列印遠端 URL"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384
msgid "exec"
msgstr "exec"
@@ -15714,191 +16063,301 @@ msgstr "列出整個樹;不僅僅目前目錄(隱含 --full-name)"
msgid "empty mbox: '%s'"
msgstr "空的 mbox:'%s'"
-#: builtin/merge.c:55
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <提交> <提交>..."
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <提交>..."
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <提交>..."
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <提交> <提交>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <引用> [<提交>]"
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+msgstr "輸出所有共同的祖先"
+
+#: builtin/merge-base.c:145
+msgid "find ancestors for a single n-way merge"
+msgstr "尋找一個多路合併的祖先提交"
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+msgstr "顯示不能被其他存取到的版本"
+
+#: builtin/merge-base.c:149
+msgid "is the first one ancestor of the other?"
+msgstr "第一個是其他的祖先提交嗎?"
+
+#: builtin/merge-base.c:151
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "根據 <引用> 的引用日誌尋找 <提交> 的衍生處"
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<選項>] [-L <檔案1> [-L <初始> [-L <名字2>]]] <檔案1> <初始文"
+"件> <檔案2>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "將結果傳送到標準輸出"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "使用基於 diff3 的合併"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "如果衝突,使用我們的版本"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "如果衝突,使用他們的版本"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "如果衝突,使用聯合版本"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "如果衝突,使用指定長度的標記"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "不要警告衝突"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "為 檔案1/初始檔案/檔案2 設定標籤"
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "未知選項 %s"
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "不能解析物件 '%s'"
+
+#: builtin/merge-recursive.c:57
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] "無法處理 %d 條以上的基礎。忽略 %s。"
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr "不能處理兩個頭合併之外的任何動作。"
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "無法解析引用 '%s'"
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "合併 %s 和 %s\n"
+
+#: builtin/merge.c:56
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<選項>] [<提交>...]"
-#: builtin/merge.c:56
+#: builtin/merge.c:57
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:57
+#: builtin/merge.c:58
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:119
+#: builtin/merge.c:121
msgid "switch `m' requires a value"
msgstr "開關 `m' 需要一個值"
-#: builtin/merge.c:142
+#: builtin/merge.c:144
#, c-format
msgid "option `%s' requires a value"
msgstr "選項 `%s' 需要一個值"
-#: builtin/merge.c:188
+#: builtin/merge.c:190
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "不能找到合併策略 '%s'。\n"
-#: builtin/merge.c:189
+#: builtin/merge.c:191
#, c-format
msgid "Available strategies are:"
msgstr "可用的策略有:"
-#: builtin/merge.c:194
+#: builtin/merge.c:196
#, c-format
msgid "Available custom strategies are:"
msgstr "可用的自訂策略有:"
-#: builtin/merge.c:245 builtin/pull.c:132
+#: builtin/merge.c:247 builtin/pull.c:133
msgid "do not show a diffstat at the end of the merge"
msgstr "在合併的最後不顯示差異統計"
-#: builtin/merge.c:248 builtin/pull.c:135
+#: builtin/merge.c:250 builtin/pull.c:136
msgid "show a diffstat at the end of the merge"
msgstr "在合併的最後顯示差異統計"
-#: builtin/merge.c:249 builtin/pull.c:138
+#: builtin/merge.c:251 builtin/pull.c:139
msgid "(synonym to --stat)"
msgstr "(和 --stat 同義)"
-#: builtin/merge.c:251 builtin/pull.c:141
+#: builtin/merge.c:253 builtin/pull.c:142
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合併提交訊息中新增(最多 <n> 條)精簡提交記錄"
-#: builtin/merge.c:254 builtin/pull.c:147
+#: builtin/merge.c:256 builtin/pull.c:148
msgid "create a single commit instead of doing a merge"
msgstr "建立一個單獨的提交而不是做一次合併"
-#: builtin/merge.c:256 builtin/pull.c:150
+#: builtin/merge.c:258 builtin/pull.c:151
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果合併成功,執行一次提交(預設)"
-#: builtin/merge.c:258 builtin/pull.c:153
+#: builtin/merge.c:260 builtin/pull.c:154
msgid "edit message before committing"
msgstr "在提交前編輯提交說明"
-#: builtin/merge.c:260
+#: builtin/merge.c:262
msgid "allow fast-forward (default)"
msgstr "允許快轉(預設)"
-#: builtin/merge.c:262 builtin/pull.c:160
+#: builtin/merge.c:264 builtin/pull.c:161
msgid "abort if fast-forward is not possible"
msgstr "如果不能快轉就放棄合併"
-#: builtin/merge.c:266 builtin/pull.c:163
+#: builtin/merge.c:268 builtin/pull.c:164
msgid "verify that the named commit has a valid GPG signature"
msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名"
-#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
-#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
+#: builtin/merge.c:269 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114
msgid "strategy"
msgstr "策略"
-#: builtin/merge.c:268 builtin/pull.c:168
+#: builtin/merge.c:270 builtin/pull.c:169
msgid "merge strategy to use"
msgstr "要使用的合併策略"
-#: builtin/merge.c:269 builtin/pull.c:171
+#: builtin/merge.c:271 builtin/pull.c:172
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:270 builtin/pull.c:172
+#: builtin/merge.c:272 builtin/pull.c:173
msgid "option for selected merge strategy"
msgstr "所選的合併策略的選項"
-#: builtin/merge.c:272
+#: builtin/merge.c:274
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "合併的提交說明(針對非快轉式合併)"
-#: builtin/merge.c:279
+#: builtin/merge.c:281
msgid "abort the current in-progress merge"
msgstr "放棄目前正在進行的合併"
#
-#: builtin/merge.c:281
+#: builtin/merge.c:283
msgid "--abort but leave index and working tree alone"
msgstr "--abort,但是保留索引和工作區"
-#: builtin/merge.c:283
+#: builtin/merge.c:285
msgid "continue the current in-progress merge"
msgstr "繼續目前正在進行的合併"
-#: builtin/merge.c:285 builtin/pull.c:179
+#: builtin/merge.c:287 builtin/pull.c:180
msgid "allow merging unrelated histories"
msgstr "允許合並不相關的歷史"
-#: builtin/merge.c:291
+#: builtin/merge.c:294
msgid "bypass pre-merge-commit and commit-msg hooks"
msgstr "繞過 pre-merge-commit 和 commit-msg 掛鉤"
-#: builtin/merge.c:308
+#: builtin/merge.c:311
msgid "could not run stash."
msgstr "不能執行儲藏。"
-#: builtin/merge.c:313
+#: builtin/merge.c:316
msgid "stash failed"
msgstr "儲藏失敗"
-#: builtin/merge.c:318
+#: builtin/merge.c:321
#, c-format
msgid "not a valid object: %s"
msgstr "不是一個有效物件:%s"
-#: builtin/merge.c:340 builtin/merge.c:357
+#: builtin/merge.c:343 builtin/merge.c:360
msgid "read-tree failed"
msgstr "讀取樹失敗"
# 譯者:請維持前導空格
-#: builtin/merge.c:387
+#: builtin/merge.c:390
msgid " (nothing to squash)"
msgstr " (無可壓縮)"
-#: builtin/merge.c:398
+#: builtin/merge.c:401
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "壓縮提交 -- 未更新 HEAD\n"
-#: builtin/merge.c:448
+#: builtin/merge.c:451
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "無合併訊息 -- 未更新 HEAD\n"
-#: builtin/merge.c:499
+#: builtin/merge.c:502
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' 沒有指向一個提交"
-#: builtin/merge.c:586
+#: builtin/merge.c:589
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "壞的 branch.%s.mergeoptions 字串:%s"
-#: builtin/merge.c:708
+#: builtin/merge.c:716
msgid "Not handling anything other than two heads merge."
msgstr "未處理兩個頭合併之外的任何動作。"
-#: builtin/merge.c:722
+#: builtin/merge.c:730
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursive 的未知選項:-X%s"
-#: builtin/merge.c:737
+#: builtin/merge.c:745
#, c-format
msgid "unable to write %s"
msgstr "不能寫 %s"
-#: builtin/merge.c:789
+#: builtin/merge.c:797
#, c-format
msgid "Could not read from '%s'"
msgstr "不能從 '%s' 讀取"
-#: builtin/merge.c:798
+#: builtin/merge.c:806
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未提交合並,使用 'git commit' 完成此次合併。\n"
-#: builtin/merge.c:804
+#: builtin/merge.c:812
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"
@@ -15908,83 +16367,83 @@ msgstr ""
"合併到主題分支。\n"
"\n"
-#: builtin/merge.c:809
+#: builtin/merge.c:817
msgid "An empty message aborts the commit.\n"
msgstr "空的提交說明會終止提交。\n"
-#: builtin/merge.c:812
+#: builtin/merge.c:820
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr "以 '%c' 開始的行將被忽略,而空的提交說明將終止提交。\n"
-#: builtin/merge.c:865
+#: builtin/merge.c:873
msgid "Empty commit message."
msgstr "空提交訊息。"
-#: builtin/merge.c:880
+#: builtin/merge.c:888
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
-#: builtin/merge.c:941
+#: builtin/merge.c:949
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自動合併失敗,修正衝突然後提交修正的結果。\n"
-#: builtin/merge.c:980
+#: builtin/merge.c:988
msgid "No current branch."
msgstr "沒有目前分支。"
-#: builtin/merge.c:982
+#: builtin/merge.c:990
msgid "No remote for the current branch."
msgstr "目前分支沒有對應的遠端版本庫。"
-#: builtin/merge.c:984
+#: builtin/merge.c:992
msgid "No default upstream defined for the current branch."
msgstr "目前分支沒有定義預設的上游分支。"
-#: builtin/merge.c:989
+#: builtin/merge.c:997
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支"
-#: builtin/merge.c:1046
+#: builtin/merge.c:1054
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'"
-#: builtin/merge.c:1149
+#: builtin/merge.c:1157
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "不能在 %s 中合併:%s"
-#: builtin/merge.c:1183
+#: builtin/merge.c:1191
msgid "not something we can merge"
msgstr "不能合併"
-#: builtin/merge.c:1286
+#: builtin/merge.c:1295
msgid "--abort expects no arguments"
msgstr "--abort 不帶參數"
-#: builtin/merge.c:1290
+#: builtin/merge.c:1299
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "沒有要終止的合併(MERGE_HEAD 遺失)。"
-#: builtin/merge.c:1299
+#: builtin/merge.c:1317
msgid "--quit expects no arguments"
msgstr "--quit 不帶參數"
-#: builtin/merge.c:1312
+#: builtin/merge.c:1330
msgid "--continue expects no arguments"
msgstr "--continue 不帶參數"
-#: builtin/merge.c:1316
+#: builtin/merge.c:1334
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "沒有進行中的合併(MERGE_HEAD 遺失)。"
-#: builtin/merge.c:1332
+#: builtin/merge.c:1350
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -15992,7 +16451,7 @@ msgstr ""
"您尚未結束您的合併(存在 MERGE_HEAD)。\n"
"請在合併前先提交您的修改。"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1357
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -16000,210 +16459,100 @@ msgstr ""
"您尚未結束您的揀選(存在 CHERRY_PICK_HEAD)。\n"
"請在合併前先提交您的修改。"
-#: builtin/merge.c:1342
+#: builtin/merge.c:1360
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未結束您的揀選(存在 CHERRY_PICK_HEAD)。"
-#: builtin/merge.c:1356
+#: builtin/merge.c:1374
msgid "You cannot combine --squash with --no-ff."
msgstr "您不能將 --squash 和 --no-ff 組合使用。"
-#: builtin/merge.c:1358
+#: builtin/merge.c:1376
msgid "You cannot combine --squash with --commit."
msgstr "您不能將 --squash 和 --commit 組合使用。"
-#: builtin/merge.c:1374
+#: builtin/merge.c:1392
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交並且 merge.defaultToUpstream 未設定。"
-#: builtin/merge.c:1391
+#: builtin/merge.c:1409
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支援到空分支的壓縮提交"
-#: builtin/merge.c:1393
+#: builtin/merge.c:1411
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快轉式提交沒有意義"
-#: builtin/merge.c:1398
+#: builtin/merge.c:1416
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合併"
-#: builtin/merge.c:1400
+#: builtin/merge.c:1418
msgid "Can merge only exactly one commit into empty head"
msgstr "只能將一個提交合並到空分支上"
-#: builtin/merge.c:1481
+#: builtin/merge.c:1499
msgid "refusing to merge unrelated histories"
msgstr "拒絕合併無關的歷史"
-#: builtin/merge.c:1490
+#: builtin/merge.c:1508
msgid "Already up to date."
msgstr "已經是最新的。"
-#: builtin/merge.c:1500
+#: builtin/merge.c:1518
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1542
+#: builtin/merge.c:1564
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "嘗試非常小的索引內合併...\n"
-#: builtin/merge.c:1549
+#: builtin/merge.c:1571
#, c-format
msgid "Nope.\n"
msgstr "無。\n"
-#: builtin/merge.c:1574
+#: builtin/merge.c:1596
msgid "Already up to date. Yeeah!"
msgstr "已經是最新的。耶!"
-#: builtin/merge.c:1580
+#: builtin/merge.c:1602
msgid "Not possible to fast-forward, aborting."
msgstr "無法快轉,終止。"
-#: builtin/merge.c:1603 builtin/merge.c:1668
+#: builtin/merge.c:1630 builtin/merge.c:1695
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "將樹回滾至原始狀態...\n"
-#: builtin/merge.c:1607
+#: builtin/merge.c:1634
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "嘗試合併策略 %s...\n"
-#: builtin/merge.c:1659
+#: builtin/merge.c:1686
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "沒有合併策略處理此合併。\n"
-#: builtin/merge.c:1661
+#: builtin/merge.c:1688
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合併失敗。\n"
-#: builtin/merge.c:1670
+#: builtin/merge.c:1697
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以準備手動解決。\n"
-#: builtin/merge.c:1682
+#: builtin/merge.c:1711
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自動合併進展順利,按要求在提交前停止\n"
-#: builtin/merge-base.c:32
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <提交> <提交>..."
-
-#: builtin/merge-base.c:33
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <提交>..."
-
-#: builtin/merge-base.c:34
-msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <提交>..."
-
-#: builtin/merge-base.c:35
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <提交> <提交>"
-
-#: builtin/merge-base.c:36
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <引用> [<提交>]"
-
-#: builtin/merge-base.c:153
-msgid "output all common ancestors"
-msgstr "輸出所有共同的祖先"
-
-#: builtin/merge-base.c:155
-msgid "find ancestors for a single n-way merge"
-msgstr "尋找一個多路合併的祖先提交"
-
-#: builtin/merge-base.c:157
-msgid "list revs not reachable from others"
-msgstr "顯示不能被其他存取到的版本"
-
-#: builtin/merge-base.c:159
-msgid "is the first one ancestor of the other?"
-msgstr "第一個是其他的祖先提交嗎?"
-
-#: builtin/merge-base.c:161
-msgid "find where <commit> forked from reflog of <ref>"
-msgstr "根據 <引用> 的引用日誌尋找 <提交> 的衍生處"
-
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
-msgstr ""
-"git merge-file [<選項>] [-L <檔案1> [-L <初始> [-L <名字2>]]] <檔案1> <初始文"
-"件> <檔案2>"
-
-#: builtin/merge-file.c:35
-msgid "send results to standard output"
-msgstr "將結果傳送到標準輸出"
-
-#: builtin/merge-file.c:36
-msgid "use a diff3 based merge"
-msgstr "使用基於 diff3 的合併"
-
-#: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
-msgstr "如果衝突,使用我們的版本"
-
-#: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
-msgstr "如果衝突,使用他們的版本"
-
-#: builtin/merge-file.c:41
-msgid "for conflicts, use a union version"
-msgstr "如果衝突,使用聯合版本"
-
-#: builtin/merge-file.c:44
-msgid "for conflicts, use this marker size"
-msgstr "如果衝突,使用指定長度的標記"
-
-#: builtin/merge-file.c:45
-msgid "do not warn about conflicts"
-msgstr "不要警告衝突"
-
-#: builtin/merge-file.c:47
-msgid "set labels for file1/orig-file/file2"
-msgstr "為 檔案1/初始檔案/檔案2 設定標籤"
-
-#: builtin/merge-recursive.c:47
-#, c-format
-msgid "unknown option %s"
-msgstr "未知選項 %s"
-
-#: builtin/merge-recursive.c:53
-#, c-format
-msgid "could not parse object '%s'"
-msgstr "不能解析物件 '%s'"
-
-#: builtin/merge-recursive.c:57
-#, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "無法處理 %d 條以上的基礎。忽略 %s。"
-
-#: builtin/merge-recursive.c:65
-msgid "not handling anything other than two heads merge."
-msgstr "不能處理兩個頭合併之外的任何動作。"
-
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
-#, c-format
-msgid "could not resolve ref '%s'"
-msgstr "無法解析引用 '%s'"
-
-#: builtin/merge-recursive.c:82
-#, c-format
-msgid "Merging %s with %s\n"
-msgstr "合併 %s 和 %s\n"
-
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -16238,7 +16587,7 @@ msgid ""
"larger than this size"
msgstr "在 repack 期間,將較小尺寸的包檔案收集到大於此大小的批次中"
-#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25
msgid "too many arguments"
msgstr "太多參數"
@@ -16338,7 +16687,7 @@ msgstr "%s,源=%s,目標=%s"
msgid "Renaming %s to %s\n"
msgstr "重新命名 %s 至 %s\n"
-#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520
#, c-format
msgid "renaming '%s' failed"
msgstr "重新命名 '%s' 失敗"
@@ -16527,7 +16876,7 @@ msgstr "不能寫註解物件"
msgid "the note contents have been left in %s"
msgstr "註解內容被留在 %s 中"
-#: builtin/notes.c:242 builtin/tag.c:532
+#: builtin/notes.c:242 builtin/tag.c:533
#, c-format
msgid "could not open or read '%s'"
msgstr "不能開啟或讀取 '%s'"
@@ -16752,7 +17101,7 @@ msgstr ""
"自動合併說明失敗。修改 %s 中的衝突並且使用指令 'git notes merge --commit' 提"
"交結果,或者使用指令 'git notes merge --abort' 終止合併。\n"
-#: builtin/notes.c:897 builtin/tag.c:545
+#: builtin/notes.c:897 builtin/tag.c:546
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "無法解析 '%s' 為一個有效引用。"
@@ -16770,7 +17119,7 @@ msgstr "嘗試刪除不存在的註解不是一個錯誤"
msgid "read object names from the standard input"
msgstr "從標準輸入讀取物件名稱"
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:164
msgid "do not remove, show only"
msgstr "不刪除,只顯示"
@@ -16786,116 +17135,116 @@ msgstr "註解引用"
msgid "use notes from <notes-ref>"
msgstr "從 <註解引用> 使用註解"
-#: builtin/notes.c:1034 builtin/stash.c:1643
+#: builtin/notes.c:1034 builtin/stash.c:1608
#, c-format
msgid "unknown subcommand: %s"
msgstr "未知子指令:%s"
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:53
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr "git pack-objects --stdout [<選項>...] [< <引用列表> | < <物件列表>]"
-#: builtin/pack-objects.c:53
+#: builtin/pack-objects.c:54
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr "git pack-objects [<選項>...] <前綴名稱> [< <引用列表> | < <物件列表>]"
-#: builtin/pack-objects.c:430
+#: builtin/pack-objects.c:431
#, c-format
msgid "bad packed object CRC for %s"
msgstr "%s 錯的包物件 CRC"
-#: builtin/pack-objects.c:441
+#: builtin/pack-objects.c:442
#, c-format
msgid "corrupt packed object for %s"
msgstr "%s 損壞的包物件"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:573
#, c-format
msgid "recursive delta detected for object %s"
msgstr "發現物件 %s 遞迴 delta"
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:784
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "排序了 %u 個物件,預期 %<PRIu32> 個"
-#: builtin/pack-objects.c:972
+#: builtin/pack-objects.c:973
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
-msgstr "禁用 bitmap 寫入,因為 pack.packSizeLimit 設定使得包被切分為多個"
+msgstr "停用 bitmap 寫入,因為 pack.packSizeLimit 設定使得包被切分為多個"
-#: builtin/pack-objects.c:985
+#: builtin/pack-objects.c:986
msgid "Writing objects"
msgstr "寫入物件中"
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: builtin/pack-objects.c:1047 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "對 %s 呼叫 stat 失敗"
-#: builtin/pack-objects.c:1099
+#: builtin/pack-objects.c:1100
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "寫入 %<PRIu32> 個物件而預期 %<PRIu32> 個"
-#: builtin/pack-objects.c:1297
+#: builtin/pack-objects.c:1298
msgid "disabling bitmap writing, as some objects are not being packed"
-msgstr "禁用 bitmap 寫入,因為一些物件將不會被打包"
+msgstr "停用 bitmap 寫入,因為一些物件將不會被打包"
-#: builtin/pack-objects.c:1724
+#: builtin/pack-objects.c:1725
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "%s 壓縮中 delta 基準位移越界"
-#: builtin/pack-objects.c:1733
+#: builtin/pack-objects.c:1734
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "%s 的 delta 基準位移越界"
-#: builtin/pack-objects.c:2004
+#: builtin/pack-objects.c:2005
msgid "Counting objects"
msgstr "物件計數中"
-#: builtin/pack-objects.c:2149
+#: builtin/pack-objects.c:2150
#, c-format
msgid "unable to parse object header of %s"
msgstr "無法解析物件 %s 標頭訊息"
-#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
-#: builtin/pack-objects.c:2245
+#: builtin/pack-objects.c:2220 builtin/pack-objects.c:2236
+#: builtin/pack-objects.c:2246
#, c-format
msgid "object %s cannot be read"
msgstr "物件 %s 無法讀取"
-#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
+#: builtin/pack-objects.c:2223 builtin/pack-objects.c:2250
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "物件 %s 不一致的物件長度(%<PRIuMAX> vs %<PRIuMAX>)"
-#: builtin/pack-objects.c:2259
+#: builtin/pack-objects.c:2260
msgid "suboptimal pack - out of memory"
msgstr "次優(suboptimal)打包 - 記憶體不足"
-#: builtin/pack-objects.c:2574
+#: builtin/pack-objects.c:2575
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "使用 %d 個執行緒進行壓縮"
-#: builtin/pack-objects.c:2713
+#: builtin/pack-objects.c:2714
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "無法為標籤 %s 壓縮物件"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2802
msgid "Compressing objects"
msgstr "壓縮物件中"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2808
msgid "inconsistency with delta count"
msgstr "不一致的差異計數"
-#: builtin/pack-objects.c:2888
+#: builtin/pack-objects.c:2889
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -16904,7 +17253,7 @@ msgstr ""
"預期邊界物件(edge object)ID,卻得到垃圾資料:\n"
" %s"
-#: builtin/pack-objects.c:2894
+#: builtin/pack-objects.c:2895
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -16913,226 +17262,226 @@ msgstr ""
"預期物件 ID,卻得到垃圾資料:\n"
" %s"
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:2993
msgid "invalid value for --missing"
msgstr "選項 --missing 的值無效"
-#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
+#: builtin/pack-objects.c:3052 builtin/pack-objects.c:3160
msgid "cannot open pack index"
msgstr "無法開啟包檔案索引"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3083
#, c-format
msgid "loose object at %s could not be examined"
msgstr "無法檢查 %s 處的鬆散物件"
-#: builtin/pack-objects.c:3167
+#: builtin/pack-objects.c:3168
msgid "unable to force loose object"
msgstr "無法強制鬆散物件"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3261
#, c-format
msgid "not a rev '%s'"
msgstr "不是一個版本 '%s'"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3264
#, c-format
msgid "bad revision '%s'"
msgstr "壞的版本 '%s'"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3289
msgid "unable to add recent objects"
msgstr "無法新增最近的物件"
-#: builtin/pack-objects.c:3341
+#: builtin/pack-objects.c:3342
#, c-format
msgid "unsupported index version %s"
msgstr "不支援的索引版本 %s"
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3346
#, c-format
msgid "bad index version '%s'"
msgstr "壞的索引版本 '%s'"
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3384
msgid "<version>[,<offset>]"
msgstr "<版本>[,<位移>]"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3385
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本來寫包索引檔案"
-#: builtin/pack-objects.c:3387
+#: builtin/pack-objects.c:3388
msgid "maximum size of each output pack file"
msgstr "每個輸出包的最大尺寸"
-#: builtin/pack-objects.c:3389
+#: builtin/pack-objects.c:3390
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略從備用物件儲存裡借用物件"
-#: builtin/pack-objects.c:3391
+#: builtin/pack-objects.c:3392
msgid "ignore packed objects"
msgstr "忽略包物件"
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3394
msgid "limit pack window by objects"
msgstr "限制打包視窗的物件數"
-#: builtin/pack-objects.c:3395
+#: builtin/pack-objects.c:3396
msgid "limit pack window by memory in addition to object limit"
msgstr "除物件數量限制外設定打包視窗的記憶體限制"
-#: builtin/pack-objects.c:3397
+#: builtin/pack-objects.c:3398
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允許的 delta 鏈的最大長度"
-#: builtin/pack-objects.c:3399
+#: builtin/pack-objects.c:3400
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3402
msgid "reuse existing objects"
msgstr "重用已存在的物件"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3404
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 物件"
-#: builtin/pack-objects.c:3405
+#: builtin/pack-objects.c:3406
msgid "use threads when searching for best delta matches"
msgstr "使用執行緒查詢最佳 delta 符合"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3408
msgid "do not create an empty pack output"
msgstr "不建立空的包輸出"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3410
msgid "read revision arguments from standard input"
msgstr "從標準輸入讀取版本號參數"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3412
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的物件"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3415
msgid "include objects reachable from any reference"
msgstr "包括可以從任何引用存取到的物件"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3418
msgid "include objects referred by reflog entries"
msgstr "包括被引用日誌引用到的物件"
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3421
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的物件"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3424
msgid "output pack to stdout"
msgstr "輸出包到標準輸出"
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3426
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包物件的標籤物件"
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3428
msgid "keep unreachable objects"
msgstr "維持無法取得的物件"
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3430
msgid "pack loose unreachable objects"
msgstr "打包鬆散的無法取得物件"
-#: builtin/pack-objects.c:3431
+#: builtin/pack-objects.c:3432
msgid "unpack unreachable objects newer than <time>"
msgstr "將比提供 <時間> 新的無法存取的物件解包"
-#: builtin/pack-objects.c:3434
+#: builtin/pack-objects.c:3435
msgid "use the sparse reachability algorithm"
msgstr "使用稀疏可以取得性演算法"
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3437
msgid "create thin packs"
msgstr "建立精簡包"
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3439
msgid "create packs suitable for shallow fetches"
msgstr "建立適合淺複製版本庫取得的包"
-#: builtin/pack-objects.c:3440
+#: builtin/pack-objects.c:3441
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 檔案的包"
-#: builtin/pack-objects.c:3442
+#: builtin/pack-objects.c:3443
msgid "ignore this pack"
msgstr "忽略該 pack"
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3445
msgid "pack compression level"
msgstr "打包壓縮級別"
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3447
msgid "do not hide commits by grafts"
msgstr "顯示被移植隱藏的提交"
-#: builtin/pack-objects.c:3448
+#: builtin/pack-objects.c:3449
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引(如果有的話)以提高物件計數時的速度"
-#: builtin/pack-objects.c:3450
+#: builtin/pack-objects.c:3451
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同時建立 bitmap 索引"
-#: builtin/pack-objects.c:3454
+#: builtin/pack-objects.c:3455
msgid "write a bitmap index if possible"
msgstr "如果可能,寫 bitmap 索引"
-#: builtin/pack-objects.c:3458
+#: builtin/pack-objects.c:3459
msgid "handling for missing objects"
msgstr "處理遺失的物件"
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3462
msgid "do not pack objects in promisor packfiles"
msgstr "不要打包 promisor packfile 中的物件"
-#: builtin/pack-objects.c:3463
+#: builtin/pack-objects.c:3464
msgid "respect islands during delta compression"
msgstr "在增量壓縮時參考資料島"
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3493
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "增量鏈深度 %d 太深了,強制為 %d"
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3498
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "設定 pack.deltaCacheLimit 太高了,強制為 %d"
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3552
msgid "--max-pack-size cannot be used to build a pack for transfer"
-msgstr "不能使用 --max-pack-size 來構建傳輸用的包檔案"
+msgstr "不能使用 --max-pack-size 來組建傳輸用的包檔案"
-#: builtin/pack-objects.c:3553
+#: builtin/pack-objects.c:3554
msgid "minimum pack size limit is 1 MiB"
msgstr "最小的包檔案大小是 1 MiB"
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3559
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin 不能用於建立一個可索引包"
-#: builtin/pack-objects.c:3561
+#: builtin/pack-objects.c:3562
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable 和 --unpack-unreachable 不相容"
-#: builtin/pack-objects.c:3567
+#: builtin/pack-objects.c:3568
msgid "cannot use --filter without --stdout"
msgstr "不能在沒有 --stdout 的情況下使用 --filter"
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3628
msgid "Enumerating objects"
msgstr "枚舉物件"
-#: builtin/pack-objects.c:3657
+#: builtin/pack-objects.c:3658
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17153,31 +17502,27 @@ msgstr "打包一切"
msgid "prune loose refs (default)"
msgstr "清除鬆散的引用(預設)"
-#: builtin/prune-packed.c:9
+#: builtin/prune-packed.c:6
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/prune-packed.c:42
-msgid "Removing duplicate objects"
-msgstr "正在刪除重複物件"
-
-#: builtin/prune.c:12
+#: builtin/prune.c:14
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <時間>] [--] [<head>...]"
-#: builtin/prune.c:131
+#: builtin/prune.c:133
msgid "report pruned objects"
msgstr "報告清除的物件"
-#: builtin/prune.c:134
+#: builtin/prune.c:136
msgid "expire objects older than <time>"
msgstr "使早於提供時間的物件過期"
-#: builtin/prune.c:136
+#: builtin/prune.c:138
msgid "limit traversal to objects outside promisor packfiles"
msgstr "限制遍歷 promisor packfile 以外的物件"
-#: builtin/prune.c:150
+#: builtin/prune.c:152
msgid "cannot prune in a precious-objects repo"
msgstr "不能在珍品版本庫中執行清理動作"
@@ -17190,61 +17535,90 @@ msgstr "%s 的值無效:%s"
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<選項>] [<版本庫> [<引用規格>...]]"
-#: builtin/pull.c:122
+#: builtin/pull.c:123
msgid "control for recursive fetching of submodules"
msgstr "控制子模組的遞迴取得"
-#: builtin/pull.c:126
+#: builtin/pull.c:127
msgid "Options related to merging"
msgstr "和合併相關的選項"
-#: builtin/pull.c:129
+#: builtin/pull.c:130
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用重定基底動作取代合併動作以套用修改"
-#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:478 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "允許快轉式"
-#: builtin/pull.c:166
-msgid "automatically stash/stash pop before and after rebase"
-msgstr "重定基底動作前後執行自動儲藏和彈出儲藏"
+#: builtin/pull.c:167 parse-options.h:339
+msgid "automatically stash/stash pop before and after"
+msgstr "在動作前後執行自動儲藏和彈出儲藏"
-#: builtin/pull.c:182
+#: builtin/pull.c:183
msgid "Options related to fetching"
msgstr "和取得相關的參數"
-#: builtin/pull.c:192
+#: builtin/pull.c:193
msgid "force overwrite of local branch"
msgstr "強制覆蓋本機分支"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "number of submodules pulled in parallel"
msgstr "並發拉取的子模組的數量"
-#: builtin/pull.c:300
+#: builtin/pull.c:317
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff 的取值無效:%s"
-#: builtin/pull.c:426
+#: builtin/pull.c:349
+msgid ""
+"Pulling without specifying how to reconcile divergent branches is\n"
+"discouraged. You can squelch this message by running one of the following\n"
+"commands sometime before your next pull:\n"
+"\n"
+" git config pull.rebase false # merge (the default strategy)\n"
+" git config pull.rebase true # rebase\n"
+" git config pull.ff only # fast-forward only\n"
+"\n"
+"You can replace \"git config\" with \"git config --global\" to set a "
+"default\n"
+"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
+"or --ff-only on the command line to override the configured default per\n"
+"invocation.\n"
+msgstr ""
+"不建議在尚未指定偏離分支的合併策略的情況下拉取。\n"
+"您可以在下一次呼叫 pull 命令前執行下述命令\n"
+"以隱藏此訊息:\n"
+"\n"
+" git config pull.rebase false # 合併(預設策略)\n"
+" git config pull.rebase true # 重定基底\n"
+" git config pull.ff only # 只快進\n"
+"\n"
+"您可以將「git config」改成「git config --global」以設定\n"
+"所有版本庫的預設偏好設定。也可以每次在命令列呼叫\n"
+"pull 命令時傳遞 --rebase、--no-rebase 或 --ff-only 覆蓋\n"
+"設定的預設值。\n"
+
+#: builtin/pull.c:459
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "在您剛剛取得到的引用中沒有重定基底動作的候選。"
-#: builtin/pull.c:428
+#: builtin/pull.c:461
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "在您剛剛取得到的引用中沒有合併動作的候選。"
-#: builtin/pull.c:429
+#: builtin/pull.c:462
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "通常這意味著您提供了一萬用字元引用規格但未能和遠端符合。"
-#: builtin/pull.c:432
+#: builtin/pull.c:465
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -17254,42 +17628,42 @@ msgstr ""
"您要求從遠端 '%s' 拉取,但是未指定一個分支。因為這不是目前\n"
"分支預設的遠端版本庫,您必須在指令列中指定一個分支名。"
-#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
+#: builtin/pull.c:470 builtin/rebase.c:1234 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "您目前不在一個分支上。"
-#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+#: builtin/pull.c:472 builtin/pull.c:487 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "請指定您要重定基底到哪一個分支。"
-#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+#: builtin/pull.c:474 builtin/pull.c:489 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "請指定您要合併哪一個分支。"
-#: builtin/pull.c:442 builtin/pull.c:457
+#: builtin/pull.c:475 builtin/pull.c:490
msgid "See git-pull(1) for details."
msgstr "詳見 git-pull(1)。"
-#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
-#: builtin/rebase.c:1415 git-parse-remote.sh:64
+#: builtin/pull.c:477 builtin/pull.c:483 builtin/pull.c:492
+#: builtin/rebase.c:1240 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<遠端>"
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
+#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<分支>"
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c:485 builtin/rebase.c:1232 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "目前分支沒有追蹤訊息。"
-#: builtin/pull.c:461 git-parse-remote.sh:95
+#: builtin/pull.c:494 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "如果您想要為此分支建立追蹤訊息,您可以執行:"
-#: builtin/pull.c:466
+#: builtin/pull.c:499
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -17298,32 +17672,28 @@ msgstr ""
"您的設定中指定要合併遠端的引用 '%s',\n"
"但是沒有取得到這個引用。"
-#: builtin/pull.c:576
+#: builtin/pull.c:610
#, c-format
msgid "unable to access commit %s"
msgstr "無法存取提交 %s"
-#: builtin/pull.c:857
+#: builtin/pull.c:895
msgid "ignoring --verify-signatures for rebase"
msgstr "為重定基底動作忽略 --verify-signatures"
-#: builtin/pull.c:912
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "--[no-]autostash 選項只在使用 --rebase 時有效。"
-
-#: builtin/pull.c:920
+#: builtin/pull.c:955
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未誕生的分支,變更新增至索引。"
-#: builtin/pull.c:924
+#: builtin/pull.c:959
msgid "pull with rebase"
msgstr "重定基底式拉取"
-#: builtin/pull.c:925
+#: builtin/pull.c:960
msgid "please commit or stash them."
msgstr "請提交或儲藏它們。"
-#: builtin/pull.c:950
+#: builtin/pull.c:985
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -17333,7 +17703,7 @@ msgstr ""
"fetch 更新了目前的分支。快轉您的工作區\n"
"至提交 %s。"
-#: builtin/pull.c:956
+#: builtin/pull.c:991
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -17350,15 +17720,15 @@ msgstr ""
"$ git reset --hard\n"
"復原之前的狀態。"
-#: builtin/pull.c:971
+#: builtin/pull.c:1006
msgid "Cannot merge multiple branches into empty head."
msgstr "無法將多個分支合併到空分支。"
-#: builtin/pull.c:975
+#: builtin/pull.c:1010
msgid "Cannot rebase onto multiple branches."
msgstr "無法重定基底到多個分支。"
-#: builtin/pull.c:982
+#: builtin/pull.c:1018
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "本機子模組中有修改,無法重定基底"
@@ -17472,7 +17842,7 @@ msgid ""
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"更新被拒絕,因為推送的一個分支的最新提交落後於其對應的遠端分支。\n"
-"簽出該分支並整合遠端變更(如 'git pull ...'),然後再推送。詳見\n"
+"檢出該分支並整合遠端變更(如 'git pull ...'),然後再推送。詳見\n"
"'git push --help' 中的 'Note about fast-forwards' 小節。"
#: builtin/push.c:289
@@ -17501,12 +17871,12 @@ msgstr ""
"如果不使用 '--force' 參數,您不能更新一個指向非提交物件的遠端引用,\n"
"也不能更新遠端引用讓其指向一個非提交物件。\n"
-#: builtin/push.c:360
+#: builtin/push.c:361
#, c-format
msgid "Pushing to %s\n"
msgstr "推送到 %s\n"
-#: builtin/push.c:367
+#: builtin/push.c:368
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "推送一些引用到 '%s' 失敗"
@@ -17535,65 +17905,65 @@ msgstr "推送標籤(不能使用 --all or --mirror)"
msgid "force updates"
msgstr "強制更新"
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:551 builtin/send-pack.c:179
msgid "<refname>:<expect>"
msgstr "<引用名>:<期望值>"
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:552 builtin/send-pack.c:180
msgid "require old value of ref to be at this value"
msgstr "要求引用舊的取值為設定值"
-#: builtin/push.c:556
+#: builtin/push.c:555
msgid "control recursive pushing of submodules"
msgstr "控制子模組的遞迴推送"
-#: builtin/push.c:558 builtin/send-pack.c:175
+#: builtin/push.c:556 builtin/send-pack.c:174
msgid "use thin pack"
msgstr "使用精簡打包"
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
+#: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "接收包程式"
-#: builtin/push.c:561
+#: builtin/push.c:559
msgid "set upstream for git pull/status"
msgstr "設定 git pull/status 的上游"
-#: builtin/push.c:564
+#: builtin/push.c:562
msgid "prune locally removed refs"
msgstr "清除本機刪除的引用"
-#: builtin/push.c:566
+#: builtin/push.c:564
msgid "bypass pre-push hook"
msgstr "繞過 pre-push 掛鉤"
-#: builtin/push.c:567
+#: builtin/push.c:565
msgid "push missing but relevant tags"
msgstr "推送缺少但有關的標籤"
-#: builtin/push.c:570 builtin/send-pack.c:169
+#: builtin/push.c:567 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr "用 GPG 為推送簽名"
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:569 builtin/send-pack.c:175
msgid "request atomic transaction on remote side"
msgstr "需要遠端支援原子事務"
-#: builtin/push.c:590
+#: builtin/push.c:587
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete 與 --all、--mirror 及 --tags 不相容"
-#: builtin/push.c:592
+#: builtin/push.c:589
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用沒有意義"
-#: builtin/push.c:612
+#: builtin/push.c:609
#, c-format
msgid "bad repository '%s'"
msgstr "壞的版本庫 '%s'"
-#: builtin/push.c:613
+#: builtin/push.c:610
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -17614,27 +17984,27 @@ msgstr ""
"\n"
" git push <名稱>\n"
-#: builtin/push.c:628
+#: builtin/push.c:625
msgid "--all and --tags are incompatible"
msgstr "--all 和 --tags 不相容"
-#: builtin/push.c:630
+#: builtin/push.c:627
msgid "--all can't be combined with refspecs"
msgstr "--all 不能和引用規格同時使用"
-#: builtin/push.c:634
+#: builtin/push.c:631
msgid "--mirror and --tags are incompatible"
msgstr "--mirror 和 --tags 不相容"
-#: builtin/push.c:636
+#: builtin/push.c:633
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror 不能和引用規格同時使用"
-#: builtin/push.c:639
+#: builtin/push.c:636
msgid "--all and --mirror are incompatible"
msgstr "--all 和 --mirror 不相容"
-#: builtin/push.c:643
+#: builtin/push.c:640
msgid "push options must not have new line characters"
msgstr "推送選項不能有換行符號"
@@ -17747,7 +18117,7 @@ msgstr "不更新索引區和工作區"
#: builtin/read-tree.c:151
msgid "skip applying sparse checkout filter"
-msgstr "跳過應用稀疏簽出過濾器"
+msgstr "跳過應用稀疏檢出過濾器"
#: builtin/read-tree.c:153
msgid "debug unpack-trees"
@@ -17761,7 +18131,7 @@ msgstr "抑制回饋訊息"
msgid "You need to resolve your current index first"
msgstr "您需要先解決目前索引的衝突"
-#: builtin/rebase.c:32
+#: builtin/rebase.c:35
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -17769,217 +18139,203 @@ msgstr ""
"git rebase [-i] [options] [--exec <指令>] [--onto <新基礎> | --keep-base] [<"
"上游> [<分支>]]"
-#: builtin/rebase.c:34
+#: builtin/rebase.c:37
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
"git rebase [-i] [選項] [--exec <指令>] [--onto <新基礎>] --root [<分支>]"
-#: builtin/rebase.c:36
+#: builtin/rebase.c:39
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
-#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
+#: builtin/rebase.c:181 builtin/rebase.c:205 builtin/rebase.c:232
#, c-format
msgid "unusable todo list: '%s'"
msgstr "不可用的待辦列表:'%s'"
-#: builtin/rebase.c:292
+#: builtin/rebase.c:298
#, c-format
msgid "could not create temporary %s"
msgstr "無法建立暫時的 %s"
-#: builtin/rebase.c:298
+#: builtin/rebase.c:304
msgid "could not mark as interactive"
msgstr "無法標記為互動式"
-#: builtin/rebase.c:352
+#: builtin/rebase.c:358
msgid "could not generate todo list"
msgstr "無法生成待辦列表"
-#: builtin/rebase.c:391
+#: builtin/rebase.c:399
msgid "a base commit must be provided with --upstream or --onto"
msgstr "使用 --upstream 或 --onto 必須提供一個基礎提交"
-#: builtin/rebase.c:461
+#: builtin/rebase.c:468
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [<選項>]"
-#: builtin/rebase.c:474 builtin/rebase.c:1550
-msgid "(DEPRECATED) keep empty commits"
-msgstr "(棄用) 保持空提交"
+#: builtin/rebase.c:481 builtin/rebase.c:1374
+msgid "keep commits which start empty"
+msgstr "保留開頭是空白的提交"
-#: builtin/rebase.c:478 builtin/revert.c:128
+#: builtin/rebase.c:485 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "允許提交說明為空"
-#: builtin/rebase.c:480
+#: builtin/rebase.c:487
msgid "rebase merge commits"
msgstr "對合併提交重定基底"
-#: builtin/rebase.c:482
+#: builtin/rebase.c:489
msgid "keep original branch points of cousins"
msgstr "保持兄弟提交的原始分支點"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:491
msgid "move commits that begin with squash!/fixup!"
msgstr "移動以 squash!/fixup! 開頭的提交"
-#: builtin/rebase.c:485
+#: builtin/rebase.c:492
msgid "sign commits"
msgstr "簽名提交"
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:494 builtin/rebase.c:1314
msgid "display a diffstat of what changed upstream"
msgstr "顯示上游變化的差異統計"
-#: builtin/rebase.c:489
+#: builtin/rebase.c:496
msgid "continue rebase"
msgstr "繼續重定基底"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:498
msgid "skip commit"
msgstr "跳過提交"
-#: builtin/rebase.c:492
+#: builtin/rebase.c:499
msgid "edit the todo list"
msgstr "重定基底待辦列表"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:501
msgid "show the current patch"
msgstr "顯示目前修補檔"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:504
msgid "shorten commit ids in the todo list"
msgstr "縮短待辦列表中的提交號"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:506
msgid "expand commit ids in the todo list"
msgstr "擴展待辦列表中的提交號"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:508
msgid "check the todo list"
msgstr "檢查待辦列表"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:510
msgid "rearrange fixup/squash lines"
msgstr "重新排列 fixup/squash 行"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:512
msgid "insert exec commands in todo list"
msgstr "在待辦列表中插入 exec 執行指令"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:513
msgid "onto"
msgstr "onto"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:516
msgid "restrict-revision"
msgstr "restrict-revision"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:516
msgid "restrict revision"
msgstr "限制版本"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:518
msgid "squash-onto"
msgstr "squash-onto"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:519
msgid "squash onto"
msgstr "squash onto"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:521
msgid "the upstream commit"
msgstr "上游提交"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:523
msgid "head-name"
msgstr "head-name"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:523
msgid "head name"
msgstr "head 名稱"
-#: builtin/rebase.c:521
+#: builtin/rebase.c:528
msgid "rebase strategy"
msgstr "重定基底策略"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:529
msgid "strategy-opts"
msgstr "strategy-opts"
-#: builtin/rebase.c:523
+#: builtin/rebase.c:530
msgid "strategy options"
msgstr "策略選項"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:531
msgid "switch-to"
msgstr "切換到"
-#: builtin/rebase.c:525
+#: builtin/rebase.c:532
msgid "the branch or commit to checkout"
-msgstr "要簽出的分支或提交"
+msgstr "要檢出的分支或提交"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:533
msgid "onto-name"
msgstr "onto-name"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:533
msgid "onto name"
msgstr "onto name"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:534
msgid "cmd"
msgstr "cmd"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:534
msgid "the command to run"
msgstr "要執行的指令"
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:537 builtin/rebase.c:1407
msgid "automatically re-schedule any `exec` that fails"
msgstr "自動重新安排任何失敗的 `exec`"
-#: builtin/rebase.c:546
+#: builtin/rebase.c:553
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "不使用 --rebase-merges,則 --[no-]rebase-cousins 沒有效果"
-#: builtin/rebase.c:562
+#: builtin/rebase.c:569
#, c-format
-msgid "%s requires an interactive rebase"
-msgstr "%s 需要互動式重定基底"
+msgid "%s requires the merge backend"
+msgstr "%s 需要合併後端"
#: builtin/rebase.c:612
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "無法取得 'onto':'%s'"
-#: builtin/rebase.c:627
+#: builtin/rebase.c:629
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "無效的原始 head:'%s'"
-#: builtin/rebase.c:652
+#: builtin/rebase.c:654
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "忽略無效的 allow_rerere_autoupdate:'%s'"
-#: builtin/rebase.c:728
-#, c-format
-msgid "Could not read '%s'"
-msgstr "不能讀取 '%s'"
-
-#: builtin/rebase.c:746
-#, c-format
-msgid "Cannot store %s"
-msgstr "不能儲存 %s"
-
-#: builtin/rebase.c:853
-msgid "could not determine HEAD revision"
-msgstr "不能確定 HEAD 版本"
-
-#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:799 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -17992,7 +18348,7 @@ msgstr ""
"\"git rebase --skip\" 指令跳過這個提交。如果想要終止執行並回到\n"
"\"git rebase\" 執行之前的狀態,執行 \"git rebase --abort\"。"
-#: builtin/rebase.c:1058
+#: builtin/rebase.c:882
#, c-format
msgid ""
"\n"
@@ -18010,14 +18366,14 @@ msgstr ""
"\n"
"因此 git 無法對其重定基底。"
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1208
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr "無法識別的 '%s' 空類型;有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。"
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1226
#, c-format
msgid ""
"%s\n"
@@ -18034,7 +18390,7 @@ msgstr ""
" git rebase '<branch>'\n"
"\n"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1242
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18047,136 +18403,136 @@ msgstr ""
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1272
msgid "exec commands cannot contain newlines"
msgstr "exec 指令不能包含換行符號"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1276
msgid "empty exec command"
msgstr "空的 exec 指令"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1305
msgid "rebase onto given branch instead of upstream"
msgstr "重定基底到提供的分支而非上游"
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1307
msgid "use the merge-base of upstream and branch as the current base"
msgstr "使用上游和分支的合併基礎做為目前基礎"
-#: builtin/rebase.c:1485
+#: builtin/rebase.c:1309
msgid "allow pre-rebase hook to run"
msgstr "允許執行 pre-rebase 掛鉤"
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1311
msgid "be quiet. implies --no-stat"
msgstr "安靜。暗示 --no-stat"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1317
msgid "do not show diffstat of what changed upstream"
msgstr "不顯示上游變化的差異統計"
-#: builtin/rebase.c:1496
+#: builtin/rebase.c:1320
msgid "add a Signed-off-by: line to each commit"
msgstr "為每一個提交新增一個 Signed-off-by: 簽名"
-#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
+#: builtin/rebase.c:1322 builtin/rebase.c:1326 builtin/rebase.c:1328
msgid "passed to 'git am'"
msgstr "傳遞給 'git am'"
-#: builtin/rebase.c:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1330 builtin/rebase.c:1332
msgid "passed to 'git apply'"
msgstr "傳遞給 'git apply'"
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: builtin/rebase.c:1334 builtin/rebase.c:1337
msgid "cherry-pick all commits, even if unchanged"
msgstr "揀選所有提交,即使未修改"
-#: builtin/rebase.c:1515
+#: builtin/rebase.c:1339
msgid "continue"
msgstr "繼續"
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1342
msgid "skip current patch and continue"
msgstr "跳過目前修補檔並繼續"
# 譯者:請維持前導空格
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1344
msgid "abort and check out the original branch"
-msgstr "終止並簽出原有分支"
+msgstr "終止並檢出原有分支"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1347
msgid "abort but keep HEAD where it is"
msgstr "終止但保持 HEAD 不變"
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1348
msgid "edit the todo list during an interactive rebase"
msgstr "在互動式重定基底中編輯待辦列表"
-#: builtin/rebase.c:1527
+#: builtin/rebase.c:1351
msgid "show the patch file being applied or merged"
msgstr "顯示正在套用或合併的修補檔案"
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1354
msgid "use apply strategies to rebase"
msgstr "使用套用策略進行重定基底"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1358
msgid "use merging strategies to rebase"
msgstr "使用合併策略進行重定基底"
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1362
msgid "let the user edit the list of commits to rebase"
msgstr "讓使用者編輯要重定基底的提交列表"
-#: builtin/rebase.c:1542
+#: builtin/rebase.c:1366
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(已棄用)嘗試重建合併提交而非忽略它們"
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1371
msgid "how to handle commits that become empty"
msgstr "處理空白提交的方式"
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1378
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "在 -i 互動模式下,移動以 squash!/fixup! 開頭的提交"
-#: builtin/rebase.c:1560
-msgid "automatically stash/stash pop before and after"
-msgstr "在動作前後執行自動儲藏和彈出儲藏"
-
-#: builtin/rebase.c:1562
+#: builtin/rebase.c:1385
msgid "add exec lines after each commit of the editable list"
msgstr "可編輯列表的每一個提交下面增加一行 exec"
-#: builtin/rebase.c:1566
+#: builtin/rebase.c:1389
msgid "allow rebasing commits with empty messages"
msgstr "允許針對空提交說明的提交重定基底"
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1393
msgid "try to rebase merges instead of skipping them"
msgstr "嘗試對合併提交重定基底而不是忽略它們"
-#: builtin/rebase.c:1573
+#: builtin/rebase.c:1396
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "使用 'merge-base --fork-point' 來最佳化上游"
-#: builtin/rebase.c:1575
+#: builtin/rebase.c:1398
msgid "use the given merge strategy"
msgstr "使用提供的合併策略"
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1400 builtin/revert.c:115
msgid "option"
msgstr "選項"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1401
msgid "pass the argument through to the merge strategy"
msgstr "將參數傳遞給合併策略"
-#: builtin/rebase.c:1581
+#: builtin/rebase.c:1404
msgid "rebase all reachable commits up to the root(s)"
msgstr "將所有可以取得的提交重定基底到根提交"
-#: builtin/rebase.c:1598
+#: builtin/rebase.c:1409
+msgid "apply all changes, even those already present upstream"
+msgstr "即使已提供上游,仍套用所有變更"
+
+#: builtin/rebase.c:1426
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -18184,36 +18540,40 @@ msgstr ""
"對 rebase.useBuiltin 的支援已被刪除!\n"
"詳見 'git help config' 中的條目。"
-#: builtin/rebase.c:1604
+#: builtin/rebase.c:1432
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "看起來 'git-am' 正在執行中。無法重定基底。"
-#: builtin/rebase.c:1645
+#: builtin/rebase.c:1473
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr "git rebase --preserve-merges 被棄用。用 --rebase-merges 代替。"
-#: builtin/rebase.c:1650
+#: builtin/rebase.c:1478
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "不能將 '--keep-base' 和 '--onto' 組合使用"
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1480
msgid "cannot combine '--keep-base' with '--root'"
msgstr "不能將 '--keep-base' 和 '--root' 組合使用"
-#: builtin/rebase.c:1656
+#: builtin/rebase.c:1484
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "不能將 '--root' 和 '--fork-point' 結合使用"
+
+#: builtin/rebase.c:1487
msgid "No rebase in progress?"
msgstr "沒有正在進行的重定基底?"
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1491
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "動作 --edit-todo 只能用在互動式重定基底過程中。"
-#: builtin/rebase.c:1683
+#: builtin/rebase.c:1514
msgid "Cannot read HEAD"
msgstr "不能讀取 HEAD"
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1526
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -18221,16 +18581,16 @@ msgstr ""
"您必須編輯所有的合併衝突,然後透過 git add\n"
"指令將它們標記為已解決"
-#: builtin/rebase.c:1714
+#: builtin/rebase.c:1545
msgid "could not discard worktree changes"
msgstr "無法捨棄工作區變更"
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1564
#, c-format
msgid "could not move back to %s"
msgstr "無法移回 %s"
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1610
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18249,164 +18609,141 @@ msgstr ""
"\t%s\n"
"然後再重新執行。 為避免遺失重要資料,我已經停止目前動作。\n"
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1638
msgid "switch `C' expects a numerical value"
msgstr "開關 `C' 期望一個數字值"
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1680
#, c-format
msgid "Unknown mode: %s"
msgstr "未知模式:%s"
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1702
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy 需要 --merge 或 --interactive"
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1732
msgid "cannot combine apply options with merge options"
msgstr "不能將 apply 套用選項與 merge 合併選項一起使用"
-#: builtin/rebase.c:1912
+#: builtin/rebase.c:1745
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "未知 rebase 後端:%s"
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1770
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1790
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "不能將 '--preserve-merges' 和 '--rebase-merges' 同時使用"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1794
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"錯誤:不能將 '--preserve-merges' 和 '--reschedule-failed-exec' 同時使用"
-#: builtin/rebase.c:1985
+#: builtin/rebase.c:1818
#, c-format
msgid "invalid upstream '%s'"
msgstr "無效的上游 '%s'"
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1824
msgid "Could not create new root commit"
msgstr "不能建立新的根提交"
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1850
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s':只需要與分支的一個合併基礎"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1853
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s':只需要一個合併基礎"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1861
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "沒有指向一個有效的提交 '%s'"
-#: builtin/rebase.c:2054
+#: builtin/rebase.c:1887
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "致命錯誤:無此分支/提交 '%s'"
-#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
+#: builtin/rebase.c:1895 builtin/submodule--helper.c:40
#: builtin/submodule--helper.c:1990
#, c-format
msgid "No such ref: %s"
msgstr "沒有這樣的引用:%s"
-#: builtin/rebase.c:2073
+#: builtin/rebase.c:1906
msgid "Could not resolve HEAD to a revision"
msgstr "無法將 HEAD 解析為一個版本"
-#: builtin/rebase.c:2111
-msgid "Cannot autostash"
-msgstr "無法 autostash"
-
-#: builtin/rebase.c:2114
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "意外的 stash 回應:'%s'"
-
-#: builtin/rebase.c:2120
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "不能為 '%s' 建立目錄"
-
-#: builtin/rebase.c:2123
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "建立了 autostash:%s\n"
-
-#: builtin/rebase.c:2126
-msgid "could not reset --hard"
-msgstr "無法 reset --hard"
-
-#: builtin/rebase.c:2135
+#: builtin/rebase.c:1927
msgid "Please commit or stash them."
msgstr "請提交或儲藏修改。"
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:1963
#, c-format
msgid "could not switch to %s"
msgstr "無法切換到 %s"
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:1974
msgid "HEAD is up to date."
msgstr "HEAD 是最新的。"
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:1976
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "目前分支 %s 是最新的。\n"
-#: builtin/rebase.c:2190
+#: builtin/rebase.c:1984
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD 是最新的,強制重定基底。"
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:1986
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "目前分支 %s 是最新的,強制重定基底。\n"
-#: builtin/rebase.c:2200
+#: builtin/rebase.c:1994
msgid "The pre-rebase hook refused to rebase."
msgstr "pre-rebase 掛鉤拒絕了重定基底動作。"
-#: builtin/rebase.c:2207
+#: builtin/rebase.c:2001
#, c-format
msgid "Changes to %s:\n"
msgstr "到 %s 的變更:\n"
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2004
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "從 %s 到 %s 的變更:\n"
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2029
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "首先,還原開頭指標以便在其上重放您的工作...\n"
-#: builtin/rebase.c:2244
+#: builtin/rebase.c:2038
msgid "Could not detach HEAD"
msgstr "無法分離開頭指標"
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2047
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "快轉 %s 到 %s。\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:34
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <版本庫目錄>"
-#: builtin/receive-pack.c:821
+#: builtin/receive-pack.c:843
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -18432,7 +18769,7 @@ msgstr ""
"若要封鎖此訊息且保持預設行為,設定 'receive.denyCurrentBranch'\n"
"設定變數為 'refuse'。"
-#: builtin/receive-pack.c:841
+#: builtin/receive-pack.c:863
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
@@ -18443,7 +18780,7 @@ msgid ""
"\n"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-"預設禁止刪除目前分支,因為下一次 'git clone' 將不會簽出任何檔案,\n"
+"預設禁止刪除目前分支,因為下一次 'git clone' 將不會檢出任何檔案,\n"
"導致困惑。\n"
"\n"
"您可以在遠端版本庫中設定 'receive.denyDeleteCurrent' 設定變數為\n"
@@ -18451,11 +18788,11 @@ msgstr ""
"\n"
"若要封鎖此訊息,您可以設定它為 'refuse'。"
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:1960
msgid "quiet"
msgstr "靜默模式"
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:1974
msgid "You must specify a directory."
msgstr "您必須指定一個目錄。"
@@ -18636,7 +18973,7 @@ msgstr "追蹤的分支"
#: builtin/remote.c:172
msgid "master branch"
-msgstr "主線分支"
+msgstr "master 分支"
#: builtin/remote.c:174
msgid "set up remote as a mirror to push to or fetch from"
@@ -19027,123 +19364,123 @@ msgstr "未找到此 URL:%s"
msgid "Will not delete all non-push URLs"
msgstr "將不會刪除所有非推送 URL 位址"
-#: builtin/repack.c:23
+#: builtin/repack.c:25
msgid "git repack [<options>]"
msgstr "git repack [<選項>]"
-#: builtin/repack.c:28
+#: builtin/repack.c:30
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
"增量 repack 和 bitmap 索引不相容。 使用 --no-write-bitmap-index\n"
-"或禁用 pack.writebitmaps 設定。"
+"或停用 pack.writebitmaps 設定。"
-#: builtin/repack.c:191
+#: builtin/repack.c:193
msgid "could not start pack-objects to repack promisor objects"
msgstr "無法開始 pack-objects 來重新打包 promisor 物件"
-#: builtin/repack.c:230 builtin/repack.c:416
+#: builtin/repack.c:232 builtin/repack.c:418
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr "repack:期望來自 pack-objects 的完整十六進位物件 ID。"
-#: builtin/repack.c:254
+#: builtin/repack.c:256
msgid "could not finish pack-objects to repack promisor objects"
msgstr "無法完成 pack-objects 來重新打包 promisor 物件"
-#: builtin/repack.c:292
+#: builtin/repack.c:294
msgid "pack everything in a single pack"
msgstr "所有內容打包到一個包檔案中"
-#: builtin/repack.c:294
+#: builtin/repack.c:296
msgid "same as -a, and turn unreachable objects loose"
msgstr "和 -a 相同,並將無法取得的物件設為鬆散物件"
-#: builtin/repack.c:297
+#: builtin/repack.c:299
msgid "remove redundant packs, and run git-prune-packed"
msgstr "刪除多餘的包,執行 git-prune-packed"
-#: builtin/repack.c:299
+#: builtin/repack.c:301
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --no-reuse-delta"
-#: builtin/repack.c:301
+#: builtin/repack.c:303
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --no-reuse-object"
-#: builtin/repack.c:303
+#: builtin/repack.c:305
msgid "do not run git-update-server-info"
msgstr "不執行 git-update-server-info"
-#: builtin/repack.c:306
+#: builtin/repack.c:308
msgid "pass --local to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --local"
-#: builtin/repack.c:308
+#: builtin/repack.c:310
msgid "write bitmap index"
msgstr "寫 bitmap 索引"
-#: builtin/repack.c:310
+#: builtin/repack.c:312
msgid "pass --delta-islands to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --delta-islands"
-#: builtin/repack.c:311
+#: builtin/repack.c:313
msgid "approxidate"
msgstr "近似日期"
-#: builtin/repack.c:312
+#: builtin/repack.c:314
msgid "with -A, do not loosen objects older than this"
msgstr "使用 -A,不要將早於提供時間的物件過期"
-#: builtin/repack.c:314
+#: builtin/repack.c:316
msgid "with -a, repack unreachable objects"
msgstr "使用 -a ,重新對無法取得物件打包"
-#: builtin/repack.c:316
+#: builtin/repack.c:318
msgid "size of the window used for delta compression"
msgstr "用於增量壓縮的視窗值"
-#: builtin/repack.c:317 builtin/repack.c:323
+#: builtin/repack.c:319 builtin/repack.c:325
msgid "bytes"
msgstr "位元組"
-#: builtin/repack.c:318
+#: builtin/repack.c:320
msgid "same as the above, but limit memory size instead of entries count"
msgstr "和上面的相似,但限制記憶體大小而非條目數"
-#: builtin/repack.c:320
+#: builtin/repack.c:322
msgid "limits the maximum delta depth"
msgstr "限制最大增量深度"
-#: builtin/repack.c:322
+#: builtin/repack.c:324
msgid "limits the maximum number of threads"
msgstr "限制最大執行緒數"
-#: builtin/repack.c:324
+#: builtin/repack.c:326
msgid "maximum size of each packfile"
msgstr "每個 packfile 的最大尺寸"
-#: builtin/repack.c:326
+#: builtin/repack.c:328
msgid "repack objects in packs marked with .keep"
msgstr "對標記為 .keep 的包中的物件重新打包"
-#: builtin/repack.c:328
+#: builtin/repack.c:330
msgid "do not repack this pack"
msgstr "不要對該包檔案重新打包"
-#: builtin/repack.c:338
+#: builtin/repack.c:340
msgid "cannot delete packs in a precious-objects repo"
msgstr "不能刪除珍品版本庫中的打包檔案"
-#: builtin/repack.c:342
+#: builtin/repack.c:344
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable 和 -A 不相容"
-#: builtin/repack.c:425
+#: builtin/repack.c:427
msgid "Nothing new to pack."
msgstr "沒有新的要打包。"
-#: builtin/repack.c:486
+#: builtin/repack.c:488
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
@@ -19159,7 +19496,7 @@ msgstr ""
"警告:並且嘗試重新命名改回原有檔案名的動作也失敗。\n"
"警告:請手動將 %s 下的這些檔案重新命名:\n"
-#: builtin/repack.c:534
+#: builtin/repack.c:536
#, c-format
msgid "failed to remove '%s'"
msgstr "刪除 '%s' 失敗"
@@ -19466,94 +19803,94 @@ msgstr "合併"
msgid "keep"
msgstr "保持"
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "You do not have a valid HEAD."
msgstr "您沒有一個有效的 HEAD。"
-#: builtin/reset.c:84
+#: builtin/reset.c:85
msgid "Failed to find tree of HEAD."
msgstr "無法找到 HEAD 指向的樹。"
-#: builtin/reset.c:90
+#: builtin/reset.c:91
#, c-format
msgid "Failed to find tree of %s."
msgstr "無法找到 %s 指向的樹。"
-#: builtin/reset.c:115
+#: builtin/reset.c:116
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD 現在位於 %s"
# 譯者:漢字之間無空格,故刪除%s前後空格
-#: builtin/reset.c:194
+#: builtin/reset.c:195
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合併過程中不能做%s重設動作。"
-#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595
#: builtin/stash.c:619
msgid "be quiet, only report errors"
msgstr "安靜模式,只報告錯誤"
-#: builtin/reset.c:296
+#: builtin/reset.c:297
msgid "reset HEAD and index"
msgstr "重設 HEAD 和索引"
-#: builtin/reset.c:297
+#: builtin/reset.c:298
msgid "reset only HEAD"
msgstr "只重設 HEAD"
-#: builtin/reset.c:299 builtin/reset.c:301
+#: builtin/reset.c:300 builtin/reset.c:302
msgid "reset HEAD, index and working tree"
msgstr "重設 HEAD、索引和工作區"
-#: builtin/reset.c:303
+#: builtin/reset.c:304
msgid "reset HEAD but keep local changes"
msgstr "重設 HEAD 但儲存本機變更"
-#: builtin/reset.c:309
+#: builtin/reset.c:310
msgid "record only the fact that removed paths will be added later"
msgstr "將刪除的路徑標記為稍後新增"
-#: builtin/reset.c:343
+#: builtin/reset.c:344
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "無法將 '%s' 解析為一個有效的版本。"
-#: builtin/reset.c:351
+#: builtin/reset.c:352
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "無法將 '%s' 解析為一個有效的樹狀物件。"
-#: builtin/reset.c:360
+#: builtin/reset.c:361
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch 與 --{hard、mixed、soft} 選項不相容"
-#: builtin/reset.c:370
+#: builtin/reset.c:371
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed 帶路徑已棄用,而是用 'git reset -- <路徑>'。"
# 譯者:漢字之間無空格,故刪除%s前後空格
-#: builtin/reset.c:372
+#: builtin/reset.c:373
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能帶路徑進行%s重設。"
# 譯者:漢字之間無空格,故刪除%s前後空格
-#: builtin/reset.c:387
+#: builtin/reset.c:388
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "不能對純版本庫進行%s重設"
-#: builtin/reset.c:391
+#: builtin/reset.c:392
msgid "-N can only be used with --mixed"
msgstr "-N 只能和 --mixed 同時使用"
-#: builtin/reset.c:412
+#: builtin/reset.c:413
msgid "Unstaged changes after reset:"
msgstr "重設後取消暫存的變更:"
-#: builtin/reset.c:415
+#: builtin/reset.c:416
#, c-format
msgid ""
"\n"
@@ -19565,12 +19902,12 @@ msgstr ""
"重設後,枚舉未暫存變更花費了 %.2f 秒。 您可以使用 '--quiet' 避免此情況。\n"
"將設定變數 reset.quiet 設定為 true 可使其成為預設值。\n"
-#: builtin/reset.c:425
+#: builtin/reset.c:434
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "不能重設索引檔案至版本 '%s'。"
-#: builtin/reset.c:429
+#: builtin/reset.c:439
msgid "Could not write new index file."
msgstr "不能寫入新的索引檔案。"
@@ -19590,23 +19927,23 @@ msgstr "rev-list 不支援顯示註解"
msgid "marked counting is incompatible with --objects"
msgstr "--objects 不相容標記計數 (marked counting)"
-#: builtin/rev-parse.c:408
+#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<選項>] -- [<參數>...]"
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:414
msgid "keep the `--` passed as an arg"
msgstr "保持 `--` 作為一個參數傳遞"
-#: builtin/rev-parse.c:415
+#: builtin/rev-parse.c:416
msgid "stop parsing after the first non-option argument"
msgstr "遇到第一個非選項參數後停止解析"
-#: builtin/rev-parse.c:418
+#: builtin/rev-parse.c:419
msgid "output in stuck long form"
msgstr "以固定長格式輸出"
-#: builtin/rev-parse.c:551
+#: builtin/rev-parse.c:552
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -19798,15 +20135,15 @@ msgstr ""
msgid "remote name"
msgstr "遠端名稱"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:176
msgid "use stateless RPC protocol"
msgstr "使用無狀態的 RPC 協定"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:177
msgid "read refs from stdin"
msgstr "從標準輸入讀取引用"
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:178
msgid "print status from remote helper"
msgstr "列印來自遠端 helper 的狀態"
@@ -20022,69 +20359,57 @@ msgid "show refs from stdin that aren't in local repository"
msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用"
#: builtin/sparse-checkout.c:21
-msgid "git sparse-checkout (init|list|set|add|disable) <options>"
-msgstr "git sparse-checkout (init|list|set|add|disable) <選項>"
+msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
+msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <選項>"
#: builtin/sparse-checkout.c:64
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr "這不是稀疏工作區(sparse-checkout 檔案可能不存在)"
-#: builtin/sparse-checkout.c:225
+#: builtin/sparse-checkout.c:212
msgid "failed to create directory for sparse-checkout file"
-msgstr "無法建立稀疏簽出檔案的目錄"
+msgstr "無法建立稀疏檢出檔案的目錄"
-#: builtin/sparse-checkout.c:266
+#: builtin/sparse-checkout.c:253
msgid "failed to set extensions.worktreeConfig setting"
msgstr "無法設定 extensions.worktreeConfig 設定"
-#: builtin/sparse-checkout.c:283
+#: builtin/sparse-checkout.c:270
msgid "git sparse-checkout init [--cone]"
msgstr "git sparse-checkout init [--cone]"
-#: builtin/sparse-checkout.c:302
+#: builtin/sparse-checkout.c:289
msgid "initialize the sparse-checkout in cone mode"
-msgstr "以 cone 模式初始化稀疏簽出"
-
-#: builtin/sparse-checkout.c:308
-msgid "initialize sparse-checkout"
-msgstr "初始化稀疏簽出"
+msgstr "以 cone 模式初始化稀疏檢出"
-#: builtin/sparse-checkout.c:341
+#: builtin/sparse-checkout.c:326
#, c-format
msgid "failed to open '%s'"
msgstr "無法開啟「%s」"
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:383
#, c-format
msgid "could not normalize path %s"
msgstr "無法標準化路徑 %s"
-#: builtin/sparse-checkout.c:410
+#: builtin/sparse-checkout.c:395
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <樣式>)"
-#: builtin/sparse-checkout.c:435
+#: builtin/sparse-checkout.c:420
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "無法去掉 '%s' C 樣式字串的引號"
-#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+#: builtin/sparse-checkout.c:474 builtin/sparse-checkout.c:498
msgid "unable to load existing sparse-checkout patterns"
-msgstr "無法載入現存的稀疏簽出樣式"
+msgstr "無法載入現存的稀疏檢出樣式"
-#: builtin/sparse-checkout.c:558
+#: builtin/sparse-checkout.c:543
msgid "read patterns from standard in"
msgstr "從標準輸入讀取樣式"
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr "設定稀疏簽出樣式"
-
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr "停用稀疏簽出"
-
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:580
msgid "error while refreshing working directory"
msgstr "重新整理工作目錄時發生錯誤"
@@ -20164,7 +20489,7 @@ msgstr "'%s' 不像是一個儲藏提交"
msgid "Too many revisions specified:%s"
msgstr "指定了太多的版本:%s"
-#: builtin/stash.c:162 git-legacy-stash.sh:549
+#: builtin/stash.c:162
msgid "No stash entries found."
msgstr "未發現儲藏條目。"
@@ -20173,7 +20498,7 @@ msgstr "未發現儲藏條目。"
msgid "%s is not a valid reference"
msgstr "%s 不是一個有效的引用名"
-#: builtin/stash.c:225 git-legacy-stash.sh:75
+#: builtin/stash.c:225
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear 不支援參數"
@@ -20203,7 +20528,7 @@ msgstr "無法從儲藏條目中復原未追蹤檔案"
msgid "Merging %s with %s"
msgstr "正在合併 %s 和 %s"
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:461
msgid "Index was not unstashed."
msgstr "索引未從儲藏中復原。"
@@ -20226,105 +20551,107 @@ msgstr "%s:無法捨棄儲藏條目"
msgid "'%s' is not a stash reference"
msgstr "'%s' 不是一個儲藏引用"
-#: builtin/stash.c:633 git-legacy-stash.sh:695
+#: builtin/stash.c:633
msgid "The stash entry is kept in case you need it again."
msgstr "儲藏條目被保留以備您再次需要。"
-#: builtin/stash.c:656 git-legacy-stash.sh:713
+#: builtin/stash.c:656
msgid "No branch name specified"
msgstr "未指定分支名"
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:800 builtin/stash.c:837
#, c-format
msgid "Cannot update %s with %s"
msgstr "無法用 %2$s 更新 %1$s"
-#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:818 builtin/stash.c:1475 builtin/stash.c:1540
msgid "stash message"
msgstr "儲藏說明"
-#: builtin/stash.c:824
+#: builtin/stash.c:828
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" 需要一個 <提交> 參數"
-#: builtin/stash.c:1049 git-legacy-stash.sh:218
+#: builtin/stash.c:1046
msgid "No changes selected"
msgstr "沒有選擇變更"
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1146
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
-#: builtin/stash.c:1176 git-legacy-stash.sh:165
+#: builtin/stash.c:1173
msgid "Cannot save the current index state"
msgstr "無法儲存目前索引狀態"
-#: builtin/stash.c:1185 git-legacy-stash.sh:180
+#: builtin/stash.c:1182
msgid "Cannot save the untracked files"
msgstr "無法儲存未追蹤檔案"
-#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
-#: git-legacy-stash.sh:214
+#: builtin/stash.c:1193 builtin/stash.c:1202
msgid "Cannot save the current worktree state"
msgstr "無法儲存目前工作區狀態"
-#: builtin/stash.c:1233 git-legacy-stash.sh:234
+#: builtin/stash.c:1230
msgid "Cannot record working tree state"
msgstr "不能記錄工作區狀態"
-#: builtin/stash.c:1282 git-legacy-stash.sh:338
+#: builtin/stash.c:1279
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同時使用參數 --patch 和 --include-untracked 或 --all"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1295
msgid "Did you forget to 'git add'?"
msgstr "您是否忘了執行 'git add'?"
-#: builtin/stash.c:1313 git-legacy-stash.sh:346
+#: builtin/stash.c:1310
msgid "No local changes to save"
msgstr "沒有要儲存的本機修改"
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1317
msgid "Cannot initialize stash"
msgstr "無法初始化儲藏"
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1332
msgid "Cannot save the current status"
msgstr "無法儲存目前狀態"
-#: builtin/stash.c:1340
+#: builtin/stash.c:1337
#, c-format
msgid "Saved working directory and index state %s"
msgstr "儲存工作目錄和索引狀態 %s"
-#: builtin/stash.c:1430 git-legacy-stash.sh:385
+#: builtin/stash.c:1427
msgid "Cannot remove worktree changes"
msgstr "無法刪除工作區變更"
-#: builtin/stash.c:1469 builtin/stash.c:1534
+#: builtin/stash.c:1466 builtin/stash.c:1531
msgid "keep index"
msgstr "保持索引"
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1468 builtin/stash.c:1533
msgid "stash in patch mode"
msgstr "以修補檔模式儲藏"
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1469 builtin/stash.c:1534
msgid "quiet mode"
msgstr "靜默模式"
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1471 builtin/stash.c:1536
msgid "include untracked files in stash"
msgstr "儲藏中包含未追蹤檔案"
-#: builtin/stash.c:1476 builtin/stash.c:1541
+#: builtin/stash.c:1473 builtin/stash.c:1538
msgid "include ignore files"
msgstr "包含忽略的檔案"
-#: builtin/stash.c:1600
-#, c-format
-msgid "could not exec %s"
-msgstr "不能執行 %s"
+#: builtin/stash.c:1573
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"對 stash.useBuiltin 的支援已被刪除!\n"
+"詳見「git help config」中的條目。"
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
@@ -20558,7 +20885,7 @@ msgstr ""
#: builtin/submodule--helper.c:1220
msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr "如果您確實想要對所有子模組執行取消初始化,請使用 '--all'"
+msgstr "如果您確定想要對所有子模組執行取消初始化,請使用 '--all'"
#: builtin/submodule--helper.c:1289
msgid ""
@@ -20756,17 +21083,25 @@ msgstr "git submodule--helper config --unset <名稱>"
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2241 git-submodule.sh:174
+#: builtin/submodule--helper.c:2241 git-submodule.sh:176
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "請確認 .gitmodules 檔案在工作區裡"
-#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
+#: builtin/submodule--helper.c:2257
+msgid "Suppress output for setting url of a submodule"
+msgstr "阻止子模組設定 URL 的輸出"
+
+#: builtin/submodule--helper.c:2261
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper set-url [--quiet] <路徑> <新 URL>"
+
+#: builtin/submodule--helper.c:2323 git.c:436 git.c:683
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支援 --super-prefix"
-#: builtin/submodule--helper.c:2297
+#: builtin/submodule--helper.c:2329
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一個有效的 submodule--helper 子指令"
@@ -20791,11 +21126,11 @@ msgstr "刪除符號引用"
msgid "shorten ref output"
msgstr "縮短引用輸出"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
msgid "reason"
msgstr "原因"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
msgid "reason of the update"
msgstr "更新的原因"
@@ -20887,134 +21222,134 @@ msgstr ""
msgid "bad object type."
msgstr "壞的物件類型。"
-#: builtin/tag.c:284
+#: builtin/tag.c:285
msgid "no tag message?"
msgstr "無標籤說明?"
-#: builtin/tag.c:291
+#: builtin/tag.c:292
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "標籤說明被保留在 %s\n"
-#: builtin/tag.c:402
+#: builtin/tag.c:403
msgid "list tag names"
msgstr "列出標籤名稱"
-#: builtin/tag.c:404
+#: builtin/tag.c:405
msgid "print <n> lines of each tag message"
msgstr "每個標籤訊息列印 <n> 行"
-#: builtin/tag.c:406
+#: builtin/tag.c:407
msgid "delete tags"
msgstr "刪除標籤"
-#: builtin/tag.c:407
+#: builtin/tag.c:408
msgid "verify tags"
msgstr "驗證標籤"
-#: builtin/tag.c:409
+#: builtin/tag.c:410
msgid "Tag creation options"
msgstr "標籤建立選項"
-#: builtin/tag.c:411
+#: builtin/tag.c:412
msgid "annotated tag, needs a message"
msgstr "附註標籤,需要一個說明"
-#: builtin/tag.c:413
+#: builtin/tag.c:414
msgid "tag message"
msgstr "標籤說明"
-#: builtin/tag.c:415
+#: builtin/tag.c:416
msgid "force edit of tag message"
msgstr "強制編輯標籤說明"
-#: builtin/tag.c:416
+#: builtin/tag.c:417
msgid "annotated and GPG-signed tag"
msgstr "附註並附加 GPG 簽名的標籤"
-#: builtin/tag.c:419
+#: builtin/tag.c:420
msgid "use another key to sign the tag"
msgstr "使用另外的私鑰簽名該標籤"
-#: builtin/tag.c:420
+#: builtin/tag.c:421
msgid "replace the tag if exists"
msgstr "如果存在,取代現有的標籤"
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:422 builtin/update-ref.c:492
msgid "create a reflog"
msgstr "建立引用日誌"
-#: builtin/tag.c:423
+#: builtin/tag.c:424
msgid "Tag listing options"
msgstr "標籤列表選項"
-#: builtin/tag.c:424
+#: builtin/tag.c:425
msgid "show tag list in columns"
msgstr "以列的方式顯示標籤列表"
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that contain the commit"
msgstr "只列印包含該提交的標籤"
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:427 builtin/tag.c:429
msgid "print only tags that don't contain the commit"
msgstr "只列印不包含該提交的標籤"
-#: builtin/tag.c:429
+#: builtin/tag.c:430
msgid "print only tags that are merged"
msgstr "只列印已經合併的標籤"
-#: builtin/tag.c:430
+#: builtin/tag.c:431
msgid "print only tags that are not merged"
msgstr "只列印尚未合併的標籤"
-#: builtin/tag.c:434
+#: builtin/tag.c:435
msgid "print only tags of the object"
msgstr "只列印指向該物件的標籤"
-#: builtin/tag.c:482
+#: builtin/tag.c:483
msgid "--column and -n are incompatible"
msgstr "--column 和 -n 不相容"
-#: builtin/tag.c:504
+#: builtin/tag.c:505
msgid "-n option is only allowed in list mode"
msgstr "-n 選項只允許用在列表顯示模式"
-#: builtin/tag.c:506
+#: builtin/tag.c:507
msgid "--contains option is only allowed in list mode"
msgstr "--contains 選項只允許用在列表顯示模式"
-#: builtin/tag.c:508
+#: builtin/tag.c:509
msgid "--no-contains option is only allowed in list mode"
msgstr "--no-contains 選項只允許用在列表顯示模式"
-#: builtin/tag.c:510
+#: builtin/tag.c:511
msgid "--points-at option is only allowed in list mode"
msgstr "--points-at 選項只允許用在列表顯示模式"
-#: builtin/tag.c:512
+#: builtin/tag.c:513
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "--merged 和 --no-merged 選項只允許用在列表顯示模式"
-#: builtin/tag.c:523
+#: builtin/tag.c:524
msgid "only one -F or -m option is allowed."
msgstr "只允許一個 -F 或 -m 選項。"
-#: builtin/tag.c:542
+#: builtin/tag.c:543
msgid "too many params"
msgstr "太多參數"
-#: builtin/tag.c:548
+#: builtin/tag.c:549
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一個有效的標籤名稱。"
-#: builtin/tag.c:553
+#: builtin/tag.c:554
#, c-format
msgid "tag '%s' already exists"
msgstr "標籤 '%s' 已存在"
-#: builtin/tag.c:584
+#: builtin/tag.c:585
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新標籤 '%s'(曾為 %s)\n"
@@ -21186,11 +21521,11 @@ msgstr "以這種格式寫入索引區"
#: builtin/update-index.c:1055
msgid "enable or disable split index"
-msgstr "啟用或禁用索引分割"
+msgstr "啟用或停用索引分割"
#: builtin/update-index.c:1057
msgid "enable/disable untracked cache"
-msgstr "啟用/禁用對未追蹤檔案的快取"
+msgstr "啟用/停用對未追蹤檔案的快取"
#: builtin/update-index.c:1059
msgid "test if the filesystem supports untracked cache"
@@ -21206,7 +21541,7 @@ msgstr "即使沒有被標記為已更改,也要寫出索引"
#: builtin/update-index.c:1065
msgid "enable or disable file system monitor"
-msgstr "啟用或禁用檔案系統監控"
+msgstr "啟用或停用檔案系統監控"
#: builtin/update-index.c:1067
msgid "mark files as fsmonitor valid"
@@ -21220,35 +21555,33 @@ msgstr "清除 fsmonitor 有效位"
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
-msgstr ""
-"core.splitIndex 被設定為 false。如果您確實要啟用索引分割,請刪除或修改它。"
+msgstr "core.splitIndex 被設定為 false。如果您確定要啟用索引分割,請移除或修改"
#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
-msgstr ""
-"core.splitIndex 被設定為 true。如果您確實要禁用索引分割,請刪除或修改它。"
+msgstr "core.splitIndex 被設定為 true。如果您確定要停用索引分割,請移除或修改"
#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
msgstr ""
-"core.untrackedCache 被設定為 true。如果您確實要禁用未追蹤檔案快取,請刪除或修"
-"改它。"
+"core.untrackedCache 被設定為 true。如果您確定要停用未追蹤檔案的快取,請移除或"
+"修改"
#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
-msgstr "快取未追蹤檔案被禁用"
+msgstr "快取未追蹤檔案被停用"
#: builtin/update-index.c:1206
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
msgstr ""
-"core.untrackedCache 被設定為 false。如果您確實要啟用未追蹤檔案快取,請刪除或"
-"修改它。"
+"core.untrackedCache 被設定為 false。如果您確定要啟用未追蹤檔案快取,請移除或"
+"修改"
#: builtin/update-index.c:1210
#, c-format
@@ -21266,11 +21599,11 @@ msgstr "fsmonitor 被啟用"
#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
-msgstr "core.fsmonitor 已設定;如果想要禁用 fsmonitor 請移除該選項"
+msgstr "core.fsmonitor 已設定;如果想要停用 fsmonitor 請移除該選項"
#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
-msgstr "fsmonitor 被禁用"
+msgstr "fsmonitor 被停用"
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
@@ -21284,19 +21617,19 @@ msgstr "git update-ref [<選項>] <引用名> <新值> [<舊值>]"
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<選項>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:487
msgid "delete the reference"
msgstr "刪除引用"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:489
msgid "update <refname> not the one it points to"
msgstr "更新 <引用名> 本身而不是它指向的引用"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:490
msgid "stdin has NUL-terminated arguments"
msgstr "標準輸入有以 NUL 字元終止的參數"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:491
msgid "read updates from stdin"
msgstr "從標準輸入讀取更新"
@@ -21388,7 +21721,7 @@ msgstr "git worktree remove [<選項>] <工作區>"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路徑>"
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:60 builtin/worktree.c:894
#, c-format
msgid "failed to delete '%s'"
msgstr "刪除 '%s' 失敗"
@@ -21466,115 +21799,115 @@ msgstr ""
msgid "could not create directory of '%s'"
msgstr "不能建立目錄 '%s'"
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:435 builtin/worktree.c:441
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "準備工作區(新分支 '%s')"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:437
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "準備工作區(重設分支 '%s',之前為 %s)"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (checking out '%s')"
-msgstr "準備工作區(簽出 '%s')"
+msgstr "準備工作區(檢出 '%s')"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:452
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "準備工作區(分離開頭指標 %s)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:493
msgid "checkout <branch> even if already checked out in other worktree"
-msgstr "簽出 <分支>,即使已經被簽出到其它工作區"
+msgstr "檢出 <分支>,即使已經被檢出到其它工作區"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:496
msgid "create a new branch"
msgstr "建立一個新分支"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:498
msgid "create or reset a branch"
msgstr "建立或重設一個分支"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:500
msgid "populate the new working tree"
msgstr "生成新的工作區"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:501
msgid "keep the new working tree locked"
msgstr "鎖定新工作區"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:504
msgid "set up tracking mode (see git-branch(1))"
msgstr "設定追蹤模式(參見 git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:507
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "嘗試為新分支名符合一個遠端追蹤分支"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:515
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b、-B 和 --detach 是互斥的"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:576
msgid "--[no-]track can only be used if a new branch is created"
-msgstr "只能在建立新分支時使用選項 --[no-]track "
+msgstr "只能在建立新分支時使用 --[no-]track 選項"
-#: builtin/worktree.c:673
+#: builtin/worktree.c:676
msgid "reason for locking"
msgstr "鎖定原因"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:688 builtin/worktree.c:721 builtin/worktree.c:795
+#: builtin/worktree.c:922
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一個工作區"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:690 builtin/worktree.c:723
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作區無法被加鎖或解鎖"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:695
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被鎖定,原因:%s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:697
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被鎖定"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:725
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被鎖定"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:766
msgid "working trees containing submodules cannot be moved or removed"
msgstr "不能移動或刪除包含子模組的工作區"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:774
msgid "force move even if worktree is dirty or locked"
msgstr "強制移動,即使工作區是髒的或已鎖定"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:797 builtin/worktree.c:924
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' 是一個主工作區"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:802
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "無法從 '%s' 算出目標名稱"
-#: builtin/worktree.c:805
+#: builtin/worktree.c:808
#, c-format
msgid "target '%s' already exists"
msgstr "目標 '%s' 已存在"
-#: builtin/worktree.c:813
+#: builtin/worktree.c:816
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -21583,7 +21916,7 @@ msgstr ""
"無法移動一個鎖定的工作區,鎖定原因:%s\n"
"使用 'move -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:818
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -21591,36 +21924,36 @@ msgstr ""
"無法移動一個鎖定的工作區,\n"
"使用 'move -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:821
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "驗證失敗,無法移動工作區:%s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:826
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "移動 '%s' 到 '%s' 失敗"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:874
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "在 '%s' 中執行 'git status' 失敗"
-#: builtin/worktree.c:875
+#: builtin/worktree.c:878
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr "'%s' 包含修改或未追蹤的檔案,使用 --force 刪除"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:883
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "在 '%s' 中執行 'git status' 失敗,離開碼 %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:906
msgid "force removal even if worktree is dirty or locked"
msgstr "強制刪除,即使工作區是髒的或已鎖定"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:929
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -21629,7 +21962,7 @@ msgstr ""
"無法刪除一個鎖定的工作區,鎖定原因:%s\n"
"使用 'remove -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:931
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -21637,7 +21970,7 @@ msgstr ""
"無法刪除一個鎖定的工作區,\n"
"使用 'remove -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:934
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "驗證失敗,無法刪除工作區:%s"
@@ -21658,17 +21991,121 @@ msgstr "將 <前綴> 子目錄內容寫到一個樹狀物件"
msgid "only useful for debugging"
msgstr "只對除錯有用"
-#: fast-import.c:3125
+#: bugreport.c:14
+msgid "git version:\n"
+msgstr "git 版本:\n"
+
+#: bugreport.c:20
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() 失敗,錯誤:「%s」(%d)\n"
+
+#: bugreport.c:30
+msgid "compiler info: "
+msgstr "編譯器資訊: "
+
+#: bugreport.c:32
+msgid "libc info: "
+msgstr "libc 資訊: "
+
+#: bugreport.c:74
+msgid "not run from a git repository - no hooks to show\n"
+msgstr "不是從 git 版本庫執行 - 沒有可顯示的掛鉤\n"
+
+#: bugreport.c:84
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr "git bugreport [-o|--output-directory <檔案>] [-s|--suffix <格式>]"
+
+#: bugreport.c:91
+msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\n"
+"\n"
+"What did you do before the bug happened? (Steps to reproduce your issue)\n"
+"\n"
+"What did you expect to happen? (Expected behavior)\n"
+"\n"
+"What happened instead? (Actual behavior)\n"
+"\n"
+"What's different between what you expected and what actually happened?\n"
+"\n"
+"Anything else you want to add:\n"
+"\n"
+"Please review the rest of the bug report below.\n"
+"You can delete any lines you don't wish to share.\n"
+msgstr ""
+"感謝您填寫 Git 臭蟲報告!\n"
+"請回答下列問題,以讓我們能夠了解您的問題。\n"
+"\n"
+"臭蟲發生前,您做了什麼?(重現問題的步驟)\n"
+"\n"
+"你原本期望發生什麼?(期望行為)\n"
+"\n"
+"那實際上發生了什麼?(實際行為)\n"
+"\n"
+"期望行為跟實際發生的行為有什麼不同?\n"
+"\n"
+"其他您想加入的:\n"
+"\n"
+"請檢閱臭蟲報告下方的剩餘部分。\n"
+"您可刪除任何您不想分享的地方。\n"
+
+#: bugreport.c:130
+msgid "specify a destination for the bugreport file"
+msgstr "請指定 bugreport 檔案的目的地"
+
+#: bugreport.c:132
+msgid "specify a strftime format suffix for the filename"
+msgstr "請指定檔案名稱的 strftime 格式後綴"
+
+#: bugreport.c:156
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "無法建立 '%s' 的前置目錄"
+
+#: bugreport.c:163
+msgid "System Info"
+msgstr "系統資訊"
+
+#: bugreport.c:166
+msgid "Enabled Hooks"
+msgstr "啟用的掛鉤"
+
+#: bugreport.c:174
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "不要在「%s」建立新檔案"
+
+#: bugreport.c:186
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "已在「%s」建立新報告。\n"
+
+#: fast-import.c:3085
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "「%s」子模組缺少 from 標記"
+
+#: fast-import.c:3087
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "「%s」子模組缺少 to 標記"
+
+#: fast-import.c:3222
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr "預期 'mark' 指令,得到 %s"
-#: fast-import.c:3130
+#: fast-import.c:3227
#, c-format
msgid "Expected 'to' command, got %s"
msgstr "預期 'to' 指令,得到 %s"
-#: fast-import.c:3254
+#: fast-import.c:3317
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr "期望子模組 rewrite 選項的格式是 name:filename"
+
+#: fast-import.c:3371
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr "沒有 --allow-unsafe-features 時,禁止在輸入中使用 '%s' 功能"
@@ -21707,7 +22144,7 @@ msgstr "test-tool serve-v2 [<選項>]"
msgid "exit immediately after advertising capabilities"
msgstr "對能力廣告之後立即離開"
-#: git.c:27
+#: git.c:28
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
@@ -21723,7 +22160,7 @@ msgstr ""
" [--git-dir=<路徑>] [--work-tree=<路徑>] [--namespace=<名稱>]\n"
" <指令> [<參數>]"
-#: git.c:34
+#: git.c:35
msgid ""
"'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
@@ -21735,47 +22172,47 @@ msgstr ""
"說明。\n"
"有關系統概述,檢視 'git help git'。"
-#: git.c:186
+#: git.c:187
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "沒有為 --git-dir 提供目錄\n"
-#: git.c:200
+#: git.c:201
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "沒有為 --namespace 提供命名空間\n"
-#: git.c:214
+#: git.c:215
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "沒有為 --work-tree 提供目錄\n"
-#: git.c:228
+#: git.c:229
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "沒有為 --super-prefix 提供前綴\n"
-#: git.c:250
+#: git.c:251
#, c-format
msgid "-c expects a configuration string\n"
msgstr "應為 -c 提供一個設定字串\n"
-#: git.c:288
+#: git.c:289
#, c-format
msgid "no directory given for -C\n"
msgstr "沒有為 -C 提供目錄\n"
-#: git.c:314
+#: git.c:315
#, c-format
msgid "unknown option: %s\n"
msgstr "未知選項:%s\n"
-#: git.c:360
+#: git.c:362
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "在擴展別名 '%s' 時:'%s'"
-#: git.c:369
+#: git.c:371
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -21784,39 +22221,39 @@ msgstr ""
"別名 '%s' 修改環境變數。您可以使用在別名中\n"
"使用 '!git'"
-#: git.c:376
+#: git.c:378
#, c-format
msgid "empty alias for %s"
msgstr "%s 的空別名"
-#: git.c:379
+#: git.c:381
#, c-format
msgid "recursive alias: %s"
msgstr "遞迴的別名:%s"
-#: git.c:459
+#: git.c:463
msgid "write failure on standard output"
msgstr "在標準輸出寫入失敗"
-#: git.c:461
+#: git.c:465
msgid "unknown write failure on standard output"
msgstr "到標準輸出的未知寫入錯誤"
-#: git.c:463
+#: git.c:467
msgid "close failed on standard output"
msgstr "標準輸出關閉失敗"
-#: git.c:793
+#: git.c:792
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "檢測到別名循環:'%s'的擴展未終止:%s"
-#: git.c:843
+#: git.c:842
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "不能作為內建指令處理 %s"
-#: git.c:856
+#: git.c:855
#, c-format
msgid ""
"usage: %s\n"
@@ -21825,53 +22262,53 @@ msgstr ""
"用法:%s\n"
"\n"
-#: git.c:876
+#: git.c:875
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "展開別名指令 '%s' 失敗,'%s' 不是一個 git 指令\n"
-#: git.c:888
+#: git.c:887
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "執行指令 '%s' 失敗:%s\n"
-#: http.c:378
+#: http.c:399
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "http.postbuffer 為負值,預設為 %d"
-#: http.c:399
+#: http.c:420
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "不支援委託控制,因為 cURL < 7.22.0"
-#: http.c:408
+#: http.c:429
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "不支援公鑰檔案鎖定,因為 cURL < 7.44.0"
-#: http.c:876
+#: http.c:914
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "不支援 CURLSSLOPT_NO_REVOKE,因為 cURL < 7.44.0"
-#: http.c:949
+#: http.c:993
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr "不支援協定限制,因為 cURL < 7.19.4"
-#: http.c:1086
+#: http.c:1139
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "不支援的 SSL 後端 '%s'。支援的 SSL 後端:"
-#: http.c:1093
+#: http.c:1146
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
-msgstr "無法設定 SSL 後端為 '%s':cURL: cURL 沒有使用 SSL 後端構建"
+msgstr "無法設定 SSL 後端為 '%s':cURL: cURL 沒有使用 SSL 後端組建"
-#: http.c:1097
+#: http.c:1150
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "無法將 SSL 後端設定為 '%s':已經設定"
-#: http.c:1966
+#: http.c:2032
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -21991,6 +22428,14 @@ msgstr "remote-curl:嘗試沒有本機版本庫下取得"
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl:未知的來自 git 的指令 '%s'"
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "沒有可用的編譯器資訊\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "沒有可用的 libc 資訊\n"
+
#: list-objects-filter-options.h:85
msgid "args"
msgstr "參數"
@@ -22044,11 +22489,11 @@ msgstr "排序的欄位名"
msgid "update the index with reused conflict resolution if possible"
msgstr "如果可能,重用衝突解決更新索引"
-#: wt-status.h:67
+#: wt-status.h:80
msgid "HEAD detached at "
msgstr "開頭指標分離於 "
-#: wt-status.h:68
+#: wt-status.h:81
msgid "HEAD detached from "
msgstr "開頭指標分離自 "
@@ -22089,619 +22534,627 @@ msgid "List, create, or delete branches"
msgstr "列出、建立或刪除分支"
#: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr "幫使用者收集要遞送臭蟲報告的資訊"
+
+#: command-list.h:60
msgid "Move objects and refs by archive"
msgstr "透過歸檔移動物件和引用"
-#: command-list.h:60
+#: command-list.h:61
msgid "Provide content or type and size information for repository objects"
msgstr "提供版本庫物件的內容、類型或大小"
-#: command-list.h:61
+#: command-list.h:62
msgid "Display gitattributes information"
msgstr "顯示 gitattributes 訊息"
-#: command-list.h:62
+#: command-list.h:63
msgid "Debug gitignore / exclude files"
msgstr "除錯 gitignore / exclude 檔案"
-#: command-list.h:63
+#: command-list.h:64
msgid "Show canonical names and email addresses of contacts"
msgstr "顯示聯絡人的規範名稱和電子信件"
-#: command-list.h:64
+#: command-list.h:65
msgid "Switch branches or restore working tree files"
msgstr "切換分支或復原工作區檔案"
-#: command-list.h:65
+#: command-list.h:66
msgid "Copy files from the index to the working tree"
msgstr "從索引複製檔案到工作區"
-#: command-list.h:66
+#: command-list.h:67
msgid "Ensures that a reference name is well formed"
msgstr "確保引用名稱格式正確"
-#: command-list.h:67
+#: command-list.h:68
msgid "Find commits yet to be applied to upstream"
msgstr "尋找尚未套用到上游的提交"
-#: command-list.h:68
+#: command-list.h:69
msgid "Apply the changes introduced by some existing commits"
msgstr "應用一些現存提交引入的修改"
-#: command-list.h:69
+#: command-list.h:70
msgid "Graphical alternative to git-commit"
msgstr "git-commit 的圖形替代介面"
-#: command-list.h:70
+#: command-list.h:71
msgid "Remove untracked files from the working tree"
msgstr "從工作區中刪除未追蹤檔案"
-#: command-list.h:71
+#: command-list.h:72
msgid "Clone a repository into a new directory"
msgstr "複製版本庫到一個新目錄"
-#: command-list.h:72
+#: command-list.h:73
msgid "Display data in columns"
msgstr "以列的方式顯示資料"
-#: command-list.h:73
+#: command-list.h:74
msgid "Record changes to the repository"
msgstr "記錄變更到版本庫"
-#: command-list.h:74
+#: command-list.h:75
msgid "Write and verify Git commit-graph files"
msgstr "寫入和驗證 Git 提交圖檔案"
-#: command-list.h:75
+#: command-list.h:76
msgid "Create a new commit object"
msgstr "建立一個新的提交物件"
-#: command-list.h:76
+#: command-list.h:77
msgid "Get and set repository or global options"
msgstr "取得和設定版本庫或者全域選項"
-#: command-list.h:77
+#: command-list.h:78
msgid "Count unpacked number of objects and their disk consumption"
msgstr "計算未打包物件的數量和磁碟空間占用"
-#: command-list.h:78
+#: command-list.h:79
msgid "Retrieve and store user credentials"
msgstr "檢索和儲存使用者密碼"
-#: command-list.h:79
+#: command-list.h:80
msgid "Helper to temporarily store passwords in memory"
msgstr "在記憶體中暫時儲存密碼的助手"
-#: command-list.h:80
+#: command-list.h:81
msgid "Helper to store credentials on disk"
msgstr "在磁碟儲存密碼的助手"
-#: command-list.h:81
+#: command-list.h:82
msgid "Export a single commit to a CVS checkout"
-msgstr "將一個提交匯出到 CVS 簽出中"
+msgstr "將一個提交匯出到 CVS 檢出中"
-#: command-list.h:82
+#: command-list.h:83
msgid "Salvage your data out of another SCM people love to hate"
msgstr "從另外一個人們愛恨的設定管理系統中拯救你的資料"
-#: command-list.h:83
+#: command-list.h:84
msgid "A CVS server emulator for Git"
msgstr "Git 的一個 CVS 服務模擬器"
-#: command-list.h:84
+#: command-list.h:85
msgid "A really simple server for Git repositories"
msgstr "一個非常簡單的 Git 版本庫伺服器"
-#: command-list.h:85
+#: command-list.h:86
msgid "Give an object a human readable name based on an available ref"
msgstr "基於一個現存的引用為一個物件起一個可讀的名稱"
-#: command-list.h:86
+#: command-list.h:87
msgid "Show changes between commits, commit and working tree, etc"
msgstr "顯示提交之間、提交和工作區之間等的差異"
-#: command-list.h:87
+#: command-list.h:88
msgid "Compares files in the working tree and the index"
msgstr "比較工作區和索引區中的檔案"
-#: command-list.h:88
+#: command-list.h:89
msgid "Compare a tree to the working tree or index"
msgstr "將一個樹和工作區或索引做比較"
-#: command-list.h:89
+#: command-list.h:90
msgid "Compares the content and mode of blobs found via two tree objects"
msgstr "比較兩個樹狀物件的檔案內容和模式"
-#: command-list.h:90
+#: command-list.h:91
msgid "Show changes using common diff tools"
msgstr "使用常見的差異工具顯示更改"
-#: command-list.h:91
+#: command-list.h:92
msgid "Git data exporter"
msgstr "Git 資料匯出器"
-#: command-list.h:92
+#: command-list.h:93
msgid "Backend for fast Git data importers"
msgstr "Git 快速資料匯入器後端"
-#: command-list.h:93
+#: command-list.h:94
msgid "Download objects and refs from another repository"
msgstr "從另外一個版本庫下載物件和引用"
-#: command-list.h:94
+#: command-list.h:95
msgid "Receive missing objects from another repository"
msgstr "從另一個版本庫取得缺少的物件"
-#: command-list.h:95
+#: command-list.h:96
msgid "Rewrite branches"
msgstr "重寫分支"
-#: command-list.h:96
+#: command-list.h:97
msgid "Produce a merge commit message"
msgstr "生成一個合併提交訊息"
-#: command-list.h:97
+#: command-list.h:98
msgid "Output information on each ref"
-msgstr "對每一個引用輸出訊息 "
+msgstr "對每一個引用輸出訊息"
-#: command-list.h:98
+#: command-list.h:99
msgid "Prepare patches for e-mail submission"
msgstr "準備電子信件提交的修補檔"
-#: command-list.h:99
+#: command-list.h:100
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr "驗證版本庫中物件的連通性和有效性"
-#: command-list.h:100
+#: command-list.h:101
msgid "Cleanup unnecessary files and optimize the local repository"
msgstr "清除不必要的檔案和最佳化本機版本庫"
-#: command-list.h:101
+#: command-list.h:102
msgid "Extract commit ID from an archive created using git-archive"
msgstr "從 git-archive 建立的歸檔檔案中擷取提交 ID"
-#: command-list.h:102
+#: command-list.h:103
msgid "Print lines matching a pattern"
msgstr "輸出和模式符合的行"
-#: command-list.h:103
+#: command-list.h:104
msgid "A portable graphical interface to Git"
msgstr "一個便攜的 Git 圖形用戶端"
-#: command-list.h:104
+#: command-list.h:105
msgid "Compute object ID and optionally creates a blob from a file"
msgstr "從一個檔案計算物件 ID,並可以建立 blob 資料物件"
-#: command-list.h:105
+#: command-list.h:106
msgid "Display help information about Git"
msgstr "顯示 Git 的說明訊息"
-#: command-list.h:106
+#: command-list.h:107
msgid "Server side implementation of Git over HTTP"
msgstr "Git HTTP 協定的服務端實現"
-#: command-list.h:107
+#: command-list.h:108
msgid "Download from a remote Git repository via HTTP"
msgstr "通過 HTTP 從遠端 Git 版本庫下載"
-#: command-list.h:108
+#: command-list.h:109
msgid "Push objects over HTTP/DAV to another repository"
msgstr "通過 HTTP/DAV 推送物件另一個版本庫"
-#: command-list.h:109
+#: command-list.h:110
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr "從標準輸入將一組修補檔傳送到IMAP資料夾"
-#: command-list.h:110
+#: command-list.h:111
msgid "Build pack index file for an existing packed archive"
msgstr "從一個現存的包存檔檔案建立包索引"
-#: command-list.h:111
+#: command-list.h:112
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "建立一個空的 Git 版本庫或重新初始化一個已存在的版本庫"
-#: command-list.h:112
+#: command-list.h:113
msgid "Instantly browse your working repository in gitweb"
msgstr "在 gitweb 中即時瀏覽您的工作版本庫"
-#: command-list.h:113
+#: command-list.h:114
msgid "Add or parse structured information in commit messages"
msgstr "新增或解析提交說明中的結構化訊息"
-#: command-list.h:114
+#: command-list.h:115
msgid "The Git repository browser"
msgstr "Git 版本庫瀏覽器"
-#: command-list.h:115
+#: command-list.h:116
msgid "Show commit logs"
msgstr "顯示提交日誌"
-#: command-list.h:116
+#: command-list.h:117
msgid "Show information about files in the index and the working tree"
msgstr "顯示索引和工作區中檔案的訊息"
-#: command-list.h:117
+#: command-list.h:118
msgid "List references in a remote repository"
msgstr "顯示一個遠端版本庫的引用"
-#: command-list.h:118
+#: command-list.h:119
msgid "List the contents of a tree object"
msgstr "顯示一個樹狀物件的內容"
-#: command-list.h:119
+#: command-list.h:120
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "從單個電子信件中擷取修補檔和作者身份"
-#: command-list.h:120
+#: command-list.h:121
msgid "Simple UNIX mbox splitter program"
msgstr "簡單的 UNIX mbox 信箱切分程式"
-#: command-list.h:121
+#: command-list.h:122
msgid "Join two or more development histories together"
msgstr "合併兩個或更多開發歷史"
-#: command-list.h:122
+#: command-list.h:123
msgid "Find as good common ancestors as possible for a merge"
msgstr "為了合併尋找儘可能好的公共祖先提交"
-#: command-list.h:123
+#: command-list.h:124
msgid "Run a three-way file merge"
msgstr "執行一個三路檔案合併"
-#: command-list.h:124
+#: command-list.h:125
msgid "Run a merge for files needing merging"
msgstr "對於需要合併的檔案執行合併"
-#: command-list.h:125
+#: command-list.h:126
msgid "The standard helper program to use with git-merge-index"
msgstr "與 git-merge-index 一起使用的標準嚮導程式"
-#: command-list.h:126
+#: command-list.h:127
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr "執行合併衝突解決工具以解決合併衝突"
-#: command-list.h:127
+#: command-list.h:128
msgid "Show three-way merge without touching index"
msgstr "顯示三路合併而不動索引"
-#: command-list.h:128
+#: command-list.h:129
msgid "Write and verify multi-pack-indexes"
msgstr "寫入和驗證多包索引"
-#: command-list.h:129
+#: command-list.h:130
msgid "Creates a tag object"
msgstr "建立一個標籤物件"
-#: command-list.h:130
+#: command-list.h:131
msgid "Build a tree-object from ls-tree formatted text"
msgstr "基於 ls-tree 的格式化文字建立一個樹狀物件"
-#: command-list.h:131
+#: command-list.h:132
msgid "Move or rename a file, a directory, or a symlink"
msgstr "移動或重新命名一個檔案、目錄或符號連結"
# 尋找提供版本的符號名稱
-#: command-list.h:132
+#: command-list.h:133
msgid "Find symbolic names for given revs"
msgstr "尋找提供版本的符號名稱"
-#: command-list.h:133
+#: command-list.h:134
msgid "Add or inspect object notes"
msgstr "新增或檢查物件備註"
-#: command-list.h:134
+#: command-list.h:135
msgid "Import from and submit to Perforce repositories"
msgstr "匯入和提交到 Perforce 版本庫中"
-#: command-list.h:135
+#: command-list.h:136
msgid "Create a packed archive of objects"
msgstr "建立物件的存檔包"
-#: command-list.h:136
+#: command-list.h:137
msgid "Find redundant pack files"
msgstr "尋找冗餘的包檔案"
-#: command-list.h:137
+#: command-list.h:138
msgid "Pack heads and tags for efficient repository access"
msgstr "打包頭和標籤以實現高效的版本庫存取"
-#: command-list.h:138
+#: command-list.h:139
msgid "Routines to help parsing remote repository access parameters"
msgstr "協助解析遠端版本庫存取參數的例程"
-#: command-list.h:139
+#: command-list.h:140
msgid "Compute unique ID for a patch"
msgstr "計算一個修補檔的唯一 ID"
-#: command-list.h:140
+#: command-list.h:141
msgid "Prune all unreachable objects from the object database"
msgstr "刪除物件庫中所有無法取得物件"
-#: command-list.h:141
+#: command-list.h:142
msgid "Remove extra objects that are already in pack files"
msgstr "刪除已經在包檔案中的多餘物件"
-#: command-list.h:142
+#: command-list.h:143
msgid "Fetch from and integrate with another repository or a local branch"
msgstr "取得並整合另外的版本庫或一個本機分支"
-#: command-list.h:143
+#: command-list.h:144
msgid "Update remote refs along with associated objects"
msgstr "更新遠端引用和相關的物件"
-#: command-list.h:144
+#: command-list.h:145
msgid "Applies a quilt patchset onto the current branch"
-msgstr "將一個 quilt 修補檔集套用到目前分支。"
+msgstr "將一個 quilt 修補檔集合套用到目前分支"
-#: command-list.h:145
+#: command-list.h:146
msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr "比較兩個提交範圍(如一個分支的兩個版本)"
-#: command-list.h:146
+#: command-list.h:147
msgid "Reads tree information into the index"
msgstr "將樹訊息讀取到索引"
-#: command-list.h:147
+#: command-list.h:148
msgid "Reapply commits on top of another base tip"
msgstr "在另一個分支上重新應用提交"
-#: command-list.h:148
+#: command-list.h:149
msgid "Receive what is pushed into the repository"
msgstr "接收推送到版本庫中的物件"
-#: command-list.h:149
+#: command-list.h:150
msgid "Manage reflog information"
msgstr "管理 reflog 訊息"
-#: command-list.h:150
+#: command-list.h:151
msgid "Manage set of tracked repositories"
msgstr "管理已追蹤版本庫"
-#: command-list.h:151
+#: command-list.h:152
msgid "Pack unpacked objects in a repository"
msgstr "打包版本庫中未打包物件"
-#: command-list.h:152
+#: command-list.h:153
msgid "Create, list, delete refs to replace objects"
msgstr "建立、列出、刪除物件取代引用"
-#: command-list.h:153
+#: command-list.h:154
msgid "Generates a summary of pending changes"
msgstr "生成待定更改的摘要"
-#: command-list.h:154
+#: command-list.h:155
msgid "Reuse recorded resolution of conflicted merges"
msgstr "重用衝突合併的解決方案記錄"
-#: command-list.h:155
+#: command-list.h:156
msgid "Reset current HEAD to the specified state"
msgstr "重設目前 HEAD 到指定狀態"
-#: command-list.h:156
+#: command-list.h:157
msgid "Restore working tree files"
msgstr "復原工作區檔案"
-#: command-list.h:157
+#: command-list.h:158
msgid "Revert some existing commits"
msgstr "還原一些現存提交"
-#: command-list.h:158
+#: command-list.h:159
msgid "Lists commit objects in reverse chronological order"
msgstr "按時間順序列出提交物件"
-#: command-list.h:159
+#: command-list.h:160
msgid "Pick out and massage parameters"
msgstr "選出並處理參數"
-#: command-list.h:160
+#: command-list.h:161
msgid "Remove files from the working tree and from the index"
msgstr "從工作區和索引中刪除檔案"
-#: command-list.h:161
+#: command-list.h:162
msgid "Send a collection of patches as emails"
msgstr "透過電子信件傳送一組修補檔"
-#: command-list.h:162
+#: command-list.h:163
msgid "Push objects over Git protocol to another repository"
msgstr "使用 Git 協定推送物件到另一個版本庫"
-#: command-list.h:163
+#: command-list.h:164
msgid "Restricted login shell for Git-only SSH access"
msgstr "只允許 Git SSH 存取的受限登入shell"
-#: command-list.h:164
+#: command-list.h:165
msgid "Summarize 'git log' output"
msgstr "'git log' 輸出摘要"
-#: command-list.h:165
+#: command-list.h:166
msgid "Show various types of objects"
msgstr "顯示各種類型的物件"
-#: command-list.h:166
+#: command-list.h:167
msgid "Show branches and their commits"
msgstr "顯示分支和提交"
-#: command-list.h:167
+#: command-list.h:168
msgid "Show packed archive index"
msgstr "顯示打包歸檔索引"
-#: command-list.h:168
+#: command-list.h:169
msgid "List references in a local repository"
msgstr "顯示本機版本庫中的引用"
-#: command-list.h:169
+#: command-list.h:170
msgid "Git's i18n setup code for shell scripts"
msgstr "為 shell 腳本準備的 Git 國際化設定程式碼"
-#: command-list.h:170
+#: command-list.h:171
msgid "Common Git shell script setup code"
msgstr "常用的 Git shell 腳本設定程式碼"
-#: command-list.h:171
+#: command-list.h:172
msgid "Initialize and modify the sparse-checkout"
-msgstr "初始化並修改稀疏簽出"
+msgstr "初始化並修改稀疏檢出"
-#: command-list.h:172
+#: command-list.h:173
msgid "Stash the changes in a dirty working directory away"
msgstr "儲藏髒工作區中的修改"
-#: command-list.h:173
+#: command-list.h:174
msgid "Add file contents to the staging area"
msgstr "將檔案內容新增到索引"
-#: command-list.h:174
+#: command-list.h:175
msgid "Show the working tree status"
msgstr "顯示工作區狀態"
-#: command-list.h:175
+#: command-list.h:176
msgid "Remove unnecessary whitespace"
msgstr "刪除不必要的空白字元"
-#: command-list.h:176
+#: command-list.h:177
msgid "Initialize, update or inspect submodules"
msgstr "初始化、更新或檢查子模組"
-#: command-list.h:177
+#: command-list.h:178
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Subversion 版本庫和 Git 之間的雙向動作"
-#: command-list.h:178
+#: command-list.h:179
msgid "Switch branches"
msgstr "切換分支"
-#: command-list.h:179
+#: command-list.h:180
msgid "Read, modify and delete symbolic refs"
msgstr "讀取、修改和刪除符號引用"
-#: command-list.h:180
+#: command-list.h:181
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "建立、列出、刪除或驗證一個 GPG 簽名的標籤物件"
-#: command-list.h:181
+#: command-list.h:182
msgid "Creates a temporary file with a blob's contents"
msgstr "用 blob 資料物件的內容建立一個暫存檔"
-#: command-list.h:182
+#: command-list.h:183
msgid "Unpack objects from a packed archive"
msgstr "從打包檔案中解壓縮物件"
-#: command-list.h:183
+#: command-list.h:184
msgid "Register file contents in the working tree to the index"
msgstr "將工作區的檔案內容註冊到索引"
-#: command-list.h:184
+#: command-list.h:185
msgid "Update the object name stored in a ref safely"
msgstr "安全地更新儲存於引用中的物件名稱"
-#: command-list.h:185
+#: command-list.h:186
msgid "Update auxiliary info file to help dumb servers"
msgstr "更新輔助訊息檔案以協助啞協定服務"
-#: command-list.h:186
+#: command-list.h:187
msgid "Send archive back to git-archive"
msgstr "將存檔傳送回 git-archive"
-#: command-list.h:187
+#: command-list.h:188
msgid "Send objects packed back to git-fetch-pack"
msgstr "將物件壓縮包傳送回 git-fetch-pack"
-#: command-list.h:188
+#: command-list.h:189
msgid "Show a Git logical variable"
msgstr "顯示 Git 邏輯變數"
-#: command-list.h:189
+#: command-list.h:190
msgid "Check the GPG signature of commits"
msgstr "檢查 GPG 提交簽名"
-#: command-list.h:190
+#: command-list.h:191
msgid "Validate packed Git archive files"
msgstr "驗證打包的 Git 封存檔案"
-#: command-list.h:191
+#: command-list.h:192
msgid "Check the GPG signature of tags"
msgstr "檢查標籤的 GPG 簽名"
-#: command-list.h:192
+#: command-list.h:193
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Git web 介面(Git 版本庫的 web 前端)"
-#: command-list.h:193
+#: command-list.h:194
msgid "Show logs with difference each commit introduces"
msgstr "顯示每一個提交引入的差異日誌"
-#: command-list.h:194
+#: command-list.h:195
msgid "Manage multiple working trees"
msgstr "管理多個工作區"
-#: command-list.h:195
+#: command-list.h:196
msgid "Create a tree object from the current index"
msgstr "從目前索引建立一個樹狀物件"
-#: command-list.h:196
+#: command-list.h:197
msgid "Defining attributes per path"
msgstr "定義路徑的屬性"
-#: command-list.h:197
+#: command-list.h:198
msgid "Git command-line interface and conventions"
msgstr "Git 指令列介面和約定"
-#: command-list.h:198
+#: command-list.h:199
msgid "A Git core tutorial for developers"
msgstr "面向開發人員的 Git 核心教學"
-#: command-list.h:199
+#: command-list.h:200
msgid "Git for CVS users"
msgstr "適合 CVS 使用者的 Git 協助"
-#: command-list.h:200
+#: command-list.h:201
msgid "Tweaking diff output"
msgstr "調整差異輸出"
-#: command-list.h:201
+#: command-list.h:202
msgid "A useful minimum set of commands for Everyday Git"
msgstr "每一天 Git 的一組有用的最小指令集合"
-#: command-list.h:202
+#: command-list.h:203
+msgid "Frequently asked questions about using Git"
+msgstr "Git 使用的常見問題"
+
+#: command-list.h:204
msgid "A Git Glossary"
msgstr "Git 詞彙表"
-#: command-list.h:203
+#: command-list.h:205
msgid "Hooks used by Git"
msgstr "Git 使用的掛鉤"
-#: command-list.h:204
+#: command-list.h:206
msgid "Specifies intentionally untracked files to ignore"
msgstr "忽略指定的未追蹤檔案"
-#: command-list.h:205
+#: command-list.h:207
msgid "Defining submodule properties"
msgstr "定義子模組屬性"
-#: command-list.h:206
+#: command-list.h:208
msgid "Git namespaces"
msgstr "Git 名字空間"
-#: command-list.h:207
+#: command-list.h:209
msgid "Git Repository Layout"
msgstr "Git 版本庫配置"
-#: command-list.h:208
+#: command-list.h:210
msgid "Specifying revisions and ranges for Git"
msgstr "指定 Git 的版本和版本範圍"
-#: command-list.h:209
+#: command-list.h:211
msgid "Mounting one repository inside another"
msgstr "在某個版本庫掛載某個版本庫"
-#: command-list.h:210
+#: command-list.h:212
msgid "A tutorial introduction to Git: part two"
msgstr "一個 Git 教學:第二部分"
-#: command-list.h:211
+#: command-list.h:213
msgid "A tutorial introduction to Git"
msgstr "一個 Git 教學"
-#: command-list.h:212
+#: command-list.h:214
msgid "An overview of recommended workflows with Git"
msgstr "Git 推薦的工作流概覽"
@@ -22746,20 +23199,20 @@ msgstr "未提供日誌檔案"
msgid "cannot read $file for replaying"
msgstr "不能讀取 $file 來重放"
-#: git-bisect.sh:232
+#: git-bisect.sh:233
msgid "?? what are you talking about?"
msgstr "?? 您在說什麼?"
-#: git-bisect.sh:241
+#: git-bisect.sh:243
msgid "bisect run failed: no command provided."
msgstr "二分尋找執行失敗:沒有提供指令。"
-#: git-bisect.sh:246
+#: git-bisect.sh:248
#, sh-format
msgid "running $command"
msgstr "執行 $command"
-#: git-bisect.sh:253
+#: git-bisect.sh:255
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -22768,11 +23221,11 @@ msgstr ""
"二分尋找執行失敗:\n"
"指令 '$command' 的離開碼 $res 小於 0 或大於等於 128"
-#: git-bisect.sh:279
+#: git-bisect.sh:281
msgid "bisect run cannot continue any more"
msgstr "二分尋找不能繼續執行"
-#: git-bisect.sh:285
+#: git-bisect.sh:287
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -22781,11 +23234,11 @@ msgstr ""
"二分尋找執行失敗:\n"
"'bisect_state $state' 離開碼為 $res"
-#: git-bisect.sh:292
+#: git-bisect.sh:294
msgid "bisect run success"
msgstr "二分尋找執行成功"
-#: git-bisect.sh:300
+#: git-bisect.sh:302
msgid "We are not bisecting."
msgstr "我們沒有在二分尋找。"
@@ -22827,128 +23280,46 @@ msgstr "嘗試和 $pretty_name 的簡單合併"
msgid "Simple merge did not work, trying automatic merge."
msgstr "簡單合併未生效,嘗試自動合併。"
-#: git-legacy-stash.sh:221
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "無法刪除暫時索引(不應發生)"
-
-#: git-legacy-stash.sh:272
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "無法用 $w_commit 更新 $ref_stash"
-
-#: git-legacy-stash.sh:324
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "錯誤:'stash push' 的未知選項:$option"
-
-#: git-legacy-stash.sh:356
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "儲存工作目錄和索引狀態 $stash_msg"
-
-#: git-legacy-stash.sh:536
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "未知選項: $opt"
-
-#: git-legacy-stash.sh:556
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "指定了太多的版本:$REV"
-
-#: git-legacy-stash.sh:571
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference 不是一個有效的引用"
-
-#: git-legacy-stash.sh:599
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' 不是儲藏式提交"
-
-#: git-legacy-stash.sh:610
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' 不是一個儲藏引用"
-
-#: git-legacy-stash.sh:618
-msgid "unable to refresh index"
-msgstr "無法重新整理索引"
-
-#: git-legacy-stash.sh:622
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "無法在合併過程套用儲藏"
-
-#: git-legacy-stash.sh:630
-msgid "Conflicts in index. Try without --index."
-msgstr "索引中有衝突。嘗試不使用 --index。"
-
-#: git-legacy-stash.sh:632
-msgid "Could not save index tree"
-msgstr "不能儲存索引樹"
-
-#: git-legacy-stash.sh:641
-msgid "Could not restore untracked files from stash entry"
-msgstr "無法從儲藏條目中復原未追蹤檔案"
-
-#: git-legacy-stash.sh:666
-msgid "Cannot unstage modified files"
-msgstr "無法將修改的檔案取消暫存"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "捨棄了 ${REV} ($s)"
-
-#: git-legacy-stash.sh:705
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}:無法捨棄儲藏條目"
-
-#: git-legacy-stash.sh:792
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(為復原資料輸入 \"git stash apply\")"
-
-#: git-submodule.sh:203
+#: git-submodule.sh:205
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "只能在工作區的頂級目錄中使用相對路徑"
-#: git-submodule.sh:213
+#: git-submodule.sh:215
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "版本庫 URL:'$repo' 必須是絕對路徑或以 ./|../ 起始"
-#: git-submodule.sh:232
+#: git-submodule.sh:234
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' 已經存在於索引中"
-#: git-submodule.sh:235
+#: git-submodule.sh:237
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' 已經存在於索引中且不是一個子模組"
-#: git-submodule.sh:242
+#: git-submodule.sh:244
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' 沒有簽出的提交"
+msgstr "'$sm_path' 沒有檢出的提交"
-#: git-submodule.sh:273
+#: git-submodule.sh:275
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "新增位於 '$sm_path' 的現存版本庫到索引"
-#: git-submodule.sh:275
+#: git-submodule.sh:277
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' 已存在且不是一個有效的 git 版本庫"
-#: git-submodule.sh:283
+#: git-submodule.sh:285
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "本機發現 '$sm_name' 的一個 git 目錄,與其對應的遠端版本庫:"
-#: git-submodule.sh:285
+#: git-submodule.sh:287
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -22963,51 +23334,51 @@ msgstr ""
"使用 '--force' 選項。如果本機 git 目錄不是正確的版本庫\n"
"或者您不確定這裡的含義,使用 '--name' 選項選擇另外的名稱。"
-#: git-submodule.sh:291
+#: git-submodule.sh:293
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "啟動本機 git 目錄到子模組 '$sm_name'。"
-#: git-submodule.sh:303
+#: git-submodule.sh:305
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
-msgstr "不能簽出子模組 '$sm_path'"
+msgstr "不能檢出子模組 '$sm_path'"
-#: git-submodule.sh:308
+#: git-submodule.sh:310
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "無法新增子模組 '$sm_path'"
-#: git-submodule.sh:317
+#: git-submodule.sh:319
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "無法註冊子模組 '$sm_path'"
-#: git-submodule.sh:590
+#: git-submodule.sh:592
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "無法在子模組路徑 '$displaypath' 中找到目前版本"
-#: git-submodule.sh:600
+#: git-submodule.sh:602
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "無法在子模組路徑 '$sm_path' 中取得"
-#: git-submodule.sh:605
+#: git-submodule.sh:607
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr "無法在子模組路徑 '$sm_path' 中找到目前版本 ${remote_name}/${branch}"
-#: git-submodule.sh:623
+#: git-submodule.sh:625
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
"$sha1:"
msgstr "無法在子模組路徑 '$displaypath' 中取得,嘗試直接取得 $sha1:"
-#: git-submodule.sh:629
+#: git-submodule.sh:631
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -23015,74 +23386,74 @@ msgid ""
msgstr ""
"取得了子模組路徑 '$displaypath',但是它沒有包含 $sha1。直接取得該提交失敗。"
-#: git-submodule.sh:636
+#: git-submodule.sh:638
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "無法在子模組路徑 '$displaypath' 中簽出 '$sha1'"
+msgstr "無法在子模組路徑 '$displaypath' 中檢出 '$sha1'"
-#: git-submodule.sh:637
+#: git-submodule.sh:639
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "子模組路徑 '$displaypath':簽出 '$sha1'"
+msgstr "子模組路徑 '$displaypath':檢出 '$sha1'"
-#: git-submodule.sh:641
+#: git-submodule.sh:643
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "無法在子模組路徑 '$displaypath' 中重定基底 '$sha1'"
-#: git-submodule.sh:642
+#: git-submodule.sh:644
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "子模組路徑 '$displaypath':重定基底至 '$sha1'"
-#: git-submodule.sh:647
+#: git-submodule.sh:649
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "無法合併 '$sha1' 到子模組路徑 '$displaypath' 中"
-#: git-submodule.sh:648
+#: git-submodule.sh:650
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "子模組路徑 '$displaypath':已合併入 '$sha1'"
-#: git-submodule.sh:653
+#: git-submodule.sh:655
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "在子模組 '$displaypath' 中執行 '$command $sha1' 失敗"
-#: git-submodule.sh:654
+#: git-submodule.sh:656
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "子模組 '$displaypath':'$command $sha1'"
-#: git-submodule.sh:685
+#: git-submodule.sh:687
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "無法遞迴進子模組路徑 '$displaypath'"
-#: git-submodule.sh:896
+#: git-submodule.sh:878
msgid "The --cached option cannot be used with the --files option"
msgstr "選項 --cached 不能和選項 --files 同時使用"
-#: git-submodule.sh:948
+#: git-submodule.sh:930
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "意外的模式 $mod_dst"
# 譯者:請維持前導空格
-#: git-submodule.sh:968
+#: git-submodule.sh:950
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 警告:$display_name 未包含提交 $sha1_src"
# 譯者:請維持前導空格
-#: git-submodule.sh:971
+#: git-submodule.sh:953
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 警告:$display_name 未包含提交 $sha1_dst"
# 譯者:請維持前導空格
-#: git-submodule.sh:974
+#: git-submodule.sh:956
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
@@ -23101,6 +23472,16 @@ msgstr "已應用 autostash。"
msgid "Cannot store $stash_sha1"
msgstr "不能儲存 $stash_sha1"
+#: git-rebase--preserve-merges.sh:113
+msgid ""
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"應用 autostash 導致衝突。\n"
+"您的修改安全地儲存在儲藏區中。\n"
+"您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"
+
#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
@@ -23370,7 +23751,7 @@ msgstr "無法執行編輯器"
#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
-msgstr "不能簽出 $switch_to"
+msgstr "不能檢出 $switch_to"
#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
@@ -23412,7 +23793,7 @@ msgstr "不能切換目錄到 $cdup,工作區的頂級目錄"
#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
-msgstr "致命錯誤:$program_name 不能在沒有工作區的情況下使用"
+msgstr "致命錯誤:$program_name 不能在沒有工作區的情況下使用。"
#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
@@ -23914,7 +24295,7 @@ msgstr "摘要信件為空,跳過\n"
#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
-msgstr "您確認要使用 <%s> [y/N]?"
+msgstr "您是否要使用 <%s> [y/N]? "
#: git-send-email.perl:913
msgid ""
@@ -23924,7 +24305,7 @@ msgstr "如下檔案含 8bit 內容,但沒有聲明一個 Content-Transfer-Enc
#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr "要聲明 8bit 為什麼樣的編碼格式 [UTF-8]?"
+msgstr "要宣告 8bit 為什麼樣的編碼格式 [UTF-8]? "
#: git-send-email.perl:926
#, perl-format
@@ -23936,7 +24317,7 @@ msgid ""
msgstr ""
"拒絕傳送,因為修補檔\n"
"\t%s\n"
-"包含範本標題 '*** SUBJECT HERE ***'。如果確實想要傳送,使用參數 --force。\n"
+"包含範本標題 '*** SUBJECT HERE ***'。如果確定想要傳送,使用參數 --force。\n"
#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
@@ -23949,7 +24330,7 @@ msgstr "致命錯誤:別名 '%s' 擴展為它自己\n"
#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
-msgstr "Message-ID 被用作第一封信件的 In-Reply-To ?"
+msgstr "(如果有)Message-ID 是否要被用作第一封信件的 In-Reply-To ? "
#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
@@ -24118,3 +24499,127 @@ msgstr "略過 %s 含備份後綴 '%s'。\n"
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "您真的要傳送 %s?[y|N]:"
+
+#, c-format
+#~ msgid ""
+#~ "Cannot update sparse checkout: the following entries are not up to date:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "無法更新稀疏簽出:如下條目不是最新:\n"
+#~ "%s"
+
+#, c-format
+#~ msgid ""
+#~ "The following working tree files would be overwritten by sparse checkout "
+#~ "update:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "工作區中下列檔案將被稀疏簽出更新所覆蓋:\n"
+#~ "%s"
+
+#, c-format
+#~ msgid ""
+#~ "The following working tree files would be removed by sparse checkout "
+#~ "update:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "工作區中下列檔案將被稀疏簽出更新所刪除:\n"
+#~ "%s"
+
+#, c-format
+#~ msgid "annotated tag %s has no embedded name"
+#~ msgstr "附註標籤 %s 沒有嵌入名稱"
+
+#~ msgid "automatically stash/stash pop before and after rebase"
+#~ msgstr "重定基底動作前後執行自動儲藏和彈出儲藏"
+
+#~ msgid "--[no-]autostash option is only valid with --rebase."
+#~ msgstr "--[no-]autostash 選項只在使用 --rebase 時有效。"
+
+#~ msgid "(DEPRECATED) keep empty commits"
+#~ msgstr "(棄用) 保持空提交"
+
+#, c-format
+#~ msgid "Could not read '%s'"
+#~ msgstr "不能讀取 '%s'"
+
+#, c-format
+#~ msgid "Cannot store %s"
+#~ msgstr "不能儲存 %s"
+
+#~ msgid "initialize sparse-checkout"
+#~ msgstr "初始化稀疏簽出"
+
+#~ msgid "set sparse-checkout patterns"
+#~ msgstr "設定稀疏簽出樣式"
+
+#~ msgid "disable sparse-checkout"
+#~ msgstr "停用稀疏簽出"
+
+#, c-format
+#~ msgid "could not exec %s"
+#~ msgstr "不能執行 %s"
+
+#~ msgid "Cannot remove temporary index (can't happen)"
+#~ msgstr "無法刪除暫時索引(不應發生)"
+
+#, sh-format
+#~ msgid "Cannot update $ref_stash with $w_commit"
+#~ msgstr "無法用 $w_commit 更新 $ref_stash"
+
+#, sh-format
+#~ msgid "error: unknown option for 'stash push': $option"
+#~ msgstr "錯誤:'stash push' 的未知選項:$option"
+
+#, sh-format
+#~ msgid "Saved working directory and index state $stash_msg"
+#~ msgstr "儲存工作目錄和索引狀態 $stash_msg"
+
+#, sh-format
+#~ msgid "unknown option: $opt"
+#~ msgstr "未知選項: $opt"
+
+#, sh-format
+#~ msgid "Too many revisions specified: $REV"
+#~ msgstr "指定了太多的版本:$REV"
+
+#, sh-format
+#~ msgid "$reference is not a valid reference"
+#~ msgstr "$reference 不是一個有效的引用"
+
+#, sh-format
+#~ msgid "'$args' is not a stash-like commit"
+#~ msgstr "'$args' 不是儲藏式提交"
+
+#, sh-format
+#~ msgid "'$args' is not a stash reference"
+#~ msgstr "'$args' 不是一個儲藏引用"
+
+#~ msgid "unable to refresh index"
+#~ msgstr "無法重新整理索引"
+
+#~ msgid "Cannot apply a stash in the middle of a merge"
+#~ msgstr "無法在合併過程套用儲藏"
+
+#~ msgid "Conflicts in index. Try without --index."
+#~ msgstr "索引中有衝突。嘗試不使用 --index。"
+
+#~ msgid "Could not save index tree"
+#~ msgstr "不能儲存索引樹"
+
+#~ msgid "Could not restore untracked files from stash entry"
+#~ msgstr "無法從儲藏條目中復原未追蹤檔案"
+
+#~ msgid "Cannot unstage modified files"
+#~ msgstr "無法將修改的檔案取消暫存"
+
+#, sh-format
+#~ msgid "Dropped ${REV} ($s)"
+#~ msgstr "捨棄了 ${REV} ($s)"
+
+#, sh-format
+#~ msgid "${REV}: Could not drop stash entry"
+#~ msgstr "${REV}:無法捨棄儲藏條目"
+
+#~ msgid "(To restore them type \"git stash apply\")"
+#~ msgstr "(為復原資料輸入 \"git stash apply\")"