diff options
| -rw-r--r-- | po/ca.po | 264 | ||||
| -rw-r--r-- | po/fr.po | 7403 | ||||
| -rw-r--r-- | po/id.po | 4694 | ||||
| -rw-r--r-- | po/pt_PT.po | 13593 | ||||
| -rw-r--r-- | po/tr.po | 4072 | ||||
| -rw-r--r-- | po/vi.po | 4052 |
6 files changed, 18059 insertions, 16019 deletions
@@ -18,6 +18,7 @@ # dry-run | fer una prova # fatal | fatal # flush | buidar / buidatge +# hint | consell # hook | lligam # hunk | tros # not supported | no està admès @@ -42,8 +43,9 @@ # Anglès | Català # -----------------+--------------------------------- # blame | «blame» -# HEAD | HEAD (f, la branca) +# HEAD | HEAD (f, la branca) - (no s'apostrofa) # cherry pick | «cherry pick» +# promisor | «promisor» # rebase | «rebase» # stage | «stage» # stash | «stash» @@ -801,7 +803,7 @@ msgstr "" #: advice.c:161 #, c-format msgid "%shint: %.*s%s\n" -msgstr "%spista: %.*s%s\n" +msgstr "%sconsell: %.*s%s\n" #: advice.c:252 msgid "Cherry-picking is not possible because you have unmerged files." @@ -1902,7 +1904,7 @@ msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final" #: blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -"--reverse i --first-parent-together requereixen una última comissió " +"--reverse i --first-parent junts requereixen una última comissió " "especificada" #: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 @@ -3405,7 +3407,7 @@ msgid "" msgstr "" "el mode «%s» de «color-moved-ws» és desconegut, els valor possibles són " "«ignore-space-change», «ignore-space-at-eol», «ignore-all-space», «allow-" -"indentation-change»." +"indentation-change»" #: diff.c:333 msgid "" @@ -4088,7 +4090,7 @@ msgstr "no s'ha pogut migrar el directori de «%s» a «%s»" #: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" -msgstr "pista: s'està esperant que el vostre editor tanqui el fitxer...%c" +msgstr "consell: s'està esperant que el vostre editor tanqui el fitxer...%c" #: entry.c:179 msgid "Filtering content" @@ -4476,7 +4478,7 @@ msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH" #: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "" -"Aquestes són ordres del Git habitualment usades en diverses situacions:" +"Aquestes són ordres habituals del Git usades en diverses situacions:" #: help.c:365 git.c:100 #, c-format @@ -4651,9 +4653,9 @@ msgid "sparse:path filters support has been dropped" msgstr "sparse: s'ha eliminat la implementació de filtres de camí sparse" #: list-objects-filter-options.c:105 -#, fuzzy, c-format +#, c-format msgid "'%s' for 'object:type=<type>' isnot a valid object type" -msgstr "«%s» per a «%s» no és una marca de temps vàlida" +msgstr "«%s» per a «object:type=<type>» no és un tipus d'objecte vàlid" #: list-objects-filter-options.c:124 #, c-format @@ -4919,7 +4921,7 @@ msgstr "" msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" "CONFLICTE (canvi de nom/supressió): %s ara té el nom %s a %s, però s'ha suprimit " -"a %s" +"a %s." #: merge-ort.c:2550 merge-recursive.c:3002 #, c-format @@ -5802,9 +5804,9 @@ msgid "unable to unpack contents of %s" msgstr "no s'han pogut desempaquetar els continguts de %s" #: object-name.c:486 -#, fuzzy, c-format +#, c-format msgid "short object ID %s is ambiguous" -msgstr "l'SHA1 %s curt és ambigu" +msgstr "l'id d'objecte curt %s és ambigu" #: object-name.c:497 msgid "The candidates are:" @@ -5850,12 +5852,13 @@ msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "el camí «%s» existeix al disc, però no a «%.*s»" #: object-name.c:1708 -#, fuzzy, c-format +#, c-format msgid "" "path '%s' exists, but not '%s'\n" "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" msgstr "" -"path '%s' existeix però no insinuacions '%s' vol dir '%.*s%s' aka '%.*s./%s'?" +"el camí «%s» existeix, però no «%s»\n" +"consell: volíeu dir «%.*s:%s» conegut com a «%.*s:./%s»?" #: object-name.c:1717 #, c-format @@ -5863,37 +5866,37 @@ msgid "path '%s' does not exist in '%.*s'" msgstr "el camí «%s» no existeix en «%.*s»" #: object-name.c:1745 -#, fuzzy, c-format +#, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" "hint: Did you mean ':%d:%s'?" msgstr "" -"La ruta \"%s\" està en l'índex però no en la indicació de l'etapa per cent." +"el camí «%s» està a l'índex, però no a «stage» %d\n." +"consell: volíeu dir «:%d:%s»?" #: object-name.c:1761 -#, fuzzy, c-format +#, c-format msgid "" "path '%s' is in the index, but not '%s'\n" "hint: Did you mean ':%d:%s' aka ':%d:./%s'?" msgstr "" -"el camí '%s' està en l'índex però no en la indicació '%s' vol dir '%ds' aka " -"'%d./%s'?" +"el camí «%s» està a l'índex, però no a «%s»\n." +"consell: volíeu dir «:%d:%s» conegut com a «:%d:./%s»?" #: object-name.c:1769 -#, fuzzy, c-format +#, c-format msgid "path '%s' exists on disk, but not in the index" -msgstr "el camí «%» existeix al disc però no a l'índex" +msgstr "el camí «%s» existeix al disc, però no a l'índex" #: object-name.c:1771 -#, fuzzy, c-format +#, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "el camí «%s» no existeix (ni al disc ni a l'índex)" #: object-name.c:1784 -#, fuzzy msgid "relative path syntax can't be used outside working tree" msgstr "" -"la sintaxi relativa del camí no es pot utilitzar fora de l'arbre de treball" +"la sintaxi de camí relatiu no es pot utilitzar fora de l'arbre de treball" #: object-name.c:1922 #, c-format @@ -5970,14 +5973,14 @@ msgid "could not stat: %s" msgstr "no s'ha pogut fer stat a: %s" #: pack-write.c:283 -#, fuzzy, c-format +#, c-format msgid "failed to make %s readable" -msgstr "s'ha produït un error en analitzar %s" +msgstr "s'ha produït un error en fer %s llegible" #: pack-write.c:522 -#, fuzzy, c-format +#, c-format msgid "could not write '%s' promisor file" -msgstr "no s'ha pogut escriure «%s»" +msgstr "no s'ha pogut escriure «%s» al fitxer «promisor»" #: packfile.c:625 msgid "offset before end of packfile (broken .idx?)" @@ -6198,9 +6201,8 @@ msgid "unable to write delim packet" msgstr "no s'ha pogut escriure el paquet delim" #: pkt-line.c:106 -#, fuzzy msgid "unable to write stateless separator packet" -msgstr "no s'ha pogut escriure el paquet de buidatge" +msgstr "no s'ha pogut escriure el paquet de separació sense estat" #: pkt-line.c:113 msgid "flush packet write failed" @@ -6279,9 +6281,8 @@ msgid "promisor remote name cannot begin with '/': %s" msgstr "el nom remot «promisor» no pot començar amb «/»: %s" #: protocol-caps.c:103 -#, fuzzy msgid "object-info: expected flush after arguments" -msgstr "s'esperava una neteja després de les capacitats" +msgstr "object-info: s'esperava una neteja després dels arguments" #: prune-packed.c:35 msgid "Removing duplicate objects" @@ -6301,13 +6302,13 @@ msgid "could not parse commit '%s'" msgstr "no s'ha pogut analitzar la comissió «%s»" #: range-diff.c:115 -#, fuzzy, c-format +#, c-format msgid "" "could not parse first line of `log` output: did not start with 'commit ': " "'%s'" msgstr "" -"no s'ha pogut analitzar la primera línia de la sortida `log` no s'ha iniciat " -"amb 'commit '%s'" +"no s'ha pogut analitzar la primera línia de la sortida «log»: no començava " +"amb «commit»: «%s»" #: range-diff.c:140 #, c-format @@ -6319,9 +6320,9 @@ msgid "failed to generate diff" msgstr "s'ha produït un error en generar el diff" #: range-diff.c:558 -#, fuzzy +# msgid "--left-only and --right-only are mutually exclusive" -msgstr "-p i --overlay són mútuament excloents" +msgstr "--left-only i --right-only són mútuament excloents" #: range-diff.c:561 range-diff.c:563 #, c-format @@ -6344,9 +6345,9 @@ msgstr "" "%s: només pot afegir fitxers normals, enllaços simbòlics o directoris git" #: read-cache.c:751 -#, fuzzy, c-format +#, c-format msgid "'%s' does not have a commit checked out" -msgstr "\"%s\" no té una comissió comprovada" +msgstr "«%s» no té una comissió comprovada" #: read-cache.c:803 #, c-format @@ -6425,19 +6426,18 @@ msgid "malformed name field in the index, near path '%s'" msgstr "camp del nom mal formatat l'índex, camí a prop «%s»" #: read-cache.c:1924 -#, fuzzy msgid "unordered stage entries in index" -msgstr "entrades d'escenari no ordenades en l'índex" +msgstr "entrades «stage» no ordenades en l'índex" #: read-cache.c:1927 -#, fuzzy, c-format +#, c-format msgid "multiple stage entries for merged file '%s'" -msgstr "múltiples entrades d'etapa per al fitxer fusionat «%s»" +msgstr "múltiples entrades «stage» per al fitxer fusionat «%s»" #: read-cache.c:1930 -#, fuzzy, c-format +#, c-format msgid "unordered stage entries for '%s'" -msgstr "entrades d'etapa no ordenades per «%s»" +msgstr "entrades «stage» no ordenades per a «%s»" #: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 #: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183 @@ -6504,9 +6504,8 @@ msgid "could not close '%s'" msgstr "no s'ha pogut tancar «%s»" #: read-cache.c:3138 -#, fuzzy msgid "failed to convert to a sparse-index" -msgstr "s'ha produït un error en netejar l'índex" +msgstr "s'ha produït un error en convertir a un índex dispers" #: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441 #, c-format @@ -6529,9 +6528,9 @@ msgid "cannot fix permission bits on '%s'" msgstr "no s'han pogut corregir els bits de permisos en «%s»" #: read-cache.c:3412 -#, fuzzy, c-format +#, c-format msgid "%s: cannot drop to stage #0" -msgstr "els percentatges no poden descendir a l'escenari #0" +msgstr "%s: no es pot baixar fins al «stage» #0" #: rebase-interactive.c:11 msgid "" @@ -6603,11 +6602,11 @@ msgstr "" "Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n" #: rebase-interactive.c:66 -#, fuzzy, c-format +#, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" -msgstr[0] "Rebase %s en un 1% (ordre<unk>d)" -msgstr[1] "Rebase de percentatges sobre els percentatges (ordres<unk>d)" +msgstr[0] "Fes «rebase» de %s a %s (%d ordre)" +msgstr[1] "Fes «rebase» de %s a %s (%d ordres)" #: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218 msgid "" @@ -6993,19 +6992,19 @@ msgid "invalid branch name: %s = %s" msgstr "nom de branca no vàlida: %s = %s" #: refs.c:674 -#, fuzzy, c-format +#, c-format msgid "ignoring dangling symref %s" -msgstr "ignorant symref per sota" +msgstr "s'està ignorant symref penjant %s" #: refs.c:922 -#, fuzzy, c-format +#, c-format msgid "log for ref %s has gap after %s" -msgstr "registre per a ref %s have gap després de percentatges" +msgstr "registre per a ref %s té un buit després de %s" #: refs.c:929 -#, fuzzy, c-format +#, , c-format msgid "log for ref %s unexpectedly ended on %s" -msgstr "registre per als ref%s inesperadament ha acabat en percentatges" +msgstr "registre per als ref %s ha acabat inesperadament a %s" #: refs.c:994 #, c-format @@ -7018,9 +7017,9 @@ msgid "refusing to update ref with bad name '%s'" msgstr "s'està refusant la referència amb nom malmès «%s»" #: refs.c:1157 -#, fuzzy, c-format +#, c-format msgid "update_ref failed for ref '%s': %s" -msgstr "ha fallat updateref per al ref '%s'%s" +msgstr "ha fallat update_ref per a la ref «%s»: %s" #: refs.c:2051 #, c-format @@ -7032,9 +7031,8 @@ msgid "ref updates forbidden inside quarantine environment" msgstr "no està permès actualitzar les referències en un entorn de quarantena" #: refs.c:2142 -#, fuzzy msgid "ref updates aborted by hook" -msgstr "les actualitzacions de referències s'han avortat per ganxo" +msgstr "les actualitzacions de referències s'han avortat per un lligam" #: refs.c:2242 refs.c:2272 #, c-format @@ -7070,7 +7068,7 @@ msgstr "refspec no vàlida: «%s»" #: remote.c:351 #, fuzzy, c-format msgid "config remote shorthand cannot begin with '/': %s" -msgstr "config remote abreviation no pot començar amb «/» per cents" +msgstr "config remote abreviation no pot començar amb «/»: %s" #: remote.c:399 msgid "more than one receivepack given, using the first" @@ -9014,9 +9012,9 @@ msgid "could not read ref %s" msgstr "no s'ha pogut llegir la referència %s" #: transport-helper.c:594 -#, fuzzy, c-format +#, c-format msgid "unknown response to connect: %s" -msgstr "resposta desconeguda per connectar els percentatges" +msgstr "resposta desconeguda en connectar: %s" #: transport-helper.c:616 msgid "setting remote service path not supported by protocol" @@ -9132,12 +9130,12 @@ msgstr "ha fallat read(%)" #: transport-helper.c:1412 #, fuzzy, c-format msgid "write(%s) failed" -msgstr "ha fallat write(%)" +msgstr "ha fallat l(%)" #: transport-helper.c:1461 -#, fuzzy, c-format +#, c-format msgid "%s thread failed" -msgstr "ha fallat el fil per cents" +msgstr "%s ha fallat el fil" #: transport-helper.c:1465 #, fuzzy, c-format @@ -9214,9 +9212,8 @@ msgid "transport '%s' not allowed" msgstr "no es permet el transport «%s»" #: transport.c:1079 -#, fuzzy msgid "git-over-rsync is no longer supported" -msgstr "git-over-rsync ja no és compatible" +msgstr "git-over-rsync ja no s'admet" #: transport.c:1181 #, c-format @@ -9591,12 +9588,12 @@ msgid "failed to read '%s'" msgstr "s'ha produït un error en llegir «%s»" #: worktree.c:304 -#, fuzzy, c-format +#, c-format msgid "'%s' at main working tree is not the repository directory" -msgstr "'%s' a l'arbre de treball principal no és el directori del repositori" +msgstr "«%s» a l'arbre de treball principal no és al directori del repositori" #: worktree.c:315 -#, fuzzy, c-format +#, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "El fitxer «%s» no conté el camí absolut a la ubicació de l'arbre de treball" @@ -9633,7 +9630,6 @@ msgid ".git file incorrect" msgstr "fitxer .git malmès" #: worktree.c:727 -#, fuzzy msgid "not a valid path" msgstr "no és un camí vàlid" @@ -9642,9 +9638,8 @@ msgid "unable to locate repository; .git is not a file" msgstr "no s'ha pogut trobar el repositori; .git no és un fitxer" #: worktree.c:737 -#, fuzzy msgid "unable to locate repository; .git file does not reference a repository" -msgstr "no s'ha pogut trobar el repositori; .git no és un fitxer" +msgstr "no s'ha pogut trobar el repositori; el fitxer .git no fa referència a un repositori" #: worktree.c:741 msgid "unable to locate repository; .git file broken" @@ -9659,38 +9654,30 @@ msgid "gitdir incorrect" msgstr "gitdir incorrecte" #: worktree.c:776 -#, fuzzy msgid "not a valid directory" -msgstr "no és en un directori git" +msgstr "no és en un directori vàlid" #: worktree.c:782 -#, fuzzy msgid "gitdir file does not exist" -msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix" +msgstr "el fitxer gitdir no existeix" #: worktree.c:787 worktree.c:796 -#, fuzzy, c-format +#, c-format msgid "unable to read gitdir file (%s)" -msgstr "no s'ha pogut llegir l'arbre (%s)" +msgstr "no s'ha pogut llegir el fitxer gitdir (%s)" #: worktree.c:806 -#, fuzzy, c-format +#, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" -msgstr "" -"S'estan eliminant els arbres de treball/%s: lectura curta (s'esperaven " -"%<PRIuMAX> bytes, se n'han llegit %<PRIuMAX>)" +msgstr "lectura curta (s'esperaven %<PRIuMAX> bytes, llegits %<PRIuMAX>)" #: worktree.c:814 -#, fuzzy msgid "invalid gitdir file" -msgstr "fitxer de configuració no vàlid %s" +msgstr "fitxer gitdir no vàlid" #: worktree.c:822 -#, fuzzy msgid "gitdir file points to non-existent location" -msgstr "" -"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no " -"existent" +msgstr "el fitxer gitdir indica una ubicació no existent" #: wrapper.c:197 wrapper.c:367 #, c-format @@ -9711,14 +9698,13 @@ msgid "Unmerged paths:" msgstr "Camins sense fusionar:" #: wt-status.c:187 wt-status.c:219 -#, fuzzy msgid " (use \"git restore --staged <file>...\" to unstage)" -msgstr "(useu \"git restitution --staged <file>\" per a unstage)" +msgstr " (useu «git restore --staged <fitxer>...» per a fer «unstage»)" #: wt-status.c:190 wt-status.c:222 -#, fuzzy, c-format +#, c-format msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" -msgstr "(useu \"git restitution --source=%s --staged <file>\" per a unstage)" +msgstr " (useu «git restore --source=%s --staged <fitxer>...» per a fer «unstage»)" #: wt-status.c:193 wt-status.c:225 msgid " (use \"git rm --cached <file>...\" to unstage)" @@ -9755,12 +9741,10 @@ msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (useu «git add/rm <fitxer>...» per a actualitzar què es cometrà)" #: wt-status.c:241 -#, fuzzy msgid "" " (use \"git restore <file>...\" to discard changes in working directory)" msgstr "" -"(useu \"git restore <file>\" per descartar els canvis en el directori de " -"treball)" +" (useu «git restore <file>...» per a descartar els canvis en el directori de treball)" #: wt-status.c:243 msgid " (commit or discard the untracked or modified content in submodules)" @@ -9868,14 +9852,15 @@ msgstr "" "Tot el que hi ha a sota s'ignorarà." #: wt-status.c:1115 -#, fuzzy, c-format +#, c-format msgid "" "\n" "It took %.2f seconds to compute the branch ahead/behind values.\n" "You can use '--no-ahead-behind' to avoid this.\n" msgstr "" -"S'ha trigat un 2%f segons a calcular la branca endavant/darrere dels valors. " -"Podeu utilitzar «--no-perhead-behind» per evitar-ho." +"\n" +"S'ha trigat un %.2f segons a calcular els valors de la branca d'endavant i darrere.\n" +"Podeu utilitzar «--no-ahead-behind» per a evitar-ho.\n" #: wt-status.c:1145 msgid "You have unmerged paths." @@ -17053,7 +17038,7 @@ msgstr "escurça els remolcs buits" #: builtin/interpret-trailers.c:99 msgid "where to place the new trailer" -msgstr "on ubica" +msgstr "on ubicar el «trailer» nou" #: builtin/interpret-trailers.c:101 msgid "action if trailer already exists" @@ -17302,30 +17287,25 @@ msgid "mark the series as Nth re-roll" msgstr "marca la sèrie com a l'enèsima llançada" #: builtin/log.c:1765 -#, fuzzy msgid "max length of output filename" -msgstr "mida màxima de cada fitxer empaquetat de sortida" +msgstr "mida màxima del nom del fitxer de sortida" #: builtin/log.c:1767 -#, fuzzy msgid "use [RFC PATCH] instead of [PATCH]" -msgstr "Usa [RFC PATCH] en lloc de [PATCH]" +msgstr "useu [RFC PATCH] en comptes de [PATCH]" #: builtin/log.c:1770 -#, fuzzy msgid "cover-from-description-mode" -msgstr "preferences-from-description-mode" +msgstr "cover-from-description-mode" #: builtin/log.c:1771 -#, fuzzy msgid "generate parts of a cover letter based on a branch's description" msgstr "" -"genera parts d'una lletra de portada basant-se en la descripció d'una branca" +"genera parts d'una carta de presentació basant-se en la descripció d'una branca" #: builtin/log.c:1773 -#, fuzzy msgid "use [<prefix>] instead of [PATCH]" -msgstr "Usa [<prefix>] en lloc de [PATCH]" +msgstr "useu [<prefix>] en comptes de [PATCH]" #: builtin/log.c:1776 msgid "store resulting files in <dir>" @@ -17438,10 +17418,9 @@ msgid "show progress while generating patches" msgstr "mostra el progrés durant la generació de pedaços" #: builtin/log.c:1821 -#, fuzzy msgid "show changes against <rev> in cover letter or single patch" msgstr "" -"mostra els canvis contra <rev> a la lletra de la portada o a un sol pedaç" +"mostra els canvis contra <rev> a la carta de presentació o a un sol pedaç" #: builtin/log.c:1824 #, fuzzy @@ -17450,7 +17429,6 @@ msgstr "" "mostra els canvis contra <refspec> a la lletra de la portada o a un sol pedaç" #: builtin/log.c:1826 builtin/range-diff.c:28 -#, fuzzy msgid "percentage by which creation is weighted" msgstr "percentatge pel qual la creació és ponderada" @@ -17648,9 +17626,8 @@ msgid "show debugging data" msgstr "mostra les dades de depuració" #: builtin/ls-files.c:674 -#, fuzzy msgid "suppress duplicate entries" -msgstr "omet anomenar cadenes" +msgstr "suprimeix les entrades duplicades" #: builtin/ls-remote.c:9 msgid "" @@ -19073,16 +19050,14 @@ msgid "suboptimal pack - out of memory" msgstr "paquet subòptim - sense memòria" #: builtin/pack-objects.c:2691 -#, fuzzy, c-format +#, c-format msgid "Delta compression using up to %d threads" -msgstr "Compressió delta usant fils de fins a un 1%" +msgstr "Compressió de diferències usant fins a %d fils" #: builtin/pack-objects.c:2830 -#, fuzzy, c-format +#, c-format msgid "unable to pack objects reachable from tag %s" -msgstr "" -"no s'han pogut empaquetar els objectes abastables des de les etiquetes per " -"cent" +msgstr "no s'han pogut empaquetar els objectes abastables des de l'etiqueta %s" #: builtin/pack-objects.c:2916 msgid "Compressing objects" @@ -19407,13 +19382,13 @@ msgid "Enumerating objects" msgstr "S'estan enumerant els objectes" #: builtin/pack-objects.c:4052 -#, fuzzy, c-format +#, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" "reused %<PRIu32>" msgstr "" -"Total%<PRIu32> (delta %<PRIu32>) reutilitzat%<PRIu32> (delta %<PRIu32>) pack-" -"reutilitzat%<PRIu32>" +"Total %<PRIu32> (%<PRIu32> diferències), reusats %<PRIu32> (%<PRIu32> diferències), paquets " +"reusats %<PRIu32>" #: builtin/pack-redundant.c:601 msgid "" @@ -19894,7 +19869,6 @@ msgid "require old value of ref to be at this value" msgstr "requereix que el valor antic de la referència sigui d'aquest valor" #: builtin/push.c:566 builtin/send-pack.c:208 -#, fuzzy msgid "require remote updates to be integrated locally" msgstr "requereix que les actualitzacions remotes s'integrin localment" @@ -20002,12 +19976,10 @@ msgstr "" "tip>." #: builtin/range-diff.c:10 -#, fuzzy msgid "git range-diff [<options>] <old-tip>...<new-tip>" -msgstr "git range-diff [<opcions>] <old-tip><new-tip>" +msgstr "git range-diff [<opcions>] <old-tip>...<new-tip>" #: builtin/range-diff.c:11 -#, fuzzy msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<opcions>] <base> <old-tip> <new-tip>" @@ -20128,7 +20100,6 @@ msgid "suppress feedback messages" msgstr "suprimeix els missatges de retroacció" #: builtin/read-tree.c:188 -#, fuzzy msgid "You need to resolve your current index first" msgstr "Primer heu de resoldre l'índex actual" @@ -20207,9 +20178,8 @@ msgid "sign commits" msgstr "signa les comissions" #: builtin/rebase.c:507 builtin/rebase.c:1328 -#, fuzzy msgid "display a diffstat of what changed upstream" -msgstr "mostra un «diffstat» de la font que ha canviat" +msgstr "mostra un «diffstat» del que ha canviat a la font" #: builtin/rebase.c:509 msgid "continue rebase" @@ -20372,7 +20342,7 @@ msgstr "" "Resoleu tots els conflictes manualment, marqueu-los com a resolts amb\n" "«git add/rm <fitxers_amb_conflicte>», llavors executeu «git rebase --" "continue».\n" -"Podeu en comptes ometre aquesta comissió: executeu «git rebase --skip».\n" +"Alternativament podeu ometre aquesta comissió: executeu «git rebase --skip».\n" "Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», " "executeu «git rebase --abort»." @@ -20481,7 +20451,7 @@ msgstr "sinònim de --reset-author-date" #: builtin/rebase.c:1343 builtin/rebase.c:1347 msgid "passed to 'git apply'" -msgstr "passa-ho a «git-apply»" +msgstr "passa-ho a «git apply»" #: builtin/rebase.c:1345 msgid "ignore changes in whitespace" @@ -20605,7 +20575,7 @@ msgstr "no es pot combinar «--keep-base» amb «--root»" #: builtin/rebase.c:1494 #, fuzzy msgid "cannot combine '--root' with '--fork-point'" -msgstr "no es pot combinar «--keep-base» amb «--root»" +msgstr "no es pot combinar «--root» amb «--root»" #: builtin/rebase.c:1497 msgid "No rebase in progress?" @@ -24402,10 +24372,10 @@ msgid "" "to read about a specific subcommand or concept.\n" "See 'git help git' for an overview of the system." msgstr "" -"«git help -a» i «git help -g» llisten subordres disponibles i\n" +"«git help -a» i «git help -g» llisten les subordres disponibles i\n" "algunes guies de concepte. Vegeu «git help <ordre>» o\n" -"«git help <concepte>» per a llegir sobre una subordre o concepte específic.\n" -"Vegeu «git help git» per a una visió general del sistema." +"«git help <concepte>» per a llegir sobre una subordre o concepte\n" +"específic. Vegeu «git help git» per a una visió general del sistema." #: git.c:188 #, c-format @@ -25155,7 +25125,7 @@ msgstr "executa les tasques basades en l'estat del repositori" #: command-list.h:100 msgid "Prepare patches for e-mail submission" -msgstr "Prepara pedaços per enviar-los per correu electrònic" +msgstr "Prepara pedaços per a enviar-los per correu electrònic" #: command-list.h:101 msgid "Verifies the connectivity and validity of the objects in the database" @@ -25176,7 +25146,7 @@ msgstr "Imprimeix les línies coincidents amb un patró" #: command-list.h:105 msgid "A portable graphical interface to Git" -msgstr "Una interfície gràfic portable per al Git" +msgstr "Una interfície gràfica portable per al Git" #: command-list.h:106 msgid "Compute object ID and optionally creates a blob from a file" @@ -25367,10 +25337,9 @@ msgid "Applies a quilt patchset onto the current branch" msgstr "Aplica un conjunt de pedaços cobert a la branca actual" #: command-list.h:147 -#, fuzzy msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "" -"Compara dos intervals de comissions (p. ex. dues versions d'una branca)" +"Compara dos rangs de comissions (p. ex. dues versions d'una branca)" #: command-list.h:148 msgid "Reads tree information into the index" @@ -25381,7 +25350,6 @@ msgid "Reapply commits on top of another base tip" msgstr "Torna a aplicar les comissions sobre un altre punt de basament" #: command-list.h:150 -#, fuzzy msgid "Receive what is pushed into the repository" msgstr "Rep el que s'envia al repositori" @@ -25476,14 +25444,12 @@ msgid "Common Git shell script setup code" msgstr "Codi de scripts de configuració comuns pel Git shell" #: command-list.h:173 -#, fuzzy msgid "Initialize and modify the sparse-checkout" -msgstr "Inicialitza i modifica la comprovació «sparse»" +msgstr "Inicialitza i modifica el «sparse-checkout»" #: command-list.h:174 -#, fuzzy msgid "Stash the changes in a dirty working directory away" -msgstr "Desa els canvis en un directori de treball brut" +msgstr "Fes «stash» dels canvis en un directori de treball brut" #: command-list.h:175 msgid "Add file contents to the staging area" @@ -25507,7 +25473,7 @@ msgstr "Operació bidireccional entre un repositori a Subversion i Git" #: command-list.h:180 msgid "Switch branches" -msgstr "Commuta branques" +msgstr "Commuta entre branques" #: command-list.h:181 msgid "Read, modify and delete symbolic refs" @@ -76,8 +76,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-05-17 16:02+0800\n" -"PO-Revision-Date: 2021-05-19 17:43+0200\n" +"POT-Creation-Date: 2021-08-03 17:06+0800\n" +"PO-Revision-Date: 2021-08-12 21:06+0200\n" "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -92,19 +92,24 @@ msgstr "" msgid "Huh (%s)?" msgstr "Hein (%s) ?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 builtin/rebase.c:1953 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 +#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 +#: builtin/rebase.c:1953 msgid "could not read index" msgstr "impossible de lire l'index" -#: add-interactive.c:584 git-add--interactive.perl:269 git-add--interactive.perl:294 +#: add-interactive.c:584 git-add--interactive.perl:269 +#: git-add--interactive.perl:294 msgid "binary" msgstr "binaire" -#: add-interactive.c:642 git-add--interactive.perl:278 git-add--interactive.perl:332 +#: add-interactive.c:642 git-add--interactive.perl:278 +#: git-add--interactive.perl:332 msgid "nothing" msgstr "rien" -#: add-interactive.c:643 git-add--interactive.perl:314 git-add--interactive.perl:329 +#: add-interactive.c:643 git-add--interactive.perl:314 +#: git-add--interactive.perl:329 msgid "unchanged" msgstr "inchangé" @@ -117,7 +122,7 @@ msgstr "Mise à jour" msgid "could not stage '%s'" msgstr "impossible d'indexer '%s'" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707 msgid "could not write index" msgstr "impossible d'écrire l'index" @@ -133,7 +138,8 @@ msgstr[1] "%d chemins mis à jour\n" msgid "note: %s is untracked now.\n" msgstr "note : %s n'est plus suivi à présent.\n" -#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298 builtin/reset.c:145 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298 +#: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" @@ -174,12 +180,12 @@ msgstr[1] "%d chemins ajoutés\n" msgid "ignoring unmerged: %s" msgstr "fichier non-fusionné ignoré : %s" -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 +#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "Seuls des fichiers binaires ont changé.\n" -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 +#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "Aucune modification.\n" @@ -198,7 +204,8 @@ msgstr "afficher les chemins comprenant des modifications" #: add-interactive.c:1012 msgid "add working tree state to the staged set of changes" -msgstr "ajouter l'état de l'arbre de travail à l'ensemble des modifications indexées" +msgstr "" +"ajouter l'état de l'arbre de travail à l'ensemble des modifications indexées" #: add-interactive.c:1014 msgid "revert staged set of changes back to the HEAD version" @@ -214,7 +221,9 @@ msgstr "visualiser les diffs entre HEAD et l'index" #: add-interactive.c:1020 msgid "add contents of untracked files to the staged set of changes" -msgstr "ajouter le contenu des fichiers non-suivis à l'ensemble des modifications indexées" +msgstr "" +"ajouter le contenu des fichiers non-suivis à l'ensemble des modifications " +"indexées" #: add-interactive.c:1028 add-interactive.c:1077 msgid "Prompt help:" @@ -256,11 +265,11 @@ msgstr "sélectionner un élément par son numéro" msgid "(empty) select nothing" msgstr "(vide) ne rien sélectionner" -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 +#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 +#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893 msgid "What now" msgstr "Et maintenant" @@ -272,9 +281,13 @@ msgstr "indexé" msgid "unstaged" msgstr "non-indexé" -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 builtin/fetch.c:152 -#: builtin/merge.c:285 builtin/pull.c:190 builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 builtin/submodule--helper.c:1822 -#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 git-add--interactive.perl:213 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309 +#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128 +#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: git-add--interactive.perl:213 msgid "path" msgstr "chemin" @@ -282,7 +295,7 @@ msgstr "chemin" msgid "could not refresh index" msgstr "impossible de rafraîchir l'index" -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 +#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "Au revoir.\n" @@ -308,8 +321,12 @@ msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Indexer cette section [y,n,q,a,d%s,?] ? " #: add-patch.c:39 -msgid "If the patch applies cleanly, the edited hunk will immediately be marked for staging." -msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme indexée." +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"staging." +msgstr "" +"Si le patch s'applique proprement, la section éditée sera immédiatement " +"marquée comme indexée." #: add-patch.c:42 msgid "" @@ -346,8 +363,12 @@ msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Remiser cette section [y,n,q,a,d%s,?] ? " #: add-patch.c:61 -msgid "If the patch applies cleanly, the edited hunk will immediately be marked for stashing." -msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme remisée." +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"stashing." +msgstr "" +"Si le patch s'applique proprement, la section éditée sera immédiatement " +"marquée comme remisée." #: add-patch.c:64 msgid "" @@ -384,8 +405,12 @@ msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? " #: add-patch.c:85 -msgid "If the patch applies cleanly, the edited hunk will immediately be marked for unstaging." -msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme desindexée." +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"unstaging." +msgstr "" +"Si le patch s'applique proprement, la section éditée sera immédiatement " +"marquée comme desindexée." #: add-patch.c:88 msgid "" @@ -422,8 +447,12 @@ msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? " #: add-patch.c:108 add-patch.c:176 add-patch.c:221 -msgid "If the patch applies cleanly, the edited hunk will immediately be marked for applying." -msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme appliquée." +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"applying." +msgstr "" +"Si le patch s'applique proprement, la section éditée sera immédiatement " +"marquée comme appliquée." #: add-patch.c:111 msgid "" @@ -439,29 +468,37 @@ msgstr "" "a - appliquer cette section et toutes les suivantes de ce fichier\n" "d - ne pas appliquer cette section ni les suivantes de ce fichier\n" -#: add-patch.c:126 git-add--interactive.perl:1455 git-add--interactive.perl:1473 +#: add-patch.c:126 git-add--interactive.perl:1455 +#: git-add--interactive.perl:1473 #, c-format, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?] ? " -#: add-patch.c:127 git-add--interactive.perl:1456 git-add--interactive.perl:1474 +#: add-patch.c:127 git-add--interactive.perl:1456 +#: git-add--interactive.perl:1474 #, c-format, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?] ? " -#: add-patch.c:128 git-add--interactive.perl:1457 git-add--interactive.perl:1475 +#: add-patch.c:128 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 #, c-format, perl-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner l'ajout dans l'arbre [y,n,q,a,d%s,?] ? " -#: add-patch.c:129 git-add--interactive.perl:1458 git-add--interactive.perl:1476 +#: add-patch.c:129 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? " #: add-patch.c:131 add-patch.c:154 add-patch.c:199 -msgid "If the patch applies cleanly, the edited hunk will immediately be marked for discarding." -msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme éliminée." +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"discarding." +msgstr "" +"Si le patch s'applique proprement, la section éditée sera immédiatement " +"marquée comme éliminée." #: add-patch.c:134 add-patch.c:202 msgid "" @@ -480,7 +517,8 @@ msgstr "" #: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 #, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? " +msgstr "" +"Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? " #: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 #, c-format, perl-format @@ -495,7 +533,8 @@ msgstr "Abandonner l'ajout de l'index et de l'arbre [y,n,q,a,d%s,?] ? " #: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " +msgstr "" +"Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " #: add-patch.c:157 msgid "" @@ -514,22 +553,28 @@ msgstr "" #: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 #, c-format, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " +msgstr "" +"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d" +"%s,?] ? " #: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 #, c-format, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " +msgstr "" +"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d" +"%s,?] ? " #: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469 #, c-format, perl-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Appliquer l'ajout dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " +msgstr "" +"Appliquer l'ajout dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " #: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " +msgstr "" +"Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " #: add-patch.c:179 msgid "" @@ -559,34 +604,34 @@ msgstr "" "a - appliquer cette section et toutes les suivantes de ce fichier\n" "d - ne pas appliquer cette section ni les suivantes de ce fichier\n" -#: add-patch.c:342 +#: add-patch.c:343 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "impossible d'analyser l'entête de section '%.*s'" -#: add-patch.c:361 add-patch.c:365 +#: add-patch.c:362 add-patch.c:366 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "impossible d'analyser l'entête coloré de section '%.*s'" -#: add-patch.c:419 +#: add-patch.c:420 msgid "could not parse diff" msgstr "impossible d'analyser la diff" -#: add-patch.c:438 +#: add-patch.c:439 msgid "could not parse colored diff" msgstr "impossible d'analyser la diff colorée" -#: add-patch.c:452 +#: add-patch.c:453 #, c-format msgid "failed to run '%s'" msgstr "échec pour lancer '%s'" -#: add-patch.c:611 +#: add-patch.c:612 msgid "mismatched output from interactive.diffFilter" msgstr "sortie sans correspondance depuis interactive.diffFilter" -#: add-patch.c:612 +#: add-patch.c:613 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -594,7 +639,7 @@ msgstr "" "Votre filtre doit maintenir une correspondance un-pour-un\n" "entre les lignes en entrée et en sortie." -#: add-patch.c:790 +#: add-patch.c:791 #, c-format msgid "" "expected context line #%d in\n" @@ -603,7 +648,7 @@ msgstr "" "ligne de contexte attendue #%d dans\n" "%.*s" -#: add-patch.c:805 +#: add-patch.c:806 #, c-format msgid "" "hunks do not overlap:\n" @@ -616,11 +661,12 @@ msgstr "" "\tne se termine pas par :\n" "%.*s" -#: add-patch.c:1081 git-add--interactive.perl:1115 +#: add-patch.c:1082 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n" +msgstr "" +"Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n" -#: add-patch.c:1085 +#: add-patch.c:1086 #, c-format msgid "" "---\n" @@ -634,7 +680,7 @@ msgstr "" "Les lignes commençant par %c seront éliminées.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1099 git-add--interactive.perl:1129 +#: add-patch.c:1100 git-add--interactive.perl:1129 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" @@ -644,11 +690,11 @@ msgstr "" "l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n" "alors l'édition sera abandonnée et la section conservée.\n" -#: add-patch.c:1132 +#: add-patch.c:1133 msgid "could not parse hunk header" msgstr "impossible d'analyser l'entête de section" -#: add-patch.c:1177 +#: add-patch.c:1178 msgid "'git apply --cached' failed" msgstr "'git apply --cached' a échoué" @@ -664,23 +710,26 @@ msgstr "'git apply --cached' a échoué" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1246 git-add--interactive.perl:1242 -msgid "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" l'élimine !) [y|n] ? " +#: add-patch.c:1247 git-add--interactive.perl:1242 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" " +"l'élimine !) [y|n] ? " -#: add-patch.c:1289 +#: add-patch.c:1290 msgid "The selected hunks do not apply to the index!" msgstr "Les sections sélectionnées ne s'applique pas à l'index !" -#: add-patch.c:1290 git-add--interactive.perl:1346 +#: add-patch.c:1291 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "Les appliquer quand même à l'arbre de travail ? " -#: add-patch.c:1297 git-add--interactive.perl:1349 +#: add-patch.c:1298 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "Rien n'a été appliqué.\n" -#: add-patch.c:1354 +#: add-patch.c:1355 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -702,69 +751,69 @@ msgstr "" "e - éditer manuellement la section actuelle\n" "? - afficher l'aide\n" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1517 add-patch.c:1527 msgid "No previous hunk" msgstr "Pas de section précédente" -#: add-patch.c:1521 add-patch.c:1531 +#: add-patch.c:1522 add-patch.c:1532 msgid "No next hunk" msgstr "Pas de section suivante" -#: add-patch.c:1537 +#: add-patch.c:1538 msgid "No other hunks to goto" msgstr "Aucune autre section à atteindre" -#: add-patch.c:1548 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " msgstr "aller à quelle section (<ret> pour voir plus) ? " -#: add-patch.c:1549 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "aller à quelle section ? " -#: add-patch.c:1560 +#: add-patch.c:1561 #, c-format msgid "Invalid number: '%s'" msgstr "Numéro invalide : '%s'" -#: add-patch.c:1565 +#: add-patch.c:1566 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "Désolé, %d seule section disponible." msgstr[1] "Désolé, Seulement %d sections disponibles." -#: add-patch.c:1574 +#: add-patch.c:1575 msgid "No other hunks to search" msgstr "Aucune autre section à rechercher" -#: add-patch.c:1580 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "rechercher la regex ? " -#: add-patch.c:1595 +#: add-patch.c:1596 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Regex de recherche malformée %s : %s" -#: add-patch.c:1612 +#: add-patch.c:1613 msgid "No hunk matches the given pattern" msgstr "Aucune section ne correspond au motif donné" -#: add-patch.c:1619 +#: add-patch.c:1620 msgid "Sorry, cannot split this hunk" msgstr "Désolé, impossible de découper cette section" -#: add-patch.c:1623 +#: add-patch.c:1624 #, c-format msgid "Split into %d hunks." msgstr "Découpée en %d sections." -#: add-patch.c:1627 +#: add-patch.c:1628 msgid "Sorry, cannot edit this hunk" msgstr "Désolé, impossible d'éditer cette section" -#: add-patch.c:1679 +#: add-patch.c:1680 msgid "'git apply' failed" msgstr "'git apply' a échoué" @@ -834,15 +883,20 @@ msgstr "Abandon à cause d'une fusion non terminée." #: advice.c:296 #, c-format msgid "" -"The following pathspecs didn't match any eligible path, but they do match index\n" +"The following pathspecs didn't match any eligible path, but they do match " +"index\n" "entries outside the current sparse checkout:\n" msgstr "" -"Les spécificateurs de chemin suivants n'ont trouvé aucune correspondance, mais correspondent\n" +"Les spécificateurs de chemin suivants n'ont trouvé aucune correspondance, " +"mais correspondent\n" "dans les entrées d'index hors de l'extraction clairsemée actuelle :\n" #: advice.c:303 -msgid "Disable or modify the sparsity rules if you intend to update such entries." -msgstr "Désactiver ou modifier les règles de partialisation si vous allez mettre à jour de telles entrées." +msgid "" +"Disable or modify the sparsity rules if you intend to update such entries." +msgstr "" +"Désactiver ou modifier les règles de partialisation si vous allez mettre à " +"jour de telles entrées." #: advice.c:310 #, c-format @@ -862,16 +916,21 @@ msgid "" "\n" " git switch -\n" "\n" -"Turn off this advice by setting config variable advice.detachedHead to false\n" +"Turn off this advice by setting config variable advice.detachedHead to " +"false\n" "\n" msgstr "" "Note : basculement sur '%s'.\n" "\n" -"Vous êtes dans l'état « HEAD détachée ». Vous pouvez visiter, faire des modifications\n" -"expérimentales et les valider. Il vous suffit de faire un autre basculement pour\n" -"abandonner les commits que vous faites dans cet état sans impacter les autres branches\n" +"Vous êtes dans l'état « HEAD détachée ». Vous pouvez visiter, faire des " +"modifications\n" +"expérimentales et les valider. Il vous suffit de faire un autre basculement " +"pour\n" +"abandonner les commits que vous faites dans cet état sans impacter les " +"autres branches\n" "\n" -"Si vous voulez créer une nouvelle branche pour conserver les commits que vous créez,\n" +"Si vous voulez créer une nouvelle branche pour conserver les commits que " +"vous créez,\n" "il vous suffit d'utiliser l'option -c de la commande switch comme ceci :\n" "\n" " git switch -c <nom-de-la-nouvelle-branche>\n" @@ -880,7 +939,8 @@ msgstr "" "\n" " git switch -\n" "\n" -"Désactivez ce conseil en renseignant la variable de configuration advice.detachedHead à false\n" +"Désactivez ce conseil en renseignant la variable de configuration advice." +"detachedHead à false\n" "\n" #: alias.c:50 @@ -935,22 +995,29 @@ msgstr "nom de fichier du patch introuvable à la ligne %d" #: apply.c:921 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la ligne %d" +msgstr "" +"git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la " +"ligne %d" #: apply.c:927 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant à la ligne %d" +msgstr "" +"git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant " +"à la ligne %d" #: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant à la ligne %d" +msgstr "" +"git apply : mauvais format de git-diff - ancien nom de fichier inconsistant " +"à la ligne %d" #: apply.c:933 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" +msgstr "" +"git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" #: apply.c:962 #, c-format @@ -964,15 +1031,24 @@ msgstr "lignes d'entête inconsistantes %d et %d" #: apply.c:1371 #, c-format -msgid "git diff header lacks filename information when removing %d leading pathname component (line %d)" -msgid_plural "git diff header lacks filename information when removing %d leading pathname components (line %d)" -msgstr[0] "information de nom de fichier manquante dans l'en-tête de git diff lors de la suppression de %d composant de préfixe de chemin (ligne %d)" -msgstr[1] "information de nom de fichier manquante dans l'en-tête de git diff lors de la suppression de %d composants de préfixe de chemin (ligne %d)" +msgid "" +"git diff header lacks filename information when removing %d leading pathname " +"component (line %d)" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname " +"components (line %d)" +msgstr[0] "" +"information de nom de fichier manquante dans l'en-tête de git diff lors de " +"la suppression de %d composant de préfixe de chemin (ligne %d)" +msgstr[1] "" +"information de nom de fichier manquante dans l'en-tête de git diff lors de " +"la suppression de %d composants de préfixe de chemin (ligne %d)" #: apply.c:1384 #, c-format msgid "git diff header lacks filename information (line %d)" -msgstr "information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)" +msgstr "" +"information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)" #: apply.c:1480 #, c-format @@ -1071,17 +1147,22 @@ msgstr "données de patch binaire manquantes pour '%s'" #: apply.c:3104 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" -msgstr "impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section inverse" +msgstr "" +"impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section " +"inverse" #: apply.c:3151 #, c-format msgid "cannot apply binary patch to '%s' without full index line" -msgstr "impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index" +msgstr "" +"impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index" #: apply.c:3162 #, c-format -msgid "the patch applies to '%s' (%s), which does not match the current contents." -msgstr "le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel." +msgid "" +"the patch applies to '%s' (%s), which does not match the current contents." +msgstr "" +"le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel." #: apply.c:3170 #, c-format @@ -1101,7 +1182,9 @@ msgstr "le patch binaire ne s'applique par correctement à '%s'" #: apply.c:3208 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s trouvé)" +msgstr "" +"le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s " +"trouvé)" #: apply.c:3229 #, c-format @@ -1113,7 +1196,8 @@ msgstr "le patch a échoué : %s:%ld" msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214 setup.c:308 +#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214 +#: setup.c:308 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" @@ -1140,7 +1224,8 @@ msgstr "%s : ne correspond pas à l'index" #: apply.c:3571 msgid "repository lacks the necessary blob to perform 3-way merge." -msgstr "le dépôt n'a pas les blobs nécessaires pour effectuer une fusion à 3 points." +msgstr "" +"le dépôt n'a pas les blobs nécessaires pour effectuer une fusion à 3 points." #: apply.c:3574 #, c-format @@ -1186,7 +1271,8 @@ msgstr "%s : type erroné" msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 read-cache.c:1351 +#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892 +#: read-cache.c:1353 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" @@ -1209,7 +1295,8 @@ msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)" #: apply.c:3981 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" -msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s" +msgstr "" +"le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s" #: apply.c:4001 #, c-format @@ -1229,7 +1316,8 @@ msgstr "Vérification du patch %s..." #: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless for submodule %s" -msgstr "l'information sha1 est manquante ou inutilisable pour le sous-module %s" +msgstr "" +"l'information sha1 est manquante ou inutilisable pour le sous-module %s" #: apply.c:4119 #, c-format @@ -1269,14 +1357,16 @@ msgstr "stat du fichier nouvellement créé '%s' impossible" #: apply.c:4327 #, c-format msgid "unable to create backing store for newly created file %s" -msgstr "création du magasin de stockage pour le fichier nouvellement créé %s impossible" +msgstr "" +"création du magasin de stockage pour le fichier nouvellement créé %s " +"impossible" #: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: apply.c:4376 builtin/bisect--helper.c:523 +#: apply.c:4376 builtin/bisect--helper.c:525 #, c-format msgid "failed to write to '%s'" msgstr "échec de l'écriture dans '%s'" @@ -1366,7 +1456,7 @@ msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace." msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace." -#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" @@ -1378,7 +1468,7 @@ msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: apply.c:5000 builtin/am.c:2317 +#: apply.c:5000 builtin/am.c:2318 msgid "num" msgstr "num" @@ -1396,7 +1486,8 @@ msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée" #: apply.c:5010 msgid "show number of added and deleted lines in decimal notation" -msgstr "afficher le nombre de lignes ajoutées et supprimées en notation décimale" +msgstr "" +"afficher le nombre de lignes ajoutées et supprimées en notation décimale" #: apply.c:5012 msgid "instead of applying the patch, output a summary for the input" @@ -1428,11 +1519,13 @@ msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)" #: apply.c:5027 msgid "attempt three-way merge, fall back on normal patch if that fails" -msgstr "tenter une fusion à 3 points, revenir à un rustinage normal en cas d'échec" +msgstr "" +"tenter une fusion à 3 points, revenir à un rustinage normal en cas d'échec" #: apply.c:5029 msgid "build a temporary index based on embedded index information" -msgstr "construire un index temporaire fondé sur l'information de l'index embarqué" +msgstr "" +"construire un index temporaire fondé sur l'information de l'index embarqué" #: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617 msgid "paths are separated with NUL character" @@ -1442,14 +1535,18 @@ msgstr "les chemins sont séparés par un caractère NUL" msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3831 builtin/rebase.c:1347 +#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297 +#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991 +#: builtin/rebase.c:1347 msgid "action" msgstr "action" #: apply.c:5036 msgid "detect new or modified lines that have whitespace errors" -msgstr "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs d'espace" +msgstr "" +"détecter des lignes nouvelles ou modifiées qui contiennent des erreurs " +"d'espace" #: apply.c:5039 apply.c:5042 msgid "ignore changes in whitespace when finding context" @@ -1471,20 +1568,23 @@ msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 builtin/log.c:2295 -#: builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 +#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "mode verbeux" #: apply.c:5054 msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "tolérer des erreurs de détection de retours chariot manquants en fin de fichier" +msgstr "" +"tolérer des erreurs de détection de retours chariot manquants en fin de " +"fichier" #: apply.c:5057 msgid "do not trust the line counts in the hunk headers" msgstr "ne pas se fier au compte de lignes dans les en-têtes de section" -#: apply.c:5059 builtin/am.c:2305 +#: apply.c:5059 builtin/am.c:2306 msgid "root" msgstr "racine" @@ -1526,7 +1626,7 @@ msgstr "le chemin n'est pas codé en UTF-8 valide : %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "le chemin est trop long (%d caractères, SHA1 : %s) : %s" -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 #, c-format msgid "deflate error (%d)" msgstr "erreur de compression (%d)" @@ -1545,8 +1645,11 @@ msgid "git archive --list" msgstr "git archive --list" #: archive.c:16 -msgid "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" -msgstr "git archive --remote <dépôt> [--exec <commande>] [<options>] <arbre ou apparenté> [<chemin>...]" +msgid "" +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" +msgstr "" +"git archive --remote <dépôt> [--exec <commande>] [<options>] <arbre ou " +"apparenté> [<chemin>...]" #: archive.c:17 msgid "git archive --remote <repo> [--exec <cmd>] --list" @@ -1557,12 +1660,14 @@ msgstr "git archive --remote <dépôt> [--exec <commande>] --list" msgid "cannot read %s" msgstr "impossible de lire %s" -#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 builtin/merge.c:1143 +#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 +#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833 +#: builtin/merge.c:1143 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" -#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 +#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" @@ -1604,7 +1709,7 @@ msgstr "fmt" msgid "archive format" msgstr "format d'archive" -#: archive.c:553 builtin/log.c:1772 +#: archive.c:553 builtin/log.c:1775 msgid "prefix" msgstr "préfixe" @@ -1612,9 +1717,12 @@ msgstr "préfixe" msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 -#: builtin/fast-export.c:1207 builtin/fast-export.c:1209 builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105 builtin/ls-files.c:653 -#: builtin/ls-files.c:656 builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 +#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 +#: builtin/fast-export.c:1207 builtin/fast-export.c:1209 +#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105 +#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" msgstr "fichier" @@ -1642,7 +1750,8 @@ msgstr "régler le niveau de compression" msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" -#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 +#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "dépôt" @@ -1650,7 +1759,8 @@ msgstr "dépôt" msgid "retrieve the archive from remote repository <repo>" msgstr "récupérer l'archive depuis le dépôt distant <dépôt>" -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 builtin/notes.c:498 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717 +#: builtin/notes.c:498 msgid "command" msgstr "commande" @@ -1672,7 +1782,8 @@ msgstr "Option --output inattendue" #: archive.c:585 msgid "Options --add-file and --remote cannot be used together" -msgstr "Les options --add-file et --remote ne peuvent pas être utilisées ensemble" +msgstr "" +"Les options --add-file et --remote ne peuvent pas être utilisées ensemble" #: archive.c:607 #, c-format @@ -1763,7 +1874,8 @@ msgid "" "We continue anyway." msgstr "" "la base de fusion entre %s et [%s] doit être évitée.\n" -"On ne peut donc pas être certain que le premier commit %s se trouve entre %s et %s.\n" +"On ne peut donc pas être certain que le premier commit %s se trouve entre %s " +"et %s.\n" "On continue tout de même." #: bisect.c:861 @@ -1831,17 +1943,24 @@ msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final" #: blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" -msgstr "--reverse et --first-parent ensemble nécessitent la spécification d'un dernier commit" +msgstr "" +"--reverse et --first-parent ensemble nécessitent la spécification d'un " +"dernier commit" -#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 -#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 -#: builtin/pack-objects.c:3661 builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414 +#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346 +#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806 +#: builtin/pack-objects.c:3821 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" #: blame.c:2838 -msgid "--reverse --first-parent together require range along first-parent chain" -msgstr "--reverse --first-parent ensemble nécessitent une portée avec la chaîne de premier parent" +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "" +"--reverse --first-parent ensemble nécessitent une portée avec la chaîne de " +"premier parent" #: blame.c:2849 #, c-format @@ -1874,17 +1993,23 @@ msgstr "La branche %s ne peut pas être sa propre branche amont." #: branch.c:93 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." -msgstr "La branche '%s' est paramétrée pour suivre la branche distante '%s' de '%s' en rebasant." +msgstr "" +"La branche '%s' est paramétrée pour suivre la branche distante '%s' de '%s' " +"en rebasant." #: branch.c:94 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." -msgstr "La branche '%s' est paramétrée pour suivre la branche distante '%s' depuis '%s'." +msgstr "" +"La branche '%s' est paramétrée pour suivre la branche distante '%s' depuis " +"'%s'." #: branch.c:98 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." -msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%'s en rebasant." +msgstr "" +"La branche '%s' est paramétrée pour suivre la branche locale '%'s en " +"rebasant." #: branch.c:99 #, c-format @@ -1894,7 +2019,9 @@ msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'." #: branch.c:104 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." -msgstr "La branche '%s' est paramétrée pour suivre la référence distante '%s' en rebasant." +msgstr "" +"La branche '%s' est paramétrée pour suivre la référence distante '%s' en " +"rebasant." #: branch.c:105 #, c-format @@ -1904,7 +2031,9 @@ msgstr "La branche '%s' est paramétrée pour suivre la référence distante '%s #: branch.c:109 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." -msgstr "La branche '%s' est paramétrée pour suivre la référence locale '%s' en rebasant." +msgstr "" +"La branche '%s' est paramétrée pour suivre la référence locale '%s' en " +"rebasant." #: branch.c:110 #, c-format @@ -1937,7 +2066,9 @@ msgstr "Impossible de forcer la mise à jour de la branche courante." #: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." -msgstr "Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est pas une branche." +msgstr "" +"Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est " +"pas une branche." #: branch.c:235 #, c-format @@ -1989,117 +2120,118 @@ msgstr "'%s' est déjà extrait dans '%s'" msgid "HEAD of working tree %s is not updated" msgstr "la HEAD de la copie de travail %s n'est pas mise à jour" -#: bundle.c:41 +#: bundle.c:44 #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "algorithme d'empreinte du colis inconnu : %s" -#: bundle.c:45 +#: bundle.c:48 #, c-format msgid "unknown capability '%s'" msgstr "capacité inconnue '%s'" -#: bundle.c:71 +#: bundle.c:74 #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "'%s' ne semble pas être un fichier colis v2 our v3" -#: bundle.c:110 +#: bundle.c:113 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 builtin/commit.c:861 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" -#: bundle.c:189 +#: bundle.c:198 msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis suivants :" -#: bundle.c:192 +#: bundle.c:201 msgid "need a repository to verify a bundle" msgstr "la vérification d'un colis requiert un dépôt" -#: bundle.c:243 +#: bundle.c:257 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Le colis contient cette référence :" msgstr[1] "Le colis contient ces %d références :" -#: bundle.c:250 +#: bundle.c:264 msgid "The bundle records a complete history." msgstr "Le colis enregistre l'historique complet." -#: bundle.c:252 +#: bundle.c:266 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Le colis exige cette référence :" msgstr[1] "Le colis exige ces %d références :" -#: bundle.c:319 +#: bundle.c:333 msgid "unable to dup bundle descriptor" msgstr "impossible de dupliquer le descripteur de liasse" -#: bundle.c:326 +#: bundle.c:340 msgid "Could not spawn pack-objects" msgstr "Impossible de créer des objets groupés" -#: bundle.c:337 +#: bundle.c:351 msgid "pack-objects died" msgstr "les objets groupés ont disparu" -#: bundle.c:386 +#: bundle.c:400 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "la référence '%s' est exclue par les options de rev-list" -#: bundle.c:490 +#: bundle.c:504 #, c-format msgid "unsupported bundle version %d" msgstr "version de colis non supportée %d" -#: bundle.c:492 +#: bundle.c:506 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "impossible d'écrire une version de colis %d avec l'algorithme %s" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" -#: bundle.c:539 +#: bundle.c:553 msgid "Refusing to create empty bundle." msgstr "Refus de créer un colis vide." -#: bundle.c:549 +#: bundle.c:563 #, c-format msgid "cannot create '%s'" msgstr "impossible de créer '%s'" -#: bundle.c:574 +#: bundle.c:588 msgid "index-pack died" msgstr "l'index de groupe a disparu" -#: chunk-format.c:113 +#: chunk-format.c:117 msgid "terminating chunk id appears earlier than expected" msgstr "l'identifiant de terminaison de tronçon apparaît plus tôt qu'attendu" -#: chunk-format.c:122 +#: chunk-format.c:126 #, c-format msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" msgstr "décalage(s) de section incorrect(s) %<PRIx64> et %<PRIx64>" -#: chunk-format.c:129 +#: chunk-format.c:133 #, c-format msgid "duplicate chunk ID %<PRIx32> found" msgstr "ID de section dupliqué %<PRIx32>" -#: chunk-format.c:143 +#: chunk-format.c:147 #, c-format msgid "final chunk has non-zero id %<PRIx32>" msgstr "la section finale a un id non nul %<PRIx32>" @@ -2120,7 +2252,8 @@ msgstr "le graphe de commit est trop petit" #: commit-graph.c:355 #, c-format msgid "commit-graph signature %X does not match signature %X" -msgstr "la signature du graphe de commit %X ne correspond pas à la signature %X" +msgstr "" +"la signature du graphe de commit %X ne correspond pas à la signature %X" #: commit-graph.c:362 #, c-format @@ -2130,7 +2263,9 @@ msgstr "la version %X du graphe de commit ne correspond pas à la version %X" #: commit-graph.c:369 #, c-format msgid "commit-graph hash version %X does not match version %X" -msgstr "l'empreinte de la version %X du graphe de commit ne correspond pas à la version %X" +msgstr "" +"l'empreinte de la version %X du graphe de commit ne correspond pas à la " +"version %X" #: commit-graph.c:386 #, c-format @@ -2148,7 +2283,8 @@ msgstr "la chaîne de graphe de commit ne correspond pas" #: commit-graph.c:540 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" -msgstr "chaîne de graphe de commit invalide : la ligne '%s' n'est pas une empreinte" +msgstr "" +"chaîne de graphe de commit invalide : la ligne '%s' n'est pas une empreinte" #: commit-graph.c:564 msgid "unable to find all commit-graph files" @@ -2156,7 +2292,9 @@ msgstr "impossible de trouver tous les fichiers du graphe de commit" #: commit-graph.c:745 commit-graph.c:782 msgid "invalid commit position. commit-graph is likely corrupt" -msgstr "position de commit invalide. Le graphe de commit est vraisemblablement corrompu" +msgstr "" +"position de commit invalide. Le graphe de commit est vraisemblablement " +"corrompu" #: commit-graph.c:766 #, c-format @@ -2165,14 +2303,16 @@ msgstr "impossible de trouver le commit %s" #: commit-graph.c:799 msgid "commit-graph requires overflow generation data but has none" -msgstr "le graphe de commits requiert des données de génération de débordement mais n'en contient pas" +msgstr "" +"le graphe de commits requiert des données de génération de débordement mais " +"n'en contient pas" -#: commit-graph.c:1075 builtin/am.c:1340 +#: commit-graph.c:1075 builtin/am.c:1341 #, c-format msgid "unable to parse commit %s" msgstr "impossible d'analyser le commit %s" -#: commit-graph.c:1337 builtin/pack-objects.c:2897 +#: commit-graph.c:1337 builtin/pack-objects.c:3057 #, c-format msgid "unable to get type of object %s" msgstr "impossible d'obtenir le type de l'objet %s" @@ -2224,7 +2364,8 @@ msgstr "erreur à l'ouverture de l'index pour %s" #: commit-graph.c:1714 msgid "Finding commits for commit graph among packed objects" -msgstr "Recherche de commits pour un graphe de commits parmi les objets empaquetés" +msgstr "" +"Recherche de commits pour un graphe de commits parmi les objets empaquetés" #: commit-graph.c:1732 msgid "Finding extra edges in commit graph" @@ -2234,7 +2375,7 @@ msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits" msgid "failed to write correct number of base graph ids" msgstr "échec à l'écriture le nombre correct d'id de base de fusion" -#: commit-graph.c:1812 midx.c:906 +#: commit-graph.c:1812 midx.c:911 #, c-format msgid "unable to create leading directories of %s" msgstr "impossible de créer les répertoires de premier niveau de %s" @@ -2277,81 +2418,103 @@ msgstr "Fusion du graphe de commits" #: commit-graph.c:2244 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" -msgstr "essai d'écriture de graphe de commits, mais 'core.commitGraph' est désactivé" +msgstr "" +"essai d'écriture de graphe de commits, mais 'core.commitGraph' est désactivé" #: commit-graph.c:2351 msgid "too many commits to write graph" msgstr "trop de commits pour écrire un graphe" -#: commit-graph.c:2450 +#: commit-graph.c:2449 msgid "the commit-graph file has incorrect checksum and is likely corrupt" -msgstr "le graphe de commit a une somme de contrôle incorrecte et est vraisemblablement corrompu" +msgstr "" +"le graphe de commit a une somme de contrôle incorrecte et est " +"vraisemblablement corrompu" -#: commit-graph.c:2460 +#: commit-graph.c:2459 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "le graphe de commit a un ordre d'OID incorrect : %s puis %s" -#: commit-graph.c:2470 commit-graph.c:2485 +#: commit-graph.c:2469 commit-graph.c:2484 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" -msgstr "le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = %u != %u" +msgstr "" +"le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = " +"%u != %u" -#: commit-graph.c:2477 +#: commit-graph.c:2476 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "échec de l'analyse le commit %s depuis le graphe de commits" -#: commit-graph.c:2495 +#: commit-graph.c:2494 msgid "Verifying commits in commit graph" msgstr "Verification des commits dans le graphe de commits" -#: commit-graph.c:2510 +#: commit-graph.c:2509 #, c-format msgid "failed to parse commit %s from object database for commit-graph" -msgstr "échec de l'analyse du commit %s depuis la base de données d'objets pour le graphe de commit" +msgstr "" +"échec de l'analyse du commit %s depuis la base de données d'objets pour le " +"graphe de commit" -#: commit-graph.c:2517 +#: commit-graph.c:2516 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" -msgstr "l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != %s" +msgstr "" +"l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != " +"%s" -#: commit-graph.c:2527 +#: commit-graph.c:2526 #, c-format msgid "commit-graph parent list for commit %s is too long" -msgstr "la liste des parents du graphe de commit pour le commit %s est trop longue" +msgstr "" +"la liste des parents du graphe de commit pour le commit %s est trop longue" -#: commit-graph.c:2536 +#: commit-graph.c:2535 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "le parent du graphe de commit pour %s est %s != %s" -#: commit-graph.c:2550 +#: commit-graph.c:2549 #, c-format msgid "commit-graph parent list for commit %s terminates early" -msgstr "la liste de parents du graphe de commit pour le commit %s se termine trop tôt" +msgstr "" +"la liste de parents du graphe de commit pour le commit %s se termine trop tôt" -#: commit-graph.c:2555 +#: commit-graph.c:2554 #, c-format -msgid "commit-graph has generation number zero for commit %s, but non-zero elsewhere" -msgstr "le graphe de commit a un numéro de génération nul pour le commit %s, mais non-nul ailleurs" +msgid "" +"commit-graph has generation number zero for commit %s, but non-zero elsewhere" +msgstr "" +"le graphe de commit a un numéro de génération nul pour le commit %s, mais " +"non-nul ailleurs" -#: commit-graph.c:2559 +#: commit-graph.c:2558 #, c-format -msgid "commit-graph has non-zero generation number for commit %s, but zero elsewhere" -msgstr "le graphe de commit a un numéro de génération non-nul pour le commit %s, mais nul ailleurs" +msgid "" +"commit-graph has non-zero generation number for commit %s, but zero elsewhere" +msgstr "" +"le graphe de commit a un numéro de génération non-nul pour le commit %s, " +"mais nul ailleurs" -#: commit-graph.c:2576 +#: commit-graph.c:2575 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" -msgstr "la génération du graphe de commit pour le commit %s est %<PRIuMAX> < %<PRIuMAX>" +msgstr "" +"la génération du graphe de commit pour le commit %s est %<PRIuMAX> < " +"%<PRIuMAX>" -#: commit-graph.c:2582 +#: commit-graph.c:2581 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" -msgstr "la date de validation pour le commit %s dans le graphe de commit est %<PRIuMAX> != %<PRIuMAX>" +msgstr "" +"la date de validation pour le commit %s dans le graphe de commit est " +"%<PRIuMAX> != %<PRIuMAX>" -#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416 builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417 +#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" @@ -2408,8 +2571,10 @@ msgid "" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" "Avertissement : le message de validation ne se conforme pas à UTF-8.\n" -"Vous souhaitez peut-être le modifier après correction du message ou régler la\n" -"variable de configuration i18n.commitencoding à l'encodage utilisé par votre projet.\n" +"Vous souhaitez peut-être le modifier après correction du message ou régler " +"la\n" +"variable de configuration i18n.commitencoding à l'encodage utilisé par votre " +"projet.\n" #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" @@ -2441,7 +2606,9 @@ msgstr "les inclusions de configuration relatives doivent venir de fichiers" #: config.c:199 msgid "relative config include conditionals must come from files" -msgstr "les conditions d'inclusion de configuration relative doivent venir de fichiers" +msgstr "" +"les conditions d'inclusion de configuration relative doivent venir de " +"fichiers" #: config.c:396 #, c-format @@ -2558,32 +2725,43 @@ msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s" #: config.c:1163 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" -msgstr "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob %s : %s" +msgstr "" +"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob " +"%s : %s" #: config.c:1166 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" -msgstr "valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier %s : %s" +msgstr "" +"valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier " +"%s : %s" #: config.c:1169 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" -msgstr "valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée standard : %s" +msgstr "" +"valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée " +"standard : %s" #: config.c:1172 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" -msgstr "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de sous-module %s : %s" +msgstr "" +"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de " +"sous-module %s : %s" #: config.c:1175 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" -msgstr "valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de commande %s : %s" +msgstr "" +"valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de " +"commande %s : %s" #: config.c:1178 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" -msgstr "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s" +msgstr "" +"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s" #: config.c:1257 #, c-format @@ -2633,7 +2811,7 @@ msgstr "valeur mal formée pour %s : %s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "doit être parmi nothing, matching, simple, upstream ou current" -#: config.c:1687 builtin/pack-objects.c:3924 +#: config.c:1687 builtin/pack-objects.c:4084 #, c-format msgid "bad pack compression level %d" msgstr "niveau de compression du paquet %d" @@ -2653,110 +2831,114 @@ msgstr "la référence '%s' ne pointe pas sur un blob" msgid "unable to resolve config blob '%s'" msgstr "impossible de résoudre le blob de config '%s'" -#: config.c:1873 +#: config.c:1874 #, c-format msgid "failed to parse %s" msgstr "échec de l'analyse de %s" -#: config.c:1929 +#: config.c:1930 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:2293 +#: config.c:2294 msgid "unknown error occurred while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:2467 +#: config.c:2468 #, c-format msgid "Invalid %s: '%s'" msgstr "%s invalide : '%s'" -#: config.c:2512 +#: config.c:2513 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" -msgstr "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et 100" +msgstr "" +"la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et " +"100" -#: config.c:2558 +#: config.c:2559 #, c-format msgid "unable to parse '%s' from command-line config" -msgstr "impossible d'analyser '%s' depuis le configuration en ligne de commande" +msgstr "" +"impossible d'analyser '%s' depuis le configuration en ligne de commande" -#: config.c:2560 +#: config.c:2561 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" -msgstr "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d" +msgstr "" +"variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d" -#: config.c:2644 +#: config.c:2645 #, c-format msgid "invalid section name '%s'" msgstr "nom de section invalide '%s'" -#: config.c:2676 +#: config.c:2677 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" -#: config.c:2705 +#: config.c:2706 #, c-format msgid "failed to write new configuration file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:2957 config.c:3283 +#: config.c:2958 config.c:3285 #, c-format msgid "could not lock config file %s" msgstr "impossible de verrouiller le fichier de configuration %s" -#: config.c:2968 +#: config.c:2969 #, c-format msgid "opening %s" msgstr "ouverture de %s" -#: config.c:3005 builtin/config.c:361 +#: config.c:3006 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "motif invalide : %s" -#: config.c:3030 +#: config.c:3031 #, c-format msgid "invalid config file %s" msgstr "fichier de configuration invalide %s" -#: config.c:3043 config.c:3296 +#: config.c:3044 config.c:3298 #, c-format msgid "fstat on %s failed" msgstr "échec de fstat sur %s" -#: config.c:3054 +#: config.c:3055 #, c-format -msgid "unable to mmap '%s'" -msgstr "impossible de réaliser un map de '%s'" +msgid "unable to mmap '%s'%s" +msgstr "impossible de réaliser un mmap de '%s'%s" -#: config.c:3063 config.c:3301 +#: config.c:3065 config.c:3303 #, c-format msgid "chmod on %s failed" msgstr "échec de chmod sur %s" -#: config.c:3148 config.c:3398 +#: config.c:3150 config.c:3400 #, c-format msgid "could not write config file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:3182 +#: config.c:3184 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossible de régler '%s' à '%s'" -#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "impossible de désinitialiser '%s'" -#: config.c:3274 +#: config.c:3276 #, c-format msgid "invalid section name: %s" msgstr "nom de section invalide : %s" -#: config.c:3441 +#: config.c:3443 #, c-format msgid "missing value for '%s'" msgstr "valeur manquante pour '%s'" @@ -2906,11 +3088,14 @@ msgstr "impossible de démarrer un proxy %s" #: connect.c:1050 msgid "no path specified; see 'git help pull' for valid url syntax" -msgstr "aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe d'URL valide" +msgstr "" +"aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe " +"d'URL valide" #: connect.c:1190 msgid "newline is forbidden in git:// hosts and repo paths" -msgstr "le retour chariot est interdit dans les hôtes git:// et les chemins de dépôt" +msgstr "" +"le retour chariot est interdit dans les hôtes git:// et les chemins de dépôt" #: connect.c:1247 msgid "ssh variant 'simple' does not support -4" @@ -2933,7 +3118,7 @@ msgstr "chemin étrange '%s' bloqué" msgid "unable to fork" msgstr "fork impossible" -#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Vérification de la connectivité" @@ -2989,8 +3174,12 @@ msgstr "Aucun BOM n'est permis dans '%s' s'il est encodé comme %s" #: convert.c:280 #, c-format -msgid "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as working-tree-encoding." -msgstr "Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez utiliser UTF-%.*s comme encodage d'arbre de travail." +msgid "" +"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " +"working-tree-encoding." +msgstr "" +"Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez " +"utiliser UTF-%.*s comme encodage d'arbre de travail." #: convert.c:293 #, c-format @@ -2999,9 +3188,13 @@ msgstr "Un BOM est obligatoire dans '%s' s'il est encodé comme %s" #: convert.c:295 #, c-format -msgid "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-%sLE (depending on the byte order) as working-tree-encoding." +msgid "" +"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" +"%sLE (depending on the byte order) as working-tree-encoding." msgstr "" -"Il manque un marqueur d'ordre d'octets (BOM) au fichier '%s'. Veuillez utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre de travail." +"Il manque un marqueur d'ordre d'octets (BOM) au fichier '%s'. Veuillez " +"utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre " +"de travail." #: convert.c:408 convert.c:479 #, c-format @@ -3011,7 +3204,9 @@ msgstr "échec de l'encodage de '%s' de %s vers %s" #: convert.c:451 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" -msgstr "encoder '%s' depuis %s vers %s puis inversement ne produit pas le même contenu" +msgstr "" +"encoder '%s' depuis %s vers %s puis inversement ne produit pas le même " +"contenu" #: convert.c:654 #, c-format @@ -3048,8 +3243,12 @@ msgstr "nom de chemin trop long pour un filtre externe" #: convert.c:934 #, c-format -msgid "external filter '%s' is not available anymore although not all paths have been filtered" -msgstr "le filtre externe '%s' n'est plus disponible bien que tous les chemins n'aient pas été filtrés" +msgid "" +"external filter '%s' is not available anymore although not all paths have " +"been filtered" +msgstr "" +"le filtre externe '%s' n'est plus disponible bien que tous les chemins " +"n'aient pas été filtrés" #: convert.c:1234 msgid "true/false are no valid working-tree-encodings" @@ -3068,7 +3267,9 @@ msgstr "%s : le filtre smudge '%s' a échoué" #: credential.c:96 #, c-format msgid "skipping credential lookup for key: credential.%s" -msgstr "vérification des informations d'identification sautée pour la clé : credential.%s" +msgstr "" +"vérification des informations d'identification sautée pour la clé : " +"credential.%s" #: credential.c:112 msgid "refusing to work with credential missing host field" @@ -3076,7 +3277,8 @@ msgstr "refus de travailler avec un champ host manquant dans l'identification" #: credential.c:114 msgid "refusing to work with credential missing protocol field" -msgstr "refus de travailler avec un champ protocol manquant dans l'identification" +msgstr "" +"refus de travailler avec un champ protocol manquant dans l'identification" #: credential.c:394 #, c-format @@ -3178,50 +3380,57 @@ msgstr "impossible de charger la regex île pour '%s' : %s" #: delta-islands.c:390 #, c-format msgid "island regex from config has too many capture groups (max=%d)" -msgstr "l'expression rationnelle depuis la configuration a trop de groupes de capture (max=%d)" +msgstr "" +"l'expression rationnelle depuis la configuration a trop de groupes de " +"capture (max=%d)" #: delta-islands.c:467 #, c-format msgid "Marked %d islands, done.\n" msgstr "Marquage de %d îlots, fait.\n" -#: diff-merges.c:80 +#: diff-merges.c:70 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "valeur inconnue pour --diff-merges : %s" -#: diff-lib.c:538 +#: diff-lib.c:557 msgid "--merge-base does not work with ranges" msgstr "--merge-base ne fonctionne pas avec des plages" -#: diff-lib.c:540 +#: diff-lib.c:559 msgid "--merge-base only works with commits" msgstr "--merge-base ne fonctionne qu'avec des commits" -#: diff-lib.c:557 +#: diff-lib.c:576 msgid "unable to get HEAD" msgstr "impossible d'acquérir HEAD" -#: diff-lib.c:564 +#: diff-lib.c:583 msgid "no merge base found" msgstr "aucune base de fusion trouvée" -#: diff-lib.c:566 +#: diff-lib.c:585 msgid "multiple merge bases found" msgstr "bases multiples de fusion trouvées" -#: diff-no-index.c:238 +#: diff-no-index.c:237 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<options>] <chemin> <chemin>" -#: diff-no-index.c:263 -msgid "Not a git repository. Use --no-index to compare two paths outside a working tree" -msgstr "Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un arbre de travail" +#: diff-no-index.c:262 +msgid "" +"Not a git repository. Use --no-index to compare two paths outside a working " +"tree" +msgstr "" +"Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un " +"arbre de travail" #: diff.c:156 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" -msgstr " Impossible d'analyser le pourcentage de modification de dirstat '%s'\n" +msgstr "" +" Impossible d'analyser le pourcentage de modification de dirstat '%s'\n" #: diff.c:161 #, c-format @@ -3229,24 +3438,34 @@ msgid " Unknown dirstat parameter '%s'\n" msgstr " Paramètre dirstat inconnu '%s'\n" #: diff.c:297 -msgid "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'" -msgstr "le paramètre de couleur de déplacement doit être parmi 'no', 'default', 'blocks', 'zebra', 'dimmed_zebra' ou 'plain'" +msgid "" +"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " +"'dimmed-zebra', 'plain'" +msgstr "le paramètre de couleur de déplacement doit être parmi 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra' ou 'plain'" #: diff.c:325 #, c-format -msgid "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" +msgid "" +"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " +"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" msgstr "" -"mode unknown color-moved-ws inconnu '%s', les valeurs possibles sont 'ignore-space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-" +"mode unknown color-moved-ws inconnu '%s', les valeurs possibles sont 'ignore-" +"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-" "change'" #: diff.c:333 -msgid "color-moved-ws: allow-indentation-change cannot be combined with other whitespace modes" -msgstr "color-moved-ws : allow-indentation-change ne peut pas être combiné avec d'autres modes d'espace" +msgid "" +"color-moved-ws: allow-indentation-change cannot be combined with other " +"whitespace modes" +msgstr "" +"color-moved-ws : allow-indentation-change ne peut pas être combiné avec " +"d'autres modes d'espace" #: diff.c:410 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" -msgstr "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" +msgstr "" +"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" #: diff.c:470 #, c-format @@ -3257,34 +3476,46 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:4278 +#: diff.c:4282 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:4630 +#: diff.c:4634 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs" -#: diff.c:4633 +#: diff.c:4637 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S et --find-object sont mutuellement exclusifs" -#: diff.c:4712 +#: diff.c:4640 +msgid "" +"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" +msgstr "-G et --pickaxe-regex sont mutuellement exclusifs, utilisez --pickaxe-regex avec -S" + +#: diff.c:4643 +msgid "" +"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +"with -G and -S" +msgstr "--pickaxe-all et --find-object sont mutuellement exclusifs, utilisez --pickaxe-all avec -G et -S" + +#: diff.c:4722 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:4760 +#: diff.c:4770 #, c-format msgid "invalid --stat value: %s" msgstr "valeur invalide de --stat : %s" -#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 +#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s attend une valeur numérique" -#: diff.c:4797 +#: diff.c:4807 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3293,504 +3524,565 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:4882 +#: diff.c:4892 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" -msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s" +msgstr "classe de modification inconnue '%c' dans --diff-filter=%s" -#: diff.c:4906 +#: diff.c:4916 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valeur inconnue après ws-error-highlight=%.*s" -#: diff.c:4920 +#: diff.c:4930 #, c-format msgid "unable to resolve '%s'" msgstr "impossible de résoudre '%s'" -#: diff.c:4970 diff.c:4976 +#: diff.c:4980 diff.c:4986 #, c-format msgid "%s expects <n>/<m> form" msgstr "forme <n>/<m> attendue par %s" -#: diff.c:4988 +#: diff.c:4998 #, c-format msgid "%s expects a character, got '%s'" msgstr "caractère attendu par %s, '%s' trouvé" -#: diff.c:5009 +#: diff.c:5019 #, c-format msgid "bad --color-moved argument: %s" msgstr "mauvais argument --color-moved : %s" -#: diff.c:5028 +#: diff.c:5038 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode invalide '%s' dans --color-moved-ws" -#: diff.c:5068 -msgid "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and \"histogram\"" -msgstr "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et \"histogram\"" +#: diff.c:5078 +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et " +"\"histogram\"" -#: diff.c:5104 diff.c:5124 +#: diff.c:5114 diff.c:5134 #, c-format msgid "invalid argument to %s" msgstr "argument invalide pour %s" -#: diff.c:5228 +#: diff.c:5238 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "regex invalide fournie à -I : '%s'" -#: diff.c:5277 +#: diff.c:5287 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'" -#: diff.c:5333 +#: diff.c:5343 #, c-format msgid "bad --word-diff argument: %s" msgstr "mauvais argument pour --word-diff : %s" -#: diff.c:5369 +#: diff.c:5379 msgid "Diff output format options" msgstr "Options de format de sortie de diff" -#: diff.c:5371 diff.c:5377 +#: diff.c:5381 diff.c:5387 msgid "generate patch" msgstr "générer la rustine" -#: diff.c:5374 builtin/log.c:179 +#: diff.c:5384 builtin/log.c:179 msgid "suppress diff output" msgstr "supprimer la sortie des différences" -#: diff.c:5379 diff.c:5493 diff.c:5500 +#: diff.c:5389 diff.c:5503 diff.c:5510 msgid "<n>" msgstr "<n>" -#: diff.c:5380 diff.c:5383 +#: diff.c:5390 diff.c:5393 msgid "generate diffs with <n> lines context" msgstr "générer les diffs avec <n> lignes de contexte" -#: diff.c:5385 +#: diff.c:5395 msgid "generate the diff in raw format" msgstr "générer le diff en format brut" -#: diff.c:5388 +#: diff.c:5398 msgid "synonym for '-p --raw'" msgstr "synonyme de '-p --raw'" -#: diff.c:5392 +#: diff.c:5402 msgid "synonym for '-p --stat'" msgstr "synonyme de '-p --stat'" -#: diff.c:5396 +#: diff.c:5406 msgid "machine friendly --stat" msgstr "--stat pour traitement automatique" -#: diff.c:5399 +#: diff.c:5409 msgid "output only the last line of --stat" msgstr "afficher seulement la dernière ligne de --stat" -#: diff.c:5401 diff.c:5409 +#: diff.c:5411 diff.c:5419 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5402 -msgid "output the distribution of relative amount of changes for each sub-directory" -msgstr "afficher la distribution des quantités de modifications relatives pour chaque sous-répertoire" +#: diff.c:5412 +msgid "" +"output the distribution of relative amount of changes for each sub-directory" +msgstr "" +"afficher la distribution des quantités de modifications relatives pour " +"chaque sous-répertoire" -#: diff.c:5406 +#: diff.c:5416 msgid "synonym for --dirstat=cumulative" msgstr "synonyme pour --dirstat=cumulative" -#: diff.c:5410 +#: diff.c:5420 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonyme pour --dirstat=files,param1,param2..." -#: diff.c:5414 +#: diff.c:5424 msgid "warn if changes introduce conflict markers or whitespace errors" -msgstr "avertir si les modifications introduisent des marqueurs de conflit ou des erreurs d'espace" +msgstr "" +"avertir si les modifications introduisent des marqueurs de conflit ou des " +"erreurs d'espace" -#: diff.c:5417 +#: diff.c:5427 msgid "condensed summary such as creations, renames and mode changes" -msgstr "résumé succinct tel que les créations, les renommages et les modifications de mode" +msgstr "" +"résumé succinct tel que les créations, les renommages et les modifications " +"de mode" -#: diff.c:5420 +#: diff.c:5430 msgid "show only names of changed files" msgstr "n'afficher que les noms de fichiers modifiés" -#: diff.c:5423 +#: diff.c:5433 msgid "show only names and status of changed files" msgstr "n'afficher que les noms et les status des fichiers modifiés" -#: diff.c:5425 +#: diff.c:5435 msgid "<width>[,<name-width>[,<count>]]" msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]" -#: diff.c:5426 +#: diff.c:5436 msgid "generate diffstat" msgstr "générer un diffstat" -#: diff.c:5428 diff.c:5431 diff.c:5434 +#: diff.c:5438 diff.c:5441 diff.c:5444 msgid "<width>" msgstr "<largeur>" -#: diff.c:5429 +#: diff.c:5439 msgid "generate diffstat with a given width" msgstr "générer un diffstat avec la largeur indiquée" -#: diff.c:5432 +#: diff.c:5442 msgid "generate diffstat with a given name width" msgstr "génerer un diffstat avec la largeur de nom indiquée" -#: diff.c:5435 +#: diff.c:5445 msgid "generate diffstat with a given graph width" msgstr "génerer un diffstat avec la largeur de graphe indiquée" -#: diff.c:5437 +#: diff.c:5447 msgid "<count>" msgstr "<compte>" -#: diff.c:5438 +#: diff.c:5448 msgid "generate diffstat with limited lines" msgstr "générer un diffstat avec des lignes limitées" -#: diff.c:5441 +#: diff.c:5451 msgid "generate compact summary in diffstat" msgstr "générer une résumé compact dans le diffstat" -#: diff.c:5444 +#: diff.c:5454 msgid "output a binary diff that can be applied" msgstr "produire un diff binaire qui peut être appliqué" -#: diff.c:5447 +#: diff.c:5457 msgid "show full pre- and post-image object names on the \"index\" lines" -msgstr "afficher les noms complets des objets pre- et post-image sur les lignes \"index\"" +msgstr "" +"afficher les noms complets des objets pre- et post-image sur les lignes " +"\"index\"" -#: diff.c:5449 +#: diff.c:5459 msgid "show colored diff" msgstr "afficher un diff coloré" -#: diff.c:5450 +#: diff.c:5460 msgid "<kind>" msgstr "<sorte>" -#: diff.c:5451 -msgid "highlight whitespace errors in the 'context', 'old' or 'new' lines in the diff" -msgstr "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', 'nouveau' dans le diff" +#: diff.c:5461 +msgid "" +"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " +"diff" +msgstr "" +"surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', " +"'nouveau' dans le diff" -#: diff.c:5454 -msgid "do not munge pathnames and use NULs as output field terminators in --raw or --numstat" -msgstr "ne pas compresser les chemins et utiliser des NULs comme terminateurs de champs dans --raw ou --numstat" +#: diff.c:5464 +msgid "" +"do not munge pathnames and use NULs as output field terminators in --raw or " +"--numstat" +msgstr "" +"ne pas compresser les chemins et utiliser des NULs comme terminateurs de " +"champs dans --raw ou --numstat" -#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572 +#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582 msgid "<prefix>" msgstr "<préfixe>" -#: diff.c:5458 +#: diff.c:5468 msgid "show the given source prefix instead of \"a/\"" msgstr "afficher le préfixe de source indiqué au lieu de \"a/\"" -#: diff.c:5461 +#: diff.c:5471 msgid "show the given destination prefix instead of \"b/\"" msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\"" -#: diff.c:5464 +#: diff.c:5474 msgid "prepend an additional prefix to every line of output" msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée" -#: diff.c:5467 +#: diff.c:5477 msgid "do not show any source or destination prefix" msgstr "n'afficher aucun préfixe, ni de source, ni de destination" -#: diff.c:5470 +#: diff.c:5480 msgid "show context between diff hunks up to the specified number of lines" -msgstr "afficher le contexte entre les sections à concurrence du nombre de ligne indiqué" +msgstr "" +"afficher le contexte entre les sections à concurrence du nombre de ligne " +"indiqué" -#: diff.c:5474 diff.c:5479 diff.c:5484 +#: diff.c:5484 diff.c:5489 diff.c:5494 msgid "<char>" msgstr "<caractère>" -#: diff.c:5475 +#: diff.c:5485 msgid "specify the character to indicate a new line instead of '+'" msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'" -#: diff.c:5480 +#: diff.c:5490 msgid "specify the character to indicate an old line instead of '-'" msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'" -#: diff.c:5485 +#: diff.c:5495 msgid "specify the character to indicate a context instead of ' '" -msgstr "spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '" +msgstr "" +"spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '" -#: diff.c:5488 +#: diff.c:5498 msgid "Diff rename options" msgstr "Options de renommage de diff" -#: diff.c:5489 +#: diff.c:5499 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5490 +#: diff.c:5500 msgid "break complete rewrite changes into pairs of delete and create" -msgstr "casser les modifications d'une réécrire complète en paires de suppression et création" +msgstr "" +"casser les modifications d'une réécrire complète en paires de suppression et " +"création" -#: diff.c:5494 +#: diff.c:5504 msgid "detect renames" msgstr "détecter les renommages" -#: diff.c:5498 +#: diff.c:5508 msgid "omit the preimage for deletes" msgstr "supprimer la pré-image pour les suppressions" -#: diff.c:5501 +#: diff.c:5511 msgid "detect copies" msgstr "détecter les copies" -#: diff.c:5505 +#: diff.c:5515 msgid "use unmodified files as source to find copies" -msgstr "utiliser les fichiers non-modifiés comme sources pour trouver des copies" +msgstr "" +"utiliser les fichiers non-modifiés comme sources pour trouver des copies" -#: diff.c:5507 +#: diff.c:5517 msgid "disable rename detection" msgstr "désactiver la détection de renommage" -#: diff.c:5510 +#: diff.c:5520 msgid "use empty blobs as rename source" msgstr "utiliser des blobs vides comme source de renommage" -#: diff.c:5512 +#: diff.c:5522 msgid "continue listing the history of a file beyond renames" msgstr "continuer à afficher l'historique d'un fichier au delà des renommages" -#: diff.c:5515 -msgid "prevent rename/copy detection if the number of rename/copy targets exceeds given limit" -msgstr "empêcher la détection de renommage/copie si le nombre de cibles de renommage/copie excède la limite indiquée" +#: diff.c:5525 +msgid "" +"prevent rename/copy detection if the number of rename/copy targets exceeds " +"given limit" +msgstr "" +"empêcher la détection de renommage/copie si le nombre de cibles de renommage/" +"copie excède la limite indiquée" -#: diff.c:5517 +#: diff.c:5527 msgid "Diff algorithm options" msgstr "Options de l'algorithme de diff" -#: diff.c:5519 +#: diff.c:5529 msgid "produce the smallest possible diff" msgstr "produire le diff le plus petit possible" -#: diff.c:5522 +#: diff.c:5532 msgid "ignore whitespace when comparing lines" msgstr "ignorer les espaces lors de la comparaison de ligne" -#: diff.c:5525 +#: diff.c:5535 msgid "ignore changes in amount of whitespace" msgstr "ignorer des modifications du nombre d'espaces" -#: diff.c:5528 +#: diff.c:5538 msgid "ignore changes in whitespace at EOL" msgstr "ignorer des modifications d'espace en fin de ligne" -#: diff.c:5531 +#: diff.c:5541 msgid "ignore carrier-return at the end of line" msgstr "ignore le retour chariot en fin de ligne" -#: diff.c:5534 +#: diff.c:5544 msgid "ignore changes whose lines are all blank" msgstr "ignorer les modifications dont les lignes sont vides" -#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606 +#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616 msgid "<regex>" msgstr "<regex>" -#: diff.c:5537 +#: diff.c:5547 msgid "ignore changes whose all lines match <regex>" msgstr "ignorer les modifications dont les lignes correspondent à <regex>" -#: diff.c:5540 +#: diff.c:5550 msgid "heuristic to shift diff hunk boundaries for easy reading" -msgstr "heuristique qui déplace les limites de sections de diff pour faciliter la lecture" +msgstr "" +"heuristique qui déplace les limites de sections de diff pour faciliter la " +"lecture" -#: diff.c:5543 +#: diff.c:5553 msgid "generate diff using the \"patience diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"patience\"" -#: diff.c:5547 +#: diff.c:5557 msgid "generate diff using the \"histogram diff\" algorithm" -msgstr "générer un diff en utilisant l'algorithme de différence \"histogramme\"" +msgstr "" +"générer un diff en utilisant l'algorithme de différence \"histogramme\"" -#: diff.c:5549 +#: diff.c:5559 msgid "<algorithm>" msgstr "<algorithme>" -#: diff.c:5550 +#: diff.c:5560 msgid "choose a diff algorithm" msgstr "choisir un algorithme de différence" -#: diff.c:5552 +#: diff.c:5562 msgid "<text>" msgstr "<texte>" -#: diff.c:5553 +#: diff.c:5563 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\"" -#: diff.c:5555 diff.c:5564 diff.c:5567 +#: diff.c:5565 diff.c:5574 diff.c:5577 msgid "<mode>" msgstr "<mode>" -#: diff.c:5556 +#: diff.c:5566 msgid "show word diff, using <mode> to delimit changed words" -msgstr "afficher des différences par mot, en utilisant <mode> pour délimiter les mots modifiés" +msgstr "" +"afficher des différences par mot, en utilisant <mode> pour délimiter les " +"mots modifiés" -#: diff.c:5559 +#: diff.c:5569 msgid "use <regex> to decide what a word is" msgstr "utiliser <regex> pour décider ce qu'est un mot" -#: diff.c:5562 +#: diff.c:5572 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5565 +#: diff.c:5575 msgid "moved lines of code are colored differently" msgstr "les lignes déplacées sont colorées différemment" -#: diff.c:5568 +#: diff.c:5578 msgid "how white spaces are ignored in --color-moved" msgstr "comment les espaces sont ignorés dans --color-moved" -#: diff.c:5571 +#: diff.c:5581 msgid "Other diff options" msgstr "Autres options diff" -#: diff.c:5573 +#: diff.c:5583 msgid "when run from subdir, exclude changes outside and show relative paths" -msgstr "lancé depuis un sous-répertoire, exclure les modifications en dehors et afficher les chemins relatifs" +msgstr "" +"lancé depuis un sous-répertoire, exclure les modifications en dehors et " +"afficher les chemins relatifs" -#: diff.c:5577 +#: diff.c:5587 msgid "treat all files as text" msgstr "traiter les fichiers comme texte" -#: diff.c:5579 +#: diff.c:5589 msgid "swap two inputs, reverse the diff" msgstr "échanger les entrées, inverser le diff" -#: diff.c:5581 +#: diff.c:5591 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon" -#: diff.c:5583 +#: diff.c:5593 msgid "disable all output of the program" msgstr "désactiver tous les affichages du programme" -#: diff.c:5585 +#: diff.c:5595 msgid "allow an external diff helper to be executed" msgstr "autoriser l'exécution d'un assistant externe de diff" -#: diff.c:5587 +#: diff.c:5597 msgid "run external text conversion filters when comparing binary files" -msgstr "lancer les filtres externes de conversion en texte lors de la comparaison de fichiers binaires" +msgstr "" +"lancer les filtres externes de conversion en texte lors de la comparaison de " +"fichiers binaires" -#: diff.c:5589 +#: diff.c:5599 msgid "<when>" msgstr "<quand>" -#: diff.c:5590 +#: diff.c:5600 msgid "ignore changes to submodules in the diff generation" -msgstr "ignorer les modifications dans les sous-modules lors de la génération de diff" +msgstr "" +"ignorer les modifications dans les sous-modules lors de la génération de diff" -#: diff.c:5593 +#: diff.c:5603 msgid "<format>" msgstr "<format>" -#: diff.c:5594 +#: diff.c:5604 msgid "specify how differences in submodules are shown" msgstr "spécifier comment les différences dans les sous-modules sont affichées" -#: diff.c:5598 +#: diff.c:5608 msgid "hide 'git add -N' entries from the index" msgstr "masquer les entrées 'git add -N' de l'index" -#: diff.c:5601 +#: diff.c:5611 msgid "treat 'git add -N' entries as real in the index" msgstr "traiter les entrées 'git add -N' comme réelles dans l'index" -#: diff.c:5603 +#: diff.c:5613 msgid "<string>" msgstr "<chaîne>" -#: diff.c:5604 -msgid "look for differences that change the number of occurrences of the specified string" -msgstr "rechercher les différences qui modifient le nombre d'occurrences de la chaîne spécifiée" +#: diff.c:5614 +msgid "" +"look for differences that change the number of occurrences of the specified " +"string" +msgstr "" +"rechercher les différences qui modifient le nombre d'occurrences de la " +"chaîne spécifiée" -#: diff.c:5607 -msgid "look for differences that change the number of occurrences of the specified regex" -msgstr "rechercher les différences qui modifient le nombre d'occurrences de la regex spécifiée" +#: diff.c:5617 +msgid "" +"look for differences that change the number of occurrences of the specified " +"regex" +msgstr "" +"rechercher les différences qui modifient le nombre d'occurrences de la regex " +"spécifiée" -#: diff.c:5610 +#: diff.c:5620 msgid "show all changes in the changeset with -S or -G" -msgstr "afficher toutes les modifications dans l'ensemble de modifications avec -S ou -G" +msgstr "" +"afficher toutes les modifications dans l'ensemble de modifications avec -S " +"ou -G" -#: diff.c:5613 +#: diff.c:5623 msgid "treat <string> in -S as extended POSIX regular expression" -msgstr "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue" +msgstr "" +"traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue" -#: diff.c:5616 +#: diff.c:5626 msgid "control the order in which files appear in the output" msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie" -#: diff.c:5617 diff.c:5620 +#: diff.c:5627 diff.c:5630 msgid "<path>" msgstr "<chemin>" -#: diff.c:5618 +#: diff.c:5628 msgid "show the change in the specified path first" msgstr "afficher la modification dans le chemin spécifié en premier" -#: diff.c:5621 +#: diff.c:5631 msgid "skip the output to the specified path" msgstr "sauter la sortie pour le chemin spécifié" -#: diff.c:5623 +#: diff.c:5633 msgid "<object-id>" msgstr "<id-objet>" -#: diff.c:5624 -msgid "look for differences that change the number of occurrences of the specified object" -msgstr "rechercher les différences qui modifient le nombre d'occurrences de l'objet indiqué" +#: diff.c:5634 +msgid "" +"look for differences that change the number of occurrences of the specified " +"object" +msgstr "" +"rechercher les différences qui modifient le nombre d'occurrences de l'objet " +"indiqué" -#: diff.c:5626 +#: diff.c:5636 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5627 +#: diff.c:5637 msgid "select files by diff type" msgstr "sélectionner les fichiers par types de diff" -#: diff.c:5629 +#: diff.c:5639 msgid "<file>" msgstr "<fichier>" -#: diff.c:5630 +#: diff.c:5640 msgid "Output to a specific file" msgstr "Sortie vers un fichier spécifié" -#: diff.c:6287 -msgid "inexact rename detection was skipped due to too many files." -msgstr "détection de renommage inexact annulée à cause d'un trop grand nombre de fichiers." +#: diff.c:6298 +msgid "exhaustive rename detection was skipped due to too many files." +msgstr "détection exhaustive de renommage annulée à cause d'un trop grand nombre de fichiers." -#: diff.c:6290 +#: diff.c:6301 msgid "only found copies from modified paths due to too many files." -msgstr "recherche uniquement des copies par modification de chemin à cause d'un trop grand nombre de fichiers." +msgstr "" +"recherche uniquement des copies par modification de chemin à cause d'un trop " +"grand nombre de fichiers." -#: diff.c:6293 +#: diff.c:6304 #, c-format -msgid "you may want to set your %s variable to at least %d and retry the command." -msgstr "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le commande." +msgid "" +"you may want to set your %s variable to at least %d and retry the command." +msgstr "" +"vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le " +"commande." #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" msgstr "impossible de lire le fichier de commande '%s'" -#: diffcore-rename.c:1418 +#: diffcore-rename.c:1510 msgid "Performing inexact rename detection" msgstr "Détection de renommage inexact en cours" @@ -3799,59 +4091,62 @@ msgstr "Détection de renommage inexact en cours" msgid "No such path '%s' in the diff" msgstr "Pas de chemin '%s' dans la diff" -#: dir.c:578 +#: dir.c:593 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" -msgstr "le spécificateur de chemin '%s' ne correspond à aucun fichier connu de git" +msgstr "" +"le spécificateur de chemin '%s' ne correspond à aucun fichier connu de git" -#: dir.c:718 dir.c:747 dir.c:760 +#: dir.c:733 dir.c:762 dir.c:775 #, c-format msgid "unrecognized pattern: '%s'" msgstr "motif non reconnu : '%s'" -#: dir.c:777 dir.c:791 +#: dir.c:792 dir.c:806 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "motif négatif non reconnu : '%s'" -#: dir.c:809 +#: dir.c:824 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "votre fichier d'extraction partielle pourrait présenter des problèmes : le motif '%s' est répété" +msgstr "" +"votre fichier d'extraction partielle pourrait présenter des problèmes : le " +"motif '%s' est répété" -#: dir.c:819 +#: dir.c:834 msgid "disabling cone pattern matching" msgstr "désactivation de la correspondance de motif de cone" -#: dir.c:1206 +#: dir.c:1221 #, c-format msgid "cannot use %s as an exclude file" msgstr "impossible d'utiliser %s comme fichier d'exclusion" -#: dir.c:2314 +#: dir.c:2358 #, c-format msgid "could not open directory '%s'" msgstr "impossible d'ouvrir le répertoire '%s'" -#: dir.c:2614 +#: dir.c:2660 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:2738 +#: dir.c:2784 msgid "untracked cache is disabled on this system or location" msgstr "le cache non suivi est désactivé sur ce système ou sur cet endroit" -#: dir.c:3543 +#: dir.c:3617 #, c-format msgid "index file corrupt in repo %s" msgstr "fichier d'index corrompu dans le dépôt %s" -#: dir.c:3590 dir.c:3595 +#: dir.c:3664 dir.c:3669 #, c-format msgid "could not create directories for %s" msgstr "impossible de créer les répertoires pour %s" -#: dir.c:3624 +#: dir.c:3698 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossible de migrer le répertoire git de '%s' vers '%s'" @@ -3859,13 +4154,15 @@ msgstr "impossible de migrer le répertoire git de '%s' vers '%s'" #: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" -msgstr "suggestion : en attente de la fermeture du fichier par votre éditeur de texte…%c" +msgstr "" +"suggestion : en attente de la fermeture du fichier par votre éditeur de " +"texte…%c" -#: entry.c:179 +#: entry.c:176 msgid "Filtering content" msgstr "Filtrage du contenu" -#: entry.c:500 +#: entry.c:497 #, c-format msgid "could not stat file '%s'" msgstr "impossible de stat le fichier '%s'" @@ -3891,7 +4188,8 @@ msgstr "git fetch-pack : liste superficielle attendue" #: fetch-pack.c:185 msgid "git fetch-pack: expected a flush packet after shallow list" -msgstr "git fetch-pack : paquet de vidage attendu après une liste superficielle" +msgstr "" +"git fetch-pack : paquet de vidage attendu après une liste superficielle" #: fetch-pack.c:196 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" @@ -4004,8 +4302,10 @@ msgstr "erreur dans le démultiplexer latéral" msgid "Server version is %.*s" msgstr "La version du serveur est %.*s" -#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058 -#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096 +#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042 +#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 +#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096 #, c-format msgid "Server supports %s" msgstr "Le serveur supporte %s" @@ -4038,7 +4338,7 @@ msgstr "pas de commit commun" msgid "source repository is shallow, reject to clone." msgstr "le dépôt source est superficiel, clonage rejeté." -#: fetch-pack.c:1128 fetch-pack.c:1651 +#: fetch-pack.c:1128 fetch-pack.c:1660 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack : échec de le récupération." @@ -4060,7 +4360,7 @@ msgstr "Le serveur ne supporte pas les requêtes superficielles" msgid "Server supports filter" msgstr "Le serveur supporte filter" -#: fetch-pack.c:1329 fetch-pack.c:2034 +#: fetch-pack.c:1329 fetch-pack.c:2043 msgid "unable to write request to remote" msgstr "impossible d'écrire la requête sur le distant" @@ -4116,24 +4416,24 @@ msgstr "erreur lors du traitement des références voulues : %d" msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack : paquet de fin de réponse attendu" -#: fetch-pack.c:1930 +#: fetch-pack.c:1939 msgid "no matching remote head" msgstr "pas de HEAD distante correspondante" -#: fetch-pack.c:1953 builtin/clone.c:697 +#: fetch-pack.c:1962 builtin/clone.c:697 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: fetch-pack.c:2056 +#: fetch-pack.c:2065 msgid "unexpected 'ready' from remote" msgstr "'ready' inattendu depuis le distant" -#: fetch-pack.c:2079 +#: fetch-pack.c:2088 #, c-format msgid "no such remote ref %s" msgstr "référence distante inconnue %s" -#: fetch-pack.c:2082 +#: fetch-pack.c:2091 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé" @@ -4153,24 +4453,29 @@ msgstr "gpg n'a pas pu signer les données" #: graph.c:98 #, c-format -msgid "ignore invalid color '%.*s' in log.graphColors" +msgid "ignored invalid color '%.*s' in log.graphColors" msgstr "couleur invalide '%.*s' ignorée dans log.graphColors" #: grep.c:531 -msgid "given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2" -msgstr "le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est supporté qu'avec -P avec PCRE v2" +msgid "" +"given pattern contains NULL byte (via -f <file>). This is only supported " +"with -P under PCRE v2" +msgstr "" +"le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est " +"supporté qu'avec -P avec PCRE v2" -#: grep.c:1893 +#: grep.c:1895 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 builtin/rm.c:136 +#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: grep.c:1921 +#: grep.c:1923 #, c-format msgid "'%s': short read" msgstr "'%s' : lecture tronquée" @@ -4181,7 +4486,8 @@ msgstr "démarrer une zone de travail (voir aussi : git help tutorial)" #: help.c:24 msgid "work on the current change (see also: git help everyday)" -msgstr "travailler sur la modification actuelle (voir aussi : git help revisions)" +msgstr "" +"travailler sur la modification actuelle (voir aussi : git help revisions)" #: help.c:25 msgid "examine the history and state (see also: git help revisions)" @@ -4251,7 +4557,9 @@ msgstr "Les guides des concepts de Git sont :" #: help.c:429 msgid "See 'git help <command>' to read about a specific subcommand" -msgstr "Référez-vous à 'git help <commande>' pour des informations sur une sous-commande spécifique" +msgstr "" +"Référez-vous à 'git help <commande>' pour des informations sur une sous-" +"commande spécifique" #: help.c:434 msgid "External commands" @@ -4282,7 +4590,8 @@ msgstr "Ahem. Votre système n'indique aucune commande Git." #: help.c:613 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." -msgstr "ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe pas." +msgstr "" +"ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe pas." #: help.c:618 #, c-format @@ -4292,7 +4601,8 @@ msgstr "Continuons en supposant que vous avez voulu dire '%s'." #: help.c:623 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." -msgstr "Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'." +msgstr "" +"Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'." #: help.c:635 msgid "" @@ -4408,7 +4718,7 @@ msgstr "sparse : le support des filtres de chemin a été abandonné" #: list-objects-filter-options.c:105 #, c-format -msgid "'%s' for 'object:type=<type>' isnot a valid object type" +msgid "'%s' for 'object:type=<type>' is not a valid object type" msgstr "'%s' pour 'object:type=<type>' n'est pas un type d'objet valide" #: list-objects-filter-options.c:124 @@ -4419,7 +4729,8 @@ msgstr "spécificateur de filtre invalide '%s'" #: list-objects-filter-options.c:140 #, c-format msgid "must escape char in sub-filter-spec: '%c'" -msgstr "le caractère doit être échappé dans le spécificateur de sous-filtre : '%c'" +msgstr "" +"le caractère doit être échappé dans le spécificateur de sous-filtre : '%c'" #: list-objects-filter-options.c:182 msgid "expected something after combine:" @@ -4431,7 +4742,9 @@ msgstr "impossible de combiner des spécificateurs multiples de filtre" #: list-objects-filter-options.c:376 msgid "unable to upgrade repository format to support partial clone" -msgstr "impossible de mettre à jour le format de dépôt pour supporter les clones partiels" +msgstr "" +"impossible de mettre à jour le format de dépôt pour supporter les clones " +"partiels" #: list-objects-filter.c:532 #, c-format @@ -4446,14 +4759,16 @@ msgstr "impossible d'analyser la donnée de filtre clairsemé dans %s" #: list-objects.c:127 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" -msgstr "l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre" +msgstr "" +"l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre" #: list-objects.c:140 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" -msgstr "l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob" +msgstr "" +"l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob" -#: list-objects.c:395 +#: list-objects.c:398 #, c-format msgid "unable to load root tree for commit %s" msgstr "impossible de charger l'arbre racine pour le commit %s" @@ -4500,41 +4815,44 @@ msgstr "CRLF citées détectées" msgid "bad action '%s' for '%s'" msgstr "action invalide '%s' pour '%s'" -#: merge-ort.c:1116 merge-recursive.c:1205 +#: merge-ort.c:1228 merge-recursive.c:1206 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Échec de la fusion du sous-module %s (non extrait)" -#: merge-ort.c:1125 merge-recursive.c:1212 +#: merge-ort.c:1237 merge-recursive.c:1213 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Échec de fusion du sous-module %s (commits non présents)" -#: merge-ort.c:1134 merge-recursive.c:1219 +#: merge-ort.c:1246 merge-recursive.c:1220 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" -msgstr "Échec de la fusion du sous-module %s (les commits ne descendent pas de la base de fusion)" +msgstr "" +"Échec de la fusion du sous-module %s (les commits ne descendent pas de la " +"base de fusion)" -#: merge-ort.c:1144 merge-ort.c:1151 +#: merge-ort.c:1256 merge-ort.c:1263 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "Note : Avance rapide du sous-module %s à %s" -#: merge-ort.c:1172 +#: merge-ort.c:1284 #, c-format msgid "Failed to merge submodule %s" msgstr "Échec de la fusion du sous-module %s" -#: merge-ort.c:1179 +#: merge-ort.c:1291 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" "%s\n" msgstr "" -"Échec de fusion du sous-module %s mais une résolution possible de fusion existe :\n" +"Échec de fusion du sous-module %s mais une résolution possible de fusion " +"existe :\n" "%s\n" -#: merge-ort.c:1183 merge-recursive.c:1273 +#: merge-ort.c:1295 merge-recursive.c:1274 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4551,412 +4869,504 @@ msgstr "" "\n" "qui acceptera cette suggestion.\n" -#: merge-ort.c:1196 +#: merge-ort.c:1308 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" "%s" msgstr "" -"Échec de fusion du sous-module %s mais de multiples solutions de fusion existent :\n" +"Échec de fusion du sous-module %s mais de multiples solutions de fusion " +"existent :\n" "%s" -#: merge-ort.c:1415 merge-recursive.c:1362 +#: merge-ort.c:1527 merge-recursive.c:1363 msgid "Failed to execute internal merge" msgstr "Échec à l'exécution de la fusion interne" -#: merge-ort.c:1420 merge-recursive.c:1367 +#: merge-ort.c:1532 merge-recursive.c:1368 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s à la base de données" -#: merge-ort.c:1427 merge-recursive.c:1400 +#: merge-ort.c:1539 merge-recursive.c:1401 #, c-format msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-ort.c:1566 merge-recursive.c:2122 +#: merge-ort.c:1678 merge-recursive.c:2123 #, c-format -msgid "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of implicit directory rename(s) putting the following path(s) there: %s." -msgstr "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne des renommages implicites de répertoire déplaçant les chemins suivants : %s." +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +msgstr "" +"CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne " +"des renommages implicites de répertoire déplaçant les chemins suivants : %s." -#: merge-ort.c:1576 merge-recursive.c:2132 +#: merge-ort.c:1688 merge-recursive.c:2133 #, c-format -msgid "CONFLICT (implicit dir rename): Cannot map more than one path to %s; implicit directory renames tried to put these paths there: %s" -msgstr "CONFLIT (renommage implicite de répertoire) : impossible de transformer plusieurs chemins sur %s ; les chemins concernés sont : %s" +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +msgstr "" +"CONFLIT (renommage implicite de répertoire) : impossible de transformer " +"plusieurs chemins sur %s ; les chemins concernés sont : %s" -#: merge-ort.c:1634 +#: merge-ort.c:1746 #, c-format msgid "" -"CONFLICT (directory rename split): Unclear where to rename %s to; it was renamed to multiple other directories, with no destination getting a majority of the " -"files." +"CONFLICT (directory rename split): Unclear where to rename %s to; it was " +"renamed to multiple other directories, with no destination getting a " +"majority of the files." msgstr "" -"CONFLIT (renommage de répertoire coupé) : le renommage de %s n'est pas clair parce que le répertoire a été renommé en plusieurs autres répertoires, sans aucune " -"destination récupérant la majorité des fichiers." +"CONFLIT (renommage de répertoire coupé) : le renommage de %s n'est pas clair " +"parce que le répertoire a été renommé en plusieurs autres répertoires, sans " +"aucune destination récupérant la majorité des fichiers." -#: merge-ort.c:1788 merge-recursive.c:2468 +#: merge-ort.c:1900 merge-recursive.c:2469 #, c-format -msgid "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was renamed." -msgstr "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été renommé." +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "" +"AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été " +"renommé." -#: merge-ort.c:1932 merge-recursive.c:3244 +#: merge-ort.c:2044 merge-recursive.c:3252 #, c-format -msgid "Path updated: %s added in %s inside a directory that was renamed in %s; moving it to %s." -msgstr "Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé en %s ; déplacé dans %s." +msgid "" +"Path updated: %s added in %s inside a directory that was renamed in %s; " +"moving it to %s." +msgstr "" +"Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé " +"en %s ; déplacé dans %s." -#: merge-ort.c:1939 merge-recursive.c:3251 +#: merge-ort.c:2051 merge-recursive.c:3259 #, c-format -msgid "Path updated: %s renamed to %s in %s, inside a directory that was renamed in %s; moving it to %s." -msgstr "Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été renommé en %s ; déplacé dans %s." +msgid "" +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " +"%s; moving it to %s." +msgstr "" +"Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été " +"renommé en %s ; déplacé dans %s." -#: merge-ort.c:1952 merge-recursive.c:3247 +#: merge-ort.c:2064 merge-recursive.c:3255 #, c-format -msgid "CONFLICT (file location): %s added in %s inside a directory that was renamed in %s, suggesting it should perhaps be moved to %s." +msgid "" +"CONFLICT (file location): %s added in %s inside a directory that was renamed " +"in %s, suggesting it should perhaps be moved to %s." msgstr "" -"CONFLIT (localisation de fichier) : %s ajouté dans %s dans un répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé vers %s." +"CONFLIT (localisation de fichier) : %s ajouté dans %s dans un répertoire qui " +"a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé " +"vers %s." -#: merge-ort.c:1960 merge-recursive.c:3254 +#: merge-ort.c:2072 merge-recursive.c:3262 #, c-format -msgid "CONFLICT (file location): %s renamed to %s in %s, inside a directory that was renamed in %s, suggesting it should perhaps be moved to %s." +msgid "" +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " +"was renamed in %s, suggesting it should perhaps be moved to %s." msgstr "" -"CONFLIT (localisation de fichier) : %s renommé en %s dans %s, dans un répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé " -"vers %s." +"CONFLIT (localisation de fichier) : %s renommé en %s dans %s, dans un " +"répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être " +"être déplacé vers %s." -#: merge-ort.c:2103 +#: merge-ort.c:2228 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." -msgstr "CONFLIT (renommage/renommage) : %s renommé en %s dans %s et en %s dans %s." +msgstr "" +"CONFLIT (renommage/renommage) : %s renommé en %s dans %s et en %s dans %s." -#: merge-ort.c:2198 +#: merge-ort.c:2323 #, c-format msgid "" -"CONFLICT (rename involved in collision): rename of %s -> %s has content conflicts AND collides with another path; this may result in nested conflict markers." +"CONFLICT (rename involved in collision): rename of %s -> %s has content " +"conflicts AND collides with another path; this may result in nested conflict " +"markers." msgstr "" -"CONFLIT (renommage au sein d'une collision) : lre renommage de %s -> %s a des conflits de contenu ET entre en collision avec un autre chemin ; ceci peut " -"resulter en des marqueurs de conflit imbriqués." +"CONFLIT (renommage au sein d'une collision) : lre renommage de %s -> %s a " +"des conflits de contenu ET entre en collision avec un autre chemin ; ceci " +"peut resulter en des marqueurs de conflit imbriqués." -#: merge-ort.c:2217 merge-ort.c:2241 +#: merge-ort.c:2342 merge-ort.c:2366 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." -msgstr "CONFLIT (renommage/suppression) : Renommage de %s en %s dans %s mais supprimé dans %s." +msgstr "" +"CONFLIT (renommage/suppression) : Renommage de %s en %s dans %s mais " +"supprimé dans %s." -#: merge-ort.c:2550 merge-recursive.c:3002 +#: merge-ort.c:2819 merge-recursive.c:3013 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" -#: merge-ort.c:2553 merge-recursive.c:3005 +#: merge-ort.c:2822 merge-recursive.c:3016 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" -#: merge-ort.c:2981 +#: merge-ort.c:3250 #, c-format -msgid "CONFLICT (file/directory): directory in the way of %s from %s; moving it to %s instead." -msgstr "CONFLIT (fichier/répertoire) : répertoire au milieu de %s depuis %s ; déplacement dans %s à la place." +msgid "" +"CONFLICT (file/directory): directory in the way of %s from %s; moving it to " +"%s instead." +msgstr "" +"CONFLIT (fichier/répertoire) : répertoire au milieu de %s depuis %s ; " +"déplacement dans %s à la place." -#: merge-ort.c:3055 +#: merge-ort.c:3326 #, c-format -msgid "CONFLICT (distinct types): %s had different types on each side; renamed both of them so each can be recorded somewhere." -msgstr "CONFLIT (types différents) : %s a des types différents des deux côtés ; renommé chacune de manière à pouvoir enregistrer les deux quelque part." +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed both " +"of them so each can be recorded somewhere." +msgstr "" +"CONFLIT (types différents) : %s a des types différents des deux côtés ; " +"renommé chacune de manière à pouvoir enregistrer les deux quelque part." -#: merge-ort.c:3062 +#: merge-ort.c:3333 #, c-format -msgid "CONFLICT (distinct types): %s had different types on each side; renamed one of them so each can be recorded somewhere." -msgstr "CONFLIT (types différents) : %s a des types différents des deux côtés ; renommé une d'entre elles de manière à pouvoir enregistrer les deux quelque part." +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed one " +"of them so each can be recorded somewhere." +msgstr "" +"CONFLIT (types différents) : %s a des types différents des deux côtés ; " +"renommé une d'entre elles de manière à pouvoir enregistrer les deux quelque " +"part." -#: merge-ort.c:3162 merge-recursive.c:3081 +#: merge-ort.c:3433 merge-recursive.c:3092 msgid "content" msgstr "contenu" -#: merge-ort.c:3164 merge-recursive.c:3085 +#: merge-ort.c:3435 merge-recursive.c:3096 msgid "add/add" msgstr "ajout/ajout" -#: merge-ort.c:3166 merge-recursive.c:3130 +#: merge-ort.c:3437 merge-recursive.c:3141 msgid "submodule" msgstr "sous-module" -#: merge-ort.c:3168 merge-recursive.c:3131 +#: merge-ort.c:3439 merge-recursive.c:3142 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" -#: merge-ort.c:3198 +#: merge-ort.c:3470 #, c-format -msgid "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s of %s left in tree." -msgstr "CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. Version %s de %s laissée dans l'arbre." +msgid "" +"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " +"of %s left in tree." +msgstr "" +"CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. " +"Version %s de %s laissée dans l'arbre." -#: merge-ort.c:3433 +#: merge-ort.c:3757 #, c-format -msgid "Note: %s not up to date and in way of checking out conflicted version; old copy renamed to %s" -msgstr "Note :%s pas à jour et au milieu de l'extraction d'une version conflictuelle ; la vielle copie a été renommée en %s" +msgid "" +"Note: %s not up to date and in way of checking out conflicted version; old " +"copy renamed to %s" +msgstr "" +"Note :%s pas à jour et au milieu de l'extraction d'une version " +"conflictuelle ; la vielle copie a été renommée en %s" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:3730 +#: merge-ort.c:4116 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "échec de collecte l'information de fusion pour les arbres %s, %s, %s" -#: merge-ort-wrappers.c:13 merge-recursive.c:3699 +#: merge-ort-wrappers.c:13 merge-recursive.c:3707 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" " %s" msgstr "" -"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n" +"Vos modifications locales aux fichiers suivants seraient écrasées par la " +"fusion :\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402 +#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402 msgid "Already up to date." msgstr "Déjà à jour." -#: merge-recursive.c:356 +#: merge-recursive.c:357 msgid "(bad commit)\n" msgstr "(mauvais commit)\n" -#: merge-recursive.c:379 +#: merge-recursive.c:380 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion." -#: merge-recursive.c:388 +#: merge-recursive.c:389 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion." -#: merge-recursive.c:876 +#: merge-recursive.c:877 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de créer le chemin '%s' %s" -#: merge-recursive.c:887 +#: merge-recursive.c:888 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n" -#: merge-recursive.c:901 merge-recursive.c:920 +#: merge-recursive.c:902 merge-recursive.c:921 msgid ": perhaps a D/F conflict?" msgstr ": peut-être un conflit D/F ?" -#: merge-recursive.c:910 +#: merge-recursive.c:911 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" -#: merge-recursive.c:951 builtin/cat-file.c:41 +#: merge-recursive.c:952 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" -#: merge-recursive.c:956 +#: merge-recursive.c:957 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:981 +#: merge-recursive.c:982 #, c-format msgid "failed to open '%s': %s" msgstr "échec à l'ouverture de '%s' : %s" -#: merge-recursive.c:992 +#: merge-recursive.c:993 #, c-format msgid "failed to symlink '%s': %s" msgstr "échec à la création du lien symbolique '%s' : %s" -#: merge-recursive.c:997 +#: merge-recursive.c:998 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" -#: merge-recursive.c:1227 merge-recursive.c:1239 +#: merge-recursive.c:1228 merge-recursive.c:1240 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Avance rapide du sous-module %s au commit suivant :" -#: merge-recursive.c:1230 merge-recursive.c:1242 +#: merge-recursive.c:1231 merge-recursive.c:1243 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avance rapide du sous-module %s" -#: merge-recursive.c:1265 +#: merge-recursive.c:1266 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" -msgstr "Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)" +msgstr "" +"Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)" -#: merge-recursive.c:1269 +#: merge-recursive.c:1270 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Échec de fusion du sous-module %s (pas en avance rapide)" -#: merge-recursive.c:1270 +#: merge-recursive.c:1271 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Résolution possible de fusion trouvée pour le sous-module :\n" -#: merge-recursive.c:1282 +#: merge-recursive.c:1283 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)" -#: merge-recursive.c:1424 +#: merge-recursive.c:1425 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." -msgstr "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la place." +msgstr "" +"Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la " +"place." -#: merge-recursive.c:1496 +#: merge-recursive.c:1497 #, c-format -msgid "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree." -msgstr "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de %s laissée dans l'arbre." +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree." +msgstr "" +"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " +"%s laissée dans l'arbre." -#: merge-recursive.c:1501 +#: merge-recursive.c:1502 #, c-format -msgid "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s left in tree." -msgstr "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version %s de %s laissée dans l'arbre." +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree." +msgstr "" +"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version " +"%s de %s laissée dans l'arbre." -#: merge-recursive.c:1508 +#: merge-recursive.c:1509 #, c-format -msgid "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree at %s." -msgstr "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de %s laissée dans l'arbre dans le fichier %s." +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." +msgstr "" +"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " +"%s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1513 +#: merge-recursive.c:1514 #, c-format -msgid "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s left in tree at %s." -msgstr "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version %s de %s laissée dans l'arbre dans le fichier %s." +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree at %s." +msgstr "" +"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version " +"%s de %s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1548 +#: merge-recursive.c:1549 msgid "rename" msgstr "renommage" -#: merge-recursive.c:1548 +#: merge-recursive.c:1549 msgid "renamed" msgstr "renommé" -#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158 +#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Refus de perdre le fichier modifié %s" -#: merge-recursive.c:1609 +#: merge-recursive.c:1610 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne." -#: merge-recursive.c:1667 +#: merge-recursive.c:1668 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" -msgstr "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s" +msgstr "" +"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s" -#: merge-recursive.c:1698 +#: merge-recursive.c:1699 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s est un répertoire dans %s ajouté plutôt comme %s" -#: merge-recursive.c:1703 +#: merge-recursive.c:1704 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place" -#: merge-recursive.c:1730 +#: merge-recursive.c:1731 #, c-format -msgid "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s\"->\"%s\" in \"%s\"%s" -msgstr "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche \"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" +msgstr "" +"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche " +"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" -#: merge-recursive.c:1735 +#: merge-recursive.c:1736 msgid " (left unresolved)" msgstr " (laissé non résolu)" -#: merge-recursive.c:1827 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" -msgstr "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'->'%s' dans %s" +msgstr "" +"CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-" +">'%s' dans %s" -#: merge-recursive.c:2090 +#: merge-recursive.c:2091 #, c-format msgid "" -"CONFLICT (directory rename split): Unclear where to place %s because directory %s was renamed to multiple other directories, with no destination getting a " -"majority of the files." +"CONFLICT (directory rename split): Unclear where to place %s because " +"directory %s was renamed to multiple other directories, with no destination " +"getting a majority of the files." msgstr "" -"CONFLIT (renommage de répertoire coupé) : la place de %s n'est pas claire parce que le répertoire %s a été renommé en plusieurs autres répertoires, sans aucune " -"destination récupérant la majorité des fichiers." +"CONFLIT (renommage de répertoire coupé) : la place de %s n'est pas claire " +"parce que le répertoire %s a été renommé en plusieurs autres répertoires, " +"sans aucune destination récupérant la majorité des fichiers." -#: merge-recursive.c:2224 +#: merge-recursive.c:2225 #, c-format -msgid "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s->%s in %s" -msgstr "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. Renommage de répertoire %s->%s dans %s" +msgid "" +"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" +">%s in %s" +msgstr "" +"CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. " +"Renommage de répertoire %s->%s dans %s" -#: merge-recursive.c:3069 +#: merge-recursive.c:3080 msgid "modify" msgstr "modification" -#: merge-recursive.c:3069 +#: merge-recursive.c:3080 msgid "modified" msgstr "modifié" -#: merge-recursive.c:3108 +#: merge-recursive.c:3119 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:3161 +#: merge-recursive.c:3172 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" -#: merge-recursive.c:3368 +#: merge-recursive.c:3376 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: merge-recursive.c:3391 +#: merge-recursive.c:3399 msgid "file/directory" msgstr "fichier/répertoire" -#: merge-recursive.c:3396 +#: merge-recursive.c:3404 msgid "directory/file" msgstr "répertoire/fichier" -#: merge-recursive.c:3403 +#: merge-recursive.c:3411 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" -msgstr "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s" +msgstr "" +"CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s" -#: merge-recursive.c:3412 +#: merge-recursive.c:3420 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:3421 +#: merge-recursive.c:3429 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s" -#: merge-recursive.c:3474 +#: merge-recursive.c:3482 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:3568 +#: merge-recursive.c:3576 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:3581 +#: merge-recursive.c:3589 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u ancêtre commun trouvé :" msgstr[1] "%u ancêtres communs trouvés :" -#: merge-recursive.c:3631 +#: merge-recursive.c:3639 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:3796 +#: merge-recursive.c:3804 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900 builtin/stash.c:473 +#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900 +#: builtin/stash.c:473 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." @@ -4964,7 +5374,9 @@ msgstr "Impossible d'écrire l'index." msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965 builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 builtin/stash.c:267 +#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966 +#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 +#: builtin/stash.c:267 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" @@ -4980,7 +5392,9 @@ msgstr "le fichier d'index multi-paquet %s est trop petit" #: midx.c:121 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" -msgstr "la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature 0x%08x" +msgstr "" +"la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature " +"0x%08x" #: midx.c:126 #, c-format @@ -4990,7 +5404,9 @@ msgstr "la version d'index multi-paquet %d n'est pas reconnue" #: midx.c:131 #, c-format msgid "multi-pack-index hash version %u does not match version %u" -msgstr "la version d'empreinte d'index multi-paquet %u ne correspond pas à la version %u" +msgstr "" +"la version d'empreinte d'index multi-paquet %u ne correspond pas à la " +"version %u" #: midx.c:148 msgid "multi-pack-index missing required pack-name chunk" @@ -5011,7 +5427,8 @@ msgstr "index multi-paquet manque de tronçon de décalage d'objet requis" #: midx.c:170 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" -msgstr "index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'" +msgstr "" +"index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'" #: midx.c:214 #, c-format @@ -5020,7 +5437,8 @@ msgstr "mauvais pack-int-id : %u (%u paquets au total)" #: midx.c:264 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" -msgstr "l'index multi-paquet stock un décalage en 64-bit, mais off_t est trop petit" +msgstr "" +"l'index multi-paquet stock un décalage en 64-bit, mais off_t est trop petit" #: midx.c:490 #, c-format @@ -5037,105 +5455,116 @@ msgstr "échec à l'ouverture du fichier paquet '%s'" msgid "failed to locate object %d in packfile" msgstr "échec de localisation de l'objet %d dans le fichier paquet" -#: midx.c:880 builtin/index-pack.c:1535 +#: midx.c:880 builtin/index-pack.c:1533 msgid "cannot store reverse index file" msgstr "impossible de stocker le fichier d'index inversé" -#: midx.c:933 +#: midx.c:920 +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "index multi-paquet existant ignoré ; non-concordance de la somme de contrôle" + +#: midx.c:943 msgid "Adding packfiles to multi-pack-index" msgstr "Ajout de fichiers paquet à un index multi-paquet" -#: midx.c:979 +#: midx.c:989 #, c-format msgid "did not see pack-file %s to drop" msgstr "fichier paquet à éliminer %s non trouvé" -#: midx.c:1024 +#: midx.c:1034 #, c-format msgid "unknown preferred pack: '%s'" msgstr "paquet préféré inconnu : %s" -#: midx.c:1029 +#: midx.c:1039 #, c-format msgid "preferred pack '%s' is expired" msgstr "le paquet préféré '%s' est expiré" -#: midx.c:1045 +#: midx.c:1055 msgid "no pack files to index." msgstr "aucun fichier paquet à l'index." -#: midx.c:1125 builtin/clean.c:37 +#: midx.c:1135 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "échec de la suppression de %s" -#: midx.c:1156 +#: midx.c:1166 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "échec du nettoyage de l'index de multi-paquet à %s" -#: midx.c:1214 +#: midx.c:1225 msgid "multi-pack-index file exists, but failed to parse" msgstr "le fichier d'index multi-paquet existe mais n'a pu être analysé" -#: midx.c:1222 +#: midx.c:1233 +msgid "incorrect checksum" +msgstr "somme de contrôle incorrecte" + +#: midx.c:1236 msgid "Looking for referenced packfiles" msgstr "Recherche de fichiers paquets référencés" -#: midx.c:1237 +#: midx.c:1251 #, c-format -msgid "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -msgstr "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = étalement[%d]" +msgid "" +"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" +msgstr "" +"étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = " +"étalement[%d]" -#: midx.c:1242 +#: midx.c:1256 msgid "the midx contains no oid" msgstr "le midx ne contient aucun oid" -#: midx.c:1251 +#: midx.c:1265 msgid "Verifying OID order in multi-pack-index" msgstr "Vérification de l'ordre des OID dans l'index multi-paquet" -#: midx.c:1260 +#: midx.c:1274 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1280 +#: midx.c:1294 msgid "Sorting objects by packfile" msgstr "Classement des objets par fichier paquet" -#: midx.c:1287 +#: midx.c:1301 msgid "Verifying object offsets" msgstr "Vérification des décalages des objets" -#: midx.c:1303 +#: midx.c:1317 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s" -#: midx.c:1309 +#: midx.c:1323 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "impossible de lire le fichier paquet %s" -#: midx.c:1318 +#: midx.c:1332 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>" -#: midx.c:1343 +#: midx.c:1357 msgid "Counting referenced objects" msgstr "Comptage des objets référencés" -#: midx.c:1353 +#: midx.c:1367 msgid "Finding and deleting unreferenced packfiles" msgstr "Recherche et effacement des fichiers paquets non-référencés" -#: midx.c:1544 +#: midx.c:1558 msgid "could not start pack-objects" msgstr "impossible de démarrer le groupement d'objets" -#: midx.c:1564 +#: midx.c:1578 msgid "could not finish pack-objects" msgstr "impossible de finir le groupement d'objets" @@ -5158,10 +5587,12 @@ msgstr "impossible de joindre le fil lazy_name : %s" #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" -"Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the previous merge before you start a new notes merge." +"Please, use 'git notes merge --commit' or 'git notes merge --abort' to " +"commit/abort the previous merge before you start a new notes merge." msgstr "" "Vous n'avez pas terminé votre précédente fusion de notes (%s existe).\n" -"Veuillez utiliser 'git notes merge --commit' ou 'git notes merge --abort' pour valider/abandonner la fusion en cours avant d'en démarrer une nouvelle." +"Veuillez utiliser 'git notes merge --commit' ou 'git notes merge --abort' " +"pour valider/abandonner la fusion en cours avant d'en démarrer une nouvelle." #: notes-merge.c:284 #, c-format @@ -5194,267 +5625,272 @@ msgstr "Mauvaise valeur de %s : '%s'" #: object-file.c:526 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" -msgstr "le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates" +msgstr "" +"le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates" -#: object-file.c:577 +#: object-file.c:584 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "impossible de normaliser le chemin d'objet alternatif : %s" -#: object-file.c:649 +#: object-file.c:658 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde" -#: object-file.c:656 +#: object-file.c:665 #, c-format msgid "unable to normalize object directory: %s" msgstr "impossible de normaliser le répertoire d'objet : %s" -#: object-file.c:699 +#: object-file.c:708 msgid "unable to fdopen alternates lockfile" msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives" -#: object-file.c:717 +#: object-file.c:726 msgid "unable to read alternates file" msgstr "lecture du fichier d'alternatives impossible" -#: object-file.c:724 +#: object-file.c:733 msgid "unable to move new alternates file into place" msgstr "impossible de déplacer le nouveau fichier d'alternative" -#: object-file.c:759 +#: object-file.c:768 #, c-format msgid "path '%s' does not exist" msgstr "le chemin '%s' n'existe pas" -#: object-file.c:780 +#: object-file.c:789 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "extraire le dépôt de référence '%s' comme une extraction liée n'est pas encore supporté." +msgstr "" +"extraire le dépôt de référence '%s' comme une extraction liée n'est pas " +"encore supporté." -#: object-file.c:786 +#: object-file.c:795 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "le dépôt de référence '%s' n'est pas un dépôt local." -#: object-file.c:792 +#: object-file.c:801 #, c-format msgid "reference repository '%s' is shallow" msgstr "le dépôt de référence '%s' est superficiel" -#: object-file.c:800 +#: object-file.c:809 #, c-format msgid "reference repository '%s' is grafted" msgstr "le dépôt de référence '%s' est greffé" -#: object-file.c:860 +#: object-file.c:869 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "ligne invalide pendant l'analyse des refs alternatives : %s" -#: object-file.c:1010 +#: object-file.c:1019 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>" -#: object-file.c:1031 -msgid "mmap failed" -msgstr "échec de mmap" +#: object-file.c:1054 +#, c-format +msgid "mmap failed%s" +msgstr "échec de mmap%s" -#: object-file.c:1195 +#: object-file.c:1218 #, c-format msgid "object file %s is empty" msgstr "le fichier objet %s est vide" -#: object-file.c:1330 object-file.c:2524 +#: object-file.c:1353 object-file.c:2548 #, c-format msgid "corrupt loose object '%s'" msgstr "objet libre corrompu '%s'" -#: object-file.c:1332 object-file.c:2528 +#: object-file.c:1355 object-file.c:2552 #, c-format msgid "garbage at end of loose object '%s'" msgstr "données incorrectes à la fin de l'objet libre '%s'" -#: object-file.c:1374 +#: object-file.c:1397 msgid "invalid object type" msgstr "type d'objet invalide" -#: object-file.c:1458 +#: object-file.c:1481 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" -msgstr "impossible de dépaqueter l'entête %s avec --allow-unknow-type" +msgstr "impossible de dépaqueter l'entête %s avec --allow-unknown-type" -#: object-file.c:1461 +#: object-file.c:1484 #, c-format msgid "unable to unpack %s header" msgstr "impossible de dépaqueter l'entête %s" -#: object-file.c:1467 +#: object-file.c:1490 #, c-format msgid "unable to parse %s header with --allow-unknown-type" -msgstr "impossible d'analyser l'entête %s avec --allow-unknow-type" +msgstr "impossible d'analyser l'entête %s avec --allow-unknown-type" -#: object-file.c:1470 +#: object-file.c:1493 #, c-format msgid "unable to parse %s header" msgstr "impossible d'analyser l'entête %s" -#: object-file.c:1697 +#: object-file.c:1717 #, c-format msgid "failed to read object %s" msgstr "impossible de lire l'objet %s" -#: object-file.c:1701 +#: object-file.c:1721 #, c-format msgid "replacement %s not found for %s" msgstr "remplacement %s non trouvé pour %s" -#: object-file.c:1705 +#: object-file.c:1725 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'objet libre %s (stocké dans %s) est corrompu" -#: object-file.c:1709 +#: object-file.c:1729 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu" -#: object-file.c:1814 +#: object-file.c:1834 #, c-format msgid "unable to write file %s" msgstr "impossible d'écrire le fichier %s" -#: object-file.c:1821 +#: object-file.c:1841 #, c-format msgid "unable to set permission to '%s'" msgstr "impossible de régler les droits de '%s'" -#: object-file.c:1828 +#: object-file.c:1848 msgid "file write error" msgstr "erreur d'écriture d'un fichier" -#: object-file.c:1848 +#: object-file.c:1868 msgid "error when closing loose object file" msgstr "erreur en fermeture du fichier d'objet esseulé" -#: object-file.c:1913 +#: object-file.c:1933 #, c-format msgid "insufficient permission for adding an object to repository database %s" -msgstr "droits insuffisants pour ajouter un objet à la base de données %s du dépôt" +msgstr "" +"droits insuffisants pour ajouter un objet à la base de données %s du dépôt" -#: object-file.c:1915 +#: object-file.c:1935 msgid "unable to create temporary file" msgstr "impossible de créer un fichier temporaire" -#: object-file.c:1939 +#: object-file.c:1959 msgid "unable to write loose object file" msgstr "impossible d'écrire le fichier d'objet esseulé" -#: object-file.c:1945 +#: object-file.c:1965 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "impossible de compresser le nouvel objet %s (%d)" -#: object-file.c:1949 +#: object-file.c:1969 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "échec de deflateEnd sur l'objet %s (%d)" -#: object-file.c:1953 +#: object-file.c:1973 #, c-format msgid "confused by unstable object source data for %s" msgstr "données de source d'objet instable pour %s" -#: object-file.c:1963 builtin/pack-objects.c:1097 +#: object-file.c:1983 builtin/pack-objects.c:1237 #, c-format msgid "failed utime() on %s" msgstr "échec de utime() sur %s" -#: object-file.c:2040 +#: object-file.c:2060 #, c-format msgid "cannot read object for %s" msgstr "impossible de lire l'objet pour %s" -#: object-file.c:2091 +#: object-file.c:2111 msgid "corrupt commit" msgstr "commit corrompu" -#: object-file.c:2099 +#: object-file.c:2119 msgid "corrupt tag" msgstr "étiquette corrompue" -#: object-file.c:2199 +#: object-file.c:2219 #, c-format msgid "read error while indexing %s" msgstr "erreur de lecture à l'indexation de %s" -#: object-file.c:2202 +#: object-file.c:2222 #, c-format msgid "short read while indexing %s" msgstr "lecture tronquée pendant l'indexation de %s" -#: object-file.c:2275 object-file.c:2285 +#: object-file.c:2295 object-file.c:2305 #, c-format msgid "%s: failed to insert into database" msgstr "%s : échec de l'insertion dans la base de données" -#: object-file.c:2291 +#: object-file.c:2311 #, c-format msgid "%s: unsupported file type" msgstr "%s : type de fichier non supporté" -#: object-file.c:2315 +#: object-file.c:2335 #, c-format msgid "%s is not a valid object" msgstr "%s n'est pas un objet valide" -#: object-file.c:2317 +#: object-file.c:2337 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s n'est pas un objet '%s' valide" -#: object-file.c:2344 builtin/index-pack.c:192 +#: object-file.c:2364 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "impossible d'ouvrir %s" -#: object-file.c:2535 object-file.c:2588 +#: object-file.c:2559 object-file.c:2612 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "incohérence de hachage pour %s (%s attendu)" -#: object-file.c:2559 +#: object-file.c:2583 #, c-format msgid "unable to mmap %s" msgstr "impossible de mmap %s" -#: object-file.c:2564 +#: object-file.c:2588 #, c-format msgid "unable to unpack header of %s" msgstr "impossible de dépaqueter l'entête de %s" -#: object-file.c:2570 +#: object-file.c:2594 #, c-format msgid "unable to parse header of %s" msgstr "impossible d'analyser l'entête de %s" -#: object-file.c:2581 +#: object-file.c:2605 #, c-format msgid "unable to unpack contents of %s" msgstr "impossible de dépaqueter le contenu de %s" -#: object-name.c:486 +#: object-name.c:480 #, c-format msgid "short object ID %s is ambiguous" msgstr "l'id court d'objet %s est ambigu" -#: object-name.c:497 +#: object-name.c:491 msgid "The candidates are:" msgstr "Les candidats sont :" -#: object-name.c:796 +#: object-name.c:790 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -5472,26 +5908,28 @@ msgstr "" "\n" " git switch -c $br $(git rev-parse ...)\n" "\n" -"où \"$br\" est d'une manière ou d'une autre vide et une référence 40-hexa est créée.\n" -"Veuillez examiner ces références et peut-être les supprimer. Désactivez ce message\n" +"où \"$br\" est d'une manière ou d'une autre vide et une référence 40-hexa " +"est créée.\n" +"Veuillez examiner ces références et peut-être les supprimer. Désactivez ce " +"message\n" "en lançant \"git config advice.objectNameWarning false\"" -#: object-name.c:916 +#: object-name.c:910 #, c-format msgid "log for '%.*s' only goes back to %s" msgstr "le journal de '%.*s' ne remonte qu'à %s" -#: object-name.c:924 +#: object-name.c:918 #, c-format msgid "log for '%.*s' only has %d entries" msgstr "le journal de '%.*s' n'a que %d entrées" -#: object-name.c:1702 +#: object-name.c:1696 #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "le chemin '%s' existe sur le disque, mais pas dans '%.*s'" -#: object-name.c:1708 +#: object-name.c:1702 #, c-format msgid "" "path '%s' exists, but not '%s'\n" @@ -5500,12 +5938,12 @@ msgstr "" "le chemin '%s' existe, mais pas '%s'\n" "conseil : peut-être vouliez-vous dire '%.*s:%s', soit '%.*s:./%s' ?" -#: object-name.c:1717 +#: object-name.c:1711 #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "le chemin '%s' n'existe pas dans '%.*s'" -#: object-name.c:1745 +#: object-name.c:1739 #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" @@ -5514,7 +5952,7 @@ msgstr "" "le chemin '%s' est dans l'index, mais pas à l'étape %d\n" "conseil : vous vouliez peut-être dire ':%d:%s' ?" -#: object-name.c:1761 +#: object-name.c:1755 #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" @@ -5523,21 +5961,23 @@ msgstr "" "le chemin '%s' est dans l'index, mais pas '%s'\n" "conseil : peut-être vouliez-vous dire ':%d:%s', soit '%d:./%s' ?" -#: object-name.c:1769 +#: object-name.c:1763 #, c-format msgid "path '%s' exists on disk, but not in the index" msgstr "le chemin '%s' existe sur le disque, mais pas dans l'index" -#: object-name.c:1771 +#: object-name.c:1765 #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "le chemin '%s' n'existe pas (ni sur le disque, ni dans l'index)" -#: object-name.c:1784 +#: object-name.c:1778 msgid "relative path syntax can't be used outside working tree" -msgstr "la syntaxe de chemin relatif ne peut pas être utilisée hors de l'arbre de travail" +msgstr "" +"la syntaxe de chemin relatif ne peut pas être utilisée hors de l'arbre de " +"travail" -#: object-name.c:1922 +#: object-name.c:1916 #, c-format msgid "invalid object name '%.*s'." msgstr "nom d'objet invalide : '%.*s'." @@ -5552,27 +5992,27 @@ msgstr "type d'objet invalide \"%s\"" msgid "object %s is a %s, not a %s" msgstr "l'objet %s est de type %s, pas de type %s" -#: object.c:232 +#: object.c:250 #, c-format msgid "object %s has unknown type id %d" msgstr "l'objet %s a un id de type inconnu %d" -#: object.c:245 +#: object.c:263 #, c-format msgid "unable to parse object: %s" msgstr "impossible d'analyser l'objet : %s" -#: object.c:265 object.c:277 +#: object.c:283 object.c:295 #, c-format msgid "hash mismatch %s" msgstr "incohérence de hachage %s" -#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251 +#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411 #, c-format msgid "unable to get size of %s" msgstr "impossible de récupérer la taille de %s" -#: pack-bitmap.c:1547 builtin/rev-list.c:92 +#: pack-bitmap.c:1571 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "impossible de récupérer l'utilisation du disque de %s" @@ -5625,15 +6065,21 @@ msgstr "impossible d'écrire le fichier de prometteur '%s'" msgid "offset before end of packfile (broken .idx?)" msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" -#: packfile.c:1937 +#: packfile.c:655 +#, c-format +msgid "packfile %s cannot be mapped%s" +msgstr "le fichier paquet %s ne peut être mmap%s" + +#: packfile.c:1934 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)" -#: packfile.c:1941 +#: packfile.c:1938 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)" +msgstr "" +"offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)" #: parse-options-cb.c:20 parse-options-cb.c:24 #, c-format @@ -5748,7 +6194,9 @@ msgstr "Impossible de rendre %s inscriptible pour le groupe" #: pathspec.c:151 msgid "Escape character '\\' not allowed as last character in attr value" -msgstr "Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une valeur d'attribut" +msgstr "" +"Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une " +"valeur d'attribut" #: pathspec.c:169 msgid "Only one 'attr:' specification is allowed." @@ -5765,11 +6213,17 @@ msgstr "nom d'attribut invalide %s" #: pathspec.c:280 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" -msgstr "les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont incompatibles" +msgstr "" +"les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont " +"incompatibles" #: pathspec.c:287 -msgid "global 'literal' pathspec setting is incompatible with all other global pathspec settings" -msgstr "le réglage global de spécificateur de chemin 'literal' est incompatible avec tous les autres réglages globaux de spécificateur de chemin" +msgid "" +"global 'literal' pathspec setting is incompatible with all other global " +"pathspec settings" +msgstr "" +"le réglage global de spécificateur de chemin 'literal' est incompatible avec " +"tous les autres réglages globaux de spécificateur de chemin" #: pathspec.c:327 msgid "invalid parameter for pathspec magic 'prefix'" @@ -5808,7 +6262,9 @@ msgstr "'%s' (mnémonique : '%c')" #: pathspec.c:552 #, c-format msgid "%s: pathspec magic not supported by this command: %s" -msgstr "%s : le spécificateur magique de chemin n'est pas supporté par cette commande : %s" +msgstr "" +"%s : le spécificateur magique de chemin n'est pas supporté par cette " +"commande : %s" #: pathspec.c:619 #, c-format @@ -5829,8 +6285,8 @@ msgid "unable to write delim packet" msgstr "impossible d'écrire le paquet de délimitation" #: pkt-line.c:106 -msgid "unable to write stateless separator packet" -msgstr "impossible d'écrire le paquet de séparateur sans état" +msgid "unable to write response end packet" +msgstr "impossible d'écrire le paquet de fin de réponse" #: pkt-line.c:113 msgid "flush packet write failed" @@ -5846,7 +6302,9 @@ msgstr "échec de l'écriture d'un paquet avec format" #: pkt-line.c:204 msgid "packet write failed - data exceeds max packet size" -msgstr "échec de l'écriture d'un paquet ‑ les données dépassent la taille maximale d'un paquet" +msgstr "" +"échec de l'écriture d'un paquet ‑ les données dépassent la taille maximale " +"d'un paquet" #: pkt-line.c:222 #, c-format @@ -5889,19 +6347,23 @@ msgstr "impossible de créer le lstat en fil : %s" msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" -#: promisor-remote.c:30 +#: promisor-remote.c:31 msgid "promisor-remote: unable to fork off fetch subprocess" -msgstr "promisor-remote : impossible de créer un sous-processus de récupération" +msgstr "" +"promisor-remote : impossible de créer un sous-processus de récupération" -#: promisor-remote.c:35 promisor-remote.c:37 +#: promisor-remote.c:38 promisor-remote.c:40 msgid "promisor-remote: could not write to fetch subprocess" -msgstr "promisor-remote : impossible d'écrire vers un sous-processus de récupération" +msgstr "" +"promisor-remote : impossible d'écrire vers un sous-processus de récupération" -#: promisor-remote.c:41 +#: promisor-remote.c:44 msgid "promisor-remote: could not close stdin to fetch subprocess" -msgstr "promisor-remote : impossible de fermer l'entrée standard du sous-processus de récupération" +msgstr "" +"promisor-remote : impossible de fermer l'entrée standard du sous-processus " +"de récupération" -#: promisor-remote.c:53 +#: promisor-remote.c:54 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "un nom de prometteur distant ne peut pas commencer par '/' : %s" @@ -5922,79 +6384,85 @@ msgstr "impossible de démarrer `log`" msgid "could not read `log` output" msgstr "impossible de lire la sortie de `log`" -#: range-diff.c:101 sequencer.c:5551 +#: range-diff.c:101 sequencer.c:5550 #, c-format msgid "could not parse commit '%s'" msgstr "impossible d'analyser le commit '%s'" #: range-diff.c:115 #, c-format -msgid "could not parse first line of `log` output: did not start with 'commit ': '%s'" -msgstr "impossible d'analyser la première ligne de la sortie de `log` : ne commence pas par 'commit' : '%s'" +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "" +"impossible d'analyser la première ligne de la sortie de `log` : ne commence " +"pas par 'commit' : '%s'" #: range-diff.c:140 #, c-format msgid "could not parse git header '%.*s'" msgstr "impossible d'analyser l'entête git '%.*s'" -#: range-diff.c:306 +#: range-diff.c:307 msgid "failed to generate diff" msgstr "échec de la génération de diff" -#: range-diff.c:558 +#: range-diff.c:559 msgid "--left-only and --right-only are mutually exclusive" msgstr "--left-only et --right-only sont mutuellement exclusifs" -#: range-diff.c:561 range-diff.c:563 +#: range-diff.c:562 range-diff.c:564 #, c-format msgid "could not parse log for '%s'" msgstr "impossible d'analyser le journal pour '%s'" -#: read-cache.c:708 +#: read-cache.c:710 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "pas d'ajout d'alias de fichier '%s'(« %s » existe déjà dans l'index)" -#: read-cache.c:724 +#: read-cache.c:726 msgid "cannot create an empty blob in the object database" msgstr "impossible de créer un blob vide dans la base de donnée d'objets" -#: read-cache.c:746 +#: read-cache.c:748 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" -msgstr "%s : ne peut ajouter que des fichiers normaux, des liens symboliques ou des répertoires git" +msgstr "" +"%s : ne peut ajouter que des fichiers normaux, des liens symboliques ou des " +"répertoires git" -#: read-cache.c:751 +#: read-cache.c:753 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' n'a pas de commit extrait" -#: read-cache.c:803 +#: read-cache.c:805 #, c-format msgid "unable to index file '%s'" msgstr "indexation du fichier '%s' impossible" -#: read-cache.c:822 +#: read-cache.c:824 #, c-format msgid "unable to add '%s' to index" msgstr "impossible d'ajouter '%s' à l'index" -#: read-cache.c:833 +#: read-cache.c:835 #, c-format msgid "unable to stat '%s'" msgstr "fstat de '%s' impossible" -#: read-cache.c:1356 +#: read-cache.c:1358 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' existe à la fois comme un fichier et un répertoire" -#: read-cache.c:1571 +#: read-cache.c:1573 msgid "Refresh index" msgstr "Rafraîchir l'index" -#: read-cache.c:1700 -#, c-format, fuzzy +#: read-cache.c:1705 +#, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" @@ -6002,7 +6470,7 @@ msgstr "" "index.version renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1710 +#: read-cache.c:1715 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6011,156 +6479,163 @@ msgstr "" "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1766 +#: read-cache.c:1771 #, c-format msgid "bad signature 0x%08x" msgstr "signature incorrecte 0x%08x" -#: read-cache.c:1769 +#: read-cache.c:1774 #, c-format msgid "bad index version %d" msgstr "mauvaise version d'index %d" -#: read-cache.c:1778 +#: read-cache.c:1783 msgid "bad index file sha1 signature" msgstr "mauvaise signature sha1 d'index" -#: read-cache.c:1812 +#: read-cache.c:1817 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "l'index utilise l'extension %.4s qui n'est pas comprise" -#: read-cache.c:1814 +#: read-cache.c:1819 #, c-format msgid "ignoring %.4s extension" msgstr "extension %.4s ignorée" -#: read-cache.c:1851 +#: read-cache.c:1856 #, c-format msgid "unknown index entry format 0x%08x" msgstr "format d'entrée d'index inconnu 0x%08x" -#: read-cache.c:1867 +#: read-cache.c:1872 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "champ de nom malformé dans l'index, près du chemin '%s'" -#: read-cache.c:1924 +#: read-cache.c:1929 msgid "unordered stage entries in index" msgstr "entrées de préparation non ordonnées dans l'index" -#: read-cache.c:1927 +#: read-cache.c:1932 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "entrées multiples de préparation pour le fichier fusionné '%s'" -#: read-cache.c:1930 +#: read-cache.c:1935 #, c-format msgid "unordered stage entries for '%s'" msgstr "entrées de préparation non ordonnées pour '%s'" -#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991 builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 builtin/mv.c:146 -#: builtin/reset.c:247 builtin/rm.c:291 builtin/submodule--helper.c:332 +#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987 +#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 +#: builtin/submodule--helper.c:331 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: read-cache.c:2180 +#: read-cache.c:2185 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "impossible de créer le fil load_cache_entries : %s" -#: read-cache.c:2193 +#: read-cache.c:2198 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "impossible de joindre le fil load_cache_entries : %s" -#: read-cache.c:2226 +#: read-cache.c:2231 #, c-format msgid "%s: index file open failed" msgstr "%s : l'ouverture du fichier d'index a échoué" -#: read-cache.c:2230 +#: read-cache.c:2235 #, c-format msgid "%s: cannot stat the open index" msgstr "%s : impossible de faire un stat sur l'index ouvert" -#: read-cache.c:2234 +#: read-cache.c:2239 #, c-format msgid "%s: index file smaller than expected" msgstr "%s : fichier d'index plus petit qu'attendu" -#: read-cache.c:2238 +#: read-cache.c:2243 #, c-format -msgid "%s: unable to map index file" -msgstr "%s : impossible de mapper le fichier d'index" +msgid "%s: unable to map index file%s" +msgstr "%s : impossible de mapper le fichier d'index%s" -#: read-cache.c:2280 +#: read-cache.c:2286 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "impossible de créer le fil load_index_extensions : %s" -#: read-cache.c:2307 +#: read-cache.c:2313 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "impossible de joindre le fil load_index_extensions : %s" -#: read-cache.c:2345 +#: read-cache.c:2351 #, c-format msgid "could not freshen shared index '%s'" msgstr "impossible de rafraîchir l'index partagé '%s'" -#: read-cache.c:2392 +#: read-cache.c:2398 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "index cassé, %s attendu dans %s, %s obtenu" -#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 +#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: read-cache.c:3138 +#: read-cache.c:3074 msgid "failed to convert to a sparse-index" msgstr "échec de conversion d'un index clairsemé" -#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441 +#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440 #, c-format msgid "could not stat '%s'" msgstr "impossible de stat '%s'" -#: read-cache.c:3222 +#: read-cache.c:3158 #, c-format msgid "unable to open git dir: %s" msgstr "impossible d'ouvrir le répertoire git : %s" -#: read-cache.c:3234 +#: read-cache.c:3170 #, c-format msgid "unable to unlink: %s" msgstr "échec lors de l'unlink : %s" -#: read-cache.c:3263 +#: read-cache.c:3199 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "impossible de régler les bits de droit de '%s'" -#: read-cache.c:3412 +#: read-cache.c:3348 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s : impossible de revenir à l'étape 0" #: rebase-interactive.c:11 msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" -"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git rebase --continue'.\n" +"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git " +"rebase --continue'.\n" "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n" #: rebase-interactive.c:33 #, c-format -msgid "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." -msgstr "paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré." +msgid "" +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." +msgstr "" +"paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré." #: rebase-interactive.c:42 msgid "" @@ -6191,13 +6666,18 @@ msgstr "" " p, pick <commit> = utiliser le commit\n" " r, reword <commit> = utiliser le commit, mais reformuler son message\n" " e, edit <commit> = utiliser le commit, mais s'arrêter pour le modifier\n" -" s, squash <commit> = utiliser le commit, mais le fusionner avec le précédent\n" -" f, fixup [-C | -c] <commit> = comme \"squash\", mais en ne gardant que le message\n" -" du commit précédent, à moins que -C ne soit utilisé, auquel cas, conserver\n" -" ne conserver que le message de ce commit ; -c est identique à -C mais ouvre\n" +" s, squash <commit> = utiliser le commit, mais le fusionner avec le " +"précédent\n" +" f, fixup [-C | -c] <commit> = comme \"squash\", mais en ne gardant que le " +"message\n" +" du commit précédent, à moins que -C ne soit utilisé, " +"auquel cas, conserver\n" +" ne conserver que le message de ce commit ; -c est " +"identique à -C mais ouvre\n" " un éditeur\n" " x, exec <commit> = lancer la commande (reste de la ligne) dans un shell\n" -" b, break = s'arrêter ici (on peut continuer ensuite avec 'git rebase --continue')\n" +" b, break = s'arrêter ici (on peut continuer ensuite avec 'git rebase --" +"continue')\n" " d, drop <commit> = supprimer le commit\n" " l, label <label> = étiqueter la HEAD courante avec un nom\n" " t, reset <label> = réinitialiser HEAD à label\n" @@ -6221,7 +6701,8 @@ msgid "" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" "\n" -"Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un commit.\n" +"Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un " +"commit.\n" #: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222 msgid "" @@ -6240,7 +6721,8 @@ msgid "" "\n" msgstr "" "\n" -"Vous êtes en train d'éditer le fichier todo d'un rebasage interactif en cours.\n" +"Vous êtes en train d'éditer le fichier todo d'un rebasage interactif en " +"cours.\n" "Pour continuer le rebasage après édition, lancez :\n" " git rebase --continue\n" "\n" @@ -6255,12 +6737,14 @@ msgstr "" "Cependant, si vous effacez tout, le rebasage sera annulé.\n" "\n" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816 sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836 +#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271 #, c-format msgid "could not write '%s'" msgstr "impossible d'écrire '%s'" -#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229 builtin/rebase.c:253 +#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229 +#: builtin/rebase.c:253 #, c-format msgid "could not write '%s'." msgstr "impossible d'écrire '%s'." @@ -6279,23 +6763,28 @@ msgstr "" msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" "\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" "The possible behaviours are: ignore, warn, error.\n" "\n" msgstr "" -"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un commit.\n" +"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un " +"commit.\n" "\n" -"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau d'avertissements.\n" +"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau " +"d'avertissements.\n" "Les comportements disponibles sont : ignore, warn, error.\n" "\n" -#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597 builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240 builtin/rebase.c:265 +#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597 +#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240 +#: builtin/rebase.c:265 #, c-format msgid "could not read '%s'." msgstr "impossible de lire '%s'." # à priori on parle d'une branche ici -#: ref-filter.c:42 wt-status.c:1978 +#: ref-filter.c:42 wt-status.c:2036 msgid "gone" msgstr "disparue" @@ -6314,246 +6803,248 @@ msgstr "en retard de %d" msgid "ahead %d, behind %d" msgstr "en avance de %d, en retard de %d" -#: ref-filter.c:175 +#: ref-filter.c:230 #, c-format msgid "expected format: %%(color:<color>)" msgstr "format attendu : %%(color:<couleur>)" -#: ref-filter.c:177 +#: ref-filter.c:232 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "couleur non reconnue : %%(color:%s)" -#: ref-filter.c:199 +#: ref-filter.c:254 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Valeur entière attendue refname:lstrip=%s" -#: ref-filter.c:203 +#: ref-filter.c:258 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valeur entière attendue refname:rstrip=%s" -#: ref-filter.c:205 +#: ref-filter.c:260 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argument %%(%s) non reconnu : %s" -#: ref-filter.c:260 +#: ref-filter.c:315 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) n'accepte pas d'argument" -#: ref-filter.c:282 +#: ref-filter.c:339 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "argument %%(objectsize) non reconnu : %s" -#: ref-filter.c:290 +#: ref-filter.c:347 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) n'accepte pas d'argument" -#: ref-filter.c:302 +#: ref-filter.c:359 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) n'accepte pas d'argument" -#: ref-filter.c:315 +#: ref-filter.c:372 #, c-format msgid "unrecognized %%(subject) argument: %s" msgstr "argument %%(subject) non reconnu : %s" -#: ref-filter.c:334 +#: ref-filter.c:391 #, c-format msgid "expected %%(trailers:key=<value>)" msgstr "%%(trailers:key=<value>) attendu" -#: ref-filter.c:336 +#: ref-filter.c:393 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "argument %%(trailers) inconnu : %s" -#: ref-filter.c:367 +#: ref-filter.c:424 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valeur positive attendue contents:lines=%s" -#: ref-filter.c:369 +#: ref-filter.c:426 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argument %%(contents) non reconnu : %s" -#: ref-filter.c:384 +#: ref-filter.c:441 #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "valeur positive attendue '%s' dans %%(%s)" -#: ref-filter.c:388 +#: ref-filter.c:445 #, c-format msgid "unrecognized argument '%s' in %%(%s)" msgstr "argument '%s' non reconnu dans %%(%s)" -#: ref-filter.c:402 +#: ref-filter.c:459 #, c-format msgid "unrecognized email option: %s" msgstr "option de courriel non reconnue : %s" -#: ref-filter.c:432 +#: ref-filter.c:489 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format attendu : %%(align:<largeur>,<position>)" -#: ref-filter.c:444 +#: ref-filter.c:501 #, c-format msgid "unrecognized position:%s" msgstr "position non reconnue : %s" -#: ref-filter.c:451 +#: ref-filter.c:508 #, c-format msgid "unrecognized width:%s" msgstr "largeur non reconnue : %s" -#: ref-filter.c:460 +#: ref-filter.c:517 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argument %%(align) non reconnu : %s" -#: ref-filter.c:468 +#: ref-filter.c:525 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "valeur positive attendue avec l'atome %%(align)" -#: ref-filter.c:486 +#: ref-filter.c:543 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argument %%(if) non reconnu : %s" -#: ref-filter.c:588 +#: ref-filter.c:645 #, c-format msgid "malformed field name: %.*s" msgstr "nom de champ malformé %.*s" -#: ref-filter.c:615 +#: ref-filter.c:672 #, c-format msgid "unknown field name: %.*s" msgstr "nom de champ inconnu : %.*s" -#: ref-filter.c:619 +#: ref-filter.c:676 #, c-format -msgid "not a git repository, but the field '%.*s' requires access to object data" -msgstr "pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet" +msgid "" +"not a git repository, but the field '%.*s' requires access to object data" +msgstr "" +"pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet" -#: ref-filter.c:743 +#: ref-filter.c:801 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format : atome %%(if) utilisé sans un atome %%(then)" -#: ref-filter.c:807 +#: ref-filter.c:865 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format : atome %%(then) utilisé sans un atome %%(if)" -#: ref-filter.c:809 +#: ref-filter.c:867 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format : atome %%(then) utilisé plus d'une fois" -#: ref-filter.c:811 +#: ref-filter.c:869 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atome %%(then) utilisé après %%(else)" -#: ref-filter.c:839 +#: ref-filter.c:897 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format : atome %%(else) utilisé sans un atome %%(if)" -#: ref-filter.c:841 +#: ref-filter.c:899 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format : atome %%(else) utilisé sans un atome %%(then)" -#: ref-filter.c:843 +#: ref-filter.c:901 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format : atome %%(else) utilisé plus d'une fois" -#: ref-filter.c:858 +#: ref-filter.c:916 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format : atome %%(end) utilisé sans atome correspondant" -#: ref-filter.c:915 +#: ref-filter.c:973 #, c-format msgid "malformed format string %s" msgstr "chaîne de formatage mal formée %s" -#: ref-filter.c:1556 +#: ref-filter.c:1621 #, c-format msgid "(no branch, rebasing %s)" msgstr "(aucune branche, rebasage de %s)" -#: ref-filter.c:1559 +#: ref-filter.c:1624 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(aucune branche, rebasage de la HEAD détachée %s)" -#: ref-filter.c:1562 +#: ref-filter.c:1627 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(aucune branche, bisect a démarré sur %s)" -#: ref-filter.c:1566 +#: ref-filter.c:1631 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD détachée sur %s)" -#: ref-filter.c:1569 +#: ref-filter.c:1634 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD détachée depuis %s)" -#: ref-filter.c:1572 +#: ref-filter.c:1637 msgid "(no branch)" msgstr "(aucune branche)" -#: ref-filter.c:1604 ref-filter.c:1813 +#: ref-filter.c:1669 ref-filter.c:1880 #, c-format msgid "missing object %s for %s" msgstr "objet manquant %s pour %s" -#: ref-filter.c:1614 +#: ref-filter.c:1679 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "échec de parse_object_buffer sur %s pour %s" -#: ref-filter.c:1997 +#: ref-filter.c:2064 #, c-format msgid "malformed object at '%s'" msgstr "objet malformé à '%s'" -#: ref-filter.c:2086 +#: ref-filter.c:2153 #, c-format msgid "ignoring ref with broken name %s" msgstr "réf avec un nom cassé %s ignoré" -#: ref-filter.c:2091 refs.c:676 +#: ref-filter.c:2158 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "réf cassé %s ignoré" -#: ref-filter.c:2431 +#: ref-filter.c:2498 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atome %%(end) manquant" -#: ref-filter.c:2525 +#: ref-filter.c:2592 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: ref-filter.c:2530 +#: ref-filter.c:2597 #, c-format msgid "option `%s' must point to a commit" msgstr "l'option '%s' doit pointer sur un commit" @@ -6656,7 +7147,8 @@ msgstr "impossible de traiter '%s' et '%s' en même temps" msgid "could not remove reference %s" msgstr "impossible de supprimer la référence %s" -#: refs/files-backend.c:1242 refs/packed-backend.c:1542 refs/packed-backend.c:1552 +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 #, c-format msgid "could not delete reference %s: %s" msgstr "impossible de supprimer la référence %s : %s" @@ -6674,7 +7166,8 @@ msgstr "spécificateur de réference invalide : '%s'" #: remote.c:351 #, c-format msgid "config remote shorthand cannot begin with '/': %s" -msgstr "un raccourci de configuration de distant ne peut pas commencer par '/' : %s" +msgstr "" +"un raccourci de configuration de distant ne peut pas commencer par '/' : %s" #: remote.c:399 msgid "more than one receivepack given, using the first" @@ -6712,12 +7205,14 @@ msgstr "la valeur '%s' du modèle n'a pas de '*'" #: remote.c:1083 #, c-format msgid "src refspec %s does not match any" -msgstr "le spécificateur de référence source %s ne correspond à aucune référence" +msgstr "" +"le spécificateur de référence source %s ne correspond à aucune référence" #: remote.c:1088 #, c-format msgid "src refspec %s matches more than one" -msgstr "le spécificateur de référence source %s correspond à plus d'une référence" +msgstr "" +"le spécificateur de référence source %s correspond à plus d'une référence" #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is @@ -6744,7 +7239,8 @@ msgstr "" " est une référence dans \"refs/{heads,tags}/\". Si oui, ajout du préfixe\n" " refs/{heads,tags}/ correspondant du côté distant.\n" "\n" -"Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence totalement qualifiée." +"Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence " +"totalement qualifiée." #: remote.c:1123 #, c-format @@ -6803,7 +7299,9 @@ msgstr "suppression de '%s' impossible : la référence distante n'existe pas" #: remote.c:1197 #, c-format msgid "dst refspec %s matches more than one" -msgstr "le spécificateur de référence dst %s correspond à plus d'un spécificateur de références" +msgstr "" +"le spécificateur de référence dst %s correspond à plus d'un spécificateur de " +"références" #: remote.c:1204 #, c-format @@ -6832,7 +7330,9 @@ msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi" #: remote.c:1757 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" -msgstr "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de branche locale de suivi" +msgstr "" +"la destination de poussée '%s' sur le serveur distant '%s' n'a pas de " +"branche locale de suivi" #: remote.c:1769 #, c-format @@ -6850,7 +7350,8 @@ msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')" #: remote.c:1814 msgid "cannot resolve 'simple' push to a single destination" -msgstr "impossible de résoudre une poussée 'simple' pour une destination unique" +msgstr "" +"impossible de résoudre une poussée 'simple' pour une destination unique" #: remote.c:1943 #, c-format @@ -6900,9 +7401,14 @@ msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" #: remote.c:2146 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" -msgid_plural "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" -msgstr[0] "Votre branche est en retard sur '%s' de %d commit, et peut être mise à jour en avance rapide.\n" -msgstr[1] "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour en avance rapide.\n" +msgid_plural "" +"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" +msgstr[0] "" +"Votre branche est en retard sur '%s' de %d commit, et peut être mise à jour " +"en avance rapide.\n" +msgstr[1] "" +"Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " +"en avance rapide.\n" #: remote.c:2154 msgid " (use \"git pull\" to update your local branch)\n" @@ -6925,7 +7431,8 @@ msgstr[1] "" #: remote.c:2167 msgid " (use \"git pull\" to merge the remote branch into yours)\n" -msgstr " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n" +msgstr "" +" (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n" #: remote.c:2359 #, c-format @@ -7005,7 +7512,8 @@ msgstr "impossible de délier '%s' qui est errant" msgid "Recorded preimage for '%s'" msgstr "Pré-image enregistrée pour '%s'" -#: rerere.c:865 submodule.c:2089 builtin/log.c:2000 builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891 +#: rerere.c:865 submodule.c:2076 builtin/log.c:2002 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "impossible de créer le répertoire '%s'" @@ -7043,49 +7551,52 @@ msgstr "impossible d'ouvrir le répertoire rr-cache" msgid "could not determine HEAD revision" msgstr "impossible de déterminer la révision HEAD" -#: reset.c:70 reset.c:76 sequencer.c:3669 +#: reset.c:70 reset.c:76 sequencer.c:3689 #, c-format msgid "failed to find tree of %s" msgstr "impossible de trouver l'arbre de %s" -#: revision.c:2343 +#: revision.c:2344 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<fichier-paquet> n'est plus géré" -#: revision.c:2683 +#: revision.c:2684 msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassée" -#: revision.c:2686 +#: revision.c:2687 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "votre branche actuelle '%s' ne contient encore aucun commit" -#: revision.c:2892 +#: revision.c:2893 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s" -#: run-command.c:767 +#: run-command.c:766 msgid "open /dev/null failed" msgstr "échec de l'ouverture de /dev/null" -#: run-command.c:1275 +#: run-command.c:1274 #, c-format msgid "cannot create async thread: %s" msgstr "impossible de créer un fil asynchrone : %s" -#: run-command.c:1345 +#: run-command.c:1344 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" "Le crochet '%s' a été ignoré parce qu'il n'est pas marqué comme exécutable.\n" -"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook false`." +"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook " +"false`." #: send-pack.c:150 msgid "unexpected flush packet while reading remote unpack status" -msgstr "paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage distant" +msgstr "" +"paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage " +"distant" #: send-pack.c:152 #, c-format @@ -7107,25 +7618,30 @@ msgstr "send-pack : impossible de créer un sous-processus de récupération" #: send-pack.c:455 msgid "push negotiation failed; proceeding anyway with push" -msgstr "le négociation de poussée a échoué ; poursuite de la poussée de toute façon" +msgstr "" +"le négociation de poussée a échoué ; poursuite de la poussée de toute façon" -#: send-pack.c:520 +#: send-pack.c:526 msgid "the receiving end does not support this repository's hash algorithm" msgstr "le receveur ne gère pas l'algorithme d'empreinte de ce dépôt" -#: send-pack.c:529 +#: send-pack.c:535 msgid "the receiving end does not support --signed push" msgstr "le receveur ne gère pas les poussées avec --signed" -#: send-pack.c:531 -msgid "not sending a push certificate since the receiving end does not support --signed push" -msgstr "pas d'envoi de certificat de poussée car le receveur ne gère pas les poussées avec --signed" +#: send-pack.c:537 +msgid "" +"not sending a push certificate since the receiving end does not support --" +"signed push" +msgstr "" +"pas d'envoi de certificat de poussée car le receveur ne gère pas les " +"poussées avec --signed" -#: send-pack.c:543 +#: send-pack.c:544 msgid "the receiving end does not support --atomic push" msgstr "le receveur ne gère pas les poussées avec --atomic" -#: send-pack.c:548 +#: send-pack.c:549 msgid "the receiving end does not support push options" msgstr "le receveur ne gère pas les options de poussées" @@ -7184,7 +7700,8 @@ msgstr "" msgid "could not lock '%s'" msgstr "impossible de verrouiller '%s'" -#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631 +#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 +#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "impossible d'écrire dans '%s'" @@ -7194,7 +7711,8 @@ msgstr "impossible d'écrire dans '%s'" msgid "could not write eol to '%s'" msgstr "impossible d'écrire la fin de ligne dans '%s'" -#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 sequencer.c:3554 +#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 +#: sequencer.c:3555 #, c-format msgid "failed to finalize '%s'" msgstr "échec lors de la finalisation de '%s'" @@ -7244,7 +7762,8 @@ msgstr "aucune clé présente dans '%.*s'" msgid "unable to dequote value of '%s'" msgstr "impossible de décoter la valeur de '%s'" -#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728 builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729 +#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" @@ -7325,15 +7844,18 @@ msgid "" "\n" " git commit --amend --reset-author\n" msgstr "" -"Votre nom et votre adresse courriel ont été configurés automatiquement en se\n" +"Votre nom et votre adresse courriel ont été configurés automatiquement en " +"se\n" "fondant sur votre nom d'utilisateur et le nom de votre machine. Veuillez \n" "vérifier qu'ils sont corrects. Vous pouvez supprimer ce message en les \n" "paramétrant explicitement. Lancez les commandes suivantes et suivez les\n" -"instructions dans votre éditeur pour éditer votre fichier de configuration :\n" +"instructions dans votre éditeur pour éditer votre fichier de " +"configuration :\n" "\n" " git config --global --edit\n" "\n" -"Après ceci, vous pouvez corriger l'identité utilisée pour cette validation avec :\n" +"Après ceci, vous pouvez corriger l'identité utilisée pour cette validation " +"avec :\n" "\n" " git commit --amend --reset-author\n" @@ -7350,8 +7872,10 @@ msgid "" "\n" " git commit --amend --reset-author\n" msgstr "" -"Votre nom et votre adresse courriel ont été configurés automatiquement en se fondant\n" -"sur votre nom d'utilisateur et le nom de votre machine. Veuillez vérifier qu'ils sont corrects.\n" +"Votre nom et votre adresse courriel ont été configurés automatiquement en se " +"fondant\n" +"sur votre nom d'utilisateur et le nom de votre machine. Veuillez vérifier " +"qu'ils sont corrects.\n" "Vous pouvez supprimer ce message en les paramétrant explicitement :\n" "\n" " git config --global user.name \"Votre Nom\"\n" @@ -7390,7 +7914,7 @@ msgstr "impossible de lire HEAD" msgid "HEAD %s is not a commit!" msgstr "HEAD %s n'est pas un commit !" -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" @@ -7398,7 +7922,7 @@ msgstr "impossible d'analyser le commit HEAD" msgid "unable to parse commit author" msgstr "impossible d'analyser l'auteur du commit" -#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" @@ -7416,11 +7940,13 @@ msgstr "identité d'auteur invalide '%s'" msgid "corrupt author: missing date information" msgstr "auteur corrompu : information de date manquante" -#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909 builtin/merge.c:934 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909 +#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199 +#: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "impossible de mettre à jour %s" @@ -7472,7 +7998,7 @@ msgstr "impossible d'écrire '%s'" msgid "need a HEAD to fixup" msgstr "une HEAD est nécessaire à la correction" -#: sequencer.c:1936 sequencer.c:3581 +#: sequencer.c:1936 sequencer.c:3582 msgid "could not read HEAD" msgstr "impossible de lire HEAD" @@ -7613,7 +8139,7 @@ msgstr "\"écrase-sur\" inutilisable" msgid "malformed options sheet: '%s'" msgstr "feuille d'options malformée : %s" -#: sequencer.c:3012 sequencer.c:4869 +#: sequencer.c:3012 sequencer.c:4868 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" @@ -7644,7 +8170,7 @@ msgstr "impossible de créer le répertoire de séquenceur '%s'" msgid "could not lock HEAD" msgstr "impossible de verrouiller HEAD" -#: sequencer.c:3125 sequencer.c:4582 +#: sequencer.c:3125 sequencer.c:4581 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" @@ -7656,7 +8182,7 @@ msgstr "impossible de résoudre HEAD" msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:3159 builtin/grep.c:759 +#: sequencer.c:3159 builtin/grep.c:758 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -7677,7 +8203,8 @@ msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu" #: sequencer.c:3179 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" -msgstr "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !" +msgstr "" +"Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !" #: sequencer.c:3220 msgid "no revert in progress" @@ -7702,9 +8229,9 @@ msgid "" "try \"git %s --continue\"" msgstr "" "avez-vous déjà validé ?\n" -"essayez \"git %s -continue\"" +"essayez \"git %s --continue\"" -#: sequencer.c:3411 sequencer.c:4473 +#: sequencer.c:3411 sequencer.c:4472 msgid "cannot read HEAD" msgstr "impossible de lire HEAD" @@ -7788,90 +8315,91 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3571 +#: sequencer.c:3572 #, c-format msgid "illegal label name: '%.*s'" msgstr "nom de label illégal '%.*s'" -#: sequencer.c:3625 +#: sequencer.c:3645 msgid "writing fake root commit" msgstr "écriture d'un commit racine bidon" -#: sequencer.c:3630 +#: sequencer.c:3650 msgid "writing squash-onto" msgstr "écriture de 'écraser-sur'" -#: sequencer.c:3714 +#: sequencer.c:3734 #, c-format msgid "could not resolve '%s'" msgstr "impossible de résoudre '%s'" -#: sequencer.c:3747 +#: sequencer.c:3767 msgid "cannot merge without a current revision" msgstr "impossible de fusionner avec une révision courante" -#: sequencer.c:3769 +#: sequencer.c:3789 #, c-format msgid "unable to parse '%.*s'" msgstr "impossible d'analyser '%.*s'" -#: sequencer.c:3778 +#: sequencer.c:3798 #, c-format msgid "nothing to merge: '%.*s'" msgstr "rien à fusionner : '%.*s'" -#: sequencer.c:3790 +#: sequencer.c:3810 msgid "octopus merge cannot be executed on top of a [new root]" -msgstr "une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine" +msgstr "" +"une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine" -#: sequencer.c:3806 +#: sequencer.c:3826 #, c-format msgid "could not get commit message of '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:3989 +#: sequencer.c:4009 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "impossible de seulement essayer de fusionner '%.*s'" -#: sequencer.c:4005 +#: sequencer.c:4025 msgid "merge: Unable to write new index file" msgstr "fusion : Impossible d'écrire le nouveau fichier index" -#: sequencer.c:4079 +#: sequencer.c:4099 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: sequencer.c:4082 +#: sequencer.c:4102 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Réponse de remisage inattendue : '%s'" -#: sequencer.c:4088 +#: sequencer.c:4108 #, c-format msgid "Could not create directory for '%s'" msgstr "Impossible de créer le répertoire pour '%s'" -#: sequencer.c:4091 +#: sequencer.c:4111 #, c-format msgid "Created autostash: %s\n" msgstr "Autoremisage créé : %s\n" -#: sequencer.c:4095 +#: sequencer.c:4115 msgid "could not reset --hard" msgstr "impossible de réinitialiser --hard" -#: sequencer.c:4120 +#: sequencer.c:4140 #, c-format msgid "Applied autostash.\n" msgstr "Autoremisage appliqué.\n" -#: sequencer.c:4132 +#: sequencer.c:4152 #, c-format msgid "cannot store %s" msgstr "impossible de stocker %s" -#: sequencer.c:4135 +#: sequencer.c:4155 #, c-format msgid "" "%s\n" @@ -7882,29 +8410,30 @@ msgstr "" "Vos modifications sont à l'abri dans la remise.\n" "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" -#: sequencer.c:4140 +#: sequencer.c:4160 msgid "Applying autostash resulted in conflicts." msgstr "L'application du remisage automatique a créé des conflits." -#: sequencer.c:4141 +#: sequencer.c:4161 msgid "Autostash exists; creating a new stash entry." -msgstr "Un remisage automatique existe ; création d'une nouvelle entrée de remisage." +msgstr "" +"Un remisage automatique existe ; création d'une nouvelle entrée de remisage." -#: sequencer.c:4234 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4233 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "impossible de détacher HEAD" -#: sequencer.c:4249 +#: sequencer.c:4248 #, c-format msgid "Stopped at HEAD\n" msgstr "Arrêt à HEAD\n" -#: sequencer.c:4251 +#: sequencer.c:4250 #, c-format msgid "Stopped at %s\n" msgstr "Arrêté à %s\n" -#: sequencer.c:4259 +#: sequencer.c:4258 #, c-format msgid "" "Could not execute the todo command\n" @@ -7925,58 +8454,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4305 +#: sequencer.c:4304 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Rebasage (%d/%d)%s" -#: sequencer.c:4351 +#: sequencer.c:4350 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Arrêt à %s... %.*s\n" -#: sequencer.c:4422 +#: sequencer.c:4421 #, c-format msgid "unknown command %d" msgstr "commande inconnue %d" -#: sequencer.c:4481 +#: sequencer.c:4480 msgid "could not read orig-head" msgstr "impossible de lire orig-head" -#: sequencer.c:4486 +#: sequencer.c:4485 msgid "could not read 'onto'" msgstr "impossible de lire 'onto'" -#: sequencer.c:4500 +#: sequencer.c:4499 #, c-format msgid "could not update HEAD to %s" msgstr "impossible de mettre à jour HEAD sur %s" -#: sequencer.c:4560 +#: sequencer.c:4559 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Rebasage et mise à jour de %s avec succès.\n" -#: sequencer.c:4612 +#: sequencer.c:4611 msgid "cannot rebase: You have unstaged changes." msgstr "impossible de rebaser : vous avez des modifications non indexées." -#: sequencer.c:4621 +#: sequencer.c:4620 msgid "cannot amend non-existing commit" msgstr "impossible de corriger un commit non-existant" -#: sequencer.c:4623 +#: sequencer.c:4622 #, c-format msgid "invalid file: '%s'" msgstr "fichier invalide : '%s'" -#: sequencer.c:4625 +#: sequencer.c:4624 #, c-format msgid "invalid contents: '%s'" msgstr "contenu invalide : '%s'" -#: sequencer.c:4628 +#: sequencer.c:4627 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7986,50 +8515,50 @@ msgstr "" "Vous avez des modifications non validées dans votre copie de travail.\n" "Veuillez les valider d'abord, puis relancer 'git rebase --continue'." -#: sequencer.c:4664 sequencer.c:4703 +#: sequencer.c:4663 sequencer.c:4702 #, c-format msgid "could not write file: '%s'" msgstr "impossible d'écrire le fichier : '%s'" -#: sequencer.c:4719 +#: sequencer.c:4718 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossible de supprimer CHERRY_PICK_HEAD" -#: sequencer.c:4726 +#: sequencer.c:4725 msgid "could not commit staged changes." msgstr "impossible de valider les modifications indexées." -#: sequencer.c:4846 +#: sequencer.c:4845 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:4850 +#: sequencer.c:4849 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:4885 +#: sequencer.c:4884 msgid "can't revert as initial commit" msgstr "impossible d'annuler en tant que commit initial" -#: sequencer.c:5362 +#: sequencer.c:5361 msgid "make_script: unhandled options" msgstr "make_script : options non gérées" -#: sequencer.c:5365 +#: sequencer.c:5364 msgid "make_script: error preparing revisions" msgstr "make_script : erreur lors de la préparation des révisions" -#: sequencer.c:5615 sequencer.c:5632 +#: sequencer.c:5614 sequencer.c:5631 msgid "nothing to do" msgstr "rien à faire" -#: sequencer.c:5651 +#: sequencer.c:5650 msgid "could not skip unnecessary pick commands" msgstr "impossible d'éviter les commandes de picorage non nécessaires" -#: sequencer.c:5751 +#: sequencer.c:5750 msgid "the script was already rearranged." msgstr "le script a déjà été réarrangé." @@ -8045,7 +8574,8 @@ msgid "" "Use 'git <command> -- <path>...' to specify paths that do not exist locally." msgstr "" "%s : ce chemin n'existe pas dans la copie de travail.\n" -"Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui n'existent pas localement." +"Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui " +"n'existent pas localement." #: setup.c:198 #, c-format @@ -8061,7 +8591,9 @@ msgstr "" #: setup.c:264 #, c-format msgid "option '%s' must come before non-option arguments" -msgstr "l'option '%s' doit être présente avant les arguments qui ne sont pas des options" +msgstr "" +"l'option '%s' doit être présente avant les arguments qui ne sont pas des " +"options" #: setup.c:283 #, c-format @@ -8076,132 +8608,142 @@ msgstr "" #: setup.c:419 msgid "unable to set up work tree using invalid config" -msgstr "impossible de mettre en place le répertoire de travail en utilisant une configuration invalide" +msgstr "" +"impossible de mettre en place le répertoire de travail en utilisant une " +"configuration invalide" -#: setup.c:423 +#: setup.c:423 builtin/rev-parse.c:895 msgid "this operation must be run in a work tree" msgstr "cette opération doit être effectuée dans un arbre de travail" -#: setup.c:661 +#: setup.c:658 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Version attendue du dépôt git <= %d, %d trouvée" -#: setup.c:669 -msgid "unknown repository extensions found:" -msgstr "extensions de dépôt inconnues trouvées :" +#: setup.c:666 +msgid "unknown repository extension found:" +msgid_plural "unknown repository extensions found:" +msgstr[0] "extension de dépôt inconnue trouvée :" +msgstr[1] "extensions de dépôt inconnues trouvées :" -#: setup.c:681 -msgid "repo version is 0, but v1-only extensions found:" -msgstr "la version du dépôt est 0, mais des extensions uniquement v1 trouvées :" +#: setup.c:680 +msgid "repo version is 0, but v1-only extension found:" +msgid_plural "repo version is 0, but v1-only extensions found:" +msgstr[0] "la version du dépôt est 0, mais une extension uniquement v1 trouvée :" +msgstr[1] "" +"la version du dépôt est 0, mais des extensions uniquement v1 trouvées :" -#: setup.c:700 +#: setup.c:701 #, c-format msgid "error opening '%s'" msgstr "erreur à l'ouverture de '%s'" -#: setup.c:702 +#: setup.c:703 #, c-format msgid "too large to be a .git file: '%s'" msgstr "trop gros pour être une fichier .git : '%s'" -#: setup.c:704 +#: setup.c:705 #, c-format msgid "error reading %s" msgstr "erreur à la lecture de %s" -#: setup.c:706 +#: setup.c:707 #, c-format msgid "invalid gitfile format: %s" msgstr "format de fichier git invalide : %s" -#: setup.c:708 +#: setup.c:709 #, c-format msgid "no path in gitfile: %s" msgstr "aucun chemin dans le fichier git : %s" -#: setup.c:710 +#: setup.c:711 #, c-format msgid "not a git repository: %s" msgstr "ce n'est pas un dépôt git : %s" -#: setup.c:812 +#: setup.c:813 #, c-format msgid "'$%s' too big" msgstr "'$%s' trop gros" -#: setup.c:826 +#: setup.c:827 #, c-format msgid "not a git repository: '%s'" msgstr "ce n'est pas un dépôt git : '%s'" -#: setup.c:855 setup.c:857 setup.c:888 +#: setup.c:856 setup.c:858 setup.c:889 #, c-format msgid "cannot chdir to '%s'" msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'" -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 +#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 msgid "cannot come back to cwd" msgstr "impossible de revenir au répertoire de travail courant" -#: setup.c:987 +#: setup.c:988 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "échec du stat de '%*s%s%s'" -#: setup.c:1225 +#: setup.c:1231 msgid "Unable to read current working directory" msgstr "Impossible d'accéder au répertoire de travail courant" -#: setup.c:1234 setup.c:1240 +#: setup.c:1240 setup.c:1246 #, c-format msgid "cannot change to '%s'" msgstr "impossible de modifier en '%s'" -#: setup.c:1245 +#: setup.c:1251 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s" -#: setup.c:1251 +#: setup.c:1257 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -"ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) n'est un dépôt git\n" -"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM n'est pas défini)." +"ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) " +"n'est un dépôt git\n" +"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM " +"n'est pas défini)." -#: setup.c:1370 +#: setup.c:1381 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" "problème avec la valeur de core.sharedRepository (0%.3o).\n" -"Le propriétaire des fichiers doit toujours avoir les droits en lecture et écriture." +"Le propriétaire des fichiers doit toujours avoir les droits en lecture et " +"écriture." -#: setup.c:1417 +#: setup.c:1430 msgid "open /dev/null or dup failed" msgstr "échec de l'ouverture ou au dup de /dev/null" -#: setup.c:1432 +#: setup.c:1445 msgid "fork failed" msgstr "échec de la bifurcation" -#: setup.c:1437 t/helper/test-simple-ipc.c:285 +#: setup.c:1450 t/helper/test-simple-ipc.c:285 msgid "setsid failed" msgstr "échec du setsid" -#: sparse-index.c:151 +#: sparse-index.c:162 msgid "attempting to use sparse-index without cone mode" msgstr "tentative d'utilisation de l'index partiel sans mode cone" -#: sparse-index.c:156 +#: sparse-index.c:174 msgid "unable to update cache-tree, staying full" msgstr "impossible de mettre à jour l'arbre de cache, full conservé" -#: sparse-index.c:239 +#: sparse-index.c:261 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "l'entrée d'index est un répertoire, mais pas clairsemé (%08x)" @@ -8258,7 +8800,8 @@ msgid_plural "%u bytes/s" msgstr[0] "%u octet/s" msgstr[1] "%u octets/s" -#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737 builtin/rebase.c:866 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738 +#: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" msgstr "impossible d'ouvrir '%s' en écriture" @@ -8280,7 +8823,9 @@ msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchjobs" #: submodule-config.c:402 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" -msgstr "'%s' ignoré et qui peut être interprété comme une option de ligne de commande : %s" +msgstr "" +"'%s' ignoré et qui peut être interprété comme une option de ligne de " +"commande : %s" #: submodule-config.c:499 #, c-format @@ -8294,7 +8839,9 @@ msgstr "Impossible de mettre à jour l'élément %s de .gitmodules" #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" -msgstr "Modification impossible de .gitmodules non fusionné, résolvez les conflits d'abord" +msgstr "" +"Modification impossible de .gitmodules non fusionné, résolvez les conflits " +"d'abord" #: submodule.c:118 submodule.c:147 #, c-format @@ -8326,51 +8873,59 @@ msgstr "Le chemin '%s' est dans le sous-module '%.*s'" msgid "bad --ignore-submodules argument: %s" msgstr "mauvais argument --ignore-submodules : %s" -#: submodule.c:818 +#: submodule.c:805 #, c-format -msgid "Submodule in commit %s at path: '%s' collides with a submodule named the same. Skipping it." -msgstr "Le sous-module dans le commit %s au chemin : '%s' entre en collision avec un sous-module du même nom. Ignoré." +msgid "" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." +msgstr "" +"Le sous-module dans le commit %s au chemin : '%s' entre en collision avec un " +"sous-module du même nom. Ignoré." -#: submodule.c:921 +#: submodule.c:908 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit" -#: submodule.c:1006 +#: submodule.c:993 #, c-format -msgid "Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s" -msgstr "Impossible de lancer la commande 'git rev-list <commits> --not --remotes -n 1' dans le sous-module %s" +msgid "" +"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " +"submodule %s" +msgstr "" +"Impossible de lancer la commande 'git rev-list <commits> --not --remotes -n " +"1' dans le sous-module %s" -#: submodule.c:1129 +#: submodule.c:1116 #, c-format msgid "process for submodule '%s' failed" msgstr "le processus pour le sous-module '%s' a échoué" -#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." -#: submodule.c:1169 +#: submodule.c:1156 #, c-format msgid "Pushing submodule '%s'\n" msgstr "Poussée du sous-module '%s'\n" -#: submodule.c:1172 +#: submodule.c:1159 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "Impossible de pousser le sous-module '%s'\n" -#: submodule.c:1464 +#: submodule.c:1451 #, c-format msgid "Fetching submodule %s%s\n" msgstr "Récupération du sous-module %s%s\n" -#: submodule.c:1498 +#: submodule.c:1485 #, c-format msgid "Could not access submodule '%s'\n" msgstr "Impossible d'accéder au sous-module '%s'\n" -#: submodule.c:1653 +#: submodule.c:1640 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8379,76 +8934,81 @@ msgstr "" "Erreurs pendant la récupération du sous-module :\n" "%s" -#: submodule.c:1678 +#: submodule.c:1665 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' n'est pas reconnu comme dépôt git" -#: submodule.c:1695 +#: submodule.c:1682 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "impossible de lancer 'git status --porcelain=2' dans le sous-module %s" -#: submodule.c:1736 +#: submodule.c:1723 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "'git status --porcelain=2' a échoué dans le sous-module %s" -#: submodule.c:1811 +#: submodule.c:1798 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "impossible de démarrer 'git status' dans le sous-module '%s'" -#: submodule.c:1824 +#: submodule.c:1811 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "impossible de lancer 'git status' dans le sous-module '%s'" -#: submodule.c:1839 +#: submodule.c:1826 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Impossible de désactiver core.worktree dans le sous-module '%s'" -#: submodule.c:1866 submodule.c:2176 +#: submodule.c:1853 submodule.c:2163 #, c-format msgid "could not recurse into submodule '%s'" msgstr "récursion impossible dans le sous-module '%s'" -#: submodule.c:1887 +#: submodule.c:1874 msgid "could not reset submodule index" msgstr "impossible de réinitialiser l'index du sous-module" -#: submodule.c:1929 +#: submodule.c:1916 #, c-format msgid "submodule '%s' has dirty index" msgstr "le sous-module '%s' a un index sale" -#: submodule.c:1981 +#: submodule.c:1968 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Le sous-module '%s' n'a pas pu être mis à jour." -#: submodule.c:2049 +#: submodule.c:2036 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" -msgstr "le répertoire git du sous-module '%s' est à l'intérieur du répertoire git '%.*s'" +msgstr "" +"le répertoire git du sous-module '%s' est à l'intérieur du répertoire git " +"'%.*s'" -#: submodule.c:2070 +#: submodule.c:2057 #, c-format -msgid "relocate_gitdir for submodule '%s' with more than one worktree not supported" -msgstr "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail n'est pas supporté" +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" +msgstr "" +"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail " +"n'est pas supporté" -#: submodule.c:2082 submodule.c:2141 +#: submodule.c:2069 submodule.c:2128 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "impossible de trouve le nom pour le sous-module '%s'" -#: submodule.c:2086 +#: submodule.c:2073 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "refus de déplacer '%s' dans une répertoire git existant" -#: submodule.c:2093 +#: submodule.c:2080 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8459,11 +9019,11 @@ msgstr "" "'%s' sur\n" "'%s'\n" -#: submodule.c:2221 +#: submodule.c:2208 msgid "could not start ls-files in .." msgstr "impossible de démarrer ls-files dans .." -#: submodule.c:2261 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree a renvoyé un code de retour inattendu %d" @@ -8478,12 +9038,14 @@ msgstr "échec du lstat de '%s'" msgid "running trailer command '%s' failed" msgstr "échec de la commande trailer '%s'" -#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566 trailer.c:570 +#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566 +#: trailer.c:570 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valeur inconnue '%s' pour la clé '%s'" -#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299 builtin/remote.c:324 +#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299 +#: builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "plus d'un %s" @@ -8498,7 +9060,7 @@ msgstr "symbole vide dans la ligne de fin '%.*s'" msgid "could not read input file '%s'" msgstr "impossible de lire le fichier d'entrée '%s'" -#: trailer.c:766 builtin/mktag.c:88 +#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577 msgid "could not read from stdin" msgstr "impossible de lire depuis l'entrée standard" @@ -8537,12 +9099,17 @@ msgstr "impossible de trouver un assistant distant pour '%s'" #: transport-helper.c:161 transport-helper.c:575 msgid "can't dup helper output fd" -msgstr "impossible de dupliquer le descripteur de flux de sortie de l'assistant" +msgstr "" +"impossible de dupliquer le descripteur de flux de sortie de l'assistant" #: transport-helper.c:214 #, c-format -msgid "unknown mandatory capability %s; this remote helper probably needs newer version of Git" -msgstr "capacité obligatoire inconnue %s ; cet assistant distant requiert probablement une une nouvelle version de Git" +msgid "" +"unknown mandatory capability %s; this remote helper probably needs newer " +"version of Git" +msgstr "" +"capacité obligatoire inconnue %s ; cet assistant distant requiert " +"probablement une une nouvelle version de Git" #: transport-helper.c:220 msgid "this remote helper should implement refspec capability" @@ -8578,13 +9145,15 @@ msgstr "réponse inconnue à connect : %s" #: transport-helper.c:616 msgid "setting remote service path not supported by protocol" -msgstr "la spécification du chemin de service distant n'est pas supportée par le protocole" +msgstr "" +"la spécification du chemin de service distant n'est pas supportée par le " +"protocole" #: transport-helper.c:618 msgid "invalid remote service path" msgstr "chemin de service distant invalide" -#: transport-helper.c:661 transport.c:1471 +#: transport-helper.c:661 transport.c:1477 msgid "operation not supported by protocol" msgstr "option non supportée par le protocole" @@ -8593,9 +9162,9 @@ msgstr "option non supportée par le protocole" msgid "can't connect to subservice %s" msgstr "impossible de se connecter au sous-service %s" -#: transport-helper.c:693 transport.c:397 +#: transport-helper.c:693 transport.c:400 msgid "--negotiate-only requires protocol v2" -msgstr "--negociate-only requiert le protocole v2" +msgstr "--negotiate-only requiert le protocole v2" #: transport-helper.c:755 msgid "'option' without a matching 'ok/error' directive" @@ -8643,7 +9212,9 @@ msgstr "l'assistant %s ne gère pas 'push-option'" #: transport-helper.c:1060 msgid "remote-helper doesn't support push; refspec needed" -msgstr "l'assistant %s ne gère pas push ; un spécificateur de référence est nécessaire" +msgstr "" +"l'assistant %s ne gère pas push ; un spécificateur de référence est " +"nécessaire" #: transport-helper.c:1065 #, c-format @@ -8726,46 +9297,46 @@ msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n" msgid "could not read bundle '%s'" msgstr "impossible de lire la liasse '%s'" -#: transport.c:220 +#: transport.c:223 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport : option de profondeur invalide '%s'" -#: transport.c:272 +#: transport.c:275 msgid "see protocol.version in 'git help config' for more details" msgstr "voir protocol.version dans 'git help config' pour plus d'information" -#: transport.c:273 +#: transport.c:276 msgid "server options require protocol version 2 or later" msgstr "les options de serveur exigent une version 2 ou supérieure" -#: transport.c:400 +#: transport.c:403 msgid "server does not support wait-for-done" msgstr "le serveur ne prend pas en charge wait-for-done" -#: transport.c:751 +#: transport.c:755 msgid "could not parse transport.color.* config" msgstr "impossible d'analyser la configuration transport.color.*" -#: transport.c:826 +#: transport.c:830 msgid "support for protocol v2 not implemented yet" msgstr "le support du protocole v2 n'est pas encore implanté" -#: transport.c:960 +#: transport.c:965 #, c-format msgid "unknown value for config '%s': %s" msgstr "valeur inconnue pour la config '%s' : %s" -#: transport.c:1026 +#: transport.c:1031 #, c-format msgid "transport '%s' not allowed" msgstr "transport '%s' non permis" -#: transport.c:1079 +#: transport.c:1084 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync n'est plus supporté" -#: transport.c:1181 +#: transport.c:1187 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8774,7 +9345,7 @@ msgstr "" "Les chemins suivants de sous-module contiennent des modifications\n" "qui ne peuvent être trouvées sur aucun distant :\n" -#: transport.c:1185 +#: transport.c:1191 #, c-format msgid "" "\n" @@ -8801,11 +9372,11 @@ msgstr "" "pour les pousser vers un serveur distant.\n" "\n" -#: transport.c:1193 +#: transport.c:1199 msgid "Aborting." msgstr "Abandon." -#: transport.c:1340 +#: transport.c:1346 msgid "failed to push all needed submodules" msgstr "échec de la poussée de tous les sous-modules nécessaires" @@ -8831,8 +9402,10 @@ 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 "" -"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n" -"%%sVeuillez valider ou remiser vos modifications avant de basculer de branche." +"Vos modifications locales aux fichiers suivants seraient écrasées par " +"l'extraction :\n" +"%%sVeuillez valider ou remiser vos modifications avant de basculer de " +"branche." #: unpack-trees.c:117 #, c-format @@ -8840,7 +9413,8 @@ msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n" +"Vos modifications locales aux fichiers suivants seraient écrasées par " +"l'extraction :\n" "%%s" #: unpack-trees.c:120 @@ -8849,7 +9423,8 @@ msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" -"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n" +"Vos modifications locales aux fichiers suivants seraient écrasées par la " +"fusion :\n" "%%sVeuillez valider ou remiser vos modifications avant la fusion." #: unpack-trees.c:122 @@ -8858,7 +9433,8 @@ msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n" +"Vos modifications locales aux fichiers suivants seraient écrasées par la " +"fusion :\n" "%%s" #: unpack-trees.c:125 @@ -8885,7 +9461,8 @@ msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -"La mise à jour des répertoires suivants effacerait les fichiers non suivis contenus :\n" +"La mise à jour des répertoires suivants effacerait les fichiers non suivis " +"contenus :\n" "%s" #: unpack-trees.c:136 @@ -8894,7 +9471,8 @@ msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -"Les fichiers suivants non suivis de la copie de travail seraient effacés par l'extraction :\n" +"Les fichiers suivants non suivis de la copie de travail seraient effacés par " +"l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." #: unpack-trees.c:138 @@ -8912,7 +9490,8 @@ msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -"Les fichiers suivants non suivis de la copie de travail seraient effacés par la fusion :\n" +"Les fichiers suivants non suivis de la copie de travail seraient effacés par " +"la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." #: unpack-trees.c:143 @@ -8930,7 +9509,8 @@ msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -"Les fichiers suivants non suivis de la copie de travail seraient effacés par %s :\n" +"Les fichiers suivants non suivis de la copie de travail seraient effacés par " +"%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." #: unpack-trees.c:148 @@ -8945,16 +9525,19 @@ msgstr "" #: unpack-trees.c:154 #, c-format msgid "" -"The following untracked working tree files would be overwritten by checkout:\n" +"The following untracked working tree files would be overwritten by " +"checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -"Les fichiers suivants non suivis de la copie de travail seraient écrasés par l'extraction :\n" +"Les fichiers suivants non suivis de la copie de travail seraient écrasés par " +"l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." #: unpack-trees.c:156 #, c-format msgid "" -"The following untracked working tree files would be overwritten by checkout:\n" +"The following untracked working tree files would be overwritten by " +"checkout:\n" "%%s" msgstr "" "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n" @@ -8966,7 +9549,8 @@ msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -"Les fichiers suivants non suivis de la copie de travail seraient effacés par la fusion :\n" +"Les fichiers suivants non suivis de la copie de travail seraient effacés par " +"la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." #: unpack-trees.c:161 @@ -8984,7 +9568,8 @@ msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -"Les fichiers suivants non suivis de la copie de travail seraient écrasés par %s :\n" +"Les fichiers suivants non suivis de la copie de travail seraient écrasés par " +"%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." #: unpack-trees.c:166 @@ -9013,10 +9598,12 @@ msgstr "" #: unpack-trees.c:180 #, c-format msgid "" -"The following paths are not up to date and were left despite sparse patterns:\n" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" "%s" msgstr "" -"Les chemins suivants ne sont pas à jour et ont été laissés malgré les motifs clairsemés :\n" +"Les chemins suivants ne sont pas à jour et ont été laissés malgré les motifs " +"clairsemés :\n" "%s" #: unpack-trees.c:182 @@ -9025,16 +9612,19 @@ msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -"Les chemins suivants ne sont pas fusionnés et ont été laissés malgré les motifs clairsemés :\n" +"Les chemins suivants ne sont pas fusionnés et ont été laissés malgré les " +"motifs clairsemés :\n" "%s" #: unpack-trees.c:184 #, c-format msgid "" -"The following paths were already present and thus not updated despite sparse patterns:\n" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" "%s" msgstr "" -"Les chemins suivants étaient déjà présents et ont été laissés malgré les motifs clairsemés :\n" +"Les chemins suivants étaient déjà présents et ont été laissés malgré les " +"motifs clairsemés :\n" "%s" #: unpack-trees.c:264 @@ -9044,8 +9634,12 @@ msgstr "Abandon\n" #: unpack-trees.c:291 #, c-format -msgid "After fixing the above paths, you may want to run `git sparse-checkout reapply`.\n" -msgstr "Après correction des chemins ci-dessus, vous voulez peut-être lancer `git sparse-checkout reapply`.\n" +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "" +"Après correction des chemins ci-dessus, vous voulez peut-être lancer `git " +"sparse-checkout reapply`.\n" #: unpack-trees.c:352 msgid "Updating files" @@ -9061,14 +9655,15 @@ msgstr "" "sensibles à la casse dans une système de fichier insensible) et un\n" "seul du groupe en collision est dans l'arbre de travail :\n" -#: unpack-trees.c:1519 +#: unpack-trees.c:1618 msgid "Updating index flags" msgstr "Mise à jour des drapeaux de l'index" -#: unpack-trees.c:2608 +#: unpack-trees.c:2707 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" -msgstr "l'arbre de travail et le commit non suivi ont des entrées dupliquées : %s" +msgstr "" +"l'arbre de travail et le commit non suivi ont des entrées dupliquées : %s" #: upload-pack.c:1548 msgid "expected flush after fetch arguments" @@ -9107,99 +9702,104 @@ msgstr "segment de chemin '..' invalide" msgid "Fetching objects" msgstr "Récupération des objets" -#: worktree.c:238 builtin/am.c:2151 +#: worktree.c:236 builtin/am.c:2152 #, c-format msgid "failed to read '%s'" msgstr "échec de la lecture de '%s'" -#: worktree.c:304 +#: worktree.c:303 #, c-format msgid "'%s' at main working tree is not the repository directory" -msgstr "'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt" +msgstr "" +"'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt" -#: worktree.c:315 +#: worktree.c:314 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" -msgstr "le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre de travail" +msgstr "" +"le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre " +"de travail" -#: worktree.c:327 +#: worktree.c:326 #, c-format msgid "'%s' does not exist" msgstr "'%s' n'existe pas" -#: worktree.c:333 +#: worktree.c:332 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' n'est pas un fichier .git, code d'erreur %d" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' ne pointe pas en retour sur '%s'" -#: worktree.c:608 +#: worktree.c:603 msgid "not a directory" msgstr "pas un répertoire" -#: worktree.c:617 +#: worktree.c:612 msgid ".git is not a file" msgstr ".git n'est pas un fichier" -#: worktree.c:619 +#: worktree.c:614 msgid ".git file broken" msgstr "fichier .git cassé" -#: worktree.c:621 +#: worktree.c:616 msgid ".git file incorrect" msgstr "fichier .git incorrect" -#: worktree.c:727 +#: worktree.c:722 msgid "not a valid path" msgstr "pas un chemin valide" -#: worktree.c:733 +#: worktree.c:728 msgid "unable to locate repository; .git is not a file" msgstr "impossible de localiser le dépôt ; .git n'est pas un fichier" -#: worktree.c:737 +#: worktree.c:732 msgid "unable to locate repository; .git file does not reference a repository" -msgstr "impossible de localiser le dépôt ; .git ne fait pas référence à un dépôt" +msgstr "" +"impossible de localiser le dépôt ; .git ne fait pas référence à un dépôt" -#: worktree.c:741 +#: worktree.c:736 msgid "unable to locate repository; .git file broken" msgstr "impossible de localiser le dépôt ; fichier .git cassé" -#: worktree.c:747 +#: worktree.c:742 msgid "gitdir unreadable" msgstr "gitdir non lisible" -#: worktree.c:751 +#: worktree.c:746 msgid "gitdir incorrect" msgstr "gitdir incorrect" -#: worktree.c:776 +#: worktree.c:771 msgid "not a valid directory" msgstr "pas un répertoire valide" -#: worktree.c:782 +#: worktree.c:777 msgid "gitdir file does not exist" msgstr "le fichier gitdir n'existe pas" -#: worktree.c:787 worktree.c:796 +#: worktree.c:782 worktree.c:791 #, c-format msgid "unable to read gitdir file (%s)" msgstr "impossible de lire le fichier gitdir (%s)" -#: worktree.c:806 +#: worktree.c:801 #, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" -msgstr "lecture trop courte ( %<PRIuMAX> octets attendus, %<PRIuMAX> octets lus)" +msgstr "" +"lecture trop courte ( %<PRIuMAX> octets attendus, %<PRIuMAX> octets lus)" -#: worktree.c:814 +#: worktree.c:809 msgid "invalid gitdir file" msgstr "fichier gitdir invalide" -#: worktree.c:822 +#: worktree.c:817 msgid "gitdir file points to non-existent location" msgstr "le fichier gitdir pointe sur un endroit inexistant" @@ -9228,7 +9828,9 @@ msgstr " (utilisez \"git restore --staged <fichier>...\" pour désindexer)" #: wt-status.c:190 wt-status.c:222 #, c-format msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" -msgstr " (utilisez \"git restore --source=%s --staged <fichier>...\" pour désindexer)" +msgstr "" +" (utilisez \"git restore --source=%s --staged <fichier>...\" pour " +"désindexer)" #: wt-status.c:193 wt-status.c:225 msgid " (use \"git rm --cached <file>...\" to unstage)" @@ -9240,40 +9842,50 @@ msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)" #: wt-status.c:199 wt-status.c:203 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" -msgstr " (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme résolu)" +msgstr "" +" (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme " +"résolu)" #: wt-status.c:201 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:211 wt-status.c:1075 +#: wt-status.c:211 wt-status.c:1125 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" -#: wt-status.c:234 wt-status.c:1084 +#: wt-status.c:234 wt-status.c:1134 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" #: wt-status.c:238 msgid " (use \"git add <file>...\" to update what will be committed)" -msgstr " (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)" +msgstr "" +" (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)" #: wt-status.c:240 msgid " (use \"git add/rm <file>...\" to update what will be committed)" -msgstr " (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera validé)" +msgstr "" +" (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera " +"validé)" #: wt-status.c:241 -msgid " (use \"git restore <file>...\" to discard changes in working directory)" -msgstr " (utilisez \"git restore <fichier>...\" pour annuler les modifications dans le répertoire de travail)" +msgid "" +" (use \"git restore <file>...\" to discard changes in working directory)" +msgstr "" +" (utilisez \"git restore <fichier>...\" pour annuler les modifications dans " +"le répertoire de travail)" #: wt-status.c:243 msgid " (commit or discard the untracked or modified content in submodules)" -msgstr " (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)" +msgstr "" +" (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)" #: wt-status.c:254 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" -msgstr " (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)" +msgstr "" +" (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)" #: wt-status.c:266 msgid "both deleted:" @@ -9347,22 +9959,22 @@ msgstr "contenu modifié, " msgid "untracked content, " msgstr "contenu non suivi, " -#: wt-status.c:908 +#: wt-status.c:958 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Votre remisage contient actuellement %d entrée" msgstr[1] "Votre remisage contient actuellement %d entrées" -#: wt-status.c:939 +#: wt-status.c:989 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiés mais non mis à jour :" -#: wt-status.c:941 +#: wt-status.c:991 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module à valider :" -#: wt-status.c:1023 +#: wt-status.c:1073 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9370,7 +9982,7 @@ msgstr "" "Ne touchez pas à la ligne ci-dessus.\n" "Tout ce qui suit sera éliminé." -#: wt-status.c:1115 +#: wt-status.c:1165 #, c-format msgid "" "\n" @@ -9378,256 +9990,275 @@ msgid "" "You can use '--no-ahead-behind' to avoid this.\n" msgstr "" "\n" -"%.2f secondes ont été nécessaires pour calculer les valeurs d'avance/retard de la branche.\n" +"%.2f secondes ont été nécessaires pour calculer les valeurs d'avance/retard " +"de la branche.\n" "Vous pouvez utiliser '--no-ahead-behind' pour éviter ceci.\n" -#: wt-status.c:1145 +#: wt-status.c:1195 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:1148 +#: wt-status.c:1198 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:1150 +#: wt-status.c:1200 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)" -#: wt-status.c:1154 +#: wt-status.c:1204 msgid "All conflicts fixed but you are still merging." msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée." -#: wt-status.c:1157 +#: wt-status.c:1207 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:1166 +#: wt-status.c:1216 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:1169 +#: wt-status.c:1219 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:1173 +#: wt-status.c:1223 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:1175 +#: wt-status.c:1225 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:1177 +#: wt-status.c:1227 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:1310 +#: wt-status.c:1360 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo est manquant." -#: wt-status.c:1312 +#: wt-status.c:1362 msgid "No commands done." msgstr "Aucune commande réalisée." -#: wt-status.c:1315 +#: wt-status.c:1365 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Dernière commande effectuée (%d commande effectuée) :" msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :" -#: wt-status.c:1326 +#: wt-status.c:1376 #, c-format msgid " (see more in file %s)" msgstr " (voir plus dans le fichier %s)" -#: wt-status.c:1331 +#: wt-status.c:1381 msgid "No commands remaining." msgstr "Aucune commande restante." -#: wt-status.c:1334 +#: wt-status.c:1384 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Prochaine commande à effectuer (%d commande restante) :" msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :" -#: wt-status.c:1342 +#: wt-status.c:1392 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)" -#: wt-status.c:1354 +#: wt-status.c:1404 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'." -#: wt-status.c:1359 +#: wt-status.c:1409 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:1372 +#: wt-status.c:1422 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:1374 +#: wt-status.c:1424 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:1376 +#: wt-status.c:1426 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)" -#: wt-status.c:1383 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:1387 +#: wt-status.c:1437 #, c-format -msgid "You are currently splitting a commit while rebasing branch '%s' on '%s'." -msgstr "Vous êtes actuellement en train de fractionner un commit pendant un rebasage de la branche '%s' sur '%s'." +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Vous êtes actuellement en train de fractionner un commit pendant un rebasage " +"de la branche '%s' sur '%s'." -#: wt-status.c:1392 +#: wt-status.c:1442 msgid "You are currently splitting a commit during a rebase." -msgstr "Vous êtes actuellement en train de fractionner un commit pendant un rebasage." +msgstr "" +"Vous êtes actuellement en train de fractionner un commit pendant un rebasage." -#: wt-status.c:1395 +#: wt-status.c:1445 msgid " (Once your working directory is clean, run \"git rebase --continue\")" -msgstr " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" +msgstr "" +" (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" -#: wt-status.c:1399 +#: wt-status.c:1449 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." -msgstr "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la branche '%s' sur '%s'." +msgstr "" +"Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la " +"branche '%s' sur '%s'." -#: wt-status.c:1404 +#: wt-status.c:1454 msgid "You are currently editing a commit during a rebase." -msgstr "Vous êtes actuellement en train d'éditer un commit pendant un rebasage." +msgstr "" +"Vous êtes actuellement en train d'éditer un commit pendant un rebasage." -#: wt-status.c:1407 +#: wt-status.c:1457 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:1409 -msgid " (use \"git rebase --continue\" once you are satisfied with your changes)" -msgstr " (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos modifications)" +#: wt-status.c:1459 +msgid "" +" (use \"git rebase --continue\" once you are satisfied with your changes)" +msgstr "" +" (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos " +"modifications)" -#: wt-status.c:1420 +#: wt-status.c:1470 msgid "Cherry-pick currently in progress." msgstr "Picorage en cours." -#: wt-status.c:1423 +#: wt-status.c:1473 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:1430 +#: wt-status.c:1480 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1433 +#: wt-status.c:1483 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (lancez \"git cherry-pick --continue\" pour continuer)" -#: wt-status.c:1436 +#: wt-status.c:1486 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" -msgstr " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" +msgstr "" +" (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" -#: wt-status.c:1438 +#: wt-status.c:1488 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (utilisez \"git cherry-pick --skip\" pour sauter ce patch)" -#: wt-status.c:1440 +#: wt-status.c:1490 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)" -#: wt-status.c:1450 +#: wt-status.c:1500 msgid "Revert currently in progress." msgstr "Rétablissement en cours." -#: wt-status.c:1453 +#: wt-status.c:1503 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1459 +#: wt-status.c:1509 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1462 +#: wt-status.c:1512 msgid " (run \"git revert --continue\" to continue)" msgstr " (lancez \"git revert --continue\" pour continuer)" -#: wt-status.c:1465 +#: wt-status.c:1515 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1467 +#: wt-status.c:1517 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (utilisez \"git revert --skip\" pour sauter ce patch)" -#: wt-status.c:1469 +#: wt-status.c:1519 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1479 +#: wt-status.c:1529 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Vous êtes en cours de bissection, depuis la branche '%s'." -#: wt-status.c:1483 +#: wt-status.c:1533 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1486 +#: wt-status.c:1536 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)" -#: wt-status.c:1497 +#: wt-status.c:1547 +msgid "You are in a sparse checkout." +msgstr "Vous êtes dans une extraction clairsemée." + +#: wt-status.c:1550 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." -msgstr "Vous êtes dans une extraction partielle avec %d %% de fichiers suivis présents." +msgstr "" +"Vous êtes dans une extraction partielle avec %d %% de fichiers suivis " +"présents." -#: wt-status.c:1736 +#: wt-status.c:1794 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1743 +#: wt-status.c:1801 msgid "interactive rebase in progress; onto " msgstr "rebasage interactif en cours ; sur " -#: wt-status.c:1745 +#: wt-status.c:1803 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1750 +#: wt-status.c:1808 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.c:1752 +#: wt-status.c:1810 msgid "HEAD detached from " msgstr "HEAD détachée depuis " -#: wt-status.c:1755 +#: wt-status.c:1813 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1772 +#: wt-status.c:1830 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1773 +#: wt-status.c:1831 msgid "No commits yet" msgstr "Aucun commit" -#: wt-status.c:1787 +#: wt-status.c:1845 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1789 +#: wt-status.c:1847 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1793 +#: wt-status.c:1851 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9636,110 +10267,121 @@ msgid "" msgstr "" "L'énumération des fichiers non suivis a duré %.2f secondes. 'status -uno'\n" "peut l'accélérer, mais vous devez alors faire attention à ne pas\n" -"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help status')." +"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " +"status')." -#: wt-status.c:1799 +#: wt-status.c:1857 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1801 +#: wt-status.c:1859 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1807 +#: wt-status.c:1865 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1812 +#: wt-status.c:1870 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" -msgstr "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou \"git commit -a\")\n" +msgstr "" +"aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou " +"\"git commit -a\")\n" -#: wt-status.c:1816 +#: wt-status.c:1874 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1820 +#: wt-status.c:1878 #, c-format -msgid "nothing added to commit but untracked files present (use \"git add\" to track)\n" -msgstr "aucune modification ajoutée à la validation mais des fichiers non suivis sont présents (utilisez \"git add\" pour les suivre)\n" +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "" +"aucune modification ajoutée à la validation mais des fichiers non suivis " +"sont présents (utilisez \"git add\" pour les suivre)\n" -#: wt-status.c:1824 +#: wt-status.c:1882 #, c-format msgid "nothing added to commit but untracked files present\n" -msgstr "aucune modification ajoutée à la validation mais des fichiers non suivis sont présents\n" +msgstr "" +"aucune modification ajoutée à la validation mais des fichiers non suivis " +"sont présents\n" -#: wt-status.c:1828 +#: wt-status.c:1886 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" -msgstr "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les suivre)\n" +msgstr "" +"rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les " +"suivre)\n" -#: wt-status.c:1832 wt-status.c:1838 +#: wt-status.c:1890 wt-status.c:1896 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1835 +#: wt-status.c:1893 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n" -#: wt-status.c:1840 +#: wt-status.c:1898 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1945 +#: wt-status.c:2003 msgid "No commits yet on " msgstr "Encore aucun commit sur " -#: wt-status.c:1949 +#: wt-status.c:2007 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1980 +#: wt-status.c:2038 msgid "different" msgstr "différent" -#: wt-status.c:1982 wt-status.c:1990 +#: wt-status.c:2040 wt-status.c:2048 msgid "behind " msgstr "derrière " -#: wt-status.c:1985 wt-status.c:1988 +#: wt-status.c:2043 wt-status.c:2046 msgid "ahead " msgstr "devant " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2511 +#: wt-status.c:2569 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "impossible de %s : vous avez des modifications non indexées." -#: wt-status.c:2517 +#: wt-status.c:2575 msgid "additionally, your index contains uncommitted changes." msgstr "de plus, votre index contient des modifications non validées." -#: wt-status.c:2519 +#: wt-status.c:2577 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s impossible : votre index contient des modifications non validées." -#: compat/simple-ipc/ipc-unix-socket.c:178 +#: compat/simple-ipc/ipc-unix-socket.c:182 msgid "could not send IPC command" msgstr "impossible de trouver le commit %" -#: compat/simple-ipc/ipc-unix-socket.c:185 +#: compat/simple-ipc/ipc-unix-socket.c:189 msgid "could not read IPC response" msgstr "impossible de lire la réponse IPC" -#: compat/simple-ipc/ipc-unix-socket.c:862 +#: compat/simple-ipc/ipc-unix-socket.c:866 #, c-format msgid "could not start accept_thread '%s'" msgstr "impossible de démarrer accept_thread '%s'" -#: compat/simple-ipc/ipc-unix-socket.c:874 +#: compat/simple-ipc/ipc-unix-socket.c:878 #, c-format msgid "could not start worker[0] for '%s'" msgstr "impossible de démarrer worker[0] pour '%s'" @@ -9776,7 +10418,7 @@ msgstr "suppression de '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" -#: builtin/add.c:307 builtin/rev-parse.c:991 +#: builtin/add.c:307 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "Impossible de lire l'index" @@ -9809,9 +10451,11 @@ msgstr "Impossible d'appliquer '%s'" #: builtin/add.c:343 msgid "The following paths are ignored by one of your .gitignore files:\n" -msgstr "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" +msgstr "" +"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" -#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124 builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550 #: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 msgid "dry run" msgstr "simuler l'action" @@ -9838,7 +10482,8 @@ msgstr "mettre à jour les fichiers suivis" #: builtin/add.c:371 msgid "renormalize EOL of tracked files (implies -u)" -msgstr "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)" +msgstr "" +"renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)" #: builtin/add.c:372 msgid "record only the fact that the path will be added later" @@ -9850,7 +10495,8 @@ msgstr "ajouter les modifications de tous les fichiers suivis et non suivis" #: builtin/add.c:376 msgid "ignore paths removed in the working tree (same as --no-all)" -msgstr "ignorer les chemins effacés dans la copie de travail (identique à --no-all)" +msgstr "" +"ignorer les chemins effacés dans la copie de travail (identique à --no-all)" #: builtin/add.c:378 msgid "don't add, only refresh the index" @@ -9858,7 +10504,9 @@ msgstr "ne pas ajouter, juste rafraîchir l'index" #: builtin/add.c:379 msgid "just skip files which cannot be added because of errors" -msgstr "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait d'erreurs" +msgstr "" +"sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait " +"d'erreurs" #: builtin/add.c:380 msgid "check if - even missing - files are ignored in dry run" @@ -9944,18 +10592,21 @@ msgstr "-A et -u sont mutuellement incompatibles" #: builtin/add.c:522 msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run" +msgstr "" +"L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run" #: builtin/add.c:526 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x" -#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637 +#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 +#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file est incompatible avec pathspec arguments" -#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643 +#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 +#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul nécessite --pathspec-from-file" @@ -9974,105 +10625,112 @@ msgstr "" "Éliminez ce message en lançant\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:364 +#: builtin/am.c:365 msgid "could not parse author script" msgstr "impossible d'analyser l'auteur du script" -#: builtin/am.c:454 +#: builtin/am.c:455 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' a été effacé par le crochet applypatch-msg" -#: builtin/am.c:496 +#: builtin/am.c:497 #, c-format msgid "Malformed input line: '%s'." msgstr "Ligne en entrée malformée : '%s'." -#: builtin/am.c:534 +#: builtin/am.c:535 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Impossible de copier les notes de '%s' vers '%s'" -#: builtin/am.c:560 +#: builtin/am.c:561 msgid "fseek failed" msgstr "échec de fseek" -#: builtin/am.c:748 +#: builtin/am.c:749 #, c-format msgid "could not parse patch '%s'" msgstr "impossible d'analyser le patch '%s'" -#: builtin/am.c:813 +#: builtin/am.c:814 msgid "Only one StGIT patch series can be applied at once" msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois" -#: builtin/am.c:861 +#: builtin/am.c:862 msgid "invalid timestamp" msgstr "horodatage invalide" -#: builtin/am.c:866 builtin/am.c:878 +#: builtin/am.c:867 builtin/am.c:879 msgid "invalid Date line" msgstr "ligne de Date invalide" -#: builtin/am.c:873 +#: builtin/am.c:874 msgid "invalid timezone offset" msgstr "décalage horaire invalide" -#: builtin/am.c:966 +#: builtin/am.c:967 msgid "Patch format detection failed." msgstr "Échec de détection du format du patch." -#: builtin/am.c:971 builtin/clone.c:414 +#: builtin/am.c:972 builtin/clone.c:414 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" -#: builtin/am.c:976 +#: builtin/am.c:977 msgid "Failed to split patches." msgstr "Échec de découpage des patchs." -#: builtin/am.c:1125 +#: builtin/am.c:1126 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"." -#: builtin/am.c:1126 +#: builtin/am.c:1127 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"." -#: builtin/am.c:1127 +#: builtin/am.c:1128 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." -msgstr "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --abort\"." +msgstr "" +"Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --" +"abort\"." -#: builtin/am.c:1222 +#: builtin/am.c:1223 msgid "Patch sent with format=flowed; space at the end of lines might be lost." -msgstr "Rustine envoyée avec format=flowed ; les espaces en fin de ligne peuvent être perdus." +msgstr "" +"Rustine envoyée avec format=flowed ; les espaces en fin de ligne peuvent " +"être perdus." -#: builtin/am.c:1250 +#: builtin/am.c:1251 msgid "Patch is empty." msgstr "Le patch actuel est vide." -#: builtin/am.c:1315 +#: builtin/am.c:1316 #, c-format msgid "missing author line in commit %s" msgstr "ligne d'auteur manquante dans le commit %s" -#: builtin/am.c:1318 +#: builtin/am.c:1319 #, c-format msgid "invalid ident line: %.*s" msgstr "ligne d'identification invalide : %.*s" -#: builtin/am.c:1537 +#: builtin/am.c:1538 msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 points." +msgstr "" +"Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 " +"points." -#: builtin/am.c:1539 +#: builtin/am.c:1540 msgid "Using index info to reconstruct a base tree..." -msgstr "Utilisation de l'information de l'index pour reconstruire un arbre de base..." +msgstr "" +"Utilisation de l'information de l'index pour reconstruire un arbre de base..." -#: builtin/am.c:1558 +#: builtin/am.c:1559 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10080,24 +10738,24 @@ msgstr "" "Avez-vous édité le patch à la main ?\n" "Il ne s'applique pas aux blobs enregistrés dans son index." -#: builtin/am.c:1564 +#: builtin/am.c:1565 msgid "Falling back to patching base and 3-way merge..." msgstr "Retour à un patch de la base et fusion à 3 points..." -#: builtin/am.c:1590 +#: builtin/am.c:1591 msgid "Failed to merge in the changes." msgstr "Échec d'intégration des modifications." -#: builtin/am.c:1622 +#: builtin/am.c:1623 msgid "applying to an empty history" msgstr "application à un historique vide" -#: builtin/am.c:1674 builtin/am.c:1678 +#: builtin/am.c:1675 builtin/am.c:1679 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossible de continuer : %s n'existe pas." -#: builtin/am.c:1696 +#: builtin/am.c:1697 msgid "Commit Body is:" msgstr "Le corps de la validation est :" @@ -10105,39 +10763,40 @@ msgstr "Le corps de la validation est :" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1706 +#: builtin/am.c:1707 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : " -#: builtin/am.c:1752 builtin/commit.c:408 +#: builtin/am.c:1753 builtin/commit.c:408 msgid "unable to write index file" msgstr "impossible d'écrire le fichier d'index" -#: builtin/am.c:1756 +#: builtin/am.c:1757 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)" -#: builtin/am.c:1796 builtin/am.c:1864 +#: builtin/am.c:1797 builtin/am.c:1865 #, c-format msgid "Applying: %.*s" msgstr "Application de %.*s" -#: builtin/am.c:1813 +#: builtin/am.c:1814 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch déjà appliqué." -#: builtin/am.c:1819 +#: builtin/am.c:1820 #, c-format msgid "Patch failed at %s %.*s" msgstr "l'application de la rustine a échoué à %s %.*s" -#: builtin/am.c:1823 +#: builtin/am.c:1824 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" -msgstr "Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en échec" +msgstr "" +"Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en échec" -#: builtin/am.c:1867 +#: builtin/am.c:1868 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10145,28 +10804,33 @@ msgid "" msgstr "" "Aucun changement - avez-vous oublié d'utiliser 'git add' ?\n" "S'il n'y a plus rien à indexer, il se peut qu'autre chose ait déjà\n" -"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce patch." +"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " +"patch." -#: builtin/am.c:1874 +#: builtin/am.c:1875 msgid "" "You still have unmerged paths in your index.\n" -"You should 'git add' each file with resolved conflicts to mark them as such.\n" +"You should 'git add' each file with resolved conflicts to mark them as " +"such.\n" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" "Vous avez encore des chemin non-fusionnés dans votre index.\n" -"Vous devriez lancer 'git add' sur chaque conflit résolu pour les marquer comme tel.\n" -"Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour accepter son état." +"Vous devriez lancer 'git add' sur chaque conflit résolu pour les marquer " +"comme tel.\n" +"Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour " +"accepter son état." -#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347 builtin/reset.c:355 +#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/am.c:2033 +#: builtin/am.c:2034 msgid "failed to clean index" msgstr "échec du nettoyage de l'index" -#: builtin/am.c:2077 +#: builtin/am.c:2078 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10174,150 +10838,160 @@ msgstr "" "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" "Pas de retour à ORIG_HEAD" -#: builtin/am.c:2184 +#: builtin/am.c:2185 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valeur invalide pour --patch-format : %s" -#: builtin/am.c:2226 +#: builtin/am.c:2227 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Valeur invalide pour --show-current-patch : %s" -#: builtin/am.c:2230 +#: builtin/am.c:2231 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s est incompatible avec --show-current-patch=%s" -#: builtin/am.c:2261 +#: builtin/am.c:2262 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<options>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2262 +#: builtin/am.c:2263 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<options>] (--continue | --skip | --abort)" -#: builtin/am.c:2268 +#: builtin/am.c:2269 msgid "run interactively" msgstr "exécution interactive" -#: builtin/am.c:2270 +#: builtin/am.c:2271 msgid "historical option -- no-op" msgstr "option historique -- no-op" -#: builtin/am.c:2272 +#: builtin/am.c:2273 msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" -#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16 builtin/repack.c:472 builtin/stash.c:948 +#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:472 builtin/stash.c:945 msgid "be quiet" msgstr "être silencieux" -#: builtin/am.c:2275 +#: builtin/am.c:2276 msgid "add a Signed-off-by trailer to the commit message" msgstr "ajouter une ligne terminale Signed-off-by au message de validation" -#: builtin/am.c:2278 +#: builtin/am.c:2279 msgid "recode into utf8 (default)" msgstr "recoder en utf-8 (par défaut)" -#: builtin/am.c:2280 +#: builtin/am.c:2281 msgid "pass -k flag to git-mailinfo" msgstr "passer l'option -k à git-mailinfo" -#: builtin/am.c:2282 +#: builtin/am.c:2283 msgid "pass -b flag to git-mailinfo" msgstr "passer l'option -b à git-mailinfo" -#: builtin/am.c:2284 +#: builtin/am.c:2285 msgid "pass -m flag to git-mailinfo" msgstr "passer l'option -m à git-mailinfo" -#: builtin/am.c:2286 +#: builtin/am.c:2287 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox" -#: builtin/am.c:2289 +#: builtin/am.c:2290 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" -msgstr "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr" +msgstr "" +"ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr" -#: builtin/am.c:2292 +#: builtin/am.c:2293 msgid "strip everything before a scissors line" msgstr "retirer tout le contenu avant la ligne des ciseaux" -#: builtin/am.c:2294 +#: builtin/am.c:2295 msgid "pass it through git-mailinfo" msgstr "le passer à travers git-mailinfo" -#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 -#: builtin/am.c:2324 +#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307 +#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319 +#: builtin/am.c:2325 msgid "pass it through git-apply" msgstr "le passer jusqu'à git-apply" -#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17 builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261 builtin/pull.c:141 -#: builtin/pull.c:200 builtin/pull.c:217 builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 builtin/repack.c:489 builtin/show-branch.c:650 -#: builtin/show-ref.c:172 builtin/tag.c:447 parse-options.h:155 parse-options.h:176 parse-options.h:317 +#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 +#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176 +#: parse-options.h:317 msgid "n" msgstr "n" -#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137 builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 builtin/verify-tag.c:38 +#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137 +#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 +#: builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2321 +#: builtin/am.c:2322 msgid "format the patch(es) are in" msgstr "format de présentation des patchs" -#: builtin/am.c:2327 +#: builtin/am.c:2328 msgid "override error message when patch failure occurs" msgstr "surcharger le message d'erreur lors d'un échec d'application de patch" -#: builtin/am.c:2329 +#: builtin/am.c:2330 msgid "continue applying patches after resolving a conflict" msgstr "continuer à appliquer les patchs après résolution d'un conflit" -#: builtin/am.c:2332 +#: builtin/am.c:2333 msgid "synonyms for --continue" msgstr "synonymes de --continue" -#: builtin/am.c:2335 +#: builtin/am.c:2336 msgid "skip the current patch" msgstr "sauter le patch courant" -#: builtin/am.c:2338 +#: builtin/am.c:2339 msgid "restore the original branch and abort the patching operation" msgstr "restaurer la branche originale et abandonner les applications de patch" -#: builtin/am.c:2341 +#: builtin/am.c:2342 msgid "abort the patching operation but keep HEAD where it is" msgstr "abandonne l'opération de patch mais garde HEAD où il est" -#: builtin/am.c:2345 +#: builtin/am.c:2346 msgid "show the patch being applied" msgstr "afficher le patch en cours d'application" -#: builtin/am.c:2350 +#: builtin/am.c:2351 msgid "lie about committer date" msgstr "mentir sur la date de validation" -#: builtin/am.c:2352 +#: builtin/am.c:2353 msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" -#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630 builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 builtin/rebase.c:1395 -#: builtin/revert.c:117 builtin/tag.c:462 +#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640 +#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 +#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 msgid "key-id" msgstr "id-clé" -#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396 +#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396 msgid "GPG-sign commits" msgstr "signer les commits avec GPG" -#: builtin/am.c:2358 +#: builtin/am.c:2359 msgid "(internal use for git-rebase)" msgstr "(utilisation interne pour git-rebase)" -#: builtin/am.c:2376 +#: builtin/am.c:2377 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." @@ -10325,16 +10999,17 @@ msgstr "" "L'option -b/--binary ne fait plus rien depuis longtemps,\n" "et elle sera supprimée. Veuillez ne plus l'utiliser." -#: builtin/am.c:2383 +#: builtin/am.c:2384 msgid "failed to read the index" msgstr "échec à la lecture de l'index" -#: builtin/am.c:2398 +#: builtin/am.c:2399 #, c-format msgid "previous rebase directory %s still exists but mbox given." -msgstr "le répertoire précédent de rebasage %s existe toujours mais mbox donnée." +msgstr "" +"le répertoire précédent de rebasage %s existe toujours mais mbox donnée." -#: builtin/am.c:2422 +#: builtin/am.c:2423 #, c-format msgid "" "Stray %s directory found.\n" @@ -10343,11 +11018,13 @@ msgstr "" "Répertoire abandonné %s trouvé.\n" "Utilisez \"git am --abort\" pour le supprimer." -#: builtin/am.c:2428 +#: builtin/am.c:2429 msgid "Resolve operation not in progress, we are not resuming." -msgstr "Pas de résolution de l'opération en cours, nous ne sommes pas dans une reprise." +msgstr "" +"Pas de résolution de l'opération en cours, nous ne sommes pas dans une " +"reprise." -#: builtin/am.c:2438 +#: builtin/am.c:2439 msgid "interactive mode requires patches on the command line" msgstr "le mode interactif requiert des rustines sur la ligne de commande" @@ -10391,17 +11068,26 @@ msgstr "git bisect--helper --bisect-reset [<commit>]" #: builtin/bisect--helper.c:24 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" -msgstr "git bisect--helper --bisect-next-check <terme-pour-bon> <terme-pour-mauvais> [<term>]" +msgstr "" +"git bisect--helper --bisect-next-check <terme-pour-bon> <terme-pour-mauvais> " +"[<term>]" #: builtin/bisect--helper.c:25 -msgid "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]" -msgstr "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]" +msgid "" +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" +"term-new]" +msgstr "" +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" +"term-new]" #: builtin/bisect--helper.c:26 msgid "" -"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{new,bad}=<terme> --term-{old,good}=<terme>][--no-checkout] [--first-parent] [<mauvais> [<bon>...]] [--] " +"git bisect--helper --bisect-start [--term-{new,bad}=<terme> --term-{old,good}" +"=<terme>][--no-checkout] [--first-parent] [<mauvais> [<bon>...]] [--] " "[<chemins>...]" #: builtin/bisect--helper.c:28 @@ -10410,15 +11096,15 @@ msgstr "git bisect--helper --bisect-next" #: builtin/bisect--helper.c:29 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" -msgstr "git bisect--helper --bisect-reset (bad|new) [<rév>]" +msgstr "git bisect--helper --bisect-state (bad|new) [<rév>]" #: builtin/bisect--helper.c:30 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" -msgstr "git bisect--helper --bisect-reset (good|old) [<rév>...]" +msgstr "git bisect--helper --bisect-state (good|old) [<rév>...]" #: builtin/bisect--helper.c:31 msgid "git bisect--helper --bisect-replay <filename>" -msgstr "git bisect--helper --bisect-next <nom-de-fichier>" +msgstr "git bisect--helper --bisect-replay <nom-de-fichier>" #: builtin/bisect--helper.c:32 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" @@ -10434,61 +11120,64 @@ msgstr "impossible d'ouvrir le fichier '%s' en mode '%s'" msgid "could not write to file '%s'" msgstr "impossible d'écrire le fichier '%s'" -#: builtin/bisect--helper.c:153 +#: builtin/bisect--helper.c:155 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' n'est pas un terme valide" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:159 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "impossible d'utiliser la commande incluse '%s' comme terme" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:169 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "impossible de modifier la signification du terme '%s'" -#: builtin/bisect--helper.c:177 +#: builtin/bisect--helper.c:179 msgid "please use two different terms" msgstr "veuillez utiliser deux termes différents" -#: builtin/bisect--helper.c:193 +#: builtin/bisect--helper.c:195 #, c-format msgid "We are not bisecting.\n" msgstr "Pas de bissection en cours.\n" -#: builtin/bisect--helper.c:201 +#: builtin/bisect--helper.c:203 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' n'est pas un commit valide" -#: builtin/bisect--helper.c:210 +#: builtin/bisect--helper.c:212 #, c-format -msgid "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." -msgstr "échec d'extraction de la HEAD d'origine '%s'. Essayez 'git bisect reset <commit>'." +msgid "" +"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." +msgstr "" +"échec d'extraction de la HEAD d'origine '%s'. Essayez 'git bisect reset " +"<commit>'." -#: builtin/bisect--helper.c:254 +#: builtin/bisect--helper.c:256 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Mauvais argument pour bisect_write : %s" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:261 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "impossible d'obtenir l'oid de la révision '%s'" -#: builtin/bisect--helper.c:271 +#: builtin/bisect--helper.c:273 #, c-format msgid "couldn't open the file '%s'" msgstr "impossible d'ouvrir le fichier '%s'" -#: builtin/bisect--helper.c:297 +#: builtin/bisect--helper.c:299 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Commande invalide : vous êtes actuellement dans une bissection %s/%s" -#: builtin/bisect--helper.c:324 +#: builtin/bisect--helper.c:326 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10497,7 +11186,7 @@ msgstr "" "Vous devez me donner au moins une révision %s et une révision %s.\n" "Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela." -#: builtin/bisect--helper.c:328 +#: builtin/bisect--helper.c:330 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10508,7 +11197,7 @@ msgstr "" "Puis vous devez me donner au moins une révision %s et une révision %s.\n" "Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela." -#: builtin/bisect--helper.c:348 +#: builtin/bisect--helper.c:350 #, c-format msgid "bisecting only with a %s commit" msgstr "bissection avec seulement un commit %s" @@ -10517,15 +11206,15 @@ msgstr "bissection avec seulement un commit %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:356 +#: builtin/bisect--helper.c:358 msgid "Are you sure [Y/n]? " msgstr "Confirmez-vous [Y/n] ? " -#: builtin/bisect--helper.c:417 +#: builtin/bisect--helper.c:419 msgid "no terms defined" msgstr "aucun terme défini" -#: builtin/bisect--helper.c:420 +#: builtin/bisect--helper.c:422 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10534,61 +11223,63 @@ msgstr "" "Vos termes actuels sont %s pour l'état ancien\n" "et %s pour le nouvel état.\n" -#: builtin/bisect--helper.c:430 +#: builtin/bisect--helper.c:432 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "" "argument invalide %s pour 'git bisect terms'.\n" -"Les options supportées sont : --term-good|--term-old et --term-bad|--term-new." +"Les options supportées sont : --term-good|--term-old et --term-bad|--term-" +"new." -#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021 +#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023 msgid "revision walk setup failed\n" msgstr "échec de la préparation du parcours des révisions\n" -#: builtin/bisect--helper.c:519 +#: builtin/bisect--helper.c:521 #, c-format msgid "could not open '%s' for appending" msgstr "impossible d'ouvrir '%s' en ajout" -#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653 msgid "'' is not a valid term" msgstr "'' n'est pas un terme valide" -#: builtin/bisect--helper.c:661 +#: builtin/bisect--helper.c:663 #, c-format msgid "unrecognized option: '%s'" msgstr "option non reconnue : '%s'" -#: builtin/bisect--helper.c:665 +#: builtin/bisect--helper.c:667 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' ne semble être une révision valide" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:698 msgid "bad HEAD - I need a HEAD" msgstr "mauvaise HEAD - j'ai besoin d'une HEAD" -#: builtin/bisect--helper.c:711 +#: builtin/bisect--helper.c:713 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." -msgstr "l'extraction de '%s' a échoué. Essayez 'git bisect start <branche-valide>'." +msgstr "" +"l'extraction de '%s' a échoué. Essayez 'git bisect start <branche-valide>'." -#: builtin/bisect--helper.c:732 +#: builtin/bisect--helper.c:734 msgid "won't bisect on cg-seek'ed tree" msgstr "refus de bissecter sur un arbre 'cg-seeked'" -#: builtin/bisect--helper.c:735 +#: builtin/bisect--helper.c:737 msgid "bad HEAD - strange symbolic ref" msgstr "mauvaise HEAD - référence symbolique douteuse" -#: builtin/bisect--helper.c:755 +#: builtin/bisect--helper.c:757 #, c-format msgid "invalid ref: '%s'" msgstr "réference invalide : '%s'" -#: builtin/bisect--helper.c:813 +#: builtin/bisect--helper.c:815 msgid "You need to start by \"git bisect start\"\n" msgstr "Vous devez démarrer avec \"git bisect start\"\n" @@ -10596,104 +11287,104 @@ msgstr "Vous devez démarrer avec \"git bisect start\"\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:824 +#: builtin/bisect--helper.c:826 msgid "Do you want me to do it for you [Y/n]? " msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? " -#: builtin/bisect--helper.c:842 +#: builtin/bisect--helper.c:844 msgid "Please call `--bisect-state` with at least one argument" msgstr "Veuillez appeler `--bisect-state` avec au moins un argument" -#: builtin/bisect--helper.c:855 +#: builtin/bisect--helper.c:857 #, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' n'accepte qu'un seul argument." -#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880 +#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882 #, c-format msgid "Bad rev input: %s" msgstr "Mauvaise révision en entrée : %s" -#: builtin/bisect--helper.c:887 +#: builtin/bisect--helper.c:889 #, c-format msgid "Bad rev input (not a commit): %s" msgstr "Mauvaise révision en entrée (pas un commit) : %s" -#: builtin/bisect--helper.c:919 +#: builtin/bisect--helper.c:921 msgid "We are not bisecting." msgstr "Pas de bissection en cours." -#: builtin/bisect--helper.c:969 +#: builtin/bisect--helper.c:971 #, c-format msgid "'%s'?? what are you talking about?" msgstr "'%s' ?? de quoi parlez-vous ?" -#: builtin/bisect--helper.c:981 +#: builtin/bisect--helper.c:983 #, c-format msgid "cannot read file '%s' for replaying" msgstr "impossible de lire le fichier '%s' pour rejouer" -#: builtin/bisect--helper.c:1054 +#: builtin/bisect--helper.c:1056 msgid "reset the bisection state" msgstr "réinitialiser l'état de la bissection" -#: builtin/bisect--helper.c:1056 +#: builtin/bisect--helper.c:1058 msgid "check whether bad or good terms exist" msgstr "vérifier si les termes bons ou mauvais existent" -#: builtin/bisect--helper.c:1058 +#: builtin/bisect--helper.c:1060 msgid "print out the bisect terms" msgstr "afficher les termes de bissection" -#: builtin/bisect--helper.c:1060 +#: builtin/bisect--helper.c:1062 msgid "start the bisect session" msgstr "démarrer une session de bissection" -#: builtin/bisect--helper.c:1062 +#: builtin/bisect--helper.c:1064 msgid "find the next bisection commit" msgstr "trouver le prochain commit de bissection" -#: builtin/bisect--helper.c:1064 +#: builtin/bisect--helper.c:1066 msgid "mark the state of ref (or refs)" msgstr "marquer l'état d'une références (ou plusieurs)" -#: builtin/bisect--helper.c:1066 +#: builtin/bisect--helper.c:1068 msgid "list the bisection steps so far" msgstr "lister les étapes de bissection jusqu'ici" -#: builtin/bisect--helper.c:1068 +#: builtin/bisect--helper.c:1070 msgid "replay the bisection process from the given file" msgstr "rejouer le processus de bissection depuis le fichier fourni" -#: builtin/bisect--helper.c:1070 +#: builtin/bisect--helper.c:1072 msgid "skip some commits for checkout" msgstr "sauter certains commits pour l'extraction" -#: builtin/bisect--helper.c:1072 +#: builtin/bisect--helper.c:1074 msgid "no log for BISECT_WRITE" msgstr "pas de journal pour BISECT_WRITE" -#: builtin/bisect--helper.c:1087 +#: builtin/bisect--helper.c:1089 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset supporte soit aucun argument, soit un commit" -#: builtin/bisect--helper.c:1092 +#: builtin/bisect--helper.c:1094 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check exige 2 ou 3 arguments" -#: builtin/bisect--helper.c:1098 +#: builtin/bisect--helper.c:1100 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms exige 0 ou 1 argument" -#: builtin/bisect--helper.c:1107 +#: builtin/bisect--helper.c:1109 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next exige 0 argument" -#: builtin/bisect--helper.c:1118 +#: builtin/bisect--helper.c:1120 msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log exige 0 argument" -#: builtin/bisect--helper.c:1123 +#: builtin/bisect--helper.c:1125 msgid "no logfile given" msgstr "pas de fichier de log donné" @@ -10730,22 +11421,29 @@ msgstr "référence à ignorer %s introuvable" #: builtin/blame.c:867 msgid "show blame entries as we find them, incrementally" -msgstr "montrer les éléments de blâme au fur et à mesure de leur découverte, de manière incrémentale" +msgstr "" +"montrer les éléments de blâme au fur et à mesure de leur découverte, de " +"manière incrémentale" #: builtin/blame.c:868 msgid "do not show object names of boundary commits (Default: off)" -msgstr "ne pas montrer les noms des objets pour les commits de limite (Défaut : désactivé)" +msgstr "" +"ne pas montrer les noms des objets pour les commits de limite (Défaut : " +"désactivé)" #: builtin/blame.c:869 msgid "do not treat root commits as boundaries (Default: off)" -msgstr "ne pas traiter les commits racine comme des limites (Défaut : désactivé)" +msgstr "" +"ne pas traiter les commits racine comme des limites (Défaut : désactivé)" #: builtin/blame.c:870 msgid "show work cost statistics" msgstr "montrer les statistiques de coût d'activité" -#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 builtin/merge.c:297 -#: builtin/multi-pack-index.c:55 builtin/pull.c:119 builtin/push.c:575 builtin/send-pack.c:198 +#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 +#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 +#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 +#: builtin/push.c:566 builtin/send-pack.c:198 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" @@ -10793,7 +11491,7 @@ msgstr "afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)" msgid "ignore whitespace differences" msgstr "ignorer les différences d'espace" -#: builtin/blame.c:883 builtin/log.c:1820 +#: builtin/blame.c:883 builtin/log.c:1823 msgid "rev" msgstr "rév" @@ -10807,7 +11505,8 @@ msgstr "ignorer les révisions listées dans <fichier>" #: builtin/blame.c:885 msgid "color redundant metadata from previous line differently" -msgstr "colorer différemment les métadonnées redondantes avec la ligne précédente" +msgstr "" +"colorer différemment les métadonnées redondantes avec la ligne précédente" #: builtin/blame.c:886 msgid "color lines by age" @@ -10815,11 +11514,13 @@ msgstr "colorier les lignes par âge" #: builtin/blame.c:887 msgid "spend extra cycles to find better match" -msgstr "dépenser des cycles supplémentaires pour trouver une meilleure correspondance" +msgstr "" +"dépenser des cycles supplémentaires pour trouver une meilleure correspondance" #: builtin/blame.c:888 msgid "use revisions from <file> instead of calling git-rev-list" -msgstr "utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list" +msgstr "" +"utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list" #: builtin/blame.c:889 msgid "use <file>'s contents as the final image" @@ -10843,11 +11544,15 @@ msgstr "plage" #: builtin/blame.c:893 msgid "process only line range <start>,<end> or function :<funcname>" -msgstr "traiter seulement l'intervalle de ligne <début>,<fin> ou la fonction : <nom-de-fonction>" +msgstr "" +"traiter seulement l'intervalle de ligne <début>,<fin> ou la fonction : <nom-" +"de-fonction>" #: builtin/blame.c:945 msgid "--progress can't be used with --incremental or porcelain formats" -msgstr "--progress ne peut pas être utilisé avec --incremental ou les formats porcelaine" +msgstr "" +"--progress ne peut pas être utilisé avec --incremental ou les formats " +"porcelaine" #. TRANSLATORS: This string is used to tell us the #. maximum display width for a relative timestamp in @@ -10886,11 +11591,13 @@ msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..." #: builtin/branch.c:32 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" -msgstr "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>" +msgstr "" +"git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>" #: builtin/branch.c:33 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" -msgstr "git branch [<options>] (-c | -C) [<ancienne-branche>] <nouvelle-branche>" +msgstr "" +"git branch [<options>] (-c | -C) [<ancienne-branche>] <nouvelle-branche>" #: builtin/branch.c:34 msgid "git branch [<options>] [-r | -a] [--points-at]" @@ -11030,11 +11737,15 @@ msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !" #: builtin/branch.c:579 msgid "Branch is renamed, but update of config-file failed" -msgstr "La branche est renommée, mais la mise à jour du fichier de configuration a échoué" +msgstr "" +"La branche est renommée, mais la mise à jour du fichier de configuration a " +"échoué" #: builtin/branch.c:581 msgid "Branch is copied, but update of config-file failed" -msgstr "La branche est copiée, mais la mise à jour du fichier de configuration a échoué" +msgstr "" +"La branche est copiée, mais la mise à jour du fichier de configuration a " +"échoué" #: builtin/branch.c:597 #, c-format @@ -11159,7 +11870,9 @@ msgstr "afficher seulement les branches qui ne sont pas fusionnées" msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 builtin/tag.c:477 +#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415 +#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 +#: builtin/tag.c:477 msgid "object" msgstr "objet" @@ -11171,7 +11884,8 @@ msgstr "afficher seulement les branches de l'objet" msgid "sorting and filtering are case insensitive" msgstr "le tri et le filtrage sont non-sensibles à la casse" -#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482 builtin/verify-tag.c:38 +#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482 +#: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" @@ -11219,8 +11933,11 @@ msgstr "trop d'arguments pour spécifier une branche amont" #: builtin/branch.c:814 #, c-format -msgid "could not set upstream of HEAD to %s when it does not point to any branch." -msgstr "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur aucune branche." +msgid "" +"could not set upstream of HEAD to %s when it does not point to any branch." +msgstr "" +"impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " +"aucune branche." #: builtin/branch.c:817 builtin/branch.c:840 #, c-format @@ -11238,7 +11955,9 @@ msgstr "trop d'arguments pour désactiver un amont" #: builtin/branch.c:838 msgid "could not unset upstream of HEAD when it does not point to any branch." -msgstr "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur aucune branche." +msgstr "" +"impossible de désactiver une branche amont de HEAD quand elle ne pointe sur " +"aucune branche." #: builtin/branch.c:844 #, c-format @@ -11250,12 +11969,17 @@ msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" msgstr "" -"Les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche.\n" +"Les options -a et -r de 'git branch' n'ont pas de sens avec un nom de " +"branche.\n" "Vouliez-vous plutôt dire -a|-r --list <motif> ?" #: builtin/branch.c:858 -msgid "the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead." -msgstr "l'option '--set-upstream' est obsolète. Utilisez '--track' ou '--set-upstream-to' à la place." +msgid "" +"the '--set-upstream' option is no longer supported. Please use '--track' or " +"'--set-upstream-to' instead." +msgstr "" +"l'option '--set-upstream' est obsolète. Utilisez '--track' ou '--set-" +"upstream-to' à la place." #: builtin/bugreport.c:15 msgid "git version:\n" @@ -11301,15 +12025,18 @@ msgid "" "You can delete any lines you don't wish to share.\n" msgstr "" "Merci de remplir le rapport de bogue Git !\n" -"Veuillez répondre aux questions suivantes pour nous aider à comprendre votre problème.\n" +"Veuillez répondre aux questions suivantes pour nous aider à comprendre votre " +"problème.\n" "\n" -"Qu'avez-vous fait avant l'apparition du bogue ? (Étapes pour reproduire votre problème)\n" +"Qu'avez-vous fait avant l'apparition du bogue ? (Étapes pour reproduire " +"votre problème)\n" "\n" "Quel était le résultat attendu ? (comportement attendu)\n" "\n" "Que s'est-il passé à la place ? (comportement observé)\n" "\n" -"Quelle différence y a-t-il entre ce que vous attendiez et ce qu'il s'est passé ?\n" +"Quelle différence y a-t-il entre ce que vous attendiez et ce qu'il s'est " +"passé ?\n" "\n" "Autres remarques :\n" "\n" @@ -11368,19 +12095,19 @@ msgstr "git bundle list-heads <fichier> [<nom-de-ref>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <fichier> [<nom-de-ref>...]" -#: builtin/bundle.c:67 builtin/pack-objects.c:3747 +#: builtin/bundle.c:67 builtin/pack-objects.c:3907 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/bundle.c:69 builtin/pack-objects.c:3749 +#: builtin/bundle.c:69 builtin/pack-objects.c:3909 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/bundle.c:71 builtin/pack-objects.c:3751 +#: builtin/bundle.c:71 builtin/pack-objects.c:3911 msgid "show progress meter during object writing phase" msgstr "afficher la barre de progression durant la phase d'écrite des objets" -#: builtin/bundle.c:74 builtin/pack-objects.c:3754 +#: builtin/bundle.c:74 builtin/pack-objects.c:3914 msgid "similar to --all-progress when progress meter is shown" msgstr "similaire à --all-progress quand la barre de progression est affichée" @@ -11392,101 +12119,112 @@ msgstr "spécifier la version du format de colis" msgid "Need a repository to create a bundle." msgstr "La création d'un colis requiert un dépôt." -#: builtin/bundle.c:107 +#: builtin/bundle.c:109 msgid "do not show bundle details" msgstr "ne pas afficher les détails du colis" -#: builtin/bundle.c:122 +#: builtin/bundle.c:128 #, c-format msgid "%s is okay\n" msgstr "%s est correct\n" -#: builtin/bundle.c:163 +#: builtin/bundle.c:179 msgid "Need a repository to unbundle." msgstr "Le dépaquetage d'un colis requiert un dépôt." -#: builtin/bundle.c:171 builtin/remote.c:1700 +#: builtin/bundle.c:191 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "être verbeux : doit être placé avant une sous-commande" -#: builtin/bundle.c:193 builtin/remote.c:1731 +#: builtin/bundle.c:213 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "Sous-commande inconnue : %s" -#: 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>" -msgstr "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p | <type> | --textconv | --filters) [--path=<chemin>] <objet>" +#: builtin/cat-file.c:596 +msgid "" +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | <type> | --textconv | --filters) [--path=<path>] <object>" +msgstr "" +"git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p " +"| <type> | --textconv | --filters) [--path=<chemin>] <objet>" -#: builtin/cat-file.c:599 -msgid "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-symlinks] [--textconv | --filters]" -msgstr "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-symlinks] [--textconv | --filters]" +#: builtin/cat-file.c:597 +msgid "" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" +msgstr "" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:620 +#: builtin/cat-file.c:618 msgid "only one batch option may be specified" msgstr "une seule option de traitement ne peut être spécifiée à la fois" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:636 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:637 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:638 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:640 msgid "exit with zero when there's no error" msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:641 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:643 msgid "for blob objects, run textconv on object's content" msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:645 msgid "for blob objects, run filters on object's content" msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:646 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:647 msgid "use a specific path for --textconv/--filters" msgstr "utiliser un chemin spécifique pour --textconv/--filters" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:649 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus" -#: builtin/cat-file.c:652 +#: builtin/cat-file.c:650 msgid "buffer --batch output" msgstr "bufferiser la sortie de --batch" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:652 msgid "show info and content of objects fed from the standard input" -msgstr "afficher l'information et le contenu des objets passés en entrée standard" +msgstr "" +"afficher l'information et le contenu des objets passés en entrée standard" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:656 msgid "show info about objects fed from the standard input" msgstr "afficher l'information des objets passés en entrée standard" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:660 msgid "follow in-tree symlinks (used with --batch or --batch-check)" -msgstr "suivre les liens symbolique internes à la copie de travail (utilisé avec --batch ou --batch-check)" +msgstr "" +"suivre les liens symbolique internes à la copie de travail (utilisé avec --" +"batch ou --batch-check)" -#: builtin/cat-file.c:664 +#: builtin/cat-file.c:662 msgid "show all objects with --batch or --batch-check" msgstr "montrer tous les objets avec --batch ou --batch-check" -#: builtin/cat-file.c:666 +#: builtin/cat-file.c:664 msgid "do not order --batch-all-objects output" msgstr "ne pas ordonner la sortie de --batch-all-objects" @@ -11512,9 +12250,11 @@ msgstr "lire les noms de fichier depuis l'entrée standard" #: builtin/check-attr.c:25 builtin/check-ignore.c:27 msgid "terminate input and output records by a NUL character" -msgstr "terminer les enregistrements en entrée et en sortie par un caractère NUL" +msgstr "" +"terminer les enregistrements en entrée et en sortie par un caractère NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 builtin/worktree.c:491 +#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 +#: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -11568,12 +12308,14 @@ msgid "no contacts specified" msgstr "aucun contact spécifié" #: builtin/checkout--worker.c:110 -#| msgid "git checkout [<options>] <branch>" msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<options>]" -#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 builtin/column.c:31 builtin/submodule--helper.c:1825 builtin/submodule--helper.c:1828 -#: builtin/submodule--helper.c:1836 builtin/submodule--helper.c:2334 builtin/worktree.c:719 +#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 +#: builtin/column.c:31 builtin/submodule--helper.c:1824 +#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835 +#: builtin/submodule--helper.c:2333 builtin/worktree.c:491 +#: builtin/worktree.c:728 msgid "string" msgstr "chaîne" @@ -11599,7 +12341,9 @@ msgstr "forcer l'écrasement des fichiers existants" #: builtin/checkout-index.c:190 msgid "no warning for existing files and files not in index" -msgstr "pas d'avertissement pour les fichiers existants et les fichiers absents de l'index" +msgstr "" +"pas d'avertissement pour les fichiers existants et les fichiers absents de " +"l'index" #: builtin/checkout-index.c:192 msgid "don't checkout new files" @@ -11688,7 +12432,8 @@ msgid_plural "Updated %d paths from the index" msgstr[0] "%d chemin mis à jour depuis l'index" msgstr[1] "%d chemins mis à jour depuis l'index" -#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 builtin/checkout.c:459 +#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 +#: builtin/checkout.c:459 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins" @@ -11701,7 +12446,9 @@ msgstr "'%s' ne peut pas être utilisé avec %s" #: builtin/checkout.c:469 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." -msgstr "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en même temps." +msgstr "" +"Impossible de mettre à jour les chemins et basculer sur la branche '%s' en " +"même temps." #: builtin/checkout.c:473 #, c-format @@ -11733,7 +12480,8 @@ msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -"impossible de continuer avec des modifications indexées dans les fichiers suivants :\n" +"impossible de continuer avec des modifications indexées dans les fichiers " +"suivants :\n" "%s" #: builtin/checkout.c:886 @@ -11745,7 +12493,7 @@ msgstr "Impossible de faire un reflog pour '%s' : %s\n" msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" @@ -11817,13 +12565,15 @@ msgid_plural "" " git branch <new-branch-name> %s\n" "\n" msgstr[0] "" -"Si vous souhaitez le garder en créant une nouvelle branche, c'est le bon moment\n" +"Si vous souhaitez le garder en créant une nouvelle branche, c'est le bon " +"moment\n" "pour le faire avec :\n" "\n" "git branch <nouvelle-branche> %s\n" "\n" msgstr[1] "" -"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon moment\n" +"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon " +"moment\n" "pour le faire avec :\n" "\n" "git branch <nouvelle-branche> %s\n" @@ -11884,7 +12634,7 @@ msgstr "une seule référence attendue" msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." -#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438 +#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" @@ -11967,7 +12717,8 @@ msgstr "impossible d'utiliser des chemins avec un basculement de branches" msgid "'%s' cannot be used with switching branches" msgstr "'%s' ne peut pas être utilisé avec un basculement de branches" -#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 builtin/checkout.c:1465 builtin/checkout.c:1470 +#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 +#: builtin/checkout.c:1465 builtin/checkout.c:1470 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" @@ -11990,7 +12741,7 @@ msgstr "argument de branche ou de commit manquant" msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323 +#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323 msgid "style" msgstr "style" @@ -12024,7 +12775,8 @@ msgstr "mettre à jour les fichiers ignorés (par défaut)" #: builtin/checkout.c:1549 msgid "do not check if another worktree is holding the given ref" -msgstr "ne pas vérifier si une autre copie de travail contient le référence fournie" +msgstr "" +"ne pas vérifier si une autre copie de travail contient le référence fournie" #: builtin/checkout.c:1562 msgid "checkout our version for unmerged files" @@ -12068,7 +12820,8 @@ msgstr "spécification de chemin invalide" #: builtin/checkout.c:1725 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" -msgstr "'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis" +msgstr "" +"'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis" #: builtin/checkout.c:1729 #, c-format @@ -12079,7 +12832,7 @@ msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'" msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file est incompatible avec --detach" -#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634 +#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file est incompatible avec --patch" @@ -12095,8 +12848,10 @@ msgstr "" msgid "you must specify path(s) to restore" msgstr "vous devez spécifier un ou des chemins à restaurer" -#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 builtin/remote.c:172 -#: builtin/submodule--helper.c:2720 builtin/worktree.c:484 builtin/worktree.c:486 +#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 +#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484 +#: builtin/worktree.c:486 msgid "branch" msgstr "branche" @@ -12114,7 +12869,8 @@ msgstr "créer un reflog pour une nouvelle branche" #: builtin/checkout.c:1791 msgid "second guess 'git checkout <no-such-branch>' (default)" -msgstr "essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)" +msgstr "" +"essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)" #: builtin/checkout.c:1792 msgid "use overlay mode (default)" @@ -12157,8 +12913,10 @@ msgid "use overlay mode" msgstr "utiliser le mode de superposition" #: 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 <motif>] [-x | -X] [--] <chemins>..." +msgid "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." +msgstr "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..." #: builtin/clean.c:33 #, c-format @@ -12185,7 +12943,7 @@ msgstr "Ignorerait le dépôt %s\n" msgid "could not lstat %s\n" msgstr "lstat de %s impossible\n" -#: builtin/clean.c:302 git-add--interactive.perl:593 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12198,7 +12956,7 @@ msgstr "" "foo - sélectionner un élément par un préfixe unique\n" " - (vide) ne rien sélectionner\n" -#: builtin/clean.c:306 git-add--interactive.perl:602 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12219,32 +12977,33 @@ msgstr "" "* - choisir tous les éléments\n" " - (vide) terminer la sélection\n" -#: builtin/clean.c:521 git-add--interactive.perl:568 git-add--interactive.perl:573 +#: builtin/clean.c:519 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Hein (%s) ?\n" -#: builtin/clean.c:661 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "Entrez les motifs à ignorer>> " -#: builtin/clean.c:696 +#: builtin/clean.c:693 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" -#: builtin/clean.c:717 +#: builtin/clean.c:714 msgid "Select items to delete" msgstr "Sélectionner les éléments à supprimer" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:755 #, c-format msgid "Remove %s [y/N]? " msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:789 +#: builtin/clean.c:786 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12262,58 +13021,68 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:825 +#: builtin/clean.c:822 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Supprimerait l'élément suivant :" msgstr[1] "Supprimerait les éléments suivants :" -#: builtin/clean.c:841 +#: builtin/clean.c:838 msgid "No more files to clean, exiting." msgstr "Plus de fichier à nettoyer, sortie." -#: builtin/clean.c:903 +#: builtin/clean.c:900 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" -#: builtin/clean.c:905 +#: builtin/clean.c:902 msgid "force" msgstr "forcer" -#: builtin/clean.c:906 +#: builtin/clean.c:903 msgid "interactive cleaning" msgstr "nettoyage interactif" -#: builtin/clean.c:908 +#: builtin/clean.c:905 msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186 builtin/ls-files.c:650 -#: builtin/name-rev.c:526 builtin/name-rev.c:528 builtin/show-ref.c:179 +#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/show-ref.c:179 msgid "pattern" msgstr "motif" -#: builtin/clean.c:910 +#: builtin/clean.c:907 msgid "add <pattern> to ignore rules" msgstr "ajouter <motif> aux règles ignore" -#: builtin/clean.c:911 +#: builtin/clean.c:908 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" -#: builtin/clean.c:913 +#: builtin/clean.c:910 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" -#: builtin/clean.c:929 -msgid "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to clean" -msgstr "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de nettoyer" +#: builtin/clean.c:925 +msgid "" +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " +"clean" +msgstr "" +"clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " +"nettoyer" -#: builtin/clean.c:932 -msgid "clean.requireForce defaults to true and neither -i, -n, nor -f given; refusing to clean" -msgstr "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de nettoyer" +#: builtin/clean.c:928 +msgid "" +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " +"refusing to clean" +msgstr "" +"clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de " +"nettoyer" -#: builtin/clean.c:944 +#: builtin/clean.c:940 msgid "-x and -X cannot be used together" msgstr "-x et -X ne peuvent pas être utilisés ensemble" @@ -12329,7 +13098,7 @@ msgstr "ne pas cloner un dépôt superficiel" msgid "don't create a checkout" msgstr "ne pas créer d'extraction" -#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542 msgid "create a bare repository" msgstr "créer un dépôt nu" @@ -12361,23 +13130,26 @@ msgstr "initialiser les sous-modules dans le clone" msgid "number of submodules cloned in parallel" msgstr "nombre de sous-modules clonés en parallèle" -#: builtin/clone.c:116 builtin/init-db.c:538 +#: builtin/clone.c:116 builtin/init-db.c:539 msgid "template-directory" msgstr "répertoire-modèle" -#: builtin/clone.c:117 builtin/init-db.c:539 +#: builtin/clone.c:117 builtin/init-db.c:540 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832 builtin/submodule--helper.c:2337 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "dépôt de référence" -#: builtin/clone.c:123 builtin/submodule--helper.c:1834 builtin/submodule--helper.c:2339 +#: builtin/clone.c:123 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" -#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549 builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495 +#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495 #: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 msgid "name" msgstr "nom" @@ -12394,7 +13166,8 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863 builtin/pull.c:208 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862 +#: builtin/pull.c:208 msgid "depth" msgstr "profondeur" @@ -12402,7 +13175,8 @@ msgstr "profondeur" msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804 builtin/pull.c:211 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964 +#: builtin/pull.c:211 msgid "time" msgstr "heure" @@ -12410,31 +13184,36 @@ msgstr "heure" msgid "create a shallow clone since a specific time" msgstr "créer un clone superficiel depuis une date spécifique" -#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318 +#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318 msgid "revision" msgstr "révision" #: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" -msgstr "approfondir l'historique d'un clone superficiel en excluant une révision" +msgstr "" +"approfondir l'historique d'un clone superficiel en excluant une révision" -#: builtin/clone.c:137 builtin/submodule--helper.c:1844 builtin/submodule--helper.c:2353 +#: builtin/clone.c:137 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" #: builtin/clone.c:139 msgid "don't clone any tags, and make later fetches not to follow them" -msgstr "ne pas cloner les tags et indiquer aux récupérations futures de ne pas le faire" +msgstr "" +"ne pas cloner les tags et indiquer aux récupérations futures de ne pas le " +"faire" #: builtin/clone.c:141 msgid "any cloned submodules will be shallow" msgstr "tous les sous-modules clonés seront superficiels" -#: builtin/clone.c:142 builtin/init-db.c:547 +#: builtin/clone.c:142 builtin/init-db.c:548 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:143 builtin/init-db.c:548 +#: builtin/clone.c:143 builtin/init-db.c:549 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" @@ -12446,29 +13225,36 @@ msgstr "clé=valeur" msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196 msgid "server-specific" msgstr "spécifique au serveur" -#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197 msgid "option to transmit" msgstr "option à transmettre" -#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 builtin/push.c:585 +#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 +#: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "n'utiliser que des adresses IPv4" -#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 builtin/push.c:587 +#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 +#: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "n'utiliser que des adresses IPv6" #: builtin/clone.c:154 msgid "any cloned submodules will use their remote-tracking branch" -msgstr "tous les sous-modules clonés utiliseront leur branche de suivi à distance" +msgstr "" +"tous les sous-modules clonés utiliseront leur branche de suivi à distance" #: builtin/clone.c:156 msgid "initialize sparse-checkout file to include only files at root" -msgstr "initialiser le fichier d'extraction clairsemée pour n'inclure que les fichiers à la racine" +msgstr "" +"initialiser le fichier d'extraction clairsemée pour n'inclure que les " +"fichiers à la racine" #: builtin/clone.c:292 msgid "" @@ -12539,7 +13325,9 @@ msgstr "échec lors de l'initialisation l'extraction clairsemée" #: builtin/clone.c:784 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "la HEAD distante réfère à une référence non existante, impossible de l'extraire.\n" +msgstr "" +"la HEAD distante réfère à une référence non existante, impossible de " +"l'extraire.\n" #: builtin/clone.c:816 msgid "unable to checkout working tree" @@ -12557,7 +13345,7 @@ msgstr "impossible de remballer pour nettoyer" msgid "cannot unlink temporary alternates file" msgstr "impossible de délier le fichier temporaire alternates" -#: builtin/clone.c:1001 builtin/receive-pack.c:2491 +#: builtin/clone.c:1001 builtin/receive-pack.c:2490 msgid "Too many arguments." msgstr "Trop d'arguments." @@ -12579,7 +13367,7 @@ msgstr "--bare et --separate-git-dir sont incompatibles." msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:1039 builtin/fetch.c:2011 +#: builtin/clone.c:1039 builtin/fetch.c:2014 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" @@ -12587,7 +13375,8 @@ msgstr "la profondeur %s n'est pas un entier positif" #: builtin/clone.c:1049 #, c-format msgid "destination path '%s' already exists and is not an empty directory." -msgstr "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide." +msgstr "" +"le chemin de destination '%s' existe déjà et n'est pas un répertoire vide." #: builtin/clone.c:1055 #, c-format @@ -12599,7 +13388,8 @@ msgstr "le chemin du dépôt '%s' existe déjà et n'est pas un répertoire vide msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 +#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" @@ -12620,8 +13410,12 @@ msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" #: builtin/clone.c:1135 -msgid "clone --recursive is not compatible with both --reference and --reference-if-able" -msgstr "clone --recursive n'est pas compatible avec à la fois --reference et --reference-if-able" +msgid "" +"clone --recursive is not compatible with both --reference and --reference-if-" +"able" +msgstr "" +"clone --recursive n'est pas compatible avec à la fois --reference et --" +"reference-if-able" #: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705 #, c-format @@ -12630,15 +13424,20 @@ msgstr "'%s' n'est pas un nom valide de distante" #: builtin/clone.c:1229 msgid "--depth is ignored in local clones; use file:// instead." -msgstr "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"." +msgstr "" +"--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"." #: builtin/clone.c:1231 msgid "--shallow-since is ignored in local clones; use file:// instead." -msgstr "--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://\"." +msgstr "" +"--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://" +"\"." #: builtin/clone.c:1233 msgid "--shallow-exclude is ignored in local clones; use file:// instead." -msgstr "--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt \"file://\"." +msgstr "" +"--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt " +"\"file://\"." #: builtin/clone.c:1235 msgid "--filter is ignored in local clones; use file:// instead." @@ -12652,12 +13451,16 @@ msgstr "le dépôt source est superficiel, option --local ignorée" msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:1337 builtin/clone.c:1345 +#: builtin/clone.c:1324 builtin/clone.c:1383 +msgid "remote transport reported error" +msgstr "le transport distant a retourné une erreur" + +#: builtin/clone.c:1336 builtin/clone.c:1344 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s" -#: builtin/clone.c:1348 +#: builtin/clone.c:1347 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -12694,33 +13497,40 @@ msgid "--command must be the first argument" msgstr "--command doit être le premier argument" #: builtin/commit-graph.c:13 builtin/commit-graph.c:22 -msgid "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" -msgstr "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +msgstr "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" #: builtin/commit-graph.c:14 builtin/commit-graph.c:27 msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--[no-]max-new-" -"filters <n>] [--[no-]progress] <split options>" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" msgstr "" -"git commit-graph write [--object-dir <répertoire-d'objet>] [--append] [--split[=<stratégie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--" -"[no-]max-new-filters <n>] [--[no-]progress] <options de division>" +"git commit-graph write [--object-dir <répertoire-d'objet>] [--append] [--" +"split[=<stratégie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <options de division>" #: builtin/commit-graph.c:64 #, c-format msgid "could not find object directory matching %s" msgstr "impossible de trouver le répertoire objet correspondant à %s" -#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776 +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779 msgid "dir" msgstr "répertoire" -#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 builtin/commit-graph.c:317 +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 msgid "the object directory to store the graph" msgstr "le répertoire d'objet où stocker le graphe" #: builtin/commit-graph.c:83 msgid "if the commit-graph is split, only verify the tip file" -msgstr "si le graphe de commit est divisé, vérifier seulement le fichier sommet" +msgstr "" +"si le graphe de commit est divisé, vérifier seulement le fichier sommet" #: builtin/commit-graph.c:106 #, c-format @@ -12756,7 +13566,8 @@ msgstr "commencer le parcours aux commits listés sur stdin" #: builtin/commit-graph.c:219 msgid "include all commits already in the commit-graph file" -msgstr "inclure tous les commits déjà présents dans le fichier de graphe de commits" +msgstr "" +"inclure tous les commits déjà présents dans le fichier de graphe de commits" #: builtin/commit-graph.c:221 msgid "enable computation for changed paths" @@ -12768,7 +13579,8 @@ msgstr "permettre d'écrire un fichier incrémental de graphe de commit" #: builtin/commit-graph.c:228 msgid "maximum number of commits in a non-base split commit-graph" -msgstr "le nombre maximum de commits dans un graphe de commit divisé pas de base" +msgstr "" +"le nombre maximum de commits dans un graphe de commit divisé pas de base" #: builtin/commit-graph.c:230 msgid "maximum ratio between two levels of a split commit-graph" @@ -12791,15 +13603,19 @@ msgid "Collecting commits from input" msgstr "Collecte des commits depuis l'entrée" #: builtin/commit-tree.c:18 -msgid "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F <file>)...] <tree>" -msgstr "git commit-tree [(-p <parent>)...] [-S[<idclé>]] [(-m <message>)...] [(-F <fichier>)...] <arbre>" +msgid "" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " +"<file>)...] <tree>" +msgstr "" +"git commit-tree [(-p <parent>)...] [-S[<idclé>]] [(-m <message>)...] [(-F " +"<fichier>)...] <arbre>" #: builtin/commit-tree.c:31 #, c-format msgid "duplicate parent %s ignored" msgstr "le parent dupliqué %s est ignoré" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562 #, c-format msgid "not a valid object name %s" msgstr "nom d'objet invalide %s" @@ -12827,11 +13643,13 @@ msgstr "parent" msgid "id of a parent commit object" msgstr "id d'un objet commit parent" -#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282 builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605 builtin/tag.c:456 +#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601 +#: builtin/tag.c:456 msgid "message" msgstr "message" -#: builtin/commit-tree.c:115 builtin/commit.c:1614 +#: builtin/commit-tree.c:115 builtin/commit.c:1624 msgid "commit message" msgstr "message de validation" @@ -12839,7 +13657,8 @@ msgstr "message de validation" msgid "read commit log message from file" msgstr "lire le message de validation depuis un fichier" -#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299 builtin/pull.c:176 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "signer la validation avec GPG" @@ -12865,7 +13684,8 @@ msgid "" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -"Vous avez demandé de corriger le commit le plus récent, mais le faire le rendrait\n" +"Vous avez demandé de corriger le commit le plus récent, mais le faire le " +"rendrait\n" "vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n" "supprimer complètement le commit avec \"git reset HEAD^\".\n" @@ -12877,7 +13697,8 @@ msgid "" " git commit --allow-empty\n" "\n" msgstr "" -"Le picorage précédent est à présent vide, vraisemblablement dû à une résolution de conflit.\n" +"Le picorage précédent est à présent vide, vraisemblablement dû à une " +"résolution de conflit.\n" "Si vous souhaitez tout de même le valider, utilisez :\n" "\n" " git commit --allow-empty\n" @@ -12910,7 +13731,7 @@ msgstr "" "pour continuer le picorage des commits restants.\n" "Si vous souhaitez sauter ce commit, utilisez :\n" "\n" -" git cherry-pick --skipped\n" +" git cherry-pick --skip\n" "\n" #: builtin/commit.c:324 @@ -12987,7 +13808,7 @@ msgstr "" "impossible de sélectionner un caractère de commentaire\n" "qui n'est pas utilisé dans le message de validation actuel" -#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158 +#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" @@ -13023,7 +13844,46 @@ msgstr "impossible de lire MERGE_MSG" msgid "could not write commit template" msgstr "impossible d'écrire le modèle de commit" -#: builtin/commit.c:900 +#: builtin/commit.c:893 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored.\n" +msgstr "" +"Veuillez saisir le message de validation pour vos modifications. Les lignes\n" +"commençant par '%c' seront ignorées.\n" + +#: builtin/commit.c:895 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"Veuillez saisir le message de validation pour vos modifications. Les lignes\n" +"commençant par '%c' seront ignorées, et un message vide abandonne la " +"validation.\n" + +#: builtin/commit.c:899 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +msgstr "" +"Veuillez saisir le message de validation pour vos modifications. Les lignes commençant\n" +"par '%c' seront conservées ; vous pouvez les supprimer vous-même si vous le souhaitez.\n" + +#: builtin/commit.c:903 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"Veuillez saisir le message de validation pour vos modifications. Les lignes\n" +"commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n" +"si vous le souhaitez. Un message vide abandonne la validation.\n" + +#: builtin/commit.c:915 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -13037,7 +13897,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "et essayez à nouveau.\n" -#: builtin/commit.c:905 +#: builtin/commit.c:920 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13051,379 +13911,389 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "et essayez à nouveau.\n" -#: builtin/commit.c:915 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be ignored, and an empty message aborts the commit.\n" -msgstr "" -"Veuillez saisir le message de validation pour vos modifications. Les lignes\n" -"commençant par '%c' seront ignorées, et un message vide abandonne la validation.\n" - -#: builtin/commit.c:923 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be kept; you may remove them yourself if you want to.\n" -"An empty message aborts the commit.\n" -msgstr "" -"Veuillez saisir le message de validation pour vos modifications. Les lignes\n" -"commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n" -"si vous le souhaitez. Un message vide abandonne la validation.\n" - -#: builtin/commit.c:940 +#: builtin/commit.c:947 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAuteur : %.*s <%.*s>" -#: builtin/commit.c:948 +#: builtin/commit.c:955 #, c-format msgid "%sDate: %s" msgstr "%sDate : %s" -#: builtin/commit.c:955 +#: builtin/commit.c:962 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sValidateur : %.*s <%.*s>" -#: builtin/commit.c:973 +#: builtin/commit.c:980 msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:1018 +#: builtin/commit.c:1025 msgid "unable to pass trailers to --trailers" msgstr "impossible de passer les lignes finales à --trailers" -#: builtin/commit.c:1058 +#: builtin/commit.c:1065 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:1072 builtin/tag.c:319 +#: builtin/commit.c:1079 builtin/tag.c:319 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" -#: builtin/commit.c:1116 +#: builtin/commit.c:1123 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" -msgstr "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun auteur existant" +msgstr "" +"--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun " +"auteur existant" -#: builtin/commit.c:1130 +#: builtin/commit.c:1137 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Mode de fichier ignoré invalide '%s'" -#: builtin/commit.c:1148 builtin/commit.c:1441 +#: builtin/commit.c:1155 builtin/commit.c:1448 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1188 +#: builtin/commit.c:1195 msgid "--long and -z are incompatible" msgstr "--long et -z sont incompatibles" -#: builtin/commit.c:1219 +#: builtin/commit.c:1226 msgid "You are in the middle of a merge -- cannot reword." msgstr "Vous êtes en pleine fusion -- impossible de reformuler." -#: builtin/commit.c:1221 +#: builtin/commit.c:1228 msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "Vous êtes en plein picorage -- impossible de reformuler." -#: builtin/commit.c:1224 +#: builtin/commit.c:1231 #, c-format msgid "cannot combine reword option of --fixup with path '%s'" msgstr "impossible de combiner l'option reword de --fixup avec le chemin '%s'" -#: builtin/commit.c:1226 -msgid "reword option of --fixup is mutually exclusive with --patch/--interactive/--all/--include/--only" -msgstr "l'option reword de --fixup est mutuellement exclusive avec --patch/--interactive/--all/--include/--only" +#: builtin/commit.c:1233 +msgid "" +"reword option of --fixup is mutually exclusive with --patch/--interactive/--" +"all/--include/--only" +msgstr "" +"l'option reword de --fixup est mutuellement exclusive avec --patch/--" +"interactive/--all/--include/--only" -#: builtin/commit.c:1245 +#: builtin/commit.c:1252 msgid "Using both --reset-author and --author does not make sense" msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens" -#: builtin/commit.c:1254 +#: builtin/commit.c:1261 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." -#: builtin/commit.c:1257 +#: builtin/commit.c:1264 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1259 +#: builtin/commit.c:1266 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)." -#: builtin/commit.c:1261 +#: builtin/commit.c:1268 msgid "You are in the middle of a rebase -- cannot amend." msgstr "Vous êtes en plein rebasage -- impossible de corriger (amend)." -#: builtin/commit.c:1264 +#: builtin/commit.c:1271 msgid "Options --squash and --fixup cannot be used together" msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble" -#: builtin/commit.c:1274 +#: builtin/commit.c:1281 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée." -#: builtin/commit.c:1276 +#: builtin/commit.c:1283 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F." -#: builtin/commit.c:1285 +#: builtin/commit.c:1292 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend." -#: builtin/commit.c:1303 +#: builtin/commit.c:1310 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." -msgstr "Une seule option parmi --include/--only/--all/--interactive/--patch peut être utilisée." +msgstr "" +"Une seule option parmi --include/--only/--all/--interactive/--patch peut " +"être utilisée." -#: builtin/commit.c:1331 +#: builtin/commit.c:1338 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "option inconnue : --fixup=%s:%s" -#: builtin/commit.c:1345 +#: builtin/commit.c:1352 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "des chemins '%s ...' avec l'option -a n'a pas de sens" -#: builtin/commit.c:1476 builtin/commit.c:1642 +#: builtin/commit.c:1483 builtin/commit.c:1652 msgid "show status concisely" msgstr "afficher l'état avec concision" -#: builtin/commit.c:1478 builtin/commit.c:1644 +#: builtin/commit.c:1485 builtin/commit.c:1654 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1480 +#: builtin/commit.c:1487 msgid "show stash information" msgstr "afficher l'information de remisage" -#: builtin/commit.c:1482 builtin/commit.c:1646 +#: builtin/commit.c:1489 builtin/commit.c:1656 msgid "compute full ahead/behind values" msgstr "calcule les valeurs complètes en avance/en retard" -#: builtin/commit.c:1484 +#: builtin/commit.c:1491 msgid "version" msgstr "version" -#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560 builtin/worktree.c:681 +#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551 +#: builtin/worktree.c:690 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1487 builtin/commit.c:1650 +#: builtin/commit.c:1494 builtin/commit.c:1660 msgid "show status in long format (default)" msgstr "afficher l'état en format long (par défaut)" -#: builtin/commit.c:1490 builtin/commit.c:1653 +#: builtin/commit.c:1497 builtin/commit.c:1663 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656 builtin/fast-export.c:1198 builtin/fast-export.c:1201 builtin/fast-export.c:1204 -#: builtin/rebase.c:1407 parse-options.h:337 +#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666 +#: builtin/fast-export.c:1198 builtin/fast-export.c:1201 +#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 msgid "mode" msgstr "mode" -#: builtin/commit.c:1493 builtin/commit.c:1656 +#: builtin/commit.c:1500 builtin/commit.c:1666 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" -msgstr "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, no. (Défaut : all)" +msgstr "" +"afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, " +"no. (Défaut : all)" -#: builtin/commit.c:1497 -msgid "show ignored files, optional modes: traditional, matching, no. (Default: traditional)" -msgstr "afficher les fichiers ignorés, \"mode\" facultatif : traditional (traditionnel), matching (correspondant), no. (Défaut : traditional)" +#: builtin/commit.c:1504 +msgid "" +"show ignored files, optional modes: traditional, matching, no. (Default: " +"traditional)" +msgstr "" +"afficher les fichiers ignorés, \"mode\" facultatif : traditional " +"(traditionnel), matching (correspondant), no. (Défaut : traditional)" -#: builtin/commit.c:1499 parse-options.h:193 +#: builtin/commit.c:1506 parse-options.h:193 msgid "when" msgstr "quand" -#: builtin/commit.c:1500 -msgid "ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)" -msgstr "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all (tous), dirty (sale), untracked (non suivi). (Défaut : all)" +#: builtin/commit.c:1507 +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" +msgstr "" +"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " +"(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1502 +#: builtin/commit.c:1509 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1503 +#: builtin/commit.c:1510 msgid "do not detect renames" msgstr "ne pas détecter les renommages" -#: builtin/commit.c:1505 +#: builtin/commit.c:1512 msgid "detect renames, optionally set similarity index" -msgstr "détecter les renommages, en spécifiant optionnellement le facteur de similarité" +msgstr "" +"détecter les renommages, en spécifiant optionnellement le facteur de " +"similarité" -#: builtin/commit.c:1525 +#: builtin/commit.c:1535 msgid "Unsupported combination of ignored and untracked-files arguments" -msgstr "Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis" +msgstr "" +"Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis" -#: builtin/commit.c:1607 +#: builtin/commit.c:1617 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1608 +#: builtin/commit.c:1618 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1610 +#: builtin/commit.c:1620 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458 +#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "author" msgstr "auteur" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1613 builtin/gc.c:550 +#: builtin/commit.c:1623 builtin/gc.c:550 msgid "date" msgstr "date" -#: builtin/commit.c:1613 +#: builtin/commit.c:1623 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622 parse-options.h:329 ref-filter.h:90 +#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632 +#: parse-options.h:329 ref-filter.h:90 msgid "commit" msgstr "commit" -#: builtin/commit.c:1615 +#: builtin/commit.c:1625 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1616 +#: builtin/commit.c:1626 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c:1621 -#| msgid "amend previous commit" +#: builtin/commit.c:1631 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]commit" -#: builtin/commit.c:1621 -msgid "use autosquash formatted message to fixup or amend/reword specified commit" -msgstr "utiliser un message au format autosquash pour corriger ou reformuler le commit spécifié" +#: builtin/commit.c:1631 +msgid "" +"use autosquash formatted message to fixup or amend/reword specified commit" +msgstr "" +"utiliser un message au format autosquash pour corriger ou reformuler le " +"commit spécifié" -#: builtin/commit.c:1622 +#: builtin/commit.c:1632 msgid "use autosquash formatted message to squash specified commit" -msgstr "utiliser un message au format autosquash pour compresser le commit spécifié" +msgstr "" +"utiliser un message au format autosquash pour compresser le commit spécifié" -#: builtin/commit.c:1623 +#: builtin/commit.c:1633 msgid "the commit is authored by me now (used with -C/-c/--amend)" -msgstr "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)" +msgstr "" +"à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)" -#: builtin/commit.c:1624 builtin/interpret-trailers.c:111 +#: builtin/commit.c:1634 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "ligne de fin" -#: builtin/commit.c:1624 +#: builtin/commit.c:1634 msgid "add custom trailer(s)" msgstr "ajouter des lignes terminales personnaliser" -#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302 builtin/pull.c:145 builtin/revert.c:110 +#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "ajouter une ligne terminale Signed-off-by" -#: builtin/commit.c:1626 +#: builtin/commit.c:1636 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1627 +#: builtin/commit.c:1637 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1629 +#: builtin/commit.c:1639 msgid "include status in commit message template" msgstr "inclure l'état dans le modèle de message de validation" -#: builtin/commit.c:1634 +#: builtin/commit.c:1644 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1635 +#: builtin/commit.c:1645 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1636 +#: builtin/commit.c:1646 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1637 +#: builtin/commit.c:1647 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1638 +#: builtin/commit.c:1648 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1639 +#: builtin/commit.c:1649 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1640 +#: builtin/commit.c:1650 msgid "bypass pre-commit and commit-msg hooks" msgstr "éviter d'utiliser les crochets pre-commit et commit-msg" -#: builtin/commit.c:1641 +#: builtin/commit.c:1651 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1654 +#: builtin/commit.c:1664 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1655 +#: builtin/commit.c:1665 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1662 +#: builtin/commit.c:1672 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1664 +#: builtin/commit.c:1674 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1737 +#: builtin/commit.c:1747 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1744 +#: builtin/commit.c:1754 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1765 +#: builtin/commit.c:1775 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1772 +#: builtin/commit.c:1782 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abandon de la validation dû à un message de validation vide.\n" -#: builtin/commit.c:1777 +#: builtin/commit.c:1787 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abandon de la validation ; vous n'avez pas édité le message\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1798 #, c-format msgid "Aborting commit due to empty commit message body.\n" -msgstr "Abandon de la validation dû à un corps de message de validation vide.\n" +msgstr "" +"Abandon de la validation dû à un corps de message de validation vide.\n" -#: builtin/commit.c:1824 +#: builtin/commit.c:1834 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -13500,7 +14370,8 @@ msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL" #: builtin/config.c:142 msgid "replace all matching variables: name value [value-pattern]" -msgstr "remplacer toutes les variables correspondant : nom valeur [motif-de-valeur]" +msgstr "" +"remplacer toutes les variables correspondant : nom valeur [motif-de-valeur]" #: builtin/config.c:143 msgid "add a new variable: name value" @@ -13528,7 +14399,8 @@ msgstr "afficher tout" #: builtin/config.c:149 msgid "use string equality when comparing values to 'value-pattern'" -msgstr "utiliser l'égalité de chaînes lors de la comparaison de 'motif-de-valeur'" +msgstr "" +"utiliser l'égalité de chaînes lors de la comparaison de 'motif-de-valeur'" #: builtin/config.c:150 msgid "open an editor" @@ -13592,11 +14464,15 @@ msgstr "respecter les directives d'inclusion lors de la recherche" #: builtin/config.c:165 msgid "show origin of config (file, standard input, blob, command line)" -msgstr "afficher l'origine de la configuration (fichier, entrée standard, blob, ligne de commande)" +msgstr "" +"afficher l'origine de la configuration (fichier, entrée standard, blob, " +"ligne de commande)" #: builtin/config.c:166 msgid "show scope of config (worktree, local, global, system, command)" -msgstr "afficher la portée de configuration (arbre de travail, local, global, système, commande)" +msgstr "" +"afficher la portée de configuration (arbre de travail, local, global, " +"système, commande)" #: builtin/config.c:167 builtin/env--helper.c:45 msgid "value" @@ -13690,7 +14566,8 @@ msgid "" msgstr "" "--worktree ne peut pas être utilisé avec des arbres de travail multiples\n" "à moins que l'extension worktreeConfig soit configuré. Veuillez lire\n" -"la section \"CONFIGURATION FILE\" de \"git help worktree\" pour plus de détails" +"la section \"CONFIGURATION FILE\" de \"git help worktree\" pour plus de " +"détails" #: builtin/config.c:743 msgid "--get-color and variable type are incoherent" @@ -13705,8 +14582,12 @@ msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only n'est applicable qu'avec --list ou --get-regexp" #: builtin/config.c:767 -msgid "--show-origin is only applicable to --get, --get-all, --get-regexp, and --list" -msgstr "--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --list" +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "" +"--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --" +"list" #: builtin/config.c:773 msgid "--default is only applicable to --get" @@ -13779,7 +14660,8 @@ msgstr "afficher les messages de debug sur stderr" #: builtin/credential-cache--daemon.c:316 msgid "credential-cache--daemon unavailable; no unix socket support" -msgstr "credential-cache--daemon non disponible ; pas de gestion des sockets unix" +msgstr "" +"credential-cache--daemon non disponible ; pas de gestion des sockets unix" #: builtin/credential-cache.c:154 msgid "credential-cache unavailable; no unix socket support" @@ -13828,7 +14710,9 @@ msgstr "aucune étiquette ne correspond parfaitement à '%s'" #: builtin/describe.c:330 #, c-format msgid "No exact match on refs or tags, searching to describe\n" -msgstr "Pas de correspondance exacte sur des réfs ou des étiquettes, recherche par describe\n" +msgstr "" +"Pas de correspondance exacte sur des réfs ou des étiquettes, recherche par " +"describe\n" #: builtin/describe.c:397 #, c-format @@ -13864,7 +14748,8 @@ msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -"plus de %i étiquettes ont été trouvées; seules les %i plus récentes sont affichées\n" +"plus de %i étiquettes ont été trouvées; seules les %i plus récentes sont " +"affichées\n" "abandon de la recherche à %s\n" #: builtin/describe.c:529 @@ -13912,7 +14797,8 @@ msgstr "n'afficher que les correspondances exactes" #: builtin/describe.c:564 msgid "consider <n> most recent tags (default: 10)" -msgstr "considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)" +msgstr "" +"considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)" #: builtin/describe.c:566 msgid "only consider tags matching <pattern>" @@ -13936,7 +14822,8 @@ msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")" #: builtin/describe.c:575 msgid "append <mark> on broken working tree (default: \"-broken\")" -msgstr "ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")" +msgstr "" +"ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")" #: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" @@ -14051,63 +14938,67 @@ msgstr "des fichiers temporaires existent dans '%s'." msgid "you may want to cleanup or recover these." msgstr "vous pourriez souhaiter les nettoyer ou les récupérer." -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "utiliser `diff.guitool` au lieu de `diff.tool`" -#: builtin/difftool.c:702 +#: builtin/difftool.c:701 msgid "perform a full-directory diff" msgstr "réalise un diff de répertoire complet" -#: builtin/difftool.c:704 +#: builtin/difftool.c:703 msgid "do not prompt before launching a diff tool" msgstr "ne pas confirmer avant de lancer l'outil de diff" -#: builtin/difftool.c:709 +#: builtin/difftool.c:708 msgid "use symlinks in dir-diff mode" msgstr "utiliser les liens symboliques en mode de diff de répertoire" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "tool" msgstr "outil" -#: builtin/difftool.c:711 +#: builtin/difftool.c:710 msgid "use the specified diff tool" msgstr "utiliser l'outil de diff spécifié" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "print a list of diff tools that may be used with `--tool`" msgstr "afficher une liste des outils de diff utilisables avec `--tool`" -#: builtin/difftool.c:716 -msgid "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit code" -msgstr "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code non-nul" +#: builtin/difftool.c:715 +msgid "" +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " +"code" +msgstr "" +"provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code " +"non-nul" -#: builtin/difftool.c:719 +#: builtin/difftool.c:718 msgid "specify a custom command for viewing diffs" msgstr "spécifier une commande personnalisée pour visualiser les différences" -#: builtin/difftool.c:720 +#: builtin/difftool.c:719 msgid "passed to `diff`" msgstr "passé à `diff`" -#: builtin/difftool.c:735 +#: builtin/difftool.c:734 msgid "difftool requires worktree or --no-index" msgstr "difftool exige un arbre de travail ou --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff est incompatible avec --no-index" -#: builtin/difftool.c:745 +#: builtin/difftool.c:744 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs" -#: builtin/difftool.c:753 +#: builtin/difftool.c:752 msgid "no <tool> given for --tool=<tool>" msgstr "pas d'<outil> spécifié pour --tool=<outil>" -#: builtin/difftool.c:760 +#: builtin/difftool.c:759 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "pas de <commande> spécifié pour --extcmd=<commande>" @@ -14125,17 +15016,24 @@ msgstr "valeur par défaut pour git_env_*(...) en cas d'absence" #: builtin/env--helper.c:48 msgid "be quiet only use git_env_*() value as exit code" -msgstr "mode silencieux n'utilisant la valeur de git_env_*() que pour le code de sortie" +msgstr "" +"mode silencieux n'utilisant la valeur de git_env_*() que pour le code de " +"sortie" #: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "l'option `--default` attend une valeur booléenne avec `--type=bool`, pas `%s`" +msgstr "" +"l'option `--default` attend une valeur booléenne avec `--type=bool`, pas `%s`" #: builtin/env--helper.c:82 #, c-format -msgid "option `--default' expects an unsigned long value with `--type=ulong`, not `%s`" -msgstr "l'option `--default` attend une valeur entier long non signé avec `--type=ulong`, pas `%s`" +msgid "" +"option `--default' expects an unsigned long value with `--type=ulong`, not `" +"%s`" +msgstr "" +"l'option `--default` attend une valeur entier long non signé avec `--" +"type=ulong`, pas `%s`" #: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" @@ -14143,7 +15041,9 @@ msgstr "git fast-export [options-de-liste-de-révisions]" #: builtin/fast-export.c:868 msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "Erreur : impossible d'exporter des étiquettes imbriquées à moins que --mark-tags ne soit spécifié." +msgstr "" +"Erreur : impossible d'exporter des étiquettes imbriquées à moins que --mark-" +"tags ne soit spécifié." #: builtin/fast-export.c:1177 msgid "--anonymize-map token cannot be empty" @@ -14159,11 +15059,14 @@ msgstr "sélectionner la gestion des étiquettes signées" #: builtin/fast-export.c:1202 msgid "select handling of tags that tag filtered objects" -msgstr "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés" +msgstr "" +"sélectionner la gestion des étiquettes qui pointent sur des objets filtrés" #: builtin/fast-export.c:1205 msgid "select handling of commit messages in an alternate encoding" -msgstr "sélectionner la gestion des messages de validation dans un encodage alternatif" +msgstr "" +"sélectionner la gestion des messages de validation dans un encodage " +"alternatif" #: builtin/fast-export.c:1208 msgid "dump marks to this file" @@ -14193,7 +15096,7 @@ msgstr "utiliser la fonction \"done\" pour terminer le flux" msgid "skip output of blob data" msgstr "sauter l'affichage de données de blob" -#: builtin/fast-export.c:1222 builtin/log.c:1823 +#: builtin/fast-export.c:1222 builtin/log.c:1826 msgid "refspec" msgstr "spécificateur de référence" @@ -14215,7 +15118,9 @@ msgstr "convertit <depuis> en <vers> dans la sortie anonymisée" #: builtin/fast-export.c:1229 msgid "reference parents which are not in fast-export stream by object id" -msgstr "référencer les parents qui ne sont pas dans le flux d'export rapide par id d'objet" +msgstr "" +"référencer les parents qui ne sont pas dans le flux d'export rapide par id " +"d'objet" #: builtin/fast-export.c:1231 msgid "show original object ids of blobs/commits" @@ -14231,7 +15136,8 @@ msgstr "--anonymize-map n'a aucune signification sans --anonymize" #: builtin/fast-export.c:1271 msgid "Cannot pass both --import-marks and --import-marks-if-exists" -msgstr "Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists" +msgstr "" +"Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists" #: builtin/fast-import.c:3088 #, c-format @@ -14255,12 +15161,15 @@ msgstr "Commande 'to' attendue, %s trouvé" #: builtin/fast-import.c:3322 msgid "Expected format name:filename for submodule rewrite option" -msgstr "Format attendu nom:<nom de fichier> pour l'option de réécriture de sous-module" +msgstr "" +"Format attendu nom:<nom de fichier> pour l'option de réécriture de sous-" +"module" #: builtin/fast-import.c:3377 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "la fonctionnalité '%s' est interdite en entrée sans --allow-unsafe-features" +msgstr "" +"la fonctionnalité '%s' est interdite en entrée sans --allow-unsafe-features" #: builtin/fetch-pack.c:242 #, c-format @@ -14329,15 +15238,21 @@ msgstr "nombre de sous-modules récupérés en parallèle" #: builtin/fetch.c:164 msgid "modify the refspec to place all refs within refs/prefetch/" -msgstr "modifier le spécificateur de référence pour placer les références dans refs/prefetch/" +msgstr "" +"modifier le spécificateur de référence pour placer les références dans refs/" +"prefetch/" #: builtin/fetch.c:166 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" -msgstr "éliminer les branches de suivi distant si la branche n'existe plus dans le dépôt distant" +msgstr "" +"éliminer les branches de suivi distant si la branche n'existe plus dans le " +"dépôt distant" #: builtin/fetch.c:168 msgid "prune local tags no longer on remote and clobber changed tags" -msgstr "éliminer les étiquettes locales qui ont disparu du dépôt distant et qui encombrent les étiquettes modifiées" +msgstr "" +"éliminer les étiquettes locales qui ont disparu du dépôt distant et qui " +"encombrent les étiquettes modifiées" #: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122 msgid "on-demand" @@ -14359,7 +15274,8 @@ msgstr "conserver le paquet téléchargé" msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209 builtin/pull.c:218 +#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" @@ -14376,8 +15292,12 @@ msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" #: builtin/fetch.c:195 -msgid "default for recursive fetching of submodules (lower priority than config files)" -msgstr "par défaut pour la récupération récursive de sous-modules (priorité plus basse que les fichiers de config)" +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +msgstr "" +"par défaut pour la récupération récursive de sous-modules (priorité plus " +"basse que les fichiers de config)" #: builtin/fetch.c:199 builtin/pull.c:224 msgid "accept refs that update .git/shallow" @@ -14397,7 +15317,9 @@ msgstr "rapporte que nous n'avons que des objets joignables depuis cet objet" #: builtin/fetch.c:210 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" -msgstr "ne pas récupérer le fichier paquet ; à la place, afficher les ancêtres des sommets de négociation" +msgstr "" +"ne pas récupérer le fichier paquet ; à la place, afficher les ancêtres des " +"sommets de négociation" #: builtin/fetch.c:213 builtin/fetch.c:215 msgid "run 'maintenance --auto' after fetching" @@ -14405,7 +15327,7 @@ msgstr "lancer 'maintenance --auto' après la récupération" #: builtin/fetch.c:217 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" -msgstr "vérifier les mises à jour forcées sur toutes les branches mises à jour" +msgstr "vérifier les mises à jour forcées (forced-updates) sur toutes les branches mises à jour" #: builtin/fetch.c:219 msgid "write the commit-graph after fetching" @@ -14422,7 +15344,8 @@ msgstr "impossible de trouver la référence HEAD distante" #: builtin/fetch.c:757 #, c-format msgid "configuration fetch.output contains invalid value %s" -msgstr "le paramètre de configuration fetch.output contient une valeur invalide %s" +msgstr "" +"le paramètre de configuration fetch.output contient une valeur invalide %s" #: builtin/fetch.c:856 #, c-format @@ -14445,7 +15368,8 @@ msgstr "impossible de récupérer dans la branche actuelle" msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944 builtin/fetch.c:956 +#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944 +#: builtin/fetch.c:956 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" @@ -14481,17 +15405,18 @@ msgid "" msgstr "" "Fetch indique normalement quelles branches ont subi une mise à jour forcée,\n" "mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n" -"'--show-forced-update' ou lancez 'git config fetch.showForcedUpdates true'." +"'--show-forced-updates' ou lancez 'git config fetch.showForcedUpdates true'." #: builtin/fetch.c:1069 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" -"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n" +"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " +"false'\n" " to avoid this check.\n" msgstr "" "%.2f secondes ont été nécessaires pour vérifier les mises à jour forcées.\n" -"Vous pouvez utiliser '--no-show-forced-update' ou lancer\n" +"Vous pouvez utiliser '--no-show-forced-updates' ou lancer\n" "'git config fetch.showForcedUpdates false' pour éviter ceci.\n" #: builtin/fetch.c:1101 @@ -14501,8 +15426,8 @@ msgstr "%s n'a pas envoyé tous les objets nécessaires\n" #: builtin/fetch.c:1129 #, c-format -msgid "reject %s because shallow roots are not allowed to be updated" -msgstr "%s rejeté parce que les racines superficielles ne sont pas mises à jour" +msgid "rejected %s because shallow roots are not allowed to be updated" +msgstr "%s rejeté parce que les mises à jour de racines superficielles ne sont pas permises" #: builtin/fetch.c:1206 builtin/fetch.c:1357 #, c-format @@ -14602,62 +15527,74 @@ msgstr "" msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1995 +#: builtin/fetch.c:1994 +msgid "--negotiate-only needs one or more --negotiate-tip=*" +msgstr "--negotiate-only nécessite au moins un --negotiate-tip=*" + +#: builtin/fetch.c:1998 msgid "Negative depth in --deepen is not supported" msgstr "Une profondeur négative dans --deepen n'est pas supportée" -#: builtin/fetch.c:1997 +#: builtin/fetch.c:2000 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen et --depth sont mutuellement exclusifs" -#: builtin/fetch.c:2002 +#: builtin/fetch.c:2005 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:2004 +#: builtin/fetch.c:2007 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow sur un dépôt complet n'a pas de sens" -#: builtin/fetch.c:2021 +#: builtin/fetch.c:2024 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:2023 +#: builtin/fetch.c:2026 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all n'a pas de sens avec des spécifications de référence" -#: builtin/fetch.c:2032 +#: builtin/fetch.c:2035 #, c-format msgid "No such remote or remote group: %s" msgstr "Distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:2039 +#: builtin/fetch.c:2042 msgid "Fetching a group and specifying refspecs does not make sense" -msgstr "La récupération d'un groupe et les spécifications de référence n'ont pas de sens" +msgstr "" +"La récupération d'un groupe et les spécifications de référence n'ont pas de " +"sens" -#: builtin/fetch.c:2055 +#: builtin/fetch.c:2058 msgid "must supply remote when using --negotiate-only" msgstr "le distant doit être fourni lors de l'utilisation de --negotiate-only" -#: builtin/fetch.c:2060 +#: builtin/fetch.c:2063 msgid "Protocol does not support --negotiate-only, exiting." msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon." -#: builtin/fetch.c:2079 -msgid "--filter can only be used with the remote configured in extensions.partialclone" -msgstr "--filter ne peut être utilisé qu'avec le dépôt distant configuré dans extensions.partialclone" +#: builtin/fetch.c:2082 +msgid "" +"--filter can only be used with the remote configured in extensions." +"partialclone" +msgstr "" +"--filter ne peut être utilisé qu'avec le dépôt distant configuré dans " +"extensions.partialclone" -#: builtin/fetch.c:2083 +#: builtin/fetch.c:2086 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic ne peut être utilisée qu'en récupérant depuis un seul distant" -#: builtin/fetch.c:2087 +#: builtin/fetch.c:2090 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin ne peut être utilisée qu'en récupérant depuis un seul distant" #: 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 <message>] [--log[=<n>] | --no-log] [--file <fichier>]" +msgid "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" +msgstr "" +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]" #: builtin/fmt-merge-msg.c:18 msgid "populate log with at most <n> entries from shortlog" @@ -14755,7 +15692,7 @@ msgstr "clé de config qui stocke la liste des chemins de dépôts" msgid "missing --config=<config>" msgstr "--config=<config> manquant" -#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128 +#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129 msgid "unknown" msgstr "inconnu" @@ -14771,16 +15708,16 @@ msgstr "erreur dans l'objet %s %s : %s" msgid "warning in %s %s: %s" msgstr "avertissement dans l'objet %s %s : %s" -#: builtin/fsck.c:123 builtin/fsck.c:126 +#: builtin/fsck.c:124 builtin/fsck.c:127 #, c-format msgid "broken link from %7s %s" msgstr "lien cassé dans l'objet %7s %s" -#: builtin/fsck.c:135 +#: builtin/fsck.c:136 msgid "wrong object type in link" msgstr "type d'objet inconnu dans le lien" -#: builtin/fsck.c:151 +#: builtin/fsck.c:152 #, c-format msgid "" "broken link from %7s %s\n" @@ -14789,212 +15726,212 @@ msgstr "" "lien cassé depuis %7s %s\n" " vers %7s %s" -#: builtin/fsck.c:263 +#: builtin/fsck.c:264 #, c-format msgid "missing %s %s" msgstr "objet %s manquant %s" -#: builtin/fsck.c:290 +#: builtin/fsck.c:291 #, c-format msgid "unreachable %s %s" msgstr "objet %s inatteignable %s" -#: builtin/fsck.c:310 +#: builtin/fsck.c:311 #, c-format msgid "dangling %s %s" msgstr "objet %s fantôme %s" -#: builtin/fsck.c:320 +#: builtin/fsck.c:321 msgid "could not create lost-found" msgstr "impossible de créer le fichier lost-found" -#: builtin/fsck.c:331 +#: builtin/fsck.c:332 #, c-format msgid "could not finish '%s'" msgstr "impossible de finir '%s'" -#: builtin/fsck.c:348 +#: builtin/fsck.c:349 #, c-format msgid "Checking %s" msgstr "Vérification de l'objet %s" -#: builtin/fsck.c:386 +#: builtin/fsck.c:387 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Vérification de la connectivité (%d objets)" -#: builtin/fsck.c:405 +#: builtin/fsck.c:406 #, c-format msgid "Checking %s %s" msgstr "Vérification de l'objet %s %s" -#: builtin/fsck.c:410 +#: builtin/fsck.c:411 msgid "broken links" msgstr "liens cassés" -#: builtin/fsck.c:419 +#: builtin/fsck.c:420 #, c-format msgid "root %s" msgstr "racine %s" -#: builtin/fsck.c:427 +#: builtin/fsck.c:428 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "étiquetage de l'objet %s %s (%s) dans %s" -#: builtin/fsck.c:456 +#: builtin/fsck.c:457 #, c-format msgid "%s: object corrupt or missing" msgstr "%s : objet corrompu ou manquant" -#: builtin/fsck.c:481 +#: builtin/fsck.c:482 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s : entrée %s de journal de références invalide" -#: builtin/fsck.c:495 +#: builtin/fsck.c:496 #, c-format msgid "Checking reflog %s->%s" msgstr "Vérification du journal de réferences %s-> %s" -#: builtin/fsck.c:529 +#: builtin/fsck.c:530 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s : pointeur de sha1 invalide %s" -#: builtin/fsck.c:536 +#: builtin/fsck.c:537 #, c-format msgid "%s: not a commit" msgstr "l'objet %s n'est pas un commit" -#: builtin/fsck.c:590 +#: builtin/fsck.c:591 msgid "notice: No default references" msgstr "note : pas de référence par défaut" -#: builtin/fsck.c:605 +#: builtin/fsck.c:606 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s : objet corrompu ou manquant : %s" -#: builtin/fsck.c:618 +#: builtin/fsck.c:619 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s : impossible d'analyser : %s" -#: builtin/fsck.c:638 +#: builtin/fsck.c:639 #, c-format msgid "bad sha1 file: %s" msgstr "mauvais fichier de sha1 : %s" -#: builtin/fsck.c:653 +#: builtin/fsck.c:654 msgid "Checking object directory" msgstr "Vérification du répertoire d'objet" -#: builtin/fsck.c:656 +#: builtin/fsck.c:657 msgid "Checking object directories" msgstr "Vérification des répertoires d'objet" -#: builtin/fsck.c:671 +#: builtin/fsck.c:672 #, c-format msgid "Checking %s link" msgstr "Vérification du lien %s" -#: builtin/fsck.c:676 builtin/index-pack.c:866 +#: builtin/fsck.c:677 builtin/index-pack.c:864 #, c-format msgid "invalid %s" msgstr "%s invalide" -#: builtin/fsck.c:683 +#: builtin/fsck.c:684 #, c-format msgid "%s points to something strange (%s)" msgstr "%s pointe sur quelque chose bizarre (%s)" -#: builtin/fsck.c:689 +#: builtin/fsck.c:690 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s : la HEAD détachée ne pointe sur rien" -#: builtin/fsck.c:693 +#: builtin/fsck.c:694 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "note : %s pointe sur une branche non-née (%s)" -#: builtin/fsck.c:705 +#: builtin/fsck.c:706 msgid "Checking cache tree" msgstr "Vérification de l'arbre cache" -#: builtin/fsck.c:710 +#: builtin/fsck.c:711 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s : pointer sha1 invalide dans l'arbre de cache" -#: builtin/fsck.c:719 +#: builtin/fsck.c:720 msgid "non-tree in cache-tree" msgstr "non-arbre dans l'arbre de cache" -#: builtin/fsck.c:750 +#: builtin/fsck.c:751 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<options>] [<objet>...]" -#: builtin/fsck.c:756 +#: builtin/fsck.c:757 msgid "show unreachable objects" msgstr "afficher les objets inaccessibles" -#: builtin/fsck.c:757 +#: builtin/fsck.c:758 msgid "show dangling objects" msgstr "afficher les objets en suspens" -#: builtin/fsck.c:758 +#: builtin/fsck.c:759 msgid "report tags" msgstr "afficher les étiquettes" -#: builtin/fsck.c:759 +#: builtin/fsck.c:760 msgid "report root nodes" msgstr "signaler les nœuds racines" -#: builtin/fsck.c:760 +#: builtin/fsck.c:761 msgid "make index objects head nodes" msgstr "considérer les objets de l'index comme nœuds tête" # translated from man page -#: builtin/fsck.c:761 +#: builtin/fsck.c:762 msgid "make reflogs head nodes (default)" msgstr "considérer les reflogs comme nœuds tête (par défaut)" -#: builtin/fsck.c:762 +#: builtin/fsck.c:763 msgid "also consider packs and alternate objects" msgstr "inspecter aussi les objets pack et alternatifs" -#: builtin/fsck.c:763 +#: builtin/fsck.c:764 msgid "check only connectivity" msgstr "ne vérifier que la connectivité" -#: builtin/fsck.c:764 builtin/mktag.c:75 +#: builtin/fsck.c:765 builtin/mktag.c:75 msgid "enable more strict checking" msgstr "activer une vérification plus strict" -#: builtin/fsck.c:766 +#: builtin/fsck.c:767 msgid "write dangling objects in .git/lost-found" msgstr "écrire les objets en suspens dans .git/lost-found" -#: builtin/fsck.c:767 builtin/prune.c:134 +#: builtin/fsck.c:768 builtin/prune.c:134 msgid "show progress" msgstr "afficher la progression" -#: builtin/fsck.c:768 +#: builtin/fsck.c:769 msgid "show verbose names for reachable objects" msgstr "afficher les noms étendus pour les objets inaccessibles" -#: builtin/fsck.c:827 builtin/index-pack.c:262 +#: builtin/fsck.c:828 builtin/index-pack.c:262 msgid "Checking objects" msgstr "Vérification des objets" -#: builtin/fsck.c:855 +#: builtin/fsck.c:856 #, c-format msgid "%s: object missing" msgstr "%s : objet manquant" -#: builtin/fsck.c:866 +#: builtin/fsck.c:867 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé" @@ -15034,7 +15971,8 @@ msgid "" msgstr "" "Le dernier lancement de gc a rapporté l'erreur suivante. Veuillez corriger\n" "la cause et supprimer %s.\n" -"Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit supprimé.\n" +"Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit " +"supprimé.\n" "\n" "%s" @@ -15052,7 +15990,9 @@ msgstr "activer le mode auto-gc" #: builtin/gc.c:557 msgid "force running gc even if there may be another gc running" -msgstr "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes tourne déjà" +msgstr "" +"forcer le lancement du ramasse-miettes même si un autre ramasse-miettes " +"tourne déjà" #: builtin/gc.c:560 msgid "repack all other packs except the largest pack" @@ -15071,7 +16011,9 @@ msgstr "impossible d'analyser la valeur d'expiration d'élagage %s" #: builtin/gc.c:607 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" -msgstr "Compression automatique du dépôt en tâche de fond pour optimiser les performances.\n" +msgstr "" +"Compression automatique du dépôt en tâche de fond pour optimiser les " +"performances.\n" #: builtin/gc.c:609 #, c-format @@ -15085,20 +16027,28 @@ msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n" #: builtin/gc.c:650 #, c-format -msgid "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" -msgstr "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> (utilisez --force si ce n'est pas le cas)" +msgid "" +"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" +msgstr "" +"un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> " +"(utilisez --force si ce n'est pas le cas)" #: builtin/gc.c:705 -msgid "There are too many unreachable loose objects; run 'git prune' to remove them." -msgstr "Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les supprimer." +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" +"Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les " +"supprimer." #: builtin/gc.c:715 -msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" -msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<tâche>] [--schedule]" +msgid "" +"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" +msgstr "" +"git maintenance run [--auto] [--[no-]quiet] [--task=<tâche>] [--schedule]" #: builtin/gc.c:745 msgid "--no-schedule is not allowed" -msgstr "--schedule n'est pas accepté" +msgstr "--no-schedule n'est pas accepté" #: builtin/gc.c:750 #, c-format @@ -15134,8 +16084,10 @@ msgid "'git multi-pack-index repack' failed" msgstr "échec de 'git multi-pack-index repack'" #: builtin/gc.c:1179 -msgid "skipping incremental-repack task because core.multiPackIndex is disabled" -msgstr "tâche incremental-repack ignorée parce que core.multiPackIndex est désactivé" +msgid "" +"skipping incremental-repack task because core.multiPackIndex is disabled" +msgstr "" +"tâche incremental-repack ignorée parce que core.multiPackIndex est désactivé" #: builtin/gc.c:1283 #, c-format @@ -15218,11 +16170,15 @@ msgstr "échec du démarrage de schtasks" #: builtin/gc.c:1879 msgid "failed to run 'crontab -l'; your system might not support 'cron'" -msgstr "echec du lancement de 'crontab -l' ; votre système n'a pas l'air de fournir 'cron'" +msgstr "" +"echec du lancement de 'crontab -l' ; votre système n'a pas l'air de fournir " +"'cron'" #: builtin/gc.c:1896 msgid "failed to run 'crontab'; your system might not support 'cron'" -msgstr "echec du lancement de 'crontab' ; votre système n'a pas l'air de fournir 'cron'" +msgstr "" +"echec du lancement de 'crontab' ; votre système n'a pas l'air de fournir " +"'cron'" #: builtin/gc.c:1900 msgid "failed to open stdin of 'crontab'" @@ -15234,7 +16190,9 @@ msgstr "'crontab' est mort" #: builtin/gc.c:1976 msgid "another process is scheduling background maintenance" -msgstr "un autre processus est en train de programmer une maintenance en tâche de fond" +msgstr "" +"un autre processus est en train de programmer une maintenance en tâche de " +"fond" #: builtin/gc.c:2000 msgid "failed to add repo to global config" @@ -15267,7 +16225,8 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793 builtin/pack-objects.c:2969 +#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791 +#: builtin/pack-objects.c:3129 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" @@ -15282,248 +16241,260 @@ msgstr "impossible de lire l'arbre (%s)" msgid "unable to grep from object of type %s" msgstr "impossible de faire un grep sur un objet de type %s" -#: builtin/grep.c:739 +#: builtin/grep.c:738 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend une valeur numérique" -#: builtin/grep.c:838 +#: builtin/grep.c:837 msgid "search in index instead of in the work tree" msgstr "rechercher dans l'index plutôt que dans la copie de travail" -#: builtin/grep.c:840 +#: builtin/grep.c:839 msgid "find in contents not managed by git" msgstr "rechercher dans les contenus non gérés par git" -#: builtin/grep.c:842 +#: builtin/grep.c:841 msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" -#: builtin/grep.c:844 +#: builtin/grep.c:843 msgid "ignore files specified via '.gitignore'" msgstr "ignorer les fichiers spécifiés via '.gitignore'" -#: builtin/grep.c:846 +#: builtin/grep.c:845 msgid "recursively search in each submodule" msgstr "rechercher récursivement dans chaque sous-module" -#: builtin/grep.c:849 +#: builtin/grep.c:848 msgid "show non-matching lines" msgstr "afficher les lignes qui ne correspondent pas" -#: builtin/grep.c:851 +#: builtin/grep.c:850 msgid "case insensitive matching" msgstr "correspondance insensible à la casse" -#: builtin/grep.c:853 +#: builtin/grep.c:852 msgid "match patterns only at word boundaries" msgstr "rechercher les motifs aux séparateurs de mots" -#: builtin/grep.c:855 +#: builtin/grep.c:854 msgid "process binary files as text" msgstr "traiter les fichiers binaires comme texte" -#: builtin/grep.c:857 +#: builtin/grep.c:856 msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" -#: builtin/grep.c:860 +#: builtin/grep.c:859 msgid "process binary files with textconv filters" msgstr "traiter les fichiers binaires avec les filtres textconv" -#: builtin/grep.c:862 +#: builtin/grep.c:861 msgid "search in subdirectories (default)" msgstr "rechercher dans les sous-répertoires (défaut)" -#: builtin/grep.c:864 +#: builtin/grep.c:863 msgid "descend at most <depth> levels" msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:868 +#: builtin/grep.c:867 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions régulières étendues POSIX" -#: builtin/grep.c:871 +#: builtin/grep.c:870 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions régulières basiques POSIX (par défaut)" -#: builtin/grep.c:874 +#: builtin/grep.c:873 msgid "interpret patterns as fixed strings" msgstr "interpréter les motifs comme de chaînes fixes" -#: builtin/grep.c:877 +#: builtin/grep.c:876 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions régulières compatibles avec Perl" -#: builtin/grep.c:880 +#: builtin/grep.c:879 msgid "show line numbers" msgstr "afficher les numéros de ligne" -#: builtin/grep.c:881 +#: builtin/grep.c:880 msgid "show column number of first match" msgstr "afficher le numéro de colonne de la première correspondance" -#: builtin/grep.c:882 +#: builtin/grep.c:881 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:883 +#: builtin/grep.c:882 msgid "show filenames" msgstr "afficher les noms de fichier" -#: builtin/grep.c:885 +#: builtin/grep.c:884 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au répertoire de base" -#: builtin/grep.c:887 +#: builtin/grep.c:886 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:889 +#: builtin/grep.c:888 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:892 +#: builtin/grep.c:891 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:894 +#: builtin/grep.c:893 msgid "print NUL after filenames" msgstr "imprimer une caractère NUL après le noms de fichier" -#: builtin/grep.c:897 +#: builtin/grep.c:896 msgid "show only matching parts of a line" msgstr "n'afficher que les parties correspondantes d'une ligne" -#: builtin/grep.c:899 +#: builtin/grep.c:898 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:900 +#: builtin/grep.c:899 msgid "highlight matches" msgstr "mettre en évidence les correspondances" -#: builtin/grep.c:902 +#: builtin/grep.c:901 msgid "print empty line between matches from different files" -msgstr "imprimer une ligne vide entre les correspondances de fichiers différents" +msgstr "" +"imprimer une ligne vide entre les correspondances de fichiers différents" -#: builtin/grep.c:904 +#: builtin/grep.c:903 msgid "show filename only once above matches from same file" -msgstr "afficher le nom de fichier une fois au dessus des correspondances du même fichier" +msgstr "" +"afficher le nom de fichier une fois au dessus des correspondances du même " +"fichier" -#: builtin/grep.c:907 +#: builtin/grep.c:906 msgid "show <n> context lines before and after matches" msgstr "afficher <n> lignes de contexte avant et après les correspondances" -#: builtin/grep.c:910 +#: builtin/grep.c:909 msgid "show <n> context lines before matches" msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:912 +#: builtin/grep.c:911 msgid "show <n> context lines after matches" msgstr "afficher <n> lignes de contexte après les correspondances" -#: builtin/grep.c:914 +#: builtin/grep.c:913 msgid "use <n> worker threads" msgstr "utiliser <n> fils de travail" -#: builtin/grep.c:915 +#: builtin/grep.c:914 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" -#: builtin/grep.c:918 +#: builtin/grep.c:917 msgid "show a line with the function name before matches" -msgstr "afficher une ligne avec le nom de la fonction avant les correspondances" +msgstr "" +"afficher une ligne avec le nom de la fonction avant les correspondances" -#: builtin/grep.c:920 +#: builtin/grep.c:919 msgid "show the surrounding function" msgstr "afficher la fonction contenante" -#: builtin/grep.c:923 +#: builtin/grep.c:922 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:925 +#: builtin/grep.c:924 msgid "match <pattern>" msgstr "rechercher <motif>" -#: builtin/grep.c:927 +#: builtin/grep.c:926 msgid "combine patterns specified with -e" msgstr "combiner les motifs spécifiés par -e" -#: builtin/grep.c:939 +#: builtin/grep.c:938 msgid "indicate hit with exit status without output" -msgstr "indiquer des correspondances avec le code de sortie mais sans rien afficher" +msgstr "" +"indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:941 +#: builtin/grep.c:940 msgid "show only matches from files that match all patterns" -msgstr "n'afficher que les correspondances de fichiers qui correspondent à tous les motifs" +msgstr "" +"n'afficher que les correspondances de fichiers qui correspondent à tous les " +"motifs" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "pager" msgstr "pagineur" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:948 +#: builtin/grep.c:947 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" -#: builtin/grep.c:1014 +#: builtin/grep.c:1013 msgid "no pattern given" msgstr "aucun motif fourni" -#: builtin/grep.c:1050 +#: builtin/grep.c:1049 msgid "--no-index or --untracked cannot be used with revs" -msgstr "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions" +msgstr "" +"--no-index ou --untracked ne peuvent pas être utilisés avec des révisions" -#: builtin/grep.c:1058 +#: builtin/grep.c:1057 #, c-format msgid "unable to resolve revision: %s" msgstr "impossible de résoudre la révision : %s" -#: builtin/grep.c:1088 +#: builtin/grep.c:1087 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked non supportée avec --recurse-submodules" -#: builtin/grep.c:1092 +#: builtin/grep.c:1091 msgid "invalid option combination, ignoring --threads" msgstr "option de combinaison invalide, ignore --threads" -#: builtin/grep.c:1095 builtin/pack-objects.c:3930 +#: builtin/grep.c:1094 builtin/pack-objects.c:4090 msgid "no threads support, ignoring --threads" msgstr "pas de support des fils, ignore --threads" -#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966 +#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/grep.c:1132 +#: builtin/grep.c:1131 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail" -#: builtin/grep.c:1158 +#: builtin/grep.c:1157 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index" -#: builtin/grep.c:1161 +#: builtin/grep.c:1160 msgid "--untracked cannot be used with --cached" msgstr "--untracked ne peut pas être utilisé avec --cached" -#: builtin/grep.c:1167 +#: builtin/grep.c:1166 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi" -#: builtin/grep.c:1175 +#: builtin/grep.c:1174 msgid "both --cached and trees are given" msgstr "--cached et des arbres sont fournis en même temps" #: builtin/hash-object.c:85 -msgid "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] [--] <file>..." -msgstr "git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] [--] <fichier>..." +msgid "" +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." +msgstr "" +"git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] " +"[--] <fichier>..." #: builtin/hash-object.c:86 msgid "git hash-object --stdin-paths" @@ -15546,8 +16517,11 @@ msgid "store file as is without filters" msgstr "stocker le fichier tel quel sans filtrage" #: builtin/hash-object.c:104 -msgid "just hash any random garbage to create corrupt objects for debugging Git" -msgstr "juste hasher n'importe quel contenu pour créer des objets corrompus pour debugger Git" +msgid "" +"just hash any random garbage to create corrupt objects for debugging Git" +msgstr "" +"juste hasher n'importe quel contenu pour créer des objets corrompus pour " +"debugger Git" #: builtin/hash-object.c:105 msgid "process file as it were from this path" @@ -15635,30 +16609,30 @@ msgstr "" msgid "'%s': unknown man viewer." msgstr "'%s' : visualiseur de manuel inconnu." -#: builtin/help.c:453 +#: builtin/help.c:452 msgid "no man viewer handled the request" msgstr "aucun visualiseur de manuel n'a pris en charge la demande" -#: builtin/help.c:461 +#: builtin/help.c:459 msgid "no info viewer handled the request" msgstr "aucun visualiseur de 'info' n'a pris en charge la demande" -#: builtin/help.c:520 builtin/help.c:531 git.c:348 +#: builtin/help.c:517 builtin/help.c:528 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' est un alias de '%s'" -#: builtin/help.c:534 git.c:380 +#: builtin/help.c:531 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "mauvais chaîne alias.%s : %s" -#: builtin/help.c:563 builtin/help.c:593 +#: builtin/help.c:561 builtin/help.c:591 #, c-format msgid "usage: %s%s" msgstr "usage : %s%s" -#: builtin/help.c:577 +#: builtin/help.c:575 msgid "'git help config' for more information" msgstr "'git help config' pour plus d'information" @@ -15696,7 +16670,7 @@ msgstr "erreur de lecture sur l'entrée" msgid "used more bytes than were available" msgstr "plus d'octets utilisés que disponibles" -#: builtin/index-pack.c:325 builtin/pack-objects.c:624 +#: builtin/index-pack.c:325 builtin/pack-objects.c:756 msgid "pack too large for current definition of off_t" msgstr "le paquet est trop grand pour la définition actuelle de off_t" @@ -15723,235 +16697,239 @@ msgstr "la signature du paquet ne correspond pas" msgid "pack version %<PRIu32> unsupported" msgstr "la version de paquet %<PRIu32> non supportée" -#: builtin/index-pack.c:383 +#: builtin/index-pack.c:381 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s" -#: builtin/index-pack.c:489 +#: builtin/index-pack.c:487 #, c-format msgid "inflate returned %d" msgstr "la décompression (inflate) a retourné %d" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:536 msgid "offset value overflow for delta base object" msgstr "dépassement de la valeur d'offset pour l'objet delta de base" -#: builtin/index-pack.c:546 +#: builtin/index-pack.c:544 msgid "delta base offset is out of bound" msgstr "l'objet delta de base est hors limite" -#: builtin/index-pack.c:554 +#: builtin/index-pack.c:552 #, c-format msgid "unknown object type %d" msgstr "type d'objet inconnu %d" -#: builtin/index-pack.c:585 +#: builtin/index-pack.c:583 msgid "cannot pread pack file" msgstr "impossible de lire (pread) le fichier paquet" -#: builtin/index-pack.c:587 +#: builtin/index-pack.c:585 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "fin prématurée du fichier paquet, %<PRIuMAX> octet lu" msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus" -#: builtin/index-pack.c:613 +#: builtin/index-pack.c:611 msgid "serious inflate inconsistency" msgstr "grave incohérence dans la décompression (inflate)" -#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788 builtin/index-pack.c:827 builtin/index-pack.c:836 +#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786 +#: builtin/index-pack.c:825 builtin/index-pack.c:834 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" -#: builtin/index-pack.c:761 builtin/pack-objects.c:171 builtin/pack-objects.c:231 builtin/pack-objects.c:326 +#: builtin/index-pack.c:759 builtin/pack-objects.c:292 +#: builtin/pack-objects.c:352 builtin/pack-objects.c:458 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" -#: builtin/index-pack.c:825 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object info %s" msgstr "impossible de lire l'information existante de l'objet %s" -#: builtin/index-pack.c:833 +#: builtin/index-pack.c:831 #, c-format msgid "cannot read existing object %s" msgstr "impossible de lire l'objet existant %s" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:845 #, c-format msgid "invalid blob object %s" msgstr "objet blob invalide %s" -#: builtin/index-pack.c:850 builtin/index-pack.c:869 +#: builtin/index-pack.c:848 builtin/index-pack.c:867 msgid "fsck error in packed object" msgstr "erreur de fsck dans l'objet empaqueté" -#: builtin/index-pack.c:871 +#: builtin/index-pack.c:869 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Tous les objets enfants de %s ne sont pas accessibles" -#: builtin/index-pack.c:932 builtin/index-pack.c:979 +#: builtin/index-pack.c:930 builtin/index-pack.c:977 msgid "failed to apply delta" msgstr "échec d'application du delta" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Receiving objects" msgstr "Réception d'objets" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Indexing objects" msgstr "Indexation d'objets" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1194 msgid "pack is corrupted (SHA1 mismatch)" msgstr "le paquet est corrompu (SHA1 ne correspond pas)" -#: builtin/index-pack.c:1201 +#: builtin/index-pack.c:1199 msgid "cannot fstat packfile" msgstr "impossible d'obtenir le statut (fstat) du fichier paquet" -#: builtin/index-pack.c:1204 +#: builtin/index-pack.c:1202 msgid "pack has junk at the end" msgstr "le paquet est invalide à la fin" -#: builtin/index-pack.c:1216 +#: builtin/index-pack.c:1214 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusion extrême dans parse_pack_objects()" -#: builtin/index-pack.c:1239 +#: builtin/index-pack.c:1237 msgid "Resolving deltas" msgstr "Résolution des deltas" -#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732 +#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892 #, c-format msgid "unable to create thread: %s" msgstr "impossible de créer le fil : %s" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1281 msgid "confusion beyond insanity" msgstr "confusion extrême" -#: builtin/index-pack.c:1289 +#: builtin/index-pack.c:1287 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "complété avec %d objet local" msgstr[1] "complété avec %d objets locaux" -#: builtin/index-pack.c:1301 +#: builtin/index-pack.c:1299 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" -msgstr "Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)" +msgstr "" +"Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1303 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "le paquet a %d delta non résolu" msgstr[1] "le paquet a %d deltas non résolus" -#: builtin/index-pack.c:1329 +#: builtin/index-pack.c:1327 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajouté (%d)" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1423 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1446 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "le nom de fichier paquet '%s' ne se termine pas par '.%s'" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1468 #, c-format msgid "cannot write %s file '%s'" msgstr "impossible d'écrire le fichier %s '%s'" -#: builtin/index-pack.c:1478 +#: builtin/index-pack.c:1476 #, c-format msgid "cannot close written %s file '%s'" msgstr "impossible de fermer le fichier %s écrit '%s'" -#: builtin/index-pack.c:1504 +#: builtin/index-pack.c:1502 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1516 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1526 +#: builtin/index-pack.c:1524 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977 +#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1651 +#: builtin/index-pack.c:1649 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1653 +#: builtin/index-pack.c:1651 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'" -#: builtin/index-pack.c:1701 +#: builtin/index-pack.c:1699 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "pas un delta : %d objet" msgstr[1] "pas un delta : %d objets" -#: builtin/index-pack.c:1708 +#: builtin/index-pack.c:1706 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longueur chaînée = %d : %lu objet" msgstr[1] "longueur chaînée = %d : %lu objets" -#: builtin/index-pack.c:1750 +#: builtin/index-pack.c:1748 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: builtin/index-pack.c:1804 builtin/index-pack.c:1807 builtin/index-pack.c:1823 builtin/index-pack.c:1827 +#: builtin/index-pack.c:1802 builtin/index-pack.c:1805 +#: builtin/index-pack.c:1821 builtin/index-pack.c:1825 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613 +#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614 #, c-format msgid "unknown hash algorithm '%s'" msgstr "algorithme d'empreinte inconnu '%s'" -#: builtin/index-pack.c:1852 +#: builtin/index-pack.c:1850 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1854 +#: builtin/index-pack.c:1852 msgid "--stdin requires a git repository" msgstr "--stdin requiert un dépôt git" -#: builtin/index-pack.c:1856 +#: builtin/index-pack.c:1854 msgid "--object-format cannot be used with --stdin" msgstr "--object-format ne peut pas être utilisé avec --stdin" -#: builtin/index-pack.c:1871 +#: builtin/index-pack.c:1869 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" -#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584 +#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "erreur de fsck dans les objets paquets" @@ -15995,110 +16973,122 @@ msgstr "modèles non trouvés dans %s" msgid "not copying templates from '%s': %s" msgstr "pas de copie des modèles depuis '%s' : %s" -#: builtin/init-db.c:262 +#: builtin/init-db.c:263 #, c-format msgid "invalid initial branch name: '%s'" msgstr "nom de branche initiale invalide : '%s'" -#: builtin/init-db.c:353 +#: builtin/init-db.c:354 #, c-format msgid "unable to handle file type %d" msgstr "impossible de traiter le fichier de type %d" -#: builtin/init-db.c:356 +#: builtin/init-db.c:357 #, c-format msgid "unable to move %s to %s" msgstr "impossible de déplacer %s vers %s" -#: builtin/init-db.c:372 +#: builtin/init-db.c:373 msgid "attempt to reinitialize repository with different hash" msgstr "essai de réinitialisation du dépôt avec une empreinte différente" -#: builtin/init-db.c:396 builtin/init-db.c:399 +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "%s existe déjà" -#: builtin/init-db.c:431 +#: builtin/init-db.c:432 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-initialisation : --initial-branch=%s ignoré" -#: builtin/init-db.c:462 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n" -#: builtin/init-db.c:463 +#: builtin/init-db.c:464 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Dépôt Git existant réinitialisé dans %s%s\n" -#: builtin/init-db.c:467 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Dépôt Git vide partagé initialisé dans %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:469 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Dépôt Git vide initialisé dans %s%s\n" -#: builtin/init-db.c:517 -msgid "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared[=<permissions>]] [<directory>]" -msgstr "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--shared[=<permissions>]] [<répertoire>]" +#: builtin/init-db.c:518 +msgid "" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" +"shared[=<permissions>]] [<directory>]" +msgstr "" +"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--" +"shared[=<permissions>]] [<répertoire>]" -#: builtin/init-db.c:543 +#: builtin/init-db.c:544 msgid "permissions" msgstr "permissions" -#: builtin/init-db.c:544 +#: builtin/init-db.c:545 msgid "specify that the git repository is to be shared amongst several users" msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs" -#: builtin/init-db.c:550 +#: builtin/init-db.c:551 msgid "override the name of the initial branch" msgstr "outrepasser le nom de la branche initiale" -#: builtin/init-db.c:551 builtin/verify-pack.c:74 +#: builtin/init-db.c:552 builtin/verify-pack.c:74 msgid "hash" msgstr "empreinte" -#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "spécifier l'algorithme d'empreinte à utiliser" -#: builtin/init-db.c:559 +#: builtin/init-db.c:560 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "--separate-git-dir et --bare sont mutuellement exclusifs" -#: builtin/init-db.c:590 builtin/init-db.c:595 +#: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" msgstr "impossible de créer le répertoire (mkdir) %s" -#: builtin/init-db.c:599 builtin/init-db.c:654 +#: builtin/init-db.c:600 builtin/init-db.c:655 #, c-format msgid "cannot chdir to %s" msgstr "impossible de se déplacer vers le répertoire (chdir) %s" -#: builtin/init-db.c:626 +#: builtin/init-db.c:627 #, c-format -msgid "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-dir=<directory>)" -msgstr "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --git-dir=<répertoire>)" +msgid "" +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" +msgstr "" +"%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --" +"git-dir=<répertoire>)" -#: builtin/init-db.c:678 +#: builtin/init-db.c:679 #, c-format msgid "Cannot access work tree '%s'" msgstr "Impossible d'accéder à l'arbre de travail '%s'" -#: builtin/init-db.c:683 +#: builtin/init-db.c:684 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir est incompatible avec un dépôt nu" #: builtin/interpret-trailers.c:16 -msgid "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <token>[(=|:)<value>])...] [<file>...]" -msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <symbole>[(=|:)<valeur>])...] [<fichier>...]" +msgid "" +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " +"<token>[(=|:)<value>])...] [<file>...]" +msgstr "" +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " +"<symbole>[(=|:)<valeur>])...] [<fichier>...]" #: builtin/interpret-trailers.c:95 msgid "edit files in place" @@ -16186,385 +17176,410 @@ msgid "decorate options" msgstr "décorer les options" #: builtin/log.c:190 -msgid "trace the evolution of line range <start>,<end> or function :<funcname> in <file>" -msgstr "tracer l'évolution d'une plage <début>,<fin> ou d'une fonction <nom-de-fonction> dans <fichier>" +msgid "" +"trace the evolution of line range <start>,<end> or function :<funcname> in " +"<file>" +msgstr "" +"tracer l'évolution d'une plage <début>,<fin> ou d'une fonction <nom-de-" +"fonction> dans <fichier>" #: builtin/log.c:213 msgid "-L<range>:<file> cannot be used with pathspec" -msgstr "-L<plage>:<fichier> ne peut pas être utilisé avec une spécificateur de chemin" +msgstr "" +"-L<plage>:<fichier> ne peut pas être utilisé avec une spécificateur de chemin" -#: builtin/log.c:303 +#: builtin/log.c:306 #, c-format msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" -#: builtin/log.c:568 +#: builtin/log.c:571 #, c-format msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" -#: builtin/log.c:583 builtin/log.c:673 +#: builtin/log.c:586 builtin/log.c:676 #, c-format msgid "could not read object %s" msgstr "impossible de lire l'objet %s" -#: builtin/log.c:698 +#: builtin/log.c:701 #, c-format msgid "unknown type: %d" msgstr "type inconnu : %d" -#: builtin/log.c:843 +#: builtin/log.c:846 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s : couverture invalide pour le mode de description" -#: builtin/log.c:850 +#: builtin/log.c:853 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:979 +#: builtin/log.c:982 #, c-format msgid "cannot open patch file %s" msgstr "impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:996 +#: builtin/log.c:999 msgid "need exactly one range" msgstr "exactement une plage nécessaire" -#: builtin/log.c:1006 +#: builtin/log.c:1009 msgid "not a range" msgstr "ceci n'est pas une plage" -#: builtin/log.c:1170 +#: builtin/log.c:1173 msgid "cover letter needs email format" msgstr "la lettre de motivation doit être au format courriel" -#: builtin/log.c:1176 +#: builtin/log.c:1179 msgid "failed to create cover-letter file" msgstr "échec de création du fichier de lettre de motivation" -#: builtin/log.c:1263 +#: builtin/log.c:1266 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:1290 +#: builtin/log.c:1293 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]" -#: builtin/log.c:1348 +#: builtin/log.c:1351 msgid "two output directories?" msgstr "deux répertoires de sortie ?" -#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340 +#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 #, c-format msgid "unknown commit %s" msgstr "commit inconnu %s" -#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207 builtin/replace.c:210 +#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "échec à résoudre '%s' comme une référence valide" -#: builtin/log.c:1519 +#: builtin/log.c:1522 msgid "could not find exact merge base" msgstr "impossible de trouver la base de fusion exacte" -#: builtin/log.c:1529 +#: builtin/log.c:1532 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base=<base-commit-id> manually" msgstr "" -"impossible de récupérer l'amont, si vous voulez enregistrer le commit de base automatiquement,\n" -"veuillez utiliser git branch --set-upstream-to pour suivre une branche distante.\n" -"Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> manuellement" +"impossible de récupérer l'amont, si vous voulez enregistrer le commit de " +"base automatiquement,\n" +"veuillez utiliser git branch --set-upstream-to pour suivre une branche " +"distante.\n" +"Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> " +"manuellement" -#: builtin/log.c:1552 +#: builtin/log.c:1555 msgid "failed to find exact merge base" msgstr "échec à trouver la base de fusion exacte" -#: builtin/log.c:1569 +#: builtin/log.c:1572 msgid "base commit should be the ancestor of revision list" msgstr "le commit de base devrait être l'ancêtre de la liste de révisions" -#: builtin/log.c:1579 +#: builtin/log.c:1582 msgid "base commit shouldn't be in revision list" msgstr "le commit de base ne devrait pas faire partie de la liste de révisions" -#: builtin/log.c:1637 +#: builtin/log.c:1640 msgid "cannot get patch id" msgstr "impossible d'obtenir l'id du patch" -#: builtin/log.c:1700 +#: builtin/log.c:1703 msgid "failed to infer range-diff origin of current series" -msgstr "échec d'inférence de l'origine de différence d'intervalles de la série actuelle" +msgstr "" +"échec d'inférence de l'origine de différence d'intervalles de la série " +"actuelle" -#: builtin/log.c:1702 +#: builtin/log.c:1705 #, c-format msgid "using '%s' as range-diff origin of current series" -msgstr "utilisation de '%s' comme une différence d'intervalle pour la série actuelle" +msgstr "" +"utilisation de '%s' comme une différence d'intervalle pour la série actuelle" -#: builtin/log.c:1746 +#: builtin/log.c:1749 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] même avec un patch unique" -#: builtin/log.c:1749 +#: builtin/log.c:1752 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] même avec des patchs multiples" -#: builtin/log.c:1753 +#: builtin/log.c:1756 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1755 +#: builtin/log.c:1758 msgid "generate a cover letter" msgstr "générer une lettre de motivation" -#: builtin/log.c:1757 +#: builtin/log.c:1760 msgid "use simple number sequence for output file names" -msgstr "utiliser une séquence simple de nombres pour les nom des fichiers de sortie" +msgstr "" +"utiliser une séquence simple de nombres pour les nom des fichiers de sortie" -#: builtin/log.c:1758 +#: builtin/log.c:1761 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1759 +#: builtin/log.c:1762 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1761 +#: builtin/log.c:1764 msgid "start numbering patches at <n> instead of 1" msgstr "démarrer la numérotation des patchs à <n> au lieu de 1" -#: builtin/log.c:1762 +#: builtin/log.c:1765 msgid "reroll-count" msgstr "reroll-count" -#: builtin/log.c:1763 +#: builtin/log.c:1766 msgid "mark the series as Nth re-roll" msgstr "marquer la série comme une Nième réédition" -#: builtin/log.c:1765 +#: builtin/log.c:1768 msgid "max length of output filename" msgstr "taille maximum du nom du fichier de sortie" -#: builtin/log.c:1767 +#: builtin/log.c:1770 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "utiliser [RFC PATCH] au lieu de [PATCH]" -#: builtin/log.c:1770 +#: builtin/log.c:1773 msgid "cover-from-description-mode" msgstr "cover-from-description-mode" -#: builtin/log.c:1771 +#: builtin/log.c:1774 msgid "generate parts of a cover letter based on a branch's description" -msgstr "générer des parties de la lettre d'introduction à partir de la description de la branche" +msgstr "" +"générer des parties de la lettre d'introduction à partir de la description " +"de la branche" -#: builtin/log.c:1773 +#: builtin/log.c:1776 msgid "use [<prefix>] instead of [PATCH]" msgstr "utiliser [<préfixe>] au lieu de [PATCH]" -#: builtin/log.c:1776 +#: builtin/log.c:1779 msgid "store resulting files in <dir>" msgstr "stocker les fichiers résultats dans <répertoire>" -#: builtin/log.c:1779 +#: builtin/log.c:1782 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1782 +#: builtin/log.c:1785 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1784 +#: builtin/log.c:1787 msgid "output all-zero hash in From header" msgstr "écrire une empreinte à zéro dans l'entête From" -#: builtin/log.c:1786 +#: builtin/log.c:1789 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant à un commit amont" -#: builtin/log.c:1788 +#: builtin/log.c:1791 msgid "show patch format instead of default (patch + stat)" msgstr "afficher le format du patch au lieu du défaut (patch + stat)" -#: builtin/log.c:1790 +#: builtin/log.c:1793 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1791 +#: builtin/log.c:1794 msgid "header" msgstr "en-tête" -#: builtin/log.c:1792 +#: builtin/log.c:1795 msgid "add email header" msgstr "ajouter l'en-tête de courriel" -#: builtin/log.c:1793 builtin/log.c:1794 +#: builtin/log.c:1796 builtin/log.c:1797 msgid "email" msgstr "courriel" -#: builtin/log.c:1793 +#: builtin/log.c:1796 msgid "add To: header" msgstr "ajouter l'en-tête \"To:\"" -#: builtin/log.c:1794 +#: builtin/log.c:1797 msgid "add Cc: header" msgstr "ajouter l'en-tête \"Cc:\"" -#: builtin/log.c:1795 +#: builtin/log.c:1798 msgid "ident" msgstr "ident" -#: builtin/log.c:1796 +#: builtin/log.c:1799 msgid "set From address to <ident> (or committer ident if absent)" -msgstr "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)" +msgstr "" +"renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)" -#: builtin/log.c:1798 +#: builtin/log.c:1801 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1799 +#: builtin/log.c:1802 msgid "make first mail a reply to <message-id>" msgstr "répondre dans le premier message à <id-message>" -#: builtin/log.c:1800 builtin/log.c:1803 +#: builtin/log.c:1803 builtin/log.c:1806 msgid "boundary" msgstr "limite" -#: builtin/log.c:1801 +#: builtin/log.c:1804 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1804 +#: builtin/log.c:1807 msgid "inline the patch" msgstr "patch à l'intérieur" -#: builtin/log.c:1808 +#: builtin/log.c:1811 msgid "enable message threading, styles: shallow, deep" -msgstr "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" +msgstr "" +"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1810 +#: builtin/log.c:1813 msgid "signature" msgstr "signature" -#: builtin/log.c:1811 +#: builtin/log.c:1814 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1812 +#: builtin/log.c:1815 msgid "base-commit" msgstr "commit-de-base" -#: builtin/log.c:1813 +#: builtin/log.c:1816 msgid "add prerequisite tree info to the patch series" msgstr "ajouter un arbre prérequis à la série de patchs" -#: builtin/log.c:1816 +#: builtin/log.c:1819 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" -#: builtin/log.c:1817 +#: builtin/log.c:1820 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1819 +#: builtin/log.c:1822 msgid "show progress while generating patches" -msgstr "afficher la barre de progression durant la phase de génération des patchs" +msgstr "" +"afficher la barre de progression durant la phase de génération des patchs" -#: builtin/log.c:1821 +#: builtin/log.c:1824 msgid "show changes against <rev> in cover letter or single patch" -msgstr "afficher les modifications par rapport à <rév> dans la première page ou une rustine" +msgstr "" +"afficher les modifications par rapport à <rév> dans la première page ou une " +"rustine" -#: builtin/log.c:1824 +#: builtin/log.c:1827 msgid "show changes against <refspec> in cover letter or single patch" -msgstr "afficher les modifications par rapport à <refspec> dans la première page ou une rustine" +msgstr "" +"afficher les modifications par rapport à <refspec> dans la première page ou " +"une rustine" -#: builtin/log.c:1826 builtin/range-diff.c:28 +#: builtin/log.c:1829 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "pourcentage par lequel la création est pondérée" -#: builtin/log.c:1913 +#: builtin/log.c:1916 #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" -#: builtin/log.c:1928 +#: builtin/log.c:1931 msgid "-n and -k are mutually exclusive" msgstr "-n et -k sont mutuellement exclusifs" -#: builtin/log.c:1930 +#: builtin/log.c:1933 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs" -#: builtin/log.c:1938 +#: builtin/log.c:1941 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1940 +#: builtin/log.c:1943 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1942 +#: builtin/log.c:1945 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1964 +#: builtin/log.c:1967 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "--stdout, --output, et --output-directory sont mutuellement exclusifs" -#: builtin/log.c:2087 +#: builtin/log.c:2089 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:2091 +#: builtin/log.c:2093 msgid "Interdiff:" msgstr "Interdiff :" -#: builtin/log.c:2092 +#: builtin/log.c:2094 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contre v%d :" -#: builtin/log.c:2098 +#: builtin/log.c:2100 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requiert --range-diff" -#: builtin/log.c:2102 +#: builtin/log.c:2104 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:2110 +#: builtin/log.c:2112 msgid "Range-diff:" msgstr "Diff-intervalle :" -#: builtin/log.c:2111 +#: builtin/log.c:2113 #, c-format msgid "Range-diff against v%d:" msgstr "Diff-intervalle contre v%d :" -#: builtin/log.c:2122 +#: builtin/log.c:2124 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" -#: builtin/log.c:2158 +#: builtin/log.c:2160 msgid "Generating patches" msgstr "Génération des patchs" -#: builtin/log.c:2202 +#: builtin/log.c:2204 msgid "failed to create output files" msgstr "échec de création des fichiers en sortie" -#: builtin/log.c:2261 +#: builtin/log.c:2263 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:2315 +#: builtin/log.c:2317 #, c-format -msgid "Could not find a tracked remote branch, please specify <upstream> manually.\n" -msgstr "Impossible de trouver une branche distante suivie, merci de spécifier <branche_amont> manuellement.\n" +msgid "" +"Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgstr "" +"Impossible de trouver une branche distante suivie, merci de spécifier " +"<branche_amont> manuellement.\n" #: builtin/ls-files.c:563 msgid "git ls-files [<options>] [<file>...]" @@ -16608,7 +17623,8 @@ msgstr "afficher les nom des objets indexés dans la sortie" #: builtin/ls-files.c:638 msgid "show files on the filesystem that need to be removed" -msgstr "afficher les fichiers du système de fichiers qui ont besoin d'être supprimés" +msgstr "" +"afficher les fichiers du système de fichiers qui ont besoin d'être supprimés" #: builtin/ls-files.c:640 msgid "show 'other' directories' names only" @@ -16664,7 +17680,9 @@ msgstr "arbre ou apparenté" #: builtin/ls-files.c:670 msgid "pretend that paths removed since <tree-ish> are still present" -msgstr "considérer que les chemins supprimés depuis <arbre ou apparenté> sont toujours présents" +msgstr "" +"considérer que les chemins supprimés depuis <arbre ou apparenté> sont " +"toujours présents" #: builtin/ls-files.c:672 msgid "show debugging data" @@ -16714,7 +17732,9 @@ msgstr "prendre en compte url.<base>.insteadOf" #: builtin/ls-remote.c:73 msgid "exit with exit code 2 if no matching refs are found" -msgstr "sortir avec un code d'erreur 2 si aucune correspondance de référence n'est trouvée" +msgstr "" +"sortir avec un code d'erreur 2 si aucune correspondance de référence n'est " +"trouvée" #: builtin/ls-remote.c:76 msgid "show underlying ref in addition to the object pointed by it" @@ -16754,11 +17774,12 @@ msgstr "utiliser les noms de chemins complets" #: builtin/ls-tree.c:145 msgid "list entire tree; not just current directory (implies --full-name)" -msgstr "afficher l'arbre entier ; pas seulement le répertoire courant (implique --full-name)" +msgstr "" +"afficher l'arbre entier ; pas seulement le répertoire courant (implique --" +"full-name)" #. TRANSLATORS: keep <> in "<" mail ">" info. #: builtin/mailinfo.c:14 -#| msgid "git diff --no-index [<options>] <path> <path>" msgid "git mailinfo [<options>] <msg> <patch> < mail >info" msgstr "git mailinfo [<options>] <msg> <rustine> < mail >info" @@ -16852,8 +17873,12 @@ msgid "find where <commit> forked from reflog of <ref>" msgstr "trouver où <validation> a divergé du reflog de <référence>" #: builtin/merge-file.c:9 -msgid "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> <orig-file> <file2>" -msgstr "git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> <fichier-orig> <fichier2>" +msgid "" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "" +"git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> " +"<fichier-orig> <fichier2>" #: builtin/merge-file.c:35 msgid "send results to standard output" @@ -16922,14 +17947,6 @@ msgstr "Fusion de %s avec %s\n" msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<options>] [<commit>...]" -#: builtin/merge.c:59 -msgid "git merge --abort" -msgstr "git merge --abort" - -#: builtin/merge.c:60 -msgid "git merge --continue" -msgstr "git merge --continue" - #: builtin/merge.c:123 msgid "switch `m' requires a value" msgstr "le commutateur `m' a besoin d'une valeur" @@ -16968,7 +17985,9 @@ msgstr "(synonyme de --stat)" #: builtin/merge.c:262 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" -msgstr "ajouter (au plus <n>) éléments du journal court au message de validation de la fusion" +msgstr "" +"ajouter (au plus <n>) éléments du journal court au message de validation de " +"la fusion" #: builtin/merge.c:265 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" @@ -16994,7 +18013,8 @@ msgstr "abandonner si l'avance rapide n'est pas possible" msgid "verify that the named commit has a valid GPG signature" msgstr "vérifier que le commit nommé a une signature GPG valide" -#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114 +#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114 msgid "strategy" msgstr "stratégie" @@ -17012,7 +18032,8 @@ msgstr "option pour la stratégie de fusion sélectionnée" #: builtin/merge.c:283 msgid "merge commit message (for a non-fast-forward merge)" -msgstr "message de validation de la fusion (pour une fusion sans avance rapide)" +msgstr "" +"message de validation de la fusion (pour une fusion sans avance rapide)" #: builtin/merge.c:290 msgid "abort the current in-progress merge" @@ -17084,7 +18105,7 @@ msgstr "Impossible de gérer autre chose que la fusion de deux têtes." msgid "Unknown option for merge-recursive: -X%s" msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" @@ -17097,7 +18118,9 @@ msgstr "Impossible de lire depuis '%s'" #: builtin/merge.c:821 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" -msgstr "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la fusion.\n" +msgstr "" +"Pas de validation de la fusion ; utilisez 'git commit' pour terminer la " +"fusion.\n" #: builtin/merge.c:827 msgid "" @@ -17105,8 +18128,10 @@ msgid "" "especially if it merges an updated upstream into a topic branch.\n" "\n" msgstr "" -"Veuillez entrer un message de validation pour expliquer en quoi cette fusion est\n" -"nécessaire, surtout si cela fusionne une branche amont mise à jour dans une branche de sujet.\n" +"Veuillez entrer un message de validation pour expliquer en quoi cette fusion " +"est\n" +"nécessaire, surtout si cela fusionne une branche amont mise à jour dans une " +"branche de sujet.\n" "\n" #: builtin/merge.c:832 @@ -17134,7 +18159,9 @@ msgstr "Merveilleux.\n" #: builtin/merge.c:964 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" -msgstr "La fusion automatique a échoué ; réglez les conflits et validez le résultat.\n" +msgstr "" +"La fusion automatique a échoué ; réglez les conflits et validez le " +"résultat.\n" #: builtin/merge.c:1003 msgid "No current branch." @@ -17217,7 +18244,8 @@ msgstr "Vous ne pouvez pas combiner --squash avec --commit." #: builtin/merge.c:1413 msgid "No commit specified and merge.defaultToUpstream not set." -msgstr "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini." +msgstr "" +"Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini." #: builtin/merge.c:1430 msgid "Squash commit into empty head not supported yet" @@ -17234,7 +18262,8 @@ msgstr "%s - pas possible de fusionner ceci" #: builtin/merge.c:1439 msgid "Can merge only exactly one commit into empty head" -msgstr "Possible de fusionner exactement une seule validation dans une tête vide" +msgstr "" +"Possible de fusionner exactement une seule validation dans une tête vide" #: builtin/merge.c:1520 msgid "refusing to merge unrelated histories" @@ -17287,7 +18316,8 @@ msgstr "Utilisation de %s pour préparer la résolution à la main.\n" #: builtin/merge.c:1732 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" -msgstr "La fusion automatique a réussi ; stoppée avant la validation comme demandé\n" +msgstr "" +"La fusion automatique a réussi ; stoppée avant la validation comme demandé\n" #: builtin/mktag.c:10 msgid "git mktag" @@ -17347,28 +18377,26 @@ msgid "allow creation of more than one tree" msgstr "autoriser la création de plus d'un arbre" #: builtin/multi-pack-index.c:10 -#| msgid "git multi-pack-index [<options>] (write|verify|expire|repack --batch-size=<size>)" msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]" msgstr "git multi-pack-index [<options>] write [--preferred-pack=<paquet>]" #: builtin/multi-pack-index.c:13 -#| msgid "git upload-pack [<options>] <dir>" msgid "git multi-pack-index [<options>] verify" msgstr "git multi-pack-index [<options>] verify" #: builtin/multi-pack-index.c:16 -#| msgid "git upload-pack [<options>] <dir>" msgid "git multi-pack-index [<options>] expire" msgstr "git multi-pack-index [<options>] expire" #: builtin/multi-pack-index.c:19 -#| msgid "git multi-pack-index [<options>] (write|verify|expire|repack --batch-size=<size>)" msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" msgstr "git multi-pack-index [<options>] repack [--batch-size=<taille>]" #: builtin/multi-pack-index.c:54 msgid "object directory containing set of packfile and pack-index pairs" -msgstr "répertoire objet contenant un ensemble de paires de fichiers paquet et d'index de paquet" +msgstr "" +"répertoire objet contenant un ensemble de paires de fichiers paquet et " +"d'index de paquet" #: builtin/multi-pack-index.c:69 msgid "preferred-pack" @@ -17379,10 +18407,14 @@ msgid "pack for reuse when computing a multi-pack bitmap" msgstr "paquet à réutiliser lors du calcul de bitmap de multi-paquet" #: builtin/multi-pack-index.c:128 -msgid "during repack, collect pack-files of smaller size into a batch that is larger than this size" -msgstr "pendant le repaquetage, collecter les fichiers paquet de plus petite taille dans un lot plus grand que cette taille" +msgid "" +"during repack, collect pack-files of smaller size into a batch that is " +"larger than this size" +msgstr "" +"pendant le repaquetage, collecter les fichiers paquet de plus petite taille " +"dans un lot plus grand que cette taille" -#: builtin/multi-pack-index.c:180 +#: builtin/multi-pack-index.c:179 #, c-format msgid "unrecognized subcommand: %s" msgstr "sous-commande non reconnue : %s" @@ -17398,7 +18430,9 @@ msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?" #: builtin/mv.c:85 msgid "Please stage your changes to .gitmodules or stash them to proceed" -msgstr "Veuillez indexer vos modifications de .gitmodules ou les remiser pour continuer" +msgstr "" +"Veuillez indexer vos modifications de .gitmodules ou les remiser pour " +"continuer" #: builtin/mv.c:103 #, c-format @@ -17497,7 +18531,8 @@ msgstr "git name-rev [<options>] --stdin" #: builtin/name-rev.c:524 msgid "print only ref-based names (no object names)" -msgstr "afficher seulement les noms basés sur des références (pas de nom d'objet)" +msgstr "" +"afficher seulement les noms basés sur des références (pas de nom d'objet)" #: builtin/name-rev.c:525 msgid "only use tags to name the commits" @@ -17513,7 +18548,8 @@ msgstr "ignorer les références correspondant à <motif>" #: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" -msgstr "afficher toutes les validations accessibles depuis toutes les références" +msgstr "" +"afficher toutes les validations accessibles depuis toutes les références" #: builtin/name-rev.c:532 msgid "read from stdin" @@ -17532,16 +18568,25 @@ msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <références-notes>] [list [<object>]]" #: builtin/notes.c:29 -msgid "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]" -msgstr "git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> | -F <fichier> | (-c | -C) <objet>] [<objet>]" +msgid "" +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " +"| (-c | -C) <object>] [<object>]" +msgstr "" +"git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> " +"| -F <fichier> | (-c | -C) <objet>] [<objet>]" #: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" -msgstr "git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>" +msgstr "" +"git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>" #: builtin/notes.c:31 -msgid "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]" -msgstr "git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -F <fichier> | (-c | -C) <objet>] [<objet>]" +msgid "" +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " +"(-c | -C) <object>] [<object>]" +msgstr "" +"git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -" +"F <fichier> | (-c | -C) <objet>] [<objet>]" #: builtin/notes.c:32 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" @@ -17552,8 +18597,11 @@ msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <références-notes>] show [<objet>]" #: builtin/notes.c:34 -msgid "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" -msgstr "git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] <références-notes>" +msgid "" +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" +msgstr "" +"git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] " +"<références-notes>" #: builtin/notes.c:35 msgid "git notes merge --commit [-v | -q]" @@ -17663,8 +18711,9 @@ msgstr "le contenu de la note a été laissé dans %s" msgid "could not open or read '%s'" msgstr "impossible d'ouvrir ou lire '%s'" -#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 builtin/notes.c:531 builtin/notes.c:610 -#: builtin/notes.c:672 +#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 +#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 +#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "impossible de résoudre '%s' comme une référence valide." @@ -17697,8 +18746,10 @@ msgstr "impossible de copier les notes de '%s' vers '%s'" msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "refus de faire %s sur des notes dans %s (hors de refs/notes/)" -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963 -#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:586 +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 +#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 +#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 +#: builtin/prune-packed.c:25 builtin/tag.c:586 msgid "too many arguments" msgstr "trop d'arguments" @@ -17733,8 +18784,12 @@ msgstr "remplacer les notes existantes" #: builtin/notes.c:448 #, c-format -msgid "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite existing notes" -msgstr "Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. Utilisez '-f' pour écraser les notes existantes" +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" +"Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. " +"Utilisez '-f' pour écraser les notes existantes" #: builtin/notes.c:463 builtin/notes.c:544 #, c-format @@ -17752,7 +18807,8 @@ msgstr "lire les objets depuis l'entrée standard" #: builtin/notes.c:499 msgid "load rewriting config for <command> (implies --stdin)" -msgstr "charger la configuration de réécriture pour <commande> (implique --stdin)" +msgstr "" +"charger la configuration de réécriture pour <commande> (implique --stdin)" #: builtin/notes.c:517 msgid "too few arguments" @@ -17760,8 +18816,12 @@ msgstr "trop peu d'arguments" #: builtin/notes.c:538 #, c-format -msgid "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite existing notes" -msgstr "Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. Utilisez '-f' pour écraser les notes existantes" +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" +"Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. " +"Utilisez '-f' pour écraser les notes existantes" #: builtin/notes.c:550 #, c-format @@ -17823,8 +18883,12 @@ msgid "Merge options" msgstr "Options de fusion" #: builtin/notes.c:788 -msgid "resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)" -msgstr "résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/theirs/union/cat_sort_uniq)" +msgid "" +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" +"cat_sort_uniq)" +msgstr "" +"résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/" +"theirs/union/cat_sort_uniq)" #: builtin/notes.c:790 msgid "Committing unmerged notes" @@ -17863,15 +18927,19 @@ msgstr "une fusion de notes dans %s est déjà en cours avec %s" #: builtin/notes.c:876 #, c-format msgid "failed to store link to current notes ref (%s)" -msgstr "impossible de stocker le lien vers la référence actuelle aux notes (%s)" +msgstr "" +"impossible de stocker le lien vers la référence actuelle aux notes (%s)" #: builtin/notes.c:878 #, c-format msgid "" -"Automatic notes merge failed. Fix conflicts in %s and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.\n" +"Automatic notes merge failed. Fix conflicts in %s and commit the result with " +"'git notes merge --commit', or abort the merge with 'git notes merge --" +"abort'.\n" msgstr "" -"La fusion automatique des notes a échoué. Corrigez les conflits dans %s et validez le résultat avec 'git notes merges --commit', ou abandonnez la fusion avec " -"'git notes merge --abort'.\n" +"La fusion automatique des notes a échoué. Corrigez les conflits dans %s et " +"validez le résultat avec 'git notes merges --commit', ou abandonnez la " +"fusion avec 'git notes merge --abort'.\n" #: builtin/notes.c:897 builtin/tag.c:589 #, c-format @@ -17885,13 +18953,14 @@ msgstr "L'objet %s n'a pas de note\n" #: builtin/notes.c:912 msgid "attempt to remove non-existent note is not an error" -msgstr "la tentative de suppression d'une note non existante n'est pas une erreur" +msgstr "" +"la tentative de suppression d'une note non existante n'est pas une erreur" #: builtin/notes.c:915 msgid "read object names from the standard input" msgstr "lire les noms d'objet depuis l'entrée standard" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" @@ -17907,143 +18976,166 @@ msgstr "références-notes" msgid "use notes from <notes-ref>" msgstr "utiliser les notes depuis <références-notes>" -#: builtin/notes.c:1034 builtin/stash.c:1739 +#: builtin/notes.c:1034 builtin/stash.c:1735 #, c-format msgid "unknown subcommand: %s" msgstr "sous-commande inconnue : %s" -#: builtin/pack-objects.c:54 -msgid "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" -msgstr "git pack-objects --stdout [options...] [< <liste-références> | < <liste-objets>]" +#: builtin/pack-objects.c:182 +msgid "" +"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" +msgstr "" +"git pack-objects --stdout [options...] [< <liste-références> | < <liste-" +"objets>]" -#: builtin/pack-objects.c:55 -msgid "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" -msgstr "git pack-objects [options...] base-name [< <liste-références> | < <liste-objets>]" +#: builtin/pack-objects.c:183 +msgid "" +"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" +msgstr "" +"git pack-objects [options...] base-name [< <liste-références> | < <liste-" +"objets>]" -#: builtin/pack-objects.c:440 +#: builtin/pack-objects.c:572 #, c-format -msgid "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in pack %s" -msgstr "write_reuse_object : impossible de localiser %s, attendu à l'offset %<PRIuMAX> dans le paquet %s" +msgid "" +"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " +"pack %s" +msgstr "" +"write_reuse_object : impossible de localiser %s, attendu à l'offset " +"%<PRIuMAX> dans le paquet %s" -#: builtin/pack-objects.c:448 +#: builtin/pack-objects.c:580 #, c-format msgid "bad packed object CRC for %s" msgstr "mauvais CRC d'objet empaqueté pour %s" -#: builtin/pack-objects.c:459 +#: builtin/pack-objects.c:591 #, c-format msgid "corrupt packed object for %s" msgstr "objet empaqueté corrompu pour %s" -#: builtin/pack-objects.c:590 +#: builtin/pack-objects.c:722 #, c-format msgid "recursive delta detected for object %s" msgstr "delta récursif détecté pour l'objet %s" -#: builtin/pack-objects.c:801 +#: builtin/pack-objects.c:941 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u objets commandés, %<PRIu32> attendus" -#: builtin/pack-objects.c:896 +#: builtin/pack-objects.c:1036 #, c-format msgid "expected object at offset %<PRIuMAX> in pack %s" msgstr "objet attendu à l'offset %<PRIuMAX> dans le paquet %s" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1155 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" -msgstr "désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à cause de pack.packSizeLimit" +msgstr "" +"désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à " +"cause de pack.packSizeLimit" -#: builtin/pack-objects.c:1028 +#: builtin/pack-objects.c:1168 msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:1089 builtin/update-index.c:90 +#: builtin/pack-objects.c:1229 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "échec du stat de %s" -#: builtin/pack-objects.c:1141 +#: builtin/pack-objects.c:1281 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus" -#: builtin/pack-objects.c:1383 +#: builtin/pack-objects.c:1523 msgid "disabling bitmap writing, as some objects are not being packed" -msgstr "désactivation de l'écriture en bitmap car certains objets ne sont pas compressés" +msgstr "" +"désactivation de l'écriture en bitmap car certains objets ne sont pas " +"compressés" -#: builtin/pack-objects.c:1831 +#: builtin/pack-objects.c:1971 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "dépassement de décalage de base de delta pour %s" -#: builtin/pack-objects.c:1840 +#: builtin/pack-objects.c:1980 #, c-format msgid "delta base offset out of bound for %s" msgstr "décalage de base de delta est hors limite pour %s" -#: builtin/pack-objects.c:2121 +#: builtin/pack-objects.c:2261 msgid "Counting objects" msgstr "Décompte des objets" -#: builtin/pack-objects.c:2266 +#: builtin/pack-objects.c:2426 #, c-format msgid "unable to parse object header of %s" msgstr "impossible d'analyser l'entête d'objet de %s" -#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352 builtin/pack-objects.c:2362 +#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512 +#: builtin/pack-objects.c:2522 #, c-format msgid "object %s cannot be read" msgstr "l'objet %s ne peut être lu" -#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366 +#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" -msgstr "objet %s longueur de l'objet inconsistante (%<PRIuMAX> contre %<PRIuMAX>)" +msgstr "" +"objet %s longueur de l'objet inconsistante (%<PRIuMAX> contre %<PRIuMAX>)" -#: builtin/pack-objects.c:2376 +#: builtin/pack-objects.c:2536 msgid "suboptimal pack - out of memory" msgstr "paquet sous-optimal - mémoire insuffisante" -#: builtin/pack-objects.c:2691 +#: builtin/pack-objects.c:2851 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compression par delta en utilisant jusqu'à %d fils d'exécution" -#: builtin/pack-objects.c:2830 +#: builtin/pack-objects.c:2990 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "impossible d'empaqueter les objets joignables depuis l'étiquette %s" -#: builtin/pack-objects.c:2916 +#: builtin/pack-objects.c:3076 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:3082 msgid "inconsistency with delta count" msgstr "inconsistance dans le compte de delta" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3161 #, c-format -msgid "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-hash> <uri>' (got '%s')" -msgstr "la valeur de uploadpack.blobpackfileuri doit être de la forme '<empreinte-d-objet> <empreinte-de-pack> <uri>' ('%s' reçu)" +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" +"hash> <uri>' (got '%s')" +msgstr "" +"la valeur de uploadpack.blobpackfileuri doit être de la forme '<empreinte-d-" +"objet> <empreinte-de-pack> <uri>' ('%s' reçu)" -#: builtin/pack-objects.c:3004 +#: builtin/pack-objects.c:3164 #, c-format -msgid "object already configured in another uploadpack.blobpackfileuri (got '%s')" -msgstr "l'objet est déjà configuré dans un autre uploadpack.blobpackfileuri ('%s' reçu)" +msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "" +"l'objet est déjà configuré dans un autre uploadpack.blobpackfileuri ('%s' " +"reçu)" -#: builtin/pack-objects.c:3039 +#: builtin/pack-objects.c:3199 #, c-format msgid "could not get type of object %s in pack %s" msgstr "impossible d'obtenir le type de l'objet %s dans le paquet %s" -#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175 +#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335 #, c-format msgid "could not find pack '%s'" msgstr "impossible de trouver le paquet '%s'" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3378 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18052,7 +19144,7 @@ msgstr "" "ID d'objet de bord attendu, reçu des données illisibles :\n" "%s" -#: builtin/pack-objects.c:3224 +#: builtin/pack-objects.c:3384 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18061,249 +19153,263 @@ msgstr "" "ID d'objet attendu, reçu des données illisibles :\n" "%s" -#: builtin/pack-objects.c:3322 +#: builtin/pack-objects.c:3482 msgid "invalid value for --missing" msgstr "valeur invalide pour --missing" -#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490 +#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650 msgid "cannot open pack index" msgstr "impossible d'ouvrir l'index de paquet" -#: builtin/pack-objects.c:3412 +#: builtin/pack-objects.c:3572 #, c-format msgid "loose object at %s could not be examined" msgstr "l'objet libre à %s n'a pas pu être examiné" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3658 msgid "unable to force loose object" msgstr "impossible de forcer l'objet libre" -#: builtin/pack-objects.c:3628 +#: builtin/pack-objects.c:3788 #, c-format msgid "not a rev '%s'" msgstr "'%s' n'est pas une révision" -#: builtin/pack-objects.c:3631 +#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061 #, c-format msgid "bad revision '%s'" msgstr "mauvaise révision '%s'" -#: builtin/pack-objects.c:3659 +#: builtin/pack-objects.c:3819 msgid "unable to add recent objects" msgstr "impossible d'ajouter les objets récents" -#: builtin/pack-objects.c:3712 +#: builtin/pack-objects.c:3872 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:3716 +#: builtin/pack-objects.c:3876 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:3755 +#: builtin/pack-objects.c:3915 msgid "<version>[,<offset>]" msgstr "<version>[,<décalage>]" -#: builtin/pack-objects.c:3756 +#: builtin/pack-objects.c:3916 msgid "write the pack index file in the specified idx format version" -msgstr "écrire le fichier d'index du paquet dans le format d'index de version spécifié" +msgstr "" +"écrire le fichier d'index du paquet dans le format d'index de version " +"spécifié" -#: builtin/pack-objects.c:3759 +#: builtin/pack-objects.c:3919 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:3761 +#: builtin/pack-objects.c:3921 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:3763 +#: builtin/pack-objects.c:3923 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:3765 +#: builtin/pack-objects.c:3925 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:3767 +#: builtin/pack-objects.c:3927 msgid "limit pack window by memory in addition to object limit" -msgstr "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets" +msgstr "" +"limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets" -#: builtin/pack-objects.c:3769 +#: builtin/pack-objects.c:3929 msgid "maximum length of delta chain allowed in the resulting pack" -msgstr "longueur maximum de la chaîne de delta autorisée dans le paquet résultant" +msgstr "" +"longueur maximum de la chaîne de delta autorisée dans le paquet résultant" -#: builtin/pack-objects.c:3771 +#: builtin/pack-objects.c:3931 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:3773 +#: builtin/pack-objects.c:3933 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:3775 +#: builtin/pack-objects.c:3935 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:3777 +#: builtin/pack-objects.c:3937 msgid "use threads when searching for best delta matches" -msgstr "utiliser des fils lors de la recherche pour une meilleure correspondance des deltas" +msgstr "" +"utiliser des fils lors de la recherche pour une meilleure correspondance des " +"deltas" -#: builtin/pack-objects.c:3779 +#: builtin/pack-objects.c:3939 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:3781 +#: builtin/pack-objects.c:3941 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:3783 +#: builtin/pack-objects.c:3943 msgid "limit the objects to those that are not yet packed" msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés" -#: builtin/pack-objects.c:3786 +#: builtin/pack-objects.c:3946 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:3789 +#: builtin/pack-objects.c:3949 msgid "include objects referred by reflog entries" msgstr "inclure les objets référencés par les éléments de reflog" -#: builtin/pack-objects.c:3792 +#: builtin/pack-objects.c:3952 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:3795 +#: builtin/pack-objects.c:3955 msgid "read packs from stdin" msgstr "lire les paquets depuis l'entrée standard" -#: builtin/pack-objects.c:3797 +#: builtin/pack-objects.c:3957 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:3799 +#: builtin/pack-objects.c:3959 msgid "include tag objects that refer to objects to be packed" msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter" -#: builtin/pack-objects.c:3801 +#: builtin/pack-objects.c:3961 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:3803 +#: builtin/pack-objects.c:3963 msgid "pack loose unreachable objects" msgstr "empaqueter les objets inaccessibles détachés" -#: builtin/pack-objects.c:3805 +#: builtin/pack-objects.c:3965 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:3808 +#: builtin/pack-objects.c:3968 msgid "use the sparse reachability algorithm" msgstr "utiliser l'algorithme de joignabilité creuse" -#: builtin/pack-objects.c:3810 +#: builtin/pack-objects.c:3970 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:3812 +#: builtin/pack-objects.c:3972 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:3814 +#: builtin/pack-objects.c:3974 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:3816 +#: builtin/pack-objects.c:3976 msgid "ignore this pack" msgstr "ignorer ce paquet" -#: builtin/pack-objects.c:3818 +#: builtin/pack-objects.c:3978 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:3820 +#: builtin/pack-objects.c:3980 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:3822 +#: builtin/pack-objects.c:3982 msgid "use a bitmap index if available to speed up counting objects" -msgstr "utiliser un index en bitmap si disponible pour accélerer le décompte des objets" +msgstr "" +"utiliser un index en bitmap si disponible pour accélerer le décompte des " +"objets" -#: builtin/pack-objects.c:3824 +#: builtin/pack-objects.c:3984 msgid "write a bitmap index together with the pack index" msgstr "écrire un index en bitmap associé à l'index de paquet" -#: builtin/pack-objects.c:3828 +#: builtin/pack-objects.c:3988 msgid "write a bitmap index if possible" msgstr "écrire un index de bitmap si possible" -#: builtin/pack-objects.c:3832 +#: builtin/pack-objects.c:3992 msgid "handling for missing objects" msgstr "gestion des objets manquants" -#: builtin/pack-objects.c:3835 +#: builtin/pack-objects.c:3995 msgid "do not pack objects in promisor packfiles" msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs" -#: builtin/pack-objects.c:3837 +#: builtin/pack-objects.c:3997 msgid "respect islands during delta compression" msgstr "respecter les îlots pendant la compression des deltas" -#: builtin/pack-objects.c:3839 +#: builtin/pack-objects.c:3999 msgid "protocol" msgstr "protocole" -#: builtin/pack-objects.c:3840 +#: builtin/pack-objects.c:4000 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "exclure tout uploadpack.blobpackfileuri configuré avec ce protocole" -#: builtin/pack-objects.c:3873 +#: builtin/pack-objects.c:4033 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "la profondeur %d de chaîne de delta est trop grande, forcée à %d" -#: builtin/pack-objects.c:3878 +#: builtin/pack-objects.c:4038 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit est trop grand, forcé à %d" -#: builtin/pack-objects.c:3934 +#: builtin/pack-objects.c:4094 msgid "--max-pack-size cannot be used to build a pack for transfer" -msgstr "--max-pack-size ne peut pas être utilisé pour construire un paquet à transférer" +msgstr "" +"--max-pack-size ne peut pas être utilisé pour construire un paquet à " +"transférer" -#: builtin/pack-objects.c:3936 +#: builtin/pack-objects.c:4096 msgid "minimum pack size limit is 1 MiB" msgstr "la taille limite minimale d'un paquet est 1 MiB" -#: builtin/pack-objects.c:3941 +#: builtin/pack-objects.c:4101 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin ne peut pas être utilisé pour construire un paquet indexable" -#: builtin/pack-objects.c:3944 +#: builtin/pack-objects.c:4104 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles" -#: builtin/pack-objects.c:3950 +#: builtin/pack-objects.c:4110 msgid "cannot use --filter without --stdout" msgstr "impossible d'utiliser --filter sans --stdout" -#: builtin/pack-objects.c:3952 +#: builtin/pack-objects.c:4112 msgid "cannot use --filter with --stdin-packs" msgstr "impossible d'utiliser --filter avec --stdin-packs" -#: builtin/pack-objects.c:3956 +#: builtin/pack-objects.c:4116 msgid "cannot use internal rev list with --stdin-packs" msgstr "impossible d'utiliser un liste interne de révisions avec --stdin-packs" -#: builtin/pack-objects.c:4015 +#: builtin/pack-objects.c:4175 msgid "Enumerating objects" msgstr "Énumération des objets" -#: builtin/pack-objects.c:4052 +#: builtin/pack-objects.c:4212 #, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-reused %<PRIu32>" -msgstr "Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>), réutilisés du pack %<PRIu32>" +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" +msgstr "" +"Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>), " +"réutilisés du pack %<PRIu32>" #: builtin/pack-redundant.c:601 msgid "" @@ -18402,12 +19508,19 @@ msgid "Invalid value for pull.ff: %s" msgstr "Valeur invalide pour pull.ff : %s" #: builtin/pull.c:445 -msgid "There is no candidate for rebasing against among the refs that you just fetched." -msgstr "Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous venez de récupérer." +msgid "" +"There is no candidate for rebasing against among the refs that you just " +"fetched." +msgstr "" +"Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous " +"venez de récupérer." #: builtin/pull.c:447 -msgid "There are no candidates for merging among the refs that you just fetched." -msgstr "Il n'y a pas de candidate avec laquelle fusionner parmi les références que vous venez de récupérer." +msgid "" +"There are no candidates for merging among the refs that you just fetched." +msgstr "" +"Il n'y a pas de candidate avec laquelle fusionner parmi les références que " +"vous venez de récupérer." #: builtin/pull.c:448 msgid "" @@ -18425,7 +19538,8 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" "Vous avez demandé de tirer depuis le dépôt distant '%s', mais sans indiquer\n" -"la branche. Comme ce n'est pas le dépôt distant par défaut dans la configuration\n" +"la branche. Comme ce n'est pas le dépôt distant par défaut dans la " +"configuration\n" "pour la branche actuelle, vous devez spécifier la branche avec la commande." #: builtin/pull.c:456 builtin/rebase.c:1248 @@ -18444,7 +19558,8 @@ msgstr "Veuillez spécifier une branche avec laquelle fusionner." msgid "See git-pull(1) for details." msgstr "Référez-vous à git-pull(1) pour de plus amples détails." -#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 builtin/rebase.c:1254 +#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 +#: builtin/rebase.c:1254 msgid "<remote>" msgstr "<distant>" @@ -18457,8 +19572,11 @@ msgid "There is no tracking information for the current branch." msgstr "Pas d'information de suivi distant pour la branche actuelle." #: builtin/pull.c:480 -msgid "If you wish to set tracking information for this branch you can do so with:" -msgstr "Si vous souhaitez indiquer l'information de suivi distant pour cette branche, vous pouvez le faire avec :" +msgid "" +"If you wish to set tracking information for this branch you can do so with:" +msgstr "" +"Si vous souhaitez indiquer l'information de suivi distant pour cette " +"branche, vous pouvez le faire avec :" #: builtin/pull.c:485 #, c-format @@ -18466,7 +19584,8 @@ msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "" -"Votre information de configuration indique de fusionner avec la référence '%s'\n" +"Votre information de configuration indique de fusionner avec la référence " +"'%s'\n" "du serveur distant, mais cette référence n'a pas été récupérée." #: builtin/pull.c:596 @@ -18488,7 +19607,8 @@ msgid "" " 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" +"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" @@ -18506,19 +19626,21 @@ msgstr "" "passer --rebase, --no-rebase ou --ff-only sur la ligne de commande pour\n" "remplacer à l'invocation la valeur par défaut configurée.\n" -#: builtin/pull.c:991 +#: builtin/pull.c:990 msgid "Updating an unborn branch with changes added to the index." -msgstr "Mise à jour d'une branche non encore créée avec les changements ajoutés dans l'index." +msgstr "" +"Mise à jour d'une branche non encore créée avec les changements ajoutés dans " +"l'index." -#: builtin/pull.c:995 +#: builtin/pull.c:994 msgid "pull with rebase" msgstr "tirer avec un rebasage" -#: builtin/pull.c:996 +#: builtin/pull.c:995 msgid "please commit or stash them." msgstr "veuillez les valider ou les remiser." -#: builtin/pull.c:1021 +#: builtin/pull.c:1020 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -18529,7 +19651,7 @@ msgstr "" "avance rapide de votre copie de travail\n" "depuis le commit %s." -#: builtin/pull.c:1027 +#: builtin/pull.c:1026 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -18546,17 +19668,19 @@ msgstr "" "$ git reset --hard\n" "pour régénérer." -#: builtin/pull.c:1042 +#: builtin/pull.c:1041 msgid "Cannot merge multiple branches into empty head." msgstr "Impossible de fusionner de multiples branches sur une tête vide." -#: builtin/pull.c:1046 +#: builtin/pull.c:1045 msgid "Cannot rebase onto multiple branches." msgstr "Impossible de rebaser sur de multiples branches." -#: builtin/pull.c:1067 +#: builtin/pull.c:1065 msgid "cannot rebase with locally recorded submodule modifications" -msgstr "impossible de rebaser avec des modifications de sous-modules enregistrées localement" +msgstr "" +"impossible de rebaser avec des modifications de sous-modules enregistrées " +"localement" #: builtin/push.c:19 msgid "git push [<options>] [<repository> [<refspec>...]]" @@ -18576,7 +19700,8 @@ msgid "" "To choose either option permanently, see push.default in 'git help config'." msgstr "" "\n" -"Pour choisir l'option de manière permanente, voir push.default dans 'git help config'." +"Pour choisir l'option de manière permanente, voir push.default dans 'git " +"help config'." #: builtin/push.c:167 #, c-format @@ -18618,7 +19743,7 @@ msgstr "" "\n" " git push %s HEAD:<nom-de-la-branche-amont>\n" -#: builtin/push.c:194 +#: builtin/push.c:191 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -18627,16 +19752,25 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" "La branche courante %s n'a pas de branche amont.\n" -"Pour pousser la branche courante et définir la distante comme amont, utilisez\n" +"Pour pousser la branche courante et définir la distante comme amont, " +"utilisez\n" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:202 +#: builtin/push.c:199 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." -msgstr "La branche courante %s a de multiples branches amont, impossible de pousser." +msgstr "" +"La branche courante %s a de multiples branches amont, impossible de pousser." + +#: builtin/push.c:217 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" +"Vous n'avez pas spécifié de spécifications de référence à pousser, et push." +"default est \"nothing\"." -#: builtin/push.c:205 +#: builtin/push.c:243 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -18647,35 +19781,37 @@ msgstr "" "qui n'est pas l'amont de votre branche courante '%s', sans\n" "me dire quoi pousser pour mettre à jour quelle branche amont." -#: builtin/push.c:260 -msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "Vous n'avez pas spécifié de spécifications de référence à pousser, et push.default est \"nothing\"." - -#: builtin/push.c:267 +#: builtin/push.c:258 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" "'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -"Les mises à jour ont été rejetées car la pointe de la branche courante est derrière\n" -"son homologue distant. Intégrez les changements distants (par exemple 'git pull ...')\n" +"Les mises à jour ont été rejetées car la pointe de la branche courante est " +"derrière\n" +"son homologue distant. Intégrez les changements distants (par exemple 'git " +"pull ...')\n" "avant de pousser à nouveau.\n" -"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus d'information." +"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " +"d'information." -#: builtin/push.c:273 +#: builtin/push.c:264 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" "(e.g. 'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -"Les mises à jour ont été rejetées car la pointe de la branche courante est derrière\n" -"son homologue distant. Extrayez cette branche et intégrez les changements distants\n" +"Les mises à jour ont été rejetées car la pointe de la branche courante est " +"derrière\n" +"son homologue distant. Extrayez cette branche et intégrez les changements " +"distants\n" "(par exemple 'git pull ...') avant de pousser à nouveau.\n" -"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus d'information." +"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " +"d'information." -#: builtin/push.c:279 +#: builtin/push.c:270 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -18683,27 +19819,35 @@ msgid "" "(e.g., 'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -"Les mises à jour ont été rejetées car la branche distante contient du travail que\n" -"vous n'avez pas en local. Ceci est généralement causé par un autre dépôt poussé\n" -"vers la même référence. Vous pourriez intégrer d'abord les changements distants\n" +"Les mises à jour ont été rejetées car la branche distante contient du " +"travail que\n" +"vous n'avez pas en local. Ceci est généralement causé par un autre dépôt " +"poussé\n" +"vers la même référence. Vous pourriez intégrer d'abord les changements " +"distants\n" "(par exemple 'git pull ...') avant de pousser à nouveau.\n" -"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus d'information." +"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " +"d'information." -#: builtin/push.c:286 +#: builtin/push.c:277 msgid "Updates were rejected because the tag already exists in the remote." -msgstr "Les mises à jour ont été rejetées car l'étiquette existe déjà dans la branche distante." +msgstr "" +"Les mises à jour ont été rejetées car l'étiquette existe déjà dans la " +"branche distante." -#: builtin/push.c:289 +#: builtin/push.c:280 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "" -"Vous ne pouvez pas mettre à jour une référence distante qui pointe sur un objet qui\n" -"n'est pas un commit, ou mettre à jour une référence distante pour la faire pointer\n" +"Vous ne pouvez pas mettre à jour une référence distante qui pointe sur un " +"objet qui\n" +"n'est pas un commit, ou mettre à jour une référence distante pour la faire " +"pointer\n" "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n" -#: builtin/push.c:294 +#: builtin/push.c:285 msgid "" "Updates were rejected because the tip of the remote-tracking\n" "branch has been updated since the last checkout. You may want\n" @@ -18715,105 +19859,108 @@ msgstr "" "ces changements localement (par exemple 'git pull ...') avant de\n" "forcer à nouveau une mise à jour.\n" -#: builtin/push.c:364 +#: builtin/push.c:355 #, c-format msgid "Pushing to %s\n" msgstr "Poussée vers %s\n" -#: builtin/push.c:371 +#: builtin/push.c:362 #, c-format msgid "failed to push some refs to '%s'" msgstr "impossible de pousser des références vers '%s'" -#: builtin/push.c:553 +#: builtin/push.c:544 msgid "repository" msgstr "dépôt" -#: builtin/push.c:554 builtin/send-pack.c:189 +#: builtin/push.c:545 builtin/send-pack.c:189 msgid "push all refs" msgstr "pousser toutes les références" -#: builtin/push.c:555 builtin/send-pack.c:191 +#: builtin/push.c:546 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "refléter toutes les références" -#: builtin/push.c:557 +#: builtin/push.c:548 msgid "delete refs" msgstr "supprimer les références" -#: builtin/push.c:558 +#: builtin/push.c:549 msgid "push tags (can't be used with --all or --mirror)" -msgstr "pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)" +msgstr "" +"pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)" -#: builtin/push.c:561 builtin/send-pack.c:192 +#: builtin/push.c:552 builtin/send-pack.c:192 msgid "force updates" msgstr "forcer les mises à jour" -#: builtin/push.c:562 builtin/send-pack.c:204 +#: builtin/push.c:553 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "<nom-de-ref>:<attendu>" -#: builtin/push.c:563 builtin/send-pack.c:205 +#: builtin/push.c:554 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur" -#: builtin/push.c:566 builtin/send-pack.c:208 +#: builtin/push.c:557 builtin/send-pack.c:208 msgid "require remote updates to be integrated locally" msgstr "exiger des mises à jours distantes pour une intégration locale" -#: builtin/push.c:569 +#: builtin/push.c:560 msgid "control recursive pushing of submodules" msgstr "contrôler la poussée récursive des sous-modules" -#: builtin/push.c:570 builtin/send-pack.c:199 +#: builtin/push.c:561 builtin/send-pack.c:199 msgid "use thin pack" msgstr "utiliser un empaquetage léger" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 builtin/send-pack.c:187 +#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186 +#: builtin/send-pack.c:187 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:573 +#: builtin/push.c:564 msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:576 +#: builtin/push.c:567 msgid "prune locally removed refs" msgstr "éliminer les références locales supprimées" -#: builtin/push.c:578 +#: builtin/push.c:569 msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:579 +#: builtin/push.c:570 msgid "push missing but relevant tags" msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:581 builtin/send-pack.c:193 +#: builtin/push.c:572 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "signer la poussée avec GPG" -#: builtin/push.c:583 builtin/send-pack.c:200 +#: builtin/push.c:574 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "demande une transaction atomique sur le serveur distant" -#: builtin/push.c:601 +#: builtin/push.c:592 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:603 +#: builtin/push.c:594 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" -#: builtin/push.c:623 +#: builtin/push.c:614 #, c-format msgid "bad repository '%s'" msgstr "mauvais dépôt '%s'" -#: builtin/push.c:624 +#: builtin/push.c:615 msgid "" "No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote repository using\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" "\n" " git remote add <name> <url>\n" "\n" @@ -18822,7 +19969,8 @@ msgid "" " git push <name>\n" msgstr "" "Pas de destination pour pousser.\n" -"Spécifiez une URL depuis la ligne de commande ou configurez un dépôt distant en utilisant\n" +"Spécifiez une URL depuis la ligne de commande ou configurez un dépôt distant " +"en utilisant\n" "\n" " git remote add <nom> <url>\n" "\n" @@ -18830,33 +19978,37 @@ msgstr "" "\n" " git push <nom>\n" -#: builtin/push.c:639 +#: builtin/push.c:630 msgid "--all and --tags are incompatible" msgstr "--all et --tags sont incompatibles" -#: builtin/push.c:641 +#: builtin/push.c:632 msgid "--all can't be combined with refspecs" msgstr "--all ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:645 +#: builtin/push.c:636 msgid "--mirror and --tags are incompatible" msgstr "--mirror et --tags sont incompatibles" -#: builtin/push.c:647 +#: builtin/push.c:638 msgid "--mirror can't be combined with refspecs" msgstr "--mirror ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:650 +#: builtin/push.c:641 msgid "--all and --mirror are incompatible" msgstr "--all et --mirror sont incompatibles" -#: builtin/push.c:657 +#: builtin/push.c:648 msgid "push options must not have new line characters" -msgstr "les options de poussée ne peuvent pas contenir de caractères de nouvelle ligne" +msgstr "" +"les options de poussée ne peuvent pas contenir de caractères de nouvelle " +"ligne" #: builtin/range-diff.c:9 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" -msgstr "git range-diff [<options>] <ancienne-base>..<ancien-sommet> <nouvelle-base>..<nouveau-sommet>" +msgstr "" +"git range-diff [<options>] <ancienne-base>..<ancien-sommet> <nouvelle-base>.." +"<nouveau-sommet>" #: builtin/range-diff.c:10 msgid "git range-diff [<options>] <old-tip>...<new-tip>" @@ -18901,11 +20053,14 @@ msgstr "plage entre deux commits requise" #: builtin/read-tree.c:41 msgid "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-" -"output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " +"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<préfixe>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-" -"output=<fichier>] (--empty | <arbre-esque> [<arbre-esque 2> [<arbre-esque 3>]])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<préfixe>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-" +"sparse-checkout] [--index-output=<fichier>] (--empty | <arbre-esque> [<arbre-" +"esque 2> [<arbre-esque 3>]])" #: builtin/read-tree.c:124 msgid "write resulting index to <file>" @@ -18980,12 +20135,19 @@ msgid "You need to resolve your current index first" msgstr "Vous devez d'abord résoudre votre index courant" #: builtin/rebase.c:35 -msgid "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]" -msgstr "git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base> | --keep-base] [<amont> [<branche>]]" +msgid "" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" +msgstr "" +"git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base> | --keep-" +"base] [<amont> [<branche>]]" #: builtin/rebase.c:37 -msgid "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" -msgstr "git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base>] --root [<branche>]" +msgid "" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" +msgstr "" +"git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base>] --root " +"[<branche>]" #: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" @@ -19182,11 +20344,13 @@ msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" "You can instead skip this commit: run \"git rebase --skip\".\n" -"To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"." +"To abort and get back to the state before \"git rebase\", run \"git rebase --" +"abort\"." msgstr "" "Résolvez tous les conflits manuellement, marquez-les comme résolus avec\n" "\"git add/rm <fichier en conflit>\", puis lancez \"git rebase --continue\".\n" -"Si vous préférez sauter ce commit, lancez \"git rebase --skip\". Pour arrêter\n" +"Si vous préférez sauter ce commit, lancez \"git rebase --skip\". Pour " +"arrêter\n" "et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"." #: builtin/rebase.c:896 @@ -19210,8 +20374,12 @@ msgstr "" #: builtin/rebase.c:1222 #, c-format -msgid "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"." -msgstr "type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), \"keep\" (garder) et \"ask\" (demander)." +msgid "" +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" +"\"." +msgstr "" +"type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), " +"\"keep\" (garder) et \"ask\" (demander)." #: builtin/rebase.c:1240 #, c-format @@ -19238,7 +20406,8 @@ msgid "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" msgstr "" -"Si vous souhaitez indiquer l'information de suivi distant pour cette branche, vous pouvez le faire avec :\n" +"Si vous souhaitez indiquer l'information de suivi distant pour cette " +"branche, vous pouvez le faire avec :\n" "\n" " git branch --set-upstream-to=%s/<branche> %s\n" "\n" @@ -19257,7 +20426,8 @@ msgstr "rebaser sur la branche %s au lieu de la branche amont" #: builtin/rebase.c:1321 msgid "use the merge-base of upstream and branch as the current base" -msgstr "utiliser la base de fusion de l'amont et la branche comme base actuelle" +msgstr "" +"utiliser la base de fusion de l'amont et la branche comme base actuelle" #: builtin/rebase.c:1323 msgid "allow pre-rebase hook to run" @@ -19289,7 +20459,7 @@ msgstr "synonyme pour --reset-author-date" #: builtin/rebase.c:1343 builtin/rebase.c:1347 msgid "passed to 'git apply'" -msgstr "passé jusqu'à git-apply" +msgstr "passé jusqu'à git apply" #: builtin/rebase.c:1345 msgid "ignore changes in whitespace" @@ -19381,15 +20551,19 @@ msgstr "rebaser tous les objets inatteignables depuis les racines" #: builtin/rebase.c:1424 msgid "apply all changes, even those already present upstream" -msgstr "appliquer toutes les modifications, même celles déjà présentes en amont" +msgstr "" +"appliquer toutes les modifications, même celles déjà présentes en amont" #: builtin/rebase.c:1442 msgid "It looks like 'git am' is in progress. Cannot rebase." -msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser." +msgstr "Il semble que 'git am' soit en cours. Impossible de rebaser." #: builtin/rebase.c:1483 -msgid "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." -msgstr "git rebase --preserve-merges est déconseillé. Utilisez --rebase-merges à la place." +msgid "" +"git rebase --preserve-merges is deprecated. Use --rebase-merges instead." +msgstr "" +"git rebase --preserve-merges est déconseillé. Utilisez --rebase-merges à la " +"place." #: builtin/rebase.c:1488 msgid "cannot combine '--keep-base' with '--onto'" @@ -19409,9 +20583,11 @@ msgstr "Pas de rebasage en cours ?" #: builtin/rebase.c:1501 msgid "The --edit-todo action can only be used during interactive rebase." -msgstr "L'action --edit-todo peut seulement être utilisée lors d'un rebasage interactif." +msgstr "" +"L'action --edit-todo peut seulement être utilisée lors d'un rebasage " +"interactif." -#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" @@ -19450,7 +20626,8 @@ msgstr "" "\t%s\n" "Sinon, essayez\n" "\t%s\n" -"puis relancez-moi à nouveau. Je m'arrête au cas où vous auriez quelque chose\n" +"puis relancez-moi à nouveau. Je m'arrête au cas où vous auriez quelque " +"chose\n" "d'important ici.\n" #: builtin/rebase.c:1648 @@ -19468,7 +20645,8 @@ msgstr "--strategy requiert --merge ou --interactive" #: builtin/rebase.c:1759 msgid "cannot combine apply options with merge options" -msgstr "impossible de combiner les options d'application avec les options de fusion" +msgstr "" +"impossible de combiner les options d'application avec les options de fusion" #: builtin/rebase.c:1772 #, c-format @@ -19484,8 +20662,11 @@ msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'" #: builtin/rebase.c:1826 -msgid "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" -msgstr "erreur : impossible de combiner '--preserve-merges' avec '--reschedule-failed-exec'" +msgid "" +"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" +msgstr "" +"erreur : impossible de combiner '--preserve-merges' avec '--reschedule-" +"failed-exec'" #: builtin/rebase.c:1850 #, c-format @@ -19516,7 +20697,8 @@ msgstr "Ne pointe pas sur une validation valide : '%s'" msgid "fatal: no such branch/commit '%s'" msgstr "fatal : pas de branche ou commit '%s'" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:40 builtin/submodule--helper.c:2415 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:39 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Référence inexistante : %s" @@ -19569,7 +20751,9 @@ msgstr "Changements de %s sur %s :\n" #: builtin/rebase.c:2063 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" -msgstr "Rembobinage préalable de head pour pouvoir rejouer votre travail par-dessus...\n" +msgstr "" +"Rembobinage préalable de head pour pouvoir rejouer votre travail par-" +"dessus...\n" #: builtin/rebase.c:2072 msgid "Could not detach HEAD" @@ -19584,7 +20768,7 @@ msgstr "Avance rapide de %s sur %s.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <répertoire-git>" -#: builtin/receive-pack.c:1276 +#: builtin/receive-pack.c:1275 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" @@ -19614,7 +20798,7 @@ msgstr "" "Pour éliminer ce message et conserver le comportement par défaut,\n" "réglez « receive.denyCurrentBranch » à 'refuse'." -#: builtin/receive-pack.c:1296 +#: builtin/receive-pack.c:1295 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" @@ -19634,22 +20818,31 @@ msgstr "" "\n" "Pour éliminer ce message, réglez-le à 'refuse'." -#: builtin/receive-pack.c:2479 +#: builtin/receive-pack.c:2478 msgid "quiet" msgstr "quiet" -#: builtin/receive-pack.c:2493 +#: builtin/receive-pack.c:2492 msgid "You must specify a directory." msgstr "Vous devez spécifier un répertoire." #: builtin/reflog.c:17 -msgid "git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <refs>..." +msgid "" +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--" +"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " +"<refs>..." msgstr "" -"git reflog expire [--expire=<date>] [--expire-unreachable=<date>] [--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <réferences>..." +"git reflog expire [--expire=<date>] [--expire-unreachable=<date>] [--" +"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " +"<réferences>..." #: builtin/reflog.c:22 -msgid "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <refs>..." -msgstr "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <références>..." +msgid "" +"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " +"<refs>..." +msgstr "" +"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " +"<références>..." #: builtin/reflog.c:25 msgid "git reflog exists <ref>" @@ -19698,8 +20891,12 @@ msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" #: builtin/remote.c:18 -msgid "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <name> <url>" -msgstr "git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <nom> <url>" +msgid "" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" +"mirror=<fetch|push>] <name> <url>" +msgstr "" +"git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--" +"mirror=<fetch|push>] <nom> <url>" #: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" @@ -19722,8 +20919,11 @@ msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nom>" #: builtin/remote.c:24 -msgid "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" -msgstr "git remote [-v | --verbose] update [-p | --prune] [(<groupe> | <distante>)...]" +msgid "" +"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" +msgstr "" +"git remote [-v | --verbose] update [-p | --prune] [(<groupe> | " +"<distante>)...]" #: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." @@ -19793,7 +20993,8 @@ msgstr "rapatrier les branches distantes" #: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" -msgstr "importer toutes les étiquettes et les objets associés lors du rapatriement" +msgstr "" +"importer toutes les étiquettes et les objets associés lors du rapatriement" #: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" @@ -19809,7 +21010,8 @@ msgstr "branche maîtresse" #: builtin/remote.c:174 msgid "set up remote as a mirror to push to or fetch from" -msgstr "paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis" +msgstr "" +"paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis" #: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" @@ -19817,7 +21019,9 @@ msgstr "spécifier une branche maîtresse n'a pas de sens avec --mirror" #: builtin/remote.c:188 msgid "specifying branches to track makes sense only with fetch mirrors" -msgstr "spécifier les branches à suivre n'a de sens qu'avec des miroirs de rapatriement" +msgstr "" +"spécifier les branches à suivre n'a de sens qu'avec des miroirs de " +"rapatriement" #: builtin/remote.c:195 builtin/remote.c:700 #, c-format @@ -19832,7 +21036,9 @@ msgstr "Impossible de paramétrer la maîtresse '%s'" #: builtin/remote.c:355 #, c-format msgid "Could not get fetch map for refspec %s" -msgstr "Impossible d'obtenir une correspondance distante pour la spécification de référence %s" +msgstr "" +"Impossible d'obtenir une correspondance distante pour la spécification de " +"référence %s" #: builtin/remote.c:454 builtin/remote.c:462 msgid "(matching)" @@ -19900,7 +21106,8 @@ msgstr[0] "" "Note : Une branche en dehors de refs/remotes/ n'a pas été supprimée ;\n" "pour la supprimer, utilisez :" msgstr[1] "" -"Note : Plusieurs branches en dehors de refs/remotes/ n'ont pas été supprimées ;\n" +"Note : Plusieurs branches en dehors de refs/remotes/ n'ont pas été " +"supprimées ;\n" "pour les supprimer, utilisez :" #: builtin/remote.c:896 @@ -20042,8 +21249,11 @@ msgstr "(inconnu)" #: builtin/remote.c:1265 #, c-format -msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" -msgstr " Branche HEAD (la HEAD distante est ambiguë, peut être l'une des suivantes) :\n" +msgid "" +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr "" +" Branche HEAD (la HEAD distante est ambiguë, peut être l'une des " +"suivantes) :\n" #: builtin/remote.c:1277 #, c-format @@ -20087,7 +21297,9 @@ msgstr "Impossible de déterminer la HEAD distante" #: builtin/remote.c:1343 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" -msgstr "Il y a de multiples branches HEAD distantes. Veuillez en choisir une explicitement avec :" +msgstr "" +"Il y a de multiples branches HEAD distantes. Veuillez en choisir une " +"explicitement avec :" #: builtin/remote.c:1353 #, c-format @@ -20203,20 +21415,26 @@ msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -"Les repaquetages incrémentaux sont incompatibles avec les index bitmap. Utilisez\n" +"Les repaquetages incrémentaux sont incompatibles avec les index bitmap. " +"Utilisez\n" "--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps." #: builtin/repack.c:198 msgid "could not start pack-objects to repack promisor objects" -msgstr "ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur" +msgstr "" +"ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur" #: builtin/repack.c:270 builtin/repack.c:630 msgid "repack: Expecting full hex object ID lines only from pack-objects." -msgstr "repack : attente de lignes d'Id d'objets en hexa complet seulement depuis les objects de paquet." +msgstr "" +"repack : attente de lignes d'Id d'objets en hexa complet seulement depuis " +"les objects de paquet." #: builtin/repack.c:294 msgid "could not finish pack-objects to repack promisor objects" -msgstr "impossible de terminer pack-objects pour ré-empaqueter les objets de prometteur" +msgstr "" +"impossible de terminer pack-objects pour ré-empaqueter les objets de " +"prometteur" #: builtin/repack.c:309 #, c-format @@ -20226,7 +21444,9 @@ msgstr "impossible d'ouvrir l'index pour %s" #: builtin/repack.c:368 #, c-format msgid "pack %s too large to consider in geometric progression" -msgstr "le paquet %s est trop gros pour être pris en compte dans un progression géométrique" +msgstr "" +"le paquet %s est trop gros pour être pris en compte dans un progression " +"géométrique" #: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413 #, c-format @@ -20255,7 +21475,7 @@ msgstr "passer --no-reuse-object à git-pack-objects" #: builtin/repack.c:471 msgid "do not run git-update-server-info" -msgstr "ne pas lancer git update-server-info" +msgstr "ne pas lancer git-update-server-info" #: builtin/repack.c:474 msgid "pass --local to git-pack-objects" @@ -20291,7 +21511,8 @@ msgstr "octets" #: builtin/repack.c:486 msgid "same as the above, but limit memory size instead of entries count" -msgstr "idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments" +msgstr "" +"idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments" #: builtin/repack.c:488 msgid "limits the maximum delta depth" @@ -20326,7 +21547,6 @@ msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable et -A sont incompatibles" #: builtin/repack.c:527 -#| msgid "--long is incompatible with --abbrev=0" msgid "--geometric is incompatible with -A, -a" msgstr "--geometric est incompatible avec -A, -a" @@ -20447,7 +21667,8 @@ msgstr "fstat de %s impossible" msgid "unable to write object to database" msgstr "impossible d'écrire l'objet dans la base de données" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 builtin/replace.c:454 +#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 +#: builtin/replace.c:454 #, c-format msgid "not a valid object name: '%s'" msgstr "nom d'objet invalide : '%s'" @@ -20483,8 +21704,12 @@ msgstr "étiquette de fusion malformée dans le commit '%s'" #: builtin/replace.c:430 #, c-format -msgid "original commit '%s' contains mergetag '%s' that is discarded; use --edit instead of --graft" -msgstr "le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; utilisez --edit au lieu de --graft" +msgid "" +"original commit '%s' contains mergetag '%s' that is discarded; use --edit " +"instead of --graft" +msgstr "" +"le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; " +"utilisez --edit au lieu de --graft" #: builtin/replace.c:469 #, c-format @@ -20589,32 +21814,38 @@ msgstr "-l n'accepte qu'un motifs" #: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget <chemin>... | status | remaining | diff | gc]" +msgstr "" +"git rerere [clear | forget <chemin>... | status | remaining | diff | gc]" -#: builtin/rerere.c:60 +#: builtin/rerere.c:58 msgid "register clean resolutions in index" msgstr "enregistrer des résolutions propres dans l'index" -#: builtin/rerere.c:79 +#: builtin/rerere.c:77 msgid "'git rerere forget' without paths is deprecated" msgstr "'git rerere forget' sans chemin est obsolète" -#: builtin/rerere.c:113 +#: builtin/rerere.c:111 #, c-format msgid "unable to generate diff for '%s'" msgstr "échec de la génération de diff pour '%s'" #: builtin/reset.c:32 -msgid "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" -msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgid "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" +msgstr "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" #: builtin/reset.c:33 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." -msgstr "git reset [-q] [<arbre ou apparenté>] [--] <spécificateur-de-chemin>..." +msgstr "" +"git reset [-q] [<arbre ou apparenté>] [--] <spécificateur-de-chemin>..." #: builtin/reset.c:34 -msgid "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" -msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<arbre-esque>]" +msgid "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" +msgstr "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<arbre-esque>]" #: builtin/reset.c:35 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" @@ -20663,7 +21894,8 @@ msgstr "HEAD est maintenant à %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion." -#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663 builtin/stash.c:687 +#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663 +#: builtin/stash.c:687 msgid "be quiet, only report errors" msgstr "être silencieux, afficher seulement les erreurs" @@ -20685,7 +21917,9 @@ msgstr "réinitialiser HEAD mais garder les changements locaux" #: builtin/reset.c:310 msgid "record only the fact that removed paths will be added later" -msgstr "enregistrer seulement le fait que les chemins effacés seront ajoutés plus tard" +msgstr "" +"enregistrer seulement le fait que les chemins effacés seront ajoutés plus " +"tard" #: builtin/reset.c:344 #, c-format @@ -20703,7 +21937,9 @@ msgstr "--patch est incompatible avec --{hard,mixed,soft}" #: builtin/reset.c:371 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." -msgstr "--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la place." +msgstr "" +"--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la " +"place." #: builtin/reset.c:373 #, c-format @@ -20732,8 +21968,10 @@ msgid "" "to make this the default.\n" msgstr "" "\n" -"Les modifications non-indexées ont pris %.2f secondes à énumérer après reset.\n" -"Vous pouvez utiliser '--quiet' pour éviter ce message. Réglez le paramètre de\n" +"Les modifications non-indexées ont pris %.2f secondes à énumérer après " +"reset.\n" +"Vous pouvez utiliser '--quiet' pour éviter ce message. Réglez le paramètre " +"de\n" "config reset.quiet à true pour avoir ce comportement en permanence.\n" #: builtin/reset.c:434 @@ -20745,19 +21983,19 @@ msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'." msgid "Could not write new index file." msgstr "Impossible d'écrire le nouveau fichier d'index." -#: builtin/rev-list.c:538 +#: builtin/rev-list.c:541 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "impossible de combiner --exclude-promisor-objects et --missing" -#: builtin/rev-list.c:599 +#: builtin/rev-list.c:602 msgid "object filtering requires --objects" msgstr "le filtrage d'objet exige --objects" -#: builtin/rev-list.c:659 +#: builtin/rev-list.c:674 msgid "rev-list does not support display of notes" msgstr "rev-list ne supporte l'affichage des notes" -#: builtin/rev-list.c:664 +#: builtin/rev-list.c:679 msgid "marked counting is incompatible with --objects" msgstr "le comptage marqué est incompatible avec --objects" @@ -20777,6 +22015,18 @@ msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option" msgid "output in stuck long form" msgstr "sortie en forme longue fixée" +#: builtin/rev-parse.c:438 +msgid "premature end of input" +msgstr "fin prématurée de l'entrée" + +#: builtin/rev-parse.c:442 +msgid "no usage string given before the `--' separator" +msgstr "pas de chaîne d'usage fournie avant le séparateur `--'" + +#: builtin/rev-parse.c:548 +msgid "Needed a single revision" +msgstr "Une seule révision attendue" + #: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" @@ -20789,7 +22039,52 @@ msgstr "" " ou : git rev-parse --sq-quote [<argument>...]\n" " ou : git rev-parse [options] [<argument>...]\n" "\n" -"Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur l'utilisation principale." +"Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur " +"l'utilisation principale." + +#: builtin/rev-parse.c:712 +msgid "--resolve-git-dir requires an argument" +msgstr "--resolve-git-dir exige un argument" + +#: builtin/rev-parse.c:715 +#, c-format +msgid "not a gitdir '%s'" +msgstr "'%s' n'est pas un gitdir" + +#: builtin/rev-parse.c:739 +msgid "--git-path requires an argument" +msgstr "--git-path exige un argument" + +#: builtin/rev-parse.c:749 +msgid "-n requires an argument" +msgstr "-n exige un argument" + +#: builtin/rev-parse.c:763 +msgid "--path-format requires an argument" +msgstr "--path-format exige un argument" + +#: builtin/rev-parse.c:769 +#, c-format +msgid "unknown argument to --path-format: %s" +msgstr "argument inconnu pour --path-format : %s" + +#: builtin/rev-parse.c:776 +msgid "--default requires an argument" +msgstr "--default exige un argument" + +#: builtin/rev-parse.c:782 +msgid "--prefix requires an argument" +msgstr "--prefix exige un argument" + +#: builtin/rev-parse.c:851 +#, c-format +msgid "unknown mode for --abbrev-ref: %s" +msgstr "mode inconnu pour --abbrev-ref : %s" + +#: builtin/rev-parse.c:1023 +#, c-format +msgid "unknown mode for --show-object-format: %s" +msgstr "mode inconnu pour --show-object-format : %s" #: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." @@ -20945,11 +22240,14 @@ msgstr "sortir avec un état zéro même si rien ne correspondait" #: builtin/rm.c:283 msgid "No pathspec was given. Which files should I remove?" -msgstr "Aucun spécificateur de chemin fourni. Quel fichier doit être supprimé ?" +msgstr "" +"Aucun spécificateur de chemin fourni. Quel fichier doit être supprimé ?" #: builtin/rm.c:310 msgid "please stage your changes to .gitmodules or stash them to proceed" -msgstr "veuillez indexer vos modifications de .gitmodules ou les remiser pour continuer" +msgstr "" +"veuillez indexer vos modifications de .gitmodules ou les remiser pour " +"continuer" #: builtin/rm.c:331 #, c-format @@ -20963,12 +22261,16 @@ msgstr "git rm : impossible de supprimer %s" #: builtin/send-pack.c:20 msgid "" -"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]\n" +"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" +"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " +"[<ref>...]\n" " --all and explicit <ref> specification are mutually exclusive." msgstr "" -"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<hôte>:]<répertoire> " +"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" +"receive-pack>] [--verbose] [--thin] [--atomic] [<hôte>:]<répertoire> " "[<référence>...]\n" -" --all et la spécification explicite de <référence> sont mutuellement exclusifs." +" --all et la spécification explicite de <référence> sont mutuellement " +"exclusifs." #: builtin/send-pack.c:188 msgid "remote name" @@ -20996,7 +22298,8 @@ msgstr "git log --pretty=short | git shortlog [<options>]" #: builtin/shortlog.c:123 msgid "using multiple --group options with stdin is not supported" -msgstr "l'utilisation de plusieurs options --group avec stdin n'est pas supportée" +msgstr "" +"l'utilisation de plusieurs options --group avec stdin n'est pas supportée" #: builtin/shortlog.c:133 msgid "using --group=trailer with stdin is not supported" @@ -21017,7 +22320,9 @@ msgstr "trier la sortie sur le nombre de validations par auteur" #: builtin/shortlog.c:356 msgid "suppress commit descriptions, only provides commit count" -msgstr "supprimer les descriptions de validation, fournit seulement le nombre de validations" +msgstr "" +"supprimer les descriptions de validation, fournit seulement le nombre de " +"validations" #: builtin/shortlog.c:358 msgid "show the email address of each author" @@ -21117,7 +22422,8 @@ msgstr "afficher les validations dans l'ordre topologique" #: builtin/show-branch.c:667 msgid "show only commits not on the first branch" -msgstr "afficher seulement les validations qui ne sont pas sur la première branche" +msgstr "" +"afficher seulement les validations qui ne sont pas sur la première branche" #: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" @@ -21133,11 +22439,13 @@ msgstr "<n>[,<base>]" #: builtin/show-branch.c:675 msgid "show <n> most recent ref-log entries starting at base" -msgstr "afficher les <n> plus récents éléments de ref-log en commençant à la base" +msgstr "" +"afficher les <n> plus récents éléments de ref-log en commençant à la base" #: builtin/show-branch.c:711 -msgid "--reflog is incompatible with --all, --remotes, --independent or --merge-base" -msgstr "--reflog est incompatible avec --all, --remotes, --independant et --merge-base" +msgid "" +"--reflog is incompatible with --all, --remotes, --independent or --merge-base" +msgstr "--reflog est incompatible avec --all, --remotes, --independent et --merge-base" #: builtin/show-branch.c:735 msgid "no branches given, and HEAD is not valid" @@ -21185,8 +22493,12 @@ msgid "Unknown hash algorithm" msgstr "Algorithme d'empreinte inconnu" #: builtin/show-ref.c:12 -msgid "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" -msgstr "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]" +msgid "" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" +msgstr "" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]" #: builtin/show-ref.c:13 msgid "git show-ref --exclude-existing[=<pattern>]" @@ -21202,7 +22514,9 @@ msgstr "afficher seulement les têtes (peut être combiné avec tags)" #: builtin/show-ref.c:164 msgid "stricter reference checking, requires exact ref path" -msgstr "vérification de référence plus stricte, nécessite un chemin de référence exact" +msgstr "" +"vérification de référence plus stricte, nécessite un chemin de référence " +"exact" #: builtin/show-ref.c:167 builtin/show-ref.c:169 msgid "show the HEAD reference, even if it would be filtered out" @@ -21218,11 +22532,14 @@ msgstr "afficher seulement le hachage SHA1 en utilisant <n> chiffres" #: builtin/show-ref.c:177 msgid "do not print results to stdout (useful with --verify)" -msgstr "ne pas afficher les résultats sur la sortie standard (pratique avec --verify)" +msgstr "" +"ne pas afficher les résultats sur la sortie standard (pratique avec --verify)" #: builtin/show-ref.c:179 msgid "show refs from stdin that aren't in local repository" -msgstr "afficher les références de l'entrée standard qui ne sont pas dans le dépôt local" +msgstr "" +"afficher les références de l'entrée standard qui ne sont pas dans le dépôt " +"local" #: builtin/sparse-checkout.c:22 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" @@ -21234,22 +22551,25 @@ msgstr "git sparse-checkout list" #: builtin/sparse-checkout.c:72 msgid "this worktree is not sparse (sparse-checkout file may not exist)" -msgstr "cet arbre de travail n'est pas clairsemé (le fichier sparse-checkout pourrait ne pas exister)" +msgstr "" +"cet arbre de travail n'est pas clairsemé (le fichier sparse-checkout " +"pourrait ne pas exister)" #: builtin/sparse-checkout.c:227 msgid "failed to create directory for sparse-checkout file" -msgstr "échec de la création du répertoire pour le fichier d'extraction clairsemée" +msgstr "" +"échec de la création du répertoire pour le fichier d'extraction clairsemée" #: builtin/sparse-checkout.c:268 msgid "unable to upgrade repository format to enable worktreeConfig" -msgstr "impossible de mettre à jour le format de dépôt pour activer worktreeConfig" +msgstr "" +"impossible de mettre à jour le format de dépôt pour activer worktreeConfig" #: builtin/sparse-checkout.c:270 msgid "failed to set extensions.worktreeConfig setting" msgstr "échec de paramétrage extensions.worktreeConfig" #: builtin/sparse-checkout.c:290 -#| msgid "git sparse-checkout init [--cone]" msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" @@ -21324,10 +22644,6 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<remise>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <nom-de-branche> [<remise>]" -#: builtin/stash.c:29 builtin/stash.c:70 -msgid "git stash clear" -msgstr "git stash clear" - #: builtin/stash.c:30 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" @@ -21400,7 +22716,8 @@ msgid "" " %s -> %s\n" " to make room.\n" msgstr "" -"AVERTISSEMENT : un fichier non-suivi en travers d'un fichier suivi ! Renommage\n" +"AVERTISSEMENT : un fichier non-suivi en travers d'un fichier suivi ! " +"Renommage\n" " %s -> %s\n" " pour faire de la place.\n" @@ -21455,7 +22772,8 @@ msgstr "'%s' n'est pas une référence de remisage" #: builtin/stash.c:701 msgid "The stash entry is kept in case you need it again." -msgstr "L'entrée de remisage est conservée au cas où vous en auriez encore besoin." +msgstr "" +"L'entrée de remisage est conservée au cas où vous en auriez encore besoin." #: builtin/stash.c:724 msgid "No branch name specified" @@ -21477,93 +22795,94 @@ msgstr "inclure les fichiers non suivis dans le remisage" msgid "only show untracked files in the stash" msgstr "ne montrer que les fichiers non suivis dans le remisage" -#: builtin/stash.c:932 builtin/stash.c:969 +#: builtin/stash.c:929 builtin/stash.c:966 #, c-format msgid "Cannot update %s with %s" msgstr "Impossible de mettre à jour %s avec %s" -#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671 +#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667 msgid "stash message" msgstr "message pour le remisage" -#: builtin/stash.c:960 +#: builtin/stash.c:957 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" exige un argument <commit>" -#: builtin/stash.c:1175 +#: builtin/stash.c:1171 msgid "No changes selected" msgstr "Aucun changement sélectionné" -#: builtin/stash.c:1275 +#: builtin/stash.c:1271 msgid "You do not have the initial commit yet" msgstr "Vous n'avez pas encore la validation initiale" -#: builtin/stash.c:1302 +#: builtin/stash.c:1298 msgid "Cannot save the current index state" msgstr "Impossible de sauver l'état courant de l'index" -#: builtin/stash.c:1311 +#: builtin/stash.c:1307 msgid "Cannot save the untracked files" msgstr "Impossible de sauver les fichiers non-suivis" -#: builtin/stash.c:1322 builtin/stash.c:1331 +#: builtin/stash.c:1318 builtin/stash.c:1327 msgid "Cannot save the current worktree state" msgstr "Impossible de sauver l'état courant de la copie de travail" -#: builtin/stash.c:1359 +#: builtin/stash.c:1355 msgid "Cannot record working tree state" msgstr "Impossible d'enregistrer l'état de la copie de travail" -#: builtin/stash.c:1408 +#: builtin/stash.c:1404 msgid "Can't use --patch and --include-untracked or --all at the same time" -msgstr "Impossible d'utiliser --patch et --include-untracked ou --all en même temps" +msgstr "" +"Impossible d'utiliser --patch et --include-untracked ou --all en même temps" -#: builtin/stash.c:1426 +#: builtin/stash.c:1422 msgid "Did you forget to 'git add'?" msgstr "Vous avez sûrement oublié 'git add' ?" -#: builtin/stash.c:1441 +#: builtin/stash.c:1437 msgid "No local changes to save" msgstr "Pas de modifications locales à sauver" -#: builtin/stash.c:1448 +#: builtin/stash.c:1444 msgid "Cannot initialize stash" msgstr "Impossible d'initialiser le remisage" -#: builtin/stash.c:1463 +#: builtin/stash.c:1459 msgid "Cannot save the current status" msgstr "Impossible de sauver l'état courant" -#: builtin/stash.c:1468 +#: builtin/stash.c:1464 #, c-format msgid "Saved working directory and index state %s" msgstr "Arbre de travail et état de l'index sauvegardés dans %s" -#: builtin/stash.c:1558 +#: builtin/stash.c:1554 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: builtin/stash.c:1597 builtin/stash.c:1662 +#: builtin/stash.c:1593 builtin/stash.c:1658 msgid "keep index" msgstr "conserver l'index" -#: builtin/stash.c:1599 builtin/stash.c:1664 +#: builtin/stash.c:1595 builtin/stash.c:1660 msgid "stash in patch mode" msgstr "remiser une mode rustine" -#: builtin/stash.c:1600 builtin/stash.c:1665 +#: builtin/stash.c:1596 builtin/stash.c:1661 msgid "quiet mode" msgstr "mode silencieux" -#: builtin/stash.c:1602 builtin/stash.c:1667 +#: builtin/stash.c:1598 builtin/stash.c:1663 msgid "include untracked files in stash" msgstr "inclure les fichiers non suivis dans la remise" -#: builtin/stash.c:1604 builtin/stash.c:1669 +#: builtin/stash.c:1600 builtin/stash.c:1665 msgid "include ignore files" msgstr "inclure les fichiers ignorés" -#: builtin/stash.c:1704 +#: builtin/stash.c:1700 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -21581,45 +22900,48 @@ msgstr "git stripspace [-c | --comment-lines]" #: builtin/stripspace.c:37 msgid "skip and remove all lines starting with comment character" -msgstr "sauter et supprimer toutes les lignes commençant par le caractère de commentaire" +msgstr "" +"sauter et supprimer toutes les lignes commençant par le caractère de " +"commentaire" #: builtin/stripspace.c:40 msgid "prepend comment character and space to each line" msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Nom de référence complet attendu, %s obtenu" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:63 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote n'accepte aucun argument" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:101 #, c-format msgid "cannot strip one component off url '%s'" msgstr "impossible de supprimer un composant de l'URL '%s'" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "ancre alternative pour les chemins relatifs" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:414 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630 builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "Entrée dans '%s'\n" -#: builtin/submodule--helper.c:528 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -21628,220 +22950,253 @@ msgstr "" "run_command a retourné un statut non-nul pour %s\n" "." -#: builtin/submodule--helper.c:550 +#: builtin/submodule--helper.c:549 #, c-format msgid "" -"run_command returned non-zero status while recursing in the nested submodules of %s\n" +"run_command returned non-zero status while recursing in the nested " +"submodules of %s\n" "." msgstr "" -"run_command a retourné un statut non-nul pendant la récursion dans les sous-modules inclus de %s\n" +"run_command a retourné un statut non-nul pendant la récursion dans les sous-" +"modules inclus de %s\n" "." -#: builtin/submodule--helper.c:566 +#: builtin/submodule--helper.c:565 msgid "suppress output of entering each submodule command" -msgstr "supprimer la sortie lors de l'entrée dans chaque commande de sous-module" +msgstr "" +"supprimer la sortie lors de l'entrée dans chaque commande de sous-module" -#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889 builtin/submodule--helper.c:1488 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:1487 msgid "recurse into nested submodules" msgstr "parcourir récursivement les sous-modules" -#: builtin/submodule--helper.c:573 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <commande>" -#: builtin/submodule--helper.c:600 +#: builtin/submodule--helper.c:599 #, c-format -msgid "could not look up configuration '%s'. Assuming this repository is its own authoritative upstream." -msgstr "impossible de trouver la configuration '%s'. Ce dépôt est considéré comme son propre amont d'autorité." +msgid "" +"could not look up configuration '%s'. Assuming this repository is its own " +"authoritative upstream." +msgstr "" +"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme " +"son propre amont d'autorité." -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:666 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:670 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:680 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" -msgstr "attention : nous vous suggérons de spécifier une commande de mode de mise à jour pour le sous-module '%s'\n" +msgstr "" +"attention : nous vous suggérons de spécifier une commande de mode de mise à " +"jour pour le sous-module '%s'\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:687 #, c-format msgid "Failed to register update mode for submodule path '%s'" -msgstr "Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module '%s'" +msgstr "" +"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module " +"'%s'" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:709 msgid "suppress output for initializing a submodule" msgstr "supprimer la sortie lors de l'initialisation d'un sous-module" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<options>] [<chemin>]" -#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" -msgstr "pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le chemin '%s'" +msgstr "" +"pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le " +"chemin '%s'" -#: builtin/submodule--helper.c:836 +#: builtin/submodule--helper.c:835 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "impossible de résoudre HEAD dans le sous-module '%s'" -#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "récursion impossible dans le sous-module '%s'" -#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "suppress submodule status output" msgstr "supprimer la sortie d'état du sous-module" -#: builtin/submodule--helper.c:888 -msgid "use commit stored in the index instead of the one stored in the submodule HEAD" -msgstr "utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD du sous-module" +#: builtin/submodule--helper.c:887 +msgid "" +"use commit stored in the index instead of the one stored in the submodule " +"HEAD" +msgstr "" +"utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD " +"du sous-module" -#: builtin/submodule--helper.c:894 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]" -#: builtin/submodule--helper.c:918 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper <nom> <chemin>" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:989 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:992 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(submodule)->%s(blob)" -#: builtin/submodule--helper.c:1006 +#: builtin/submodule--helper.c:1005 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1056 +#: builtin/submodule--helper.c:1055 #, c-format msgid "couldn't hash object from '%s'" msgstr "impossible de calculer l'empreinte de l'objet depuis '%s'" -#: builtin/submodule--helper.c:1060 +#: builtin/submodule--helper.c:1059 #, c-format msgid "unexpected mode %o\n" msgstr "mode %o inattendu\n" -#: builtin/submodule--helper.c:1301 +#: builtin/submodule--helper.c:1300 msgid "use the commit stored in the index instead of the submodule HEAD" -msgstr "utiliser le commit stocké dans l'index au lieu de la HEAD du sous-module" +msgstr "" +"utiliser le commit stocké dans l'index au lieu de la HEAD du sous-module" -#: builtin/submodule--helper.c:1303 -msgid "to compare the commit in the index with that in the submodule HEAD" -msgstr "pour comparer le commit dans l'index au lieu de celui dans la HEAD du sous-module" +#: builtin/submodule--helper.c:1302 +msgid "compare the commit in the index with that in the submodule HEAD" +msgstr "comparer le commit dans l'index avec celui dans la HEAD du sous-module" -#: builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1304 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "sauter les sous-modules avec la valeur 'ignore_config' à 'all'" -#: builtin/submodule--helper.c:1307 +#: builtin/submodule--helper.c:1306 msgid "limit the summary size" msgstr "limiter la taille du résumé" -#: builtin/submodule--helper.c:1312 +#: builtin/submodule--helper.c:1311 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<chemin>]" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1335 msgid "could not fetch a revision for HEAD" msgstr "impossible de récupérer une révision pour HEAD" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1340 msgid "--cached and --files are mutually exclusive" msgstr "--cached et --files sont mutuellement exclusifs" -#: builtin/submodule--helper.c:1408 +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synchronisation de l'URL sous-module pour '%s'\n" -#: builtin/submodule--helper.c:1414 +#: builtin/submodule--helper.c:1413 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "échec d'enregistrement de l'URL pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:1428 +#: builtin/submodule--helper.c:1427 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "échec d'obtention du dépôt distant par défaut pour le sous-module '%s'" -#: builtin/submodule--helper.c:1439 +#: builtin/submodule--helper.c:1438 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "échec de mise à jour du dépôt distant pour le sous-module '%s'" -#: builtin/submodule--helper.c:1486 +#: builtin/submodule--helper.c:1485 msgid "suppress output of synchronizing submodule url" -msgstr "supprimer la sortie lors de la synchronisation de l'URL d'un sous-module" +msgstr "" +"supprimer la sortie lors de la synchronisation de l'URL d'un sous-module" -#: builtin/submodule--helper.c:1493 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]" -#: builtin/submodule--helper.c:1547 +#: builtin/submodule--helper.c:1546 #, c-format -msgid "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you really want to remove it including all of its history)" +msgid "" +"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " +"really want to remove it including all of its history)" msgstr "" -"L'arbre de travail du sous-module '%s' contient un répertoire .git (utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son historique)" +"L'arbre de travail du sous-module '%s' contient un répertoire .git (utilisez " +"'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " +"historique)" -#: builtin/submodule--helper.c:1559 +#: builtin/submodule--helper.c:1558 #, c-format -msgid "Submodule work tree '%s' contains local modifications; use '-f' to discard them" -msgstr "L'arbre de travail du sous-module '%s' contient des modifications locales ; utilisez '-f' pour les annuler" +msgid "" +"Submodule work tree '%s' contains local modifications; use '-f' to discard " +"them" +msgstr "" +"L'arbre de travail du sous-module '%s' contient des modifications locales ; " +"utilisez '-f' pour les annuler" -#: builtin/submodule--helper.c:1567 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "Répertoire '%s' nettoyé\n" -#: builtin/submodule--helper.c:1569 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Impossible de supprimer l'arbre de travail du sous-module '%s'\n" -#: builtin/submodule--helper.c:1580 +#: builtin/submodule--helper.c:1579 #, c-format msgid "could not create empty submodule directory %s" msgstr "impossible de créer le répertoire vide du sous-module %s" -#: builtin/submodule--helper.c:1596 +#: builtin/submodule--helper.c:1595 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Sous-module '%s' (%s) non enregistré pour le chemin '%s'\n" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1624 msgid "remove submodule working trees even if they contain local changes" -msgstr "éliminer les arbres de travail des sous-modules même s'ils contiennent des modifications locales" +msgstr "" +"éliminer les arbres de travail des sous-modules même s'ils contiennent des " +"modifications locales" -#: builtin/submodule--helper.c:1626 +#: builtin/submodule--helper.c:1625 msgid "unregister all submodules" msgstr "désenregistrer tous les sous-modules" -#: builtin/submodule--helper.c:1631 -msgid "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" -msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]" +#: builtin/submodule--helper.c:1630 +msgid "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" +msgstr "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]" -#: builtin/submodule--helper.c:1645 +#: builtin/submodule--helper.c:1644 msgid "Use '--all' if you really want to deinitialize all submodules" -msgstr "Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules" +msgstr "" +"Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules" -#: builtin/submodule--helper.c:1714 +#: builtin/submodule--helper.c:1713 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -21853,228 +23208,243 @@ msgstr "" "submodule.alternateErrorStrategy à 'info', ou de manière équivalente,\n" "clonez avec '--reference-if-able' au lieu de '--reference'." -#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756 +#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s" -#: builtin/submodule--helper.c:1792 +#: builtin/submodule--helper.c:1791 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" -msgstr "La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue" +msgstr "" +"La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue" -#: builtin/submodule--helper.c:1799 +#: builtin/submodule--helper.c:1798 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue" -#: builtin/submodule--helper.c:1823 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "emplacement où le sous-module sera cloné" -#: builtin/submodule--helper.c:1826 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "nom du nouveau sous-module" -#: builtin/submodule--helper.c:1829 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "URL depuis laquelle cloner le sous-module" -#: builtin/submodule--helper.c:1837 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "profondeur de l'historique des clones superficiels" -#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "forcer l'affichage de la progression du clonage" -#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 msgid "disallow cloning into non-empty directory" msgstr "interdire de cloner dans un répertoire non-vide" -#: builtin/submodule--helper.c:1849 +#: builtin/submodule--helper.c:1848 msgid "" -"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference <repository>] [--name <name>] [--depth <depth>] [--single-branch] --url <url> --path <path>" +"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" -"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference <dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> --path " -"<chemin>" +"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference " +"<dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> " +"--path <chemin>" -#: builtin/submodule--helper.c:1874 +#: builtin/submodule--helper.c:1873 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "refus de créer/utiliser '%s' dans un répertoire git d'un autre sous-module" +msgstr "" +"refus de créer/utiliser '%s' dans un répertoire git d'un autre sous-module" -#: builtin/submodule--helper.c:1885 +#: builtin/submodule--helper.c:1884 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "le clonage de '%s' dans le chemin de sous-module '%s' a échoué" -#: builtin/submodule--helper.c:1889 +#: builtin/submodule--helper.c:1888 #, c-format msgid "directory not empty: '%s'" msgstr "le répertoire n'est pas vide : '%s'" -#: builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" msgstr "impossible de créer le répertoire de sous-module pour '%s'" -#: builtin/submodule--helper.c:1937 +#: builtin/submodule--helper.c:1936 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Mode de mise à jour '%s' invalide pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:1941 +#: builtin/submodule--helper.c:1940 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" -msgstr "Mode de mise à jour '%s'invalide configuré pour le chemin de sous-module '%s'" +msgstr "" +"Mode de mise à jour '%s'invalide configuré pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:2042 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Le chemin de sous-module '%s' n'est pas initialisé" -#: builtin/submodule--helper.c:2046 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "Vous voudriez sûrement utiliser 'update --init' ?" -#: builtin/submodule--helper.c:2076 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Sous-module non fusionné %s non traité" -#: builtin/submodule--helper.c:2105 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "Sous-module '%s' non traité" -#: builtin/submodule--helper.c:2255 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Impossible de cloner '%s'. Réessai prévu" -#: builtin/submodule--helper.c:2266 +#: builtin/submodule--helper.c:2265 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Impossible de cloner '%s' pour la seconde fois, abandon" -#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "chemin dans la copie de travail" -#: builtin/submodule--helper.c:2331 +#: builtin/submodule--helper.c:2330 msgid "path into the working tree, across nested submodule boundaries" -msgstr "chemin dans la copie de travail, traversant les frontières de sous-modules" +msgstr "" +"chemin dans la copie de travail, traversant les frontières de sous-modules" -#: builtin/submodule--helper.c:2335 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "valeurs possibles : rebase, merge, checkout ou none" -#: builtin/submodule--helper.c:2341 +#: builtin/submodule--helper.c:2340 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "créer un clone superficiel tronqué au nombre de révisions spécifié" -#: builtin/submodule--helper.c:2344 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "jobs parallèles" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2345 msgid "whether the initial clone should follow the shallow recommendation" msgstr "spécifie si le clonage initial doit être aussi superficiel" -#: builtin/submodule--helper.c:2347 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "ne pas afficher la progression du clonage" -#: builtin/submodule--helper.c:2358 +#: builtin/submodule--helper.c:2357 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:2371 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "valeur invalide pour la mise à jour du paramètre" -#: builtin/submodule--helper.c:2419 +#: builtin/submodule--helper.c:2418 #, c-format -msgid "Submodule (%s) branch configured to inherit branch from superproject, but the superproject is not on any branch" -msgstr "La branche du sous-module %s est configurée pour hériter de la branche du superprojet, mais le superprojet n'est sur aucune branche" +msgid "" +"Submodule (%s) branch configured to inherit branch from superproject, but " +"the superproject is not on any branch" +msgstr "" +"La branche du sous-module %s est configurée pour hériter de la branche du " +"superprojet, mais le superprojet n'est sur aucune branche" -#: builtin/submodule--helper.c:2542 +#: builtin/submodule--helper.c:2541 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "impossible de trouver une poignée de dépôt pour le sous-module '%s'" -#: builtin/submodule--helper.c:2575 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "parcourir récursivement les sous-modules" -#: builtin/submodule--helper.c:2581 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "git submodule--helper embed-git-dir [<options>] [<chemin>...]" +msgstr "git submodule--helper absorb-git-dirs [<options>] [<chemin>...]" -#: builtin/submodule--helper.c:2637 +#: builtin/submodule--helper.c:2636 msgid "check if it is safe to write to the .gitmodules file" msgstr "vérifier si écrire dans le fichier .gitmodules est sur" -#: builtin/submodule--helper.c:2640 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "désactiver la configuration dans le fichier .gitmodules" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config name [<valeur>]" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nom>" -#: builtin/submodule--helper.c:2647 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2666 git-submodule.sh:150 +#: builtin/submodule--helper.c:2665 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" -msgstr "veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail" +msgstr "" +"veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail" -#: builtin/submodule--helper.c:2682 +#: builtin/submodule--helper.c:2681 msgid "suppress output for setting url of a submodule" msgstr "supprimer la sortie lors du paramétrage de l'url d'un sous-module" -#: builtin/submodule--helper.c:2686 +#: builtin/submodule--helper.c:2685 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper sync [--quiet] <chemin> <nouvelle-url>" -#: builtin/submodule--helper.c:2719 +#: builtin/submodule--helper.c:2718 msgid "set the default tracking branch to master" msgstr "régler la branche de suivi par défaut à master" -#: builtin/submodule--helper.c:2721 +#: builtin/submodule--helper.c:2720 msgid "set the default tracking branch" msgstr "régler la branche de suivi par défaut" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2724 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <chemin>" -#: builtin/submodule--helper.c:2726 -msgid "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -msgstr "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branche> <chemin>" +#: builtin/submodule--helper.c:2725 +msgid "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branche> " +"<chemin>" -#: builtin/submodule--helper.c:2733 +#: builtin/submodule--helper.c:2732 msgid "--branch or --default required" msgstr "--branch ou --default requis" -#: builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2735 msgid "--branch and --default are mutually exclusive" msgstr "--branch et --default sont mutuellement exclusifs" -#: builtin/submodule--helper.c:2793 git.c:449 git.c:724 +#: builtin/submodule--helper.c:2792 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s ne gère pas --super-prefix" -#: builtin/submodule--helper.c:2799 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" @@ -22089,7 +23459,8 @@ msgstr "git symbolic-ref -d [-q] <nom>" #: builtin/symbolic-ref.c:42 msgid "suppress error message for non-symbolic (detached) refs" -msgstr "supprimer le message d'erreur pour une référence non symbolique (détachée)" +msgstr "" +"supprimer le message d'erreur pour une référence non symbolique (détachée)" #: builtin/symbolic-ref.c:43 msgid "delete symbolic ref" @@ -22121,11 +23492,15 @@ msgstr "git tag -d <nométiquette>..." #: builtin/tag.c:28 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n" -"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]" +"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" +"points-at <object>]\n" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" msgstr "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <objet>]\n" -"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] [<motif>...]" +"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" +"points-at <objet>]\n" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<motif>...]" #: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." @@ -22160,12 +23535,14 @@ msgid "" "\n" "Write a message for tag:\n" " %s\n" -"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you " +"want to.\n" msgstr "" "\n" "Écrivez un message pour l'étiquette :\n" " %s\n" -"Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-même si vous le souhaitez.\n" +"Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-" +"même si vous le souhaitez.\n" #: builtin/tag.c:241 msgid "unable to sign the tag" @@ -22179,8 +23556,10 @@ msgid "" "\n" "\tgit tag -f %s %s^{}" msgstr "" -"Vous avez créé une étiquette nichée. L'objet pointé par votre nouvelle étiquette\n" -"est déjà une étiquette. Si vous vouliez étiqueter l'objet pointé, utilisez :\n" +"Vous avez créé une étiquette nichée. L'objet pointé par votre nouvelle " +"étiquette\n" +"est déjà une étiquette. Si vous vouliez étiqueter l'objet pointé, " +"utilisez :\n" "\n" "\tgit tag -f %s %s^{}" @@ -22287,7 +23666,7 @@ msgstr "l'option --contains est autorisée seulement en mode de liste" #: builtin/tag.c:552 msgid "--no-contains option is only allowed in list mode" -msgstr "l'option --contains est autorisée seulement en mode liste" +msgstr "l'option --no-contains est autorisée seulement en mode liste" #: builtin/tag.c:554 msgid "--points-at option is only allowed in list mode" @@ -22295,7 +23674,8 @@ msgstr "l'option --points-at est autorisée seulement en mode liste" #: builtin/tag.c:556 msgid "--merged and --no-merged options are only allowed in list mode" -msgstr "les options --merged et --no-merged ne sont autorisées qu'en mode liste" +msgstr "" +"les options --merged et --no-merged ne sont autorisées qu'en mode liste" #: builtin/tag.c:567 msgid "only one -F or -m option is allowed." @@ -22347,27 +23727,36 @@ msgstr "Test du mtime dans '%s' " #: builtin/update-index.c:154 msgid "directory stat info does not change after adding a new file" -msgstr "l'information de stat du répertoire ne change pas après ajout d'un fichier" +msgstr "" +"l'information de stat du répertoire ne change pas après ajout d'un fichier" #: builtin/update-index.c:167 msgid "directory stat info does not change after adding a new directory" -msgstr "l'information de stat du répertoire ne change pas après ajout d'un répertoire" +msgstr "" +"l'information de stat du répertoire ne change pas après ajout d'un répertoire" #: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" -msgstr "l'information de stat du répertoire change après mise à jour d'un fichier" +msgstr "" +"l'information de stat du répertoire change après mise à jour d'un fichier" #: builtin/update-index.c:191 msgid "directory stat info changes after adding a file inside subdirectory" -msgstr "l'information de stat du répertoire change après l'ajout d'un fichier dans un sous-répertoire" +msgstr "" +"l'information de stat du répertoire change après l'ajout d'un fichier dans " +"un sous-répertoire" #: builtin/update-index.c:202 msgid "directory stat info does not change after deleting a file" -msgstr "l'information de stat du répertoire ne change pas après la suppression d'un fichier<" +msgstr "" +"l'information de stat du répertoire ne change pas après la suppression d'un " +"fichier<" #: builtin/update-index.c:215 msgid "directory stat info does not change after deleting a directory" -msgstr "l'information de stat du répertoire ne change pas après la suppression d'un répertoire" +msgstr "" +"l'information de stat du répertoire ne change pas après la suppression d'un " +"répertoire" #: builtin/update-index.c:222 msgid " OK" @@ -22439,11 +23828,15 @@ msgstr "ne pas toucher aux entrées restreintes à l'index" #: builtin/update-index.c:1024 msgid "add to index only; do not add content to object database" -msgstr "ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de données des objets" +msgstr "" +"ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de " +"données des objets" #: builtin/update-index.c:1026 msgid "remove named paths even if present in worktree" -msgstr "supprimer les chemins nommés même s'ils sont présents dans la copie de travail" +msgstr "" +"supprimer les chemins nommés même s'ils sont présents dans la copie de " +"travail" #: builtin/update-index.c:1028 msgid "with --stdin: input lines are terminated by null bytes" @@ -22503,7 +23896,8 @@ msgstr "écrire l'index même s'il n'est pas marqué comme modifié" #: builtin/update-index.c:1067 msgid "enable or disable file system monitor" -msgstr "activer ou désactiver la surveillance du système de fichier (fsmonitor)" +msgstr "" +"activer ou désactiver la surveillance du système de fichier (fsmonitor)" #: builtin/update-index.c:1069 msgid "mark files as fsmonitor valid" @@ -22514,24 +23908,40 @@ msgid "clear fsmonitor valid bit" msgstr "effacer le bit de validité fsmonitor" #: builtin/update-index.c:1175 -msgid "core.splitIndex is set to false; remove or change it, if you really want to enable split index" -msgstr "core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous souhaitez vraiment activer l'index coupé" +msgid "" +"core.splitIndex is set to false; remove or change it, if you really want to " +"enable split index" +msgstr "" +"core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous " +"souhaitez vraiment activer l'index coupé" #: builtin/update-index.c:1184 -msgid "core.splitIndex is set to true; remove or change it, if you really want to disable split index" -msgstr "core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous souhaitez vraiment désactiver l'index coupé" +msgid "" +"core.splitIndex is set to true; remove or change it, if you really want to " +"disable split index" +msgstr "" +"core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous " +"souhaitez vraiment désactiver l'index coupé" #: builtin/update-index.c:1196 -msgid "core.untrackedCache is set to true; remove or change it, if you really want to disable the untracked cache" -msgstr "core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous souhaitez vraiment désactiver le cache des fichiers non-suivis" +msgid "" +"core.untrackedCache is set to true; remove or change it, if you really want " +"to disable the untracked cache" +msgstr "" +"core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous " +"souhaitez vraiment désactiver le cache des fichiers non-suivis" #: builtin/update-index.c:1200 msgid "Untracked cache disabled" msgstr "Le cache non suivi est désactivé" #: builtin/update-index.c:1208 -msgid "core.untrackedCache is set to false; remove or change it, if you really want to enable the untracked cache" -msgstr "core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous souhaitez vraiment activer le cache des fichiers non-suivis" +msgid "" +"core.untrackedCache is set to false; remove or change it, if you really want " +"to enable the untracked cache" +msgstr "" +"core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous " +"souhaitez vraiment activer le cache des fichiers non-suivis" #: builtin/update-index.c:1212 #, c-format @@ -22540,15 +23950,20 @@ msgstr "Le cache non suivi est activé pour '%s'" #: builtin/update-index.c:1220 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" -msgstr "core.fsmonitor est réglé à false ; changez-le si vous souhaitez vraiment activer la surveillance du système de fichiers" +msgstr "" +"core.fsmonitor est réglé à false ; changez-le si vous souhaitez vraiment " +"activer la surveillance du système de fichiers" #: builtin/update-index.c:1224 msgid "fsmonitor enabled" msgstr "fsmonitor activé" #: builtin/update-index.c:1227 -msgid "core.fsmonitor is set; remove it if you really want to disable fsmonitor" -msgstr "core.fsmonitor est réglé à true ; supprimez-le ou changez-le si vous souhaitez vraiment désactiver la surveillance du système de fichiers" +msgid "" +"core.fsmonitor is set; remove it if you really want to disable fsmonitor" +msgstr "" +"core.fsmonitor est réglé à true ; supprimez-le ou changez-le si vous " +"souhaitez vraiment désactiver la surveillance du système de fichiers" #: builtin/update-index.c:1231 msgid "fsmonitor disabled" @@ -22560,7 +23975,9 @@ msgstr "git update-ref [<options>] -d <nom-référence> [<ancienne-valeur>]" #: builtin/update-ref.c:11 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" -msgstr "git update-ref [<options>] <nom-référence> <nouvelle-valeur> [<ancienne-valeur>]" +msgstr "" +"git update-ref [<options>] <nom-référence> <nouvelle-valeur> [<ancienne-" +"valeur>]" #: builtin/update-ref.c:12 msgid "git update-ref [<options>] --stdin [-z]" @@ -22604,7 +24021,8 @@ msgstr "sortir immédiatement après l'annonce initiale des références" #: builtin/upload-pack.c:27 msgid "do not try <directory>/.git/ if <directory> is no Git directory" -msgstr "ne pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire Git" +msgstr "" +"ne pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire Git" #: builtin/upload-pack.c:29 msgid "interrupt transfer after <n> seconds of inactivity" @@ -22670,7 +24088,7 @@ msgstr "git worktree remove [<options>] <arbre-de-travail>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <chemin>" -#: builtin/worktree.c:61 builtin/worktree.c:935 +#: builtin/worktree.c:61 builtin/worktree.c:944 #, c-format msgid "failed to delete '%s'" msgstr "échec de la suppression de '%s'" @@ -22680,34 +24098,35 @@ msgstr "échec de la suppression de '%s'" msgid "Removing %s/%s: %s" msgstr "Suppression de %s/%s : %s" -#: builtin/worktree.c:149 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "afficher les arbres de travail éliminés" -#: builtin/worktree.c:151 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" msgstr "faire expirer les arbres de travail plus vieux que <temps>" -#: builtin/worktree.c:221 +#: builtin/worktree.c:219 #, c-format msgid "'%s' already exists" msgstr "'%s' existe déjà" -#: builtin/worktree.c:230 +#: builtin/worktree.c:228 #, c-format msgid "unusable worktree destination '%s'" msgstr "arbre de travail destination '%s' inutilisable" -#: builtin/worktree.c:235 +#: builtin/worktree.c:233 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" "use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" "'%s' est un arbre de travail manquant mais verrouillé ;\n" -"utilisez '%s -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' pour corriger" +"utilisez '%s -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' " +"pour corriger" -#: builtin/worktree.c:237 +#: builtin/worktree.c:235 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -22716,34 +24135,42 @@ msgstr "" "'%s' est un arbre de travail manquant mais déjà enregistré ;\n" "utilisez '%s -f' pour passer outre, ou 'prune' ou 'remove' pour corriger" -#: builtin/worktree.c:288 +#: builtin/worktree.c:286 #, c-format msgid "could not create directory of '%s'" msgstr "impossible de créer le répertoire de '%s'" -#: builtin/worktree.c:422 builtin/worktree.c:428 +#: builtin/worktree.c:308 +msgid "initializing" +msgstr "initialisation" + +#: builtin/worktree.c:420 builtin/worktree.c:426 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')" -#: builtin/worktree.c:424 +#: builtin/worktree.c:422 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" -msgstr "Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; précédemment sur %s)" +msgstr "" +"Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; " +"précédemment sur %s)" -#: builtin/worktree.c:433 +#: builtin/worktree.c:431 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Préparation de l'arbre de travail (extraction de '%s')" -#: builtin/worktree.c:439 +#: builtin/worktree.c:437 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Préparation de l'arbre de travail (HEAD détachée %s)" #: builtin/worktree.c:482 msgid "checkout <branch> even if already checked out in other worktree" -msgstr "extraire la <branche> même si elle est déjà extraite dans une autre copie de travail" +msgstr "" +"extraire la <branche> même si elle est déjà extraite dans une autre copie de " +"travail" #: builtin/worktree.c:485 msgid "create a new branch" @@ -22761,90 +24188,106 @@ msgstr "remplissage de la nouvelle copie de travail" msgid "keep the new working tree locked" msgstr "conserver le verrou sur le nouvel arbre de travail" -#: builtin/worktree.c:493 +#: builtin/worktree.c:492 builtin/worktree.c:729 +msgid "reason for locking" +msgstr "raison du verrouillage" + +#: builtin/worktree.c:495 msgid "set up tracking mode (see git-branch(1))" msgstr "régler le mode de suivi (voir git-branch(1))" -#: builtin/worktree.c:496 +#: builtin/worktree.c:498 msgid "try to match the new branch name with a remote-tracking branch" msgstr "essayer de nommer la nouvelle branche comme la branche amont" -#: builtin/worktree.c:504 +#: builtin/worktree.c:506 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B et --detach sont mutuellement exclusifs" -#: builtin/worktree.c:565 +#: builtin/worktree.c:508 +msgid "--reason requires --lock" +msgstr "--reason exige --lock" + +#: builtin/worktree.c:512 +msgid "added with --lock" +msgstr "ajouté avec --lock" + +#: builtin/worktree.c:574 msgid "--[no-]track can only be used if a new branch is created" -msgstr "--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche" +msgstr "" +"--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche" -#: builtin/worktree.c:682 +#: builtin/worktree.c:691 msgid "show extended annotations and reasons, if available" msgstr "afficher les annotations étendues et les raisons, si disponible" -#: builtin/worktree.c:684 +#: builtin/worktree.c:693 msgid "add 'prunable' annotation to worktrees older than <time>" -msgstr "ajouter l'annotation 'prunable' aux arbres de travail plus vieux que <temps>" +msgstr "" +"ajouter l'annotation 'prunable' aux arbres de travail plus vieux que <temps>" -#: builtin/worktree.c:693 +#: builtin/worktree.c:702 msgid "--verbose and --porcelain are mutually exclusive" msgstr "--verbose et --porcelain sont mutuellement exclusifs" -#: builtin/worktree.c:720 -msgid "reason for locking" -msgstr "raison du verrouillage" - -#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839 builtin/worktree.c:963 +#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 +#: builtin/worktree.c:972 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' n'est pas une copie de travail" -#: builtin/worktree.c:734 builtin/worktree.c:767 +#: builtin/worktree.c:743 builtin/worktree.c:776 msgid "The main working tree cannot be locked or unlocked" -msgstr "La copie de travail principale ne peut pas être verrouillée ou déverrouillée" +msgstr "" +"La copie de travail principale ne peut pas être verrouillée ou déverrouillée" -#: builtin/worktree.c:739 +#: builtin/worktree.c:748 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' est déjà verrouillé, car '%s'" -#: builtin/worktree.c:741 +#: builtin/worktree.c:750 #, c-format msgid "'%s' is already locked" msgstr "'%s' est déjà verrouillé" -#: builtin/worktree.c:769 +#: builtin/worktree.c:778 #, c-format msgid "'%s' is not locked" msgstr "'%s' n'est pas verrouillé" -#: builtin/worktree.c:810 +#: builtin/worktree.c:819 msgid "working trees containing submodules cannot be moved or removed" -msgstr "les arbres de travail contenant des sous-modules ne peuvent pas être déplacés ou supprimés" +msgstr "" +"les arbres de travail contenant des sous-modules ne peuvent pas être " +"déplacés ou supprimés" -#: builtin/worktree.c:818 +#: builtin/worktree.c:827 msgid "force move even if worktree is dirty or locked" -msgstr "forcer le déplacement même si l'arbre de travail est sale ou verrouillé" +msgstr "" +"forcer le déplacement même si l'arbre de travail est sale ou verrouillé" -#: builtin/worktree.c:841 builtin/worktree.c:965 +#: builtin/worktree.c:850 builtin/worktree.c:974 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' est un arbre de travail principal" -#: builtin/worktree.c:846 +#: builtin/worktree.c:855 #, c-format msgid "could not figure out destination name from '%s'" msgstr "impossible de trouver le nom de la destination à partir de '%s'" -#: builtin/worktree.c:859 +#: builtin/worktree.c:868 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" "use 'move -f -f' to override or unlock first" msgstr "" -"impossible de déplacer un arbre de travail verrouillé, raison du verrouillage : %s\n" +"impossible de déplacer un arbre de travail verrouillé, raison du " +"verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:861 +#: builtin/worktree.c:870 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -22852,45 +24295,49 @@ msgstr "" "impossible de déplacer un arbre de travail verrouillé;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:864 +#: builtin/worktree.c:873 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "la validation a échoué, impossible de déplacer l'arbre de travail : %s" -#: builtin/worktree.c:869 +#: builtin/worktree.c:878 #, c-format msgid "failed to move '%s' to '%s'" msgstr "échec au déplacement de '%s' vers '%s'" -#: builtin/worktree.c:915 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "échec du lancement de 'git status' sur '%s'" -#: builtin/worktree.c:919 +#: builtin/worktree.c:928 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" -msgstr "'%s' contient des fichiers modifiés ou non-suivis, utilisez --force pour le supprimer" +msgstr "" +"'%s' contient des fichiers modifiés ou non-suivis, utilisez --force pour le " +"supprimer" -#: builtin/worktree.c:924 +#: builtin/worktree.c:933 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "impossible de lancer 'git status' sur '%s', code %d" -#: builtin/worktree.c:947 +#: builtin/worktree.c:956 msgid "force removal even if worktree is dirty or locked" -msgstr "forcer la suppression même si l'arbre de travail est sale ou verrouillé" +msgstr "" +"forcer la suppression même si l'arbre de travail est sale ou verrouillé" -#: builtin/worktree.c:970 +#: builtin/worktree.c:979 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" "use 'remove -f -f' to override or unlock first" msgstr "" -"impossible de supprimer un arbre de travail verrouillé, raison du verrouillage : %s\n" +"impossible de supprimer un arbre de travail verrouillé, raison du " +"verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:972 +#: builtin/worktree.c:981 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -22898,17 +24345,18 @@ msgstr "" "impossible de supprimer un arbre de travail verrouillé;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:975 +#: builtin/worktree.c:984 #, c-format msgid "validation failed, cannot remove working tree: %s" -msgstr "la validation a échoué, impossible de supprimer l'arbre de travail : %s" +msgstr "" +"la validation a échoué, impossible de supprimer l'arbre de travail : %s" -#: builtin/worktree.c:999 +#: builtin/worktree.c:1008 #, c-format msgid "repair: %s: %s" msgstr "réparation : %s : '%s'" -#: builtin/worktree.c:1002 +#: builtin/worktree.c:1011 #, c-format msgid "error: %s: %s" msgstr "erreur : %s : %s" @@ -22933,16 +24381,20 @@ msgstr "seulement utile pour le débogage" msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" +"bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" " [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" " <command> [<args>]" msgstr "" "git [--version] [--help] [-C <chemin>] [-c <nom>=<valeur>]\n" -" [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n" +" [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-" +"path]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" +"bare]\n" " [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n" -" [--super-prefix=<chemin>] [--config-env=<nom>=<variable-d-environnement>]\n" +" [--super-prefix=<chemin>] [--config-env=<nom>=<variable-d-" +"environnement>]\n" " <commande> [<args>]" #: git.c:36 @@ -22985,7 +24437,7 @@ msgstr "-c requiert une chaîne de configuration\n" #: git.c:260 #, c-format msgid "no config key given for --config-env\n" -msgstr "aucune clé de configuration fournie pour --conf-env\n" +msgstr "aucune clé de configuration fournie pour --config-env\n" #: git.c:300 #, c-format @@ -23055,7 +24507,8 @@ msgstr "" #: git.c:916 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" -msgstr "l'expansion de l'alias '%s' a échoué : '%s' n'est pas une commande git\n" +msgstr "" +"l'expansion de l'alias '%s' a échoué : '%s' n'est pas une commande git\n" #: git.c:928 #, c-format @@ -23148,7 +24601,9 @@ msgstr "test-helper simple-ipc run-daemon [<nom>] [<fils-d'exécution>]" #: t/helper/test-simple-ipc.c:684 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" -msgstr "test-helper simple-ipc start-daemon [<nom>] [<fils-d'exécution>] [<attente-max>]" +msgstr "" +"test-helper simple-ipc start-daemon [<nom>] [<fils-d'exécution>] [<attente-" +"max>]" #: t/helper/test-simple-ipc.c:685 msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" @@ -23160,11 +24615,16 @@ msgstr "test-helper simple-ipc send [<nom>] [<jeton>]" #: t/helper/test-simple-ipc.c:687 msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" -msgstr "test-helper simple-ipc sendbytes [<nom>] [<nombre-d'octets>] [<octets>]" +msgstr "" +"test-helper simple-ipc sendbytes [<nom>] [<nombre-d'octets>] [<octets>]" #: t/helper/test-simple-ipc.c:688 -msgid "test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] [<batchsize>]" -msgstr "test-helper simple-ipc multiple [<nom>] [<fils-d'exécution>] [<nombre-d'octets>] [<taille-de-lot>]" +msgid "" +"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " +"[<batchsize>]" +msgstr "" +"test-helper simple-ipc multiple [<nom>] [<fils-d'exécution>] [<nombre-" +"d'octets>] [<taille-de-lot>]" #: t/helper/test-simple-ipc.c:696 msgid "name or pathname of unix domain socket" @@ -23176,7 +24636,8 @@ msgstr "nom du pipe nommé" #: t/helper/test-simple-ipc.c:700 msgid "number of threads in server thread pool" -msgstr "nombre de fils d'exécution dans le réservoir de fils d'exécution du serveur" +msgstr "" +"nombre de fils d'exécution dans le réservoir de fils d'exécution du serveur" #: t/helper/test-simple-ipc.c:701 msgid "seconds to wait for daemon to start or stop" @@ -23209,7 +24670,8 @@ msgstr "jeton de commande à envoyer au serveur" #: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" -msgstr "valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d" +msgstr "" +"valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d" #: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" @@ -23235,14 +24697,16 @@ msgstr "Dorsale SSL '%s' non supportée. Dorsales SSL supportées :" #: http.c:1139 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" -msgstr "Impossible de régler la dorsale SSL à '%s' : cURL a été construit sans dorsale SSL" +msgstr "" +"Impossible de régler la dorsale SSL à '%s' : cURL a été construit sans " +"dorsale SSL" #: http.c:1143 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "Impossible de spécifier le dorsal SSL à '%s' : déjà spécifié" -#: http.c:2035 +#: http.c:2034 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -23292,95 +24756,97 @@ msgstr "impossible d'accéder à '%s' : %s" msgid "redirecting to %s" msgstr "redirection vers %s" -#: remote-curl.c:642 +#: remote-curl.c:644 msgid "shouldn't have EOF when not gentle on EOF" msgstr "ne devrait pas recevoir OEF quand on n'est pas gentil sur EOF" -#: remote-curl.c:654 -msgid "remote server sent stateless separator" -msgstr "le serveur distant a envoyé un séparateur sans état" +#: remote-curl.c:656 +msgid "remote server sent unexpected response end packet" +msgstr "le serveur distant a envoyé un paquet de fin de réponse inattendu" -#: remote-curl.c:724 +#: remote-curl.c:726 msgid "unable to rewind rpc post data - try increasing http.postBuffer" -msgstr "impossible de rembobiner le données post rpc - essayer d'augmenter http.postBuffer" +msgstr "" +"impossible de rembobiner le données post rpc - essayer d'augmenter http." +"postBuffer" -#: remote-curl.c:754 +#: remote-curl.c:756 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "remote-curl : mauvais caractère de longueur de ligne : %.4s" -#: remote-curl.c:756 +#: remote-curl.c:758 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl : paquet de fin de réponse inattendu" -#: remote-curl.c:832 +#: remote-curl.c:834 #, c-format msgid "RPC failed; %s" msgstr "échec RPC ; %s" -#: remote-curl.c:872 +#: remote-curl.c:874 msgid "cannot handle pushes this big" msgstr "impossible de gérer des poussées aussi grosses" -#: remote-curl.c:987 +#: remote-curl.c:989 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "impossible de compresser la requête ; erreur de compression zlib %d" -#: remote-curl.c:991 +#: remote-curl.c:993 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "impossible de compresser la requête ; erreur de fin zlib %d" -#: remote-curl.c:1041 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of length header were received" msgstr "%d octets de longueur d'entête ont été reçus" -#: remote-curl.c:1043 +#: remote-curl.c:1045 #, c-format msgid "%d bytes of body are still expected" msgstr "%d octets de corps sont encore attendus" -#: remote-curl.c:1132 +#: remote-curl.c:1134 msgid "dumb http transport does not support shallow capabilities" msgstr "le protocole http idiot ne supporte la capacité superficielle" -#: remote-curl.c:1147 +#: remote-curl.c:1149 msgid "fetch failed." msgstr "échec du récupération." -#: remote-curl.c:1193 +#: remote-curl.c:1195 msgid "cannot fetch by sha1 over smart http" msgstr "impossible de récupérer par sha1 sur http intelligent" -#: remote-curl.c:1237 remote-curl.c:1243 +#: remote-curl.c:1239 remote-curl.c:1245 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé" -#: remote-curl.c:1255 remote-curl.c:1373 +#: remote-curl.c:1257 remote-curl.c:1375 #, c-format msgid "http transport does not support %s" msgstr "le transport http ne supporte pas %s" -#: remote-curl.c:1291 +#: remote-curl.c:1293 msgid "git-http-push failed" msgstr "échec de git-http-push" -#: remote-curl.c:1479 +#: remote-curl.c:1481 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: usage: git remote-curl <distant> [<url>]" -#: remote-curl.c:1511 +#: remote-curl.c:1513 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl : erreur de lecture du flux de commande depuis git" -#: remote-curl.c:1518 +#: remote-curl.c:1520 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl : récupération tentée sans dépôt local" -#: remote-curl.c:1559 +#: remote-curl.c:1561 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl : commande inconnue '%s' depuis git" @@ -23430,8 +24896,11 @@ msgid "read pathspec from file" msgstr "lire les spécificateurs de fichier depuis fichier" #: parse-options.h:339 -msgid "with --pathspec-from-file, pathspec elements are separated with NUL character" -msgstr "avec --pathspec-from-file, les spécificateurs de chemin sont séparés par un caractère NUL" +msgid "" +"with --pathspec-from-file, pathspec elements are separated with NUL character" +msgstr "" +"avec --pathspec-from-file, les spécificateurs de chemin sont séparés par un " +"caractère NUL" #: ref-filter.h:99 msgid "key" @@ -23443,7 +24912,8 @@ msgstr "nom du champ servant à trier" #: rerere.h:44 msgid "update the index with reused conflict resolution if possible" -msgstr "met à jour l'index avec les résolutions de conflit réutilisées si possible" +msgstr "" +"met à jour l'index avec les résolutions de conflit réutilisées si possible" #: command-list.h:50 msgid "Add file contents to the index" @@ -23475,7 +24945,9 @@ msgstr "Trouver par recherche binaire la modification qui a introduit un bogue" #: command-list.h:57 msgid "Show what revision and author last modified each line of a file" -msgstr "Montrer la révision et l'auteur qui ont modifié en dernier chaque ligne d'un fichier" +msgstr "" +"Montrer la révision et l'auteur qui ont modifié en dernier chaque ligne d'un " +"fichier" #: command-list.h:58 msgid "List, create, or delete branches" @@ -23483,7 +24955,8 @@ msgstr "Lister, créer ou supprimer des branches" #: command-list.h:59 msgid "Collect information for user to file a bug report" -msgstr "Collecter l'information pour l'utilisateur pour remplir un rapport de bogue" +msgstr "" +"Collecter l'information pour l'utilisateur pour remplir un rapport de bogue" #: command-list.h:60 msgid "Move objects and refs by archive" @@ -23491,7 +24964,9 @@ msgstr "Déplacer les objets et références par archive" #: command-list.h:61 msgid "Provide content or type and size information for repository objects" -msgstr "Fournir le contenu ou l'information de type et taille pour les objets du dépôt" +msgstr "" +"Fournir le contenu ou l'information de type et taille pour les objets du " +"dépôt" #: command-list.h:62 msgid "Display gitattributes information" @@ -23559,7 +25034,9 @@ msgstr "Voir et régler les options globales ou de dépôt" #: command-list.h:78 msgid "Count unpacked number of objects and their disk consumption" -msgstr "Compter le nombre d'objets non-empaquetés et leur consommation d'espace disque" +msgstr "" +"Compter le nombre d'objets non-empaquetés et leur consommation d'espace " +"disque" #: command-list.h:79 msgid "Retrieve and store user credentials" @@ -23591,11 +25068,14 @@ msgstr "Un serveur vraiment simple pour les dépôts Git" #: command-list.h:86 msgid "Give an object a human readable name based on an available ref" -msgstr "Baptiser un objet avec un nom lisible à partir d'une référence disponible" +msgstr "" +"Baptiser un objet avec un nom lisible à partir d'une référence disponible" #: command-list.h:87 msgid "Show changes between commits, commit and working tree, etc" -msgstr "Afficher les changements entre les validations, entre validation et copie de travail, etc" +msgstr "" +"Afficher les changements entre les validations, entre validation et copie de " +"travail, etc" #: command-list.h:88 msgid "Compares files in the working tree and the index" @@ -23651,7 +25131,8 @@ msgstr "Préparer les patchs pour soumission par courriel" #: command-list.h:101 msgid "Verifies the connectivity and validity of the objects in the database" -msgstr "Vérifier la connectivité et la validité des objets dans la base de données" +msgstr "" +"Vérifier la connectivité et la validité des objets dans la base de données" #: command-list.h:102 msgid "Cleanup unnecessary files and optimize the local repository" @@ -23671,7 +25152,8 @@ msgstr "Une interface graphique portable pour Git" #: command-list.h:106 msgid "Compute object ID and optionally creates a blob from a file" -msgstr "Calculer l'ID d'objet et créer optionnellement un blob depuis un fichier" +msgstr "" +"Calculer l'ID d'objet et créer optionnellement un blob depuis un fichier" #: command-list.h:107 msgid "Display help information about Git" @@ -23695,7 +25177,8 @@ msgstr "Envoyer un ensemble de rustines depuis stdin vers un répertoire IMAP" #: command-list.h:112 msgid "Build pack index file for an existing packed archive" -msgstr "Construire un fichier d'index pack depuis une archive compactée existante" +msgstr "" +"Construire un fichier d'index pack depuis une archive compactée existante" #: command-list.h:113 msgid "Create an empty Git repository or reinitialize an existing one" @@ -23707,7 +25190,8 @@ msgstr "Naviguer instantanément votre dépôt de travail dans gitweb" #: command-list.h:115 msgid "Add or parse structured information in commit messages" -msgstr "Ajouter ou analyser l'information structurée dans les messages de validation" +msgstr "" +"Ajouter ou analyser l'information structurée dans les messages de validation" #: command-list.h:116 msgid "The Git repository browser" @@ -23719,7 +25203,9 @@ msgstr "Afficher l'historique des validations" #: command-list.h:118 msgid "Show information about files in the index and the working tree" -msgstr "Afficher l'information à propos des fichiers dans l'index ou l'arbre de travail" +msgstr "" +"Afficher l'information à propos des fichiers dans l'index ou l'arbre de " +"travail" #: command-list.h:119 msgid "List references in a remote repository" @@ -23731,7 +25217,9 @@ msgstr "Afficher le contenu d'un objet arbre" #: command-list.h:121 msgid "Extracts patch and authorship from a single e-mail message" -msgstr "Extraire le patch et l'information de d'auteur depuis un simple message de courriel" +msgstr "" +"Extraire le patch et l'information de d'auteur depuis un simple message de " +"courriel" #: command-list.h:122 msgid "Simple UNIX mbox splitter program" @@ -23763,7 +25251,9 @@ msgstr "Le programme assistant standard à utiliser avec git-merge-index" #: command-list.h:129 msgid "Run merge conflict resolution tools to resolve merge conflicts" -msgstr "Lancer les outils de résolution de conflit de fusion pour résoudre les conflits de fusion" +msgstr "" +"Lancer les outils de résolution de conflit de fusion pour résoudre les " +"conflits de fusion" #: command-list.h:130 msgid "Show three-way merge without touching index" @@ -23815,7 +25305,8 @@ msgstr "Calculer l'ID unique d'un patch" #: command-list.h:142 msgid "Prune all unreachable objects from the object database" -msgstr "Éliminer les objets inatteignables depuis la base de données des objets" +msgstr "" +"Éliminer les objets inatteignables depuis la base de données des objets" #: command-list.h:143 msgid "Remove extra objects that are already in pack files" @@ -23835,7 +25326,8 @@ msgstr "Appliquer un patchset quilt sur la branche courante" #: command-list.h:147 msgid "Compare two commit ranges (e.g. two versions of a branch)" -msgstr "Comparer deux plages de commits (par exemple deux versions d'une branche)" +msgstr "" +"Comparer deux plages de commits (par exemple deux versions d'une branche)" #: command-list.h:148 msgid "Reads tree information into the index" @@ -23975,7 +25467,8 @@ msgstr "Lire, modifier et supprimer les références symboliques" #: command-list.h:182 msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG" +msgstr "" +"Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG" #: command-list.h:183 msgid "Creates a temporary file with a blob's contents" @@ -23991,11 +25484,14 @@ msgstr "Enregistrer le contenu d'un fichier de l'arbre de travail dans l'index" #: command-list.h:186 msgid "Update the object name stored in a ref safely" -msgstr "Mettre à jour le nom d'objet stocké dans une référence en toute sécurité" +msgstr "" +"Mettre à jour le nom d'objet stocké dans une référence en toute sécurité" #: command-list.h:187 msgid "Update auxiliary info file to help dumb servers" -msgstr "Mettre à jour le fichier d'informations auxiliaires pour aider les serveurs idiots" +msgstr "" +"Mettre à jour le fichier d'informations auxiliaires pour aider les serveurs " +"idiots" #: command-list.h:188 msgid "Send archive back to git-archive" @@ -24083,7 +25579,8 @@ msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement" #: command-list.h:209 msgid "Map author/committer names and/or E-Mail addresses" -msgstr "Fait correspondre les noms d'auteur/validateur avec les adresses de courriel" +msgstr "" +"Fait correspondre les noms d'auteur/validateur avec les adresses de courriel" #: command-list.h:210 msgid "Defining submodule properties" @@ -24157,8 +25654,12 @@ msgid "bisect run success" msgstr "succès de la bissection" #: git-merge-octopus.sh:46 -msgid "Error: Your local changes to the following files would be overwritten by merge" -msgstr "Erreur : vos modifications locales aux fichiers suivants seraient écrasées par la fusion" +msgid "" +"Error: Your local changes to the following files would be overwritten by " +"merge" +msgstr "" +"Erreur : vos modifications locales aux fichiers suivants seraient écrasées " +"par la fusion" #: git-merge-octopus.sh:61 msgid "Automated merge did not work." @@ -24194,7 +25695,9 @@ msgstr "La fusion simple a échoué, essai avec la fusion automatique." #: git-submodule.sh:179 msgid "Relative path can only be used from the toplevel of the working tree" -msgstr "Un chemin relatif ne peut être utilisé que depuis la racine de la copie de travail" +msgstr "" +"Un chemin relatif ne peut être utilisé que depuis la racine de la copie de " +"travail" #: git-submodule.sh:189 #, sh-format @@ -24229,19 +25732,25 @@ msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide" #: git-submodule.sh:259 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) distant(s) :" +msgstr "" +"Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) " +"distant(s) :" #: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" " $realrepo\n" -"use the '--force' option. If the local git directory is not the correct repo\n" -"or you are unsure what this means choose another name with the '--name' option." +"use the '--force' option. If the local git directory is not the correct " +"repo\n" +"or you are unsure what this means choose another name with the '--name' " +"option." msgstr "" -"Si vous voulez réutiliser ce répertoire local git au lieu de le recloner depuis\n" +"Si vous voulez réutiliser ce répertoire local git au lieu de le recloner " +"depuis\n" " $realrepo\n" -"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt correct\n" +"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt " +"correct\n" "ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'." #: git-submodule.sh:267 @@ -24267,7 +25776,9 @@ msgstr "Échec d'enregistrement du sous-module '$sm_path'" #: git-submodule.sh:568 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" -msgstr "Impossible de trouver la révision courante dans le chemin de sous-module '$displaypath'" +msgstr "" +"Impossible de trouver la révision courante dans le chemin de sous-module " +"'$displaypath'" #: git-submodule.sh:578 #, sh-format @@ -24276,23 +25787,36 @@ msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'" #: git-submodule.sh:583 #, sh-format -msgid "Unable to find current ${remote_name}/${branch} revision in submodule path '$sm_path'" -msgstr "Impossible de trouver la révision courante ${remote_name}/${branch} dans le chemin de sous-module '$sm_path'" +msgid "" +"Unable to find current ${remote_name}/${branch} revision in submodule path " +"'$sm_path'" +msgstr "" +"Impossible de trouver la révision courante ${remote_name}/${branch} dans le " +"chemin de sous-module '$sm_path'" #: git-submodule.sh:601 #, sh-format -msgid "Unable to fetch in submodule path '$displaypath'; trying to directly fetch $sha1:" -msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath' ; essai de rapatriement direct de $sha1 :" +msgid "" +"Unable to fetch in submodule path '$displaypath'; trying to directly fetch " +"$sha1:" +msgstr "" +"Impossible de rapatrier dans le chemin de sous-module '$displaypath' ; essai " +"de rapatriement direct de $sha1 :" #: git-submodule.sh:607 #, sh-format -msgid "Fetched in submodule path '$displaypath', but it did not contain $sha1. Direct fetching of that commit failed." -msgstr "Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas $sha1. La récupération directe de ce commit a échoué." +msgid "" +"Fetched in submodule path '$displaypath', but it did not contain $sha1. " +"Direct fetching of that commit failed." +msgstr "" +"Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas " +"$sha1. La récupération directe de ce commit a échoué." #: git-submodule.sh:614 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" -msgstr "Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'" +msgstr "" +"Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'" #: git-submodule.sh:615 #, sh-format @@ -24302,7 +25826,8 @@ msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait" #: git-submodule.sh:619 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" -msgstr "Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'" +msgstr "" +"Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'" #: git-submodule.sh:620 #, sh-format @@ -24312,7 +25837,8 @@ msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'" #: git-submodule.sh:625 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" -msgstr "Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'" +msgstr "" +"Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'" #: git-submodule.sh:626 #, sh-format @@ -24322,7 +25848,9 @@ msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'" #: git-submodule.sh:631 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" -msgstr "L'exécution de '$command $sha1' a échoué dans le chemin de sous-module '$displaypath'" +msgstr "" +"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module " +"'$displaypath'" #: git-submodule.sh:632 #, sh-format @@ -24383,7 +25911,8 @@ msgstr "" " p, pick <commit> = utiliser le commit\n" " r, reword <commit> = utiliser le commit, mais reformuler son message\n" " e, edit <commit> = utiliser le commit, mais s'arrêter pour le modifier\n" -" s, squash <commit> = utiliser le commit, mais le fusionner avec le précédent\n" +" s, squash <commit> = utiliser le commit, mais le fusionner avec le " +"précédent\n" " f, fixup <commit> = comme \"squash\", mais en éliminant son message\n" " x, exec <commit> = lancer la commande (reste de la ligne) dans un shell\n" " d, drop <commit> = supprimer le commit\n" @@ -24485,7 +26014,8 @@ msgstr "Impossible d'écrire $fixup_msg" msgid "This is a combination of 2 commits." msgstr "Ceci est la combinaison de 2 commits." -#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 git-rebase--preserve-merges.sh:572 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Impossible d'appliquer $sha1... $rest" @@ -24495,12 +26025,16 @@ msgstr "Impossible d'appliquer $sha1... $rest" msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" "This is most likely due to an empty commit message, or the pre-commit hook\n" -"failed. If the pre-commit hook failed, you may need to resolve the issue before\n" +"failed. If the pre-commit hook failed, you may need to resolve the issue " +"before\n" "you are able to reword the commit." msgstr "" -"Impossible de corriger le commit après avoir réussi à picorer $sha1... $rest\n" -"C'est probablement dû à un message de validation vide ou le crochet pre-commit\n" -"a échoué. Si le crochet pre-commit a échoué, vous devez peut-être résoudre le\n" +"Impossible de corriger le commit après avoir réussi à picorer $sha1... " +"$rest\n" +"C'est probablement dû à un message de validation vide ou le crochet pre-" +"commit\n" +"a échoué. Si le crochet pre-commit a échoué, vous devez peut-être résoudre " +"le\n" "problème avant de pouvoir reformuler le message du commit." #: git-rebase--preserve-merges.sh:616 @@ -24604,7 +26138,8 @@ msgstr "" #: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" -msgstr "Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit" +msgstr "" +"Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit" #: git-rebase--preserve-merges.sh:829 msgid "" @@ -24663,7 +26198,9 @@ msgstr "usage : $dashless $USAGE" #: git-sh-setup.sh:191 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" -msgstr "Impossible de se placer dans le répertoire $cdup, la racine de la copie de travail" +msgstr "" +"Impossible de se placer dans le répertoire $cdup, la racine de la copie de " +"travail" #: git-sh-setup.sh:200 git-sh-setup.sh:207 #, sh-format @@ -24676,11 +26213,14 @@ msgstr "Impossible de rebaser : vous avez des modifications non indexées." #: git-sh-setup.sh:224 msgid "Cannot rewrite branches: You have unstaged changes." -msgstr "Impossible de réécrire les branches : vous avez des modifications non indexées." +msgstr "" +"Impossible de réécrire les branches : vous avez des modifications non " +"indexées." #: git-sh-setup.sh:227 msgid "Cannot pull with rebase: You have unstaged changes." -msgstr "impossible de tirer avec rebasage. Vous avez des modifications non indexées." +msgstr "" +"impossible de tirer avec rebasage. Vous avez des modifications non indexées." #: git-sh-setup.sh:230 #, sh-format @@ -24689,16 +26229,20 @@ msgstr "$action est impossible : vous avez des modifications non indexées." #: git-sh-setup.sh:243 msgid "Cannot rebase: Your index contains uncommitted changes." -msgstr "Impossible de rebaser : votre index contient des modifications non validées." +msgstr "" +"Impossible de rebaser : votre index contient des modifications non validées." #: git-sh-setup.sh:246 msgid "Cannot pull with rebase: Your index contains uncommitted changes." -msgstr "impossible de tirer avec rebasage : votre index contient des modifications non validées." +msgstr "" +"impossible de tirer avec rebasage : votre index contient des modifications " +"non validées." #: git-sh-setup.sh:249 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." -msgstr "$action est impossible : votre index contient des modifications non validées." +msgstr "" +"$action est impossible : votre index contient des modifications non validées." #: git-sh-setup.sh:253 msgid "Additionally, your index contains uncommitted changes." @@ -24706,7 +26250,8 @@ msgstr "De plus, votre index contient des modifications non validées." #: git-sh-setup.sh:373 msgid "You need to run this command from the toplevel of the working tree." -msgstr "Vous devez lancer cette commande depuis la racine de votre copie de travail." +msgstr "" +"Vous devez lancer cette commande depuis la racine de votre copie de travail." #: git-sh-setup.sh:378 msgid "Unable to determine absolute path of git directory" @@ -24749,7 +26294,8 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme desindexée." -#: git-add--interactive.perl:1065 git-add--interactive.perl:1074 git-add--interactive.perl:1080 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1074 +#: git-add--interactive.perl:1080 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -24757,7 +26303,8 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme appliquée." -#: git-add--interactive.perl:1068 git-add--interactive.perl:1071 git-add--interactive.perl:1077 +#: git-add--interactive.perl:1068 git-add--interactive.perl:1071 +#: git-add--interactive.perl:1077 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -24934,7 +26481,8 @@ msgstr "fichier non-fusionné ignoré : %s\n" #: git-add--interactive.perl:1479 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?] ? " +msgstr "" +"Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?] ? " #: git-add--interactive.perl:1480 #, perl-format @@ -25012,17 +26560,21 @@ msgid "" "revert - revert staged set of changes back to the HEAD version\n" "patch - pick hunks and update selectively\n" "diff - view diff between HEAD and index\n" -"add untracked - add contents of untracked files to the staged set of changes\n" +"add untracked - add contents of untracked files to the staged set of " +"changes\n" msgstr "" "status - montrer les chemins modifiés\n" -"update - ajouter l'état de l'arbre de travail aux modifications à indexer\n" +"update - ajouter l'état de l'arbre de travail aux modifications à " +"indexer\n" "revert - faire revenir les modifications à indexer à la version HEAD\n" "patch - sélectionner les sections et mettre à jour sélectivement\n" "diff - visualiser les diff entre HEAD et l'index\n" "add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n" -#: git-add--interactive.perl:1828 git-add--interactive.perl:1840 git-add--interactive.perl:1843 git-add--interactive.perl:1850 git-add--interactive.perl:1853 -#: git-add--interactive.perl:1860 git-add--interactive.perl:1864 git-add--interactive.perl:1870 +#: git-add--interactive.perl:1828 git-add--interactive.perl:1840 +#: git-add--interactive.perl:1843 git-add--interactive.perl:1850 +#: git-add--interactive.perl:1853 git-add--interactive.perl:1860 +#: git-add--interactive.perl:1864 git-add--interactive.perl:1870 msgid "missing --" msgstr "-- manquant" @@ -25036,86 +26588,95 @@ msgstr "mode de --patch inconnu : %s" msgid "invalid argument %s, expecting --" msgstr "argument invalide %s, -- attendu" -#: git-send-email.perl:138 +#: git-send-email.perl:129 msgid "local zone differs from GMT by a non-minute interval\n" -msgstr "la zone locale diffère du GMT par un intervalle supérieur à une minute\n" +msgstr "" +"la zone locale diffère du GMT par un intervalle supérieur à une minute\n" -#: git-send-email.perl:145 git-send-email.perl:151 +#: git-send-email.perl:136 git-send-email.perl:142 msgid "local time offset greater than or equal to 24 hours\n" msgstr "le décalage de temps local est plus grand ou égal à 24 heures\n" -#: git-send-email.perl:222 +#: git-send-email.perl:214 #, perl-format msgid "fatal: command '%s' died with exit code %d" msgstr "fatal : la commande '%s' s'est interrompue avec le code %d" -#: git-send-email.perl:235 +#: git-send-email.perl:227 msgid "the editor exited uncleanly, aborting everything" msgstr "l'éditeur est sorti en erreur, abandon total" -#: git-send-email.perl:321 +#: git-send-email.perl:316 #, perl-format -msgid "'%s' contains an intermediate version of the email you were composing.\n" -msgstr "'%s' contient une version intermédiaire du courriel que vous composiez.\n" +msgid "" +"'%s' contains an intermediate version of the email you were composing.\n" +msgstr "" +"'%s' contient une version intermédiaire du courriel que vous composiez.\n" -#: git-send-email.perl:326 +#: git-send-email.perl:321 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' contient le courriel composé.\n" -#: git-send-email.perl:419 +#: git-send-email.perl:450 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases est incompatible avec d'autres options\n" -#: git-send-email.perl:493 +#: git-send-email.perl:525 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" "Set sendemail.forbidSendmailVariables to false to disable this check.\n" msgstr "" "fatal : options de configuration trouvées pour 'sendmail'\n" -"git-send-mail est configuré avec des options sendemail.* - veuillez noter le 'e'.\n" +"git-send-email est configuré avec des options sendemail.* - veuillez noter le 'e'.\n" "Positionnez sendemail.forbidSendmailVariables à false pour désactiver cette vérification.\n" -#: git-send-email.perl:498 git-send-email.perl:700 +#: git-send-email.perl:530 git-send-email.perl:746 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Lancement de git format-patch impossible à l'extérieur d'un dépôt\n" -#: git-send-email.perl:501 -msgid "`batch-size` and `relogin` must be specified together (via command-line or configuration option)\n" -msgstr "`batch-size` et `relogin` doivent être spécifiés ensembles (via la ligne de commande ou des options de configuration)\n" +#: git-send-email.perl:533 +msgid "" +"`batch-size` and `relogin` must be specified together (via command-line or " +"configuration option)\n" +msgstr "" +"`batch-size` et `relogin` doivent être spécifiés ensembles (via la ligne de " +"commande ou des options de configuration)\n" -#: git-send-email.perl:514 +#: git-send-email.perl:546 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Champ de --suppress-cc inconnu : '%s'\n" -#: git-send-email.perl:545 +#: git-send-email.perl:577 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Paramètre de --confirm inconnu : '%s'\n" -#: git-send-email.perl:573 +#: git-send-email.perl:617 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" -msgstr "attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n" +msgstr "" +"attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n" -#: git-send-email.perl:575 +#: git-send-email.perl:619 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "attention : `:include:` n'est pas supporté : %s\n" -#: git-send-email.perl:577 +#: git-send-email.perl:621 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" -msgstr "attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n" +msgstr "" +"attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n" -#: git-send-email.perl:582 +#: git-send-email.perl:626 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "attention : ligne sendmail non reconnue : %s\n" -#: git-send-email.perl:666 +#: git-send-email.perl:711 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -25124,18 +26685,18 @@ msgid "" " * Saying \"./%s\" if you mean a file; or\n" " * Giving --format-patch option if you mean a range.\n" msgstr "" -"Le fichier '%s' existe mais ce pourrait aussi être la plage de commits\n" -"pour lequel les patches sont à produire. Veuillez préciser...\n" +"Le fichier '%s' existe, mais ce pourrait aussi être la plage de commits\n" +"pour lequel les rustines sont à produire. Veuillez préciser...\n" "\n" " * en indiquant \"./%s\" si vous désignez un fichier, ou\n" " * en fournissant l'option --format-patch pour une plage.\n" -#: git-send-email.perl:687 +#: git-send-email.perl:732 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Échec à l'ouverture du répertoire %s : %s" -#: git-send-email.perl:720 +#: git-send-email.perl:767 msgid "" "\n" "No patch files specified!\n" @@ -25145,17 +26706,17 @@ msgstr "" "Aucun fichier patch spécifié !\n" "\n" -#: git-send-email.perl:733 +#: git-send-email.perl:780 #, perl-format msgid "No subject line in %s?" msgstr "Ligne de sujet non trouvée dans %s ?" -#: git-send-email.perl:743 +#: git-send-email.perl:791 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Impossible d'ouvrir %s en écriture : %s" -#: git-send-email.perl:754 +#: git-send-email.perl:802 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -25169,59 +26730,67 @@ msgstr "" "\n" "Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n" -#: git-send-email.perl:778 +#: git-send-email.perl:826 #, perl-format msgid "Failed to open %s: %s" msgstr "Échec à l'ouverture de %s : %s" -#: git-send-email.perl:795 +#: git-send-email.perl:843 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Échec à l'ouverture de %s.final : %s" -#: git-send-email.perl:838 +#: git-send-email.perl:886 msgid "Summary email is empty, skipping it\n" msgstr "Le courriel de résumé étant vide, il a été ignoré\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:873 +#: git-send-email.perl:935 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Êtes-vous sur de vouloir utiliser <%s> [y/N] ? " -#: git-send-email.perl:928 -msgid "The following files are 8bit, but do not declare a Content-Transfer-Encoding.\n" -msgstr "Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-Transfer-Encoding.\n" +#: git-send-email.perl:990 +msgid "" +"The following files are 8bit, but do not declare a Content-Transfer-" +"Encoding.\n" +msgstr "" +"Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-" +"Transfer-Encoding.\n" -#: git-send-email.perl:933 +#: git-send-email.perl:995 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? " -#: git-send-email.perl:941 +#: git-send-email.perl:1003 #, perl-format msgid "" "Refusing to send because the patch\n" "\t%s\n" -"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n" +"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " +"want to send.\n" msgstr "" "Envoi refusé parce que le patch\n" "\t%s\n" -"a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez vraiment envoyer.\n" +"a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez " +"vraiment envoyer.\n" -#: git-send-email.perl:960 +#: git-send-email.perl:1022 msgid "To whom should the emails be sent (if anyone)?" msgstr "À qui les courriels doivent-ils être envoyés (s'il y en a) ?" -#: git-send-email.perl:978 +#: git-send-email.perl:1040 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal : l'alias '%s' se développe en lui-même\n" -#: git-send-email.perl:990 +#: git-send-email.perl:1052 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " -msgstr "Message-ID à utiliser comme In-Reply-To pour le premier courriel (s'il y en a) ? " +msgstr "" +"Message-ID à utiliser comme In-Reply-To pour le premier courriel (s'il y en " +"a) ? " -#: git-send-email.perl:1048 git-send-email.perl:1056 +#: git-send-email.perl:1114 git-send-email.perl:1122 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n" @@ -25229,16 +26798,16 @@ msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1060 +#: git-send-email.perl:1126 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Que faire de cette adresse ? ([q]uitter|[d]élaisser|[e]diter): " -#: git-send-email.perl:1377 +#: git-send-email.perl:1446 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "Le chemin vers la CA \"%s\" n'existe pas" -#: git-send-email.perl:1460 +#: git-send-email.perl:1529 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -25265,112 +26834,114 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1475 +#: git-send-email.perl:1544 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Envoyer ce courriel ? ([y]es|[n]o|[e]dit|[q]uit|[a]ll) : " -#: git-send-email.perl:1478 +#: git-send-email.perl:1547 msgid "Send this email reply required" msgstr "Une réponse est nécessaire" -#: git-send-email.perl:1506 +#: git-send-email.perl:1581 msgid "The required SMTP server is not properly defined." msgstr "Le serveur SMTP nécessaire n'est pas défini correctement." -#: git-send-email.perl:1553 +#: git-send-email.perl:1628 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Le serveur ne supporte pas STARTTLS ! %s" -#: git-send-email.perl:1558 git-send-email.perl:1562 +#: git-send-email.perl:1633 git-send-email.perl:1637 #, perl-format msgid "STARTTLS failed! %s" msgstr "échec de STARTTLS ! %s" -#: git-send-email.perl:1571 +#: git-send-email.perl:1646 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." -msgstr "Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-debug." +msgstr "" +"Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-" +"debug." -#: git-send-email.perl:1589 +#: git-send-email.perl:1664 #, perl-format msgid "Failed to send %s\n" msgstr "Échec de l'envoi de %s\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Dry-Sent %s\n" msgstr "Envoi simulé de %s\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Sent %s\n" msgstr "%s envoyé\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "Dry-OK. Log says:\n" msgstr "Simulation OK. Le journal indique :\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "OK. Log says:\n" msgstr "OK. Le journal indique :\n" -#: git-send-email.perl:1606 +#: git-send-email.perl:1688 msgid "Result: " msgstr "Résultat : " -#: git-send-email.perl:1609 +#: git-send-email.perl:1691 msgid "Result: OK\n" msgstr "Résultat : OK\n" -#: git-send-email.perl:1627 +#: git-send-email.perl:1709 #, perl-format msgid "can't open file %s" msgstr "impossible d'ouvrir le fichier %s" -#: git-send-email.perl:1674 git-send-email.perl:1694 +#: git-send-email.perl:1756 git-send-email.perl:1776 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1680 +#: git-send-email.perl:1762 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1737 +#: git-send-email.perl:1819 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1772 +#: git-send-email.perl:1854 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1883 +#: git-send-email.perl:1965 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Impossible d'exécuter '%s'" -#: git-send-email.perl:1890 +#: git-send-email.perl:1972 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Ajout de %s : %s depuis : '%s'\n" -#: git-send-email.perl:1894 +#: git-send-email.perl:1976 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) échec de la fermeture du pipe vers '%s'" -#: git-send-email.perl:1924 +#: git-send-email.perl:2006 msgid "cannot send message as 7bit" msgstr "impossible d'envoyer un message comme 7bit" -#: git-send-email.perl:1932 +#: git-send-email.perl:2014 msgid "invalid transfer encoding" msgstr "codage de transfert invalide" -#: git-send-email.perl:1966 +#: git-send-email.perl:2051 #, perl-format msgid "" "fatal: %s: rejected by sendemail-validate hook\n" @@ -25381,12 +26952,12 @@ msgstr "" "%s\n" "attention : aucun patch envoyé\n" -#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039 +#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124 #, perl-format msgid "unable to open %s: %s\n" msgstr "impossible d'ouvrir %s :%s\n" -#: git-send-email.perl:1979 +#: git-send-email.perl:2064 #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" @@ -25395,69 +26966,13 @@ msgstr "" "fatal : %s : %d est plus long que 998 caractères \n" "attention : aucun patch envoyé\n" -#: git-send-email.perl:1997 +#: git-send-email.perl:2082 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:2001 +#: git-send-email.perl:2086 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " - -#~ msgid "--cached and --3way cannot be used together." -#~ msgstr "--cached et --3way ne peuvent pas être utilisés ensemble." - -#~ msgid "both" -#~ msgstr "les deux" - -#~ msgid "one" -#~ msgstr "un" - -#, c-format -#~ msgid "Already up to date!" -#~ msgstr "Déjà à jour !" - -#~ msgid "Already up to date. Yeeah!" -#~ msgstr "Déjà à jour. Ouais !" - -#~ msgid "--batch-size option is only for 'repack' subcommand" -#~ msgstr "l'option --batch-size ne sert que pour la sous-commande 'repack'" - -#~ msgid "Percentage by which creation is weighted" -#~ msgstr "Pourcentage par lequel la création est pondérée" - -#~ msgid "" -#~ "the rebase.useBuiltin support has been removed!\n" -#~ "See its entry in 'git help config' for details." -#~ msgstr "" -#~ "les support de rebase.useBuiltin a été supprimé !\n" -#~ "Voir son entrée dans 'git help config' pour plus de détails." - -#, perl-format -#~ msgid "%s: patch contains a line longer than 998 characters" -#~ msgstr "%s : le patch contient une ligne plus longue que 998 caractères" - -#~ msgid "repository contains replace objects; skipping commit-graph" -#~ msgstr "le dépôt contient des object de remplacement ; saut du graphe de commits" - -#~ msgid "repository contains (deprecated) grafts; skipping commit-graph" -#~ msgstr "le dépôt contient des greffes (déconseillées) ; saut du graphe de commits" - -#~ msgid "repository is shallow; skipping commit-graph" -#~ msgstr "le dépôt est superficiel ; saut du graphe de commit" - -#, c-format -#~ msgid "commit-graph improper chunk offset %08x%08x" -#~ msgstr "décalage de bloc %08x%08x du graphe de commit inadéquat" - -#, c-format -#~ msgid "commit-graph chunk id %08x appears multiple times" -#~ msgstr "l'id de bloc de graphe de commit %08x apparaît des multiples fois" - -#~ msgid "invalid chunk offset (too large)" -#~ msgstr "décalage de section invalide (trop grand)" - -#~ msgid "Writing chunks to multi-pack-index" -#~ msgstr "Écriture des sections dans l'index multi-paquet" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-05-17 16:02+0800\n" +"POT-Creation-Date: 2021-08-03 17:06+0800\n" "PO-Revision-Date: 2021-05-17 18:32+0700\n" "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n" "Language-Team: Indonesian\n" @@ -23,7 +23,7 @@ msgid "Huh (%s)?" msgstr "Huh (%s)" #: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 -#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 +#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 #: builtin/rebase.c:1953 msgid "could not read index" msgstr "tidak dapat membaca indeks" @@ -52,7 +52,7 @@ msgstr "Perbarui" msgid "could not stage '%s'" msgstr "tidak dapat menggelar '%s'" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707 msgid "could not write index" msgstr "tidak dapat menulis indeks" @@ -110,12 +110,12 @@ msgstr[1] "%d jalur ditambahkan\n" msgid "ignoring unmerged: %s" msgstr "mengabaikan tak tergabung: %s" -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 +#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "Hanya berkas biner yang berubah.\n" -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 +#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "Tidak ada perubahan.\n" @@ -192,11 +192,11 @@ msgstr "pilih item bernomor" msgid "(empty) select nothing" msgstr "(empty) tidak pilih apapun" -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 +#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** Perintah ***" -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 +#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893 msgid "What now" msgstr "Apa sekarang" @@ -208,12 +208,12 @@ msgstr "tergelar" msgid "unstaged" msgstr "tak tergelar" -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 -#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309 +#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 -#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327 -#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 #: git-add--interactive.perl:213 msgid "path" msgstr "jalur" @@ -222,7 +222,7 @@ msgstr "jalur" msgid "could not refresh index" msgstr "tidak dapat menyegarkan indeks" -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 +#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "Sampai jumpa.\n" @@ -523,34 +523,34 @@ msgstr "" "a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n" "d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n" -#: add-patch.c:342 +#: add-patch.c:343 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "tidak dapat menguraikan kepala hunk '%.*s'" -#: add-patch.c:361 add-patch.c:365 +#: add-patch.c:362 add-patch.c:366 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "tidak dapat menguraikan kepala hunk berwarna '%.*s'" -#: add-patch.c:419 +#: add-patch.c:420 msgid "could not parse diff" msgstr "tidak dapat menguraikan diff" -#: add-patch.c:438 +#: add-patch.c:439 msgid "could not parse colored diff" msgstr "tidak dapat menguraikan diff berwarna" -#: add-patch.c:452 +#: add-patch.c:453 #, c-format msgid "failed to run '%s'" msgstr "gagal menjalankan '%s'" -#: add-patch.c:611 +#: add-patch.c:612 msgid "mismatched output from interactive.diffFilter" msgstr "keluaran tak cocok dari interactive.diffFilter" -#: add-patch.c:612 +#: add-patch.c:613 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -558,7 +558,7 @@ msgstr "" "Saringan Anda haru menjaga korespondensi satu-satu antara masukannya\n" "dan baris keluaran." -#: add-patch.c:790 +#: add-patch.c:791 #, c-format msgid "" "expected context line #%d in\n" @@ -567,7 +567,7 @@ msgstr "" "baris konteks #%d diharapkan dalam\n" "%.*s" -#: add-patch.c:805 +#: add-patch.c:806 #, c-format msgid "" "hunks do not overlap:\n" @@ -580,11 +580,11 @@ msgstr "" "tidak berakhir dengan:\n" "%.*s" -#: add-patch.c:1081 git-add--interactive.perl:1115 +#: add-patch.c:1082 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Mode sunting hunk manual -- lihat dibawah untuk panduan cepat.\n" -#: add-patch.c:1085 +#: add-patch.c:1086 #, c-format msgid "" "---\n" @@ -598,7 +598,7 @@ msgstr "" "Baris yang diawali dengan %c akan dihapus.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1099 git-add--interactive.perl:1129 +#: add-patch.c:1100 git-add--interactive.perl:1129 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" @@ -608,11 +608,11 @@ msgstr "" "untuk menyunting lagi. Jika semua baris dalam hunk dihapus, suntingan\n" "dibatalkan dan hunk tetap tidak berubah.\n" -#: add-patch.c:1132 +#: add-patch.c:1133 msgid "could not parse hunk header" msgstr "tidak dapat menguraikan kepala hunk" -#: add-patch.c:1177 +#: add-patch.c:1178 msgid "'git apply --cached' failed" msgstr "'git apply --cached' gagal" @@ -628,26 +628,26 @@ msgstr "'git apply --cached' gagal" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1246 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Hunk Anda tak diterapkan. Sunting lagi (bilang \"n\" untuk \"tidak\" buang!) " "[y/n]?" -#: add-patch.c:1289 +#: add-patch.c:1290 msgid "The selected hunks do not apply to the index!" msgstr "Hunk yang dipilih tidak diterapkan ke indeks!" -#: add-patch.c:1290 git-add--interactive.perl:1346 +#: add-patch.c:1291 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "Tetap terapkan itu ke pohon kerja? " -#: add-patch.c:1297 git-add--interactive.perl:1349 +#: add-patch.c:1298 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "Tidak ada yang diterapkan.\n" -#: add-patch.c:1354 +#: add-patch.c:1355 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -669,69 +669,69 @@ msgstr "" "e - sunting hunk saat ini secara manual\n" "? - cetak bantuan\n" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1517 add-patch.c:1527 msgid "No previous hunk" msgstr "Tidak ada hunk sebelumnya" -#: add-patch.c:1521 add-patch.c:1531 +#: add-patch.c:1522 add-patch.c:1532 msgid "No next hunk" msgstr "Tidak ada hunk selanjutnya" -#: add-patch.c:1537 +#: add-patch.c:1538 msgid "No other hunks to goto" msgstr "Tidak ada hunk lainnya untuk dikunjungi" -#: add-patch.c:1548 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " msgstr "pergi ke hunk yang mana (<ret> untuk lihat lebih)? " -#: add-patch.c:1549 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "pergi ke hunk yang mana?" -#: add-patch.c:1560 +#: add-patch.c:1561 #, c-format msgid "Invalid number: '%s'" msgstr "Angka tidak valid: '%s'" -#: add-patch.c:1565 +#: add-patch.c:1566 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "Maaf, hanya %d hunk yang tersedia." msgstr[1] "Maaf, hanya %d hunk yang tersedia." -#: add-patch.c:1574 +#: add-patch.c:1575 msgid "No other hunks to search" msgstr "Tidak ada hunk lainnya untuk dicari" -#: add-patch.c:1580 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "cari untuk regex? " -#: add-patch.c:1595 +#: add-patch.c:1596 #, c-format msgid "Malformed search regexp %s: %s" msgstr "regexp pencarian %s cacat: %s" -#: add-patch.c:1612 +#: add-patch.c:1613 msgid "No hunk matches the given pattern" msgstr "Tidak ada hunk yang cocok dengan pola yang diberikan" -#: add-patch.c:1619 +#: add-patch.c:1620 msgid "Sorry, cannot split this hunk" msgstr "Maaf, tidak dapat membelah hunk ini" -#: add-patch.c:1623 +#: add-patch.c:1624 #, c-format msgid "Split into %d hunks." msgstr "Terbelah ke dalam %d hunk." -#: add-patch.c:1627 +#: add-patch.c:1628 msgid "Sorry, cannot edit this hunk" msgstr "Maaf, tidak dapat menyunting hunk ini" -#: add-patch.c:1679 +#: add-patch.c:1680 msgid "'git apply' failed" msgstr "'git apply' gagal" @@ -1137,8 +1137,8 @@ msgstr "" msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 -#: read-cache.c:1351 +#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892 +#: read-cache.c:1353 #, c-format msgid "invalid path '%s'" msgstr "" @@ -1228,7 +1228,7 @@ msgstr "" msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4376 builtin/bisect--helper.c:523 +#: apply.c:4376 builtin/bisect--helper.c:525 #, c-format msgid "failed to write to '%s'" msgstr "" @@ -1318,7 +1318,7 @@ msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "" @@ -1330,7 +1330,7 @@ msgstr "" msgid "apply changes matching the given path" msgstr "" -#: apply.c:5000 builtin/am.c:2317 +#: apply.c:5000 builtin/am.c:2318 msgid "num" msgstr "" @@ -1394,9 +1394,9 @@ msgstr "" msgid "ensure at least <n> lines of context match" msgstr "" -#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 +#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991 #: builtin/rebase.c:1347 msgid "action" msgstr "" @@ -1426,8 +1426,8 @@ msgid "allow overlapping hunks" msgstr "" #: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 -#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 -#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "" @@ -1439,7 +1439,7 @@ msgstr "" msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5059 builtin/am.c:2305 +#: apply.c:5059 builtin/am.c:2306 msgid "root" msgstr "" @@ -1481,7 +1481,7 @@ msgstr "" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "" -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 #, c-format msgid "deflate error (%d)" msgstr "" @@ -1516,13 +1516,13 @@ msgid "cannot read %s" msgstr "Tidak dapat membaca %s" #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 -#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 +#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833 #: builtin/merge.c:1143 #, c-format msgid "could not read '%s'" msgstr "tidak dapat membaca '%s'" -#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 +#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "spek jalur '%s' tidak cocok dengan berkas apapun" @@ -1564,7 +1564,7 @@ msgstr "fmt" msgid "archive format" msgstr "format arsip" -#: archive.c:553 builtin/log.c:1772 +#: archive.c:553 builtin/log.c:1775 msgid "prefix" msgstr "prefiks" @@ -1575,7 +1575,7 @@ msgstr "tambahkan prefiks di depan setiap nama jalur dalam arsip" #: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105 +#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105 #: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" @@ -1606,7 +1606,7 @@ msgid "list supported archive formats" msgstr "daftar format arsip yang didukung" #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "repositori" @@ -1614,7 +1614,7 @@ msgstr "repositori" msgid "retrieve the archive from remote repository <repo>" msgstr "ambil arsip dari repositori remote <repo>" -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717 #: builtin/notes.c:498 msgid "command" msgstr "perintah" @@ -1668,17 +1668,17 @@ msgstr "" #: bisect.c:489 #, c-format msgid "Badly quoted content in file '%s': %s" -msgstr "" +msgstr "Kontent terkutip jelek dalam berkas '%s': %s" #: bisect.c:699 #, c-format msgid "We cannot bisect more!\n" -msgstr "" +msgstr "Kami tidak dapat membagi dua lagi!\n" #: bisect.c:766 #, c-format msgid "Not a valid commit name %s" -msgstr "" +msgstr "Bukan sebuah nama komit yang valid %s" #: bisect.c:791 #, c-format @@ -1686,6 +1686,8 @@ msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "" +"Dasar penggabungan %s jelek.\n" +"Ini berarti bug telah diperbaiki antara %s dan [%s].\n" #: bisect.c:796 #, c-format @@ -1693,6 +1695,8 @@ msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" +"Dasar penggabungan %s baru.\n" +"Properti telah berubah antara %s dan [%s].\n" #: bisect.c:801 #, c-format @@ -1700,6 +1704,8 @@ msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" +"Dasar penggabungan %s adalah %s.\n" +"Ini berarti komit '%s' pertama adalah di antara %s dan [%s].\n" #: bisect.c:809 #, c-format @@ -1708,6 +1714,9 @@ msgid "" "git bisect cannot work properly in this case.\n" "Maybe you mistook %s and %s revs?\n" msgstr "" +"Beberapa revisi %s bukan nenek moyang dari revisi %s.\n" +"git bisect tidak dapat bekerja dengan benar pada kasus ini.\n" +"Mungkin Anda salah mengira revisi %s dan %s?\n" #: bisect.c:822 #, c-format @@ -1716,35 +1725,38 @@ msgid "" "So we cannot be sure the first %s commit is between %s and %s.\n" "We continue anyway." msgstr "" +"dasar penggabungan antara %s dan [%s] harus dilewatkan.\n" +"Jadi kami tidak dapat yakin komit %s pertama di antara %s dan %s.\n" +"Kami tetap lanjutkan." #: bisect.c:861 #, c-format msgid "Bisecting: a merge base must be tested\n" -msgstr "" +msgstr "Membagi dua: dasar penggabungan harus diuji\n" #: bisect.c:911 #, c-format msgid "a %s revision is needed" -msgstr "" +msgstr "sebuah revisi %s diperlukan" #: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298 #, c-format msgid "could not create file '%s'" -msgstr "" +msgstr "tidak dapat membuat berkas '%s'" #: bisect.c:987 builtin/merge.c:153 #, c-format msgid "could not read file '%s'" -msgstr "" +msgstr "tidak dapat membaca berkas '%s'" #: bisect.c:1027 msgid "reading bisect refs failed" -msgstr "" +msgstr "gagal membaca berkas referensi bagi dua" #: bisect.c:1057 #, c-format msgid "%s was both %s and %s\n" -msgstr "" +msgstr "%s sama-sama %s dan %s\n" #: bisect.c:1066 #, c-format @@ -1752,13 +1764,15 @@ msgid "" "No testable commit found.\n" "Maybe you started with bad path arguments?\n" msgstr "" +"Tidak ada komit yang bisa diuji ditemukan.\n" +"Mungkin Anda mulai dengan argumen jalur jelek?\n" #: bisect.c:1095 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "(kira-kira %d langkah)" +msgstr[1] "(kira-kira %d langkah)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. @@ -1767,26 +1781,26 @@ msgstr[1] "" #, c-format 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] "" -msgstr[1] "" +msgstr[0] "Membagi dua: %d revisi tersisa untuk diuji setelah ini %s\n" +msgstr[1] "Membagi dua: %d revisi tersisa untuk diuji setelah ini %s\n" #: blame.c:2776 msgid "--contents and --reverse do not blend well." -msgstr "" +msgstr "--contents dan --reverse tidak dapat dipadu dengan baik." #: blame.c:2790 msgid "cannot use --contents with final commit object name" -msgstr "" +msgstr "tidak dapat menggunakan --contents dengan nama objek komit final" #: blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" -msgstr "" +msgstr "--reverse dan --first-parent bersama-sama butuh komit terbaru yang disebutkan" -#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 -#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 -#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 -#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 -#: builtin/pack-objects.c:3661 builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414 +#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346 +#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806 +#: builtin/pack-objects.c:3821 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "persiapan jalan revisi gagal" @@ -1794,16 +1808,17 @@ msgstr "persiapan jalan revisi gagal" msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" +"--reverse --first-parent bersama-sama butuh rentang bersama rantai induk pertama" #: blame.c:2849 #, c-format msgid "no such path %s in %s" -msgstr "" +msgstr "tidak ada jalur seperti %s di %s" #: blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" -msgstr "" +msgstr "tidak dapat membaca blob %s untuk jalur %s" #: branch.c:53 #, c-format @@ -1929,118 +1944,118 @@ msgstr "" msgid "HEAD of working tree %s is not updated" msgstr "" -#: bundle.c:41 +#: bundle.c:44 #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "" -#: bundle.c:45 +#: bundle.c:48 #, c-format msgid "unknown capability '%s'" msgstr "" -#: bundle.c:71 +#: bundle.c:74 #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "" -#: bundle.c:110 +#: bundle.c:113 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 #: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "" -#: bundle.c:189 +#: bundle.c:198 msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:192 +#: bundle.c:201 msgid "need a repository to verify a bundle" msgstr "" -#: bundle.c:243 +#: bundle.c:257 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:250 +#: bundle.c:264 msgid "The bundle records a complete history." msgstr "" -#: bundle.c:252 +#: bundle.c:266 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:319 +#: bundle.c:333 msgid "unable to dup bundle descriptor" msgstr "" -#: bundle.c:326 +#: bundle.c:340 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:337 +#: bundle.c:351 msgid "pack-objects died" msgstr "" -#: bundle.c:386 +#: bundle.c:400 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:490 +#: bundle.c:504 #, c-format msgid "unsupported bundle version %d" msgstr "" -#: bundle.c:492 +#: bundle.c:506 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:539 +#: bundle.c:553 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:549 +#: bundle.c:563 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:574 +#: bundle.c:588 msgid "index-pack died" msgstr "" -#: chunk-format.c:113 +#: chunk-format.c:117 msgid "terminating chunk id appears earlier than expected" msgstr "" -#: chunk-format.c:122 +#: chunk-format.c:126 #, c-format msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" msgstr "" -#: chunk-format.c:129 +#: chunk-format.c:133 #, c-format msgid "duplicate chunk ID %<PRIx32> found" msgstr "" -#: chunk-format.c:143 +#: chunk-format.c:147 #, c-format msgid "final chunk has non-zero id %<PRIx32>" msgstr "" @@ -2108,12 +2123,12 @@ msgstr "" msgid "commit-graph requires overflow generation data but has none" msgstr "" -#: commit-graph.c:1075 builtin/am.c:1340 +#: commit-graph.c:1075 builtin/am.c:1341 #, c-format msgid "unable to parse commit %s" msgstr "" -#: commit-graph.c:1337 builtin/pack-objects.c:2897 +#: commit-graph.c:1337 builtin/pack-objects.c:3057 #, c-format msgid "unable to get type of object %s" msgstr "" @@ -2175,7 +2190,7 @@ msgstr "" msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1812 midx.c:906 +#: commit-graph.c:1812 midx.c:911 #, c-format msgid "unable to create leading directories of %s" msgstr "" @@ -2224,78 +2239,78 @@ msgstr "" msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:2450 +#: commit-graph.c:2449 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:2460 +#: commit-graph.c:2459 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:2470 commit-graph.c:2485 +#: commit-graph.c:2469 commit-graph.c:2484 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:2477 +#: commit-graph.c:2476 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" -#: commit-graph.c:2495 +#: commit-graph.c:2494 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2510 +#: commit-graph.c:2509 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2517 +#: commit-graph.c:2516 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2527 +#: commit-graph.c:2526 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2536 +#: commit-graph.c:2535 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2550 +#: commit-graph.c:2549 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2555 +#: commit-graph.c:2554 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2559 +#: commit-graph.c:2558 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2576 +#: commit-graph.c:2575 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "" -#: commit-graph.c:2582 +#: commit-graph.c:2581 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" -#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416 -#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417 +#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "" @@ -2569,7 +2584,7 @@ msgstr "nilai rusak untuk %s: %s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "harus salah satu dari nothing, matching, simple, upstream atau current" -#: config.c:1687 builtin/pack-objects.c:3924 +#: config.c:1687 builtin/pack-objects.c:4084 #, c-format msgid "bad pack compression level %d" msgstr "level kompresi pak jelek %d" @@ -2589,110 +2604,110 @@ msgstr "referensi '%s' tidak menunjuk pada sebuah blob" msgid "unable to resolve config blob '%s'" msgstr "tidak dapat menguraikan blob konfigurasi '%s'" -#: config.c:1873 +#: config.c:1874 #, c-format msgid "failed to parse %s" msgstr "gagal menguraikan %s" -#: config.c:1929 +#: config.c:1930 msgid "unable to parse command-line config" msgstr "gagal menguraikan konfigurasi baris perintah" -#: config.c:2293 +#: config.c:2294 msgid "unknown error occurred while reading the configuration files" msgstr "error tidak diketahui ketika membaca berkas konfigurasi" -#: config.c:2467 +#: config.c:2468 #, c-format msgid "Invalid %s: '%s'" msgstr "%s tidak valid: '%s'" -#: config.c:2512 +#: config.c:2513 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "nilai splitIndex.maxPercentChange '%d' harusnya diantara 0 dan 100" -#: config.c:2558 +#: config.c:2559 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "tidak dapat menguraikan '%s' dari konfigurasi baris perintah" -#: config.c:2560 +#: config.c:2561 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variabel konfigurasi '%s' jelek dalam berkas '%s' pada baris %d" -#: config.c:2644 +#: config.c:2645 #, c-format msgid "invalid section name '%s'" msgstr "nama bagian '%s' tidak valid" -#: config.c:2676 +#: config.c:2677 #, c-format msgid "%s has multiple values" msgstr "%s punya banyak nilai" -#: config.c:2705 +#: config.c:2706 #, c-format msgid "failed to write new configuration file %s" msgstr "gagal menulis berkas konfigurasi baru %s" -#: config.c:2957 config.c:3283 +#: config.c:2958 config.c:3285 #, c-format msgid "could not lock config file %s" msgstr "tidak dapat mengunci berkas konfigurasi %s" -#: config.c:2968 +#: config.c:2969 #, c-format msgid "opening %s" msgstr "membuka %s" -#: config.c:3005 builtin/config.c:361 +#: config.c:3006 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "pola tidak valid: %s" -#: config.c:3030 +#: config.c:3031 #, c-format msgid "invalid config file %s" msgstr "berkas konfigurasi %s tidak valid" -#: config.c:3043 config.c:3296 +#: config.c:3044 config.c:3298 #, c-format msgid "fstat on %s failed" msgstr "fstat pada %s gagal" -#: config.c:3054 +#: config.c:3055 #, c-format -msgid "unable to mmap '%s'" -msgstr "tidak dapat me-mmap '%s'" +msgid "unable to mmap '%s'%s" +msgstr "tidak dapat me-mmap '%s'%s" -#: config.c:3063 config.c:3301 +#: config.c:3065 config.c:3303 #, c-format msgid "chmod on %s failed" msgstr "chmod pada %s gagal" -#: config.c:3148 config.c:3398 +#: config.c:3150 config.c:3400 #, c-format msgid "could not write config file %s" msgstr "tidak dapat menulis berkas konfigurasi %s" -#: config.c:3182 +#: config.c:3184 #, c-format msgid "could not set '%s' to '%s'" msgstr "tidak dapat menyetel '%s' ke '%s'" -#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "tidak dapat mem-batal setel '%s'" -#: config.c:3274 +#: config.c:3276 #, c-format msgid "invalid section name: %s" msgstr "nama bagian tidak valid: %s" -#: config.c:3441 +#: config.c:3443 #, c-format msgid "missing value for '%s'" msgstr "nilai hilang untuk '%s'" @@ -2861,7 +2876,7 @@ msgstr "" msgid "unable to fork" msgstr "" -#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45 msgid "Checking connectivity" msgstr "" @@ -3114,36 +3129,36 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "" -#: diff-merges.c:80 +#: diff-merges.c:70 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "" -#: diff-lib.c:538 +#: diff-lib.c:557 msgid "--merge-base does not work with ranges" msgstr "" -#: diff-lib.c:540 +#: diff-lib.c:559 msgid "--merge-base only works with commits" msgstr "" -#: diff-lib.c:557 +#: diff-lib.c:576 msgid "unable to get HEAD" msgstr "" -#: diff-lib.c:564 +#: diff-lib.c:583 msgid "no merge base found" msgstr "" -#: diff-lib.c:566 +#: diff-lib.c:585 msgid "multiple merge bases found" msgstr "" -#: diff-no-index.c:238 +#: diff-no-index.c:237 msgid "git diff --no-index [<options>] <path> <path>" msgstr "" -#: diff-no-index.c:263 +#: diff-no-index.c:262 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" @@ -3199,35 +3214,49 @@ msgstr "" "Ditemukan error dalam variable konfigurasi 'diff.dirstat':\n" "%s" -#: diff.c:4278 +#: diff.c:4282 #, c-format msgid "external diff died, stopping at %s" msgstr "diff eksternal mati, berhenti pada %s" -#: diff.c:4630 +#: diff.c:4634 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check dan -s saling eksklusif" -#: diff.c:4633 +#: diff.c:4637 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S dan --find-object saling eksklusif" -#: diff.c:4712 +#: diff.c:4640 +msgid "" +"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" +msgstr "" +"-G dan --pickaxe-regex saling eksklusif, gunakan --pickaxe-regex dengan -S" + +#: diff.c:4643 +msgid "" +"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +"with -G and -S" +msgstr "" +"---pickaxe-all dan --find-object saling eksklusif, gunakan --pickaxe-all " +"dengan -G dan -S" + +#: diff.c:4722 msgid "--follow requires exactly one pathspec" msgstr "--follow butuh tepatnya satu spek jalur" -#: diff.c:4760 +#: diff.c:4770 #, c-format msgid "invalid --stat value: %s" msgstr "nilai --stat tidak valid: %s" -#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 +#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s harap nilai numerik" -#: diff.c:4797 +#: diff.c:4807 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3236,42 +3265,42 @@ msgstr "" "Gagal menguraikan parameter opsi --dirstat/-X:\n" "%s" -#: diff.c:4882 +#: diff.c:4892 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "kelas perubahan '%c' tidak dikenal dalam --diff-filter=%s" -#: diff.c:4906 +#: diff.c:4916 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "nilai tidak dikenal setelah ws-error-highlight=%.*s" -#: diff.c:4920 +#: diff.c:4930 #, c-format msgid "unable to resolve '%s'" msgstr "tidak dapat menguraikan '%s'" -#: diff.c:4970 diff.c:4976 +#: diff.c:4980 diff.c:4986 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s butuh bentuk <n>/<m>" -#: diff.c:4988 +#: diff.c:4998 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s butuh sebuah karakter, dapat '%s'" -#: diff.c:5009 +#: diff.c:5019 #, c-format msgid "bad --color-moved argument: %s" msgstr "argumen --color-moved jelek: %s" -#: diff.c:5028 +#: diff.c:5038 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode tidak valid '%s' dalam --color-moved-ws" -#: diff.c:5068 +#: diff.c:5078 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3279,162 +3308,162 @@ msgstr "" "opsi diff-algorithm terima \"myers\", \"minimal\", \"patience\" dan " "\"histogram\"" -#: diff.c:5104 diff.c:5124 +#: diff.c:5114 diff.c:5134 #, c-format msgid "invalid argument to %s" msgstr "argumen tidak valid ke %s" -#: diff.c:5228 +#: diff.c:5238 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "regex tidak valid diberikan ke -I: '%s'" -#: diff.c:5277 +#: diff.c:5287 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "gagal menguraikan parameter opsi --submodule: '%s'" -#: diff.c:5333 +#: diff.c:5343 #, c-format msgid "bad --word-diff argument: %s" msgstr "argumen --word-diff jelek: %s" -#: diff.c:5369 +#: diff.c:5379 msgid "Diff output format options" msgstr "Opsi format keluaran diff" -#: diff.c:5371 diff.c:5377 +#: diff.c:5381 diff.c:5387 msgid "generate patch" msgstr "buat tambalan" -#: diff.c:5374 builtin/log.c:179 +#: diff.c:5384 builtin/log.c:179 msgid "suppress diff output" msgstr "sembunyikan keluaran diff" -#: diff.c:5379 diff.c:5493 diff.c:5500 +#: diff.c:5389 diff.c:5503 diff.c:5510 msgid "<n>" msgstr "<n>" -#: diff.c:5380 diff.c:5383 +#: diff.c:5390 diff.c:5393 msgid "generate diffs with <n> lines context" msgstr "buat diff dengan <n> baris konteks" -#: diff.c:5385 +#: diff.c:5395 msgid "generate the diff in raw format" msgstr "buat diff dalam format mentah" -#: diff.c:5388 +#: diff.c:5398 msgid "synonym for '-p --raw'" msgstr "sinonim untuk '-p --raw'" -#: diff.c:5392 +#: diff.c:5402 msgid "synonym for '-p --stat'" msgstr "sinonim untuk '-p --stat'" -#: diff.c:5396 +#: diff.c:5406 msgid "machine friendly --stat" msgstr "--stat yang ramah mesin" -#: diff.c:5399 +#: diff.c:5409 msgid "output only the last line of --stat" msgstr "keluarkan hanya baris terakhir --stat" -#: diff.c:5401 diff.c:5409 +#: diff.c:5411 diff.c:5419 msgid "<param1,param2>..." msgstr "<parameter 1,parameter 2>..." -#: diff.c:5402 +#: diff.c:5412 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "keluarkan distribusi jumlah perubahan relatif untuk setiap subdirektori" -#: diff.c:5406 +#: diff.c:5416 msgid "synonym for --dirstat=cumulative" msgstr "sinonim untuk --dirstat=cumulative" -#: diff.c:5410 +#: diff.c:5420 msgid "synonym for --dirstat=files,param1,param2..." msgstr "sinonim untuk --dirstat=files,param1,param2..." -#: diff.c:5414 +#: diff.c:5424 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "peringatkan bila perubahan memasukkan penanda konflik atau kesalahan spasi" -#: diff.c:5417 +#: diff.c:5427 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "ringkasan singkat seperti pembuatan, penggantian nama dan perubahan mode" -#: diff.c:5420 +#: diff.c:5430 msgid "show only names of changed files" msgstr "perlihatkan hanya nama berkas yang berubah" -#: diff.c:5423 +#: diff.c:5433 msgid "show only names and status of changed files" msgstr "perlihatkan hanya nama dan status berkas yang berubah" -#: diff.c:5425 +#: diff.c:5435 msgid "<width>[,<name-width>[,<count>]]" msgstr "<lebar>[,<nama lebar>[,<hitungan>]]" -#: diff.c:5426 +#: diff.c:5436 msgid "generate diffstat" msgstr "buat diffstat" -#: diff.c:5428 diff.c:5431 diff.c:5434 +#: diff.c:5438 diff.c:5441 diff.c:5444 msgid "<width>" msgstr "<lebar>" -#: diff.c:5429 +#: diff.c:5439 msgid "generate diffstat with a given width" msgstr "buat diffstat dengan lebar yang diberikan" -#: diff.c:5432 +#: diff.c:5442 msgid "generate diffstat with a given name width" msgstr "buat diffstat dengan nama lebar yang diberikan" -#: diff.c:5435 +#: diff.c:5445 msgid "generate diffstat with a given graph width" msgstr "buat diffstat dengan lebar grafik yang diberikan" -#: diff.c:5437 +#: diff.c:5447 msgid "<count>" msgstr "<hitungan>" -#: diff.c:5438 +#: diff.c:5448 msgid "generate diffstat with limited lines" msgstr "buat diffstat dengan baris yang terbatas" -#: diff.c:5441 +#: diff.c:5451 msgid "generate compact summary in diffstat" msgstr "buat ringkasan singkat dalam diffstat" -#: diff.c:5444 +#: diff.c:5454 msgid "output a binary diff that can be applied" msgstr "keluarkan diff biner yang dapat diterapkan" -#: diff.c:5447 +#: diff.c:5457 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "perlihatkan objek pra- dan pasca-citra penuh pada baris \"index\"" -#: diff.c:5449 +#: diff.c:5459 msgid "show colored diff" msgstr "perlihatkan diff berwarna" -#: diff.c:5450 +#: diff.c:5460 msgid "<kind>" msgstr "<tipe>" -#: diff.c:5451 +#: diff.c:5461 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" "soroti kesalahan spasi dalam baris 'context', 'old' atau 'new' dalam diff" -#: diff.c:5454 +#: diff.c:5464 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3442,91 +3471,91 @@ msgstr "" "jangan tengkar jalur nama dan gunakan NUL sebagai pembatas bidang keluaran " "pada --raw atau --numstat" -#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572 +#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582 msgid "<prefix>" msgstr "<prefiks>" -#: diff.c:5458 +#: diff.c:5468 msgid "show the given source prefix instead of \"a/\"" msgstr "perlihatkan prefiks sumber yang diberikan daripada \"a/\"" -#: diff.c:5461 +#: diff.c:5471 msgid "show the given destination prefix instead of \"b/\"" msgstr "perlihatkan prefiks tujuan daripada \"b/\"" -#: diff.c:5464 +#: diff.c:5474 msgid "prepend an additional prefix to every line of output" msgstr "tambah depan prefiks tambahan pada setiap baris keluaran" -#: diff.c:5467 +#: diff.c:5477 msgid "do not show any source or destination prefix" msgstr "jangan perlihatkan prefiks sumber atau tujuan apapun" -#: diff.c:5470 +#: diff.c:5480 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "perlihatkan konteks diantara hunk diff hingga jumlah baris yang disebutkan" -#: diff.c:5474 diff.c:5479 diff.c:5484 +#: diff.c:5484 diff.c:5489 diff.c:5494 msgid "<char>" msgstr "<karakter>" -#: diff.c:5475 +#: diff.c:5485 msgid "specify the character to indicate a new line instead of '+'" msgstr "sebutkan karakter yang menandai baris baru daripada '+'" -#: diff.c:5480 +#: diff.c:5490 msgid "specify the character to indicate an old line instead of '-'" msgstr "sebutkan karakter yang menandai baris lama daripada '-'" -#: diff.c:5485 +#: diff.c:5495 msgid "specify the character to indicate a context instead of ' '" msgstr "sebutkan karakter yang menandai konteks daripada ' '" -#: diff.c:5488 +#: diff.c:5498 msgid "Diff rename options" msgstr "Opsi penamaan ulang diff" -#: diff.c:5489 +#: diff.c:5499 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5490 +#: diff.c:5500 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "pisahkan perubahan penulisan ulang penuh kedalam pasangan penghapusan dan " "pembuatan" -#: diff.c:5494 +#: diff.c:5504 msgid "detect renames" msgstr "deteksi penamaan ulang" -#: diff.c:5498 +#: diff.c:5508 msgid "omit the preimage for deletes" msgstr "lewati pracitra untuk penghapusan" -#: diff.c:5501 +#: diff.c:5511 msgid "detect copies" msgstr "deteksi penyalinan" -#: diff.c:5505 +#: diff.c:5515 msgid "use unmodified files as source to find copies" msgstr "" "gunakan berkas tak termodifikasi sebagai sumber untuk menemukan salinan" -#: diff.c:5507 +#: diff.c:5517 msgid "disable rename detection" msgstr "nonaktifkan deteksi penamaan ulang" -#: diff.c:5510 +#: diff.c:5520 msgid "use empty blobs as rename source" msgstr "gunakan blob kosong sebagai sumber penamaan ulang" -#: diff.c:5512 +#: diff.c:5522 msgid "continue listing the history of a file beyond renames" msgstr "lanjutkan daftarkan riwayat berkas di luar penamaan ulang" -#: diff.c:5515 +#: diff.c:5525 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3534,232 +3563,232 @@ msgstr "" "cegah pendeteksian penamaan ulang/penyalinan jika jumlah target penamaan " "ulang/penyalinan melebihi batas yang diberikan" -#: diff.c:5517 +#: diff.c:5527 msgid "Diff algorithm options" msgstr "Opsi algoritma diff" -#: diff.c:5519 +#: diff.c:5529 msgid "produce the smallest possible diff" msgstr "hasilkan diff yang paling kecil yang dimungkinkan" -#: diff.c:5522 +#: diff.c:5532 msgid "ignore whitespace when comparing lines" msgstr "abaikan spasi saat membandingkan baris" -#: diff.c:5525 +#: diff.c:5535 msgid "ignore changes in amount of whitespace" msgstr "abaikan perubahan dalam jumlah spasi" -#: diff.c:5528 +#: diff.c:5538 msgid "ignore changes in whitespace at EOL" msgstr "abaikan perubahan spasi pada EOL" -#: diff.c:5531 +#: diff.c:5541 msgid "ignore carrier-return at the end of line" msgstr "abaikan kembalian-kurir pada akhir baris" -#: diff.c:5534 +#: diff.c:5544 msgid "ignore changes whose lines are all blank" msgstr "abaikan perubahan yang semua baris kosong" -#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606 +#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616 msgid "<regex>" msgstr "<regex>" -#: diff.c:5537 +#: diff.c:5547 msgid "ignore changes whose all lines match <regex>" msgstr "abaikan perubahan yang semua baris cocok dengan <regex>" -#: diff.c:5540 +#: diff.c:5550 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "heuristik untuk geser perbatasan hunk diff untuk pembacaan yang mudah" -#: diff.c:5543 +#: diff.c:5553 msgid "generate diff using the \"patience diff\" algorithm" msgstr "buat diff menggunakan algoritma \"diff sabar\"" -#: diff.c:5547 +#: diff.c:5557 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "buat diff menggunakan algoritma \"diff histogram\"" -#: diff.c:5549 +#: diff.c:5559 msgid "<algorithm>" msgstr "<algoritma>" -#: diff.c:5550 +#: diff.c:5560 msgid "choose a diff algorithm" msgstr "pilih algoritma diff" -#: diff.c:5552 +#: diff.c:5562 msgid "<text>" msgstr "<teks>" -#: diff.c:5553 +#: diff.c:5563 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "buat diff menggunakan algoritma \"diff terlabuh\"" -#: diff.c:5555 diff.c:5564 diff.c:5567 +#: diff.c:5565 diff.c:5574 diff.c:5577 msgid "<mode>" msgstr "<mode>" -#: diff.c:5556 +#: diff.c:5566 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "perlihatkan diff kata, menggunakan <mode> untuk batasi kata yang berubah" -#: diff.c:5559 +#: diff.c:5569 msgid "use <regex> to decide what a word is" msgstr "gunakan <regex> untuk menentukan apa itu kata" -#: diff.c:5562 +#: diff.c:5572 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "sama dengan --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5565 +#: diff.c:5575 msgid "moved lines of code are colored differently" msgstr "baris kode yang berpindah diwarnai berbeda" -#: diff.c:5568 +#: diff.c:5578 msgid "how white spaces are ignored in --color-moved" msgstr "bagaimana spasi diabaikan di --color-moved" -#: diff.c:5571 +#: diff.c:5581 msgid "Other diff options" msgstr "Opsi diff yang lainnya" -#: diff.c:5573 +#: diff.c:5583 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "ketika dijalankan dari subdirektori, kecualikan perubahan diluar dan " "perlihatkan jalur relatif" -#: diff.c:5577 +#: diff.c:5587 msgid "treat all files as text" msgstr "perlakukan semua berkas sebagai teks" -#: diff.c:5579 +#: diff.c:5589 msgid "swap two inputs, reverse the diff" msgstr "tukar dua masukkan, balikkan diff" -#: diff.c:5581 +#: diff.c:5591 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "keluar dengan 1 jika ada perbedaan, selain itu 0" -#: diff.c:5583 +#: diff.c:5593 msgid "disable all output of the program" msgstr "nonaktifkan semua keluaran program" -#: diff.c:5585 +#: diff.c:5595 msgid "allow an external diff helper to be executed" msgstr "perbolehkan pembantu diff eksternal untuk dieksekusi" -#: diff.c:5587 +#: diff.c:5597 msgid "run external text conversion filters when comparing binary files" msgstr "" "jalankan saringan konversi teks eksternal ketika membandingkan berkas biner" -#: diff.c:5589 +#: diff.c:5599 msgid "<when>" msgstr "<kapan>" -#: diff.c:5590 +#: diff.c:5600 msgid "ignore changes to submodules in the diff generation" msgstr "abaikan perubahan submodul dalam pembuatan diff" -#: diff.c:5593 +#: diff.c:5603 msgid "<format>" msgstr "<format>" -#: diff.c:5594 +#: diff.c:5604 msgid "specify how differences in submodules are shown" msgstr "sebutkan bagaimana perbedaan dalam submodul diperlihatkan" -#: diff.c:5598 +#: diff.c:5608 msgid "hide 'git add -N' entries from the index" msgstr "sembunyikan entri 'git add -N' dari indeks" -#: diff.c:5601 +#: diff.c:5611 msgid "treat 'git add -N' entries as real in the index" msgstr "perlakukan entri 'git add -N' sebagai nyata dalam indeks" -#: diff.c:5603 +#: diff.c:5613 msgid "<string>" msgstr "<untai>" -#: diff.c:5604 +#: diff.c:5614 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "cari perbedaan yang mengubah jumlah kemunculan untai yang disebutkan" -#: diff.c:5607 +#: diff.c:5617 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "cari perbedaan yang mengubah jumlah kemunculan regex yang disebutkan" -#: diff.c:5610 +#: diff.c:5620 msgid "show all changes in the changeset with -S or -G" msgstr "perlihatkan semua perubahan dalam set perubahan dengan -S atau -G" -#: diff.c:5613 +#: diff.c:5623 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "perlakukan <string> di -S sebagai ekspresi reguler POSIX yang diperluas" -#: diff.c:5616 +#: diff.c:5626 msgid "control the order in which files appear in the output" msgstr "kontrol urutan berkas yang muncul dalam keluaran" -#: diff.c:5617 diff.c:5620 +#: diff.c:5627 diff.c:5630 msgid "<path>" msgstr "<jalur>" -#: diff.c:5618 +#: diff.c:5628 msgid "show the change in the specified path first" msgstr "perlihatkan perubahan dalam jalur yang disebutkan terlebih dahulu" -#: diff.c:5621 +#: diff.c:5631 msgid "skip the output to the specified path" msgstr "lewati keluaran ke jalur yang disebutkan" -#: diff.c:5623 +#: diff.c:5633 msgid "<object-id>" msgstr "<id objek>" -#: diff.c:5624 +#: diff.c:5634 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "cari perubahan yang mengubah jumlah kemunculan objek yang disebutkan" -#: diff.c:5626 +#: diff.c:5636 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5627 +#: diff.c:5637 msgid "select files by diff type" msgstr "pilih berkas oleh tipe diff" -#: diff.c:5629 +#: diff.c:5639 msgid "<file>" msgstr "<berkas>" -#: diff.c:5630 +#: diff.c:5640 msgid "Output to a specific file" msgstr "Keluarkan ke berkas yang disebutkan" -#: diff.c:6287 -msgid "inexact rename detection was skipped due to too many files." +#: diff.c:6298 +msgid "exhaustive rename detection was skipped due to too many files." msgstr "" -"deteksi penamaan ulang tak eksak dilewati karena terlalu banyak berkas." +"deteksi penamaan ulang lengkap dilewati karena terlalu banyak berkas." -#: diff.c:6290 +#: diff.c:6301 msgid "only found copies from modified paths due to too many files." msgstr "" "hanya ditemukan salinan dari jalur yang berubah karena terlalu banyak berkas." -#: diff.c:6293 +#: diff.c:6304 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3772,7 +3801,7 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:1418 +#: diffcore-rename.c:1510 msgid "Performing inexact rename detection" msgstr "" @@ -3781,59 +3810,59 @@ msgstr "" msgid "No such path '%s' in the diff" msgstr "" -#: dir.c:578 +#: dir.c:593 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" -#: dir.c:718 dir.c:747 dir.c:760 +#: dir.c:733 dir.c:762 dir.c:775 #, c-format msgid "unrecognized pattern: '%s'" msgstr "" -#: dir.c:777 dir.c:791 +#: dir.c:792 dir.c:806 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "" -#: dir.c:809 +#: dir.c:824 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" -#: dir.c:819 +#: dir.c:834 msgid "disabling cone pattern matching" msgstr "" -#: dir.c:1206 +#: dir.c:1221 #, c-format msgid "cannot use %s as an exclude file" msgstr "" -#: dir.c:2314 +#: dir.c:2358 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2614 +#: dir.c:2660 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2738 +#: dir.c:2784 msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3543 +#: dir.c:3617 #, c-format msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:3590 dir.c:3595 +#: dir.c:3664 dir.c:3669 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3624 +#: dir.c:3698 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" @@ -3843,11 +3872,11 @@ msgstr "" msgid "hint: Waiting for your editor to close the file...%c" msgstr "" -#: entry.c:179 +#: entry.c:176 msgid "Filtering content" msgstr "" -#: entry.c:500 +#: entry.c:497 #, c-format msgid "could not stat file '%s'" msgstr "" @@ -4022,7 +4051,7 @@ msgstr "" msgid "source repository is shallow, reject to clone." msgstr "" -#: fetch-pack.c:1128 fetch-pack.c:1651 +#: fetch-pack.c:1128 fetch-pack.c:1660 msgid "git fetch-pack: fetch failed." msgstr "" @@ -4044,7 +4073,7 @@ msgstr "" msgid "Server supports filter" msgstr "" -#: fetch-pack.c:1329 fetch-pack.c:2034 +#: fetch-pack.c:1329 fetch-pack.c:2043 msgid "unable to write request to remote" msgstr "" @@ -4100,24 +4129,24 @@ msgstr "" msgid "git fetch-pack: expected response end packet" msgstr "" -#: fetch-pack.c:1930 +#: fetch-pack.c:1939 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1953 builtin/clone.c:697 +#: fetch-pack.c:1962 builtin/clone.c:697 msgid "remote did not send all necessary objects" msgstr "" -#: fetch-pack.c:2056 +#: fetch-pack.c:2065 msgid "unexpected 'ready' from remote" msgstr "" -#: fetch-pack.c:2079 +#: fetch-pack.c:2088 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:2082 +#: fetch-pack.c:2091 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" @@ -4137,7 +4166,7 @@ msgstr "" #: graph.c:98 #, c-format -msgid "ignore invalid color '%.*s' in log.graphColors" +msgid "ignored invalid color '%.*s' in log.graphColors" msgstr "" #: grep.c:531 @@ -4145,108 +4174,110 @@ msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" msgstr "" +"pola yang diberikan berisi bita NULL (via -f <berkas>). Hal ini hanya " +"didukung dengan -P di bawah PCRE v2" -#: grep.c:1893 +#: grep.c:1895 #, c-format msgid "'%s': unable to read %s" -msgstr "" +msgstr "'%s': tidak dapat membaca %s" -#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 #: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" -msgstr "" +msgstr "gagal men-stat '%s'" -#: grep.c:1921 +#: grep.c:1923 #, c-format msgid "'%s': short read" -msgstr "" +msgstr "'%s': baca pendek" #: help.c:23 msgid "start a working area (see also: git help tutorial)" -msgstr "" +msgstr "mulai area kerja (lihat pula: git help tutorial)" #: help.c:24 msgid "work on the current change (see also: git help everyday)" -msgstr "" +msgstr "bekerja pada perubahan saat ini (lihat pula: git help everyday)" #: help.c:25 msgid "examine the history and state (see also: git help revisions)" -msgstr "" +msgstr "periksa riwayat dan keadaan (lihat pula: git help revisions)" #: help.c:26 msgid "grow, mark and tweak your common history" -msgstr "" +msgstr "tumbuhkan, tandai, dan cubit riwayat umum Anda" #: help.c:27 msgid "collaborate (see also: git help workflows)" -msgstr "" +msgstr "kolaborasi (lihat pula: git help workflows)" #: help.c:31 msgid "Main Porcelain Commands" -msgstr "" +msgstr "Perintah Porselen Utama" #: help.c:32 msgid "Ancillary Commands / Manipulators" -msgstr "" +msgstr "Perintah Tambahan / Peubah" #: help.c:33 msgid "Ancillary Commands / Interrogators" -msgstr "" +msgstr "Perintah Tambahan / Pemeriksa" #: help.c:34 msgid "Interacting with Others" -msgstr "" +msgstr "Berinteraksi dengan yang Lain" #: help.c:35 msgid "Low-level Commands / Manipulators" -msgstr "" +msgstr "Perintah Tingkat Rendah / Peubah" #: help.c:36 msgid "Low-level Commands / Interrogators" -msgstr "" +msgstr "Perintah Tingkat Rendah / Pemeriksa" #: help.c:37 msgid "Low-level Commands / Syncing Repositories" -msgstr "" +msgstr "Perintah Tingkat Rendah / Sinkronisasi Repositori" #: help.c:38 msgid "Low-level Commands / Internal Helpers" -msgstr "" +msgstr "Perintah Tingak Rendah / Pembantu Internal" #: help.c:300 #, c-format msgid "available git commands in '%s'" -msgstr "" +msgstr "perintah git yang tersedia di '%s'" #: help.c:307 msgid "git commands available from elsewhere on your $PATH" -msgstr "" +msgstr "perintah git yang tersedia dari tempat lain pada $PATH Anda" #: help.c:316 msgid "These are common Git commands used in various situations:" -msgstr "" +msgstr "Berikut ini perintah Git umum yang digunakan dalam beragam situasi:" #: help.c:365 git.c:100 #, c-format msgid "unsupported command listing type '%s'" -msgstr "" +msgstr "tipe daftar perintah '%s' tidak didukung" #: help.c:405 msgid "The Git concept guides are:" -msgstr "" +msgstr "Panduan konsep Git adalah:" #: help.c:429 msgid "See 'git help <command>' to read about a specific subcommand" -msgstr "" +msgstr "Lihat 'git help <perintah>' untuk baca tentang subperintah spesifik" #: help.c:434 msgid "External commands" -msgstr "" +msgstr "Perintah eksternal" #: help.c:449 msgid "Command aliases" -msgstr "" +msgstr "Alias perintah" #: help.c:527 #, c-format @@ -4254,30 +4285,32 @@ msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "" +"'%s' sepertinya perintah git, tetapi kami tidak dapat\n" +"menjalankannya. Mungkin git-%s rusak?" #: help.c:543 help.c:631 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "" +msgstr "git: '%s' bukan perintah git. Lihat 'git --help'." #: help.c:591 msgid "Uh oh. Your system reports no Git commands at all." -msgstr "" +msgstr "Eh oh. Sistem Anda melaporkan tidak ada perintah Git sama sekali." #: help.c:613 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." -msgstr "" +msgstr "PERINGATAN: Anda memanggil perintah Git bernama '%s' yang tidak ada." #: help.c:618 #, c-format msgid "Continuing under the assumption that you meant '%s'." -msgstr "" +msgstr "Melanjutkan di bawah asumsi bahwa maksud Anda '%s'." #: help.c:623 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." -msgstr "" +msgstr "Melanjutkan dalam %0.1f detik, mengasumsikan bahwa maksud Anda '%s'." #: help.c:635 msgid "" @@ -4287,16 +4320,20 @@ msgid_plural "" "\n" "The most similar commands are" msgstr[0] "" +"\n" +"Perintah paling mirip adalah" msgstr[1] "" +"\n" +"Perintah paling mirip adalah" #: help.c:675 msgid "git version [<options>]" -msgstr "" +msgstr "git version [<opsi>]" #: help.c:730 #, c-format msgid "%s: %s - %s" -msgstr "" +msgstr "%s: %s - %s" #: help.c:734 msgid "" @@ -4306,7 +4343,11 @@ msgid_plural "" "\n" "Did you mean one of these?" msgstr[0] "" +"\n" +"Mungkin maksud Anda yang ini?" msgstr[1] "" +"\n" +"Mungkin maksud Anda salah satu dari yang ini?" #: ident.c:353 msgid "Author identity unknown\n" @@ -4374,7 +4415,7 @@ msgstr "" #: list-objects-filter-options.c:105 #, c-format -msgid "'%s' for 'object:type=<type>' isnot a valid object type" +msgid "'%s' for 'object:type=<type>' is not a valid object type" msgstr "" #: list-objects-filter-options.c:124 @@ -4419,7 +4460,7 @@ msgstr "" msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "" -#: list-objects.c:395 +#: list-objects.c:398 #, c-format msgid "unable to load root tree for commit %s" msgstr "" @@ -4459,39 +4500,39 @@ msgstr "" msgid "bad action '%s' for '%s'" msgstr "" -#: merge-ort.c:1116 merge-recursive.c:1205 +#: merge-ort.c:1228 merge-recursive.c:1206 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "" -#: merge-ort.c:1125 merge-recursive.c:1212 +#: merge-ort.c:1237 merge-recursive.c:1213 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "" -#: merge-ort.c:1134 merge-recursive.c:1219 +#: merge-ort.c:1246 merge-recursive.c:1220 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" -#: merge-ort.c:1144 merge-ort.c:1151 +#: merge-ort.c:1256 merge-ort.c:1263 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "" -#: merge-ort.c:1172 +#: merge-ort.c:1284 #, c-format msgid "Failed to merge submodule %s" msgstr "" -#: merge-ort.c:1179 +#: merge-ort.c:1291 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" "%s\n" msgstr "" -#: merge-ort.c:1183 merge-recursive.c:1273 +#: merge-ort.c:1295 merge-recursive.c:1274 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4502,42 +4543,42 @@ msgid "" "which will accept this suggestion.\n" msgstr "" -#: merge-ort.c:1196 +#: merge-ort.c:1308 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" "%s" msgstr "" -#: merge-ort.c:1415 merge-recursive.c:1362 +#: merge-ort.c:1527 merge-recursive.c:1363 msgid "Failed to execute internal merge" msgstr "" -#: merge-ort.c:1420 merge-recursive.c:1367 +#: merge-ort.c:1532 merge-recursive.c:1368 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-ort.c:1427 merge-recursive.c:1400 +#: merge-ort.c:1539 merge-recursive.c:1401 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-ort.c:1566 merge-recursive.c:2122 +#: merge-ort.c:1678 merge-recursive.c:2123 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" -#: merge-ort.c:1576 merge-recursive.c:2132 +#: merge-ort.c:1688 merge-recursive.c:2133 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" -#: merge-ort.c:1634 +#: merge-ort.c:1746 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4545,47 +4586,47 @@ msgid "" "majority of the files." msgstr "" -#: merge-ort.c:1788 merge-recursive.c:2468 +#: merge-ort.c:1900 merge-recursive.c:2469 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "" -#: merge-ort.c:1932 merge-recursive.c:3244 +#: merge-ort.c:2044 merge-recursive.c:3252 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." msgstr "" -#: merge-ort.c:1939 merge-recursive.c:3251 +#: merge-ort.c:2051 merge-recursive.c:3259 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " "%s; moving it to %s." msgstr "" -#: merge-ort.c:1952 merge-recursive.c:3247 +#: merge-ort.c:2064 merge-recursive.c:3255 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " "in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-ort.c:1960 merge-recursive.c:3254 +#: merge-ort.c:2072 merge-recursive.c:3262 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " "was renamed in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-ort.c:2103 +#: merge-ort.c:2228 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" -#: merge-ort.c:2198 +#: merge-ort.c:2323 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4593,67 +4634,67 @@ msgid "" "markers." msgstr "" -#: merge-ort.c:2217 merge-ort.c:2241 +#: merge-ort.c:2342 merge-ort.c:2366 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" -#: merge-ort.c:2550 merge-recursive.c:3002 +#: merge-ort.c:2819 merge-recursive.c:3013 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-ort.c:2553 merge-recursive.c:3005 +#: merge-ort.c:2822 merge-recursive.c:3016 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-ort.c:2981 +#: merge-ort.c:3250 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " "%s instead." msgstr "" -#: merge-ort.c:3055 +#: merge-ort.c:3326 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " "of them so each can be recorded somewhere." msgstr "" -#: merge-ort.c:3062 +#: merge-ort.c:3333 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " "of them so each can be recorded somewhere." msgstr "" -#: merge-ort.c:3162 merge-recursive.c:3081 +#: merge-ort.c:3433 merge-recursive.c:3092 msgid "content" msgstr "" -#: merge-ort.c:3164 merge-recursive.c:3085 +#: merge-ort.c:3435 merge-recursive.c:3096 msgid "add/add" msgstr "" -#: merge-ort.c:3166 merge-recursive.c:3130 +#: merge-ort.c:3437 merge-recursive.c:3141 msgid "submodule" msgstr "" -#: merge-ort.c:3168 merge-recursive.c:3131 +#: merge-ort.c:3439 merge-recursive.c:3142 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-ort.c:3198 +#: merge-ort.c:3470 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " "of %s left in tree." msgstr "" -#: merge-ort.c:3433 +#: merge-ort.c:3757 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -4663,192 +4704,192 @@ msgstr "" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:3730 +#: merge-ort.c:4116 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "" -#: merge-ort-wrappers.c:13 merge-recursive.c:3699 +#: merge-ort-wrappers.c:13 merge-recursive.c:3707 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" " %s" msgstr "" -#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402 +#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402 msgid "Already up to date." msgstr "Sudah terbaru." -#: merge-recursive.c:356 +#: merge-recursive.c:357 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:379 +#: merge-recursive.c:380 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:388 +#: merge-recursive.c:389 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:876 +#: merge-recursive.c:877 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:887 +#: merge-recursive.c:888 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:901 merge-recursive.c:920 +#: merge-recursive.c:902 merge-recursive.c:921 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:910 +#: merge-recursive.c:911 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:951 builtin/cat-file.c:41 +#: merge-recursive.c:952 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:956 +#: merge-recursive.c:957 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:981 +#: merge-recursive.c:982 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:992 +#: merge-recursive.c:993 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:997 +#: merge-recursive.c:998 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:1227 merge-recursive.c:1239 +#: merge-recursive.c:1228 merge-recursive.c:1240 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "" -#: merge-recursive.c:1230 merge-recursive.c:1242 +#: merge-recursive.c:1231 merge-recursive.c:1243 #, c-format msgid "Fast-forwarding submodule %s" msgstr "" -#: merge-recursive.c:1265 +#: merge-recursive.c:1266 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -#: merge-recursive.c:1269 +#: merge-recursive.c:1270 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "" -#: merge-recursive.c:1270 +#: merge-recursive.c:1271 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" -#: merge-recursive.c:1282 +#: merge-recursive.c:1283 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" -#: merge-recursive.c:1424 +#: merge-recursive.c:1425 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" -#: merge-recursive.c:1496 +#: merge-recursive.c:1497 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1501 +#: merge-recursive.c:1502 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "" -#: merge-recursive.c:1508 +#: merge-recursive.c:1509 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1513 +#: merge-recursive.c:1514 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "" -#: merge-recursive.c:1548 +#: merge-recursive.c:1549 msgid "rename" msgstr "" -#: merge-recursive.c:1548 +#: merge-recursive.c:1549 msgid "renamed" msgstr "" -#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158 +#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "" -#: merge-recursive.c:1609 +#: merge-recursive.c:1610 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" -#: merge-recursive.c:1667 +#: merge-recursive.c:1668 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" -#: merge-recursive.c:1698 +#: merge-recursive.c:1699 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1703 +#: merge-recursive.c:1704 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" -#: merge-recursive.c:1730 +#: merge-recursive.c:1731 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1735 +#: merge-recursive.c:1736 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1827 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:2090 +#: merge-recursive.c:2091 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4856,85 +4897,85 @@ msgid "" "getting a majority of the files." msgstr "" -#: merge-recursive.c:2224 +#: merge-recursive.c:2225 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" -#: merge-recursive.c:3069 +#: merge-recursive.c:3080 msgid "modify" msgstr "" -#: merge-recursive.c:3069 +#: merge-recursive.c:3080 msgid "modified" msgstr "" -#: merge-recursive.c:3108 +#: merge-recursive.c:3119 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:3161 +#: merge-recursive.c:3172 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:3368 +#: merge-recursive.c:3376 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:3391 +#: merge-recursive.c:3399 msgid "file/directory" msgstr "" -#: merge-recursive.c:3396 +#: merge-recursive.c:3404 msgid "directory/file" msgstr "" -#: merge-recursive.c:3403 +#: merge-recursive.c:3411 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:3412 +#: merge-recursive.c:3420 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:3421 +#: merge-recursive.c:3429 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3474 +#: merge-recursive.c:3482 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:3568 +#: merge-recursive.c:3576 msgid "Merging:" msgstr "" -#: merge-recursive.c:3581 +#: merge-recursive.c:3589 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:3631 +#: merge-recursive.c:3639 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:3796 +#: merge-recursive.c:3804 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900 +#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900 #: builtin/stash.c:473 msgid "Unable to write index." msgstr "" @@ -4943,7 +4984,7 @@ msgstr "" msgid "failed to read the cache" msgstr "" -#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965 +#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966 #: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 #: builtin/stash.c:267 msgid "unable to write new index file" @@ -5018,106 +5059,114 @@ msgstr "" msgid "failed to locate object %d in packfile" msgstr "" -#: midx.c:880 builtin/index-pack.c:1535 +#: midx.c:880 builtin/index-pack.c:1533 msgid "cannot store reverse index file" msgstr "tidak dapat menyimpan berkas indeks balik" -#: midx.c:933 +#: midx.c:920 +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "" + +#: midx.c:943 msgid "Adding packfiles to multi-pack-index" msgstr "" -#: midx.c:979 +#: midx.c:989 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:1024 +#: midx.c:1034 #, c-format msgid "unknown preferred pack: '%s'" msgstr "" -#: midx.c:1029 +#: midx.c:1039 #, c-format msgid "preferred pack '%s' is expired" msgstr "" -#: midx.c:1045 +#: midx.c:1055 msgid "no pack files to index." msgstr "" -#: midx.c:1125 builtin/clean.c:37 +#: midx.c:1135 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "gagal menghapus %s" -#: midx.c:1156 +#: midx.c:1166 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "" -#: midx.c:1214 +#: midx.c:1225 msgid "multi-pack-index file exists, but failed to parse" msgstr "" -#: midx.c:1222 +#: midx.c:1233 +msgid "incorrect checksum" +msgstr "" + +#: midx.c:1236 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1237 +#: midx.c:1251 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" -#: midx.c:1242 +#: midx.c:1256 msgid "the midx contains no oid" msgstr "" -#: midx.c:1251 +#: midx.c:1265 msgid "Verifying OID order in multi-pack-index" msgstr "" -#: midx.c:1260 +#: midx.c:1274 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1280 +#: midx.c:1294 msgid "Sorting objects by packfile" msgstr "" -#: midx.c:1287 +#: midx.c:1301 msgid "Verifying object offsets" msgstr "" -#: midx.c:1303 +#: midx.c:1317 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "" -#: midx.c:1309 +#: midx.c:1323 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "" -#: midx.c:1318 +#: midx.c:1332 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" -#: midx.c:1343 +#: midx.c:1357 msgid "Counting referenced objects" msgstr "" -#: midx.c:1353 +#: midx.c:1367 msgid "Finding and deleting unreferenced packfiles" msgstr "" -#: midx.c:1544 +#: midx.c:1558 msgid "could not start pack-objects" msgstr "" -#: midx.c:1564 +#: midx.c:1578 msgid "could not finish pack-objects" msgstr "" @@ -5177,265 +5226,266 @@ msgstr "" msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" -#: object-file.c:577 +#: object-file.c:584 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "" -#: object-file.c:649 +#: object-file.c:658 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" -#: object-file.c:656 +#: object-file.c:665 #, c-format msgid "unable to normalize object directory: %s" msgstr "" -#: object-file.c:699 +#: object-file.c:708 msgid "unable to fdopen alternates lockfile" msgstr "" -#: object-file.c:717 +#: object-file.c:726 msgid "unable to read alternates file" msgstr "" -#: object-file.c:724 +#: object-file.c:733 msgid "unable to move new alternates file into place" msgstr "" -#: object-file.c:759 +#: object-file.c:768 #, c-format msgid "path '%s' does not exist" msgstr "" -#: object-file.c:780 +#: object-file.c:789 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: object-file.c:786 +#: object-file.c:795 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: object-file.c:792 +#: object-file.c:801 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: object-file.c:800 +#: object-file.c:809 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: object-file.c:860 +#: object-file.c:869 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "" -#: object-file.c:1010 +#: object-file.c:1019 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "" -#: object-file.c:1031 -msgid "mmap failed" +#: object-file.c:1054 +#, c-format +msgid "mmap failed%s" msgstr "" -#: object-file.c:1195 +#: object-file.c:1218 #, c-format msgid "object file %s is empty" msgstr "" -#: object-file.c:1330 object-file.c:2524 +#: object-file.c:1353 object-file.c:2548 #, c-format msgid "corrupt loose object '%s'" msgstr "" -#: object-file.c:1332 object-file.c:2528 +#: object-file.c:1355 object-file.c:2552 #, c-format msgid "garbage at end of loose object '%s'" msgstr "" -#: object-file.c:1374 +#: object-file.c:1397 msgid "invalid object type" msgstr "" -#: object-file.c:1458 +#: object-file.c:1481 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" -#: object-file.c:1461 +#: object-file.c:1484 #, c-format msgid "unable to unpack %s header" msgstr "" -#: object-file.c:1467 +#: object-file.c:1490 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" -#: object-file.c:1470 +#: object-file.c:1493 #, c-format msgid "unable to parse %s header" msgstr "" -#: object-file.c:1697 +#: object-file.c:1717 #, c-format msgid "failed to read object %s" msgstr "" -#: object-file.c:1701 +#: object-file.c:1721 #, c-format msgid "replacement %s not found for %s" msgstr "" -#: object-file.c:1705 +#: object-file.c:1725 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "" -#: object-file.c:1709 +#: object-file.c:1729 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "" -#: object-file.c:1814 +#: object-file.c:1834 #, c-format msgid "unable to write file %s" msgstr "" -#: object-file.c:1821 +#: object-file.c:1841 #, c-format msgid "unable to set permission to '%s'" msgstr "" -#: object-file.c:1828 +#: object-file.c:1848 msgid "file write error" msgstr "" -#: object-file.c:1848 +#: object-file.c:1868 msgid "error when closing loose object file" msgstr "" -#: object-file.c:1913 +#: object-file.c:1933 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -#: object-file.c:1915 +#: object-file.c:1935 msgid "unable to create temporary file" msgstr "" -#: object-file.c:1939 +#: object-file.c:1959 msgid "unable to write loose object file" msgstr "" -#: object-file.c:1945 +#: object-file.c:1965 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "" -#: object-file.c:1949 +#: object-file.c:1969 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "" -#: object-file.c:1953 +#: object-file.c:1973 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: object-file.c:1963 builtin/pack-objects.c:1097 +#: object-file.c:1983 builtin/pack-objects.c:1237 #, c-format msgid "failed utime() on %s" msgstr "" -#: object-file.c:2040 +#: object-file.c:2060 #, c-format msgid "cannot read object for %s" msgstr "" -#: object-file.c:2091 +#: object-file.c:2111 msgid "corrupt commit" msgstr "" -#: object-file.c:2099 +#: object-file.c:2119 msgid "corrupt tag" msgstr "" -#: object-file.c:2199 +#: object-file.c:2219 #, c-format msgid "read error while indexing %s" msgstr "" -#: object-file.c:2202 +#: object-file.c:2222 #, c-format msgid "short read while indexing %s" msgstr "" -#: object-file.c:2275 object-file.c:2285 +#: object-file.c:2295 object-file.c:2305 #, c-format msgid "%s: failed to insert into database" msgstr "" -#: object-file.c:2291 +#: object-file.c:2311 #, c-format msgid "%s: unsupported file type" msgstr "" -#: object-file.c:2315 +#: object-file.c:2335 #, c-format msgid "%s is not a valid object" msgstr "" -#: object-file.c:2317 +#: object-file.c:2337 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: object-file.c:2344 builtin/index-pack.c:192 +#: object-file.c:2364 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "tidak dapat membuka %s" -#: object-file.c:2535 object-file.c:2588 +#: object-file.c:2559 object-file.c:2612 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "" -#: object-file.c:2559 +#: object-file.c:2583 #, c-format msgid "unable to mmap %s" msgstr "" -#: object-file.c:2564 +#: object-file.c:2588 #, c-format msgid "unable to unpack header of %s" msgstr "" -#: object-file.c:2570 +#: object-file.c:2594 #, c-format msgid "unable to parse header of %s" msgstr "" -#: object-file.c:2581 +#: object-file.c:2605 #, c-format msgid "unable to unpack contents of %s" msgstr "" -#: object-name.c:486 +#: object-name.c:480 #, c-format msgid "short object ID %s is ambiguous" msgstr "" -#: object-name.c:497 +#: object-name.c:491 msgid "The candidates are:" msgstr "" -#: object-name.c:796 +#: object-name.c:790 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -5448,62 +5498,62 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: object-name.c:916 +#: object-name.c:910 #, c-format msgid "log for '%.*s' only goes back to %s" msgstr "" -#: object-name.c:924 +#: object-name.c:918 #, c-format msgid "log for '%.*s' only has %d entries" msgstr "" -#: object-name.c:1702 +#: object-name.c:1696 #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "" -#: object-name.c:1708 +#: object-name.c:1702 #, c-format msgid "" "path '%s' exists, but not '%s'\n" "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" msgstr "" -#: object-name.c:1717 +#: object-name.c:1711 #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "" -#: object-name.c:1745 +#: object-name.c:1739 #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" "hint: Did you mean ':%d:%s'?" msgstr "" -#: object-name.c:1761 +#: object-name.c:1755 #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" "hint: Did you mean ':%d:%s' aka ':%d:./%s'?" msgstr "" -#: object-name.c:1769 +#: object-name.c:1763 #, c-format msgid "path '%s' exists on disk, but not in the index" msgstr "" -#: object-name.c:1771 +#: object-name.c:1765 #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "" -#: object-name.c:1784 +#: object-name.c:1778 msgid "relative path syntax can't be used outside working tree" msgstr "" -#: object-name.c:1922 +#: object-name.c:1916 #, c-format msgid "invalid object name '%.*s'." msgstr "" @@ -5518,27 +5568,27 @@ msgstr "" msgid "object %s is a %s, not a %s" msgstr "" -#: object.c:232 +#: object.c:250 #, c-format msgid "object %s has unknown type id %d" msgstr "" -#: object.c:245 +#: object.c:263 #, c-format msgid "unable to parse object: %s" msgstr "" -#: object.c:265 object.c:277 +#: object.c:283 object.c:295 #, c-format msgid "hash mismatch %s" msgstr "" -#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251 +#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411 #, c-format msgid "unable to get size of %s" msgstr "" -#: pack-bitmap.c:1547 builtin/rev-list.c:92 +#: pack-bitmap.c:1571 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "" @@ -5591,12 +5641,17 @@ msgstr "" msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:1937 +#: packfile.c:655 +#, c-format +msgid "packfile %s cannot be mapped%s" +msgstr "" + +#: packfile.c:1934 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1941 +#: packfile.c:1938 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -5797,7 +5852,7 @@ msgid "unable to write delim packet" msgstr "" #: pkt-line.c:106 -msgid "unable to write stateless separator packet" +msgid "unable to write response end packet" msgstr "" #: pkt-line.c:113 @@ -5857,19 +5912,19 @@ msgstr "" msgid "unable to parse --pretty format" msgstr "" -#: promisor-remote.c:30 +#: promisor-remote.c:31 msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "" -#: promisor-remote.c:35 promisor-remote.c:37 +#: promisor-remote.c:38 promisor-remote.c:40 msgid "promisor-remote: could not write to fetch subprocess" msgstr "" -#: promisor-remote.c:41 +#: promisor-remote.c:44 msgid "promisor-remote: could not close stdin to fetch subprocess" msgstr "" -#: promisor-remote.c:53 +#: promisor-remote.c:54 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "" @@ -5890,7 +5945,7 @@ msgstr "" msgid "could not read `log` output" msgstr "" -#: range-diff.c:101 sequencer.c:5551 +#: range-diff.c:101 sequencer.c:5550 #, c-format msgid "could not parse commit '%s'" msgstr "" @@ -5907,213 +5962,213 @@ msgstr "" msgid "could not parse git header '%.*s'" msgstr "" -#: range-diff.c:306 +#: range-diff.c:307 msgid "failed to generate diff" msgstr "" -#: range-diff.c:558 +#: range-diff.c:559 msgid "--left-only and --right-only are mutually exclusive" msgstr "" -#: range-diff.c:561 range-diff.c:563 +#: range-diff.c:562 range-diff.c:564 #, c-format msgid "could not parse log for '%s'" msgstr "" -#: read-cache.c:708 +#: read-cache.c:710 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" -#: read-cache.c:724 +#: read-cache.c:726 msgid "cannot create an empty blob in the object database" msgstr "" -#: read-cache.c:746 +#: read-cache.c:748 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" -#: read-cache.c:751 +#: read-cache.c:753 #, c-format msgid "'%s' does not have a commit checked out" msgstr "" -#: read-cache.c:803 +#: read-cache.c:805 #, c-format msgid "unable to index file '%s'" msgstr "" -#: read-cache.c:822 +#: read-cache.c:824 #, c-format msgid "unable to add '%s' to index" msgstr "" -#: read-cache.c:833 +#: read-cache.c:835 #, c-format msgid "unable to stat '%s'" msgstr "" -#: read-cache.c:1356 +#: read-cache.c:1358 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "" -#: read-cache.c:1571 +#: read-cache.c:1573 msgid "Refresh index" msgstr "" -#: read-cache.c:1700 +#: read-cache.c:1705 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1710 +#: read-cache.c:1715 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1766 +#: read-cache.c:1771 #, c-format msgid "bad signature 0x%08x" msgstr "" -#: read-cache.c:1769 +#: read-cache.c:1774 #, c-format msgid "bad index version %d" msgstr "" -#: read-cache.c:1778 +#: read-cache.c:1783 msgid "bad index file sha1 signature" msgstr "" -#: read-cache.c:1812 +#: read-cache.c:1817 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" -#: read-cache.c:1814 +#: read-cache.c:1819 #, c-format msgid "ignoring %.4s extension" msgstr "" -#: read-cache.c:1851 +#: read-cache.c:1856 #, c-format msgid "unknown index entry format 0x%08x" msgstr "" -#: read-cache.c:1867 +#: read-cache.c:1872 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "" -#: read-cache.c:1924 +#: read-cache.c:1929 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1927 +#: read-cache.c:1932 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "" -#: read-cache.c:1930 +#: read-cache.c:1935 #, c-format msgid "unordered stage entries for '%s'" msgstr "" -#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991 +#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 -#: builtin/submodule--helper.c:332 +#: builtin/submodule--helper.c:331 msgid "index file corrupt" msgstr "" -#: read-cache.c:2180 +#: read-cache.c:2185 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2193 +#: read-cache.c:2198 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2226 +#: read-cache.c:2231 #, c-format msgid "%s: index file open failed" msgstr "" -#: read-cache.c:2230 +#: read-cache.c:2235 #, c-format msgid "%s: cannot stat the open index" msgstr "" -#: read-cache.c:2234 +#: read-cache.c:2239 #, c-format msgid "%s: index file smaller than expected" msgstr "" -#: read-cache.c:2238 +#: read-cache.c:2243 #, c-format -msgid "%s: unable to map index file" +msgid "%s: unable to map index file%s" msgstr "" -#: read-cache.c:2280 +#: read-cache.c:2286 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2307 +#: read-cache.c:2313 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2345 +#: read-cache.c:2351 #, c-format msgid "could not freshen shared index '%s'" msgstr "" -#: read-cache.c:2392 +#: read-cache.c:2398 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 +#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:3138 +#: read-cache.c:3074 msgid "failed to convert to a sparse-index" msgstr "" -#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441 +#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:3222 +#: read-cache.c:3158 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:3234 +#: read-cache.c:3170 #, c-format msgid "unable to unlink: %s" msgstr "" -#: read-cache.c:3263 +#: read-cache.c:3199 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "" -#: read-cache.c:3412 +#: read-cache.c:3348 #, c-format msgid "%s: cannot drop to stage #0" msgstr "" @@ -6191,8 +6246,8 @@ msgid "" "\n" msgstr "" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816 -#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836 +#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271 #, c-format msgid "could not write '%s'" msgstr "" @@ -6228,7 +6283,7 @@ msgstr "" msgid "could not read '%s'." msgstr "" -#: ref-filter.c:42 wt-status.c:1978 +#: ref-filter.c:42 wt-status.c:2036 msgid "gone" msgstr "" @@ -6247,247 +6302,247 @@ msgstr "" msgid "ahead %d, behind %d" msgstr "" -#: ref-filter.c:175 +#: ref-filter.c:230 #, c-format msgid "expected format: %%(color:<color>)" msgstr "" -#: ref-filter.c:177 +#: ref-filter.c:232 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" -#: ref-filter.c:199 +#: ref-filter.c:254 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "" -#: ref-filter.c:203 +#: ref-filter.c:258 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: ref-filter.c:205 +#: ref-filter.c:260 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "" -#: ref-filter.c:260 +#: ref-filter.c:315 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "" -#: ref-filter.c:282 +#: ref-filter.c:339 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "" -#: ref-filter.c:290 +#: ref-filter.c:347 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "" -#: ref-filter.c:302 +#: ref-filter.c:359 #, c-format msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:315 +#: ref-filter.c:372 #, c-format msgid "unrecognized %%(subject) argument: %s" msgstr "" -#: ref-filter.c:334 +#: ref-filter.c:391 #, c-format msgid "expected %%(trailers:key=<value>)" msgstr "" -#: ref-filter.c:336 +#: ref-filter.c:393 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "" -#: ref-filter.c:367 +#: ref-filter.c:424 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:369 +#: ref-filter.c:426 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: ref-filter.c:384 +#: ref-filter.c:441 #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "" -#: ref-filter.c:388 +#: ref-filter.c:445 #, c-format msgid "unrecognized argument '%s' in %%(%s)" msgstr "" -#: ref-filter.c:402 +#: ref-filter.c:459 #, c-format msgid "unrecognized email option: %s" msgstr "" -#: ref-filter.c:432 +#: ref-filter.c:489 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "" -#: ref-filter.c:444 +#: ref-filter.c:501 #, c-format msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:451 +#: ref-filter.c:508 #, c-format msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:460 +#: ref-filter.c:517 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:468 +#: ref-filter.c:525 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:486 +#: ref-filter.c:543 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "" -#: ref-filter.c:588 +#: ref-filter.c:645 #, c-format msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:615 +#: ref-filter.c:672 #, c-format msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:619 +#: ref-filter.c:676 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" -#: ref-filter.c:743 +#: ref-filter.c:801 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:807 +#: ref-filter.c:865 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:809 +#: ref-filter.c:867 #, c-format msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:811 +#: ref-filter.c:869 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:839 +#: ref-filter.c:897 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:841 +#: ref-filter.c:899 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:843 +#: ref-filter.c:901 #, c-format msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:858 +#: ref-filter.c:916 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:915 +#: ref-filter.c:973 #, c-format msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1556 +#: ref-filter.c:1621 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: ref-filter.c:1559 +#: ref-filter.c:1624 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "" -#: ref-filter.c:1562 +#: ref-filter.c:1627 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" -#: ref-filter.c:1566 +#: ref-filter.c:1631 #, c-format msgid "(HEAD detached at %s)" msgstr "" -#: ref-filter.c:1569 +#: ref-filter.c:1634 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: ref-filter.c:1572 +#: ref-filter.c:1637 msgid "(no branch)" msgstr "" -#: ref-filter.c:1604 ref-filter.c:1813 +#: ref-filter.c:1669 ref-filter.c:1880 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1614 +#: ref-filter.c:1679 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:1997 +#: ref-filter.c:2064 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:2086 +#: ref-filter.c:2153 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:2091 refs.c:676 +#: ref-filter.c:2158 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:2431 +#: ref-filter.c:2498 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2525 +#: ref-filter.c:2592 #, c-format msgid "malformed object name %s" msgstr "" -#: ref-filter.c:2530 +#: ref-filter.c:2597 #, c-format msgid "option `%s' must point to a commit" msgstr "" @@ -6928,8 +6983,8 @@ msgstr "" msgid "Recorded preimage for '%s'" msgstr "" -#: rerere.c:865 submodule.c:2089 builtin/log.c:2000 -#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891 +#: rerere.c:865 submodule.c:2076 builtin/log.c:2002 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "" @@ -6967,38 +7022,38 @@ msgstr "" msgid "could not determine HEAD revision" msgstr "tidak dapat menentukan revisi HEAD" -#: reset.c:70 reset.c:76 sequencer.c:3669 +#: reset.c:70 reset.c:76 sequencer.c:3689 #, c-format msgid "failed to find tree of %s" msgstr "gagal menemukan pohon %s" -#: revision.c:2343 +#: revision.c:2344 msgid "--unpacked=<packfile> no longer supported" msgstr "" -#: revision.c:2683 +#: revision.c:2684 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2686 +#: revision.c:2687 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2892 +#: revision.c:2893 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" -#: run-command.c:767 +#: run-command.c:766 msgid "open /dev/null failed" msgstr "" -#: run-command.c:1275 +#: run-command.c:1274 #, c-format msgid "cannot create async thread: %s" msgstr "" -#: run-command.c:1345 +#: run-command.c:1344 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -7031,25 +7086,25 @@ msgstr "" msgid "push negotiation failed; proceeding anyway with push" msgstr "" -#: send-pack.c:520 +#: send-pack.c:526 msgid "the receiving end does not support this repository's hash algorithm" msgstr "" -#: send-pack.c:529 +#: send-pack.c:535 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:531 +#: send-pack.c:537 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:543 +#: send-pack.c:544 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:548 +#: send-pack.c:549 msgid "the receiving end does not support push options" msgstr "" @@ -7104,7 +7159,7 @@ msgid "could not lock '%s'" msgstr "" #: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 -#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631 +#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "" @@ -7115,7 +7170,7 @@ msgid "could not write eol to '%s'" msgstr "" #: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 -#: sequencer.c:3554 +#: sequencer.c:3555 #, c-format msgid "failed to finalize '%s'" msgstr "" @@ -7165,8 +7220,8 @@ msgstr "" msgid "unable to dequote value of '%s'" msgstr "" -#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728 -#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729 +#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "" @@ -7279,7 +7334,7 @@ msgstr "" msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702 msgid "could not parse HEAD commit" msgstr "" @@ -7287,7 +7342,7 @@ msgstr "" msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706 msgid "git write-tree failed to write a tree" msgstr "" @@ -7305,12 +7360,13 @@ msgstr "" msgid "corrupt author: missing date information" msgstr "" -#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909 #: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199 +#: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "" @@ -7362,7 +7418,7 @@ msgstr "" msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1936 sequencer.c:3581 +#: sequencer.c:1936 sequencer.c:3582 msgid "could not read HEAD" msgstr "" @@ -7503,7 +7559,7 @@ msgstr "" msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:3012 sequencer.c:4869 +#: sequencer.c:3012 sequencer.c:4868 msgid "empty commit set passed" msgstr "" @@ -7534,7 +7590,7 @@ msgstr "" msgid "could not lock HEAD" msgstr "" -#: sequencer.c:3125 sequencer.c:4582 +#: sequencer.c:3125 sequencer.c:4581 msgid "no cherry-pick or revert in progress" msgstr "" @@ -7546,7 +7602,7 @@ msgstr "" msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:3159 builtin/grep.c:759 +#: sequencer.c:3159 builtin/grep.c:758 #, c-format msgid "cannot open '%s'" msgstr "" @@ -7592,7 +7648,7 @@ msgid "" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:3411 sequencer.c:4473 +#: sequencer.c:3411 sequencer.c:4472 msgid "cannot read HEAD" msgstr "" @@ -7658,90 +7714,90 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3571 +#: sequencer.c:3572 #, c-format msgid "illegal label name: '%.*s'" msgstr "" -#: sequencer.c:3625 +#: sequencer.c:3645 msgid "writing fake root commit" msgstr "" -#: sequencer.c:3630 +#: sequencer.c:3650 msgid "writing squash-onto" msgstr "" -#: sequencer.c:3714 +#: sequencer.c:3734 #, c-format msgid "could not resolve '%s'" msgstr "" -#: sequencer.c:3747 +#: sequencer.c:3767 msgid "cannot merge without a current revision" msgstr "" -#: sequencer.c:3769 +#: sequencer.c:3789 #, c-format msgid "unable to parse '%.*s'" msgstr "" -#: sequencer.c:3778 +#: sequencer.c:3798 #, c-format msgid "nothing to merge: '%.*s'" msgstr "" -#: sequencer.c:3790 +#: sequencer.c:3810 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3806 +#: sequencer.c:3826 #, c-format msgid "could not get commit message of '%s'" msgstr "" -#: sequencer.c:3989 +#: sequencer.c:4009 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "" -#: sequencer.c:4005 +#: sequencer.c:4025 msgid "merge: Unable to write new index file" msgstr "" -#: sequencer.c:4079 +#: sequencer.c:4099 msgid "Cannot autostash" msgstr "" -#: sequencer.c:4082 +#: sequencer.c:4102 #, c-format msgid "Unexpected stash response: '%s'" msgstr "" -#: sequencer.c:4088 +#: sequencer.c:4108 #, c-format msgid "Could not create directory for '%s'" msgstr "" -#: sequencer.c:4091 +#: sequencer.c:4111 #, c-format msgid "Created autostash: %s\n" msgstr "" -#: sequencer.c:4095 +#: sequencer.c:4115 msgid "could not reset --hard" msgstr "" -#: sequencer.c:4120 +#: sequencer.c:4140 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:4132 +#: sequencer.c:4152 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:4135 +#: sequencer.c:4155 #, c-format msgid "" "%s\n" @@ -7749,29 +7805,29 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:4140 +#: sequencer.c:4160 msgid "Applying autostash resulted in conflicts." msgstr "" -#: sequencer.c:4141 +#: sequencer.c:4161 msgid "Autostash exists; creating a new stash entry." msgstr "" -#: sequencer.c:4234 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4233 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "" -#: sequencer.c:4249 +#: sequencer.c:4248 #, c-format msgid "Stopped at HEAD\n" msgstr "" -#: sequencer.c:4251 +#: sequencer.c:4250 #, c-format msgid "Stopped at %s\n" msgstr "" -#: sequencer.c:4259 +#: sequencer.c:4258 #, c-format msgid "" "Could not execute the todo command\n" @@ -7784,108 +7840,108 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:4305 +#: sequencer.c:4304 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "" -#: sequencer.c:4351 +#: sequencer.c:4350 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:4422 +#: sequencer.c:4421 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:4481 +#: sequencer.c:4480 msgid "could not read orig-head" msgstr "" -#: sequencer.c:4486 +#: sequencer.c:4485 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:4500 +#: sequencer.c:4499 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:4560 +#: sequencer.c:4559 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "" -#: sequencer.c:4612 +#: sequencer.c:4611 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:4621 +#: sequencer.c:4620 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:4623 +#: sequencer.c:4622 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:4625 +#: sequencer.c:4624 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:4628 +#: sequencer.c:4627 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: sequencer.c:4664 sequencer.c:4703 +#: sequencer.c:4663 sequencer.c:4702 #, c-format msgid "could not write file: '%s'" msgstr "" -#: sequencer.c:4719 +#: sequencer.c:4718 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:4726 +#: sequencer.c:4725 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:4846 +#: sequencer.c:4845 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:4850 +#: sequencer.c:4849 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:4885 +#: sequencer.c:4884 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:5362 +#: sequencer.c:5361 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:5365 +#: sequencer.c:5364 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:5615 sequencer.c:5632 +#: sequencer.c:5614 sequencer.c:5631 msgid "nothing to do" msgstr "" -#: sequencer.c:5651 +#: sequencer.c:5650 msgid "could not skip unnecessary pick commands" msgstr "" -#: sequencer.c:5751 +#: sequencer.c:5750 msgid "the script was already rearranged." msgstr "" @@ -7926,126 +7982,130 @@ msgstr "" msgid "unable to set up work tree using invalid config" msgstr "" -#: setup.c:423 +#: setup.c:423 builtin/rev-parse.c:895 msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:661 +#: setup.c:658 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:669 -msgid "unknown repository extensions found:" -msgstr "" +#: setup.c:666 +msgid "unknown repository extension found:" +msgid_plural "unknown repository extensions found:" +msgstr[0] "" +msgstr[1] "" -#: setup.c:681 -msgid "repo version is 0, but v1-only extensions found:" -msgstr "" +#: setup.c:680 +msgid "repo version is 0, but v1-only extension found:" +msgid_plural "repo version is 0, but v1-only extensions found:" +msgstr[0] "" +msgstr[1] "" -#: setup.c:700 +#: setup.c:701 #, c-format msgid "error opening '%s'" msgstr "" -#: setup.c:702 +#: setup.c:703 #, c-format msgid "too large to be a .git file: '%s'" msgstr "" -#: setup.c:704 +#: setup.c:705 #, c-format msgid "error reading %s" msgstr "" -#: setup.c:706 +#: setup.c:707 #, c-format msgid "invalid gitfile format: %s" msgstr "" -#: setup.c:708 +#: setup.c:709 #, c-format msgid "no path in gitfile: %s" msgstr "" -#: setup.c:710 +#: setup.c:711 #, c-format msgid "not a git repository: %s" msgstr "" -#: setup.c:812 +#: setup.c:813 #, c-format msgid "'$%s' too big" msgstr "" -#: setup.c:826 +#: setup.c:827 #, c-format msgid "not a git repository: '%s'" msgstr "" -#: setup.c:855 setup.c:857 setup.c:888 +#: setup.c:856 setup.c:858 setup.c:889 #, c-format msgid "cannot chdir to '%s'" msgstr "" -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 +#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 msgid "cannot come back to cwd" msgstr "" -#: setup.c:987 +#: setup.c:988 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "" -#: setup.c:1225 +#: setup.c:1231 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1234 setup.c:1240 +#: setup.c:1240 setup.c:1246 #, c-format msgid "cannot change to '%s'" msgstr "" -#: setup.c:1245 +#: setup.c:1251 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:1251 +#: setup.c:1257 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -#: setup.c:1370 +#: setup.c:1381 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: setup.c:1417 +#: setup.c:1430 msgid "open /dev/null or dup failed" msgstr "" -#: setup.c:1432 +#: setup.c:1445 msgid "fork failed" msgstr "" -#: setup.c:1437 t/helper/test-simple-ipc.c:285 +#: setup.c:1450 t/helper/test-simple-ipc.c:285 msgid "setsid failed" msgstr "" -#: sparse-index.c:151 +#: sparse-index.c:162 msgid "attempting to use sparse-index without cone mode" msgstr "" -#: sparse-index.c:156 +#: sparse-index.c:174 msgid "unable to update cache-tree, staying full" msgstr "" -#: sparse-index.c:239 +#: sparse-index.c:261 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "" @@ -8102,7 +8162,7 @@ msgid_plural "%u bytes/s" msgstr[0] "" msgstr[1] "" -#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738 #: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" @@ -8172,7 +8232,7 @@ msgstr "Spek jalur '%s' di dalam submodul '%.*s'" msgid "bad --ignore-submodules argument: %s" msgstr "argumen --ignore-submodules jelek: %s" -#: submodule.c:818 +#: submodule.c:805 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " @@ -8181,12 +8241,12 @@ msgstr "" "Submodul dalam komit %s pada jalur '%s' bertabrakan dengan submodul yang " "bernama sama. Melewati itu." -#: submodule.c:921 +#: submodule.c:908 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "entri submodul '%s' (%s) adalah %s, bukan komit" -#: submodule.c:1006 +#: submodule.c:993 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " @@ -8195,36 +8255,36 @@ msgstr "" "Tidak dapat menjalankan perintah 'git rev-list <komit> --not --remotes -n 1' " "dalam submodul %s" -#: submodule.c:1129 +#: submodule.c:1116 #, c-format msgid "process for submodule '%s' failed" msgstr "proses untuk submodul '%s' gagal" -#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "Gagal menguraikan HEAD sebagai referensi valid." -#: submodule.c:1169 +#: submodule.c:1156 #, c-format msgid "Pushing submodule '%s'\n" msgstr "Mendorong submodul '%s'\n" -#: submodule.c:1172 +#: submodule.c:1159 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "Tidak dapat mendorong submodul '%s'\n" -#: submodule.c:1464 +#: submodule.c:1451 #, c-format msgid "Fetching submodule %s%s\n" msgstr "Mengambil submodul %s%s\n" -#: submodule.c:1498 +#: submodule.c:1485 #, c-format msgid "Could not access submodule '%s'\n" msgstr "Tidak dapat mengakses submodul '%s'\n" -#: submodule.c:1653 +#: submodule.c:1640 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8233,61 +8293,61 @@ msgstr "" "Kesalahan saat pengambilan submodul:\n" "%s" -#: submodule.c:1678 +#: submodule.c:1665 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' tak dikenal sebagai repositori git" -#: submodule.c:1695 +#: submodule.c:1682 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "Tidak dapat menjalankan 'git status --porcelain=2' dalam submodul %s" -#: submodule.c:1736 +#: submodule.c:1723 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "'git status --porcelain=2' gagal dalam submodul %s" -#: submodule.c:1811 +#: submodule.c:1798 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "Tidak dalat memulai 'git status' dalam submodul '%s'" -#: submodule.c:1824 +#: submodule.c:1811 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "tidak dapat menjalankan 'git status' dalam submodul '%s'" -#: submodule.c:1839 +#: submodule.c:1826 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Tidak dapat batal setel setelan core.worktree dalam submodul '%s'" -#: submodule.c:1866 submodule.c:2176 +#: submodule.c:1853 submodule.c:2163 #, c-format msgid "could not recurse into submodule '%s'" msgstr "tidak dapat rekursi ke dalam submodul '%s'" -#: submodule.c:1887 +#: submodule.c:1874 msgid "could not reset submodule index" msgstr "tidak dapat reset indeks submodul" -#: submodule.c:1929 +#: submodule.c:1916 #, c-format msgid "submodule '%s' has dirty index" msgstr "submodul '%s' punya indeks kotor" -#: submodule.c:1981 +#: submodule.c:1968 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Submodul '%s' tidak dapat diperbarui." -#: submodule.c:2049 +#: submodule.c:2036 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "direktori submodul git '%s' di dalam direktori git '%.*s'" -#: submodule.c:2070 +#: submodule.c:2057 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8295,17 +8355,17 @@ msgstr "" "relocate_gitdir untuk submodul '%s' dengan lebih dari satu pohon kerja tidak " "didukung" -#: submodule.c:2082 submodule.c:2141 +#: submodule.c:2069 submodule.c:2128 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "tidak dapat mencari nama untuk submodul '%s'" -#: submodule.c:2086 +#: submodule.c:2073 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "menolak memindahkan '%s' ke dalam direktori git yang ada" -#: submodule.c:2093 +#: submodule.c:2080 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8316,11 +8376,11 @@ msgstr "" "'%s' ke\n" "'%s'\n" -#: submodule.c:2221 +#: submodule.c:2208 msgid "could not start ls-files in .." msgstr "tidak dapat memulai ls-files dalam .." -#: submodule.c:2261 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree kembalikan kode kembali %d yang tak diharapkan" @@ -8357,7 +8417,7 @@ msgstr "" msgid "could not read input file '%s'" msgstr "" -#: trailer.c:766 builtin/mktag.c:88 +#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577 msgid "could not read from stdin" msgstr "" @@ -8445,7 +8505,7 @@ msgstr "" msgid "invalid remote service path" msgstr "" -#: transport-helper.c:661 transport.c:1471 +#: transport-helper.c:661 transport.c:1477 msgid "operation not supported by protocol" msgstr "" @@ -8454,7 +8514,7 @@ msgstr "" msgid "can't connect to subservice %s" msgstr "" -#: transport-helper.c:693 transport.c:397 +#: transport-helper.c:693 transport.c:400 msgid "--negotiate-only requires protocol v2" msgstr "" @@ -8585,53 +8645,53 @@ msgstr "" msgid "could not read bundle '%s'" msgstr "" -#: transport.c:220 +#: transport.c:223 #, c-format msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:272 +#: transport.c:275 msgid "see protocol.version in 'git help config' for more details" msgstr "" -#: transport.c:273 +#: transport.c:276 msgid "server options require protocol version 2 or later" msgstr "" -#: transport.c:400 +#: transport.c:403 msgid "server does not support wait-for-done" msgstr "" -#: transport.c:751 +#: transport.c:755 msgid "could not parse transport.color.* config" msgstr "" -#: transport.c:826 +#: transport.c:830 msgid "support for protocol v2 not implemented yet" msgstr "" -#: transport.c:960 +#: transport.c:965 #, c-format msgid "unknown value for config '%s': %s" msgstr "" -#: transport.c:1026 +#: transport.c:1031 #, c-format msgid "transport '%s' not allowed" msgstr "" -#: transport.c:1079 +#: transport.c:1084 msgid "git-over-rsync is no longer supported" msgstr "" -#: transport.c:1181 +#: transport.c:1187 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:1185 +#: transport.c:1191 #, c-format msgid "" "\n" @@ -8647,11 +8707,11 @@ msgid "" "\n" msgstr "" -#: transport.c:1193 +#: transport.c:1199 msgid "Aborting." msgstr "" -#: transport.c:1340 +#: transport.c:1346 msgid "failed to push all needed submodules" msgstr "" @@ -8864,11 +8924,11 @@ msgid "" "colliding group is in the working tree:\n" msgstr "" -#: unpack-trees.c:1519 +#: unpack-trees.c:1618 msgid "Updating index flags" msgstr "" -#: unpack-trees.c:2608 +#: unpack-trees.c:2707 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "" @@ -8910,100 +8970,100 @@ msgstr "" msgid "Fetching objects" msgstr "" -#: worktree.c:238 builtin/am.c:2151 +#: worktree.c:236 builtin/am.c:2152 #, c-format msgid "failed to read '%s'" msgstr "gagal membaca '%s'" -#: worktree.c:304 +#: worktree.c:303 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "'%s' pada pohon kerja utama bukan direktori repositori" -#: worktree.c:315 +#: worktree.c:314 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "berkas '%s' tidak berisi jalur absolut ke lokasi pohon kerja" -#: worktree.c:327 +#: worktree.c:326 #, c-format msgid "'%s' does not exist" msgstr "'%s' tidak ada" -#: worktree.c:333 +#: worktree.c:332 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' bukan berkas .git, kode error %d" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' tidak menunjuk kembali ke '%s'" -#: worktree.c:608 +#: worktree.c:603 msgid "not a directory" msgstr "bukan direktori" -#: worktree.c:617 +#: worktree.c:612 msgid ".git is not a file" msgstr ".git bukan berkas" -#: worktree.c:619 +#: worktree.c:614 msgid ".git file broken" msgstr "berkas .git rusak" -#: worktree.c:621 +#: worktree.c:616 msgid ".git file incorrect" msgstr "berkas .git salah" -#: worktree.c:727 +#: worktree.c:722 msgid "not a valid path" msgstr "bukan jalur valid" -#: worktree.c:733 +#: worktree.c:728 msgid "unable to locate repository; .git is not a file" msgstr "tidak dapat menempatkan repositori; .git bukan berkas" -#: worktree.c:737 +#: worktree.c:732 msgid "unable to locate repository; .git file does not reference a repository" msgstr "" "tidak dapat menempatkan repositori; berkas .git tidak merujuk repositori" -#: worktree.c:741 +#: worktree.c:736 msgid "unable to locate repository; .git file broken" msgstr "tidak dapat menempatkan repositori; berkas .git rusak" -#: worktree.c:747 +#: worktree.c:742 msgid "gitdir unreadable" msgstr "gitdir tidak dapat dibaca" -#: worktree.c:751 +#: worktree.c:746 msgid "gitdir incorrect" msgstr "gitdir salah" -#: worktree.c:776 +#: worktree.c:771 msgid "not a valid directory" msgstr "bukan direktori valid" -#: worktree.c:782 +#: worktree.c:777 msgid "gitdir file does not exist" msgstr "berkas gitdir tidak ada" -#: worktree.c:787 worktree.c:796 +#: worktree.c:782 worktree.c:791 #, c-format msgid "unable to read gitdir file (%s)" msgstr "tidak dapat membaca berkas gitdir (%s)" -#: worktree.c:806 +#: worktree.c:801 #, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "baca singkat (diharapkan %<PRIuMAX> bita, terbaca %<PRIuMAX>)" -#: worktree.c:814 +#: worktree.c:809 msgid "invalid gitdir file" msgstr "berkas gitdir tidak valid" -#: worktree.c:822 +#: worktree.c:817 msgid "gitdir file points to non-existent location" msgstr "berkas gitdir menunjuk ke lokasi yang tidak ada" @@ -9047,18 +9107,18 @@ msgstr " (gunakan \"git add <berkas>...\" untuk menandai penyelesaian)" #: wt-status.c:199 wt-status.c:203 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -" (gunakan \"git add.rm <berkas>...\" sebagaimana mestinya untuk menandai " +" (gunakan \"git add/rm <berkas>...\" sebagaimana mestinya untuk menandai " "penyelesaian)" #: wt-status.c:201 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (gunakan \"git rm <berkas>\" untuk menandai penyelesaian)" -#: wt-status.c:211 wt-status.c:1075 +#: wt-status.c:211 wt-status.c:1125 msgid "Changes to be committed:" msgstr "Perubahan yang akan dikomit:" -#: wt-status.c:234 wt-status.c:1084 +#: wt-status.c:234 wt-status.c:1134 msgid "Changes not staged for commit:" msgstr "Perubahan yang tidak digelar untuk komit:" @@ -9162,22 +9222,22 @@ msgstr "konten yang dimodifikasi, " msgid "untracked content, " msgstr "konten yang tak dilacak, " -#: wt-status.c:908 +#: wt-status.c:958 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Simpanan Anda saat ini ada %d entri" msgstr[1] "Simpanan Anda saat ini ada %d entri" -#: wt-status.c:939 +#: wt-status.c:989 msgid "Submodules changed but not updated:" msgstr "Submodul berubah tapi tak diperbarui:" -#: wt-status.c:941 +#: wt-status.c:991 msgid "Submodule changes to be committed:" msgstr "Perubahan submodul yang akan dikomit:" -#: wt-status.c:1023 +#: wt-status.c:1073 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9185,7 +9245,7 @@ msgstr "" "Jangan ubah atau hapus baris diatas.\n" "Semua dibawahnya akan diabaikan." -#: wt-status.c:1115 +#: wt-status.c:1165 #, c-format msgid "" "\n" @@ -9196,262 +9256,266 @@ msgstr "" "Butuh %.2f detik untuk menghitung cabang di depan/di belakang nilai.\n" "Anda bisa gunakan '--no-ahead-behind' untuk menghindari hal tersebut.\n" -#: wt-status.c:1145 +#: wt-status.c:1195 msgid "You have unmerged paths." msgstr "Anda punya jalur yang tak tergabung." -#: wt-status.c:1148 +#: wt-status.c:1198 msgid " (fix conflicts and run \"git commit\")" msgstr " (selesaikan konflik dan jalankan \"git commit\")" -#: wt-status.c:1150 +#: wt-status.c:1200 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (gunakan \"git merge --abort\" untuk membatalkan penggabungan)" -#: wt-status.c:1154 +#: wt-status.c:1204 msgid "All conflicts fixed but you are still merging." msgstr "Semua konflik sudah selesai tapi Anda masih menggabungkan." -#: wt-status.c:1157 +#: wt-status.c:1207 msgid " (use \"git commit\" to conclude merge)" msgstr " (gunakan \"git commit\" untuk mengakhiri penggabungan)" -#: wt-status.c:1166 +#: wt-status.c:1216 msgid "You are in the middle of an am session." msgstr "Anda berada ditengah-tengah sesi am." -#: wt-status.c:1169 +#: wt-status.c:1219 msgid "The current patch is empty." msgstr "Jalur saat ini kosong" -#: wt-status.c:1173 +#: wt-status.c:1223 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (selesaikan konflik lalu jalankan \"git am --continue\")" -#: wt-status.c:1175 +#: wt-status.c:1225 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (gunakan \"git am --skip\" untuk lewati tambalan ini)" -#: wt-status.c:1177 +#: wt-status.c:1227 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (gunakan \"git am --abort\" untuk mengembalikan cabang asal)" -#: wt-status.c:1310 +#: wt-status.c:1360 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo hilang." -#: wt-status.c:1312 +#: wt-status.c:1362 msgid "No commands done." msgstr "Tidak ada perintah selesai." -#: wt-status.c:1315 +#: wt-status.c:1365 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Perintah yang selesai (%d perintah):" msgstr[1] "Perintah yang selesai (%d perintah):" -#: wt-status.c:1326 +#: wt-status.c:1376 #, c-format msgid " (see more in file %s)" msgstr " (lihat lebih lanjut di berkas %s)" -#: wt-status.c:1331 +#: wt-status.c:1381 msgid "No commands remaining." msgstr "Tidak ada perintah yang tersisa." -#: wt-status.c:1334 +#: wt-status.c:1384 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Perintah berikutnya (%d perintah tersisa):" msgstr[1] "Perintah berikutnya (%d perintah tersisa):" -#: wt-status.c:1342 +#: wt-status.c:1392 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (gunakan \"git rebase --edit-todo\" untuk lihat dan sunting)" -#: wt-status.c:1354 +#: wt-status.c:1404 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Anda sedang mendasarkan ulang cabang '%s' pada '%s'." -#: wt-status.c:1359 +#: wt-status.c:1409 msgid "You are currently rebasing." msgstr "Anda sedang mendasarkan ulang." -#: wt-status.c:1372 +#: wt-status.c:1422 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (selesaikan konflik lalu jalankan \"git rebase --continue\")" -#: wt-status.c:1374 +#: wt-status.c:1424 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (gunakan \"git rebase --skip\" untuk lewati tambalan ini)" -#: wt-status.c:1376 +#: wt-status.c:1426 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (gunakan \"git rebase --abort\" untuk check out cabang asal)" -#: wt-status.c:1383 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (semua konflik sudah selesai: jalankan \"git rebase --continue\")" -#: wt-status.c:1387 +#: wt-status.c:1437 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" "Anda sedang membelah komit saat mendasarkan ulang cabang '%s' pada '%s'." -#: wt-status.c:1392 +#: wt-status.c:1442 msgid "You are currently splitting a commit during a rebase." msgstr "Anda sedang membelah komit saat mendasarkan ulang." -#: wt-status.c:1395 +#: wt-status.c:1445 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Setelah direktori kerja Anda bersih, jalankan \"git rebase --continue\")" -#: wt-status.c:1399 +#: wt-status.c:1449 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Anda sedang menyunting komit saat mendasarkan ulang cabang '%s' pada '%s'." -#: wt-status.c:1404 +#: wt-status.c:1454 msgid "You are currently editing a commit during a rebase." msgstr "Anda sedang menyunting komit saat mendasarkan ulang." -#: wt-status.c:1407 +#: wt-status.c:1457 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (gunakan \"git commit --amend\" untuk mengubah komit saat ini)" -#: wt-status.c:1409 +#: wt-status.c:1459 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (gunakan \"git rebase --continue\" begitu Anda puas dengan perubahan Anda)" -#: wt-status.c:1420 +#: wt-status.c:1470 msgid "Cherry-pick currently in progress." msgstr "Petik ceri sedang berjalan." -#: wt-status.c:1423 +#: wt-status.c:1473 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Anda sedang memetik ceri komit %s." -#: wt-status.c:1430 +#: wt-status.c:1480 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (selesaikan konflik dan jalankan \"git cherry-pick --continue\")" -#: wt-status.c:1433 +#: wt-status.c:1483 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (jalankan \"git cherry-pick --continue\" untuk melanjutkan)" -#: wt-status.c:1436 +#: wt-status.c:1486 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (semua konflik sudah selesai: jalankan \"git cherry-pick --continue\")" -#: wt-status.c:1438 +#: wt-status.c:1488 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (gunakan \"git cherry-pick --skip\" untuk lewati tambalan ini)" -#: wt-status.c:1440 +#: wt-status.c:1490 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (gunakan \"git cherry-pick --abort\" untuk membatalkan operasi petik ceri)" -#: wt-status.c:1450 +#: wt-status.c:1500 msgid "Revert currently in progress." msgstr "Pengembalian sedang berjalang." -#: wt-status.c:1453 +#: wt-status.c:1503 #, c-format msgid "You are currently reverting commit %s." msgstr "Anda sedang mengembalikan komit %s." -#: wt-status.c:1459 +#: wt-status.c:1509 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (selesaikan konflik dan jalankan \"git revert --continue\")" -#: wt-status.c:1462 +#: wt-status.c:1512 msgid " (run \"git revert --continue\" to continue)" msgstr " (jalankan \"git revert --continue\" untuk melanjutkan)" -#: wt-status.c:1465 +#: wt-status.c:1515 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (semua konflik sudah selesai: jalankan \"git revert --continue\")" -#: wt-status.c:1467 +#: wt-status.c:1517 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (gunakan \"git revert --skip\" untuk lewati tambalan ini)" -#: wt-status.c:1469 +#: wt-status.c:1519 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (gunakan \"git revert --abort\" untuk membatalkan operasi pengembalian)" -#: wt-status.c:1479 +#: wt-status.c:1529 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Anda sedang membagi dua, dimulai dari cabang '%s'." -#: wt-status.c:1483 +#: wt-status.c:1533 msgid "You are currently bisecting." msgstr "Anda sedang membagi dua." -#: wt-status.c:1486 +#: wt-status.c:1536 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (gunakan \"git bisect reset\" untuk kembali ke cabang asal)" -#: wt-status.c:1497 +#: wt-status.c:1547 +msgid "You are in a sparse checkout." +msgstr "Anda berada dalam checkout tipis." + +#: wt-status.c:1550 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "Anda berada dalam checkout tipis dengan %d%% berkas terlacak ada." -#: wt-status.c:1736 +#: wt-status.c:1794 msgid "On branch " msgstr "Pada cabang " -#: wt-status.c:1743 +#: wt-status.c:1801 msgid "interactive rebase in progress; onto " msgstr "sedang mendasarkan ulang interaktif; ke " -#: wt-status.c:1745 +#: wt-status.c:1803 msgid "rebase in progress; onto " msgstr "sedang mendasarkan ulang; ke " -#: wt-status.c:1750 +#: wt-status.c:1808 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1752 +#: wt-status.c:1810 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1755 +#: wt-status.c:1813 msgid "Not currently on any branch." msgstr "Tidak sedang berada pada cabang apapun." -#: wt-status.c:1772 +#: wt-status.c:1830 msgid "Initial commit" msgstr "Komit awal" -#: wt-status.c:1773 +#: wt-status.c:1831 msgid "No commits yet" msgstr "Tidak ada komit" -#: wt-status.c:1787 +#: wt-status.c:1845 msgid "Untracked files" msgstr "Berkas tak terlacak" -#: wt-status.c:1789 +#: wt-status.c:1847 msgid "Ignored files" msgstr "Berkas yang diabaikan" -#: wt-status.c:1793 +#: wt-status.c:1851 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9462,32 +9526,32 @@ msgstr "" "mungkin bisa mempercepat, tapi Anda harus berhati-hati jangan sampai lupa\n" "untuk tambahkan berkas baru sendiri (lihat 'git help status')." -#: wt-status.c:1799 +#: wt-status.c:1857 #, c-format msgid "Untracked files not listed%s" msgstr "Berkas tak terlacak yang tak disebutkan%s" -#: wt-status.c:1801 +#: wt-status.c:1859 msgid " (use -u option to show untracked files)" msgstr " (gunakan opsi -u untuk melihat berkas yang tak terlacak)" -#: wt-status.c:1807 +#: wt-status.c:1865 msgid "No changes" msgstr "Tidak ada perubahan" -#: wt-status.c:1812 +#: wt-status.c:1870 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "tidak ada perubahan untuk dikomit (gunakan \"git add\" dan/atau \"git commit " "-a\")\n" -#: wt-status.c:1816 +#: wt-status.c:1874 #, c-format msgid "no changes added to commit\n" msgstr "tidak ada perubahan untuk dikomit\n" -#: wt-status.c:1820 +#: wt-status.c:1878 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9496,82 +9560,82 @@ msgstr "" "tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada(gunakan " "\"git add\" untuk lacak)\n" -#: wt-status.c:1824 +#: wt-status.c:1882 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada\n" -#: wt-status.c:1828 +#: wt-status.c:1886 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "tidak ada yang dikomit (buat/salin berkas dan gunakan \"git add\" untuk " "lacak)\n" -#: wt-status.c:1832 wt-status.c:1838 +#: wt-status.c:1890 wt-status.c:1896 #, c-format msgid "nothing to commit\n" msgstr "tidak ada yang dikomit\n" -#: wt-status.c:1835 +#: wt-status.c:1893 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "tidak ada yang dikomit (gunakan -u untuk lihat berkas tak terlacak)\n" -#: wt-status.c:1840 +#: wt-status.c:1898 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "tidak ada yang dikomit, pohon kerja bersih\n" -#: wt-status.c:1945 +#: wt-status.c:2003 msgid "No commits yet on " msgstr "Tidak ada komit apapun pada " -#: wt-status.c:1949 +#: wt-status.c:2007 msgid "HEAD (no branch)" msgstr "HEAD (tanpa cabang)" -#: wt-status.c:1980 +#: wt-status.c:2038 msgid "different" msgstr "berbeda" -#: wt-status.c:1982 wt-status.c:1990 +#: wt-status.c:2040 wt-status.c:2048 msgid "behind " msgstr "di belakang " -#: wt-status.c:1985 wt-status.c:1988 +#: wt-status.c:2043 wt-status.c:2046 msgid "ahead " msgstr "di depan " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2511 +#: wt-status.c:2569 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "tidak dapat %s: Anda punya perubahan yang tidak digelar." -#: wt-status.c:2517 +#: wt-status.c:2575 msgid "additionally, your index contains uncommitted changes." msgstr "juga indeks Anda berisi perubahan yang belum dikomit." -#: wt-status.c:2519 +#: wt-status.c:2577 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "tidak dapat %s: indeks Anda berisi perubahan yang belum dikomit." -#: compat/simple-ipc/ipc-unix-socket.c:178 +#: compat/simple-ipc/ipc-unix-socket.c:182 msgid "could not send IPC command" msgstr "" -#: compat/simple-ipc/ipc-unix-socket.c:185 +#: compat/simple-ipc/ipc-unix-socket.c:189 msgid "could not read IPC response" msgstr "" -#: compat/simple-ipc/ipc-unix-socket.c:862 +#: compat/simple-ipc/ipc-unix-socket.c:866 #, c-format msgid "could not start accept_thread '%s'" msgstr "" -#: compat/simple-ipc/ipc-unix-socket.c:874 +#: compat/simple-ipc/ipc-unix-socket.c:878 #, c-format msgid "could not start worker[0] for '%s'" msgstr "" @@ -9608,7 +9672,7 @@ msgstr "hapus '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Perubahan tak tergelar setelah menyegarkan indeks:" -#: builtin/add.c:307 builtin/rev-parse.c:991 +#: builtin/add.c:307 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "Tidak dapat membaca indeks" @@ -9643,8 +9707,8 @@ msgstr "Tidak dapat terapkan '%s'" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Jalur berikut diabaikan oleh salah satu dari berkas .gitignore Anda:\n" -#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550 #: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 msgid "dry run" msgstr "latihan" @@ -9785,12 +9849,12 @@ msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod param '%s' harus berupa -x atau +x" #: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 -#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637 +#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file tidak kompatibel dengan argumen pathspec" #: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 -#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643 +#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul butuh --pathspec-from-file" @@ -9809,128 +9873,128 @@ msgstr "" "Matikan pesan ini dengan menjalankan\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:364 +#: builtin/am.c:365 msgid "could not parse author script" msgstr "" -#: builtin/am.c:454 +#: builtin/am.c:455 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:496 +#: builtin/am.c:497 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:534 +#: builtin/am.c:535 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:560 +#: builtin/am.c:561 msgid "fseek failed" msgstr "" -#: builtin/am.c:748 +#: builtin/am.c:749 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:813 +#: builtin/am.c:814 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:861 +#: builtin/am.c:862 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:866 builtin/am.c:878 +#: builtin/am.c:867 builtin/am.c:879 msgid "invalid Date line" msgstr "" -#: builtin/am.c:873 +#: builtin/am.c:874 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:966 +#: builtin/am.c:967 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:971 builtin/clone.c:414 +#: builtin/am.c:972 builtin/clone.c:414 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:976 +#: builtin/am.c:977 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1125 +#: builtin/am.c:1126 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1126 +#: builtin/am.c:1127 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1127 +#: builtin/am.c:1128 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1222 +#: builtin/am.c:1223 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -#: builtin/am.c:1250 +#: builtin/am.c:1251 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1315 +#: builtin/am.c:1316 #, c-format msgid "missing author line in commit %s" msgstr "" -#: builtin/am.c:1318 +#: builtin/am.c:1319 #, c-format msgid "invalid ident line: %.*s" msgstr "" -#: builtin/am.c:1537 +#: builtin/am.c:1538 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1539 +#: builtin/am.c:1540 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1558 +#: builtin/am.c:1559 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1564 +#: builtin/am.c:1565 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1590 +#: builtin/am.c:1591 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1622 +#: builtin/am.c:1623 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1674 builtin/am.c:1678 +#: builtin/am.c:1675 builtin/am.c:1679 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1696 +#: builtin/am.c:1697 msgid "Commit Body is:" msgstr "" @@ -9938,46 +10002,46 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1706 +#: builtin/am.c:1707 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1752 builtin/commit.c:408 +#: builtin/am.c:1753 builtin/commit.c:408 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1756 +#: builtin/am.c:1757 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1796 builtin/am.c:1864 +#: builtin/am.c:1797 builtin/am.c:1865 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1813 +#: builtin/am.c:1814 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1819 +#: builtin/am.c:1820 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1823 +#: builtin/am.c:1824 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -#: builtin/am.c:1867 +#: builtin/am.c:1868 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: builtin/am.c:1874 +#: builtin/am.c:1875 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9985,106 +10049,106 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347 +#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Tidak dapat mengurai objek '%s'." -#: builtin/am.c:2033 +#: builtin/am.c:2034 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2077 +#: builtin/am.c:2078 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2184 +#: builtin/am.c:2185 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2226 +#: builtin/am.c:2227 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "" -#: builtin/am.c:2230 +#: builtin/am.c:2231 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "" -#: builtin/am.c:2261 +#: builtin/am.c:2262 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "" -#: builtin/am.c:2262 +#: builtin/am.c:2263 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2268 +#: builtin/am.c:2269 msgid "run interactively" msgstr "" -#: builtin/am.c:2270 +#: builtin/am.c:2271 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2272 +#: builtin/am.c:2273 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16 -#: builtin/repack.c:472 builtin/stash.c:948 +#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:472 builtin/stash.c:945 msgid "be quiet" msgstr "" -#: builtin/am.c:2275 +#: builtin/am.c:2276 msgid "add a Signed-off-by trailer to the commit message" msgstr "" -#: builtin/am.c:2278 +#: builtin/am.c:2279 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2280 +#: builtin/am.c:2281 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2282 +#: builtin/am.c:2283 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2284 +#: builtin/am.c:2285 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2286 +#: builtin/am.c:2287 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2289 +#: builtin/am.c:2290 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2292 +#: builtin/am.c:2293 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2294 +#: builtin/am.c:2295 msgid "pass it through git-mailinfo" msgstr "" -#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 -#: builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 -#: builtin/am.c:2324 +#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307 +#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319 +#: builtin/am.c:2325 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261 +#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 #: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 #: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 @@ -10093,93 +10157,93 @@ msgstr "" msgid "n" msgstr "" -#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137 +#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137 #: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 #: builtin/verify-tag.c:38 msgid "format" msgstr "" -#: builtin/am.c:2321 +#: builtin/am.c:2322 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2327 +#: builtin/am.c:2328 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2329 +#: builtin/am.c:2330 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2332 +#: builtin/am.c:2333 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2335 +#: builtin/am.c:2336 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2338 +#: builtin/am.c:2339 msgid "restore the original branch and abort the patching operation" msgstr "" -#: builtin/am.c:2341 +#: builtin/am.c:2342 msgid "abort the patching operation but keep HEAD where it is" msgstr "" -#: builtin/am.c:2345 +#: builtin/am.c:2346 msgid "show the patch being applied" msgstr "" -#: builtin/am.c:2350 +#: builtin/am.c:2351 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2352 +#: builtin/am.c:2353 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630 +#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640 #: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 #: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 msgid "key-id" msgstr "" -#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396 +#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2358 +#: builtin/am.c:2359 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2376 +#: builtin/am.c:2377 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" -#: builtin/am.c:2383 +#: builtin/am.c:2384 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2398 +#: builtin/am.c:2399 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2422 +#: builtin/am.c:2423 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2428 +#: builtin/am.c:2429 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: builtin/am.c:2438 +#: builtin/am.c:2439 msgid "interactive mode requires patches on the command line" msgstr "" @@ -10219,17 +10283,19 @@ msgstr "" #: builtin/bisect--helper.c:23 msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "" +msgstr "git bisect--helper --bisect-reset [<komit>]" #: builtin/bisect--helper.c:24 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" -msgstr "" +msgstr "git bisect--helper --bisect-next-check <istilah bagus> <istilah jelek> [<istilah>]" #: builtin/bisect--helper.c:25 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" msgstr "" +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | " +"--term-new]" #: builtin/bisect--helper.c:26 msgid "" @@ -10237,445 +10303,458 @@ msgid "" "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " "[<paths>...]" msgstr "" +"git bisect--helper --bisect-start [--term-{new,bad}=<istilah> " +"--term-{old,good}=<istilah>] [--no-checkout] [--first-parent] [<jelek> " +"[<bagus>...]] [--] [<jalur>...]" #: builtin/bisect--helper.c:28 msgid "git bisect--helper --bisect-next" -msgstr "" +msgstr "git bisect--helper --bisect-next" #: builtin/bisect--helper.c:29 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" -msgstr "" +msgstr "git bisect--helper --bisect-state (bad|new) [<revisi>]" #: builtin/bisect--helper.c:30 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" -msgstr "" +msgstr "git bisect--helper --bisect-state (good|old) [<revisi>...]" #: builtin/bisect--helper.c:31 msgid "git bisect--helper --bisect-replay <filename>" -msgstr "" +msgstr "git bisect--helper --bisect-replay <nama berkas>" #: builtin/bisect--helper.c:32 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" -msgstr "" +msgstr "git bisect--helper --bisect-skip [(<revisi>|<rentang>)...]" #: builtin/bisect--helper.c:107 #, c-format msgid "cannot open file '%s' in mode '%s'" -msgstr "" +msgstr "tidak dapat membuka berkas '%s' dalam mode '%s'" #: builtin/bisect--helper.c:114 #, c-format msgid "could not write to file '%s'" -msgstr "" +msgstr "tidak dapat menulis ke berkas '%s'" -#: builtin/bisect--helper.c:153 +#: builtin/bisect--helper.c:155 #, c-format msgid "'%s' is not a valid term" -msgstr "" +msgstr "'%s' bukan istilah yang valid" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:159 #, c-format msgid "can't use the builtin command '%s' as a term" -msgstr "" +msgstr "tidak dapat menggunakan perintah bawaan '%s' sebagai istilah" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:169 #, c-format msgid "can't change the meaning of the term '%s'" -msgstr "" +msgstr "tidak dapat mengubah makna istilah '%s'" -#: builtin/bisect--helper.c:177 +#: builtin/bisect--helper.c:179 msgid "please use two different terms" -msgstr "" +msgstr "mohon gunakan dua istilah yang berbeda" -#: builtin/bisect--helper.c:193 +#: builtin/bisect--helper.c:195 #, c-format msgid "We are not bisecting.\n" -msgstr "" +msgstr "Kami tidak sedang membagi dua.\n" -#: builtin/bisect--helper.c:201 +#: builtin/bisect--helper.c:203 #, c-format msgid "'%s' is not a valid commit" -msgstr "" +msgstr "'%s' bukan sebuah komit yang valid" -#: builtin/bisect--helper.c:210 +#: builtin/bisect--helper.c:212 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "" +"tidak dapat men-checkout HEAD asli '%s'. Coba 'git bisect reset <komit>'." -#: builtin/bisect--helper.c:254 +#: builtin/bisect--helper.c:256 #, c-format msgid "Bad bisect_write argument: %s" -msgstr "" +msgstr "argument bisect_write jelek: %s" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:261 #, c-format msgid "couldn't get the oid of the rev '%s'" -msgstr "" +msgstr "tidak dapat mendapatkan oid revisi '%s'" -#: builtin/bisect--helper.c:271 +#: builtin/bisect--helper.c:273 #, c-format msgid "couldn't open the file '%s'" -msgstr "" +msgstr "tidak dapat membuka berkas '%s'" -#: builtin/bisect--helper.c:297 +#: builtin/bisect--helper.c:299 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" -msgstr "" +msgstr "Perintah tidak valid: sekarang Anda berada dalam pembagian dua %s/%s" -#: builtin/bisect--helper.c:324 +#: builtin/bisect--helper.c:326 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" +"Anda perlu berikan saya setidaknya satu revisi %s dan %s.\n" +"Untuk itu Anda dapat menggunakan \"git bisect %s\" dan \"git bisect %s\"." -#: builtin/bisect--helper.c:328 +#: builtin/bisect--helper.c:330 #, c-format msgid "" "You need to start by \"git bisect start\".\n" "You then need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" +"Anda perlu memulai dengan \"git bisect start\".\n" +"Lalu Anda perlu berikan saya setidaknya satu revisi %s dan %s.\n" +"Untuk itu Anda dapat menggunakan \"git bisect %s\" dan \"git bisect %s\"." -#: builtin/bisect--helper.c:348 +#: builtin/bisect--helper.c:350 #, c-format msgid "bisecting only with a %s commit" -msgstr "" +msgstr "membagi dua hanya dengan sebuah komit %s" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:356 +#: builtin/bisect--helper.c:358 msgid "Are you sure [Y/n]? " -msgstr "" +msgstr "Anda yakin [Y/n]?" -#: builtin/bisect--helper.c:417 +#: builtin/bisect--helper.c:419 msgid "no terms defined" -msgstr "" +msgstr "tidak ada istilah yang didefinisikan" -#: builtin/bisect--helper.c:420 +#: builtin/bisect--helper.c:422 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "" +"Istilah Anda saat ini adalah %s untuk keadaan lama\n" +"dan %s untuk keadaan baru.\n" -#: builtin/bisect--helper.c:430 +#: builtin/bisect--helper.c:432 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "" +"argumen %s tidak valid untuk 'git bisect terms'.\n" +"Opsi yang didukung adalah: --term-good|--term-old dan --term-bad|--term-new." -#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021 +#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023 msgid "revision walk setup failed\n" -msgstr "" +msgstr "setup jalan revisi gagal\n" -#: builtin/bisect--helper.c:519 +#: builtin/bisect--helper.c:521 #, c-format msgid "could not open '%s' for appending" -msgstr "" +msgstr "tidak dapat membuka '%s' untuk menambahkan" -#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653 msgid "'' is not a valid term" -msgstr "" +msgstr "'' bukan istilah yang valid" -#: builtin/bisect--helper.c:661 +#: builtin/bisect--helper.c:663 #, c-format msgid "unrecognized option: '%s'" -msgstr "" +msgstr "opsi tidak dikenal: '%s'" -#: builtin/bisect--helper.c:665 +#: builtin/bisect--helper.c:667 #, c-format msgid "'%s' does not appear to be a valid revision" -msgstr "" +msgstr "'%s' sepertinya bukan revisi valid" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:698 msgid "bad HEAD - I need a HEAD" -msgstr "" +msgstr "HEAD jelek - saya butuh HEAD" -#: builtin/bisect--helper.c:711 +#: builtin/bisect--helper.c:713 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." -msgstr "" +msgstr "gagal men-checkout '%s'. Coba 'git bisect start <cabang valid>'." -#: builtin/bisect--helper.c:732 +#: builtin/bisect--helper.c:734 msgid "won't bisect on cg-seek'ed tree" -msgstr "" +msgstr "tidak akan membagi dua pada pohon yang di-cg-seek" -#: builtin/bisect--helper.c:735 +#: builtin/bisect--helper.c:737 msgid "bad HEAD - strange symbolic ref" -msgstr "" +msgstr "HEAD jelek - referensi simbolik aneh" -#: builtin/bisect--helper.c:755 +#: builtin/bisect--helper.c:757 #, c-format msgid "invalid ref: '%s'" -msgstr "" +msgstr "referensi tidak valid: '%s'" -#: builtin/bisect--helper.c:813 +#: builtin/bisect--helper.c:815 msgid "You need to start by \"git bisect start\"\n" -msgstr "" +msgstr "Anda perlu memulai dengan \"git bisect start\"\n" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:824 +#: builtin/bisect--helper.c:826 msgid "Do you want me to do it for you [Y/n]? " -msgstr "" +msgstr "Anda ingin saya melakukannya untuk Anda [Y/n]" -#: builtin/bisect--helper.c:842 +#: builtin/bisect--helper.c:844 msgid "Please call `--bisect-state` with at least one argument" -msgstr "" +msgstr "Mohon panggil `--bisect-state` dengan setidaknya satu argumen" -#: builtin/bisect--helper.c:855 +#: builtin/bisect--helper.c:857 #, c-format msgid "'git bisect %s' can take only one argument." -msgstr "" +msgstr "'git bisect %s' hanya dapat mengambil satu argumen." -#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880 +#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882 #, c-format msgid "Bad rev input: %s" -msgstr "" +msgstr "Masukan revisi jelek: %s" -#: builtin/bisect--helper.c:887 +#: builtin/bisect--helper.c:889 #, c-format msgid "Bad rev input (not a commit): %s" -msgstr "" +msgstr "Masukan revisi jelek (bukan sebuah komit): %s" -#: builtin/bisect--helper.c:919 +#: builtin/bisect--helper.c:921 msgid "We are not bisecting." -msgstr "" +msgstr "Kami tidak sedang membagi dua." -#: builtin/bisect--helper.c:969 +#: builtin/bisect--helper.c:971 #, c-format msgid "'%s'?? what are you talking about?" -msgstr "" +msgstr "'%s'?? Anda bilang tentang apa?" -#: builtin/bisect--helper.c:981 +#: builtin/bisect--helper.c:983 #, c-format msgid "cannot read file '%s' for replaying" -msgstr "" +msgstr "tidak dapat membuka berkas '%s' untuk memainkan ulang" -#: builtin/bisect--helper.c:1054 +#: builtin/bisect--helper.c:1056 msgid "reset the bisection state" -msgstr "" +msgstr "setel ulang keadaan pembagian dua" -#: builtin/bisect--helper.c:1056 +#: builtin/bisect--helper.c:1058 msgid "check whether bad or good terms exist" -msgstr "" +msgstr "periksa apakah ada istilah jelek atau bagus" -#: builtin/bisect--helper.c:1058 +#: builtin/bisect--helper.c:1060 msgid "print out the bisect terms" -msgstr "" +msgstr "cetak istilah pembagian dua" -#: builtin/bisect--helper.c:1060 +#: builtin/bisect--helper.c:1062 msgid "start the bisect session" -msgstr "" +msgstr "mulai sesi pembagian dua" -#: builtin/bisect--helper.c:1062 +#: builtin/bisect--helper.c:1064 msgid "find the next bisection commit" -msgstr "" +msgstr "temukan komit pembagian dua berikutnya" -#: builtin/bisect--helper.c:1064 +#: builtin/bisect--helper.c:1066 msgid "mark the state of ref (or refs)" -msgstr "" +msgstr "tandai keadaan referensi" -#: builtin/bisect--helper.c:1066 +#: builtin/bisect--helper.c:1068 msgid "list the bisection steps so far" -msgstr "" +msgstr "daftar langkah pembagian dua sejauh ini" -#: builtin/bisect--helper.c:1068 +#: builtin/bisect--helper.c:1070 msgid "replay the bisection process from the given file" -msgstr "" +msgstr "mainkan ulang proses pembagian dua dari berkas yang diberikan" -#: builtin/bisect--helper.c:1070 +#: builtin/bisect--helper.c:1072 msgid "skip some commits for checkout" -msgstr "" +msgstr "lewati beberapa komit untuk checkout" -#: builtin/bisect--helper.c:1072 +#: builtin/bisect--helper.c:1074 msgid "no log for BISECT_WRITE" -msgstr "" +msgstr "tidak ada log untuk BISECT_WRITE" -#: builtin/bisect--helper.c:1087 +#: builtin/bisect--helper.c:1089 msgid "--bisect-reset requires either no argument or a commit" -msgstr "" +msgstr "--bisect-reset butuh baik tanpa argumen atau sebuah komit" -#: builtin/bisect--helper.c:1092 +#: builtin/bisect--helper.c:1094 msgid "--bisect-next-check requires 2 or 3 arguments" -msgstr "" +msgstr "--bisect-next-check butuh 2 atau 3 argumen" -#: builtin/bisect--helper.c:1098 +#: builtin/bisect--helper.c:1100 msgid "--bisect-terms requires 0 or 1 argument" -msgstr "" +msgstr "--bisect-terms butuh 0 atau 1 argumen" -#: builtin/bisect--helper.c:1107 +#: builtin/bisect--helper.c:1109 msgid "--bisect-next requires 0 arguments" -msgstr "" +msgstr "--bisect-next butuh 0 argumen" -#: builtin/bisect--helper.c:1118 +#: builtin/bisect--helper.c:1120 msgid "--bisect-log requires 0 arguments" -msgstr "" +msgstr "--bisect-log butuh 0 argumen" -#: builtin/bisect--helper.c:1123 +#: builtin/bisect--helper.c:1125 msgid "no logfile given" -msgstr "" +msgstr "tidak ada berkas log yang diberikan" #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" -msgstr "" +msgstr "git blame [<opsi>] [<opsi revisi>] [<revisi>] [--] <berkas>" #: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" -msgstr "" +msgstr "<opsi revisi> didokumentasikan dalam git-rev-list(1)" #: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" -msgstr "" +msgstr "mengharapkan warna: %s" #: builtin/blame.c:417 msgid "must end with a color" -msgstr "" +msgstr "harus berakhir dengan warna" #: builtin/blame.c:728 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" -msgstr "" +msgstr "warna tidak valid '%s' pada color.blame.repeatedLines" #: builtin/blame.c:746 msgid "invalid value for blame.coloring" -msgstr "" +msgstr "nilai tidak valid untuk blame.coloring" #: builtin/blame.c:845 #, c-format msgid "cannot find revision %s to ignore" -msgstr "" +msgstr "tidak dapat menemukan revisi %s untuk diabaikan" #: builtin/blame.c:867 msgid "show blame entries as we find them, incrementally" -msgstr "" +msgstr "perlihatkan entri penyalahan seperti yang kami temukan secara bertahap" #: builtin/blame.c:868 msgid "do not show object names of boundary commits (Default: off)" -msgstr "" +msgstr "jangan perlihatkan nama objek dari komit perbatasan (asali: off)" #: builtin/blame.c:869 msgid "do not treat root commits as boundaries (Default: off)" -msgstr "" +msgstr "jangan perlakukan komit akar sebagai perbatasan (asali: off)" #: builtin/blame.c:870 msgid "show work cost statistics" -msgstr "" +msgstr "perlihatkan statistik biaya usaha" #: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 #: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 #: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 -#: builtin/push.c:575 builtin/send-pack.c:198 +#: builtin/push.c:566 builtin/send-pack.c:198 msgid "force progress reporting" msgstr "paksa laporkan perkembangan" #: builtin/blame.c:872 msgid "show output score for blame entries" -msgstr "" +msgstr "perlihatkan nilai keluaran untuk entri penyalahan" #: builtin/blame.c:873 msgid "show original filename (Default: auto)" -msgstr "" +msgstr "perlihatkan nama berkas asli (asali: auto)" #: builtin/blame.c:874 msgid "show original linenumber (Default: off)" -msgstr "" +msgstr "perlihatkan nomor baris asli (asali: off)" #: builtin/blame.c:875 msgid "show in a format designed for machine consumption" -msgstr "" +msgstr "perlihatkan dalam format yang didesain untuk konsumsi mesin" #: builtin/blame.c:876 msgid "show porcelain format with per-line commit information" -msgstr "" +msgstr "perlihatkan format porselen dengan informasi komit per baris" #: builtin/blame.c:877 msgid "use the same output mode as git-annotate (Default: off)" -msgstr "" +msgstr "gunakan mode keluaran yang sama dengan git-annotate (asali: off)" #: builtin/blame.c:878 msgid "show raw timestamp (Default: off)" -msgstr "" +msgstr "perlihatkan stempel waktu mentah (asali: off)" #: builtin/blame.c:879 msgid "show long commit SHA1 (Default: off)" -msgstr "" +msgstr "perlihatkan SHA1 komit panjang (asali: off)" #: builtin/blame.c:880 msgid "suppress author name and timestamp (Default: off)" -msgstr "" +msgstr "sembunyikan nama pengarang dan stempel waktu (asali: off)" #: builtin/blame.c:881 msgid "show author email instead of name (Default: off)" -msgstr "" +msgstr "perlihatkan email pengarang daripada nama (asali: off)" #: builtin/blame.c:882 msgid "ignore whitespace differences" -msgstr "" +msgstr "abaikan perbedaan spasi putih" -#: builtin/blame.c:883 builtin/log.c:1820 +#: builtin/blame.c:883 builtin/log.c:1823 msgid "rev" -msgstr "" +msgstr "revisi" #: builtin/blame.c:883 msgid "ignore <rev> when blaming" -msgstr "" +msgstr "abaikan <revisi> ketika menyalahkan" #: builtin/blame.c:884 msgid "ignore revisions from <file>" -msgstr "" +msgstr "abaikan revisi dari <berkas>" #: builtin/blame.c:885 msgid "color redundant metadata from previous line differently" -msgstr "" +msgstr "metadata warna berlebihan dari baris sebelumnya secara berbeda" #: builtin/blame.c:886 msgid "color lines by age" -msgstr "" +msgstr "warnai baris oleh umur" #: builtin/blame.c:887 msgid "spend extra cycles to find better match" -msgstr "" +msgstr "perlihatkan siklus ekstra untuk menemukan cocokan yang lebih baik" #: builtin/blame.c:888 msgid "use revisions from <file> instead of calling git-rev-list" -msgstr "" +msgstr "gunakan revisi dari <berkas> daripada memanggil git-rev-list" #: builtin/blame.c:889 msgid "use <file>'s contents as the final image" -msgstr "" +msgstr "gunakan konten <berkas> sebagai citra final" #: builtin/blame.c:890 builtin/blame.c:891 msgid "score" -msgstr "" +msgstr "nilai" #: builtin/blame.c:890 msgid "find line copies within and across files" -msgstr "" +msgstr "temukan salinan baris di dalam dan di seluruh berkas" #: builtin/blame.c:891 msgid "find line movements within and across files" -msgstr "" +msgstr "temukan gerakan baris di dalam dan di seluruh baris" #: builtin/blame.c:892 msgid "range" -msgstr "" +msgstr "rentang" #: builtin/blame.c:893 msgid "process only line range <start>,<end> or function :<funcname>" -msgstr "" +msgstr "hanya proses rentang baris <awal>,<akhir> atau fungsi :<nama fungsi>" #: builtin/blame.c:945 msgid "--progress can't be used with --incremental or porcelain formats" -msgstr "" +msgstr "--progress tidak dapat digunakan dengan --incremental atau format porselen" #. TRANSLATORS: This string is used to tell us the #. maximum display width for a relative timestamp in @@ -10687,18 +10766,18 @@ msgstr "" #. #: builtin/blame.c:996 msgid "4 years, 11 months ago" -msgstr "" +msgstr "4 tahun, 11 bulan yang lalu" #: builtin/blame.c:1112 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "berkas %s hanya punya %lu baris" +msgstr[1] "berkas %s hanya punya %lu baris" #: builtin/blame.c:1157 msgid "Blaming lines" -msgstr "" +msgstr "Menyalahkan baris" #: builtin/branch.c:29 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" @@ -11193,19 +11272,19 @@ msgstr "" msgid "git bundle unbundle <file> [<refname>...]" msgstr "" -#: builtin/bundle.c:67 builtin/pack-objects.c:3747 +#: builtin/bundle.c:67 builtin/pack-objects.c:3907 msgid "do not show progress meter" msgstr "" -#: builtin/bundle.c:69 builtin/pack-objects.c:3749 +#: builtin/bundle.c:69 builtin/pack-objects.c:3909 msgid "show progress meter" msgstr "" -#: builtin/bundle.c:71 builtin/pack-objects.c:3751 +#: builtin/bundle.c:71 builtin/pack-objects.c:3911 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/bundle.c:74 builtin/pack-objects.c:3754 +#: builtin/bundle.c:74 builtin/pack-objects.c:3914 msgid "similar to --all-progress when progress meter is shown" msgstr "" @@ -11217,105 +11296,105 @@ msgstr "" msgid "Need a repository to create a bundle." msgstr "" -#: builtin/bundle.c:107 +#: builtin/bundle.c:109 msgid "do not show bundle details" msgstr "" -#: builtin/bundle.c:122 +#: builtin/bundle.c:128 #, c-format msgid "%s is okay\n" msgstr "" -#: builtin/bundle.c:163 +#: builtin/bundle.c:179 msgid "Need a repository to unbundle." msgstr "" -#: builtin/bundle.c:171 builtin/remote.c:1700 +#: builtin/bundle.c:191 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "" -#: builtin/bundle.c:193 builtin/remote.c:1731 +#: builtin/bundle.c:213 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "" -#: builtin/cat-file.c:598 +#: builtin/cat-file.c:596 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "" -#: builtin/cat-file.c:599 +#: builtin/cat-file.c:597 msgid "" "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" "symlinks] [--textconv | --filters]" msgstr "" -#: builtin/cat-file.c:620 +#: builtin/cat-file.c:618 msgid "only one batch option may be specified" msgstr "" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:636 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:637 msgid "show object type" msgstr "" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:638 msgid "show object size" msgstr "" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:640 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:641 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:643 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:645 msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:646 msgid "blob" msgstr "" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:647 msgid "use a specific path for --textconv/--filters" msgstr "" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:649 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" -#: builtin/cat-file.c:652 +#: builtin/cat-file.c:650 msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:652 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:656 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:660 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" -#: builtin/cat-file.c:664 +#: builtin/cat-file.c:662 msgid "show all objects with --batch or --batch-check" msgstr "" -#: builtin/cat-file.c:666 +#: builtin/cat-file.c:664 msgid "do not order --batch-all-objects output" msgstr "" @@ -11344,7 +11423,7 @@ msgid "terminate input and output records by a NUL character" msgstr "" #: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 -#: builtin/worktree.c:491 +#: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "" @@ -11402,9 +11481,10 @@ msgid "git checkout--worker [<options>]" msgstr "" #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/submodule--helper.c:1825 -#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836 -#: builtin/submodule--helper.c:2334 builtin/worktree.c:719 +#: builtin/column.c:31 builtin/submodule--helper.c:1824 +#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835 +#: builtin/submodule--helper.c:2333 builtin/worktree.c:491 +#: builtin/worktree.c:728 msgid "string" msgstr "" @@ -11580,7 +11660,7 @@ msgstr "Tidak dapat melakukan reflog untuk '%s': %s\n" msgid "HEAD is now at" msgstr "HEAD sekarang berada di" -#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "tidak dapat memperbarui HEAD" @@ -11715,7 +11795,7 @@ msgstr "hanya satu referensi yang diharapkan" msgid "only one reference expected, %d given." msgstr "hanya satu referensi yang diharapkan, %d diberikan" -#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438 +#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "referensi tidak valid: %s" @@ -11786,7 +11866,7 @@ msgid "" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" "tidak dapat mengganti cabang saat pembalikan\n" -"Pertimbangkan untuk menggunakan \"git cherry-pick --quit\" atau \"git " +"Pertimbangkan untuk menggunakan \"git revert --quit\" atau \"git " "worktree add\"." #: builtin/checkout.c:1432 @@ -11826,7 +11906,7 @@ msgstr "kehilangan argumen cabang atau komit" msgid "perform a 3-way merge with the new branch" msgstr "lakukan penggabungan 3 arah dengan cabang baru" -#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323 +#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323 msgid "style" msgstr "gaya" @@ -11916,7 +11996,7 @@ msgstr "git checkout: --detach tidak mengambil argumen jalur '%s'" msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file tidak kompatible dengan --detach" -#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634 +#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file tidak kompatibel dengan --patch" @@ -11925,7 +12005,7 @@ msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -"git checkout: --ours/theirs, --force dan --merge tidak kompatibel saat\n" +"git checkout: --ours/--theirs, --force dan --merge tidak kompatibel saat\n" "men-checkout index" #: builtin/checkout.c:1759 @@ -11934,7 +12014,7 @@ msgstr "Anda harus sebutkan jalur untuk dipulihkan" #: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 #: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484 #: builtin/worktree.c:486 msgid "branch" msgstr "cabang" @@ -12026,7 +12106,7 @@ msgstr "Akan melewatkan repositori %s\n" msgid "could not lstat %s\n" msgstr "tidak dapat me-lstat %s\n" -#: builtin/clean.c:302 git-add--interactive.perl:593 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12039,7 +12119,7 @@ msgstr "" "foo - pilih item berdasarkan prefiks unik\n" " - (kosong) tidak pilih apa-apa\n" -#: builtin/clean.c:306 git-add--interactive.perl:602 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12060,33 +12140,33 @@ msgstr "" "* - pilih semua item\n" " - (kosong) selesai memilih\n" -#: builtin/clean.c:521 git-add--interactive.perl:568 +#: builtin/clean.c:519 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Huh (%s)?\n" -#: builtin/clean.c:661 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "Masukkan pola pengabaian>> " -#: builtin/clean.c:696 +#: builtin/clean.c:693 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "PERINGATAN: Tidak dapat menemukan item yang cocok dengan: %s" -#: builtin/clean.c:717 +#: builtin/clean.c:714 msgid "Select items to delete" msgstr "Pilih item untuk dihapus" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:755 #, c-format msgid "Remove %s [y/N]? " msgstr "Hapus %s [y/N]? " -#: builtin/clean.c:789 +#: builtin/clean.c:786 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12104,52 +12184,52 @@ msgstr "" "help - layar ini\n" "? - bantuan untuk bisik pemilihan" -#: builtin/clean.c:825 +#: builtin/clean.c:822 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Akan menghapus item berikut:" msgstr[1] "Akan menghapus item berikut:" -#: builtin/clean.c:841 +#: builtin/clean.c:838 msgid "No more files to clean, exiting." msgstr "Tidak ada lagi berkas untuk dibersihkan, keluar." -#: builtin/clean.c:903 +#: builtin/clean.c:900 msgid "do not print names of files removed" msgstr "jangan cetak nama berkas yang dihapus" -#: builtin/clean.c:905 +#: builtin/clean.c:902 msgid "force" msgstr "paksa" -#: builtin/clean.c:906 +#: builtin/clean.c:903 msgid "interactive cleaning" msgstr "pembersihan interaktif" -#: builtin/clean.c:908 +#: builtin/clean.c:905 msgid "remove whole directories" msgstr "hapus keseluruhan direktori" -#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186 +#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186 #: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "pola" -#: builtin/clean.c:910 +#: builtin/clean.c:907 msgid "add <pattern> to ignore rules" msgstr "tambahkan <pola> ke aturan pengabaian" -#: builtin/clean.c:911 +#: builtin/clean.c:908 msgid "remove ignored files, too" msgstr "juga hapus berkas terabaikan" -#: builtin/clean.c:913 +#: builtin/clean.c:910 msgid "remove only ignored files" msgstr "hanya hapus berkas terabaikan" -#: builtin/clean.c:929 +#: builtin/clean.c:925 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -12157,7 +12237,7 @@ msgstr "" "clean.requireForce disetel ke true dan baik -i, -n, atau -f tidak diberikan; " "menolak membersihkan" -#: builtin/clean.c:932 +#: builtin/clean.c:928 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -12165,7 +12245,7 @@ msgstr "" "clean.requireForce asal ke true dan baik -i, -n, atau -f tidak diberikan; " "menolak membersihkan" -#: builtin/clean.c:944 +#: builtin/clean.c:940 msgid "-x and -X cannot be used together" msgstr "-x dan -X tidak dapat digunakan bersamaan" @@ -12181,7 +12261,7 @@ msgstr "jangan kloning repositori dangkal" msgid "don't create a checkout" msgstr "jangan buat checkout" -#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542 msgid "create a bare repository" msgstr "buat repositori bare" @@ -12213,26 +12293,26 @@ msgstr "inisialisasi submodul dalam klon" msgid "number of submodules cloned in parallel" msgstr "jumlah submodul yang diklon secara paralel" -#: builtin/clone.c:116 builtin/init-db.c:538 +#: builtin/clone.c:116 builtin/init-db.c:539 msgid "template-directory" msgstr "direktori templat" -#: builtin/clone.c:117 builtin/init-db.c:539 +#: builtin/clone.c:117 builtin/init-db.c:540 msgid "directory from which templates will be used" msgstr "direktori dimana templat akan digunakan" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832 -#: builtin/submodule--helper.c:2337 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "repositori rujukan" -#: builtin/clone.c:123 builtin/submodule--helper.c:1834 -#: builtin/submodule--helper.c:2339 +#: builtin/clone.c:123 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "gunakan --reference hanya pada saat kloning" -#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495 +#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495 #: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 msgid "name" msgstr "nama" @@ -12249,7 +12329,7 @@ msgstr "checkout <cabang> daripada HEAD remote" msgid "path to git-upload-pack on the remote" msgstr "jalur ke git-upload-pack pada remote" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862 #: builtin/pull.c:208 msgid "depth" msgstr "kedalaman" @@ -12258,7 +12338,7 @@ msgstr "kedalaman" msgid "create a shallow clone of that depth" msgstr "buat klon dangkal sedalam kedalaman tersebut" -#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964 #: builtin/pull.c:211 msgid "time" msgstr "waktu" @@ -12276,8 +12356,8 @@ msgstr "revisi" msgid "deepen history of shallow clone, excluding rev" msgstr "perdalam riwayat klon dangkal, tidak termasuk rev" -#: builtin/clone.c:137 builtin/submodule--helper.c:1844 -#: builtin/submodule--helper.c:2353 +#: builtin/clone.c:137 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "klon hanya satu cabang, HEAD atau --branch" @@ -12289,11 +12369,11 @@ msgstr "jangan klon tag apapun, dan buat pengambilan nanti tidak mengikutinya" msgid "any cloned submodules will be shallow" msgstr "submodul yang diklon akan dangkal" -#: builtin/clone.c:142 builtin/init-db.c:547 +#: builtin/clone.c:142 builtin/init-db.c:548 msgid "gitdir" msgstr "direktori git" -#: builtin/clone.c:143 builtin/init-db.c:548 +#: builtin/clone.c:143 builtin/init-db.c:549 msgid "separate git dir from working tree" msgstr "pisahkan direktori git dari pohon kerja" @@ -12306,22 +12386,22 @@ msgid "set config inside the new repository" msgstr "setel konfigurasi di dalam repositori baru" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 +#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196 msgid "server-specific" msgstr "spesifik ke server" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 +#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197 msgid "option to transmit" msgstr "opsi untuk transmisi" #: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 -#: builtin/push.c:585 +#: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "gunakan hanya alamat IPv4" #: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 -#: builtin/push.c:587 +#: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "gunakan hanya alamat IPv6" @@ -12422,7 +12502,7 @@ msgstr "tidak dapat memaket ulang untuk pembersihan" msgid "cannot unlink temporary alternates file" msgstr "tidak dapat batal-taut berkas alternatif sementara" -#: builtin/clone.c:1001 builtin/receive-pack.c:2491 +#: builtin/clone.c:1001 builtin/receive-pack.c:2490 msgid "Too many arguments." msgstr "Terlalu banyak argumen." @@ -12444,7 +12524,7 @@ msgstr "--bare dan --separate-git-dir tidak kompatibel." msgid "repository '%s' does not exist" msgstr "repositori '%s' tidak ada" -#: builtin/clone.c:1039 builtin/fetch.c:2011 +#: builtin/clone.c:1039 builtin/fetch.c:2014 #, c-format msgid "depth %s is not a positive number" msgstr "kedalaman %s bukan bilangan positif" @@ -12465,7 +12545,7 @@ msgid "working tree '%s' already exists." msgstr "pohon kerja '%s' sudah ada." #: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 -#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312 #, c-format msgid "could not create leading directories of '%s'" msgstr "tidak dapat membuat direktori pendahulu '%s'" @@ -12524,12 +12604,16 @@ msgstr "repositori sumber dangkal, abaikan --local" msgid "--local is ignored" msgstr "--local diabaikan" -#: builtin/clone.c:1337 builtin/clone.c:1345 +#: builtin/clone.c:1324 builtin/clone.c:1383 +msgid "remote transport reported error" +msgstr "transportasi remote melaporkan kesalahan" + +#: builtin/clone.c:1336 builtin/clone.c:1344 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Cabang remote %s tidak ditemukan di hulu %s" -#: builtin/clone.c:1348 +#: builtin/clone.c:1347 msgid "You appear to have cloned an empty repository." msgstr "Anda tampaknya mengklon repositori kosong." @@ -12583,7 +12667,7 @@ msgid "could not find object directory matching %s" msgstr "" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776 +#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779 msgid "dir" msgstr "" @@ -12675,7 +12759,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562 #, c-format msgid "not a valid object name %s" msgstr "" @@ -12703,13 +12787,13 @@ msgstr "" msgid "id of a parent commit object" msgstr "" -#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605 +#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601 #: builtin/tag.c:456 msgid "message" msgstr "" -#: builtin/commit-tree.c:115 builtin/commit.c:1614 +#: builtin/commit-tree.c:115 builtin/commit.c:1624 msgid "commit message" msgstr "" @@ -12717,7 +12801,7 @@ msgstr "" msgid "read commit log message from file" msgstr "" -#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299 +#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "" @@ -12866,7 +12950,7 @@ msgstr "" "tidak dapat memilih karakter komentar yang tidak terpakai\n" "dalam pesan komit saat ini" -#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158 +#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165 #, c-format msgid "could not lookup commit %s" msgstr "tidak dapat mencari komit %s" @@ -12902,7 +12986,45 @@ msgstr "tidak dapat membaca MERGE_MSG" msgid "could not write commit template" msgstr "tidak dapat menulis templat komit" -#: builtin/commit.c:900 +#: builtin/commit.c:893 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored.\n" +msgstr "" +"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n" +"dengan '%c' akan diabaikan.\n" + +#: builtin/commit.c:895 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n" +"dengan '%c' akan diabaikan, dan pesan kosong batalkan komit.\n" + +#: builtin/commit.c:899 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +msgstr "" +"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n" +"dengan '%c' akan tetap; Anda dapat menghapus itu jika Anda mau.\n" + +#: builtin/commit.c:903 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n" +"dengan '%c' akan tetap; Anda dapat menghapus itu jika Anda mau.\n" +"Pesan kosong batalkan komit.\n" + +#: builtin/commit.c:915 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -12916,7 +13038,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "dan coba lagi.\n" -#: builtin/commit.c:905 +#: builtin/commit.c:920 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -12930,195 +13052,175 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "dan coba lagi.\n" -#: builtin/commit.c:915 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be ignored, and an empty message aborts the commit.\n" -msgstr "" -"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n" -"dengan '%c' akan diabaikan, dan pesan kosong batalkan komit.\n" - -#: builtin/commit.c:923 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be kept; you may remove them yourself if you want to.\n" -"An empty message aborts the commit.\n" -msgstr "" -"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n" -"dengan '%c' akan tetap; Anda dapat menghapus itu jika Anda mau.\n" -"Pesan kosong batalkan komit.\n" - -#: builtin/commit.c:940 +#: builtin/commit.c:947 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sPengarang: %.*s <%.*s>" -#: builtin/commit.c:948 +#: builtin/commit.c:955 #, c-format msgid "%sDate: %s" msgstr "%sTanggal: %s" -#: builtin/commit.c:955 +#: builtin/commit.c:962 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sPengkomit: %.*s <%.*s>" -#: builtin/commit.c:973 +#: builtin/commit.c:980 msgid "Cannot read index" msgstr "Tidak dapat membaca indeks" -#: builtin/commit.c:1018 +#: builtin/commit.c:1025 msgid "unable to pass trailers to --trailers" msgstr "tidak dapat melewatkan trailer ke --trailers" -#: builtin/commit.c:1058 +#: builtin/commit.c:1065 msgid "Error building trees" msgstr "Kesalahan membangun pohon" -#: builtin/commit.c:1072 builtin/tag.c:319 +#: builtin/commit.c:1079 builtin/tag.c:319 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Mohon berikan pesan baik dengan opsi -m atau -F.\n" -#: builtin/commit.c:1116 +#: builtin/commit.c:1123 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' bukan 'Nama <email>' dan tidak cocok dengan pengarang yang ada" -#: builtin/commit.c:1130 +#: builtin/commit.c:1137 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Mode terabaikan '%s' tidak valid" -#: builtin/commit.c:1148 builtin/commit.c:1441 +#: builtin/commit.c:1155 builtin/commit.c:1448 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode berkas tak terlacak '%s' tidak valid" -#: builtin/commit.c:1188 +#: builtin/commit.c:1195 msgid "--long and -z are incompatible" msgstr "--long dan -z tidak kompatibel" -#: builtin/commit.c:1219 +#: builtin/commit.c:1226 msgid "You are in the middle of a merge -- cannot reword." msgstr "Anda berada di tengah penggabungan -- tidak dapat menulis ulang." -#: builtin/commit.c:1221 +#: builtin/commit.c:1228 msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "Anda berada di tengah pemetikan ceri -- tidak dapat menulis ulang." -#: builtin/commit.c:1224 +#: builtin/commit.c:1231 #, c-format msgid "cannot combine reword option of --fixup with path '%s'" msgstr "" "tidak dapat menggabungkan opsi penulisan ulang --fixup dengan jalur '%s'" -#: builtin/commit.c:1226 +#: builtin/commit.c:1233 msgid "" "reword option of --fixup is mutually exclusive with --patch/--interactive/--" "all/--include/--only" msgstr "" -#: builtin/commit.c:1245 +#: builtin/commit.c:1252 msgid "Using both --reset-author and --author does not make sense" msgstr "Menggunakan baik --reset-author dan --author tidak masuk akal" -#: builtin/commit.c:1254 +#: builtin/commit.c:1261 msgid "You have nothing to amend." msgstr "Anda tidak punya apapun untuk diubah." -#: builtin/commit.c:1257 +#: builtin/commit.c:1264 msgid "You are in the middle of a merge -- cannot amend." msgstr "Anda berada di tengah penggabungan -- tidak dapat mengubah." -#: builtin/commit.c:1259 +#: builtin/commit.c:1266 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Anda berada di tengah pemetikan ceri -- tidak dapat mengubah." -#: builtin/commit.c:1261 +#: builtin/commit.c:1268 msgid "You are in the middle of a rebase -- cannot amend." msgstr "Anda berada di tengah pendasaran ulang -- tidak dapat mengubah." -#: builtin/commit.c:1264 +#: builtin/commit.c:1271 msgid "Options --squash and --fixup cannot be used together" msgstr "Opsi --squash dan --fixup tidak dapat digunakan bersamaan" -#: builtin/commit.c:1274 +#: builtin/commit.c:1281 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Hanya salah satu dari -c/-C/-F/--fixup yang dapat digunakan." -#: builtin/commit.c:1276 +#: builtin/commit.c:1283 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Opsi -m tidak dapat digabung dengan -c/-C/-F." -#: builtin/commit.c:1285 +#: builtin/commit.c:1292 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author hanya dapat digunakan dengan -C, -c atau --amend." -#: builtin/commit.c:1303 +#: builtin/commit.c:1310 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Hanya salah satu dari --include/--only/--all/--interactive/--patch yang " "dapat digunakan." -#: builtin/commit.c:1331 +#: builtin/commit.c:1338 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "" -#: builtin/commit.c:1345 +#: builtin/commit.c:1352 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "jalur '%s ...' dengan -a tidak masuk akal" -#: builtin/commit.c:1476 builtin/commit.c:1642 +#: builtin/commit.c:1483 builtin/commit.c:1652 msgid "show status concisely" msgstr "perlihatkan status dengan ringkas" -#: builtin/commit.c:1478 builtin/commit.c:1644 +#: builtin/commit.c:1485 builtin/commit.c:1654 msgid "show branch information" msgstr "perlihatkan informasi cabang" -#: builtin/commit.c:1480 +#: builtin/commit.c:1487 msgid "show stash information" msgstr "perlihatkan informasi stase" -#: builtin/commit.c:1482 builtin/commit.c:1646 +#: builtin/commit.c:1489 builtin/commit.c:1656 msgid "compute full ahead/behind values" msgstr "hitung nilai didepan/dibelakang penuh" -#: builtin/commit.c:1484 +#: builtin/commit.c:1491 msgid "version" msgstr "versi" -#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560 -#: builtin/worktree.c:681 +#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551 +#: builtin/worktree.c:690 msgid "machine-readable output" msgstr "keluaran yang dapat dibaca mesin" -#: builtin/commit.c:1487 builtin/commit.c:1650 +#: builtin/commit.c:1494 builtin/commit.c:1660 msgid "show status in long format (default)" msgstr "perlihatkan status dalam format panjang (asali)" -#: builtin/commit.c:1490 builtin/commit.c:1653 +#: builtin/commit.c:1497 builtin/commit.c:1663 msgid "terminate entries with NUL" msgstr "akhiri entri dengan NUL" -#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656 +#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666 #: builtin/fast-export.c:1198 builtin/fast-export.c:1201 #: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 msgid "mode" msgstr "mode" -#: builtin/commit.c:1493 builtin/commit.c:1656 +#: builtin/commit.c:1500 builtin/commit.c:1666 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "perlihatkan berkas tak terlacak, mode opsional: all, normal, no. (Asali: all)" -#: builtin/commit.c:1497 +#: builtin/commit.c:1504 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13126,11 +13228,11 @@ msgstr "" "perlihatkan berkas terabaikan, mode opsional: traditional, matching, no. " "(Asali: traditional)" -#: builtin/commit.c:1499 parse-options.h:193 +#: builtin/commit.c:1506 parse-options.h:193 msgid "when" msgstr "bila" -#: builtin/commit.c:1500 +#: builtin/commit.c:1507 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -13138,192 +13240,192 @@ msgstr "" "abaikan perubahan submodul, bila opsional: all, dirty, untracked. (Asali: " "all)" -#: builtin/commit.c:1502 +#: builtin/commit.c:1509 msgid "list untracked files in columns" msgstr "sebut berkas tak terlacak dalam kolom" -#: builtin/commit.c:1503 +#: builtin/commit.c:1510 msgid "do not detect renames" msgstr "jangan deteksi penggantian nama" -#: builtin/commit.c:1505 +#: builtin/commit.c:1512 msgid "detect renames, optionally set similarity index" msgstr "deteksi penggantian nama, setel indeks kemiripan secara opsional" -#: builtin/commit.c:1525 +#: builtin/commit.c:1535 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "Kombinasi argumen berkas terabaikan dan tak terlacak tidak didukung" -#: builtin/commit.c:1607 +#: builtin/commit.c:1617 msgid "suppress summary after successful commit" msgstr "sembunyikan rangkuman setelah komit berhasil" -#: builtin/commit.c:1608 +#: builtin/commit.c:1618 msgid "show diff in commit message template" msgstr "perlihatkan diff dalam templat pesan komit" -#: builtin/commit.c:1610 +#: builtin/commit.c:1620 msgid "Commit message options" msgstr "Opsi pesan komit" -#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458 +#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458 msgid "read message from file" msgstr "Baca pesan dari berkas" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "author" msgstr "pengarang" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "override author for commit" msgstr "timpa pengarang komit" -#: builtin/commit.c:1613 builtin/gc.c:550 +#: builtin/commit.c:1623 builtin/gc.c:550 msgid "date" msgstr "tangal" -#: builtin/commit.c:1613 +#: builtin/commit.c:1623 msgid "override date for commit" msgstr "timpa tanggal komit" -#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622 +#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632 #: parse-options.h:329 ref-filter.h:90 msgid "commit" msgstr "komit" -#: builtin/commit.c:1615 +#: builtin/commit.c:1625 msgid "reuse and edit message from specified commit" msgstr "gunakan kembali dan sunting pesan dari komit tersebut" -#: builtin/commit.c:1616 +#: builtin/commit.c:1626 msgid "reuse message from specified commit" msgstr "gunakan kembali pesan dari komit tersebut" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c:1621 +#: builtin/commit.c:1631 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]komit" -#: builtin/commit.c:1621 +#: builtin/commit.c:1631 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" "gunakan pesan terformat autosquash untuk perbaiki atau ubah/tulis ulang " "komit yang disebutkan" -#: builtin/commit.c:1622 +#: builtin/commit.c:1632 msgid "use autosquash formatted message to squash specified commit" msgstr "gunakan pesan terformat autosquash untuk lumat komit tersebut" -#: builtin/commit.c:1623 +#: builtin/commit.c:1633 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "komit sekarang dikarang olehku (gunakan dengan -C/-c/--amend)" -#: builtin/commit.c:1624 builtin/interpret-trailers.c:111 +#: builtin/commit.c:1634 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "" -#: builtin/commit.c:1624 +#: builtin/commit.c:1634 msgid "add custom trailer(s)" msgstr "" -#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302 +#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "tambahkan trailer Signed-off-by" -#: builtin/commit.c:1626 +#: builtin/commit.c:1636 msgid "use specified template file" msgstr "gunakan templat berkas tersebut" -#: builtin/commit.c:1627 +#: builtin/commit.c:1637 msgid "force edit of commit" msgstr "paksa sunting komit" -#: builtin/commit.c:1629 +#: builtin/commit.c:1639 msgid "include status in commit message template" msgstr "masukkan status dalam templat pesaan komit" -#: builtin/commit.c:1634 +#: builtin/commit.c:1644 msgid "Commit contents options" msgstr "Opsi isi komit" -#: builtin/commit.c:1635 +#: builtin/commit.c:1645 msgid "commit all changed files" msgstr "komit semua berkas terubah" -#: builtin/commit.c:1636 +#: builtin/commit.c:1646 msgid "add specified files to index for commit" msgstr "tambahakn berkas tersebut ke indeks untuk dikomit" -#: builtin/commit.c:1637 +#: builtin/commit.c:1647 msgid "interactively add files" msgstr "tambah berkas secara interaktif" -#: builtin/commit.c:1638 +#: builtin/commit.c:1648 msgid "interactively add changes" msgstr "tambah perubahan secara interaktif" -#: builtin/commit.c:1639 +#: builtin/commit.c:1649 msgid "commit only specified files" msgstr "hanya komit berkas tersebut" -#: builtin/commit.c:1640 +#: builtin/commit.c:1650 msgid "bypass pre-commit and commit-msg hooks" msgstr "lewati hook pre-commit dan commit-msg" -#: builtin/commit.c:1641 +#: builtin/commit.c:1651 msgid "show what would be committed" msgstr "perlihatkan apa yang akan dikomit" -#: builtin/commit.c:1654 +#: builtin/commit.c:1664 msgid "amend previous commit" msgstr "ubah komit sebelumnya" -#: builtin/commit.c:1655 +#: builtin/commit.c:1665 msgid "bypass post-rewrite hook" msgstr "lewati hook post-rewrite" -#: builtin/commit.c:1662 +#: builtin/commit.c:1672 msgid "ok to record an empty change" msgstr "ok merekam perubahan kosong" -#: builtin/commit.c:1664 +#: builtin/commit.c:1674 msgid "ok to record a change with an empty message" msgstr "ok merekam perubahan dengan pesan kosong" -#: builtin/commit.c:1737 +#: builtin/commit.c:1747 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Berkas MERGE_HEAD (%s) rusak" -#: builtin/commit.c:1744 +#: builtin/commit.c:1754 msgid "could not read MERGE_MODE" msgstr "tidak dapat membaca MERGE_MODE" -#: builtin/commit.c:1765 +#: builtin/commit.c:1775 #, c-format msgid "could not read commit message: %s" msgstr "tidak dapat membaca pesan komit: %s" -#: builtin/commit.c:1772 +#: builtin/commit.c:1782 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Batalkan komit karena pesan komit kosong.\n" -#: builtin/commit.c:1777 +#: builtin/commit.c:1787 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Batalkan komit; Anda tidak menyunting pesan.\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1798 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "Batalkan komit karena badan pesan komit kosong.\n" -#: builtin/commit.c:1824 +#: builtin/commit.c:1834 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -13695,48 +13797,48 @@ msgstr "" #: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" -msgstr "" +msgstr "git describe [<opsi>] [<mirip-komit>...]" #: builtin/describe.c:27 msgid "git describe [<options>] --dirty" -msgstr "" +msgstr "git describe [<opsi>] --dirty" #: builtin/describe.c:63 msgid "head" -msgstr "" +msgstr "kepala" #: builtin/describe.c:63 msgid "lightweight" -msgstr "" +msgstr "ringan" #: builtin/describe.c:63 msgid "annotated" -msgstr "" +msgstr "teranotasi" #: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" -msgstr "" +msgstr "tag teranotasi %s tidak tersedia" #: builtin/describe.c:281 #, c-format msgid "tag '%s' is externally known as '%s'" -msgstr "" +msgstr "tag '%s' dikenal luar sebagai '%s'" #: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" -msgstr "" +msgstr "tidak ada tag yang tepat cocok dengan '%s'" #: builtin/describe.c:330 #, c-format msgid "No exact match on refs or tags, searching to describe\n" -msgstr "" +msgstr "tidak ada kecocokan eksak pada referensi atau tag, mencari untuk menjelaskan \n" #: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" -msgstr "" +msgstr "selesai mencari pada %s\n" #: builtin/describe.c:424 #, c-format @@ -13744,6 +13846,8 @@ msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" +"Tidak ada tag teranotasi yang dapat menjelaskan '%s'.\n" +"Bagaimanapun, ada tag tak teranotasi: coba --tags." #: builtin/describe.c:428 #, c-format @@ -13751,11 +13855,13 @@ msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" +"Tidak ada tag yang dapat menjelaskan '%s'\n" +"Coba --always, atau buat beberapa tag." #: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" -msgstr "" +msgstr "%lu komit dilintasi\n" #: builtin/describe.c:461 #, c-format @@ -13763,140 +13869,142 @@ msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" +"lebih dari %i tag ditemukan; %i terbaru didaftarkan\n" +"menyerah mencari pada %s\n" #: builtin/describe.c:529 #, c-format msgid "describe %s\n" -msgstr "" +msgstr "jelaskan %s\n" #: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" -msgstr "" +msgstr "Bukan nama objek yang valid %s" #: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" -msgstr "" +msgstr "%s bukan sebuah komit atau blob" #: builtin/describe.c:554 msgid "find the tag that comes after the commit" -msgstr "" +msgstr "temukan tag yang datang setelah komit" #: builtin/describe.c:555 msgid "debug search strategy on stderr" -msgstr "" +msgstr "debug strategi pencarian pada keluaran standar" #: builtin/describe.c:556 msgid "use any ref" -msgstr "" +msgstr "gunakan referensi apapun" #: builtin/describe.c:557 msgid "use any tag, even unannotated" -msgstr "" +msgstr "gunakan tag apapun, bahkan tak teranotasi" #: builtin/describe.c:558 msgid "always use long format" -msgstr "" +msgstr "selalu gunakan format panjang" #: builtin/describe.c:559 msgid "only follow first parent" -msgstr "" +msgstr "hanya ikuti induk pertama" #: builtin/describe.c:562 msgid "only output exact matches" -msgstr "" +msgstr "hanya keluarkan kecocokan eksak" #: builtin/describe.c:564 msgid "consider <n> most recent tags (default: 10)" -msgstr "" +msgstr "pertimbangkan <n> tag terbaru (asali: 10)" #: builtin/describe.c:566 msgid "only consider tags matching <pattern>" -msgstr "" +msgstr "hanya pertimbangkan tag yang cocok dengan <pola>" #: builtin/describe.c:568 msgid "do not consider tags matching <pattern>" -msgstr "" +msgstr "jangan pertimbangkan tag yang cocok dengan <pola>" #: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" -msgstr "" +msgstr "perlihatkan objek komit singkat sebagai langkah terakhir" #: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" -msgstr "" +msgstr "tanda" #: builtin/describe.c:572 msgid "append <mark> on dirty working tree (default: \"-dirty\")" -msgstr "" +msgstr "tambahkan <tanda> pada direktori kerja kotor (asali: \"-dirty\")" #: builtin/describe.c:575 msgid "append <mark> on broken working tree (default: \"-broken\")" -msgstr "" +msgstr "tambahkan <tanda> pada direktori kerja rusak (asali: \"-broken\")" #: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" -msgstr "" +msgstr "--long tidak kompatibel dengan --abbrev=0" #: builtin/describe.c:622 msgid "No names found, cannot describe anything." -msgstr "" +msgstr "Tidak ada nama yang ditemukan, tidak dapat menjelaskan apapun." #: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" -msgstr "" +msgstr "--dirty tidak kompatibel dengan mirip-komit" #: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" -msgstr "" +msgstr "--broken tidak kompatibel dengan mirip-komit" #: builtin/diff-tree.c:155 msgid "--stdin and --merge-base are mutually exclusive" -msgstr "" +msgstr "--stdin dan --merge-base saling eksklusif" #: builtin/diff-tree.c:157 msgid "--merge-base only works with two commits" -msgstr "" +msgstr "--merge-base hanya bekerja dengan dua komit" #: builtin/diff.c:92 #, c-format msgid "'%s': not a regular file or symlink" -msgstr "" +msgstr "'%s': bukan berkas reguler atau tautan simbolik" #: builtin/diff.c:259 #, c-format msgid "invalid option: %s" -msgstr "" +msgstr "opsi tidak valid: %s" #: builtin/diff.c:376 #, c-format msgid "%s...%s: no merge base" -msgstr "" +msgstr "%s...%s: tidak ada dasar penggabungan" #: builtin/diff.c:486 msgid "Not a git repository" -msgstr "" +msgstr "bukan repositori git" #: builtin/diff.c:532 builtin/grep.c:684 #, c-format msgid "invalid object '%s' given." -msgstr "" +msgstr "objek yang diberikan '%s' tidak valid" #: builtin/diff.c:543 #, c-format msgid "more than two blobs given: '%s'" -msgstr "" +msgstr "lebih dari dua blob diberikan: '%s'" #: builtin/diff.c:548 #, c-format msgid "unhandled object '%s' given." -msgstr "" +msgstr "objek tak tertangani '%s' diberikan" #: builtin/diff.c:582 #, c-format msgid "%s...%s: multiple merge bases, using %s" -msgstr "" +msgstr "%s...%s: banyak dasar penggabungan, menggunakan %s" #: builtin/difftool.c:31 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" @@ -13946,65 +14054,65 @@ msgstr "" msgid "you may want to cleanup or recover these." msgstr "" -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "" -#: builtin/difftool.c:702 +#: builtin/difftool.c:701 msgid "perform a full-directory diff" msgstr "" -#: builtin/difftool.c:704 +#: builtin/difftool.c:703 msgid "do not prompt before launching a diff tool" msgstr "" -#: builtin/difftool.c:709 +#: builtin/difftool.c:708 msgid "use symlinks in dir-diff mode" msgstr "" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "tool" msgstr "" -#: builtin/difftool.c:711 +#: builtin/difftool.c:710 msgid "use the specified diff tool" msgstr "" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" -#: builtin/difftool.c:719 +#: builtin/difftool.c:718 msgid "specify a custom command for viewing diffs" msgstr "" -#: builtin/difftool.c:720 +#: builtin/difftool.c:719 msgid "passed to `diff`" msgstr "" -#: builtin/difftool.c:735 +#: builtin/difftool.c:734 msgid "difftool requires worktree or --no-index" msgstr "" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 msgid "--dir-diff is incompatible with --no-index" msgstr "" -#: builtin/difftool.c:745 +#: builtin/difftool.c:744 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "" -#: builtin/difftool.c:753 +#: builtin/difftool.c:752 msgid "no <tool> given for --tool=<tool>" msgstr "" -#: builtin/difftool.c:760 +#: builtin/difftool.c:759 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "" @@ -14092,7 +14200,7 @@ msgstr "" msgid "skip output of blob data" msgstr "" -#: builtin/fast-export.c:1222 builtin/log.c:1823 +#: builtin/fast-export.c:1222 builtin/log.c:1826 msgid "refspec" msgstr "" @@ -14410,7 +14518,7 @@ msgstr "%s tidak mengirim semua objek yang diperlukan\n" #: builtin/fetch.c:1129 #, c-format -msgid "reject %s because shallow roots are not allowed to be updated" +msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "tolak %s karena akar dangkal tidak diperkenankan untuk diperbarui" #: builtin/fetch.c:1206 builtin/fetch.c:1357 @@ -14511,48 +14619,52 @@ msgstr "" msgid "You need to specify a tag name." msgstr "Anda perlu sebutkan nama tag" -#: builtin/fetch.c:1995 +#: builtin/fetch.c:1994 +msgid "--negotiate-only needs one or more --negotiate-tip=*" +msgstr "--negotiate-only perlu satu atau lebih --negotiate-tip=*" + +#: builtin/fetch.c:1998 msgid "Negative depth in --deepen is not supported" msgstr "Kedalaman negatif di --deepen tidak didukung" -#: builtin/fetch.c:1997 +#: builtin/fetch.c:2000 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen dan --depth saling eksklusif" -#: builtin/fetch.c:2002 +#: builtin/fetch.c:2005 msgid "--depth and --unshallow cannot be used together" msgstr "--depth dan --unshallow tidak dapat digunakan bersamaan" -#: builtin/fetch.c:2004 +#: builtin/fetch.c:2007 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow pada repositori penuh tidak masuk akal" -#: builtin/fetch.c:2021 +#: builtin/fetch.c:2024 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tidak mengambil argumen repositori" -#: builtin/fetch.c:2023 +#: builtin/fetch.c:2026 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all tidak masuk akal dengan spek referensi" -#: builtin/fetch.c:2032 +#: builtin/fetch.c:2035 #, c-format msgid "No such remote or remote group: %s" msgstr "tidak ada remote atau grup remote seperti itu: %s" -#: builtin/fetch.c:2039 +#: builtin/fetch.c:2042 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Ambil grup dan sebutkan spek referensi tidak masuk akal" -#: builtin/fetch.c:2055 +#: builtin/fetch.c:2058 msgid "must supply remote when using --negotiate-only" msgstr "" -#: builtin/fetch.c:2060 +#: builtin/fetch.c:2063 msgid "Protocol does not support --negotiate-only, exiting." msgstr "" -#: builtin/fetch.c:2079 +#: builtin/fetch.c:2082 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -14560,11 +14672,11 @@ msgstr "" "--filter hanya dapat digunakan dengan remote yang terkonfigurasi di " "extensions.partialclone" -#: builtin/fetch.c:2083 +#: builtin/fetch.c:2086 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic hanya dapat digunakan saat mengambil dari satu remote" -#: builtin/fetch.c:2087 +#: builtin/fetch.c:2090 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin hanya dapat digunakan saat mengambil dari satu remote" @@ -14669,7 +14781,7 @@ msgstr "" msgid "missing --config=<config>" msgstr "" -#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128 +#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129 msgid "unknown" msgstr "" @@ -14685,227 +14797,227 @@ msgstr "" msgid "warning in %s %s: %s" msgstr "" -#: builtin/fsck.c:123 builtin/fsck.c:126 +#: builtin/fsck.c:124 builtin/fsck.c:127 #, c-format msgid "broken link from %7s %s" msgstr "" -#: builtin/fsck.c:135 +#: builtin/fsck.c:136 msgid "wrong object type in link" msgstr "" -#: builtin/fsck.c:151 +#: builtin/fsck.c:152 #, c-format msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" -#: builtin/fsck.c:263 +#: builtin/fsck.c:264 #, c-format msgid "missing %s %s" msgstr "" -#: builtin/fsck.c:290 +#: builtin/fsck.c:291 #, c-format msgid "unreachable %s %s" msgstr "" -#: builtin/fsck.c:310 +#: builtin/fsck.c:311 #, c-format msgid "dangling %s %s" msgstr "" -#: builtin/fsck.c:320 +#: builtin/fsck.c:321 msgid "could not create lost-found" msgstr "" -#: builtin/fsck.c:331 +#: builtin/fsck.c:332 #, c-format msgid "could not finish '%s'" msgstr "" -#: builtin/fsck.c:348 +#: builtin/fsck.c:349 #, c-format msgid "Checking %s" msgstr "" -#: builtin/fsck.c:386 +#: builtin/fsck.c:387 #, c-format msgid "Checking connectivity (%d objects)" msgstr "" -#: builtin/fsck.c:405 +#: builtin/fsck.c:406 #, c-format msgid "Checking %s %s" msgstr "" -#: builtin/fsck.c:410 +#: builtin/fsck.c:411 msgid "broken links" msgstr "" -#: builtin/fsck.c:419 +#: builtin/fsck.c:420 #, c-format msgid "root %s" msgstr "" -#: builtin/fsck.c:427 +#: builtin/fsck.c:428 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "" -#: builtin/fsck.c:456 +#: builtin/fsck.c:457 #, c-format msgid "%s: object corrupt or missing" msgstr "" -#: builtin/fsck.c:481 +#: builtin/fsck.c:482 #, c-format msgid "%s: invalid reflog entry %s" msgstr "" -#: builtin/fsck.c:495 +#: builtin/fsck.c:496 #, c-format msgid "Checking reflog %s->%s" msgstr "" -#: builtin/fsck.c:529 +#: builtin/fsck.c:530 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "" -#: builtin/fsck.c:536 +#: builtin/fsck.c:537 #, c-format msgid "%s: not a commit" msgstr "" -#: builtin/fsck.c:590 +#: builtin/fsck.c:591 msgid "notice: No default references" msgstr "" -#: builtin/fsck.c:605 +#: builtin/fsck.c:606 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "" -#: builtin/fsck.c:618 +#: builtin/fsck.c:619 #, c-format msgid "%s: object could not be parsed: %s" msgstr "" -#: builtin/fsck.c:638 +#: builtin/fsck.c:639 #, c-format msgid "bad sha1 file: %s" msgstr "" -#: builtin/fsck.c:653 +#: builtin/fsck.c:654 msgid "Checking object directory" msgstr "" -#: builtin/fsck.c:656 +#: builtin/fsck.c:657 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:671 +#: builtin/fsck.c:672 #, c-format msgid "Checking %s link" msgstr "" -#: builtin/fsck.c:676 builtin/index-pack.c:866 +#: builtin/fsck.c:677 builtin/index-pack.c:864 #, c-format msgid "invalid %s" msgstr "%s tidak valid" -#: builtin/fsck.c:683 +#: builtin/fsck.c:684 #, c-format msgid "%s points to something strange (%s)" msgstr "" -#: builtin/fsck.c:689 +#: builtin/fsck.c:690 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "" -#: builtin/fsck.c:693 +#: builtin/fsck.c:694 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "" -#: builtin/fsck.c:705 +#: builtin/fsck.c:706 msgid "Checking cache tree" msgstr "" -#: builtin/fsck.c:710 +#: builtin/fsck.c:711 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "" -#: builtin/fsck.c:719 +#: builtin/fsck.c:720 msgid "non-tree in cache-tree" msgstr "" -#: builtin/fsck.c:750 +#: builtin/fsck.c:751 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:756 +#: builtin/fsck.c:757 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:757 +#: builtin/fsck.c:758 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:758 +#: builtin/fsck.c:759 msgid "report tags" msgstr "" -#: builtin/fsck.c:759 +#: builtin/fsck.c:760 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:760 +#: builtin/fsck.c:761 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:761 +#: builtin/fsck.c:762 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:762 +#: builtin/fsck.c:763 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:763 +#: builtin/fsck.c:764 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:764 builtin/mktag.c:75 +#: builtin/fsck.c:765 builtin/mktag.c:75 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:766 +#: builtin/fsck.c:767 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:767 builtin/prune.c:134 +#: builtin/fsck.c:768 builtin/prune.c:134 msgid "show progress" msgstr "" -#: builtin/fsck.c:768 +#: builtin/fsck.c:769 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:827 builtin/index-pack.c:262 +#: builtin/fsck.c:828 builtin/index-pack.c:262 msgid "Checking objects" msgstr "Memeriksa objek" -#: builtin/fsck.c:855 +#: builtin/fsck.c:856 #, c-format msgid "%s: object missing" msgstr "" -#: builtin/fsck.c:866 +#: builtin/fsck.c:867 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "" @@ -15161,24 +15273,24 @@ msgstr "" #: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "" +msgstr "git grep [<opsi>] [-e] <pola> [<revisi>...] [[--] <pola>...]" #: builtin/grep.c:223 #, c-format msgid "grep: failed to create thread: %s" -msgstr "" +msgstr "grep: gagal membuat utas: %s" #: builtin/grep.c:277 #, c-format msgid "invalid number of threads specified (%d) for %s" -msgstr "" +msgstr "jumlah utas yang diberikan (%d) tidak valid untuk %s" #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793 -#: builtin/pack-objects.c:2969 +#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791 +#: builtin/pack-objects.c:3129 #, c-format msgid "no threads support, ignoring %s" msgstr "tidak ada dukungan utas, abaikan %s" @@ -15186,251 +15298,251 @@ msgstr "tidak ada dukungan utas, abaikan %s" #: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643 #, c-format msgid "unable to read tree (%s)" -msgstr "" +msgstr "tidak dapat membaca pohon (%s)" #: builtin/grep.c:658 #, c-format msgid "unable to grep from object of type %s" -msgstr "" +msgstr "tidak dapan men-grep dari objek dengan tipe %s" -#: builtin/grep.c:739 +#: builtin/grep.c:738 #, c-format msgid "switch `%c' expects a numerical value" -msgstr "" +msgstr "saklar '%c' mengharapkan nilai numerik" -#: builtin/grep.c:838 +#: builtin/grep.c:837 msgid "search in index instead of in the work tree" -msgstr "" +msgstr "cari dalam index daripada dalam pohon kerja" -#: builtin/grep.c:840 +#: builtin/grep.c:839 msgid "find in contents not managed by git" -msgstr "" +msgstr "temukan dalam konten yang tak dikelola oleh git" -#: builtin/grep.c:842 +#: builtin/grep.c:841 msgid "search in both tracked and untracked files" -msgstr "" +msgstr "cari dalam berkas terlacak dan tak terlacak" -#: builtin/grep.c:844 +#: builtin/grep.c:843 msgid "ignore files specified via '.gitignore'" -msgstr "" +msgstr "abaikan berkas yang disebutkan via '.gitignore'" -#: builtin/grep.c:846 +#: builtin/grep.c:845 msgid "recursively search in each submodule" -msgstr "" +msgstr "cari secara rekursif dalam setiap submodul" -#: builtin/grep.c:849 +#: builtin/grep.c:848 msgid "show non-matching lines" -msgstr "" +msgstr "perlihatkan baris nir-cocok" -#: builtin/grep.c:851 +#: builtin/grep.c:850 msgid "case insensitive matching" -msgstr "" +msgstr "pencocokan tak peka kapital" -#: builtin/grep.c:853 +#: builtin/grep.c:852 msgid "match patterns only at word boundaries" -msgstr "" +msgstr "cocokkan pola hanya pada batas kata" -#: builtin/grep.c:855 +#: builtin/grep.c:854 msgid "process binary files as text" -msgstr "" +msgstr "proses berkas biner sebagai teks" -#: builtin/grep.c:857 +#: builtin/grep.c:856 msgid "don't match patterns in binary files" -msgstr "" +msgstr "jangan cocokkan pola pada berkas biner" -#: builtin/grep.c:860 +#: builtin/grep.c:859 msgid "process binary files with textconv filters" -msgstr "" +msgstr "proses berkas biner dengan saringan textconv" -#: builtin/grep.c:862 +#: builtin/grep.c:861 msgid "search in subdirectories (default)" -msgstr "" +msgstr "cari dalam subdirektori (asali)" -#: builtin/grep.c:864 +#: builtin/grep.c:863 msgid "descend at most <depth> levels" -msgstr "" +msgstr "turun paling banyak <kedalaman> tingkat" -#: builtin/grep.c:868 +#: builtin/grep.c:867 msgid "use extended POSIX regular expressions" -msgstr "" +msgstr "gunakan ekspresi reguler POSIX diperpanjang" -#: builtin/grep.c:871 +#: builtin/grep.c:870 msgid "use basic POSIX regular expressions (default)" -msgstr "" +msgstr "gunakan ekspresi reguler POSIX dasar (asali)" -#: builtin/grep.c:874 +#: builtin/grep.c:873 msgid "interpret patterns as fixed strings" -msgstr "" +msgstr "tafsirkan pola sebagai untai tetap" -#: builtin/grep.c:877 +#: builtin/grep.c:876 msgid "use Perl-compatible regular expressions" -msgstr "" +msgstr "gunakan ekspresi reguler kompatibel dengan Perl" -#: builtin/grep.c:880 +#: builtin/grep.c:879 msgid "show line numbers" -msgstr "" +msgstr "perlihatkan nomor baris" -#: builtin/grep.c:881 +#: builtin/grep.c:880 msgid "show column number of first match" -msgstr "" +msgstr "perlihatkan nomor kolom cocokan pertama" -#: builtin/grep.c:882 +#: builtin/grep.c:881 msgid "don't show filenames" -msgstr "" +msgstr "jangan perlihatkan nama berkas" -#: builtin/grep.c:883 +#: builtin/grep.c:882 msgid "show filenames" -msgstr "" +msgstr "perlihatkan nama berkas" -#: builtin/grep.c:885 +#: builtin/grep.c:884 msgid "show filenames relative to top directory" -msgstr "" +msgstr "perlihatkan nama berkas relatif terhadap direktori puncak" -#: builtin/grep.c:887 +#: builtin/grep.c:886 msgid "show only filenames instead of matching lines" -msgstr "" +msgstr "hanya perlihatkan nama berkas daripada baris yang cocok" -#: builtin/grep.c:889 +#: builtin/grep.c:888 msgid "synonym for --files-with-matches" -msgstr "" +msgstr "sinonim untuk --files-with-matches" -#: builtin/grep.c:892 +#: builtin/grep.c:891 msgid "show only the names of files without match" -msgstr "" +msgstr "hanya perlihatkan nama berkas tanpa cocok" -#: builtin/grep.c:894 +#: builtin/grep.c:893 msgid "print NUL after filenames" -msgstr "" +msgstr "cetak NUL setelah nama berkas" -#: builtin/grep.c:897 +#: builtin/grep.c:896 msgid "show only matching parts of a line" -msgstr "" +msgstr "hanya perlihatkan bagian cocokan baris" -#: builtin/grep.c:899 +#: builtin/grep.c:898 msgid "show the number of matches instead of matching lines" -msgstr "" +msgstr "perlihatkan jumlah cocokan daripada baris yang cocok" -#: builtin/grep.c:900 +#: builtin/grep.c:899 msgid "highlight matches" -msgstr "" +msgstr "sorot cocokan" -#: builtin/grep.c:902 +#: builtin/grep.c:901 msgid "print empty line between matches from different files" -msgstr "" +msgstr "cetak baris kosong di antara cocokan dari berkas yang berbeda" -#: builtin/grep.c:904 +#: builtin/grep.c:903 msgid "show filename only once above matches from same file" -msgstr "" +msgstr "perlihatkan nama berkas hanya sekali di atas cocokan dari berkas yang sama" -#: builtin/grep.c:907 +#: builtin/grep.c:906 msgid "show <n> context lines before and after matches" -msgstr "" +msgstr "perlihatkan <n> baris konteks sebelum dan sesudah cocokan" -#: builtin/grep.c:910 +#: builtin/grep.c:909 msgid "show <n> context lines before matches" -msgstr "" +msgstr "perlihatkan <n> baris konteks sebelum cocokan" -#: builtin/grep.c:912 +#: builtin/grep.c:911 msgid "show <n> context lines after matches" -msgstr "" +msgstr "perlihatkan <n> baris konteks setelah cocokan" -#: builtin/grep.c:914 +#: builtin/grep.c:913 msgid "use <n> worker threads" -msgstr "" +msgstr "gunakan <n> utas pekerja" -#: builtin/grep.c:915 +#: builtin/grep.c:914 msgid "shortcut for -C NUM" -msgstr "" +msgstr "pintasan untuk -C NUM" -#: builtin/grep.c:918 +#: builtin/grep.c:917 msgid "show a line with the function name before matches" -msgstr "" +msgstr "perlihatkan sebuah baris dengan nama fungsi sebelum cocokan" -#: builtin/grep.c:920 +#: builtin/grep.c:919 msgid "show the surrounding function" -msgstr "" +msgstr "perlihatkan fungsi di sekitar" -#: builtin/grep.c:923 +#: builtin/grep.c:922 msgid "read patterns from file" -msgstr "" +msgstr "baca pola dari berkas" -#: builtin/grep.c:925 +#: builtin/grep.c:924 msgid "match <pattern>" -msgstr "" +msgstr "cocokkan <pola>" -#: builtin/grep.c:927 +#: builtin/grep.c:926 msgid "combine patterns specified with -e" -msgstr "" +msgstr "kombinasikan pola yang disebutkan dengan -e" -#: builtin/grep.c:939 +#: builtin/grep.c:938 msgid "indicate hit with exit status without output" -msgstr "" +msgstr "tunjukkan kena dengan status keluar tanpa keluaran" -#: builtin/grep.c:941 +#: builtin/grep.c:940 msgid "show only matches from files that match all patterns" -msgstr "" +msgstr "hanya perlihatkan cocokan dari berkas yang cocok dengan semua pola" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "pager" -msgstr "" +msgstr "penghalaman" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "show matching files in the pager" -msgstr "" +msgstr "perlihatkan berkas yang cocok dalam penghalaman" -#: builtin/grep.c:948 +#: builtin/grep.c:947 msgid "allow calling of grep(1) (ignored by this build)" -msgstr "" +msgstr "perbolehkan pemanggilan grep(1) (diabaikan oleh bangunan ini)" -#: builtin/grep.c:1014 +#: builtin/grep.c:1013 msgid "no pattern given" -msgstr "" +msgstr "tidak ada pola yang diberikan" -#: builtin/grep.c:1050 +#: builtin/grep.c:1049 msgid "--no-index or --untracked cannot be used with revs" -msgstr "" +msgstr "--no-index atau --untracked tidak dapat digunakan dengan revisi" -#: builtin/grep.c:1058 +#: builtin/grep.c:1057 #, c-format msgid "unable to resolve revision: %s" -msgstr "" +msgstr "tidak dapat menguraikan revisi: %s" -#: builtin/grep.c:1088 +#: builtin/grep.c:1087 msgid "--untracked not supported with --recurse-submodules" -msgstr "" +msgstr "--untracked tidak didukung dengan --recurse-submodules" -#: builtin/grep.c:1092 +#: builtin/grep.c:1091 msgid "invalid option combination, ignoring --threads" -msgstr "" +msgstr "kombinasi opsi tidak valid, abaikan --threads" -#: builtin/grep.c:1095 builtin/pack-objects.c:3930 +#: builtin/grep.c:1094 builtin/pack-objects.c:4090 msgid "no threads support, ignoring --threads" -msgstr "" +msgstr "tidak ada dukungan utas, abaikan --threads" -#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966 +#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126 #, c-format msgid "invalid number of threads specified (%d)" msgstr "jumlah utas tersebut (%d) tidak valid" -#: builtin/grep.c:1132 +#: builtin/grep.c:1131 msgid "--open-files-in-pager only works on the worktree" -msgstr "" +msgstr "--open-files-in-pager hanya bekerja pada pohon kerja" -#: builtin/grep.c:1158 +#: builtin/grep.c:1157 msgid "--cached or --untracked cannot be used with --no-index" -msgstr "" +msgstr "--cached atau --untracked tidak dapat digunakan dengan --no-index" -#: builtin/grep.c:1161 +#: builtin/grep.c:1160 msgid "--untracked cannot be used with --cached" -msgstr "" +msgstr "--untracked tidak dapat digunakan dengan --cached" -#: builtin/grep.c:1167 +#: builtin/grep.c:1166 msgid "--[no-]exclude-standard cannot be used for tracked contents" -msgstr "" +msgstr "--[no-]exclude-standard tidak dapat digunakan untuk konten terlacak" -#: builtin/grep.c:1175 +#: builtin/grep.c:1174 msgid "both --cached and trees are given" -msgstr "" +msgstr "baik --cached dan pohon diberikan" #: builtin/hash-object.c:85 msgid "" @@ -15549,30 +15661,30 @@ msgstr "" msgid "'%s': unknown man viewer." msgstr "'%s': pembaca man tidak dikenal" -#: builtin/help.c:453 +#: builtin/help.c:452 msgid "no man viewer handled the request" msgstr "tidak ada pembaca man yang menangani permintaan" -#: builtin/help.c:461 +#: builtin/help.c:459 msgid "no info viewer handled the request" msgstr "tidak ada pembaca info yang menangani permintaan" -#: builtin/help.c:520 builtin/help.c:531 git.c:348 +#: builtin/help.c:517 builtin/help.c:528 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' dialiaskan ke '%s'" -#: builtin/help.c:534 git.c:380 +#: builtin/help.c:531 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "untai alias.%s jelek: %s" -#: builtin/help.c:563 builtin/help.c:593 +#: builtin/help.c:561 builtin/help.c:591 #, c-format msgid "usage: %s%s" msgstr "penggunaan: %s%s" -#: builtin/help.c:577 +#: builtin/help.c:575 msgid "'git help config' for more information" msgstr "'git help config' untuk informasi lebih lanjut" @@ -15610,7 +15722,7 @@ msgstr "kesalahan baca pada masukan" msgid "used more bytes than were available" msgstr "gunakan lebih banyak pita dari pada yang tersedia" -#: builtin/index-pack.c:325 builtin/pack-objects.c:624 +#: builtin/index-pack.c:325 builtin/pack-objects.c:756 msgid "pack too large for current definition of off_t" msgstr "paket terlalu besar untuk definisi off_t saat ini" @@ -15637,238 +15749,238 @@ msgstr "tanda tangan paket tidak cocok" msgid "pack version %<PRIu32> unsupported" msgstr "versi paket %<PRIu32> tidak didukung" -#: builtin/index-pack.c:383 +#: builtin/index-pack.c:381 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paket ada objek jelek pada offset %<PRIuMAX>: %s" -#: builtin/index-pack.c:489 +#: builtin/index-pack.c:487 #, c-format msgid "inflate returned %d" msgstr "inflate mengembalikan %d" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:536 msgid "offset value overflow for delta base object" msgstr "nilai offset meluap untuk objek basis delta" -#: builtin/index-pack.c:546 +#: builtin/index-pack.c:544 msgid "delta base offset is out of bound" msgstr "offset basis delta di luar jangkauan" -#: builtin/index-pack.c:554 +#: builtin/index-pack.c:552 #, c-format msgid "unknown object type %d" msgstr "tipe objek tidak diketahui %d" -#: builtin/index-pack.c:585 +#: builtin/index-pack.c:583 msgid "cannot pread pack file" msgstr "tidak dapat pread berkas paket" -#: builtin/index-pack.c:587 +#: builtin/index-pack.c:585 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:613 +#: builtin/index-pack.c:611 msgid "serious inflate inconsistency" msgstr "inkonsistensi inflate serius" -#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788 -#: builtin/index-pack.c:827 builtin/index-pack.c:836 +#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786 +#: builtin/index-pack.c:825 builtin/index-pack.c:834 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "TUMBUKAN SHA1 DITEMUKAN DENGAN %s !" -#: builtin/index-pack.c:761 builtin/pack-objects.c:171 -#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 +#: builtin/index-pack.c:759 builtin/pack-objects.c:292 +#: builtin/pack-objects.c:352 builtin/pack-objects.c:458 #, c-format msgid "unable to read %s" msgstr "tidak dapat membaca %s" -#: builtin/index-pack.c:825 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object info %s" msgstr "tidak dapat membaca info objek yang ada %s" -#: builtin/index-pack.c:833 +#: builtin/index-pack.c:831 #, c-format msgid "cannot read existing object %s" msgstr "tidak dapat membaca objek yang ada %s" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:845 #, c-format msgid "invalid blob object %s" msgstr "objek blob tidak valid %s" -#: builtin/index-pack.c:850 builtin/index-pack.c:869 +#: builtin/index-pack.c:848 builtin/index-pack.c:867 msgid "fsck error in packed object" msgstr "kesalahan fsck dalam objek terpaket" -#: builtin/index-pack.c:871 +#: builtin/index-pack.c:869 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Tidak semua objek anak dari %s bisa dicapai" -#: builtin/index-pack.c:932 builtin/index-pack.c:979 +#: builtin/index-pack.c:930 builtin/index-pack.c:977 msgid "failed to apply delta" msgstr "gagal menerapkan delta" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Receiving objects" msgstr "Menerima objek" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Indexing objects" msgstr "Mengindeks objek" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1194 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paket rusak (SHA1 tidak cocok)" -#: builtin/index-pack.c:1201 +#: builtin/index-pack.c:1199 msgid "cannot fstat packfile" msgstr "tidak dapat fstat berkas paket" -#: builtin/index-pack.c:1204 +#: builtin/index-pack.c:1202 msgid "pack has junk at the end" msgstr "paket memiliki sampah pada ujung" -#: builtin/index-pack.c:1216 +#: builtin/index-pack.c:1214 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "bingung di luar kegilaan di parse_pack_objects()" -#: builtin/index-pack.c:1239 +#: builtin/index-pack.c:1237 msgid "Resolving deltas" msgstr "Menguraikan delta" -#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732 +#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892 #, c-format msgid "unable to create thread: %s" msgstr "tidak dapat membuat utas: %s" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1281 msgid "confusion beyond insanity" msgstr "bingung di luar kegilaan" -#: builtin/index-pack.c:1289 +#: builtin/index-pack.c:1287 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1301 +#: builtin/index-pack.c:1299 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Checksum ekor tidak diharapkan untuk %s (kerusakan disk?)" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1303 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1329 +#: builtin/index-pack.c:1327 #, c-format msgid "unable to deflate appended object (%d)" msgstr "tidak dapat menggemboskan objek tertambah (%d)" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1423 #, c-format msgid "local object %s is corrupt" msgstr "objek lokal %s rusak" -#: builtin/index-pack.c:1446 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "nama berkas paket '%s' tidak diakhiri dengan '.%s'" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1468 #, c-format msgid "cannot write %s file '%s'" msgstr "tidak dapat menulis %s berkas '%s'" -#: builtin/index-pack.c:1478 +#: builtin/index-pack.c:1476 #, c-format msgid "cannot close written %s file '%s'" msgstr "tidak dapat menutup %s berkas tertulis '%s'" -#: builtin/index-pack.c:1504 +#: builtin/index-pack.c:1502 msgid "error while closing pack file" msgstr "kesalahan menutup berkas paket" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1516 msgid "cannot store pack file" msgstr "tidak dapat menyimpan berkas paket" -#: builtin/index-pack.c:1526 +#: builtin/index-pack.c:1524 msgid "cannot store index file" msgstr "tidak dapat menyimpan berkas indeks" -#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977 +#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> jelek" -#: builtin/index-pack.c:1651 +#: builtin/index-pack.c:1649 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "tidak dapat membuka berkas paket yang ada '%s'" -#: builtin/index-pack.c:1653 +#: builtin/index-pack.c:1651 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "tidak dapat membuka berkas indeks paket untuk '%s'" -#: builtin/index-pack.c:1701 +#: builtin/index-pack.c:1699 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1708 +#: builtin/index-pack.c:1706 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1750 +#: builtin/index-pack.c:1748 msgid "Cannot come back to cwd" msgstr "tidak dapat kembali ke direktori kerja saat ini" -#: builtin/index-pack.c:1804 builtin/index-pack.c:1807 -#: builtin/index-pack.c:1823 builtin/index-pack.c:1827 +#: builtin/index-pack.c:1802 builtin/index-pack.c:1805 +#: builtin/index-pack.c:1821 builtin/index-pack.c:1825 #, c-format msgid "bad %s" msgstr "%s jelek" -#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613 +#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614 #, c-format msgid "unknown hash algorithm '%s'" msgstr "algoritma hash tak dikenal '%s'" -#: builtin/index-pack.c:1852 +#: builtin/index-pack.c:1850 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin tidak dapat digunakan tanpa --stdin" -#: builtin/index-pack.c:1854 +#: builtin/index-pack.c:1852 msgid "--stdin requires a git repository" msgstr "--stdin memerlukan repositori git" -#: builtin/index-pack.c:1856 +#: builtin/index-pack.c:1854 msgid "--object-format cannot be used with --stdin" msgstr "--object-format tidak dapat digunakan dengan --stdin" -#: builtin/index-pack.c:1871 +#: builtin/index-pack.c:1869 msgid "--verify with no packfile name given" msgstr "--verify tanpa nama berkas paket diberikan" -#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584 +#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "kesalahan fsck dalam objek paket" @@ -15912,56 +16024,56 @@ msgstr "templat tidak ditemukan di %s" msgid "not copying templates from '%s': %s" msgstr "tidak menyalin templat dari '%s': %s" -#: builtin/init-db.c:262 +#: builtin/init-db.c:263 #, c-format msgid "invalid initial branch name: '%s'" msgstr "nama cabang asal salah: '%s'" -#: builtin/init-db.c:353 +#: builtin/init-db.c:354 #, c-format msgid "unable to handle file type %d" msgstr "tidak dapat menangani tipe berkas %d" -#: builtin/init-db.c:356 +#: builtin/init-db.c:357 #, c-format msgid "unable to move %s to %s" msgstr "tidak dapat memindahkan %s ke %s" -#: builtin/init-db.c:372 +#: builtin/init-db.c:373 msgid "attempt to reinitialize repository with different hash" msgstr "mencoba menginisialisasi ulang repositori dengan hash yang berbeda" -#: builtin/init-db.c:396 builtin/init-db.c:399 +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "%s sudah ada" -#: builtin/init-db.c:431 +#: builtin/init-db.c:432 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: --initial-branch=%s diabaikan" -#: builtin/init-db.c:462 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Repositori berbagi Git yang sudah ada diinisialisasi ulang di %s%s\n" -#: builtin/init-db.c:463 +#: builtin/init-db.c:464 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Repositori Git diinisialisasi ulang di %s%s\n" -#: builtin/init-db.c:467 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Repositori berbagi Git kosong diinisialisasi di %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:469 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Repositori Git kosong dinisialisasi di %s%s\n" -#: builtin/init-db.c:517 +#: builtin/init-db.c:518 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -15969,56 +16081,56 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<direktori-templat>][--" "shared[=<perizinan>]] [<direktori>]" -#: builtin/init-db.c:543 +#: builtin/init-db.c:544 msgid "permissions" msgstr "perizinan" -#: builtin/init-db.c:544 +#: builtin/init-db.c:545 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "tentukan bahwa repositori git untuk dibagikan di antara beberapa pengguna" -#: builtin/init-db.c:550 +#: builtin/init-db.c:551 msgid "override the name of the initial branch" msgstr "timpa nama cabang asal" -#: builtin/init-db.c:551 builtin/verify-pack.c:74 +#: builtin/init-db.c:552 builtin/verify-pack.c:74 msgid "hash" msgstr "" -#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "tentukan algoritma hash yang akan digunakan" -#: builtin/init-db.c:559 +#: builtin/init-db.c:560 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "--separate-git-dir dan --bare saling eksklusif" -#: builtin/init-db.c:590 builtin/init-db.c:595 +#: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" msgstr "tidak dapat membuat direktori %s" -#: builtin/init-db.c:599 builtin/init-db.c:654 +#: builtin/init-db.c:600 builtin/init-db.c:655 #, c-format msgid "cannot chdir to %s" msgstr "tidak dapat mengganti direktori ke %s" -#: builtin/init-db.c:626 +#: builtin/init-db.c:627 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" "%s (atau --work-tree=<direktori>) tidak diperbolehkan tanpa sebutkan %s " -"(atau--git-dir=<direktori>)" +"(atau --git-dir=<direktori>)" -#: builtin/init-db.c:678 +#: builtin/init-db.c:679 #, c-format msgid "Cannot access work tree '%s'" msgstr "Tidak dapat mengakses pohon kerja '%s'" -#: builtin/init-db.c:683 +#: builtin/init-db.c:684 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir tidak kompatibel dengan repositori bare" @@ -16125,85 +16237,85 @@ msgstr "" msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<rentang>:<berkas> tidak dapat digunakan dengan spek jalur" -#: builtin/log.c:303 +#: builtin/log.c:306 #, c-format msgid "Final output: %d %s\n" msgstr "Keluaran terakhir: %d %s\n" -#: builtin/log.c:568 +#: builtin/log.c:571 #, c-format msgid "git show %s: bad file" msgstr "git show %s: berkas jelek" -#: builtin/log.c:583 builtin/log.c:673 +#: builtin/log.c:586 builtin/log.c:676 #, c-format msgid "could not read object %s" msgstr "tidak dapat membaca objek %s" -#: builtin/log.c:698 +#: builtin/log.c:701 #, c-format msgid "unknown type: %d" msgstr "tipe tidak dikenal: %d" -#: builtin/log.c:843 +#: builtin/log.c:846 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: sampul tidak valid dari mode deskripsi" -#: builtin/log.c:850 +#: builtin/log.c:853 msgid "format.headers without value" msgstr "format.headers tanpa nilai" -#: builtin/log.c:979 +#: builtin/log.c:982 #, c-format msgid "cannot open patch file %s" msgstr "tidak dapat membuka berkas tambalan %s" -#: builtin/log.c:996 +#: builtin/log.c:999 msgid "need exactly one range" msgstr "butuh tepatnya satu rentang" -#: builtin/log.c:1006 +#: builtin/log.c:1009 msgid "not a range" msgstr "bukan sebuah rentang" -#: builtin/log.c:1170 +#: builtin/log.c:1173 msgid "cover letter needs email format" msgstr "sampul surat butuh format email" -#: builtin/log.c:1176 +#: builtin/log.c:1179 msgid "failed to create cover-letter file" msgstr "gagal membuat berkas sampul surat" -#: builtin/log.c:1263 +#: builtin/log.c:1266 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to gila: %s" -#: builtin/log.c:1290 +#: builtin/log.c:1293 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opsi>] [<sejak> | <rentang revisi>]" -#: builtin/log.c:1348 +#: builtin/log.c:1351 msgid "two output directories?" msgstr "dua direktori keluaran?" -#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340 +#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 #, c-format msgid "unknown commit %s" msgstr "komit tidak dikenal %s" -#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "gagal menguraikan '%s' sebagai referensi valid" -#: builtin/log.c:1519 +#: builtin/log.c:1522 msgid "could not find exact merge base" msgstr "tidak dapat menemukan dasar penggabungan eksak" -#: builtin/log.c:1529 +#: builtin/log.c:1532 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" @@ -16215,292 +16327,292 @@ msgstr "" "Atau Anda dapat menyebutkan dasar komit secara manual dengan --base=<id " "dasar komit>" -#: builtin/log.c:1552 +#: builtin/log.c:1555 msgid "failed to find exact merge base" msgstr "tidak dapat menemukan dasar penggabungan eksak" -#: builtin/log.c:1569 +#: builtin/log.c:1572 msgid "base commit should be the ancestor of revision list" msgstr "dasar komit seharusnya menjadi leluhur daftar revisi" -#: builtin/log.c:1579 +#: builtin/log.c:1582 msgid "base commit shouldn't be in revision list" msgstr "dasar komit tidak seharusnya dalam daftar revisi" -#: builtin/log.c:1637 +#: builtin/log.c:1640 msgid "cannot get patch id" msgstr "tidak dapat mendapatkan id tambalan" -#: builtin/log.c:1700 +#: builtin/log.c:1703 msgid "failed to infer range-diff origin of current series" msgstr "gagal menduga asal range-diff dari seri saat ini" -#: builtin/log.c:1702 +#: builtin/log.c:1705 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "menggunakan '%s' sebagai asal range-diff dari seri saat ini" -#: builtin/log.c:1746 +#: builtin/log.c:1749 msgid "use [PATCH n/m] even with a single patch" msgstr "gunakan [PATCH n/m] bahkan dengan satu tambalan" -#: builtin/log.c:1749 +#: builtin/log.c:1752 msgid "use [PATCH] even with multiple patches" msgstr "gunakan [PATCH] bahkan dengan banyak tambalan" -#: builtin/log.c:1753 +#: builtin/log.c:1756 msgid "print patches to standard out" msgstr "cetak tambalan ke keluaran standar" -#: builtin/log.c:1755 +#: builtin/log.c:1758 msgid "generate a cover letter" msgstr "buat sampul surat" -#: builtin/log.c:1757 +#: builtin/log.c:1760 msgid "use simple number sequence for output file names" msgstr "gunakan urutan bilangan sederhana untuk keluarkan nama berkas" -#: builtin/log.c:1758 +#: builtin/log.c:1761 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1759 +#: builtin/log.c:1762 msgid "use <sfx> instead of '.patch'" msgstr "gunakan <akhiran> daripada '.patch'" -#: builtin/log.c:1761 +#: builtin/log.c:1764 msgid "start numbering patches at <n> instead of 1" msgstr "mulai menomorkan tambalan pada <n> daripada 1" -#: builtin/log.c:1762 +#: builtin/log.c:1765 msgid "reroll-count" msgstr "" -#: builtin/log.c:1763 +#: builtin/log.c:1766 msgid "mark the series as Nth re-roll" msgstr "tandai seri sebagai gulung ulang ke-N" -#: builtin/log.c:1765 +#: builtin/log.c:1768 msgid "max length of output filename" msgstr "panjang nama berkas keluaran maksimum" -#: builtin/log.c:1767 +#: builtin/log.c:1770 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "gunakan [RFC PATCH] daripada [PATCH]" -#: builtin/log.c:1770 +#: builtin/log.c:1773 msgid "cover-from-description-mode" msgstr "cover-from-description-mode" -#: builtin/log.c:1771 +#: builtin/log.c:1774 msgid "generate parts of a cover letter based on a branch's description" msgstr "buat bagian dari sampul surat berdasarkan deskripsi cabang" -#: builtin/log.c:1773 +#: builtin/log.c:1776 msgid "use [<prefix>] instead of [PATCH]" msgstr "gunakan [<prefix>] daripada [PATCH]" -#: builtin/log.c:1776 +#: builtin/log.c:1779 msgid "store resulting files in <dir>" msgstr "simpan hasil berkas di <direktori>" -#: builtin/log.c:1779 +#: builtin/log.c:1782 msgid "don't strip/add [PATCH]" msgstr "jangan copot/tambah [PATCH]" -#: builtin/log.c:1782 +#: builtin/log.c:1785 msgid "don't output binary diffs" msgstr "jangan keluarkan diff biner" -#: builtin/log.c:1784 +#: builtin/log.c:1787 msgid "output all-zero hash in From header" msgstr "keluarkan hash semua-nol di kepala From" -#: builtin/log.c:1786 +#: builtin/log.c:1789 msgid "don't include a patch matching a commit upstream" msgstr "jangan termasuk tambalan yang cocok dengan komit hulu" -#: builtin/log.c:1788 +#: builtin/log.c:1791 msgid "show patch format instead of default (patch + stat)" msgstr "perlihatkan format tambalan daripada asali (tambalan + stat)" -#: builtin/log.c:1790 +#: builtin/log.c:1793 msgid "Messaging" msgstr "Perpesanan" -#: builtin/log.c:1791 +#: builtin/log.c:1794 msgid "header" msgstr "kepala" -#: builtin/log.c:1792 +#: builtin/log.c:1795 msgid "add email header" msgstr "tambahkan kepala email" -#: builtin/log.c:1793 builtin/log.c:1794 +#: builtin/log.c:1796 builtin/log.c:1797 msgid "email" msgstr "email" -#: builtin/log.c:1793 +#: builtin/log.c:1796 msgid "add To: header" msgstr "tambahkan kepala To:" -#: builtin/log.c:1794 +#: builtin/log.c:1797 msgid "add Cc: header" msgstr "tambahkan kepala Cc:" -#: builtin/log.c:1795 +#: builtin/log.c:1798 msgid "ident" msgstr "ident" -#: builtin/log.c:1796 +#: builtin/log.c:1799 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "setel alamat From ke <identitas> (atau identitas pengkomit jika tidak ada)" -#: builtin/log.c:1798 +#: builtin/log.c:1801 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1799 +#: builtin/log.c:1802 msgid "make first mail a reply to <message-id>" msgstr "buat surat pertama balasan ke <id pesan>" -#: builtin/log.c:1800 builtin/log.c:1803 +#: builtin/log.c:1803 builtin/log.c:1806 msgid "boundary" msgstr "perbatasan" -#: builtin/log.c:1801 +#: builtin/log.c:1804 msgid "attach the patch" msgstr "lampirkan tambalan" -#: builtin/log.c:1804 +#: builtin/log.c:1807 msgid "inline the patch" msgstr "bariskan tambalan" -#: builtin/log.c:1808 +#: builtin/log.c:1811 msgid "enable message threading, styles: shallow, deep" msgstr "aktifkan utasan pesan, gaya: shallow, deep" -#: builtin/log.c:1810 +#: builtin/log.c:1813 msgid "signature" msgstr "tanda tangan" -#: builtin/log.c:1811 +#: builtin/log.c:1814 msgid "add a signature" msgstr "tambah tanda tangan" -#: builtin/log.c:1812 +#: builtin/log.c:1815 msgid "base-commit" msgstr "dasar komit" -#: builtin/log.c:1813 +#: builtin/log.c:1816 msgid "add prerequisite tree info to the patch series" msgstr "tambahkan info pohon prasyarat ke seri tambalan" -#: builtin/log.c:1816 +#: builtin/log.c:1819 msgid "add a signature from a file" msgstr "tambahkan tandatangan dari berkas" -#: builtin/log.c:1817 +#: builtin/log.c:1820 msgid "don't print the patch filenames" msgstr "jangan cetak nama berkas tambalan" -#: builtin/log.c:1819 +#: builtin/log.c:1822 msgid "show progress while generating patches" msgstr "perlihatkan perkembangan ketika membuat tambalan" -#: builtin/log.c:1821 +#: builtin/log.c:1824 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "perlihatkan perubahan terhadap <revisi> di sampul surat atau satu tambalan" -#: builtin/log.c:1824 +#: builtin/log.c:1827 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "perlihatkan perubahan terhadap <spek referensi> di sampul surat atau satu " "tambalan" -#: builtin/log.c:1826 builtin/range-diff.c:28 +#: builtin/log.c:1829 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "persentase dimana pembuatan tertimbang" -#: builtin/log.c:1913 +#: builtin/log.c:1916 #, c-format msgid "invalid ident line: %s" msgstr "baris identitas tidak valid: %s" -#: builtin/log.c:1928 +#: builtin/log.c:1931 msgid "-n and -k are mutually exclusive" msgstr "-n dan -k saling eksklusif" -#: builtin/log.c:1930 +#: builtin/log.c:1933 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc dan -k saling eksklusif" -#: builtin/log.c:1938 +#: builtin/log.c:1941 msgid "--name-only does not make sense" msgstr "--name-only tidak masuk akal" -#: builtin/log.c:1940 +#: builtin/log.c:1943 msgid "--name-status does not make sense" msgstr "--name-status tidak masuk akal" -#: builtin/log.c:1942 +#: builtin/log.c:1945 msgid "--check does not make sense" msgstr "--check tidak masuk akal" -#: builtin/log.c:1964 +#: builtin/log.c:1967 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "--stdout, --output, dan --output-directory saling eksklusif" -#: builtin/log.c:2087 +#: builtin/log.c:2089 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff butuh --cover-letter atau satu tambalan" -#: builtin/log.c:2091 +#: builtin/log.c:2093 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:2092 +#: builtin/log.c:2094 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff terhadap v%d:" -#: builtin/log.c:2098 +#: builtin/log.c:2100 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor butuh --range-diff" -#: builtin/log.c:2102 +#: builtin/log.c:2104 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff butuh --cover-letter atau satu tambalan" -#: builtin/log.c:2110 +#: builtin/log.c:2112 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:2111 +#: builtin/log.c:2113 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff terhadap v%d:" -#: builtin/log.c:2122 +#: builtin/log.c:2124 #, c-format msgid "unable to read signature file '%s'" msgstr "tidak dapat membaca berkas tanda tangan '%s'" -#: builtin/log.c:2158 +#: builtin/log.c:2160 msgid "Generating patches" msgstr "Membuat tambalan" -#: builtin/log.c:2202 +#: builtin/log.c:2204 msgid "failed to create output files" msgstr "tidak dapat membuat berkas keluaran" -#: builtin/log.c:2261 +#: builtin/log.c:2263 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<hulu> [<kepala> [<batas>]]]" -#: builtin/log.c:2315 +#: builtin/log.c:2317 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -16862,14 +16974,6 @@ msgstr "" msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opsi>] [<komit>...]" -#: builtin/merge.c:59 -msgid "git merge --abort" -msgstr "git merge --abort" - -#: builtin/merge.c:60 -msgid "git merge --continue" -msgstr "git merge --continue" - #: builtin/merge.c:123 msgid "switch `m' requires a value" msgstr "tombol `m' butuh sebuah nilai" @@ -17026,7 +17130,7 @@ msgstr "Tak tangani apapun selain penggabungan dua kepala." msgid "Unknown option for merge-recursive: -X%s" msgstr "Opsi merge-recursive tak dikenal: -X%s" -#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "tidak dapat menulis %s" @@ -17327,7 +17431,7 @@ msgid "" "larger than this size" msgstr "" -#: builtin/multi-pack-index.c:180 +#: builtin/multi-pack-index.c:179 #, c-format msgid "unrecognized subcommand: %s" msgstr "" @@ -17849,7 +17953,7 @@ msgstr "" msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146 msgid "do not remove, show only" msgstr "" @@ -17865,404 +17969,404 @@ msgstr "" msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1034 builtin/stash.c:1739 +#: builtin/notes.c:1034 builtin/stash.c:1735 #, c-format msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:54 +#: builtin/pack-objects.c:182 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:55 +#: builtin/pack-objects.c:183 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:440 +#: builtin/pack-objects.c:572 #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " "pack %s" msgstr "" -#: builtin/pack-objects.c:448 +#: builtin/pack-objects.c:580 #, c-format msgid "bad packed object CRC for %s" msgstr "" -#: builtin/pack-objects.c:459 +#: builtin/pack-objects.c:591 #, c-format msgid "corrupt packed object for %s" msgstr "" -#: builtin/pack-objects.c:590 +#: builtin/pack-objects.c:722 #, c-format msgid "recursive delta detected for object %s" msgstr "" -#: builtin/pack-objects.c:801 +#: builtin/pack-objects.c:941 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:896 +#: builtin/pack-objects.c:1036 #, c-format msgid "expected object at offset %<PRIuMAX> in pack %s" msgstr "" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1155 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:1028 +#: builtin/pack-objects.c:1168 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1089 builtin/update-index.c:90 +#: builtin/pack-objects.c:1229 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "" -#: builtin/pack-objects.c:1141 +#: builtin/pack-objects.c:1281 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:1383 +#: builtin/pack-objects.c:1523 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:1831 +#: builtin/pack-objects.c:1971 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "" -#: builtin/pack-objects.c:1840 +#: builtin/pack-objects.c:1980 #, c-format msgid "delta base offset out of bound for %s" msgstr "" -#: builtin/pack-objects.c:2121 +#: builtin/pack-objects.c:2261 msgid "Counting objects" msgstr "" -#: builtin/pack-objects.c:2266 +#: builtin/pack-objects.c:2426 #, c-format msgid "unable to parse object header of %s" msgstr "" -#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352 -#: builtin/pack-objects.c:2362 +#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512 +#: builtin/pack-objects.c:2522 #, c-format msgid "object %s cannot be read" msgstr "" -#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366 +#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" -#: builtin/pack-objects.c:2376 +#: builtin/pack-objects.c:2536 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2691 +#: builtin/pack-objects.c:2851 #, c-format msgid "Delta compression using up to %d threads" msgstr "" -#: builtin/pack-objects.c:2830 +#: builtin/pack-objects.c:2990 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "" -#: builtin/pack-objects.c:2916 +#: builtin/pack-objects.c:3076 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:3082 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3161 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" "hash> <uri>' (got '%s')" msgstr "" -#: builtin/pack-objects.c:3004 +#: builtin/pack-objects.c:3164 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "" -#: builtin/pack-objects.c:3039 +#: builtin/pack-objects.c:3199 #, c-format msgid "could not get type of object %s in pack %s" msgstr "" -#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175 +#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335 #, c-format msgid "could not find pack '%s'" msgstr "" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3378 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:3224 +#: builtin/pack-objects.c:3384 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:3322 +#: builtin/pack-objects.c:3482 msgid "invalid value for --missing" msgstr "" -#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490 +#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650 msgid "cannot open pack index" msgstr "" -#: builtin/pack-objects.c:3412 +#: builtin/pack-objects.c:3572 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3658 msgid "unable to force loose object" msgstr "" -#: builtin/pack-objects.c:3628 +#: builtin/pack-objects.c:3788 #, c-format msgid "not a rev '%s'" msgstr "" -#: builtin/pack-objects.c:3631 +#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061 #, c-format msgid "bad revision '%s'" msgstr "" -#: builtin/pack-objects.c:3659 +#: builtin/pack-objects.c:3819 msgid "unable to add recent objects" msgstr "" -#: builtin/pack-objects.c:3712 +#: builtin/pack-objects.c:3872 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:3716 +#: builtin/pack-objects.c:3876 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:3755 +#: builtin/pack-objects.c:3915 msgid "<version>[,<offset>]" msgstr "" -#: builtin/pack-objects.c:3756 +#: builtin/pack-objects.c:3916 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:3759 +#: builtin/pack-objects.c:3919 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:3761 +#: builtin/pack-objects.c:3921 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:3763 +#: builtin/pack-objects.c:3923 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:3765 +#: builtin/pack-objects.c:3925 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:3767 +#: builtin/pack-objects.c:3927 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:3769 +#: builtin/pack-objects.c:3929 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:3771 +#: builtin/pack-objects.c:3931 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:3773 +#: builtin/pack-objects.c:3933 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:3775 +#: builtin/pack-objects.c:3935 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:3777 +#: builtin/pack-objects.c:3937 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:3779 +#: builtin/pack-objects.c:3939 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:3781 +#: builtin/pack-objects.c:3941 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:3783 +#: builtin/pack-objects.c:3943 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3786 +#: builtin/pack-objects.c:3946 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3789 +#: builtin/pack-objects.c:3949 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3792 +#: builtin/pack-objects.c:3952 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:3795 +#: builtin/pack-objects.c:3955 msgid "read packs from stdin" msgstr "" -#: builtin/pack-objects.c:3797 +#: builtin/pack-objects.c:3957 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3799 +#: builtin/pack-objects.c:3959 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3801 +#: builtin/pack-objects.c:3961 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:3803 +#: builtin/pack-objects.c:3963 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:3805 +#: builtin/pack-objects.c:3965 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:3808 +#: builtin/pack-objects.c:3968 msgid "use the sparse reachability algorithm" msgstr "" -#: builtin/pack-objects.c:3810 +#: builtin/pack-objects.c:3970 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:3812 +#: builtin/pack-objects.c:3972 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:3814 +#: builtin/pack-objects.c:3974 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:3816 +#: builtin/pack-objects.c:3976 msgid "ignore this pack" msgstr "" -#: builtin/pack-objects.c:3818 +#: builtin/pack-objects.c:3978 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:3820 +#: builtin/pack-objects.c:3980 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:3822 +#: builtin/pack-objects.c:3982 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:3824 +#: builtin/pack-objects.c:3984 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:3828 +#: builtin/pack-objects.c:3988 msgid "write a bitmap index if possible" msgstr "" -#: builtin/pack-objects.c:3832 +#: builtin/pack-objects.c:3992 msgid "handling for missing objects" msgstr "" -#: builtin/pack-objects.c:3835 +#: builtin/pack-objects.c:3995 msgid "do not pack objects in promisor packfiles" msgstr "" -#: builtin/pack-objects.c:3837 +#: builtin/pack-objects.c:3997 msgid "respect islands during delta compression" msgstr "" -#: builtin/pack-objects.c:3839 +#: builtin/pack-objects.c:3999 msgid "protocol" msgstr "" -#: builtin/pack-objects.c:3840 +#: builtin/pack-objects.c:4000 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" -#: builtin/pack-objects.c:3873 +#: builtin/pack-objects.c:4033 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "" -#: builtin/pack-objects.c:3878 +#: builtin/pack-objects.c:4038 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "" -#: builtin/pack-objects.c:3934 +#: builtin/pack-objects.c:4094 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" -#: builtin/pack-objects.c:3936 +#: builtin/pack-objects.c:4096 msgid "minimum pack size limit is 1 MiB" msgstr "" -#: builtin/pack-objects.c:3941 +#: builtin/pack-objects.c:4101 msgid "--thin cannot be used to build an indexable pack" msgstr "" -#: builtin/pack-objects.c:3944 +#: builtin/pack-objects.c:4104 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "" -#: builtin/pack-objects.c:3950 +#: builtin/pack-objects.c:4110 msgid "cannot use --filter without --stdout" msgstr "" -#: builtin/pack-objects.c:3952 +#: builtin/pack-objects.c:4112 msgid "cannot use --filter with --stdin-packs" msgstr "" -#: builtin/pack-objects.c:3956 +#: builtin/pack-objects.c:4116 msgid "cannot use internal rev list with --stdin-packs" msgstr "" -#: builtin/pack-objects.c:4015 +#: builtin/pack-objects.c:4175 msgid "Enumerating objects" msgstr "" -#: builtin/pack-objects.c:4052 +#: builtin/pack-objects.c:4212 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -18477,21 +18581,21 @@ msgstr "" "--rebase, --no-rebase, atau --ff-only pada baris perintah untuk menimpa\n" "asali terkonfigurasi untuk setiap invokasi.\n" -#: builtin/pull.c:991 +#: builtin/pull.c:990 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Memperbarui cabang yang belum lahir dengan perubahan yang ditambahkan ke " "indeks." -#: builtin/pull.c:995 +#: builtin/pull.c:994 msgid "pull with rebase" msgstr "tarik dengan pendasaran ulang" -#: builtin/pull.c:996 +#: builtin/pull.c:995 msgid "please commit or stash them." msgstr "mohon komit atau stase itu." -#: builtin/pull.c:1021 +#: builtin/pull.c:1020 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -18501,7 +18605,7 @@ msgstr "" "fetch memperbarui kepala cabang saat ini.\n" "memajukan-cepat pohon kerja Anda dari komit %s." -#: builtin/pull.c:1027 +#: builtin/pull.c:1026 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -18518,15 +18622,15 @@ msgstr "" "$ git reset --hard\n" "untuk memulihkan." -#: builtin/pull.c:1042 +#: builtin/pull.c:1041 msgid "Cannot merge multiple branches into empty head." msgstr "Tidak dapat menggabungkan banyak cabang ke kepala kosong." -#: builtin/pull.c:1046 +#: builtin/pull.c:1045 msgid "Cannot rebase onto multiple branches." msgstr "Tidak dapat mendasarkan ulang pada banyak cabang." -#: builtin/pull.c:1067 +#: builtin/pull.c:1065 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "tidak dapat mendasarkan ulang dengan modifikasi submodul yang terekam lokal." @@ -18592,7 +18696,7 @@ msgstr "" "\n" " git push %s HEAD:<nama-cabang-remote>\n" -#: builtin/push.c:194 +#: builtin/push.c:191 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -18605,12 +18709,19 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:202 +#: builtin/push.c:199 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "Cabang saat ini %s punya banyak cabang hulu, tolak dorong. " -#: builtin/push.c:205 +#: builtin/push.c:217 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" +"Anda tidak sebutkan spek referensi apapun untuk didorong, dan push.default " +"yaitu \"nothing\"" + +#: builtin/push.c:243 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -18621,14 +18732,7 @@ msgstr "" "cabang Anda saat ini '%s', tanpa beri tahu saya apa yang harus\n" "didorong untuk perbarui cabang remote yang mana." -#: builtin/push.c:260 -msgid "" -"You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "" -"Anda tidak sebutkan spek referensi apapun untuk didorong, dan push.default " -"yaitu \"nothing\"" - -#: builtin/push.c:267 +#: builtin/push.c:258 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -18640,7 +18744,7 @@ msgstr "" "'git pull') sebelum dorong lagi.\n" "Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya." -#: builtin/push.c:273 +#: builtin/push.c:264 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -18652,7 +18756,7 @@ msgstr "" "remote (seperti 'git pull') sebelum dorong lagi.\n" "Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya." -#: builtin/push.c:279 +#: builtin/push.c:270 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -18666,11 +18770,11 @@ msgstr "" "perubahan remote (seperti 'git pull') sebelum dorong lagi.\n" "Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya." -#: builtin/push.c:286 +#: builtin/push.c:277 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Pembaruan ditolak karena tag sudah ada di remote." -#: builtin/push.c:289 +#: builtin/push.c:280 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -18680,7 +18784,7 @@ msgstr "" "non komit atau memperbarui referensi remote agar itu memnunjuk ke\n" "objek non komit, tanpa menggunakan opsi '--force'.\n" -#: builtin/push.c:294 +#: builtin/push.c:285 msgid "" "Updates were rejected because the tip of the remote-tracking\n" "branch has been updated since the last checkout. You may want\n" @@ -18692,103 +18796,103 @@ msgstr "" "integrasikan perubahan tersebut ke lokal (seperti 'git pull...')\n" "sebelum memaksa pembaruan.\n" -#: builtin/push.c:364 +#: builtin/push.c:355 #, c-format msgid "Pushing to %s\n" msgstr "Mendorong ke %s\n" -#: builtin/push.c:371 +#: builtin/push.c:362 #, c-format msgid "failed to push some refs to '%s'" msgstr "gagal dorong beberapa referensi ke '%s'" -#: builtin/push.c:553 +#: builtin/push.c:544 msgid "repository" msgstr "repositori" -#: builtin/push.c:554 builtin/send-pack.c:189 +#: builtin/push.c:545 builtin/send-pack.c:189 msgid "push all refs" msgstr "dorong semua referensi" -#: builtin/push.c:555 builtin/send-pack.c:191 +#: builtin/push.c:546 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "cermin semua referensi" -#: builtin/push.c:557 +#: builtin/push.c:548 msgid "delete refs" msgstr "hapus referensi" -#: builtin/push.c:558 +#: builtin/push.c:549 msgid "push tags (can't be used with --all or --mirror)" msgstr "dorong tag (tidak dapat digunakan dengan --all atau --mirror)" -#: builtin/push.c:561 builtin/send-pack.c:192 +#: builtin/push.c:552 builtin/send-pack.c:192 msgid "force updates" msgstr "paksa pembaruan" -#: builtin/push.c:562 builtin/send-pack.c:204 +#: builtin/push.c:553 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "<nama referensi>:<harapan>" -#: builtin/push.c:563 builtin/send-pack.c:205 +#: builtin/push.c:554 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "memerlukan nilai lama referensi berada pada nilai saat ini" -#: builtin/push.c:566 builtin/send-pack.c:208 +#: builtin/push.c:557 builtin/send-pack.c:208 msgid "require remote updates to be integrated locally" msgstr "memerlukan pembaruan remote diintegrasikan ke lokal" -#: builtin/push.c:569 +#: builtin/push.c:560 msgid "control recursive pushing of submodules" msgstr "kontrol dorong rekursif submodul" -#: builtin/push.c:570 builtin/send-pack.c:199 +#: builtin/push.c:561 builtin/send-pack.c:199 msgid "use thin pack" msgstr "gunakan paket tipis" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186 #: builtin/send-pack.c:187 msgid "receive pack program" msgstr "program terima paket" -#: builtin/push.c:573 +#: builtin/push.c:564 msgid "set upstream for git pull/status" msgstr "setel hulu untuk git pull/status" -#: builtin/push.c:576 +#: builtin/push.c:567 msgid "prune locally removed refs" msgstr "buang referensi terhapus lokal" -#: builtin/push.c:578 +#: builtin/push.c:569 msgid "bypass pre-push hook" msgstr "lewati kait pra-dorong" -#: builtin/push.c:579 +#: builtin/push.c:570 msgid "push missing but relevant tags" msgstr "dorong tag yang hilang tapi relevan" -#: builtin/push.c:581 builtin/send-pack.c:193 +#: builtin/push.c:572 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "Tandatangan GPG dorong" -#: builtin/push.c:583 builtin/send-pack.c:200 +#: builtin/push.c:574 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "minta transaksi atomik pada sisi remote" -#: builtin/push.c:601 +#: builtin/push.c:592 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete tidak kompatibel dengan --all, --mirror dan --tags " -#: builtin/push.c:603 +#: builtin/push.c:594 msgid "--delete doesn't make sense without any refs" msgstr "--delete tidak masuk akal tanpa referensi" -#: builtin/push.c:623 +#: builtin/push.c:614 #, c-format msgid "bad repository '%s'" msgstr "repositori jelek '%s'" -#: builtin/push.c:624 +#: builtin/push.c:615 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -18810,27 +18914,27 @@ msgstr "" "\n" " git push <nama>\n" -#: builtin/push.c:639 +#: builtin/push.c:630 msgid "--all and --tags are incompatible" msgstr "--all dan --tags tidak kompatibel" -#: builtin/push.c:641 +#: builtin/push.c:632 msgid "--all can't be combined with refspecs" msgstr "--all tidak dapat digabung dengan spek referensi" -#: builtin/push.c:645 +#: builtin/push.c:636 msgid "--mirror and --tags are incompatible" msgstr "--mirror dan --tags tidak kompatibel" -#: builtin/push.c:647 +#: builtin/push.c:638 msgid "--mirror can't be combined with refspecs" msgstr "--mirror tidak dapat digabungkan dengan spek referensi" -#: builtin/push.c:650 +#: builtin/push.c:641 msgid "--all and --mirror are incompatible" msgstr "--all dan --mirror tidak kompatibel" -#: builtin/push.c:657 +#: builtin/push.c:648 msgid "push options must not have new line characters" msgstr "opsi dorong harus tidak ada karakter baris baru" @@ -19408,7 +19512,7 @@ msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Aksi --edit-todo hanya dapat digunakan selama pendasaran ulang interaktif." -#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122 msgid "Cannot read HEAD" msgstr "Tidak dapat membaca HEAD" @@ -19516,8 +19620,8 @@ msgstr "Tidak menunjuk pada komit yang valid '%s'" msgid "fatal: no such branch/commit '%s'" msgstr "fatal: tidak ada cabang/komit seperti '%s'" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:2415 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:39 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Tidak ada referensi seperti: %s" @@ -19587,7 +19691,7 @@ msgstr "Maju-cepat %s ke %s.\n" msgid "git receive-pack <git-dir>" msgstr "" -#: builtin/receive-pack.c:1276 +#: builtin/receive-pack.c:1275 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" @@ -19604,7 +19708,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -#: builtin/receive-pack.c:1296 +#: builtin/receive-pack.c:1295 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" @@ -19616,11 +19720,11 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" -#: builtin/receive-pack.c:2479 +#: builtin/receive-pack.c:2478 msgid "quiet" msgstr "" -#: builtin/receive-pack.c:2493 +#: builtin/receive-pack.c:2492 msgid "You must specify a directory." msgstr "" @@ -20580,15 +20684,15 @@ msgstr "" msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "" -#: builtin/rerere.c:60 +#: builtin/rerere.c:58 msgid "register clean resolutions in index" msgstr "" -#: builtin/rerere.c:79 +#: builtin/rerere.c:77 msgid "'git rerere forget' without paths is deprecated" msgstr "" -#: builtin/rerere.c:113 +#: builtin/rerere.c:111 #, c-format msgid "unable to generate diff for '%s'" msgstr "" @@ -20740,19 +20844,19 @@ msgstr "Tidak dapat menyetel ulang berkas indeks ke revisi '%s'." msgid "Could not write new index file." msgstr "Tidak dapat menulis berkas indeks baru." -#: builtin/rev-list.c:538 +#: builtin/rev-list.c:541 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "" -#: builtin/rev-list.c:599 +#: builtin/rev-list.c:602 msgid "object filtering requires --objects" msgstr "" -#: builtin/rev-list.c:659 +#: builtin/rev-list.c:674 msgid "rev-list does not support display of notes" msgstr "" -#: builtin/rev-list.c:664 +#: builtin/rev-list.c:679 msgid "marked counting is incompatible with --objects" msgstr "" @@ -20772,6 +20876,18 @@ msgstr "" msgid "output in stuck long form" msgstr "" +#: builtin/rev-parse.c:438 +msgid "premature end of input" +msgstr "" + +#: builtin/rev-parse.c:442 +msgid "no usage string given before the `--' separator" +msgstr "" + +#: builtin/rev-parse.c:548 +msgid "Needed a single revision" +msgstr "" + #: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" @@ -20781,6 +20897,50 @@ msgid "" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" +#: builtin/rev-parse.c:712 +msgid "--resolve-git-dir requires an argument" +msgstr "" + +#: builtin/rev-parse.c:715 +#, c-format +msgid "not a gitdir '%s'" +msgstr "" + +#: builtin/rev-parse.c:739 +msgid "--git-path requires an argument" +msgstr "" + +#: builtin/rev-parse.c:749 +msgid "-n requires an argument" +msgstr "" + +#: builtin/rev-parse.c:763 +msgid "--path-format requires an argument" +msgstr "" + +#: builtin/rev-parse.c:769 +#, c-format +msgid "unknown argument to --path-format: %s" +msgstr "" + +#: builtin/rev-parse.c:776 +msgid "--default requires an argument" +msgstr "" + +#: builtin/rev-parse.c:782 +msgid "--prefix requires an argument" +msgstr "" + +#: builtin/rev-parse.c:851 +#, c-format +msgid "unknown mode for --abbrev-ref: %s" +msgstr "" + +#: builtin/rev-parse.c:1023 +#, c-format +msgid "unknown mode for --show-object-format: %s" +msgstr "" + #: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "" @@ -20979,60 +21139,60 @@ msgstr "" #: builtin/shortlog.c:16 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" -msgstr "" +msgstr "git shortlog [<opsi>] [<rentang revisi>] [[--] <jalur>...]" #: builtin/shortlog.c:17 msgid "git log --pretty=short | git shortlog [<options>]" -msgstr "" +msgstr "git log --pretty=short | git shortlog [<opsi>]" #: builtin/shortlog.c:123 msgid "using multiple --group options with stdin is not supported" -msgstr "" +msgstr "menggunakan banyak opsi --group dengan masukan standar tidak didukung" #: builtin/shortlog.c:133 msgid "using --group=trailer with stdin is not supported" -msgstr "" +msgstr "mengguanakn --group=trailer dengan stdin tidak didukung" #: builtin/shortlog.c:323 #, c-format msgid "unknown group type: %s" -msgstr "" +msgstr "tipe kelompok tidak dikenal: %s" #: builtin/shortlog.c:351 msgid "group by committer rather than author" -msgstr "" +msgstr "kelompokkan oleh pengkomit daripada pengarang" #: builtin/shortlog.c:354 msgid "sort output according to the number of commits per author" -msgstr "" +msgstr "urutkan keluaran berdasarkan jumlah komit per pengarang" #: builtin/shortlog.c:356 msgid "suppress commit descriptions, only provides commit count" -msgstr "" +msgstr "sembunyikan deskripsi komit, hanya sediakan hitungan komit" #: builtin/shortlog.c:358 msgid "show the email address of each author" -msgstr "" +msgstr "perlihatkan alamat email setiap pengarang" #: builtin/shortlog.c:359 msgid "<w>[,<i1>[,<i2>]]" -msgstr "" +msgstr "<w>[,<i1>[,<i2>]]" #: builtin/shortlog.c:360 msgid "linewrap output" -msgstr "" +msgstr "bungkus-baris keluaran" #: builtin/shortlog.c:362 msgid "field" -msgstr "" +msgstr "bidang" #: builtin/shortlog.c:363 msgid "group by field" -msgstr "" +msgstr "kelompokkan oleh bidang" #: builtin/shortlog.c:391 msgid "too many arguments given outside repository" -msgstr "" +msgstr "terlalu banyak argumen diberikan di luar repositori" #: builtin/show-branch.c:13 msgid "" @@ -21041,178 +21201,185 @@ msgid "" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" +"\t\t[--current] [--color[=<kapan>] | --no-color] [--sparse]\n" +"\t\t[--more=<n> | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [(<revisi> | <glob>)...]" #: builtin/show-branch.c:17 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "" +msgstr "git show-branch (-g | --reflog)[=<n>[,<dasar>]] [--list] [<referensi>]" #: builtin/show-branch.c:395 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "mengabaikan %s; tidak dapat menangani lebih dari %d referensi" +msgstr[1] "mengabaikan %s; tidak dapat menangani lebih dari %d referensi" #: builtin/show-branch.c:548 #, c-format msgid "no matching refs with %s" -msgstr "" +msgstr "tidak ada referensi yang cocok dengan %s" #: builtin/show-branch.c:645 msgid "show remote-tracking and local branches" -msgstr "" +msgstr "perlihatkan cabang pelacak remote dan lokal" #: builtin/show-branch.c:647 msgid "show remote-tracking branches" -msgstr "" +msgstr "perlihatkan cabang pelacak remote" #: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" -msgstr "" +msgstr "warna '*!+-' bersesuaian pada cabang" #: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" -msgstr "" +msgstr "perlihatkan <n> komit lagi setelah nenek moyang yang sama" #: builtin/show-branch.c:653 msgid "synonym to more=-1" -msgstr "" +msgstr "sinonim untuk more=-1" #: builtin/show-branch.c:654 msgid "suppress naming strings" -msgstr "" +msgstr "sembunyikan untai penamaan" #: builtin/show-branch.c:656 msgid "include the current branch" -msgstr "" +msgstr "masukkan cabang saat ini" #: builtin/show-branch.c:658 msgid "name commits with their object names" -msgstr "" +msgstr "namai komit dengan nama objeknya" #: builtin/show-branch.c:660 msgid "show possible merge bases" -msgstr "" +msgstr "perlihatkan dasar penggabungan yang mungkin" #: builtin/show-branch.c:662 msgid "show refs unreachable from any other ref" -msgstr "" +msgstr "perlihatkan referensi yang tidak dapat dicapai dari referensi yang lainnya" #: builtin/show-branch.c:664 msgid "show commits in topological order" -msgstr "" +msgstr "perlihatkan komit dalam urutan topologis" #: builtin/show-branch.c:667 msgid "show only commits not on the first branch" -msgstr "" +msgstr "hanya perlihatkan komit yang bukan pada cabang pertama" #: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" -msgstr "" +msgstr "perlihatkan penggabungan yang bisa dicapai hanya dari satu ujung" #: builtin/show-branch.c:671 msgid "topologically sort, maintaining date order where possible" -msgstr "" +msgstr "urutkan secara topologis, pelihara urutan tanggal bila memungkinkan" #: builtin/show-branch.c:674 msgid "<n>[,<base>]" -msgstr "" +msgstr "<n>[,<dasar>]" #: builtin/show-branch.c:675 msgid "show <n> most recent ref-log entries starting at base" -msgstr "" +msgstr "perlihatkan <n> entri ref-log terkini dimulai dari dasar" #: builtin/show-branch.c:711 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" +"--reflog tidak kompatibel dengan --all, --remotes, --independent atau --merge-base" #: builtin/show-branch.c:735 msgid "no branches given, and HEAD is not valid" -msgstr "" +msgstr "tidak ada cabang yang diberikan, dan HEAD tidak valid" #: builtin/show-branch.c:738 msgid "--reflog option needs one branch name" -msgstr "" +msgstr "opsi --reflog butuh satu nama cabang" #: builtin/show-branch.c:741 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "hanya %d entri yang bisa diperlihatkan pada satu waktu." +msgstr[1] "hanya %d entri yang bisa diperlihatkan pada satu waktu." #: builtin/show-branch.c:745 #, c-format msgid "no such ref %s" -msgstr "" +msgstr "tidak ada referensi seperti %s" #: builtin/show-branch.c:831 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "tidak dapat menangani lebih dari %d revisi." +msgstr[1] "tidak dapat menangani lebih dari %d revisi." #: builtin/show-branch.c:835 #, c-format msgid "'%s' is not a valid ref." -msgstr "" +msgstr "'%s' bukan sebuah referensi yang valid." #: builtin/show-branch.c:838 #, c-format msgid "cannot find commit %s (%s)" -msgstr "" +msgstr "tidak dapat menemukan komit %s (%s)" #: builtin/show-index.c:21 msgid "hash-algorithm" -msgstr "" +msgstr "algoritma hash" #: builtin/show-index.c:31 msgid "Unknown hash algorithm" -msgstr "" +msgstr "algoritma hash tidak dikenal" #: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] " +"[-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pola>...]" #: builtin/show-ref.c:13 msgid "git show-ref --exclude-existing[=<pattern>]" -msgstr "" +msgstr "git show-ref --exclude-existing[=<pola>]" #: builtin/show-ref.c:162 msgid "only show tags (can be combined with heads)" -msgstr "" +msgstr "hanya perlihatkan tag (bisa dikombinasikan dengan kepala)" #: builtin/show-ref.c:163 msgid "only show heads (can be combined with tags)" -msgstr "" +msgstr "hanya perlihatkan kepala (bisa dikombinasikan dengan tag)" #: builtin/show-ref.c:164 msgid "stricter reference checking, requires exact ref path" -msgstr "" +msgstr "pemeriksaan referensi lebih ketat, butuh jalur referensi eksak" #: builtin/show-ref.c:167 builtin/show-ref.c:169 msgid "show the HEAD reference, even if it would be filtered out" -msgstr "" +msgstr "perlihatkan referensi HEAD, bahkan jika itu akan disaring" #: builtin/show-ref.c:171 msgid "dereference tags into object IDs" -msgstr "" +msgstr "dereferensi tag ke dalam ID objek" #: builtin/show-ref.c:173 msgid "only show SHA1 hash using <n> digits" -msgstr "" +msgstr "hanya perlihatkan hash SHA1 menggunakan <n> digit" #: builtin/show-ref.c:177 msgid "do not print results to stdout (useful with --verify)" -msgstr "" +msgstr "jangan cetak hasil ke keluaran standar (berguna dengan --verify)" #: builtin/show-ref.c:179 msgid "show refs from stdin that aren't in local repository" -msgstr "" +msgstr "perlihatkan referensi dari masukan standar yang tidak ada dalam repositori lokal" #: builtin/sparse-checkout.c:22 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" @@ -21313,10 +21480,6 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stase>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <nama cabang> [<stase>]" -#: builtin/stash.c:29 builtin/stash.c:70 -msgid "git stash clear" -msgstr "git stash clear" - #: builtin/stash.c:30 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" @@ -21467,95 +21630,95 @@ msgstr "masukkan berkas tak terlacak ke dalam stase" msgid "only show untracked files in the stash" msgstr "hanya perlihatkan berkas tak terlacak dalam stase" -#: builtin/stash.c:932 builtin/stash.c:969 +#: builtin/stash.c:929 builtin/stash.c:966 #, c-format msgid "Cannot update %s with %s" msgstr "Tidak dapat memperbarui %s dengan %s" -#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671 +#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667 msgid "stash message" msgstr "pesan stase" -#: builtin/stash.c:960 +#: builtin/stash.c:957 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" butuh satu argumen <komit>" -#: builtin/stash.c:1175 +#: builtin/stash.c:1171 msgid "No changes selected" msgstr "Tidak ada perubahan yang dipilih" -#: builtin/stash.c:1275 +#: builtin/stash.c:1271 msgid "You do not have the initial commit yet" msgstr "Anda belum punya komit awal" -#: builtin/stash.c:1302 +#: builtin/stash.c:1298 msgid "Cannot save the current index state" msgstr "Tidak dapat menyimpan keadaan indeks saat ini" -#: builtin/stash.c:1311 +#: builtin/stash.c:1307 msgid "Cannot save the untracked files" msgstr "Tidak dapat menyimpan berkas tak terlacak" -#: builtin/stash.c:1322 builtin/stash.c:1331 +#: builtin/stash.c:1318 builtin/stash.c:1327 msgid "Cannot save the current worktree state" msgstr "Tidak dapat menyimpang keadaan pohon kerja saat ini" -#: builtin/stash.c:1359 +#: builtin/stash.c:1355 msgid "Cannot record working tree state" msgstr "Tidak dapat merekam keadaan pohon kerja" -#: builtin/stash.c:1408 +#: builtin/stash.c:1404 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Tidak dapat menggunakan --patch dan --include-untracked atau --all pada " "waktu yang bersamaan" -#: builtin/stash.c:1426 +#: builtin/stash.c:1422 msgid "Did you forget to 'git add'?" msgstr "Anda lupa untuk 'git add'?" -#: builtin/stash.c:1441 +#: builtin/stash.c:1437 msgid "No local changes to save" msgstr "Tidak ada perubahan lokal untuk disimpan" -#: builtin/stash.c:1448 +#: builtin/stash.c:1444 msgid "Cannot initialize stash" msgstr "Tidak dapat menginisialisasi stase" -#: builtin/stash.c:1463 +#: builtin/stash.c:1459 msgid "Cannot save the current status" msgstr "Tidak dapat menyimpan status saat ini" -#: builtin/stash.c:1468 +#: builtin/stash.c:1464 #, c-format msgid "Saved working directory and index state %s" msgstr "Direktori kerja dan keadaan indeks %s disimpan" -#: builtin/stash.c:1558 +#: builtin/stash.c:1554 msgid "Cannot remove worktree changes" msgstr "Tidak dapat menghapus perubahaan pohon kerja" -#: builtin/stash.c:1597 builtin/stash.c:1662 +#: builtin/stash.c:1593 builtin/stash.c:1658 msgid "keep index" msgstr "jaga indeks" -#: builtin/stash.c:1599 builtin/stash.c:1664 +#: builtin/stash.c:1595 builtin/stash.c:1660 msgid "stash in patch mode" msgstr "stase dalam mode tambalan" -#: builtin/stash.c:1600 builtin/stash.c:1665 +#: builtin/stash.c:1596 builtin/stash.c:1661 msgid "quiet mode" msgstr "mode hening" -#: builtin/stash.c:1602 builtin/stash.c:1667 +#: builtin/stash.c:1598 builtin/stash.c:1663 msgid "include untracked files in stash" msgstr "masukkan berkas tak terlacak ke dalam stase" -#: builtin/stash.c:1604 builtin/stash.c:1669 +#: builtin/stash.c:1600 builtin/stash.c:1665 msgid "include ignore files" msgstr "masukkan berkas ignore" -#: builtin/stash.c:1704 +#: builtin/stash.c:1700 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -21579,41 +21742,41 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Mengharapkan nama referensi penuh, dapat %s" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:63 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote tidak membutuhkan argumen" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:101 #, c-format msgid "cannot strip one component off url '%s'" msgstr "tidak dapat mencopot satu komponen dari url '%s'" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "jangkar alternatif untuk jalur relatif" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:414 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<jalur>] [<jalur>...]" -#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "" "Tidak ada url yang ditemukan untuk jalur submodul '%s' dalam .gitmodules" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "Memasuki '%s'\n" -#: builtin/submodule--helper.c:528 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -21622,7 +21785,7 @@ msgstr "" "run_command mengembalikan status bukan nol untuk %s\n" "." -#: builtin/submodule--helper.c:550 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -21633,21 +21796,21 @@ msgstr "" "bersarang %s\n" "." -#: builtin/submodule--helper.c:566 +#: builtin/submodule--helper.c:565 msgid "suppress output of entering each submodule command" msgstr "sembunyikan keluaran memasuki setiap perintah submodul" -#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889 -#: builtin/submodule--helper.c:1488 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:1487 msgid "recurse into nested submodules" msgstr "rekursi ke dalam submodul bersarang" -#: builtin/submodule--helper.c:573 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "" "git submodule--helper foreach [--quiet] [--recursive] [--] [<perintah>]" -#: builtin/submodule--helper.c:600 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -21656,54 +21819,54 @@ msgstr "" "tidak dapat mencari konfigurasi '%s'. Asumsi bahwa repositori ini adalah " "hulu otoritatif tersendiri." -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:666 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Gagal mendaftarkan url untuk jalur submodul '%s'" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:670 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Submodul '%s' (%s) didaftarkan untuk jalur '%s'\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:680 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "peringatan: perintah mode pembaruan disarankan untuk submodul '%s'\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:687 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Gagal mendaftarkan mode pembaruan untuk jalur submodul '%s'" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:709 msgid "suppress output for initializing a submodule" msgstr "sembunyikan keluaran menginisialisasi submodul" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<opsi>] [<jalur>]" -#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "tidak ada pemetaan submodul ditemukan di .gitmodules untuk jalur '%s'" -#: builtin/submodule--helper.c:836 +#: builtin/submodule--helper.c:835 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "tidak dapat menguraikan referensi HEAD di dalam submodul '%s'" -#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "gagal merekursi ke dalam submodul '%s'" -#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "suppress submodule status output" msgstr "sembunyikan keluaran status submodul" -#: builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:887 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -21711,97 +21874,97 @@ msgstr "" "gunakan komit yang disimpan di dalam indeks daripada yang disimpan di dalam " "HEAD" -#: builtin/submodule--helper.c:894 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<jalur>...]" -#: builtin/submodule--helper.c:918 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <jalur>" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:989 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodul)" -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:992 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(submodul)->%s(blob)" -#: builtin/submodule--helper.c:1006 +#: builtin/submodule--helper.c:1005 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1056 +#: builtin/submodule--helper.c:1055 #, c-format msgid "couldn't hash object from '%s'" msgstr "tidak dapat hash objek dari '%s'" -#: builtin/submodule--helper.c:1060 +#: builtin/submodule--helper.c:1059 #, c-format msgid "unexpected mode %o\n" msgstr "mode tidak diharapkan %o\n" -#: builtin/submodule--helper.c:1301 +#: builtin/submodule--helper.c:1300 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "gunakan komit yang disimpan di dalam indeks daripada HEAD submodul" -#: builtin/submodule--helper.c:1303 -msgid "to compare the commit in the index with that in the submodule HEAD" +#: builtin/submodule--helper.c:1302 +msgid "compare the commit in the index with that in the submodule HEAD" msgstr "" -"untuk membandingkan komit di dalam indeks dengan yang di dalam HEAD submodul" +"bandingkan komit di dalam indeks dengan yang di dalam HEAD submodul" -#: builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1304 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "lewatkan submodul dengan nilai 'ignore_config' disetel ke 'all'" -#: builtin/submodule--helper.c:1307 +#: builtin/submodule--helper.c:1306 msgid "limit the summary size" msgstr "batasi ukuran ringkasan" -#: builtin/submodule--helper.c:1312 +#: builtin/submodule--helper.c:1311 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "git submodule--helper summary [<opsi>] [<commit>] -- [<jalur>]" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1335 msgid "could not fetch a revision for HEAD" msgstr "tidak dapat mengambil revisi untuk HEAD" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1340 msgid "--cached and --files are mutually exclusive" msgstr "--cached dan --files saling eksklusif" -#: builtin/submodule--helper.c:1408 +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Mensinkronisasi url submodul untuk '%s'\n" -#: builtin/submodule--helper.c:1414 +#: builtin/submodule--helper.c:1413 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "gagal mendaftarkan url untuk jalur submodul '%s'" -#: builtin/submodule--helper.c:1428 +#: builtin/submodule--helper.c:1427 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "gagal mendapatkan remote asali untuk submodul '%s'" -#: builtin/submodule--helper.c:1439 +#: builtin/submodule--helper.c:1438 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "gagal memperbarui remote untuk submodul '%s'" -#: builtin/submodule--helper.c:1486 +#: builtin/submodule--helper.c:1485 msgid "suppress output of synchronizing submodule url" msgstr "sembunyikan keluaran mensinkronisasi url submodul" -#: builtin/submodule--helper.c:1493 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<jalur>]" -#: builtin/submodule--helper.c:1547 +#: builtin/submodule--helper.c:1546 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -21810,7 +21973,7 @@ msgstr "" "Pohon kerja submodul '%s' berisi direktori .git (gunakan 'rm -rf' bila Anda " "benar-benar ingin menghapus itu termasuk semua riwayatnya)" -#: builtin/submodule--helper.c:1559 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -21819,46 +21982,46 @@ msgstr "" "Pohon kerja submodul '%s' berisi modifikasi lokal; gunakan '-f' untuk " "menyingkirkan itu" -#: builtin/submodule--helper.c:1567 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "Direktori '%s' dibersihkan\n" -#: builtin/submodule--helper.c:1569 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Tidak dapat menghapus pohon kerja submodul '%s'\n" -#: builtin/submodule--helper.c:1580 +#: builtin/submodule--helper.c:1579 #, c-format msgid "could not create empty submodule directory %s" msgstr "tidak dapat membuat direktori submodul kosong %s" -#: builtin/submodule--helper.c:1596 +#: builtin/submodule--helper.c:1595 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Submodul '%s' (%s) tak terdaftar untuk jalur '%s'\n" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1624 msgid "remove submodule working trees even if they contain local changes" msgstr "hapus pohon kerja submodul bahkan jika itu berisi perubahan lokal" -#: builtin/submodule--helper.c:1626 +#: builtin/submodule--helper.c:1625 msgid "unregister all submodules" msgstr "batal daftar semua submodul" -#: builtin/submodule--helper.c:1631 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<jalur>...]]" -#: builtin/submodule--helper.c:1645 +#: builtin/submodule--helper.c:1644 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Gunakan '--all' jika Anda benar-benar ingin deinisialisasi semua submodul" -#: builtin/submodule--helper.c:1714 +#: builtin/submodule--helper.c:1713 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -21870,46 +22033,46 @@ msgstr "" " itu, setel submodule.alternateErrorStrategy ke 'info' atau yang sama,\n" "kloning degan '--reference-if-able' daripada '--reference'." -#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756 +#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "submodul '%s' tidak dapat menambahkan pengganti: %s" -#: builtin/submodule--helper.c:1792 +#: builtin/submodule--helper.c:1791 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Nilai '%s' untuk submodule.alternateErrorStrategy tidak dikenal" -#: builtin/submodule--helper.c:1799 +#: builtin/submodule--helper.c:1798 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Nilai '%s' untuk submodule.alternateLocation tidak dikenal" -#: builtin/submodule--helper.c:1823 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "di mana submodul baru akan dikloning" -#: builtin/submodule--helper.c:1826 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "nama submodul baru" -#: builtin/submodule--helper.c:1829 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "url di mana submodul dikloning" -#: builtin/submodule--helper.c:1837 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "kedalaman untuk kloning dangkal" -#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "paksa perkembangan kloning" -#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 msgid "disallow cloning into non-empty directory" msgstr "tak perbolehkan kloning ke dalam direktori bukan kosong" -#: builtin/submodule--helper.c:1849 +#: builtin/submodule--helper.c:1848 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -21919,103 +22082,103 @@ msgstr "" "<repositori>] [--name <nama>] [--depth <kedalaman>] [--single-branch] --url " "<url> --path <jalur>" -#: builtin/submodule--helper.c:1874 +#: builtin/submodule--helper.c:1873 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "" "menolak membuat/menggunakan '%s' di dalam direktori git submodul yang lain" -#: builtin/submodule--helper.c:1885 +#: builtin/submodule--helper.c:1884 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "gagal mengkloning '%s' ke dalam jalur submodul '%s'" -#: builtin/submodule--helper.c:1889 +#: builtin/submodule--helper.c:1888 #, c-format msgid "directory not empty: '%s'" msgstr "direktori tidak kosong: '%s'" -#: builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" msgstr "tidak dapat mendapatkan direktori submodul untuk '%s'" -#: builtin/submodule--helper.c:1937 +#: builtin/submodule--helper.c:1936 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'" -#: builtin/submodule--helper.c:1941 +#: builtin/submodule--helper.c:1940 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'" -#: builtin/submodule--helper.c:2042 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Jalur submodul '%s' tidak diinisialisasi" -#: builtin/submodule--helper.c:2046 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "Mungkin Anda ingin menggunakan 'update --init'?" -#: builtin/submodule--helper.c:2076 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Melewati submodul tak tergabung %s" -#: builtin/submodule--helper.c:2105 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "Melewati submodul '%s'" -#: builtin/submodule--helper.c:2255 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Gagal mengkloning '%s'. Percobaan ulang dijadwalkan" -#: builtin/submodule--helper.c:2266 +#: builtin/submodule--helper.c:2265 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Gagal mengkloning '%s' untuk kedua kalinya, batalkan" -#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "jalur ke dalam pohon kerja" -#: builtin/submodule--helper.c:2331 +#: builtin/submodule--helper.c:2330 msgid "path into the working tree, across nested submodule boundaries" msgstr "jalur ke dalam pohon kerja, melintasi perbatasan submodul bersarang" -#: builtin/submodule--helper.c:2335 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "dasarkan ulang, gabungkan, checkout atau tidak sama sekali" -#: builtin/submodule--helper.c:2341 +#: builtin/submodule--helper.c:2340 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "buat klon dangkal terpotong hingga sejumlah revisi yang disebutkan" -#: builtin/submodule--helper.c:2344 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "pekerjaan paralel" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2345 msgid "whether the initial clone should follow the shallow recommendation" msgstr "apakah klon awal seharusnya mengikuti rekomendasi dangkal" -#: builtin/submodule--helper.c:2347 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "jangan cetak perkembangan pengkloningan" -#: builtin/submodule--helper.c:2358 +#: builtin/submodule--helper.c:2357 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<jalur>] [<jalur>...]" -#: builtin/submodule--helper.c:2371 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "nilai jelek untuk parameter pembaruan" -#: builtin/submodule--helper.c:2419 +#: builtin/submodule--helper.c:2418 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -22024,84 +22187,84 @@ msgstr "" "Cabang submodul (%s) dikonfigurasikan untuk mewarisi cabang dari proyek " "super, tapi proyek super tidak pada cabang apapun" -#: builtin/submodule--helper.c:2542 +#: builtin/submodule--helper.c:2541 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "tidak dapat mendapat pegangan repositori untuk submodul '%s'" -#: builtin/submodule--helper.c:2575 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "rekursi ke dalam submodul" -#: builtin/submodule--helper.c:2581 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "giit submodule--helper absorb-git-dirs [<opsi>] [<jalur>...]" +msgstr "git submodule--helper absorb-git-dirs [<opsi>] [<jalur>...]" -#: builtin/submodule--helper.c:2637 +#: builtin/submodule--helper.c:2636 msgid "check if it is safe to write to the .gitmodules file" msgstr "periksa apakah itu aman untuk menulis ke berkas .gitmodules" -#: builtin/submodule--helper.c:2640 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "batal setel konfigurasi dalam berkas .gitmodules" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <nama> [<nilai>]" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nama>" -#: builtin/submodule--helper.c:2647 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2666 git-submodule.sh:150 +#: builtin/submodule--helper.c:2665 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "mohom pastikan berkas .gitmodules di dalam pohon kerja" -#: builtin/submodule--helper.c:2682 +#: builtin/submodule--helper.c:2681 msgid "suppress output for setting url of a submodule" msgstr "sembunyikan keluaran penyetelan url submodule" -#: builtin/submodule--helper.c:2686 +#: builtin/submodule--helper.c:2685 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <jalur> <url baru>" -#: builtin/submodule--helper.c:2719 +#: builtin/submodule--helper.c:2718 msgid "set the default tracking branch to master" msgstr "setel cabang pelacak asali ke master" -#: builtin/submodule--helper.c:2721 +#: builtin/submodule--helper.c:2720 msgid "set the default tracking branch" msgstr "setel cabang pelacak asali" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2724 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <jalur>" -#: builtin/submodule--helper.c:2726 +#: builtin/submodule--helper.c:2725 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <cabang> <jalur>" -#: builtin/submodule--helper.c:2733 +#: builtin/submodule--helper.c:2732 msgid "--branch or --default required" msgstr "--branch atau --default dibutuhkan" -#: builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2735 msgid "--branch and --default are mutually exclusive" msgstr "--branch dan --default saling eksklusif" -#: builtin/submodule--helper.c:2793 git.c:449 git.c:724 +#: builtin/submodule--helper.c:2792 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s tidak mendukung --super-prefix" -#: builtin/submodule--helper.c:2799 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' bukan subperintah submodule--helper valid" @@ -22712,7 +22875,7 @@ msgstr "" msgid "git worktree unlock <path>" msgstr "" -#: builtin/worktree.c:61 builtin/worktree.c:935 +#: builtin/worktree.c:61 builtin/worktree.c:944 #, c-format msgid "failed to delete '%s'" msgstr "" @@ -22722,59 +22885,63 @@ msgstr "" msgid "Removing %s/%s: %s" msgstr "" -#: builtin/worktree.c:149 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "" -#: builtin/worktree.c:151 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" msgstr "" -#: builtin/worktree.c:221 +#: builtin/worktree.c:219 #, c-format msgid "'%s' already exists" msgstr "" -#: builtin/worktree.c:230 +#: builtin/worktree.c:228 #, c-format msgid "unusable worktree destination '%s'" msgstr "" -#: builtin/worktree.c:235 +#: builtin/worktree.c:233 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" "use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:237 +#: builtin/worktree.c:235 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" "use '%s -f' to override, or 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:288 +#: builtin/worktree.c:286 #, c-format msgid "could not create directory of '%s'" msgstr "" -#: builtin/worktree.c:422 builtin/worktree.c:428 +#: builtin/worktree.c:308 +msgid "initializing" +msgstr "" + +#: builtin/worktree.c:420 builtin/worktree.c:426 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "" -#: builtin/worktree.c:424 +#: builtin/worktree.c:422 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" -#: builtin/worktree.c:433 +#: builtin/worktree.c:431 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "" -#: builtin/worktree.c:439 +#: builtin/worktree.c:437 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "" @@ -22799,147 +22966,155 @@ msgstr "" msgid "keep the new working tree locked" msgstr "" -#: builtin/worktree.c:493 +#: builtin/worktree.c:492 builtin/worktree.c:729 +msgid "reason for locking" +msgstr "" + +#: builtin/worktree.c:495 msgid "set up tracking mode (see git-branch(1))" msgstr "" -#: builtin/worktree.c:496 +#: builtin/worktree.c:498 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" -#: builtin/worktree.c:504 +#: builtin/worktree.c:506 msgid "-b, -B, and --detach are mutually exclusive" msgstr "" -#: builtin/worktree.c:565 +#: builtin/worktree.c:508 +msgid "--reason requires --lock" +msgstr "" + +#: builtin/worktree.c:512 +msgid "added with --lock" +msgstr "" + +#: builtin/worktree.c:574 msgid "--[no-]track can only be used if a new branch is created" msgstr "" -#: builtin/worktree.c:682 +#: builtin/worktree.c:691 msgid "show extended annotations and reasons, if available" msgstr "" -#: builtin/worktree.c:684 +#: builtin/worktree.c:693 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "" -#: builtin/worktree.c:693 +#: builtin/worktree.c:702 msgid "--verbose and --porcelain are mutually exclusive" msgstr "" -#: builtin/worktree.c:720 -msgid "reason for locking" -msgstr "" - -#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839 -#: builtin/worktree.c:963 +#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 +#: builtin/worktree.c:972 #, c-format msgid "'%s' is not a working tree" msgstr "" -#: builtin/worktree.c:734 builtin/worktree.c:767 +#: builtin/worktree.c:743 builtin/worktree.c:776 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:739 +#: builtin/worktree.c:748 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:741 +#: builtin/worktree.c:750 #, c-format msgid "'%s' is already locked" msgstr "" -#: builtin/worktree.c:769 +#: builtin/worktree.c:778 #, c-format msgid "'%s' is not locked" msgstr "" -#: builtin/worktree.c:810 +#: builtin/worktree.c:819 msgid "working trees containing submodules cannot be moved or removed" msgstr "" -#: builtin/worktree.c:818 +#: builtin/worktree.c:827 msgid "force move even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:841 builtin/worktree.c:965 +#: builtin/worktree.c:850 builtin/worktree.c:974 #, c-format msgid "'%s' is a main working tree" msgstr "" -#: builtin/worktree.c:846 +#: builtin/worktree.c:855 #, c-format msgid "could not figure out destination name from '%s'" msgstr "" -#: builtin/worktree.c:859 +#: builtin/worktree.c:868 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:861 +#: builtin/worktree.c:870 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:864 +#: builtin/worktree.c:873 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" -#: builtin/worktree.c:869 +#: builtin/worktree.c:878 #, c-format msgid "failed to move '%s' to '%s'" msgstr "" -#: builtin/worktree.c:915 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "" -#: builtin/worktree.c:919 +#: builtin/worktree.c:928 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -#: builtin/worktree.c:924 +#: builtin/worktree.c:933 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "" -#: builtin/worktree.c:947 +#: builtin/worktree.c:956 msgid "force removal even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:970 +#: builtin/worktree.c:979 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:972 +#: builtin/worktree.c:981 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:975 +#: builtin/worktree.c:984 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" -#: builtin/worktree.c:999 +#: builtin/worktree.c:1008 #, c-format msgid "repair: %s: %s" msgstr "" -#: builtin/worktree.c:1002 +#: builtin/worktree.c:1011 #, c-format msgid "error: %s: %s" msgstr "" @@ -23262,7 +23437,7 @@ msgstr "" msgid "Could not set SSL backend to '%s': already set" msgstr "" -#: http.c:2035 +#: http.c:2034 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -23309,95 +23484,95 @@ msgstr "" msgid "redirecting to %s" msgstr "" -#: remote-curl.c:642 +#: remote-curl.c:644 msgid "shouldn't have EOF when not gentle on EOF" msgstr "" -#: remote-curl.c:654 -msgid "remote server sent stateless separator" +#: remote-curl.c:656 +msgid "remote server sent unexpected response end packet" msgstr "" -#: remote-curl.c:724 +#: remote-curl.c:726 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" -#: remote-curl.c:754 +#: remote-curl.c:756 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "" -#: remote-curl.c:756 +#: remote-curl.c:758 msgid "remote-curl: unexpected response end packet" msgstr "" -#: remote-curl.c:832 +#: remote-curl.c:834 #, c-format msgid "RPC failed; %s" msgstr "" -#: remote-curl.c:872 +#: remote-curl.c:874 msgid "cannot handle pushes this big" msgstr "" -#: remote-curl.c:987 +#: remote-curl.c:989 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "" -#: remote-curl.c:991 +#: remote-curl.c:993 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "" -#: remote-curl.c:1041 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of length header were received" msgstr "" -#: remote-curl.c:1043 +#: remote-curl.c:1045 #, c-format msgid "%d bytes of body are still expected" msgstr "" -#: remote-curl.c:1132 +#: remote-curl.c:1134 msgid "dumb http transport does not support shallow capabilities" msgstr "" -#: remote-curl.c:1147 +#: remote-curl.c:1149 msgid "fetch failed." msgstr "" -#: remote-curl.c:1193 +#: remote-curl.c:1195 msgid "cannot fetch by sha1 over smart http" msgstr "" -#: remote-curl.c:1237 remote-curl.c:1243 +#: remote-curl.c:1239 remote-curl.c:1245 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "" -#: remote-curl.c:1255 remote-curl.c:1373 +#: remote-curl.c:1257 remote-curl.c:1375 #, c-format msgid "http transport does not support %s" msgstr "" -#: remote-curl.c:1291 +#: remote-curl.c:1293 msgid "git-http-push failed" msgstr "" -#: remote-curl.c:1479 +#: remote-curl.c:1481 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "" -#: remote-curl.c:1511 +#: remote-curl.c:1513 msgid "remote-curl: error reading command stream from git" msgstr "" -#: remote-curl.c:1518 +#: remote-curl.c:1520 msgid "remote-curl: fetch attempted without a local repo" msgstr "" -#: remote-curl.c:1559 +#: remote-curl.c:1561 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "" @@ -24940,86 +25115,86 @@ msgstr "" msgid "invalid argument %s, expecting --" msgstr "" -#: git-send-email.perl:138 +#: git-send-email.perl:129 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "" -#: git-send-email.perl:145 git-send-email.perl:151 +#: git-send-email.perl:136 git-send-email.perl:142 msgid "local time offset greater than or equal to 24 hours\n" msgstr "" -#: git-send-email.perl:222 +#: git-send-email.perl:214 #, perl-format msgid "fatal: command '%s' died with exit code %d" msgstr "" -#: git-send-email.perl:235 +#: git-send-email.perl:227 msgid "the editor exited uncleanly, aborting everything" msgstr "" -#: git-send-email.perl:321 +#: git-send-email.perl:316 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" -#: git-send-email.perl:326 +#: git-send-email.perl:321 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "" -#: git-send-email.perl:419 +#: git-send-email.perl:450 msgid "--dump-aliases incompatible with other options\n" msgstr "" -#: git-send-email.perl:493 +#: git-send-email.perl:525 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" "Set sendemail.forbidSendmailVariables to false to disable this check.\n" msgstr "" -#: git-send-email.perl:498 git-send-email.perl:700 +#: git-send-email.perl:530 git-send-email.perl:746 msgid "Cannot run git format-patch from outside a repository\n" msgstr "" -#: git-send-email.perl:501 +#: git-send-email.perl:533 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "" -#: git-send-email.perl:514 +#: git-send-email.perl:546 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "" -#: git-send-email.perl:545 +#: git-send-email.perl:577 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "" -#: git-send-email.perl:573 +#: git-send-email.perl:617 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" -#: git-send-email.perl:575 +#: git-send-email.perl:619 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "" -#: git-send-email.perl:577 +#: git-send-email.perl:621 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "" -#: git-send-email.perl:582 +#: git-send-email.perl:626 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "" -#: git-send-email.perl:666 +#: git-send-email.perl:711 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -25029,29 +25204,29 @@ msgid "" " * Giving --format-patch option if you mean a range.\n" msgstr "" -#: git-send-email.perl:687 +#: git-send-email.perl:732 #, perl-format msgid "Failed to opendir %s: %s" msgstr "" -#: git-send-email.perl:720 +#: git-send-email.perl:767 msgid "" "\n" "No patch files specified!\n" "\n" msgstr "" -#: git-send-email.perl:733 +#: git-send-email.perl:780 #, perl-format msgid "No subject line in %s?" msgstr "" -#: git-send-email.perl:743 +#: git-send-email.perl:791 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "" -#: git-send-email.perl:754 +#: git-send-email.perl:802 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -25060,37 +25235,37 @@ msgid "" "Clear the body content if you don't wish to send a summary.\n" msgstr "" -#: git-send-email.perl:778 +#: git-send-email.perl:826 #, perl-format msgid "Failed to open %s: %s" msgstr "" -#: git-send-email.perl:795 +#: git-send-email.perl:843 #, perl-format msgid "Failed to open %s.final: %s" msgstr "" -#: git-send-email.perl:838 +#: git-send-email.perl:886 msgid "Summary email is empty, skipping it\n" msgstr "" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:873 +#: git-send-email.perl:935 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "" -#: git-send-email.perl:928 +#: git-send-email.perl:990 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" -#: git-send-email.perl:933 +#: git-send-email.perl:995 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "" -#: git-send-email.perl:941 +#: git-send-email.perl:1003 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -25099,20 +25274,20 @@ msgid "" "want to send.\n" msgstr "" -#: git-send-email.perl:960 +#: git-send-email.perl:1022 msgid "To whom should the emails be sent (if anyone)?" msgstr "" -#: git-send-email.perl:978 +#: git-send-email.perl:1040 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "" -#: git-send-email.perl:990 +#: git-send-email.perl:1052 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" -#: git-send-email.perl:1048 git-send-email.perl:1056 +#: git-send-email.perl:1114 git-send-email.perl:1122 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "" @@ -25120,16 +25295,16 @@ msgstr "" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1060 +#: git-send-email.perl:1126 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" -#: git-send-email.perl:1377 +#: git-send-email.perl:1446 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "" -#: git-send-email.perl:1460 +#: git-send-email.perl:1529 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -25146,112 +25321,112 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1475 +#: git-send-email.perl:1544 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "" -#: git-send-email.perl:1478 +#: git-send-email.perl:1547 msgid "Send this email reply required" msgstr "" -#: git-send-email.perl:1506 +#: git-send-email.perl:1581 msgid "The required SMTP server is not properly defined." msgstr "" -#: git-send-email.perl:1553 +#: git-send-email.perl:1628 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "" -#: git-send-email.perl:1558 git-send-email.perl:1562 +#: git-send-email.perl:1633 git-send-email.perl:1637 #, perl-format msgid "STARTTLS failed! %s" msgstr "" -#: git-send-email.perl:1571 +#: git-send-email.perl:1646 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" -#: git-send-email.perl:1589 +#: git-send-email.perl:1664 #, perl-format msgid "Failed to send %s\n" msgstr "" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Dry-Sent %s\n" msgstr "" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Sent %s\n" msgstr "" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "Dry-OK. Log says:\n" msgstr "" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "OK. Log says:\n" msgstr "" -#: git-send-email.perl:1606 +#: git-send-email.perl:1688 msgid "Result: " msgstr "" -#: git-send-email.perl:1609 +#: git-send-email.perl:1691 msgid "Result: OK\n" msgstr "" -#: git-send-email.perl:1627 +#: git-send-email.perl:1709 #, perl-format msgid "can't open file %s" msgstr "" -#: git-send-email.perl:1674 git-send-email.perl:1694 +#: git-send-email.perl:1756 git-send-email.perl:1776 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1680 +#: git-send-email.perl:1762 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1737 +#: git-send-email.perl:1819 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1772 +#: git-send-email.perl:1854 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1883 +#: git-send-email.perl:1965 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "" -#: git-send-email.perl:1890 +#: git-send-email.perl:1972 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "" -#: git-send-email.perl:1894 +#: git-send-email.perl:1976 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "" -#: git-send-email.perl:1924 +#: git-send-email.perl:2006 msgid "cannot send message as 7bit" msgstr "" -#: git-send-email.perl:1932 +#: git-send-email.perl:2014 msgid "invalid transfer encoding" msgstr "" -#: git-send-email.perl:1966 +#: git-send-email.perl:2051 #, perl-format msgid "" "fatal: %s: rejected by sendemail-validate hook\n" @@ -25259,29 +25434,38 @@ msgid "" "warning: no patches were sent\n" msgstr "" -#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039 +#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124 #, perl-format msgid "unable to open %s: %s\n" msgstr "" -#: git-send-email.perl:1979 +#: git-send-email.perl:2064 #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" "warning: no patches were sent\n" msgstr "" -#: git-send-email.perl:1997 +#: git-send-email.perl:2082 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:2001 +#: git-send-email.perl:2086 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "" +#~ msgid "git merge --abort" +#~ msgstr "git merge --abort" + +#~ msgid "git merge --continue" +#~ msgstr "git merge --continue" + +#~ msgid "git stash clear" +#~ msgstr "git stash clear" + #~ msgid "Already up to date. Yeeah!" #~ msgstr "Sudah terbaru. Ya!" diff --git a/po/pt_PT.po b/po/pt_PT.po index 3b15fccf9a..1b8437e735 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -1,5 +1,5 @@ -# Portugual's Portuguese translations for Git package. -# Copyright (C) 2020 Daniel Santos <hello@brighterdan.com> +# Portugal's Portuguese translations for Git package. +# Copyright (C) 2021 Daniel Santos <hello@brighterdan.com> # This file is distributed under the same license as the Git package. # Contributors: # - Daniel Santos <hello@brighterdan.com> @@ -12,129 +12,158 @@ # English | Portuguese # ---------------------------------+-------------------------------------- # 3-way merge | tri-junção -# abbreviate | -# alternate object database | -# amend | -# ancestor | -# annotated tag | +# abbreviate | abreviar +# alternate object database | base dados de objetos alternativa +# amend | emendar +# ancestor | antepassado +# annotated tag | etiqueta anotada # bare repository | repositório nú -# bisect | -# blob object | -# bloom filter | +# bisect | bifurcar +# blob object | objeto-blob # branch | ramo -# bundle | -# bypass | -# cache | cache -# chain | -# changeset | -# checkout | -# checksum | +# bundle | conjunto +# bypass | desviar +# cache | cenário +# chain | corrente +# changeset | memória +# checkout | observar +# checksum | checksum # cherry-picking | apanhar -# clean | -# clone | +# clean | limpa +# clone | clone # commit | memorizar # commit message | mensagem de memória -# commit object | objeto da memória +# commit object | objeto de memória # commit-ish (also committish) | mnemónica # conflict | conflito -# core Git | -# cover letter | +# core Git | núcleo-Git +# cover letter | carta de apresentação # DAG | DAG -# dangling object | objeto DAG +# dangling object | objeto perdido # detached HEAD | HEAD solta # directory | pasta -# dirty | -# dumb HTTP protocol | -# evil merge | -# fast-forward | +# dirty | suja +# dumb HTTP protocol | protocolo HTTP burro +# evil merge | junção malvada +# fast-forward | avanço # fetch | buscar -# file system | -# fork | aforquilhar -# Git archive | -# gitfile | -# grafts | -# hash | +# file system | sistema de ficheiro +# fork | ramificar +# Git archive | repositório +# gitfile | ficheiro-git +# grafts | enxertos +# hash | hash # HEAD | HEAD -# head | -# head ref | +# head | cabeça +# head ref | ref-cabeça # header | cabeçalho -# hook | +# hook | gancho # hunk | pedaço -# index | -# index entry | -# loose object | -# loose refs | -# master | +# index | cenário +# index entry | entrada de cenário +# loose object | objeto solto +# loose refs | refs soltas +# master | master # merge | junção -# object | -# object database | -# object identifier | -# object name | -# object type | -# octopus | -# origin | -# pack | -# pack index | -# packfile | -# parent | -# patch | -# pathspec | -# pattern | pattern -# pickaxe | -# plumbing | -# porcelain | -# precious-objects repo | -# prune | +# object | objeto +# object database | base dados de objeto +# object identifier | identificador de objeto +# object name | nome de objeto +# object type | tipo de objeto +# octopus | polvinho +# origin | origin +# pack | pacote +# pack index | índice de pacote +# packfile | ficheiro-pacote +# parent | parente +# patch | remendo +# pathspec | espetro-caminho +# pattern | padrão +# pickaxe | picareta +# plumbing | nuclear +# porcelain | porcelana +# precious-objects repo | repo de objetos preciosos +# prune | podar # pull | agarrar # push | atirar -# reachable | -# rebase | -# ref | -# reflog | -# refspec | -# remote | -# remote-tracking branch | -# replay | +# reachable | acessível +# rebase | rebasear +# ref | ref +# reflog | registo-ref +# refspec | espetro-ref +# remote | remoto +# remote-tracking branch | ramo remoto de monitorização +# replay | replay # repo | repo # repository | repositório -# reset | reposição -# resolve | +# reset | restabelecer +# resolve | resolver # revert | reverter # revision | revisão -# rewind | -# SCM | +# rewind | rebobinar +# SCM | SCM # SHA-1 | SHA-1 -# shallow repository | -# signed tag | -# smart HTTP protocol | -# squash | +# shallow repository | repositório raso +# signed tag | etiqueta assinada +# smart HTTP protocol | protocolo HTTP esperto +# squash | esmagar # squelch | suprimir -# stage | preparar -# stash | arrumos -# submodule | -# symref | -# tag | -# tag object | -# tagger | -# topic branch | -# track | seguir -# trailer | -# tree | -# tree object | -# tree-ish (also treeish) | -# unmerged index | -# unpack | -# unreachable object | -# unstage | despreparar +# stage | cenário +# stash | esconderijo +# submodule | submódulo +# superproject | super-projeto +# symref | ref-simbólica +# tag | etiqueta +# tag object | objeto-etiqueta +# tagger | etiquetador +# topic branch | ramo-tópico +# track | monitorizar +# trailer | atribuições +# tree | árvore +# tree object | objeto-árvore +# tree-ish (also treeish) | arvoredo +# unmerged index | cenário por juntar +# unpack | desempacotar +# unreachable object | objeto inacessível +# unstage | desencenar # upstream | upstream -# upstream branch | ramo upstream -# working tree | +# upstream branch | ramo-upstream +# working tree | árvore de trabalho +# +# +# Other translation table helper +# +# English | Portuguese +# ---------------------------------+-------------------------------------- +# apply | submeter +# bind | vincular +# call | chamar +# chain | série +# change | alteração +# default | predefinido +# delete | apagar +# edit | modificação +# feature | feição +# given | fornecido +# handle | pega +# in progress | em curso +# named | denominado +# not supported | insustentado +# parse | processar +# path | caminho +# scan | sondar +# set | definir +# sparse | disperso +# stat | stat +# support | sustenta +# untrack | desmonitorizar +# # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-12-15 16:27+0800\n" +"POT-Creation-Date: 2021-08-03 17:06+0800\n" "PO-Revision-Date: 2020-10-14 11:43+0100\n" "Last-Translator: Daniel Santos <hello@brighterdan.com>\n" "Language-Team: Git L10N Português <https://github.com/git-l10n-pt-PT/>\n" @@ -149,9 +178,9 @@ msgstr "" msgid "Huh (%s)?" msgstr "O quê (%s)?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284 -#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532 -#: builtin/rebase.c:1955 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 +#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 +#: builtin/rebase.c:1953 msgid "could not read index" msgstr "incapaz de ler index" @@ -177,9 +206,9 @@ msgstr "Atualizar" #: add-interactive.c:697 add-interactive.c:885 #, fuzzy, c-format msgid "could not stage '%s'" -msgstr "inacapaz de stage '%s'" +msgstr "incapaz de stage '%s'" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707 #, fuzzy msgid "could not write index" msgstr "incapaz de escrever index" @@ -196,7 +225,7 @@ msgstr[1] "actualizou %d paths\n" msgid "note: %s is untracked now.\n" msgstr "nota: %s agora está por seguir.\n" -#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:295 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" @@ -239,12 +268,12 @@ msgstr[1] "adicionei %d paths\n" msgid "ignoring unmerged: %s" msgstr "ignorando unmerged: %s" -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 +#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "Apenas ficheiros binários mudaram.\n" -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 +#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "Sem modificação.\n" @@ -273,7 +302,7 @@ msgstr "reverter conjunto das modificações staged de volta para a versão HEAD #: add-interactive.c:1016 #, fuzzy msgid "pick hunks and update selectively" -msgstr "apanha os pedaços e atualiza selectivamente" +msgstr "apanha os pedaços e atualiza seletivamente" #: add-interactive.c:1018 #, fuzzy @@ -330,11 +359,11 @@ msgstr "seleciona item numerado" msgid "(empty) select nothing" msgstr "(vazio) seleciona nada" -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 +#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** Comandos ***" -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 +#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893 msgid "What now" msgstr "E agora" @@ -346,10 +375,10 @@ msgstr "staged" msgid "unstaged" msgstr "unstaged" -#: add-interactive.c:1144 apply.c:4989 apply.c:4992 builtin/am.c:2257 -#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 -#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309 +#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128 +#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818 #: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 #: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 #: git-add--interactive.perl:213 @@ -361,7 +390,7 @@ msgstr "path" msgid "could not refresh index" msgstr "incapaz de reactualizar o index" -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 +#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "Adeus.\n" @@ -594,7 +623,7 @@ msgstr "" #: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 #, fuzzy, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Descartar modo de modficação de index e worktree [y,n,q,a,d%s,?]?" +msgstr "Descartar modo de modificação de index e worktree [y,n,q,a,d%s,?]?" #: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 #, fuzzy, c-format, perl-format @@ -676,36 +705,36 @@ msgstr "" "a - submeter este pedaço e qualquer próximo deste ficheiro\n" "d - declinar este pedaço e qualquer próximo deste ficheiro\n" -#: add-patch.c:342 +#: add-patch.c:343 #, fuzzy, c-format msgid "could not parse hunk header '%.*s'" -msgstr "incapaz de analisar ínicio de pedaço '%s'" +msgstr "incapaz de analisar início de pedaço '%s'" -#: add-patch.c:361 add-patch.c:365 +#: add-patch.c:362 add-patch.c:366 #, fuzzy, c-format msgid "could not parse colored hunk header '%.*s'" -msgstr "incapaz de analizar início de pedaço colorido '%.*s'" +msgstr "incapaz de analisar início de pedaço colorido '%.*s'" -#: add-patch.c:419 +#: add-patch.c:420 #, fuzzy msgid "could not parse diff" msgstr "incapaz de analisar diff" -#: add-patch.c:438 +#: add-patch.c:439 #, fuzzy msgid "could not parse colored diff" msgstr "incapaz de analisar diff colorido" -#: add-patch.c:452 +#: add-patch.c:453 #, fuzzy, c-format msgid "failed to run '%s'" -msgstr "falha ao executar '%s'" +msgstr "falhou executar '%s'" -#: add-patch.c:611 +#: add-patch.c:612 msgid "mismatched output from interactive.diffFilter" msgstr "sem match de output de interactive.diffFilter" -#: add-patch.c:612 +#: add-patch.c:613 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -713,7 +742,7 @@ msgstr "" "O teu filtro tem de manter uma correspondência exata\n" "entre seu input e linhas output." -#: add-patch.c:790 +#: add-patch.c:791 #, fuzzy, c-format msgid "" "expected context line #%d in\n" @@ -722,7 +751,7 @@ msgstr "" "linha de contexto esperada #%d em\n" "%.*s" -#: add-patch.c:805 +#: add-patch.c:806 #, c-format msgid "" "hunks do not overlap:\n" @@ -735,11 +764,11 @@ msgstr "" "\ttermina sem:\n" "%.*s" -#: add-patch.c:1081 git-add--interactive.perl:1115 +#: add-patch.c:1082 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Modo de edição manual de pedaço -- ver final para guia rápido.\n" -#: add-patch.c:1085 +#: add-patch.c:1086 #, fuzzy, c-format msgid "" "---\n" @@ -753,7 +782,7 @@ msgstr "" "Linhas começadas com %c serão removidas.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1099 git-add--interactive.perl:1129 +#: add-patch.c:1100 git-add--interactive.perl:1129 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" @@ -763,12 +792,12 @@ msgstr "" "editar. Se todas as linhas deste pedaço forem removidas, então a edição\n" "é abortada e este pedaço é deixado inalterado.\n" -#: add-patch.c:1132 +#: add-patch.c:1133 #, fuzzy msgid "could not parse hunk header" msgstr "incapaz interpretar início de pedaço" -#: add-patch.c:1177 +#: add-patch.c:1178 msgid "'git apply --cached' failed" msgstr "'git apply --cached' falhou" @@ -784,27 +813,27 @@ msgstr "'git apply --cached' falhou" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1246 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" -"Problema na submissão de pedaço editado. Editar de novo (responder " -"\"n\" para \"não\" descarta!) [y/n]? " +"Problema na submissão de pedaço editado. Editar de novo (responder \"n\" " +"para \"não\" descarta!) [y/n]? " -#: add-patch.c:1289 +#: add-patch.c:1290 #, fuzzy msgid "The selected hunks do not apply to the index!" msgstr "Submissão incorreta de pedaços selecionados para index!" -#: add-patch.c:1290 git-add--interactive.perl:1346 +#: add-patch.c:1291 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "Submetê-los para worktree mesmo assim? " -#: add-patch.c:1297 git-add--interactive.perl:1349 +#: add-patch.c:1298 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "Nada foi submetido.\n" -#: add-patch.c:1354 +#: add-patch.c:1355 #, fuzzy msgid "" "j - leave this hunk undecided, see next undecided hunk\n" @@ -827,77 +856,77 @@ msgstr "" "e - editar manualmente o pedaço atual\n" "? - mostrar ajuda\n" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1517 add-patch.c:1527 #, fuzzy msgid "No previous hunk" msgstr "Sem pedaço anterior" -#: add-patch.c:1521 add-patch.c:1531 +#: add-patch.c:1522 add-patch.c:1532 #, fuzzy msgid "No next hunk" msgstr "Sem próximo pedaço" -#: add-patch.c:1537 +#: add-patch.c:1538 msgid "No other hunks to goto" msgstr "Sem qualquer outro pedaço" -#: add-patch.c:1548 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " msgstr "ir para qual pedaço (<ret> para ver mais)? " -#: add-patch.c:1549 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "ir para qual pedaço? " -#: add-patch.c:1560 +#: add-patch.c:1561 #, fuzzy, c-format msgid "Invalid number: '%s'" msgstr "Número inválido: '%s'" -#: add-patch.c:1565 +#: add-patch.c:1566 #, fuzzy, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "Lamento, apenas %d pedaço disponível." msgstr[1] "Lamento, apenas %d pedaços disponíveis." -#: add-patch.c:1574 +#: add-patch.c:1575 msgid "No other hunks to search" msgstr "Sem outro pedaço a procurar" -#: add-patch.c:1580 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "procurar por regex? " -#: add-patch.c:1595 +#: add-patch.c:1596 #, fuzzy, c-format msgid "Malformed search regexp %s: %s" msgstr "Pesquisa regexp deformada %s: %s" -#: add-patch.c:1612 +#: add-patch.c:1613 #, fuzzy msgid "No hunk matches the given pattern" msgstr "Sem pedaço correspondente ao padrão fornecido" -#: add-patch.c:1619 +#: add-patch.c:1620 msgid "Sorry, cannot split this hunk" msgstr "Lamento, incapaz de dividir este pedaço" -#: add-patch.c:1623 +#: add-patch.c:1624 #, fuzzy, c-format msgid "Split into %d hunks." msgstr "Dividir em %d pedaços." -#: add-patch.c:1627 +#: add-patch.c:1628 msgid "Sorry, cannot edit this hunk" msgstr "Lamento, incapaz de editar este pedaço" -#: add-patch.c:1679 +#: add-patch.c:1680 #, fuzzy msgid "'git apply' failed" msgstr "'git apply' falhou" -#: advice.c:143 +#: advice.c:145 #, c-format msgid "" "\n" @@ -906,37 +935,37 @@ msgstr "" "\n" "Desative este mensagem com \"git config advice.%s false\"" -#: advice.c:159 +#: advice.c:161 #, fuzzy, c-format msgid "%shint: %.*s%s\n" msgstr "%sdica: %.*s%s\n" -#: advice.c:250 +#: advice.c:252 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Cherry-picking é impossível porque tem ficheiros em separado." -#: advice.c:252 +#: advice.c:254 msgid "Committing is not possible because you have unmerged files." msgstr "Cometer é impossível porque tem ficheiros em separado." -#: advice.c:254 +#: advice.c:256 msgid "Merging is not possible because you have unmerged files." msgstr "Juntar é impossível porque tem ficheiros em separado." -#: advice.c:256 +#: advice.c:258 msgid "Pulling is not possible because you have unmerged files." msgstr "Puxar é impossível porque tem ficheiros em separado." -#: advice.c:258 +#: advice.c:260 msgid "Reverting is not possible because you have unmerged files." msgstr "Reverter é impossível porque tem ficheiros em separado." -#: advice.c:260 +#: advice.c:262 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "É impossível fazer %s porque tem ficheiros em separado." -#: advice.c:268 +#: advice.c:270 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -944,23 +973,36 @@ msgstr "" "Corrija-os em worktree, e use 'git add/rm <ficheiro>' apropriadamente\n" "para marcar resolução e fazer uma memória." -#: advice.c:276 +#: advice.c:278 msgid "Exiting because of an unresolved conflict." msgstr "Saindo devido a conflito por resolver." -#: advice.c:281 builtin/merge.c:1369 +#: advice.c:283 builtin/merge.c:1374 msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "O teu juntar ficou por concluír (MERGE_HEAD presente)." +msgstr "O teu juntar ficou por concluir (MERGE_HEAD presente)." -#: advice.c:283 +#: advice.c:285 msgid "Please, commit your changes before merging." msgstr "Por favor, memoriza as tuas modificações antes de juntar." -#: advice.c:284 +#: advice.c:286 msgid "Exiting because of unfinished merge." msgstr "Saindo devido a juntar inacabado." -#: advice.c:290 +#: advice.c:296 +#, c-format +msgid "" +"The following pathspecs didn't match any eligible path, but they do match " +"index\n" +"entries outside the current sparse checkout:\n" +msgstr "" + +#: advice.c:303 +msgid "" +"Disable or modify the sparsity rules if you intend to update such entries." +msgstr "" + +#: advice.c:310 #, fuzzy, c-format msgid "" "Note: switching to '%s'.\n" @@ -997,7 +1039,7 @@ msgstr "" "\n" " git switch -\n" "\n" -"Desliga este conselho pondo a variável de config advice.detachedHead em" +"Desliga este conselho pondo a variável de config advice.detachedHead em " "false\n" "\n" @@ -1010,85 +1052,83 @@ msgstr "cmdline termina com \\" msgid "unclosed quote" msgstr "aspa aberta" -#: apply.c:69 +#: apply.c:70 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "opção de whitespace desconhecida '%s'" -#: apply.c:85 +#: apply.c:86 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "opção de ignorar whitespace desconhecida '%s'" -#: apply.c:135 +#: apply.c:136 msgid "--reject and --3way cannot be used together." msgstr "--reject e --3way só podem ser usados separadamente." -#: apply.c:137 -msgid "--cached and --3way cannot be used together." -msgstr "--cached e --3way só podem ser usados separadamente." - -#: apply.c:140 +#: apply.c:139 msgid "--3way outside a repository" msgstr "--3way fora de um repositório" -#: apply.c:151 +#: apply.c:150 msgid "--index outside a repository" msgstr "--index fora de um repositório" -#: apply.c:154 +#: apply.c:153 msgid "--cached outside a repository" -msgstr "--cached fora de um repositório" +msgstr "--cached fora de repositório" -#: apply.c:801 +#: apply.c:800 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Incapaz preparar timestamp de regexp %s" -#: apply.c:810 +#: apply.c:809 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec devolveu %d para input: %s" -#: apply.c:884 +#: apply.c:883 #, c-format msgid "unable to find filename in patch at line %d" msgstr "incapaz de encontrar o nome do ficheiro no patch da linha %d" -#: apply.c:922 +#: apply.c:921 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "git apply: git-diff incorreto - esperava /dev/null, tive %s na linha " -"%d" +msgstr "" +"git apply: git-diff incorreto - esperava /dev/null, tive %s na linha %d" -#: apply.c:928 +#: apply.c:927 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "git apply: git-diff incorreto - novo nome de ficheiro inconsistente " -"na linha %d" +msgstr "" +"git apply: git-diff incorreto - novo nome de ficheiro inconsistente na linha " +"%d" -#: apply.c:929 +#: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "git apply: git-diff incorreto - antigo nome de ficheiro inconsistente " -"na linha %d" +msgstr "" +"git apply: git-diff incorreto - antigo nome de ficheiro inconsistente na " +"linha %d" -#: apply.c:934 +#: apply.c:933 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff incorreto - esperava /dev/null na linha %d" -#: apply.c:963 +#: apply.c:962 #, fuzzy, c-format msgid "invalid mode on line %d: %s" msgstr "modo inválido na linha %d: %s" -#: apply.c:1282 +#: apply.c:1281 #, c-format msgid "inconsistent header lines %d and %d" msgstr "linhas de cabeçalho %d e %d inconsistentes" -#: apply.c:1372 +#: apply.c:1371 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1103,92 +1143,92 @@ msgstr[1] "" "cabeçalho do git diff falta informação de nome de ficheiro quando removendo " "%d componentes do pathname (linha %d)" -#: apply.c:1385 +#: apply.c:1384 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "cabeçalho do git diff falta informação de nome de ficheiro (linha %d)" -#: apply.c:1481 +#: apply.c:1480 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recontagem: linha inesperada: %.*s" -#: apply.c:1550 +#: apply.c:1549 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragmento de patch sem cabeçalho na linha %d: %.*s" -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "novo ficheiro depende de conteúdos antigos" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "ficheiro eliminado ainda tem conteúdos" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "patch roto na linha %d" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "novo ficheiro %s depende de conteúdos antigos" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "ficheiro apagado %s ainda tem conteúdos" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** aviso: ficheiro %s fica vazio e mantêm-se" -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binário roto na linha %d: %.*s" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binário irreconhecível na linha %d" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "patch com apenas lixo na linha %d" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "incapaz de ler ligação simbólica %s" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "incapaz de abrir ou ler %s" -#: apply.c:2936 +#: apply.c:2935 #, c-format msgid "invalid start of line: '%c'" msgstr "início de linha inválido: '%c'" -#: apply.c:3057 +#: apply.c:3056 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Pedaço #%d apareceu em %d (%d offset de linha)." msgstr[1] "Pedaço #%d apareceu em %d (%d offset de linhas)." -#: apply.c:3069 +#: apply.c:3068 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexto reduzido a (%ld/%ld) para submeter fragmento em %d" -#: apply.c:3075 +#: apply.c:3074 #, c-format msgid "" "while searching for:\n" @@ -1197,135 +1237,141 @@ msgstr "" "procurando por:\n" "%.*s" -#: apply.c:3097 +#: apply.c:3096 #, c-format msgid "missing binary patch data for '%s'" msgstr "faltando patch binário para '%s'" -#: apply.c:3105 +#: apply.c:3104 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" -msgstr "incapaz submeter-inversamente patch binário sem pedaço " -"inverso a '%s'" +msgstr "incapaz submeter-inversamente patch binário sem pedaço inverso a '%s'" -#: apply.c:3152 +#: apply.c:3151 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "incapaz submeter patch binário a '%s' sem a linha completa de index" -#: apply.c:3163 +#: apply.c:3162 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" "o patch submete-se a '%s' (%s), que corresponde a conteúdo actual nenhum." -#: apply.c:3171 +#: apply.c:3170 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "o patch submete-se a um '%s' vazio mas tem conteúdo" -#: apply.c:3189 +#: apply.c:3188 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "incapaz ler a postimage necessária %s para '%s'" -#: apply.c:3202 +#: apply.c:3201 #, c-format msgid "binary patch does not apply to '%s'" msgstr "path binário submete-se a '%s' de maneira nenhuma" -#: apply.c:3209 +#: apply.c:3208 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "patch binário para '%s' cria resultado incorreto (esperei %s, " -"recebi %s)" +msgstr "" +"patch binário para '%s' cria resultado incorreto (esperei %s, recebi %s)" -#: apply.c:3230 +#: apply.c:3229 #, c-format msgid "patch failed: %s:%ld" msgstr "patch falhou: %s:%ld" -#: apply.c:3353 +#: apply.c:3352 #, c-format msgid "cannot checkout %s" msgstr "incapaz de checkout %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308 +#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214 +#: setup.c:308 #, c-format msgid "failed to read %s" msgstr "falha a ler %s" -#: apply.c:3413 +#: apply.c:3412 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lendo '%s' além de uma ligação simbólica" -#: apply.c:3442 apply.c:3685 +#: apply.c:3441 apply.c:3687 #, c-format msgid "path %s has been renamed/deleted" msgstr "path %s mudou de nome ou foi eliminado" -#: apply.c:3528 apply.c:3700 +#: apply.c:3527 apply.c:3702 #, c-format msgid "%s: does not exist in index" msgstr "%s: tem inexistência no index" -#: apply.c:3537 apply.c:3708 apply.c:3953 +#: apply.c:3536 apply.c:3710 apply.c:3954 #, c-format msgid "%s: does not match index" msgstr "%s: no index há correspondência nenhuma" -#: apply.c:3572 -msgid "repository lacks the necessary blob to fall back on 3-way merge." +#: apply.c:3571 +#, fuzzy +msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "repositório falta o blob necessário para recorrer à tri-junção." -#: apply.c:3575 -#, c-format -msgid "Falling back to three-way merge...\n" +#: apply.c:3574 +#, fuzzy, c-format +msgid "Performing three-way merge...\n" msgstr "A recorrer a integração com 3 pontos...\n" -#: apply.c:3591 apply.c:3595 +#: apply.c:3590 apply.c:3594 #, c-format msgid "cannot read the current contents of '%s'" msgstr "incapaz ler conteúdo atual de '%s'" -#: apply.c:3607 -#, c-format -msgid "Failed to fall back on three-way merge...\n" +#: apply.c:3606 +#, fuzzy, c-format +msgid "Failed to perform three-way merge...\n" msgstr "Falha a recorrer a integração com 3 pontos...\n" -#: apply.c:3621 +#: apply.c:3620 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch aplicado a '%s' com conflitos.\n" -#: apply.c:3626 +#: apply.c:3625 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch aplicado a '%s' com sucesso.\n" -#: apply.c:3652 +#: apply.c:3642 +#, fuzzy, c-format +msgid "Falling back to direct application...\n" +msgstr "A recorrer a integração com 3 pontos...\n" + +#: apply.c:3654 msgid "removal patch leaves file contents" msgstr "patch de remoção deixa conteúdos no ficheiro" -#: apply.c:3725 +#: apply.c:3727 #, c-format msgid "%s: wrong type" msgstr "%s: tipo errado" -#: apply.c:3727 +#: apply.c:3729 #, c-format msgid "%s has type %o, expected %o" msgstr "%s é do tipo %o, esperado %o" -#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 -#: read-cache.c:1313 +#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892 +#: read-cache.c:1353 #, c-format msgid "invalid path '%s'" msgstr "caminho inválido '%s'" -#: apply.c:3950 +#: apply.c:3952 #, c-format msgid "%s: already exists in index" msgstr "%s: já existe no índice" @@ -1358,7 +1404,7 @@ msgstr "%s: patch submete-se de maneira nenhuma" #: apply.c:4020 #, c-format msgid "Checking patch %s..." -msgstr "A verificar o patch %s..." +msgstr "" #: apply.c:4112 #, c-format @@ -1410,7 +1456,7 @@ msgstr "incapaz criar armazenamento de backup para ficheiro recém-criado %s" msgid "unable to add cache entry for %s" msgstr "incapaz adicionar entrada de cache para %s" -#: apply.c:4376 builtin/bisect--helper.c:524 +#: apply.c:4376 builtin/bisect--helper.c:525 #, c-format msgid "failed to write to '%s'" msgstr "falha a escrever para '%s'" @@ -1446,7 +1492,7 @@ msgstr[1] "A aplicar patch %%s com %d rejeições..." msgid "truncating .rej filename to %.*s.rej" msgstr "a truncar o nome do ficheiro .rej em %.*s.rej" -#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 +#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394 #, c-format msgid "cannot open %s" msgstr "incapaz abrir %s" @@ -1461,172 +1507,175 @@ msgstr "Excerto nº%d aplicado com sucesso." msgid "Rejected hunk #%d." msgstr "Excerto nº%d rejeitado." -#: apply.c:4720 +#: apply.c:4725 #, c-format msgid "Skipped patch '%s'." msgstr "Patch '%s' ignorado." -#: apply.c:4728 +#: apply.c:4733 msgid "unrecognized input" msgstr "input desconhecido" -#: apply.c:4748 +#: apply.c:4753 msgid "unable to read index file" msgstr "incapaz ler ficheiro index" -#: apply.c:4905 +#: apply.c:4910 #, c-format msgid "can't open patch '%s': %s" msgstr "incapaz abrir patch '%s': %s" -#: apply.c:4932 +#: apply.c:4937 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erro de espaço em branco reprimido" msgstr[1] "%d erros de espaço em branco reprimidos" -#: apply.c:4938 apply.c:4953 +#: apply.c:4943 apply.c:4958 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d linha adiciona erros de espaço em branco." msgstr[1] "%d linhas adicionam erros de espaço em branco." -#: apply.c:4946 +#: apply.c:4951 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d linha aplicada depois de corrigir erros de espaço em branco." msgstr[1] "%d linhas aplicadas depois de corrigir erros de espaço em branco." -#: apply.c:4962 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "Incapaz de escrever novo ficheiro index" -#: apply.c:4990 +#: apply.c:4995 msgid "don't apply changes matching the given path" -msgstr "submeter de maneira nenhuma alterações correspondentes a path fornecido" +msgstr "" +"submeter de maneira nenhuma alterações correspondentes a path fornecido" -#: apply.c:4993 +#: apply.c:4998 msgid "apply changes matching the given path" msgstr "submeter alterações correspondentes a path fornecido" -#: apply.c:4995 builtin/am.c:2266 +#: apply.c:5000 builtin/am.c:2318 msgid "num" msgstr "num" -#: apply.c:4996 +#: apply.c:5001 msgid "remove <num> leading slashes from traditional diff paths" msgstr "remover <num> barras à esquerda dos caminhos de diff tradicional" -#: apply.c:4999 +#: apply.c:5004 msgid "ignore additions made by the patch" msgstr "ignorar adições feitas pelo patch" -#: apply.c:5001 +#: apply.c:5006 msgid "instead of applying the patch, output diffstat for the input" msgstr "invés aplicada patch, output diffstat para " -#: apply.c:5005 +#: apply.c:5010 msgid "show number of added and deleted lines in decimal notation" msgstr "mostrar número de linhas adicionadas e removidas em notação decimal" -#: apply.c:5007 +#: apply.c:5012 msgid "instead of applying the patch, output a summary for the input" msgstr "em vez de aplicar o patch, mostrar um resumo da entrada" -#: apply.c:5009 +#: apply.c:5014 msgid "instead of applying the patch, see if the patch is applicable" msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado" -#: apply.c:5011 +#: apply.c:5016 msgid "make sure the patch is applicable to the current index" msgstr "garantir que o patch pode ser aplicado ao índice atual" -#: apply.c:5013 +#: apply.c:5018 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:5015 +#: apply.c:5020 msgid "apply a patch without touching the working tree" msgstr "aplicar um patch sem tocar na árvore de trabalho" -#: apply.c:5017 +#: apply.c:5022 msgid "accept a patch that touches outside the working area" msgstr "aceitar patches que alteram ficheiros fora da área de trabalho" -#: apply.c:5020 +#: apply.c:5025 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplicar o patch também (use com --stat/--summary/--check)" -#: apply.c:5022 -msgid "attempt three-way merge if a patch does not apply" +#: apply.c:5027 +#, fuzzy +msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "tentar tri-junção se um patch submete-se de maneira nenhuma" -#: apply.c:5024 +#: apply.c:5029 msgid "build a temporary index based on embedded index information" msgstr "" "construir um índice temporário baseado na informação incorporada do índice" -#: apply.c:5027 builtin/checkout-index.c:182 builtin/ls-files.c:525 +#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617 msgid "paths are separated with NUL character" msgstr "os caminhos estão separados por caracteres NUL" -#: apply.c:5029 +#: apply.c:5034 msgid "ensure at least <n> lines of context match" msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem" -#: apply.c:5030 builtin/am.c:2245 builtin/interpret-trailers.c:98 -#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1346 +#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297 +#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991 +#: builtin/rebase.c:1347 msgid "action" msgstr "ação" -#: apply.c:5031 +#: apply.c:5036 msgid "detect new or modified lines that have whitespace errors" msgstr "detetar linhas novas ou modificadas que tenham espaços em branco" -#: apply.c:5034 apply.c:5037 +#: apply.c:5039 apply.c:5042 msgid "ignore changes in whitespace when finding context" msgstr "ignorar alterações de espaço em branco ao procurar contexto" -#: apply.c:5040 +#: apply.c:5045 msgid "apply the patch in reverse" msgstr "aplicar o patch em reverso" -#: apply.c:5042 +#: apply.c:5047 msgid "don't expect at least one line of context" msgstr "conta com linha de contexto nenhuma" -#: apply.c:5044 +#: apply.c:5049 msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "deixar os excertos rejeitados nos respetivos ficheiros *.rej" +msgstr "deixar os pedaços rejeitados nos respetivos ficheiros *.rej" -#: apply.c:5046 +#: apply.c:5051 msgid "allow overlapping hunks" -msgstr "permitir a sobreposição de excertos" +msgstr "permitir a sobreposição de pedaços" -#: apply.c:5047 builtin/add.c:329 builtin/check-ignore.c:22 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 +#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "ser verboso" -#: apply.c:5049 +#: apply.c:5054 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolerar deteções incorretas de falta de nova linha no final do ficheiro" -#: apply.c:5052 +#: apply.c:5057 msgid "do not trust the line counts in the hunk headers" msgstr "desconfia da contagem de linhas nos headers de pedaços" -#: apply.c:5054 builtin/am.c:2254 +#: apply.c:5059 builtin/am.c:2306 msgid "root" msgstr "raiz" -#: apply.c:5055 +#: apply.c:5060 msgid "prepend <root> to all filenames" msgstr "preceder <root> a todos os nomes de ficheiro" @@ -1665,7 +1714,7 @@ msgstr "" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "" -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 #, c-format msgid "deflate error (%d)" msgstr "erro ao compactar (%d)" @@ -1694,145 +1743,145 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repo> [--exec <cmd>] --list" -#: archive.c:192 +#: archive.c:188 #, fuzzy, c-format msgid "cannot read %s" -msgstr "incapaz ler '%s'" +msgstr "incapaz ler %s" -#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886 -#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786 -#: builtin/merge.c:1138 +#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 +#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833 +#: builtin/merge.c:1143 #, c-format msgid "could not read '%s'" msgstr "incapaz ler '%s'" -#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 +#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "especificador de path '%s' correspondeu a ficheiro nenhum" -#: archive.c:454 +#: archive.c:451 #, fuzzy, c-format msgid "no such ref: %.*s" -msgstr "referência inexistente %s" +msgstr "ref inexistente: %.*s" -#: archive.c:460 +#: archive.c:457 #, fuzzy, c-format msgid "not a valid object name: %s" msgstr "nome de objeto inválido: %s" -#: archive.c:473 +#: archive.c:470 #, fuzzy, c-format msgid "not a tree object: %s" msgstr "é objeto árvore nenhum: %s" -#: archive.c:485 +#: archive.c:482 #, fuzzy msgid "current working directory is untracked" msgstr "pasta de trabalho atual está por seguir" -#: archive.c:526 +#: archive.c:523 #, fuzzy, c-format msgid "File not found: %s" msgstr "ficheiro por encontrar: %s" -#: archive.c:528 +#: archive.c:525 #, fuzzy, c-format msgid "Not a regular file: %s" msgstr "É ficheiro normal nenhum: %s" -#: archive.c:555 +#: archive.c:552 msgid "fmt" msgstr "fmt" -#: archive.c:555 +#: archive.c:552 msgid "archive format" msgstr "formato do arquivo" -#: archive.c:556 builtin/log.c:1765 +#: archive.c:553 builtin/log.c:1775 msgid "prefix" msgstr "prefixo" -#: archive.c:557 +#: archive.c:554 msgid "prepend prefix to each pathname in the archive" msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo" -#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890 -#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135 -#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 -#: builtin/fast-export.c:1214 builtin/grep.c:919 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 +#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 +#: builtin/fast-export.c:1207 builtin/fast-export.c:1209 +#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105 +#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" msgstr "ficheiro" -#: archive.c:559 +#: archive.c:556 #, fuzzy msgid "add untracked file to archive" msgstr "adiciona ficheiro por seguir a arquivo" -#: archive.c:562 builtin/archive.c:90 +#: archive.c:559 builtin/archive.c:90 msgid "write the archive to this file" msgstr "escreve arquivo para este ficheiro" -#: archive.c:564 +#: archive.c:561 msgid "read .gitattributes in working directory" msgstr "ler .gitattributes do diretório de trabalho" -#: archive.c:565 +#: archive.c:562 msgid "report archived files on stderr" msgstr "listar ficheiros arquivados para stderr" -#: archive.c:567 +#: archive.c:564 #, fuzzy msgid "set compression level" msgstr "nível de compactação do pacote" -#: archive.c:570 +#: archive.c:567 msgid "list supported archive formats" msgstr "listar formatos de arquivo suportados" -#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 +#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 #: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "repo" -#: archive.c:573 builtin/archive.c:92 +#: archive.c:570 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "obter o arquivo a partir do repositório remoto <repo>" -#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717 #: builtin/notes.c:498 msgid "command" msgstr "comando" -#: archive.c:575 builtin/archive.c:94 +#: archive.c:572 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "caminho para o comando git-upload-archive no remoto" -#: archive.c:582 +#: archive.c:579 msgid "Unexpected option --remote" msgstr "Opção inesperada --remote" -#: archive.c:584 +#: archive.c:581 msgid "Option --exec can only be used together with --remote" -msgstr "A opção --exec só pode ser usada em conjunto com --remote" +msgstr "Opção --exec apenas pode ser usada com --remote" -#: archive.c:586 +#: archive.c:583 msgid "Unexpected option --output" msgstr "Opção inesperada --output" -#: archive.c:588 +#: archive.c:585 #, fuzzy msgid "Options --add-file and --remote cannot be used together" msgstr "Opções --add-file e --remote podem nada ser usadas juntas" -#: archive.c:610 +#: archive.c:607 #, c-format msgid "Unknown archive format '%s'" msgstr "Formato de arquivo desconhecido '%s'" -#: archive.c:619 +#: archive.c:616 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumento por ser suportado para formato '%s': -%d" @@ -1842,12 +1891,12 @@ msgstr "Argumento por ser suportado para formato '%s': -%d" msgid "%.*s is not a valid attribute name" msgstr "%.*s é nome de atributo inválido" -#: attr.c:359 +#: attr.c:363 #, fuzzy, c-format msgid "%s not allowed: %s:%d" msgstr "falha ao aplicar o patch: %s:%ld" -#: attr.c:399 +#: attr.c:403 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1929,12 +1978,12 @@ msgstr "A bissetar: uma base de integração tem de ser testada\n" msgid "a %s revision is needed" msgstr "precisa-se de uma revisão %s" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298 #, c-format msgid "could not create file '%s'" msgstr "incapaz criar ficheiro '%s'" -#: bisect.c:987 builtin/merge.c:152 +#: bisect.c:987 builtin/merge.c:153 #, c-format msgid "could not read file '%s'" msgstr "incapaz ler ficheiro '%s'" @@ -1949,10 +1998,10 @@ msgid "%s was both %s and %s\n" msgstr "%s era %s e %s em simultâneo\n" #: bisect.c:1066 -#, c-format +#, fuzzy, c-format msgid "" "No testable commit found.\n" -"Maybe you started with bad path parameters?\n" +"Maybe you started with bad path arguments?\n" msgstr "" "Nenhum commit testável encontrado.\n" "Talvez tenha começado com parâmetros de caminho incorretos?\n" @@ -1974,39 +2023,39 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "A bissetar: falta %d revisão para testar depois desta %s\n" msgstr[1] "A bissetar: faltam %d revisões para testar depois desta %s\n" -#: blame.c:2777 +#: blame.c:2776 msgid "--contents and --reverse do not blend well." msgstr "--contents e --reverse são imiscíveis." -#: blame.c:2791 +#: blame.c:2790 msgid "cannot use --contents with final commit object name" msgstr "usar --contents com nome de objeto commit final é impossível" -#: blame.c:2812 +#: blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse e --first-parent juntos requer que se especifique o último commit" -#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138 -#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409 -#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336 -#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 -#: builtin/shortlog.c:267 +#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414 +#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346 +#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806 +#: builtin/pack-objects.c:3821 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "falha ao configurar percurso de revisões" -#: blame.c:2839 +#: blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent juntos requer intervalo ao longo do primeiro-pai" -#: blame.c:2850 +#: blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "path %s inexistente em %s" -#: blame.c:2861 +#: blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "incapaz ler blob %s para path %s" @@ -2095,7 +2144,9 @@ msgstr "Incapaz de forçar a atualização do ramo atual." #: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." -msgstr "Impossível configurar informação sobre seguir; o ponto inicial '%s' é ramo nenhum." +msgstr "" +"Impossível configurar informação sobre seguir; o ponto inicial '%s' é ramo " +"nenhum." #: branch.c:235 #, c-format @@ -2137,390 +2188,395 @@ msgstr "Nome de objeto ambíguo: '%s'." msgid "Not a valid branch point: '%s'." msgstr "Ponto no ramo inválido: '%s'." -#: branch.c:365 +#: branch.c:366 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' foi já extraído em '%s'" -#: branch.c:388 +#: branch.c:389 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD da working tree %s está desatualizada" -#: bundle.c:41 +#: bundle.c:44 #, fuzzy, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "algoritmo hash de bundle irreconhecível: %s" -#: bundle.c:45 +#: bundle.c:48 #, fuzzy, c-format msgid "unknown capability '%s'" msgstr "capacidade desconhecida '%s'" -#: bundle.c:71 +#: bundle.c:74 #, fuzzy, c-format msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "'%s' parece-se com ficheiro bundle v2 ou v3 nenhum" -#: bundle.c:110 +#: bundle.c:113 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "cabeçalho irreconhecível: %s%s (%d)" -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176 -#: builtin/commit.c:814 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "incapaz abrir '%s'" -#: bundle.c:189 +#: bundle.c:198 msgid "Repository lacks these prerequisite commits:" msgstr "Falta ao repositório estes pré-requisitos de commits:" -#: bundle.c:192 +#: bundle.c:201 #, fuzzy msgid "need a repository to verify a bundle" msgstr "é preciso repositório para verificar um bundle." -#: bundle.c:243 +#: bundle.c:257 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "O bundle contém esta referência:" msgstr[1] "O bundle contém estas %d referências:" -#: bundle.c:250 +#: bundle.c:264 msgid "The bundle records a complete history." msgstr "O pacote regista um histórico completo." -#: bundle.c:252 +#: bundle.c:266 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "O bundle requer esta referência:" msgstr[1] "O bundle requer estas %d referências:" -#: bundle.c:319 +#: bundle.c:333 #, fuzzy msgid "unable to dup bundle descriptor" msgstr "incapaz de dup descritor de bundle" -#: bundle.c:326 +#: bundle.c:340 msgid "Could not spawn pack-objects" msgstr "Impossível gerar pack-objects" -#: bundle.c:337 +#: bundle.c:351 msgid "pack-objects died" msgstr "pack-objects terminaram inesperadamente" -#: bundle.c:379 -msgid "rev-list died" -msgstr "rev-list terminou inesperadamente" - -#: bundle.c:428 +#: bundle.c:400 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "a referência '%s' é excluída pelas opções de rev-list" -#: bundle.c:498 +#: bundle.c:504 #, fuzzy, c-format msgid "unsupported bundle version %d" msgstr "fora de suporte versão bundle %d" -#: bundle.c:500 +#: bundle.c:506 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "" -#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "argumento irreconhecível: %s" -#: bundle.c:530 +#: bundle.c:553 msgid "Refusing to create empty bundle." msgstr "Criação de bundle vazio recusada." -#: bundle.c:540 +#: bundle.c:563 #, c-format msgid "cannot create '%s'" msgstr "incapaz criar '%s'" -#: bundle.c:565 +#: bundle.c:588 msgid "index-pack died" msgstr "index-pack terminou inesperadamente" +#: chunk-format.c:117 +msgid "terminating chunk id appears earlier than expected" +msgstr "" + +#: chunk-format.c:126 +#, c-format +msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" +msgstr "" + +#: chunk-format.c:133 +#, c-format +msgid "duplicate chunk ID %<PRIx32> found" +msgstr "" + +#: chunk-format.c:147 +#, c-format +msgid "final chunk has non-zero id %<PRIx32>" +msgstr "" + #: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "valor de cor inválido: %.*s" -#: commit-graph.c:188 midx.c:47 +#: commit-graph.c:204 midx.c:47 #, fuzzy msgid "invalid hash version" msgstr "especificação de caminho inválida" -#: commit-graph.c:246 +#: commit-graph.c:262 msgid "commit-graph file is too small" msgstr "" -#: commit-graph.c:311 +#: commit-graph.c:355 #, fuzzy, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "assinatura commit-graph %X corresponde a assinatura %X nenhuma" -#: commit-graph.c:318 +#: commit-graph.c:362 #, fuzzy, c-format msgid "commit-graph version %X does not match version %X" msgstr "commit-graph versão %X corresponde a versão %X nenhuma" -#: commit-graph.c:325 +#: commit-graph.c:369 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" -#: commit-graph.c:342 +#: commit-graph.c:386 #, c-format msgid "commit-graph file is too small to hold %u chunks" msgstr "" -#: commit-graph.c:361 -#, c-format -msgid "commit-graph improper chunk offset %08x%08x" -msgstr "" - -#: commit-graph.c:433 -#, c-format -msgid "commit-graph chunk id %08x appears multiple times" -msgstr "" - -#: commit-graph.c:499 +#: commit-graph.c:482 msgid "commit-graph has no base graphs chunk" msgstr "" -#: commit-graph.c:509 +#: commit-graph.c:492 msgid "commit-graph chain does not match" msgstr "" -#: commit-graph.c:557 +#: commit-graph.c:540 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" -#: commit-graph.c:581 +#: commit-graph.c:564 #, fuzzy msgid "unable to find all commit-graph files" msgstr "incapaz de encontrar todos ficheiros commit-graph" -#: commit-graph.c:721 commit-graph.c:785 +#: commit-graph.c:745 commit-graph.c:782 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" -#: commit-graph.c:742 +#: commit-graph.c:766 #, fuzzy, c-format msgid "could not find commit %s" msgstr "incapaz encontrar commit %s" -#: commit-graph.c:1042 builtin/am.c:1292 +#: commit-graph.c:799 +msgid "commit-graph requires overflow generation data but has none" +msgstr "" + +#: commit-graph.c:1075 builtin/am.c:1341 #, c-format msgid "unable to parse commit %s" msgstr "incapaz analisar commit %s" -#: commit-graph.c:1265 builtin/pack-objects.c:2864 +#: commit-graph.c:1337 builtin/pack-objects.c:3057 #, fuzzy, c-format msgid "unable to get type of object %s" msgstr "incapaz obter tipo de objeto %s" -#: commit-graph.c:1301 +#: commit-graph.c:1368 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:1318 +#: commit-graph.c:1385 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:1338 +#: commit-graph.c:1405 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:1357 +#: commit-graph.c:1424 +#, fuzzy +msgid "Computing commit graph topological levels" +msgstr "" + +#: commit-graph.c:1477 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:1424 +#: commit-graph.c:1558 msgid "Computing commit changed paths Bloom filters" msgstr "" -#: commit-graph.c:1501 +#: commit-graph.c:1635 #, fuzzy msgid "Collecting referenced commits" msgstr "Recolhendo commits referênciados" -#: commit-graph.c:1526 +#: commit-graph.c:1660 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1539 +#: commit-graph.c:1673 #, fuzzy, c-format msgid "error adding pack %s" -msgstr "Erro ao rematar %s." +msgstr "error adicionando pacote %s" -#: commit-graph.c:1543 +#: commit-graph.c:1677 #, c-format msgid "error opening index for %s" msgstr "" -#: commit-graph.c:1582 +#: commit-graph.c:1714 msgid "Finding commits for commit graph among packed objects" msgstr "" -#: commit-graph.c:1597 -msgid "Counting distinct commits in commit graph" -msgstr "" - -#: commit-graph.c:1629 +#: commit-graph.c:1732 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:1678 +#: commit-graph.c:1781 msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1720 midx.c:819 +#: commit-graph.c:1812 midx.c:911 #, fuzzy, c-format msgid "unable to create leading directories of %s" msgstr "incapaz criar as pastas superiores a %s" -#: commit-graph.c:1733 +#: commit-graph.c:1825 #, fuzzy msgid "unable to create temporary graph layer" msgstr "incapaz criar camada de grafo temporária" -#: commit-graph.c:1738 +#: commit-graph.c:1830 #, fuzzy, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "incapaz de ajustar permissão partilhada para '%s'" -#: commit-graph.c:1808 +#: commit-graph.c:1887 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1853 +#: commit-graph.c:1923 #, fuzzy msgid "unable to open commit-graph chain file" msgstr "incapaz abrir ficheiro commit-graph chain" -#: commit-graph.c:1869 +#: commit-graph.c:1939 #, fuzzy msgid "failed to rename base commit-graph file" -msgstr "Falha ao criar os ficheiros de saída" +msgstr "" -#: commit-graph.c:1889 +#: commit-graph.c:1959 #, fuzzy msgid "failed to rename temporary commit-graph file" msgstr "falha a renomear ficheiro commit-graph temporário" -#: commit-graph.c:2015 +#: commit-graph.c:2092 #, fuzzy msgid "Scanning merged commits" msgstr "A adicionar %s integrado" -#: commit-graph.c:2059 +#: commit-graph.c:2136 msgid "Merging commit-graph" msgstr "" -#: commit-graph.c:2165 +#: commit-graph.c:2244 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" -#: commit-graph.c:2274 -#, c-format -msgid "the commit graph format cannot write %d commits" -msgstr "" - -#: commit-graph.c:2285 +#: commit-graph.c:2351 #, fuzzy msgid "too many commits to write graph" msgstr "demasiados commits para escrever grafo" -#: commit-graph.c:2378 +#: commit-graph.c:2449 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:2388 +#: commit-graph.c:2459 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:2398 commit-graph.c:2413 +#: commit-graph.c:2469 commit-graph.c:2484 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:2405 +#: commit-graph.c:2476 #, fuzzy, c-format msgid "failed to parse commit %s from commit-graph" msgstr "incapaz analisar commit %s de commit-graph" -#: commit-graph.c:2423 +#: commit-graph.c:2494 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2438 +#: commit-graph.c:2509 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2445 +#: commit-graph.c:2516 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2455 +#: commit-graph.c:2526 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2464 +#: commit-graph.c:2535 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2478 +#: commit-graph.c:2549 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2483 +#: commit-graph.c:2554 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2487 +#: commit-graph.c:2558 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2503 +#: commit-graph.c:2575 #, c-format -msgid "commit-graph generation for commit %s is %u != %u" +msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "" -#: commit-graph.c:2509 +#: commit-graph.c:2581 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" -#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417 +#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "incapaz analisar %s" @@ -2542,27 +2598,27 @@ msgid "" "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1172 +#: commit.c:1237 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Commit %s tem assinatura GPG desconfiada, alegadamente por %s." -#: commit.c:1176 +#: commit.c:1241 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Commit %s tem assinatura GPG incorreta, alegadamente por %s." -#: commit.c:1179 +#: commit.c:1244 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s tem assinatura GPG nenhuma." -#: commit.c:1182 +#: commit.c:1247 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Commit %s tem assinatura correta, por %s\n" -#: commit.c:1436 +#: commit.c:1501 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2577,7 +2633,7 @@ msgstr "" msgid "memory exhausted" msgstr "memória esgotada" -#: config.c:125 +#: config.c:126 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -2587,300 +2643,345 @@ msgid "" "This might be due to circular includes." msgstr "" -#: config.c:141 +#: config.c:142 #, fuzzy, c-format msgid "could not expand include path '%s'" msgstr "incapaz de expandir include path '%s'" -#: config.c:152 +#: config.c:153 #, fuzzy msgid "relative config includes must come from files" msgstr "" "configuração relativa com inclusão condicional deve provir de ficheiros" -#: config.c:198 +#: config.c:199 msgid "relative config include conditionals must come from files" msgstr "" "configuração relativa com inclusão condicional deve provir de ficheiros" -#: config.c:378 +#: config.c:396 +#, fuzzy, c-format +msgid "invalid config format: %s" +msgstr "formato de ref inválido: %s" + +#: config.c:400 +#, c-format +msgid "missing environment variable name for configuration '%.*s'" +msgstr "" + +#: config.c:405 +#, c-format +msgid "missing environment variable '%s' for configuration '%.*s'" +msgstr "" + +#: config.c:442 #, fuzzy, c-format msgid "key does not contain a section: %s" msgstr "chave contém secção nenhuma: %s" -#: config.c:384 +#: config.c:448 #, c-format msgid "key does not contain variable name: %s" msgstr "" -#: config.c:408 sequencer.c:2580 +#: config.c:472 sequencer.c:2785 #, c-format msgid "invalid key: %s" msgstr "chave inválida: %s" -#: config.c:414 +#: config.c:478 #, fuzzy, c-format msgid "invalid key (newline): %s" -msgstr "linha de identidade inválida: %s" +msgstr "" + +#: config.c:511 +#, fuzzy +msgid "empty config key" +msgstr "" -#: config.c:450 config.c:462 +#: config.c:529 config.c:541 #, fuzzy, c-format msgid "bogus config parameter: %s" msgstr "parâmetros insuficientes" -#: config.c:497 +#: config.c:555 config.c:572 config.c:579 config.c:588 #, fuzzy, c-format msgid "bogus format in %s" -msgstr "cadeia malformada %s" +msgstr "formato falso em %s" + +#: config.c:622 +#, fuzzy, c-format +msgid "bogus count in %s" +msgstr "contagem falsa em %s" + +#: config.c:626 +#, fuzzy, c-format +msgid "too many entries in %s" +msgstr "" + +#: config.c:636 +#, fuzzy, c-format +msgid "missing config key %s" +msgstr "ficheiro config inválido %s" + +#: config.c:644 +#, fuzzy, c-format +msgid "missing config value %s" +msgstr "" -#: config.c:836 +#: config.c:995 #, c-format msgid "bad config line %d in blob %s" msgstr "linha de configuração %d incorreta no blob %s" -#: config.c:840 +#: config.c:999 #, c-format msgid "bad config line %d in file %s" msgstr "linha de configuração %d incorreta no ficheiro %s" -#: config.c:844 +#: config.c:1003 #, c-format msgid "bad config line %d in standard input" msgstr "linha de configuração %d incorreta na entrada padrão" -#: config.c:848 +#: config.c:1007 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "linha de configuração %d incorreta no submódulo-blob %s" -#: config.c:852 +#: config.c:1011 #, c-format msgid "bad config line %d in command line %s" msgstr "linha de configuração %d incorreta na linha de comandos %s" -#: config.c:856 +#: config.c:1015 #, c-format msgid "bad config line %d in %s" msgstr "linha de configuração %d incorreta em %s" -#: config.c:993 +#: config.c:1152 msgid "out of range" msgstr "fora de intervalo" -#: config.c:993 +#: config.c:1152 msgid "invalid unit" msgstr "unidade inválida" -#: config.c:994 +#: config.c:1153 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valor numérico '%s' da configuração '%s' incorreto: %s" -#: config.c:1013 +#: config.c:1163 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "valor numérico '%s' da configuração '%s' incorreto no blob %s: %s" -#: config.c:1016 +#: config.c:1166 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "valor numérico '%s' da configuração '%s' incorreto no ficheiro %s: %s" -#: config.c:1019 +#: config.c:1169 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "valor numérico '%s' da configuração '%s' incorreto na entrada padrão: %s" -#: config.c:1022 +#: config.c:1172 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "valor numérico '%s' da configuração '%s' incorreto no submódulo-blob %s: %s" -#: config.c:1025 +#: config.c:1175 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "valor numérico '%s' da configuração '%s' incorreto na linha de comandos %s: " "%s" -#: config.c:1028 +#: config.c:1178 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "valor numérico '%s' da configuração '%s' incorreto em %s: %s" -#: config.c:1123 +#: config.c:1257 +#, fuzzy, c-format +msgid "bad boolean config value '%s' for '%s'" +msgstr "valor numérico '%s' da configuração '%s' incorreto: %s" + +#: config.c:1275 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "falha ao expandir diretório de utilizador em: '%s'" -#: config.c:1132 +#: config.c:1284 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' em '%s' é carimbo de data/hora inválido" -#: config.c:1223 +#: config.c:1377 #, c-format msgid "abbrev length out of range: %d" msgstr "" -#: config.c:1237 config.c:1248 +#: config.c:1391 config.c:1402 #, c-format msgid "bad zlib compression level %d" msgstr "nível de compressão zlib %d incorreto" -#: config.c:1340 +#: config.c:1494 msgid "core.commentChar should only be one character" msgstr "" -#: config.c:1373 +#: config.c:1527 #, c-format msgid "invalid mode for object creation: %s" msgstr "modo inválido para criação de objeto: %s" -#: config.c:1445 +#: config.c:1599 #, fuzzy, c-format msgid "malformed value for %s" msgstr "valor desformado para %s" -#: config.c:1471 +#: config.c:1625 #, fuzzy, c-format msgid "malformed value for %s: %s" -msgstr "valor inválido de %s: %s" +msgstr ": %s" -#: config.c:1472 +#: config.c:1626 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1533 builtin/pack-objects.c:3649 +#: config.c:1687 builtin/pack-objects.c:4084 #, c-format msgid "bad pack compression level %d" msgstr "nível de compactação do pacote %d incorreto" -#: config.c:1655 +#: config.c:1809 #, fuzzy, c-format msgid "unable to load config blob object '%s'" msgstr "incapaz carregar objeto blob config '%s'" -#: config.c:1658 +#: config.c:1812 #, fuzzy, c-format msgid "reference '%s' does not point to a blob" msgstr "referência '%s' aponta para blob nenhum" -#: config.c:1675 +#: config.c:1829 #, fuzzy, c-format msgid "unable to resolve config blob '%s'" msgstr "incapaz resolver blog config '%s'" -#: config.c:1705 +#: config.c:1874 #, fuzzy, c-format msgid "failed to parse %s" msgstr "falha a analisar %s" -#: config.c:1759 +#: config.c:1930 msgid "unable to parse command-line config" msgstr "incapaz analisar config de linha de comandos" -#: config.c:2122 +#: config.c:2294 msgid "unknown error occurred while reading the configuration files" msgstr "" "ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração" -#: config.c:2296 +#: config.c:2468 #, c-format msgid "Invalid %s: '%s'" msgstr "Inválido %s: '%s'" -#: config.c:2341 +#: config.c:2513 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "o valor '%d' de splitIndex.maxPercentChange deve estar entre 0 e 100" -#: config.c:2387 +#: config.c:2559 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "incapaz analisar '%s' da configuração de linha de comandos" -#: config.c:2389 +#: config.c:2561 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variável de configuração '%s' incorreta no ficheiro '%s' na linha %d" -#: config.c:2473 +#: config.c:2645 #, fuzzy, c-format msgid "invalid section name '%s'" msgstr "conteúdo inválido: '%s'" -#: config.c:2505 +#: config.c:2677 #, c-format msgid "%s has multiple values" msgstr "%s tem múltiplos valores" -#: config.c:2534 +#: config.c:2706 #, fuzzy, c-format msgid "failed to write new configuration file %s" msgstr "falha a escrever novo ficheiro configuração %s" -#: config.c:2786 config.c:3112 +#: config.c:2958 config.c:3285 #, fuzzy, c-format msgid "could not lock config file %s" msgstr "incapaz trancar ficheiro config %s" -#: config.c:2797 +#: config.c:2969 #, fuzzy, c-format msgid "opening %s" msgstr "abrindo %s" -#: config.c:2834 builtin/config.c:361 +#: config.c:3006 builtin/config.c:361 #, fuzzy, c-format msgid "invalid pattern: %s" msgstr "padrão inválido: %s" -#: config.c:2859 +#: config.c:3031 #, fuzzy, c-format msgid "invalid config file %s" msgstr "ficheiro config inválido %s" -#: config.c:2872 config.c:3125 +#: config.c:3044 config.c:3298 #, c-format msgid "fstat on %s failed" -msgstr "falha de fstat de %s" +msgstr "fstat em %s falhou" -#: config.c:2883 +#: config.c:3055 #, fuzzy, c-format -msgid "unable to mmap '%s'" -msgstr "incapaz mmap '%s'" +msgid "unable to mmap '%s'%s" +msgstr "incapaz mmap '%s'%s" -#: config.c:2892 config.c:3130 +#: config.c:3065 config.c:3303 #, fuzzy, c-format msgid "chmod on %s failed" -msgstr "falha de fstat de %s" +msgstr "chmod em %s falhou" -#: config.c:2977 config.c:3227 +#: config.c:3150 config.c:3400 #, fuzzy, c-format msgid "could not write config file %s" msgstr "incapaz escrever ficheiro config %s" -#: config.c:3011 +#: config.c:3184 #, c-format msgid "could not set '%s' to '%s'" msgstr "incapaz definir '%s' como '%s'" -#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "incapaz desdefinir '%s'" -#: config.c:3103 +#: config.c:3276 #, fuzzy, c-format msgid "invalid section name: %s" -msgstr "opção inválida: %s" +msgstr "" -#: config.c:3270 +#: config.c:3443 #, fuzzy, c-format msgid "missing value for '%s'" -msgstr "valor inválido de %s" +msgstr "" #: connect.c:61 #, fuzzy @@ -2925,7 +3026,7 @@ msgstr "" #: connect.c:306 #, fuzzy, c-format msgid "protocol error: expected shallow sha-1, got '%s'" -msgstr "esperava-se raso/aprofundar, obteve-se %s" +msgstr "" #: connect.c:308 msgid "repository on the other end cannot be shallow" @@ -2934,59 +3035,59 @@ msgstr "" #: connect.c:347 #, fuzzy msgid "invalid packet" -msgstr "caminho inválido '%s'" +msgstr "" #: connect.c:367 #, fuzzy, c-format msgid "protocol error: unexpected '%s'" -msgstr "erro de protocolo: cabeçalho de pacote incorreto" +msgstr "" -#: connect.c:473 +#: connect.c:497 #, c-format msgid "unknown object format '%s' specified by server" msgstr "objeto desconhecido '%s' pelo formato em servidor." -#: connect.c:500 +#: connect.c:526 #, fuzzy, c-format msgid "invalid ls-refs response: %s" -msgstr "referência inválida: %s" +msgstr "" -#: connect.c:504 +#: connect.c:530 msgid "expected flush after ref listing" msgstr "" -#: connect.c:507 +#: connect.c:533 msgid "expected response end packet after ref listing" msgstr "" -#: connect.c:640 +#: connect.c:666 #, fuzzy, c-format msgid "protocol '%s' is not supported" msgstr "protocolo '%s' é insustentado" -#: connect.c:691 +#: connect.c:717 msgid "unable to set SO_KEEPALIVE on socket" msgstr "" -#: connect.c:731 connect.c:794 +#: connect.c:757 connect.c:820 #, fuzzy, c-format msgid "Looking up %s ... " -msgstr "A verificar o patch %s..." +msgstr "" -#: connect.c:735 +#: connect.c:761 #, fuzzy, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "incapaz procurar %s (porta %s) (%s)" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:739 connect.c:810 +#: connect.c:765 connect.c:836 #, c-format msgid "" "done.\n" "Connecting to %s (port %s) ... " msgstr "" -#: connect.c:761 connect.c:838 +#: connect.c:787 connect.c:864 #, fuzzy, c-format msgid "" "unable to connect to %s:\n" @@ -2996,64 +3097,68 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:767 connect.c:844 +#: connect.c:793 connect.c:870 #, fuzzy msgid "done." msgstr "concluído." -#: connect.c:798 +#: connect.c:824 #, fuzzy, c-format msgid "unable to look up %s (%s)" msgstr "incapaz procurar %s (%s)" -#: connect.c:804 +#: connect.c:830 #, fuzzy, c-format msgid "unknown port %s" -msgstr "opção desconhecido %s" +msgstr "" -#: connect.c:941 connect.c:1271 +#: connect.c:967 connect.c:1299 #, c-format msgid "strange hostname '%s' blocked" msgstr "" -#: connect.c:943 +#: connect.c:969 #, c-format msgid "strange port '%s' blocked" msgstr "" -#: connect.c:953 +#: connect.c:979 #, fuzzy, c-format msgid "cannot start proxy %s" msgstr "incapaz começar proxy %s" -#: connect.c:1024 +#: connect.c:1050 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" -#: connect.c:1219 +#: connect.c:1190 +msgid "newline is forbidden in git:// hosts and repo paths" +msgstr "" + +#: connect.c:1247 msgid "ssh variant 'simple' does not support -4" msgstr "" -#: connect.c:1231 +#: connect.c:1259 msgid "ssh variant 'simple' does not support -6" msgstr "" -#: connect.c:1248 +#: connect.c:1276 #, fuzzy msgid "ssh variant 'simple' does not support setting port" msgstr "ssh variant 'simple' insustenta definir porta" -#: connect.c:1360 +#: connect.c:1388 #, c-format msgid "strange pathname '%s' blocked" msgstr "" -#: connect.c:1408 +#: connect.c:1436 #, fuzzy msgid "unable to fork" msgstr "incapaz de aforquilhar" -#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45 msgid "Checking connectivity" msgstr "A verificar conectividade" @@ -3063,23 +3168,23 @@ msgstr "Impossível executar 'git rev-list'" #: connected.c:144 msgid "failed write to rev-list" -msgstr "falha ao escrever para rev-list" +msgstr "falhou escrever para rev-list" #: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "falha ao fechar entrada padrão de rev-list" -#: convert.c:194 +#: convert.c:183 #, c-format msgid "illegal crlf_action %d" msgstr "" -#: convert.c:207 +#: convert.c:196 #, fuzzy, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF será substituído por LF em %s." -#: convert.c:209 +#: convert.c:198 #, fuzzy, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -3088,12 +3193,12 @@ msgstr "" "CRLF será substituído por LF em %s.\n" "O final de linha original será mantido no ficheiro da sua árvore de trabalho." -#: convert.c:217 +#: convert.c:206 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF será substituído por CRLF em %s." -#: convert.c:219 +#: convert.c:208 #, fuzzy, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -3102,91 +3207,91 @@ msgstr "" "LF será substituído por CRLF em %s.\n" "O final de linha original será mantido no ficheiro da sua árvore de trabalho." -#: convert.c:284 +#: convert.c:273 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" -#: convert.c:291 +#: convert.c:280 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " "working-tree-encoding." msgstr "" -#: convert.c:304 +#: convert.c:293 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "" -#: convert.c:306 +#: convert.c:295 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" "%sLE (depending on the byte order) as working-tree-encoding." msgstr "" -#: convert.c:419 convert.c:490 +#: convert.c:408 convert.c:479 #, fuzzy, c-format msgid "failed to encode '%s' from %s to %s" msgstr "falha ao copiar notas de '%s' para '%s'" -#: convert.c:462 +#: convert.c:451 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" -#: convert.c:665 +#: convert.c:654 #, fuzzy, c-format msgid "cannot fork to run external filter '%s'" msgstr "incapaz aforquilhar para correr filtro externo '%s'" -#: convert.c:685 +#: convert.c:674 #, fuzzy, c-format msgid "cannot feed the input to external filter '%s'" msgstr "incapaz introduzir input para filtro externo '%s'" -#: convert.c:692 +#: convert.c:681 #, fuzzy, c-format msgid "external filter '%s' failed %d" msgstr "filtro externo '%s' falhou %d" -#: convert.c:727 convert.c:730 +#: convert.c:716 convert.c:719 #, c-format msgid "read from external filter '%s' failed" msgstr "" -#: convert.c:733 convert.c:788 +#: convert.c:722 convert.c:777 #, fuzzy, c-format msgid "external filter '%s' failed" -msgstr "falha ao mudar o nome de '%s'" +msgstr "filtro externo '%s' falhou" -#: convert.c:837 +#: convert.c:826 #, fuzzy msgid "unexpected filter type" -msgstr "fim de ficheiro inesperado" +msgstr "" -#: convert.c:848 +#: convert.c:837 msgid "path name too long for external filter" msgstr "" -#: convert.c:940 +#: convert.c:934 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -#: convert.c:1240 +#: convert.c:1234 msgid "true/false are no valid working-tree-encodings" msgstr "" -#: convert.c:1428 convert.c:1462 +#: convert.c:1414 convert.c:1447 #, fuzzy, c-format msgid "%s: clean filter '%s' failed" -msgstr "falha ao criar '%s'" +msgstr "" -#: convert.c:1508 +#: convert.c:1490 #, fuzzy, c-format msgid "%s: smudge filter %s failed" msgstr "falha ao atualizar os ficheiros" @@ -3299,7 +3404,7 @@ msgstr "objeto árvore" #: delta-islands.c:334 #, fuzzy, c-format msgid "failed to load island regex for '%s': %s" -msgstr "falha ao abrir '%s': %s" +msgstr "" #: delta-islands.c:390 #, c-format @@ -3311,33 +3416,38 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "" -#: diff-lib.c:534 +#: diff-merges.c:70 +#, fuzzy, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "valor desconhecido '%s' da chave '%s'" + +#: diff-lib.c:557 msgid "--merge-base does not work with ranges" msgstr "" -#: diff-lib.c:536 +#: diff-lib.c:559 msgid "--merge-base only works with commits" msgstr "" -#: diff-lib.c:553 +#: diff-lib.c:576 #, fuzzy msgid "unable to get HEAD" msgstr "incapaz obter HEAD" -#: diff-lib.c:560 +#: diff-lib.c:583 msgid "no merge base found" msgstr "" -#: diff-lib.c:562 +#: diff-lib.c:585 msgid "multiple merge bases found" msgstr "" -#: diff-no-index.c:238 +#: diff-no-index.c:237 #, fuzzy msgid "git diff --no-index [<options>] <path> <path>" msgstr "git worktree add [<opções>] <caminho> [<ramo>]" -#: diff-no-index.c:263 +#: diff-no-index.c:262 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" @@ -3386,36 +3496,48 @@ msgstr "" "Erros encontrados na variável de configuração 'diff.dirstat':\n" "%s" -#: diff.c:4276 +#: diff.c:4282 #, c-format msgid "external diff died, stopping at %s" msgstr "o diff externo terminou inesperadamente, interrompido em %s" -#: diff.c:4625 +#: diff.c:4634 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check e -s são mutuamente exclusivos" -#: diff.c:4628 +#: diff.c:4637 #, fuzzy msgid "-G, -S and --find-object are mutually exclusive" -msgstr "-b, -B e --detach são mutuamente exclusivos" +msgstr "" + +#: diff.c:4640 +msgid "" +"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" +msgstr "" + +#: diff.c:4643 +#, fuzzy +msgid "" +"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +"with -G and -S" +msgstr "" -#: diff.c:4706 +#: diff.c:4722 msgid "--follow requires exactly one pathspec" msgstr "--follow requer exatamente um único especificador de caminho" -#: diff.c:4754 +#: diff.c:4770 #, fuzzy, c-format msgid "invalid --stat value: %s" msgstr "valor de cor inválido: %.*s" -#: diff.c:4759 diff.c:4764 diff.c:4769 diff.c:4774 diff.c:5302 +#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, fuzzy, c-format msgid "%s expects a numerical value" -msgstr "a opção '%c' espera um valor numérico" +msgstr "" -#: diff.c:4791 +#: diff.c:4807 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3424,539 +3546,555 @@ msgstr "" "Falha ao analisar parâmetro da opção --dirstat/-X:\n" "%s" -#: diff.c:4876 +#: diff.c:4892 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4900 +#: diff.c:4916 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4914 +#: diff.c:4930 #, fuzzy, c-format msgid "unable to resolve '%s'" msgstr "incapaz resolver '%s'" -#: diff.c:4964 diff.c:4970 +#: diff.c:4980 diff.c:4986 #, c-format msgid "%s expects <n>/<m> form" msgstr "" -#: diff.c:4982 +#: diff.c:4998 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:5003 +#: diff.c:5019 #, fuzzy, c-format msgid "bad --color-moved argument: %s" msgstr "argumento incorreto --color-moved: %s" -#: diff.c:5022 +#: diff.c:5038 #, fuzzy, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "objeto inválido '%s' fornecido." -#: diff.c:5062 +#: diff.c:5078 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -#: diff.c:5098 diff.c:5118 +#: diff.c:5114 diff.c:5134 #, fuzzy, c-format msgid "invalid argument to %s" -msgstr "valor inválido de %s" +msgstr "" -#: diff.c:5222 +#: diff.c:5238 #, fuzzy, c-format msgid "invalid regex given to -I: '%s'" -msgstr "valor inválido de %s" +msgstr "" -#: diff.c:5271 +#: diff.c:5287 #, fuzzy, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'" -#: diff.c:5327 +#: diff.c:5343 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5350 +#: diff.c:5379 msgid "Diff output format options" msgstr "" -#: diff.c:5352 diff.c:5358 +#: diff.c:5381 diff.c:5387 #, fuzzy msgid "generate patch" msgstr "incorporar o patch" -#: diff.c:5355 builtin/log.c:178 +#: diff.c:5384 builtin/log.c:179 msgid "suppress diff output" msgstr "suprimir saída do diff" -#: diff.c:5360 diff.c:5474 diff.c:5481 +#: diff.c:5389 diff.c:5503 diff.c:5510 msgid "<n>" msgstr "" -#: diff.c:5361 diff.c:5364 +#: diff.c:5390 diff.c:5393 #, fuzzy msgid "generate diffs with <n> lines context" msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem" -#: diff.c:5366 +#: diff.c:5395 msgid "generate the diff in raw format" msgstr "" -#: diff.c:5369 +#: diff.c:5398 #, fuzzy msgid "synonym for '-p --raw'" -msgstr "(sinónimo de --stat)" +msgstr "" -#: diff.c:5373 +#: diff.c:5402 #, fuzzy msgid "synonym for '-p --stat'" -msgstr "(sinónimo de --stat)" +msgstr "" -#: diff.c:5377 +#: diff.c:5406 #, fuzzy msgid "machine friendly --stat" msgstr "saída inteligível por máquina" -#: diff.c:5380 +#: diff.c:5409 msgid "output only the last line of --stat" msgstr "" -#: diff.c:5382 diff.c:5390 +#: diff.c:5411 diff.c:5419 msgid "<param1,param2>..." msgstr "" -#: diff.c:5383 +#: diff.c:5412 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5387 +#: diff.c:5416 #, fuzzy msgid "synonym for --dirstat=cumulative" -msgstr "sinónimo de --files-with-matches" +msgstr "sinónimo de --dirstat=cumulative" -#: diff.c:5391 +#: diff.c:5420 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: diff.c:5395 +#: diff.c:5424 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5398 +#: diff.c:5427 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5401 +#: diff.c:5430 #, fuzzy msgid "show only names of changed files" -msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas" +msgstr "" -#: diff.c:5404 +#: diff.c:5433 #, fuzzy msgid "show only names and status of changed files" -msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas" +msgstr "" -#: diff.c:5406 +#: diff.c:5435 msgid "<width>[,<name-width>[,<count>]]" msgstr "" -#: diff.c:5407 +#: diff.c:5436 #, fuzzy msgid "generate diffstat" msgstr "diff status inesperado %c" -#: diff.c:5409 diff.c:5412 diff.c:5415 +#: diff.c:5438 diff.c:5441 diff.c:5444 msgid "<width>" msgstr "" -#: diff.c:5410 +#: diff.c:5439 msgid "generate diffstat with a given width" msgstr "" -#: diff.c:5413 +#: diff.c:5442 msgid "generate diffstat with a given name width" msgstr "" -#: diff.c:5416 +#: diff.c:5445 msgid "generate diffstat with a given graph width" msgstr "" -#: diff.c:5418 +#: diff.c:5447 msgid "<count>" msgstr "" -#: diff.c:5419 +#: diff.c:5448 msgid "generate diffstat with limited lines" msgstr "" -#: diff.c:5422 +#: diff.c:5451 msgid "generate compact summary in diffstat" msgstr "" -#: diff.c:5425 +#: diff.c:5454 msgid "output a binary diff that can be applied" msgstr "" -#: diff.c:5428 +#: diff.c:5457 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5430 +#: diff.c:5459 #, fuzzy msgid "show colored diff" msgstr "mostrar ficheiros ignorados" -#: diff.c:5431 +#: diff.c:5460 msgid "<kind>" msgstr "" -#: diff.c:5432 +#: diff.c:5461 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5435 +#: diff.c:5464 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" -#: diff.c:5438 diff.c:5441 diff.c:5444 diff.c:5553 +#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582 #, fuzzy msgid "<prefix>" msgstr "<prefixo>/" -#: diff.c:5439 +#: diff.c:5468 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5442 +#: diff.c:5471 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5445 +#: diff.c:5474 #, fuzzy msgid "prepend an additional prefix to every line of output" msgstr "preceder o nomebase do projeto pai na saída" -#: diff.c:5448 +#: diff.c:5477 msgid "do not show any source or destination prefix" msgstr "" -#: diff.c:5451 +#: diff.c:5480 #, fuzzy msgid "show context between diff hunks up to the specified number of lines" msgstr "criar um clone raso, truncado ao número especificado de revisões" -#: diff.c:5455 diff.c:5460 diff.c:5465 +#: diff.c:5484 diff.c:5489 diff.c:5494 msgid "<char>" msgstr "" -#: diff.c:5456 +#: diff.c:5485 msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: diff.c:5461 +#: diff.c:5490 msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: diff.c:5466 +#: diff.c:5495 msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: diff.c:5469 +#: diff.c:5498 #, fuzzy msgid "Diff rename options" -msgstr "Opções genéricas" +msgstr "" -#: diff.c:5470 +#: diff.c:5499 #, fuzzy msgid "<n>[/<m>]" msgstr "<n>[,<base>]" -#: diff.c:5471 +#: diff.c:5500 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: diff.c:5475 +#: diff.c:5504 #, fuzzy msgid "detect renames" -msgstr "nome do remoto" +msgstr "detetar renomeações" -#: diff.c:5479 +#: diff.c:5508 msgid "omit the preimage for deletes" msgstr "" -#: diff.c:5482 +#: diff.c:5511 msgid "detect copies" msgstr "" -#: diff.c:5486 +#: diff.c:5515 msgid "use unmodified files as source to find copies" msgstr "" -#: diff.c:5488 +#: diff.c:5517 #, fuzzy msgid "disable rename detection" msgstr "Deteção de mudança de nome inexata em curso" -#: diff.c:5491 +#: diff.c:5520 msgid "use empty blobs as rename source" msgstr "" -#: diff.c:5493 +#: diff.c:5522 msgid "continue listing the history of a file beyond renames" msgstr "" -#: diff.c:5496 +#: diff.c:5525 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5498 +#: diff.c:5527 #, fuzzy msgid "Diff algorithm options" -msgstr "opção inválida: %s" +msgstr "" -#: diff.c:5500 +#: diff.c:5529 msgid "produce the smallest possible diff" msgstr "" -#: diff.c:5503 +#: diff.c:5532 #, fuzzy msgid "ignore whitespace when comparing lines" -msgstr "ignorar alterações de espaço em branco ao procurar contexto" +msgstr "" -#: diff.c:5506 +#: diff.c:5535 #, fuzzy msgid "ignore changes in amount of whitespace" -msgstr "ignorar alterações de espaço em branco ao procurar contexto" +msgstr "" -#: diff.c:5509 +#: diff.c:5538 #, fuzzy msgid "ignore changes in whitespace at EOL" -msgstr "ignorar alterações de espaço em branco ao procurar contexto" +msgstr "" -#: diff.c:5512 +#: diff.c:5541 msgid "ignore carrier-return at the end of line" msgstr "" -#: diff.c:5515 +#: diff.c:5544 msgid "ignore changes whose lines are all blank" msgstr "" -#: diff.c:5517 diff.c:5539 diff.c:5542 diff.c:5587 +#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616 msgid "<regex>" msgstr "" -#: diff.c:5518 +#: diff.c:5547 #, fuzzy msgid "ignore changes whose all lines match <regex>" -msgstr "ignorar alterações de espaço em branco ao procurar contexto" +msgstr "" -#: diff.c:5521 +#: diff.c:5550 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5524 +#: diff.c:5553 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: diff.c:5528 +#: diff.c:5557 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: diff.c:5530 +#: diff.c:5559 msgid "<algorithm>" msgstr "" -#: diff.c:5531 +#: diff.c:5560 msgid "choose a diff algorithm" msgstr "" -#: diff.c:5533 +#: diff.c:5562 #, fuzzy msgid "<text>" msgstr "texto" -#: diff.c:5534 +#: diff.c:5563 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: diff.c:5536 diff.c:5545 diff.c:5548 +#: diff.c:5565 diff.c:5574 diff.c:5577 #, fuzzy msgid "<mode>" msgstr "modo" -#: diff.c:5537 +#: diff.c:5566 msgid "show word diff, using <mode> to delimit changed words" msgstr "" -#: diff.c:5540 +#: diff.c:5569 msgid "use <regex> to decide what a word is" msgstr "" -#: diff.c:5543 +#: diff.c:5572 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "" -#: diff.c:5546 +#: diff.c:5575 msgid "moved lines of code are colored differently" msgstr "" -#: diff.c:5549 +#: diff.c:5578 msgid "how white spaces are ignored in --color-moved" msgstr "" -#: diff.c:5552 +#: diff.c:5581 #, fuzzy msgid "Other diff options" -msgstr "Opções genéricas" +msgstr "" -#: diff.c:5554 +#: diff.c:5583 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -#: diff.c:5558 +#: diff.c:5587 #, fuzzy msgid "treat all files as text" msgstr "processar ficheiros binários como texto" -#: diff.c:5560 +#: diff.c:5589 msgid "swap two inputs, reverse the diff" msgstr "" -#: diff.c:5562 +#: diff.c:5591 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" -#: diff.c:5564 +#: diff.c:5593 msgid "disable all output of the program" msgstr "" -#: diff.c:5566 +#: diff.c:5595 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5568 +#: diff.c:5597 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5570 +#: diff.c:5599 #, fuzzy msgid "<when>" msgstr "quando" -#: diff.c:5571 +#: diff.c:5600 #, fuzzy msgid "ignore changes to submodules in the diff generation" msgstr "" "ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. " "(Predefinição: all)" -#: diff.c:5574 +#: diff.c:5603 #, fuzzy msgid "<format>" msgstr "formato" -#: diff.c:5575 +#: diff.c:5604 msgid "specify how differences in submodules are shown" msgstr "" -#: diff.c:5579 +#: diff.c:5608 #, fuzzy msgid "hide 'git add -N' entries from the index" -msgstr "usar .gitattributes apenas a partir do índice" +msgstr "" -#: diff.c:5582 +#: diff.c:5611 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5584 +#: diff.c:5613 #, fuzzy msgid "<string>" msgstr "cadeia" -#: diff.c:5585 +#: diff.c:5614 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5588 +#: diff.c:5617 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5591 +#: diff.c:5620 #, fuzzy msgid "show all changes in the changeset with -S or -G" msgstr "mostrar ficheiros com correspondências no paginador" -#: diff.c:5594 +#: diff.c:5623 #, fuzzy msgid "treat <string> in -S as extended POSIX regular expression" msgstr "usar expressões regulares estendidas do POSIX" -#: diff.c:5597 +#: diff.c:5626 #, fuzzy msgid "control the order in which files appear in the output" msgstr "mostrar outros ficheiros na saída" -#: diff.c:5598 +#: diff.c:5627 diff.c:5630 +#, fuzzy +msgid "<path>" +msgstr "path" + +#: diff.c:5628 +#, fuzzy +msgid "show the change in the specified path first" +msgstr "" +"escrever o ficheiro de índice do pacote na versão de formato especificada" + +#: diff.c:5631 +#, fuzzy +msgid "skip the output to the specified path" +msgstr "Repor a HEAD atual no estado especificado" + +#: diff.c:5633 #, fuzzy msgid "<object-id>" msgstr "objeto" -#: diff.c:5599 +#: diff.c:5634 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5601 +#: diff.c:5636 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" -#: diff.c:5602 +#: diff.c:5637 msgid "select files by diff type" msgstr "" -#: diff.c:5604 +#: diff.c:5639 #, fuzzy msgid "<file>" msgstr "ficheiro" -#: diff.c:5605 +#: diff.c:5640 #, fuzzy msgid "Output to a specific file" msgstr "submeter somente os ficheiros especificados" -#: diff.c:6262 -msgid "inexact rename detection was skipped due to too many files." -msgstr "" -"a deteção mudança de nome inexata foi omitida devido a demasiados ficheiros." +#: diff.c:6298 +#, fuzzy +msgid "exhaustive rename detection was skipped due to too many files." +msgstr "detecção de renomeação exaustiva foi ignorada devido a demasiados ficheiros." -#: diff.c:6265 +#: diff.c:6301 msgid "only found copies from modified paths due to too many files." msgstr "" "só foram encontradas cópias de caminhos modificados devido a demasiados " "ficheiros." -#: diff.c:6268 +#: diff.c:6304 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3966,67 +4104,72 @@ msgstr "" #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" -msgstr "falha ao ler o ficheiro de comando '%s'" +msgstr "falha ao ler ficheiro de comando '%s'" -#: diffcore-rename.c:592 +#: diffcore-rename.c:1510 msgid "Performing inexact rename detection" msgstr "Deteção de mudança de nome inexata em curso" -#: dir.c:578 +#: diffcore-rotate.c:29 +#, fuzzy, c-format +msgid "No such path '%s' in the diff" +msgstr "path %s inexistente em %s" + +#: dir.c:593 #, fuzzy, c-format msgid "pathspec '%s' did not match any file(s) known to git" -msgstr "especificador de path '%s' correspondeu a ficheiro nenhum " -"conhecido pelo git" +msgstr "" +"especificador de path '%s' correspondeu a ficheiro nenhum conhecido pelo git" -#: dir.c:718 dir.c:747 dir.c:760 +#: dir.c:733 dir.c:762 dir.c:775 #, fuzzy, c-format msgid "unrecognized pattern: '%s'" msgstr "padrão irreconhecível: '%s'" -#: dir.c:777 dir.c:791 +#: dir.c:792 dir.c:806 #, fuzzy, c-format msgid "unrecognized negative pattern: '%s'" msgstr "por reconhecer padrão negativo: '%s'" -#: dir.c:809 +#: dir.c:824 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" -#: dir.c:819 +#: dir.c:834 msgid "disabling cone pattern matching" msgstr "" -#: dir.c:1198 +#: dir.c:1221 #, fuzzy, c-format msgid "cannot use %s as an exclude file" msgstr "incapaz usar %s como ficheiro de exclusão" -#: dir.c:2305 +#: dir.c:2358 #, fuzzy, c-format msgid "could not open directory '%s'" msgstr "incapaz abrir pasta '%s'" -#: dir.c:2605 +#: dir.c:2660 msgid "failed to get kernel name and information" msgstr "falha ao obter nome e informação do kernel" -#: dir.c:2729 +#: dir.c:2784 #, fuzzy msgid "untracked cache is disabled on this system or location" msgstr "cache untracked está desativada neste sistema ou localização." -#: dir.c:3520 +#: dir.c:3617 #, fuzzy, c-format msgid "index file corrupt in repo %s" -msgstr "ficheiro de índice corrompido" +msgstr "" -#: dir.c:3565 dir.c:3570 +#: dir.c:3664 dir.c:3669 #, c-format msgid "could not create directories for %s" msgstr "incapaz criar pasta para %s" -#: dir.c:3599 +#: dir.c:3698 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "incapaz migrar pasta git de '%s' para '%s'" @@ -4036,22 +4179,22 @@ msgstr "incapaz migrar pasta git de '%s' para '%s'" msgid "hint: Waiting for your editor to close the file...%c" msgstr "" -#: entry.c:177 +#: entry.c:176 #, fuzzy msgid "Filtering content" msgstr "imprimir conteúdo da tag" -#: entry.c:478 +#: entry.c:497 #, c-format msgid "could not stat file '%s'" -msgstr "incapaz obter estatutário de ficheiro '%s'" +msgstr "incapaz de stat o ficheiro '%s'" -#: environment.c:150 +#: environment.c:152 #, c-format msgid "bad git namespace path \"%s\"" msgstr "" -#: environment.c:337 +#: environment.c:335 #, fuzzy, c-format msgid "could not set GIT_DIR to '%s'" msgstr "incapaz definir GIT_DIR para '%s'" @@ -4059,295 +4202,309 @@ msgstr "incapaz definir GIT_DIR para '%s'" #: exec-cmd.c:363 #, fuzzy, c-format msgid "too many args to run %s" -msgstr "Demasiados argumentos." +msgstr "" -#: fetch-pack.c:177 +#: fetch-pack.c:182 msgid "git fetch-pack: expected shallow list" -msgstr "git fetch-pack: esperava-se lista rasa" +msgstr "git fetch-pack: esperado lista rasa" -#: fetch-pack.c:180 +#: fetch-pack.c:185 #, fuzzy msgid "git fetch-pack: expected a flush packet after shallow list" -msgstr "git fetch-pack: esperava-se lista rasa" +msgstr "git fetch-pack: esperado pacote flush após lista rasa" -#: fetch-pack.c:191 +#: fetch-pack.c:196 #, fuzzy msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'" -#: fetch-pack.c:211 +#: fetch-pack.c:216 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'" -#: fetch-pack.c:222 +#: fetch-pack.c:227 #, fuzzy msgid "unable to write to remote" msgstr "incapaz escrever para remoto" -#: fetch-pack.c:283 +#: fetch-pack.c:288 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requer multi_ack_detailed" -#: fetch-pack.c:378 fetch-pack.c:1406 +#: fetch-pack.c:383 fetch-pack.c:1423 #, c-format msgid "invalid shallow line: %s" msgstr "linha rasa inválida: %s" -#: fetch-pack.c:384 fetch-pack.c:1412 +#: fetch-pack.c:389 fetch-pack.c:1429 #, c-format msgid "invalid unshallow line: %s" -msgstr "linha para aprofundar inválida: %s" +msgstr "linha por aprofundar inválida: %s" -#: fetch-pack.c:386 fetch-pack.c:1414 +#: fetch-pack.c:391 fetch-pack.c:1431 #, c-format msgid "object not found: %s" msgstr "objeto perdido: %s" -#: fetch-pack.c:389 fetch-pack.c:1417 +#: fetch-pack.c:394 fetch-pack.c:1434 #, c-format msgid "error in object: %s" msgstr "erro no objeto: %s" -#: fetch-pack.c:391 fetch-pack.c:1419 +#: fetch-pack.c:396 fetch-pack.c:1436 #, c-format msgid "no shallow found: %s" -msgstr "shallow perdido: %s" +msgstr "shallow por encontrar: %s" -#: fetch-pack.c:394 fetch-pack.c:1423 +#: fetch-pack.c:399 fetch-pack.c:1440 #, c-format msgid "expected shallow/unshallow, got %s" -msgstr "esperava-se raso/aprofundar, obteve-se %s" +msgstr "esperado shallow/unshallow, recebi %s" -#: fetch-pack.c:434 +#: fetch-pack.c:439 #, c-format msgid "got %s %d %s" msgstr "obteve-se %s %d %s" -#: fetch-pack.c:451 +#: fetch-pack.c:456 #, c-format msgid "invalid commit %s" msgstr "commit inválido %s" -#: fetch-pack.c:482 +#: fetch-pack.c:487 msgid "giving up" -msgstr "desistência" +msgstr "a desistir" -#: fetch-pack.c:495 progress.c:339 +#: fetch-pack.c:500 progress.c:339 msgid "done" msgstr "concluído" -#: fetch-pack.c:507 +#: fetch-pack.c:512 #, c-format msgid "got %s (%d) %s" msgstr "obteve-se %s (%d) %s" -#: fetch-pack.c:543 +#: fetch-pack.c:548 #, c-format msgid "Marking %s as complete" msgstr "Marcado %s como completo" -#: fetch-pack.c:758 +#: fetch-pack.c:763 #, c-format msgid "already have %s (%s)" msgstr "já se tem %s (%s)" -#: fetch-pack.c:827 +#: fetch-pack.c:849 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: incapaz de aforquilhar demultiplexer sideband" -#: fetch-pack.c:835 +#: fetch-pack.c:857 msgid "protocol error: bad pack header" -msgstr "erro de protocolo: cabeçalho de pacote incorreto" +msgstr "" -#: fetch-pack.c:919 +#: fetch-pack.c:951 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: incapaz de aforquilhar %s" -#: fetch-pack.c:937 +#: fetch-pack.c:957 +msgid "fetch-pack: invalid index-pack output" +msgstr "" + +#: fetch-pack.c:974 #, c-format msgid "%s failed" msgstr "%s falhou" -#: fetch-pack.c:939 +#: fetch-pack.c:976 msgid "error in sideband demultiplexer" msgstr "erro em demultiplexer sideband" -#: fetch-pack.c:982 +#: fetch-pack.c:1019 #, c-format msgid "Server version is %.*s" msgstr "A versão do servidor é %.*s" -#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005 -#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021 -#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037 -#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059 +#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042 +#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 +#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096 #, fuzzy, c-format msgid "Server supports %s" msgstr "O servidor suporta side-band" -#: fetch-pack.c:992 +#: fetch-pack.c:1029 msgid "Server does not support shallow clients" msgstr "Servidor insustenta clientes shallow" -#: fetch-pack.c:1052 +#: fetch-pack.c:1089 msgid "Server does not support --shallow-since" msgstr "Servidor insustenta --shallow-since" -#: fetch-pack.c:1057 +#: fetch-pack.c:1094 msgid "Server does not support --shallow-exclude" msgstr "Servidor insustenta --shallow-exclude" -#: fetch-pack.c:1061 +#: fetch-pack.c:1098 msgid "Server does not support --deepen" msgstr "Servidor insustenta --deepen" -#: fetch-pack.c:1063 +#: fetch-pack.c:1100 #, fuzzy msgid "Server does not support this repository's object format" msgstr "Servidor insustenta formato de objeto deste repositório" -#: fetch-pack.c:1076 +#: fetch-pack.c:1113 msgid "no common commits" msgstr "commits comuns nenhuns" -#: fetch-pack.c:1088 fetch-pack.c:1628 +#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238 +#, fuzzy +msgid "source repository is shallow, reject to clone." +msgstr "o repositório de origem é raso, --local ignorado" + +#: fetch-pack.c:1128 fetch-pack.c:1660 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: falha ao obter." -#: fetch-pack.c:1214 +#: fetch-pack.c:1242 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "" -#: fetch-pack.c:1218 +#: fetch-pack.c:1246 #, fuzzy, c-format msgid "the server does not support algorithm '%s'" msgstr "o servidor insustenta algoritmo '%s'" -#: fetch-pack.c:1238 +#: fetch-pack.c:1279 #, fuzzy msgid "Server does not support shallow requests" msgstr "Servidor insustenta pedidos shallow" -#: fetch-pack.c:1245 +#: fetch-pack.c:1286 #, fuzzy msgid "Server supports filter" msgstr "Servidor sustenta filtro" -#: fetch-pack.c:1284 +#: fetch-pack.c:1329 fetch-pack.c:2043 #, fuzzy msgid "unable to write request to remote" msgstr "incapaz escrever pedidos para remoto" -#: fetch-pack.c:1302 +#: fetch-pack.c:1347 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1308 +#: fetch-pack.c:1353 #, fuzzy, c-format msgid "expected '%s', received '%s'" -msgstr "blob para %s '%s' esperado" +msgstr "" -#: fetch-pack.c:1369 +#: fetch-pack.c:1387 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1374 +#: fetch-pack.c:1392 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1384 +#: fetch-pack.c:1402 msgid "expected packfile to be sent after 'ready'" msgstr "" -#: fetch-pack.c:1386 +#: fetch-pack.c:1404 msgid "expected no other sections to be sent after no 'ready'" msgstr "" -#: fetch-pack.c:1428 +#: fetch-pack.c:1445 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1475 +#: fetch-pack.c:1494 #, fuzzy, c-format msgid "expected wanted-ref, got '%s'" -msgstr "esperava-se raso/aprofundar, obteve-se %s" +msgstr "" -#: fetch-pack.c:1480 +#: fetch-pack.c:1499 #, fuzzy, c-format msgid "unexpected wanted-ref: '%s'" -msgstr "fim de ficheiro inesperado" +msgstr "" -#: fetch-pack.c:1485 +#: fetch-pack.c:1504 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1515 +#: fetch-pack.c:1534 #, fuzzy msgid "git fetch-pack: expected response end packet" -msgstr "git fetch-pack: esperava-se lista rasa" +msgstr "git fetch-pack: esperado pacote fim de resposta" -#: fetch-pack.c:1897 +#: fetch-pack.c:1939 msgid "no matching remote head" msgstr "corresponde a remote head nenhuma" -#: fetch-pack.c:1920 builtin/clone.c:693 +#: fetch-pack.c:1962 builtin/clone.c:697 msgid "remote did not send all necessary objects" msgstr "remoto faltou enviar todos objetos necessários" -#: fetch-pack.c:1947 +#: fetch-pack.c:2065 +#, fuzzy +msgid "unexpected 'ready' from remote" +msgstr "" + +#: fetch-pack.c:2088 #, c-format msgid "no such remote ref %s" msgstr "referência remota %s inexistente" -#: fetch-pack.c:1950 +#: fetch-pack.c:2091 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Servidor proíbe pedido de objeto por anunciar %s" -#: gpg-interface.c:272 +#: gpg-interface.c:273 msgid "could not create temporary file" msgstr "incapaz criar ficheiro temporário" -#: gpg-interface.c:275 +#: gpg-interface.c:276 #, c-format msgid "failed writing detached signature to '%s'" msgstr "falha ao escrever assinatura destacada em '%s'" -#: gpg-interface.c:457 +#: gpg-interface.c:470 msgid "gpg failed to sign the data" msgstr "gpg falhou assinar os dados" #: graph.c:98 -#, c-format -msgid "ignore invalid color '%.*s' in log.graphColors" +#, fuzzy, c-format +msgid "ignored invalid color '%.*s' in log.graphColors" msgstr "ignorar cor inválida '%.*s' em log.graphColors" -#: grep.c:640 +#: grep.c:531 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" msgstr "" -#: grep.c:2100 +#: grep.c:1895 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': incapaz ler %s" -#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89 -#: builtin/rm.c:135 +#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" -msgstr "falha ao invocar stat de '%s'" +msgstr "" -#: grep.c:2128 +#: grep.c:1923 #, c-format msgid "'%s': short read" msgstr "'%s': leitura truncada" @@ -4417,7 +4574,7 @@ msgstr "comandos do git disponíveis noutras localizações em $PATH" msgid "These are common Git commands used in various situations:" msgstr "Estes são comandos do Git comuns usados em diversas situações:" -#: help.c:365 git.c:99 +#: help.c:365 git.c:100 #, fuzzy, c-format msgid "unsupported command listing type '%s'" msgstr "insustento para listagem tipo comandos '%s'" @@ -4569,47 +4726,52 @@ msgstr "nome de identação vazio (para <%s>) proíbido" msgid "name consists only of disallowed characters: %s" msgstr "nome consiste apenas de caracteres proíbidos: %s" -#: ident.c:454 builtin/commit.c:634 +#: ident.c:454 builtin/commit.c:647 #, c-format msgid "invalid date format: %s" msgstr "formato de data inválido: %s" -#: list-objects-filter-options.c:81 +#: list-objects-filter-options.c:83 msgid "expected 'tree:<depth>'" msgstr "" -#: list-objects-filter-options.c:96 +#: list-objects-filter-options.c:98 msgid "sparse:path filters support has been dropped" msgstr "" -#: list-objects-filter-options.c:109 +#: list-objects-filter-options.c:105 +#, fuzzy, c-format +msgid "'%s' for 'object:type=<type>' is not a valid object type" +msgstr "'%s' para 'object:type=<type>' é um tipo de objecto inválido" + +#: list-objects-filter-options.c:124 #, fuzzy, c-format msgid "invalid filter-spec '%s'" -msgstr "ficheiro inválido: '%s'" +msgstr "" -#: list-objects-filter-options.c:125 +#: list-objects-filter-options.c:140 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "" -#: list-objects-filter-options.c:167 +#: list-objects-filter-options.c:182 msgid "expected something after combine:" msgstr "" -#: list-objects-filter-options.c:249 +#: list-objects-filter-options.c:264 msgid "multiple filter-specs cannot be combined" msgstr "" -#: list-objects-filter-options.c:361 +#: list-objects-filter-options.c:376 msgid "unable to upgrade repository format to support partial clone" msgstr "" -#: list-objects-filter.c:492 +#: list-objects-filter.c:532 #, fuzzy, c-format msgid "unable to access sparse blob in '%s'" msgstr "incapaz acessar blob sparse em '%s'" -#: list-objects-filter.c:495 +#: list-objects-filter.c:535 #, fuzzy, c-format msgid "unable to parse sparse filter data in %s" msgstr "incapaz analisar dados de filtro sparse em %s" @@ -4624,7 +4786,7 @@ msgstr "" msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "" -#: list-objects.c:375 +#: list-objects.c:398 #, fuzzy, c-format msgid "unable to load root tree for commit %s" msgstr "incapaz carregar raiz de árvore para commit %s" @@ -4653,11 +4815,240 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Incapaz de criar '%s.lock': %s" -#: ls-refs.c:109 +#: ls-refs.c:37 +#, fuzzy, c-format +msgid "invalid value '%s' for lsrefs.unborn" +msgstr "" + +#: ls-refs.c:167 msgid "expected flush after ls-refs arguments" msgstr "" -#: merge-ort-wrappers.c:13 merge-recursive.c:3672 +#: mailinfo.c:1050 +msgid "quoted CRLF detected" +msgstr "" + +#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46 +#, fuzzy, c-format +msgid "bad action '%s' for '%s'" +msgstr "ação inválida '%s' para '%s'" + +#: merge-ort.c:1228 merge-recursive.c:1206 +#, fuzzy, c-format +msgid "Failed to merge submodule %s (not checked out)" +msgstr "" + +#: merge-ort.c:1237 merge-recursive.c:1213 +#, fuzzy, c-format +msgid "Failed to merge submodule %s (commits not present)" +msgstr "" + +#: merge-ort.c:1246 merge-recursive.c:1220 +#, c-format +msgid "Failed to merge submodule %s (commits don't follow merge-base)" +msgstr "" + +#: merge-ort.c:1256 merge-ort.c:1263 +#, fuzzy, c-format +msgid "Note: Fast-forwarding submodule %s to %s" +msgstr "" + +#: merge-ort.c:1284 +#, fuzzy, c-format +msgid "Failed to merge submodule %s" +msgstr "falha a percorrer recursivamente dentro de submódulo '%s'" + +#: merge-ort.c:1291 +#, fuzzy, c-format +msgid "" +"Failed to merge submodule %s, but a possible merge resolution exists:\n" +"%s\n" +msgstr "" + +#: merge-ort.c:1295 merge-recursive.c:1274 +#, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" + +#: merge-ort.c:1308 +#, fuzzy, c-format +msgid "" +"Failed to merge submodule %s, but multiple possible merges exist:\n" +"%s" +msgstr "" + +#: merge-ort.c:1527 merge-recursive.c:1363 +msgid "Failed to execute internal merge" +msgstr "Falha ao executar integração interna" + +#: merge-ort.c:1532 merge-recursive.c:1368 +#, c-format +msgid "Unable to add %s to database" +msgstr "Incapaz de adicionar %s à base de dados" + +#: merge-ort.c:1539 merge-recursive.c:1401 +#, c-format +msgid "Auto-merging %s" +msgstr "A integrar automaticamente %s" + +#: merge-ort.c:1678 merge-recursive.c:2123 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +msgstr "" + +#: merge-ort.c:1688 merge-recursive.c:2133 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +msgstr "" + +#: merge-ort.c:1746 +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to rename %s to; it was " +"renamed to multiple other directories, with no destination getting a " +"majority of the files." +msgstr "" + +#: merge-ort.c:1900 merge-recursive.c:2469 +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "" + +#: merge-ort.c:2044 merge-recursive.c:3252 +#, c-format +msgid "" +"Path updated: %s added in %s inside a directory that was renamed in %s; " +"moving it to %s." +msgstr "" + +#: merge-ort.c:2051 merge-recursive.c:3259 +#, c-format +msgid "" +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " +"%s; moving it to %s." +msgstr "" + +#: merge-ort.c:2064 merge-recursive.c:3255 +#, c-format +msgid "" +"CONFLICT (file location): %s added in %s inside a directory that was renamed " +"in %s, suggesting it should perhaps be moved to %s." +msgstr "" + +#: merge-ort.c:2072 merge-recursive.c:3262 +#, c-format +msgid "" +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " +"was renamed in %s, suggesting it should perhaps be moved to %s." +msgstr "" + +#: merge-ort.c:2228 +#, fuzzy, c-format +msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." +msgstr "" +"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome " +"%s->%s em %s" + +#: merge-ort.c:2323 +#, c-format +msgid "" +"CONFLICT (rename involved in collision): rename of %s -> %s has content " +"conflicts AND collides with another path; this may result in nested conflict " +"markers." +msgstr "" + +#: merge-ort.c:2342 merge-ort.c:2366 +#, fuzzy, c-format +msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." +msgstr "" +"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em " +"%s" + +#: merge-ort.c:2819 merge-recursive.c:3013 +#, c-format +msgid "cannot read object %s" +msgstr "incapaz ler objeto %s" + +#: merge-ort.c:2822 merge-recursive.c:3016 +#, c-format +msgid "object %s is not a blob" +msgstr "objeto %s é blob nenhum" + +#: merge-ort.c:3250 +#, c-format +msgid "" +"CONFLICT (file/directory): directory in the way of %s from %s; moving it to " +"%s instead." +msgstr "" + +#: merge-ort.c:3326 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed both " +"of them so each can be recorded somewhere." +msgstr "" + +#: merge-ort.c:3333 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed one " +"of them so each can be recorded somewhere." +msgstr "" + +#: merge-ort.c:3433 merge-recursive.c:3092 +msgid "content" +msgstr "conteúdo" + +#: merge-ort.c:3435 merge-recursive.c:3096 +msgid "add/add" +msgstr "adicionar/adicionar" + +#: merge-ort.c:3437 merge-recursive.c:3141 +msgid "submodule" +msgstr "submódulo" + +#: merge-ort.c:3439 merge-recursive.c:3142 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "CONFLITO (%s): conflito de integração em %s" + +#: merge-ort.c:3470 +#, fuzzy, c-format +msgid "" +"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " +"of %s left in tree." +msgstr "" +"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s " +"deixada na árvore." + +#: merge-ort.c:3757 +#, c-format +msgid "" +"Note: %s not up to date and in way of checking out conflicted version; old " +"copy renamed to %s" +msgstr "" + +#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge +#. base, and 2-3) the trees for the two trees we're merging. +#. +#: merge-ort.c:4116 +#, fuzzy, c-format +msgid "collecting merge info failed for trees %s, %s, %s" +msgstr "" + +#: merge-ort-wrappers.c:13 merge-recursive.c:3707 #, fuzzy, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4667,145 +5058,105 @@ msgstr "" "integrar:\n" "%%s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3436 -#, fuzzy, c-format -msgid "Already up to date!" -msgstr "Já está atualizado!" +#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402 +#, fuzzy +msgid "Already up to date." +msgstr "Já está atualizado." -#: merge-recursive.c:356 +#: merge-recursive.c:357 msgid "(bad commit)\n" msgstr "(commit incorreto)\n" -#: merge-recursive.c:379 +#: merge-recursive.c:380 #, fuzzy, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "addinfo_cache falhou no caminho '%s'" -#: merge-recursive.c:388 +#: merge-recursive.c:389 #, fuzzy, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "addinfo_cache falhou no caminho '%s'" -#: merge-recursive.c:874 +#: merge-recursive.c:877 #, c-format msgid "failed to create path '%s'%s" msgstr "falha ao criar o caminho '%s'%s" -#: merge-recursive.c:885 +#: merge-recursive.c:888 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "A remover %s para criar espaço para o subdiretório\n" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:902 merge-recursive.c:921 msgid ": perhaps a D/F conflict?" msgstr ": talvez um conflito D/F?" -#: merge-recursive.c:908 +#: merge-recursive.c:911 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "recusando perder ficheiro untracked em '%s'" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:952 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "incapaz ler objeto %s '%s'" -#: merge-recursive.c:954 +#: merge-recursive.c:957 #, c-format msgid "blob expected for %s '%s'" -msgstr "blob para %s '%s' esperado" +msgstr "" -#: merge-recursive.c:979 +#: merge-recursive.c:982 #, c-format msgid "failed to open '%s': %s" -msgstr "falha ao abrir '%s': %s" +msgstr "falhou ao abrir '%s': %s" -#: merge-recursive.c:990 +#: merge-recursive.c:993 #, c-format msgid "failed to symlink '%s': %s" msgstr "falha ao criar a ligação simbólica '%s': %s" -#: merge-recursive.c:995 +#: merge-recursive.c:998 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "desconheço que fazer com %06o %s '%s'" -#: merge-recursive.c:1191 -#, fuzzy, c-format -msgid "Failed to merge submodule %s (not checked out)" -msgstr "Falha ao registar o submódulo '$sm_path'" - -#: merge-recursive.c:1198 -#, fuzzy, c-format -msgid "Failed to merge submodule %s (commits not present)" -msgstr "Falha ao registar o submódulo '$sm_path'" - -#: merge-recursive.c:1205 -#, c-format -msgid "Failed to merge submodule %s (commits don't follow merge-base)" -msgstr "" - -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1228 merge-recursive.c:1240 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1231 merge-recursive.c:1243 #, fuzzy, c-format msgid "Fast-forwarding submodule %s" -msgstr "Avanço-rápido para $sha1" +msgstr "Avançando submódulo %s" -#: merge-recursive.c:1251 +#: merge-recursive.c:1266 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -#: merge-recursive.c:1255 +#: merge-recursive.c:1270 #, fuzzy, c-format msgid "Failed to merge submodule %s (not fast-forward)" -msgstr "Falha ao registar o submódulo '$sm_path'" - -#: merge-recursive.c:1256 -msgid "Found a possible merge resolution for the submodule:\n" msgstr "" -#: merge-recursive.c:1259 -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" +#: merge-recursive.c:1271 +msgid "Found a possible merge resolution for the submodule:\n" msgstr "" -#: merge-recursive.c:1268 +#: merge-recursive.c:1283 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" -#: merge-recursive.c:1341 -msgid "Failed to execute internal merge" -msgstr "Falha ao executar integração interna" - -#: merge-recursive.c:1346 -#, c-format -msgid "Unable to add %s to database" -msgstr "Incapaz de adicionar %s à base de dados" - -#: merge-recursive.c:1378 -#, c-format -msgid "Auto-merging %s" -msgstr "A integrar automaticamente %s" - -#: merge-recursive.c:1402 +#: merge-recursive.c:1425 #, fuzzy, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." -msgstr "Erro: Recusando perder ficheiro untracked de '%s'; escrevendo " -"invés para %s" +msgstr "" +"Erro: Recusando perder ficheiro untracked de '%s'; escrevendo invés para %s" -#: merge-recursive.c:1474 +#: merge-recursive.c:1497 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4814,7 +5165,7 @@ msgstr "" "CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s " "deixada na árvore." -#: merge-recursive.c:1479 +#: merge-recursive.c:1502 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4823,7 +5174,7 @@ msgstr "" "CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versão de %s " "de %s deixada na árvore." -#: merge-recursive.c:1486 +#: merge-recursive.c:1509 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4832,7 +5183,7 @@ msgstr "" "CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s " "deixada na árvore em %s." -#: merge-recursive.c:1491 +#: merge-recursive.c:1514 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4841,44 +5192,43 @@ msgstr "" "CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versão de %s " "de %s deixada na árvore em %s." -#: merge-recursive.c:1526 +#: merge-recursive.c:1549 msgid "rename" msgstr "mudar nome" -#: merge-recursive.c:1526 +#: merge-recursive.c:1549 msgid "renamed" msgstr "nome mudado" -#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 +#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169 #, fuzzy, c-format msgid "Refusing to lose dirty file at %s" msgstr "Recusando perder ficheiro sujo de %s" -#: merge-recursive.c:1587 +#: merge-recursive.c:1610 #, fuzzy, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." -msgstr "Recusando perder ficheiro untracked de %s, apesar de este estar " -"no caminho." +msgstr "" +"Recusando perder ficheiro untracked de %s, apesar de este estar no caminho." -#: merge-recursive.c:1645 +#: merge-recursive.c:1668 #, fuzzy, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em " "%s" -#: merge-recursive.c:1676 +#: merge-recursive.c:1699 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s é um diretório em %s adicionando %s no seu lugar" -#: merge-recursive.c:1681 +#: merge-recursive.c:1704 #, fuzzy, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" -msgstr "Recusando perder ficheiro untracked de %s; adicionado-o como %s " -"invés" +msgstr "Recusando perder ficheiro untracked de %s; adicionado-o como %s invés" -#: merge-recursive.c:1708 +#: merge-recursive.c:1731 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -4887,18 +5237,18 @@ msgstr "" "CONFLITO (mudar nome/mudar nome): Mudar o nome \"%s\"->\"%s\" no ramo \"%s\" " "mudar o nome \"%s\"->\"%s\" em \"%s\"%s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1736 msgid " (left unresolved)" msgstr " (por resolver)" -#: merge-recursive.c:1805 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome " "%s->%s em %s" -#: merge-recursive.c:2068 +#: merge-recursive.c:2091 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4906,21 +5256,7 @@ msgid "" "getting a majority of the files." msgstr "" -#: merge-recursive.c:2100 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " -"implicit directory rename(s) putting the following path(s) there: %s." -msgstr "" - -#: merge-recursive.c:2110 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " -"implicit directory renames tried to put these paths there: %s" -msgstr "" - -#: merge-recursive.c:2202 +#: merge-recursive.c:2225 #, fuzzy, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4929,141 +5265,80 @@ msgstr "" "CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome " "%s->%s em %s" -#: merge-recursive.c:2447 -#, c-format -msgid "" -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " -"renamed." -msgstr "" - -#: merge-recursive.c:2973 -#, c-format -msgid "cannot read object %s" -msgstr "incapaz ler objeto %s" - -#: merge-recursive.c:2976 -#, c-format -msgid "object %s is not a blob" -msgstr "objeto %s é blob nenhum" - -#: merge-recursive.c:3040 +#: merge-recursive.c:3080 msgid "modify" msgstr "modificar" -#: merge-recursive.c:3040 +#: merge-recursive.c:3080 msgid "modified" msgstr "modificado" -#: merge-recursive.c:3052 -msgid "content" -msgstr "conteúdo" - -#: merge-recursive.c:3056 -msgid "add/add" -msgstr "adicionar/adicionar" - -#: merge-recursive.c:3079 +#: merge-recursive.c:3119 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s ignorado (integrado é igual ao existente)" -#: merge-recursive.c:3101 -msgid "submodule" -msgstr "submódulo" - -#: merge-recursive.c:3102 -#, c-format -msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "CONFLITO (%s): conflito de integração em %s" - -#: merge-recursive.c:3132 +#: merge-recursive.c:3172 #, c-format msgid "Adding as %s instead" msgstr "A adicionar como %s, em alternativa." -#: merge-recursive.c:3215 -#, c-format -msgid "" -"Path updated: %s added in %s inside a directory that was renamed in %s; " -"moving it to %s." -msgstr "" - -#: merge-recursive.c:3218 -#, c-format -msgid "" -"CONFLICT (file location): %s added in %s inside a directory that was renamed " -"in %s, suggesting it should perhaps be moved to %s." -msgstr "" - -#: merge-recursive.c:3222 -#, c-format -msgid "" -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " -"%s; moving it to %s." -msgstr "" - -#: merge-recursive.c:3225 -#, c-format -msgid "" -"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " -"was renamed in %s, suggesting it should perhaps be moved to %s." -msgstr "" - -#: merge-recursive.c:3339 +#: merge-recursive.c:3376 #, c-format msgid "Removing %s" msgstr "A remover %s" -#: merge-recursive.c:3362 +#: merge-recursive.c:3399 msgid "file/directory" msgstr "ficheiro/diretório" -#: merge-recursive.c:3367 +#: merge-recursive.c:3404 msgid "directory/file" msgstr "diretório/ficheiro" -#: merge-recursive.c:3374 +#: merge-recursive.c:3411 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLITO (%s): Há um diretório designado %s em %s. A adicionar %s como %s" -#: merge-recursive.c:3383 +#: merge-recursive.c:3420 #, c-format msgid "Adding %s" msgstr "A adicionar %s" -#: merge-recursive.c:3392 +#: merge-recursive.c:3429 #, fuzzy, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLITO (%s): conflito de integração em %s" -#: merge-recursive.c:3445 +#: merge-recursive.c:3482 #, c-format msgid "merging of trees %s and %s failed" msgstr "falha ao integrar as árvores %s e %s" -#: merge-recursive.c:3550 +#: merge-recursive.c:3576 msgid "Merging:" msgstr "A integrar:" -#: merge-recursive.c:3563 +#: merge-recursive.c:3589 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u antecessor comum encontrado:" msgstr[1] "%u antecessores comuns encontrados:" -#: merge-recursive.c:3613 +#: merge-recursive.c:3639 msgid "merge returned no commit" msgstr "junção retornou commit nenhum" -#: merge-recursive.c:3769 +#: merge-recursive.c:3804 #, c-format msgid "Could not parse object '%s'" msgstr "Incapaz de analisar objeto '%s'" -#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895 +#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900 +#: builtin/stash.c:473 msgid "Unable to write index." msgstr "Incapaz de escrever no index." @@ -5071,190 +5346,211 @@ msgstr "Incapaz de escrever no index." msgid "failed to read the cache" msgstr "falha ao ler a cache" -#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917 -#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817 -#: builtin/stash.c:265 +#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966 +#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 +#: builtin/stash.c:267 msgid "unable to write new index file" msgstr "incapaz escrever novo ficheiro index" -#: midx.c:80 +#: midx.c:74 +#, fuzzy +msgid "multi-pack-index OID fanout is of the wrong size" +msgstr "versão %d de multi-pack-index é irreconhecível" + +#: midx.c:105 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" -#: midx.c:96 +#: midx.c:121 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" -#: midx.c:101 +#: midx.c:126 #, c-format msgid "multi-pack-index version %d not recognized" -msgstr "" +msgstr "versão %d de multi-pack-index é irreconhecível" -#: midx.c:106 +#: midx.c:131 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "" -#: midx.c:123 -msgid "invalid chunk offset (too large)" -msgstr "" - -#: midx.c:147 -msgid "terminating multi-pack-index chunk id appears earlier than expected" -msgstr "" - -#: midx.c:160 +#: midx.c:148 msgid "multi-pack-index missing required pack-name chunk" msgstr "" -#: midx.c:162 +#: midx.c:150 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" -#: midx.c:164 +#: midx.c:152 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" -#: midx.c:166 +#: midx.c:154 msgid "multi-pack-index missing required object offsets chunk" msgstr "" -#: midx.c:180 +#: midx.c:170 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:223 +#: midx.c:214 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:273 +#: midx.c:264 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" -#: midx.c:480 +#: midx.c:490 #, fuzzy, c-format msgid "failed to add packfile '%s'" -msgstr "falha ao ler o ficheiro de comando '%s'" +msgstr "" -#: midx.c:486 +#: midx.c:496 #, fuzzy, c-format msgid "failed to open pack-index '%s'" -msgstr "falha ao abrir '%s'" +msgstr "" -#: midx.c:546 +#: midx.c:564 #, fuzzy, c-format msgid "failed to locate object %d in packfile" -msgstr "Falha ao criar os ficheiros de saída" +msgstr "" + +#: midx.c:880 builtin/index-pack.c:1533 +#, fuzzy +msgid "cannot store reverse index file" +msgstr "incapaz guardar ficheiro index" -#: midx.c:846 +#: midx.c:920 +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "ignorando multi-pack-index existente; checksum diferente" + +#: midx.c:943 msgid "Adding packfiles to multi-pack-index" msgstr "" -#: midx.c:879 +#: midx.c:989 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:931 +#: midx.c:1034 +#, fuzzy, c-format +msgid "unknown preferred pack: '%s'" +msgstr "" + +#: midx.c:1039 +#, fuzzy, c-format +msgid "preferred pack '%s' is expired" +msgstr "o repositório de referência '%s' está enxertado" + +#: midx.c:1055 #, fuzzy msgid "no pack files to index." msgstr "pack files nenhuns para index." -#: midx.c:982 -msgid "Writing chunks to multi-pack-index" -msgstr "" +#: midx.c:1135 builtin/clean.c:37 +#, c-format +msgid "failed to remove %s" +msgstr "falha ao remover %s" -#: midx.c:1060 +#: midx.c:1166 #, fuzzy, c-format msgid "failed to clear multi-pack-index at %s" -msgstr "falha ao limpar o índice" +msgstr "" -#: midx.c:1116 +#: midx.c:1225 msgid "multi-pack-index file exists, but failed to parse" msgstr "" -#: midx.c:1124 +#: midx.c:1233 +msgid "incorrect checksum" +msgstr "checksum incorreto" + +#: midx.c:1236 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1139 +#: midx.c:1251 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" -#: midx.c:1144 +#: midx.c:1256 msgid "the midx contains no oid" msgstr "" -#: midx.c:1153 +#: midx.c:1265 msgid "Verifying OID order in multi-pack-index" msgstr "" -#: midx.c:1162 +#: midx.c:1274 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1182 +#: midx.c:1294 #, fuzzy msgid "Sorting objects by packfile" -msgstr "A escrever objetos" +msgstr "" -#: midx.c:1189 +#: midx.c:1301 #, fuzzy msgid "Verifying object offsets" -msgstr "A escrever objetos" +msgstr "" -#: midx.c:1205 +#: midx.c:1317 #, fuzzy, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "falhou carregar entrada pack para oid[%d] = %s" -#: midx.c:1211 +#: midx.c:1323 #, fuzzy, c-format msgid "failed to load pack-index for packfile %s" -msgstr "falha ao ler o ficheiro de comando '%s'" +msgstr "" -#: midx.c:1220 +#: midx.c:1332 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" -#: midx.c:1245 +#: midx.c:1357 #, fuzzy msgid "Counting referenced objects" msgstr "Contando objetos referenciados" -#: midx.c:1255 +#: midx.c:1367 msgid "Finding and deleting unreferenced packfiles" msgstr "" -#: midx.c:1446 +#: midx.c:1558 #, fuzzy msgid "could not start pack-objects" msgstr "incapaz de começar pack-objects" -#: midx.c:1466 +#: midx.c:1578 #, fuzzy msgid "could not finish pack-objects" msgstr "incapaz de terminar pack-objects" -#: name-hash.c:537 +#: name-hash.c:542 #, fuzzy, c-format msgid "unable to create lazy_dir thread: %s" msgstr "incapaz criar thread lazy_dir: %s" -#: name-hash.c:559 +#: name-hash.c:564 #, fuzzy, c-format msgid "unable to create lazy_name thread: %s" msgstr "incapaz criar thread lazy_name: %s" -#: name-hash.c:565 +#: name-hash.c:570 #, fuzzy, c-format msgid "unable to join lazy_name thread: %s" msgstr "incapaz juntar a thread lazy_name: %s" @@ -5268,7 +5564,8 @@ msgid "" msgstr "" "Ficou por concluír a anterior junção de notas (%s existe).\n" "Por favor, usa 'git notes merge --commit' ou 'git notes merge --abort' para " -"commitar/abortar a junção anterior antes de começares uma nova junção de notas." +"commitar/abortar a junção anterior antes de começares uma nova junção de " +"notas." #: notes-merge.c:284 #, c-format @@ -5277,7 +5574,8 @@ msgstr "Ficou por concluír a tua junção de notas (%s existe)." #: notes-utils.c:46 msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "Impossível commit notas de árvore que estejam por iniciar/por referênciar" +msgstr "" +"Impossível commit notas de árvore que estejam por iniciar/por referênciar" #: notes-utils.c:105 #, c-format @@ -5298,6 +5596,367 @@ msgstr "Reescrita de notas em %s (fora de refs/notes/) recusada" msgid "Bad %s value: '%s'" msgstr "Valor incorreto de %s: '%s'" +#: object-file.c:526 +#, c-format +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "" + +#: object-file.c:584 +#, fuzzy, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "incapaz normalizar path de objeto alternativo: %s" + +#: object-file.c:658 +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "" + +#: object-file.c:665 +#, fuzzy, c-format +msgid "unable to normalize object directory: %s" +msgstr "incapaz normalizar pasta de objeto: %s" + +#: object-file.c:708 +#, fuzzy +msgid "unable to fdopen alternates lockfile" +msgstr "incapaz de fdopen lockfile alternativo" + +#: object-file.c:726 +#, fuzzy +msgid "unable to read alternates file" +msgstr "incapaz ler ficheiro alternativo" + +#: object-file.c:733 +#, fuzzy +msgid "unable to move new alternates file into place" +msgstr "incapaz mover novo ficheiro alternativo para o sítio" + +#: object-file.c:768 +#, c-format +msgid "path '%s' does not exist" +msgstr "caminho '%s' é inexistente" + +#: object-file.c:789 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "" +"repositório referência '%s' como uma checkout ligada ainda é insustentado." + +#: object-file.c:795 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "repositório referência '%s' é repositório local nenhum." + +#: object-file.c:801 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "o repositório de referência '%s' é raso" + +#: object-file.c:809 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "o repositório de referência '%s' está enxertado" + +#: object-file.c:869 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "" + +#: object-file.c:1019 +#, c-format +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "" + +#: object-file.c:1054 +#, fuzzy, c-format +msgid "mmap failed%s" +msgstr "mmap falhou%s" + +#: object-file.c:1218 +#, fuzzy, c-format +msgid "object file %s is empty" +msgstr "" + +#: object-file.c:1353 object-file.c:2548 +#, fuzzy, c-format +msgid "corrupt loose object '%s'" +msgstr "objeto solto '%s' corrupto" + +#: object-file.c:1355 object-file.c:2552 +#, fuzzy, c-format +msgid "garbage at end of loose object '%s'" +msgstr "lixo no fim de objeto solto '%s'" + +#: object-file.c:1397 +#, fuzzy +msgid "invalid object type" +msgstr "tipo de objeto incorreto." + +#: object-file.c:1481 +#, c-format +msgid "unable to unpack %s header with --allow-unknown-type" +msgstr "" + +#: object-file.c:1484 +#, fuzzy, c-format +msgid "unable to unpack %s header" +msgstr "incapaz desempacotar cabeçalho %s" + +#: object-file.c:1490 +#, c-format +msgid "unable to parse %s header with --allow-unknown-type" +msgstr "" + +#: object-file.c:1493 +#, fuzzy, c-format +msgid "unable to parse %s header" +msgstr "incapaz processar cabeçalho %s" + +#: object-file.c:1717 +#, fuzzy, c-format +msgid "failed to read object %s" +msgstr "falha ao ler o objeto '%s'." + +#: object-file.c:1721 +#, fuzzy, c-format +msgid "replacement %s not found for %s" +msgstr "%s substituto, por encontrar para %s" + +#: object-file.c:1725 +#, fuzzy, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "" + +#: object-file.c:1729 +#, fuzzy, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "" + +#: object-file.c:1834 +#, fuzzy, c-format +msgid "unable to write file %s" +msgstr "incapaz escrever ficheiro %s" + +#: object-file.c:1841 +#, fuzzy, c-format +msgid "unable to set permission to '%s'" +msgstr "incapaz definir permissão para '%s'" + +#: object-file.c:1848 +#, fuzzy +msgid "file write error" +msgstr "" + +#: object-file.c:1868 +#, fuzzy +msgid "error when closing loose object file" +msgstr "" + +#: object-file.c:1933 +#, c-format +msgid "insufficient permission for adding an object to repository database %s" +msgstr "" + +#: object-file.c:1935 +#, fuzzy +msgid "unable to create temporary file" +msgstr "incapaz criar ficheiro temporário" + +#: object-file.c:1959 +#, fuzzy +msgid "unable to write loose object file" +msgstr "incapaz escrever ficheiro objeto solto" + +#: object-file.c:1965 +#, fuzzy, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "incapaz esvaziar objeto novo %s (%d)" + +#: object-file.c:1969 +#, fuzzy, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "deflateEnd em objeto %s falhou (%d)" + +#: object-file.c:1973 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "" + +#: object-file.c:1983 builtin/pack-objects.c:1237 +#, fuzzy, c-format +msgid "failed utime() on %s" +msgstr "" + +#: object-file.c:2060 +#, fuzzy, c-format +msgid "cannot read object for %s" +msgstr "incapaz ler objeto para %s" + +#: object-file.c:2111 +#, fuzzy +msgid "corrupt commit" +msgstr "substituir autor do commit" + +#: object-file.c:2119 +#, fuzzy +msgid "corrupt tag" +msgstr "mostrar tags" + +#: object-file.c:2219 +#, c-format +msgid "read error while indexing %s" +msgstr "" + +#: object-file.c:2222 +#, fuzzy, c-format +msgid "short read while indexing %s" +msgstr "leitura curta enquanto indexando %s" + +#: object-file.c:2295 object-file.c:2305 +#, fuzzy, c-format +msgid "%s: failed to insert into database" +msgstr "%s: falhou inserir na base de dados" + +#: object-file.c:2311 +#, fuzzy, c-format +msgid "%s: unsupported file type" +msgstr "%s: tipo ficheiro insustentado" + +#: object-file.c:2335 +#, fuzzy, c-format +msgid "%s is not a valid object" +msgstr "%s é objeto inválido" + +#: object-file.c:2337 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s é um objeto inválido '%s'" + +#: object-file.c:2364 builtin/index-pack.c:192 +#, c-format +msgid "unable to open %s" +msgstr "incapaz abrir %s" + +#: object-file.c:2559 object-file.c:2612 +#, c-format +msgid "hash mismatch for %s (expected %s)" +msgstr "" + +#: object-file.c:2583 +#, fuzzy, c-format +msgid "unable to mmap %s" +msgstr "incapaz mmap %s" + +#: object-file.c:2588 +#, fuzzy, c-format +msgid "unable to unpack header of %s" +msgstr "incapaz desempacotar cabeçalho de %s" + +#: object-file.c:2594 +#, fuzzy, c-format +msgid "unable to parse header of %s" +msgstr "incapaz processar cabeçalho de %s" + +#: object-file.c:2605 +#, fuzzy, c-format +msgid "unable to unpack contents of %s" +msgstr "incapaz desempacotar conteúdo de %s" + +#: object-name.c:480 +#, fuzzy, c-format +msgid "short object ID %s is ambiguous" +msgstr "SHA1 curto %s é ambíguo" + +#: object-name.c:491 +msgid "The candidates are:" +msgstr "Os candidatos são:" + +#: object-name.c:790 +#, fuzzy +msgid "" +"Git normally never creates a ref that ends with 40 hex characters\n" +"because it will be ignored when you just specify 40-hex. These refs\n" +"may be created by mistake. For example,\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.objectNameWarning false\"" +msgstr "" +"Normalmente o Git nunca cria refs que terminem em 40 caracteres\n" +"hexadecimais, porque será ignorada quando apenas se indica 40-hex.\n" +"Poderam-se criar estas refs por engano. Como no exemplo,\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"onde \"$br\" fica vazio e uma ref de 40-hex é criada. Por favor\n" +"examine estas refs e talvez apague-as. Desative esta mensagem\n" +"executando \"git config advice.objectNameWarning false\"" + +#: object-name.c:910 +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "" + +#: object-name.c:918 +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "" + +#: object-name.c:1696 +#, fuzzy, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "O caminho '%s' está dentro do submódulo '%.*s'" + +#: object-name.c:1702 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" + +#: object-name.c:1711 +#, fuzzy, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "caminho '%s' é inexistente em '%.*s'" + +#: object-name.c:1739 +#, c-format +msgid "" +"path '%s' is in the index, but not at stage %d\n" +"hint: Did you mean ':%d:%s'?" +msgstr "" + +#: object-name.c:1755 +#, c-format +msgid "" +"path '%s' is in the index, but not '%s'\n" +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" +msgstr "" + +#: object-name.c:1763 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "" + +#: object-name.c:1765 +#, fuzzy, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "caminho '%s' é inexistente (quer no disco quer no index)" + +#: object-name.c:1778 +#, fuzzy +msgid "relative path syntax can't be used outside working tree" +msgstr "" +"Os caminhos relativos só podem ser usados a partir do topo da árvore de " +"trabalho" + +#: object-name.c:1916 +#, fuzzy, c-format +msgid "invalid object name '%.*s'." +msgstr "Nome de objeto inválido: '%s'." + #: object.c:53 #, fuzzy, c-format msgid "invalid object type \"%s\"" @@ -5308,36 +5967,91 @@ msgstr "objeto blob inválido %s" msgid "object %s is a %s, not a %s" msgstr "objeto %s é %s, é %s nenhum(a)" -#: object.c:233 +#: object.c:250 #, fuzzy, c-format msgid "object %s has unknown type id %d" -msgstr "objeto de tipo desconhecido" +msgstr "" -#: object.c:246 +#: object.c:263 #, c-format msgid "unable to parse object: %s" msgstr "incapaz analisar objeto: %s" -#: object.c:266 object.c:278 +#: object.c:283 object.c:295 #, c-format msgid "hash mismatch %s" msgstr "" -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411 #, fuzzy, c-format msgid "unable to get size of %s" msgstr "incapaz obter tamanho de %s" -#: packfile.c:615 +#: pack-bitmap.c:1571 builtin/rev-list.c:92 +#, fuzzy, c-format +msgid "unable to get disk usage of %s" +msgstr "incapaz obter tamanho de %s" + +#: pack-revindex.c:221 +#, c-format +msgid "reverse-index file %s is too small" +msgstr "" + +#: pack-revindex.c:226 +#, fuzzy, c-format +msgid "reverse-index file %s is corrupt" +msgstr "" + +#: pack-revindex.c:234 +#, fuzzy, c-format +msgid "reverse-index file %s has unknown signature" +msgstr "" + +#: pack-revindex.c:238 +#, c-format +msgid "reverse-index file %s has unsupported version %<PRIu32>" +msgstr "" + +#: pack-revindex.c:243 +#, c-format +msgid "reverse-index file %s has unsupported hash id %<PRIu32>" +msgstr "" + +#: pack-write.c:250 +#, fuzzy +msgid "cannot both write and verify reverse index" +msgstr "incapaz ler o index" + +#: pack-write.c:271 +#, fuzzy, c-format +msgid "could not stat: %s" +msgstr "incapaz obter estatutário %s" + +#: pack-write.c:283 +#, fuzzy, c-format +msgid "failed to make %s readable" +msgstr "falha a analisar %s" + +#: pack-write.c:522 +#, fuzzy, c-format +msgid "could not write '%s' promisor file" +msgstr "incapaz escrever ficheiro promissor '%s'" + +#: packfile.c:625 msgid "offset before end of packfile (broken .idx?)" msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)" -#: packfile.c:1907 +#: packfile.c:655 +#, fuzzy, c-format +msgid "packfile %s cannot be mapped%s" +msgstr "ficheiro-pacote %s incapaz ser mapeado%s" + +#: packfile.c:1934 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset antes do início do índice do pacote %s (índice corrompido?)" -#: packfile.c:1911 +#: packfile.c:1938 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset depois do fim do índice do pacote %s (índice truncado?)" @@ -5345,12 +6059,12 @@ msgstr "offset depois do fim do índice do pacote %s (índice truncado?)" #: parse-options-cb.c:20 parse-options-cb.c:24 #, fuzzy, c-format msgid "option `%s' expects a numerical value" -msgstr "a opção '%c' espera um valor numérico" +msgstr "" #: parse-options-cb.c:41 #, fuzzy, c-format msgid "malformed expiration date '%s'" -msgstr "folha de opções malformada: '%s'" +msgstr "data de prazo de validade malformada '%s'" #: parse-options-cb.c:54 #, c-format @@ -5370,12 +6084,12 @@ msgstr "a opção '%s' requer um valor" #: parse-options.c:73 #, fuzzy, c-format msgid "%s is incompatible with %s" -msgstr "--long é incompatível com --abbrev=0" +msgstr "%s é incompatível com %s" #: parse-options.c:78 #, fuzzy, c-format msgid "%s : incompatible with something else" -msgstr "--dirty é incompatível com commits ou semelhantes" +msgstr "" #: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, fuzzy, c-format @@ -5402,31 +6116,31 @@ msgstr "" msgid "did you mean `--%s` (with two dashes)?" msgstr "" -#: parse-options.c:666 parse-options.c:971 +#: parse-options.c:668 parse-options.c:988 #, c-format msgid "alias of --%s" msgstr "" -#: parse-options.c:862 +#: parse-options.c:879 #, fuzzy, c-format msgid "unknown option `%s'" -msgstr "opção desconhecido %s" +msgstr "" -#: parse-options.c:864 +#: parse-options.c:881 #, fuzzy, c-format msgid "unknown switch `%c'" -msgstr "opção desconhecido %s" +msgstr "" -#: parse-options.c:866 +#: parse-options.c:883 #, fuzzy, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "Definidição --confirm desconhecida: '%s'" -#: parse-options.c:890 +#: parse-options.c:907 msgid "..." msgstr "..." -#: parse-options.c:909 +#: parse-options.c:926 #, c-format msgid "usage: %s" msgstr "utilização: %s" @@ -5434,17 +6148,17 @@ msgstr "utilização: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:915 +#: parse-options.c:932 #, c-format msgid " or: %s" msgstr " ou: %s" -#: parse-options.c:918 +#: parse-options.c:935 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:957 +#: parse-options.c:974 msgid "-NUM" msgstr "-NUM" @@ -5453,30 +6167,30 @@ msgstr "-NUM" msgid "Could not make %s writable by group" msgstr "Incapaz de fazer %s escrevível ao grupo" -#: pathspec.c:130 +#: pathspec.c:151 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "Carácter de escape '\\' é proíbido como último carácter no valor attr" -#: pathspec.c:148 +#: pathspec.c:169 msgid "Only one 'attr:' specification is allowed." msgstr "Só se pode especificar um 'attr:'." -#: pathspec.c:151 +#: pathspec.c:172 msgid "attr spec must not be empty" msgstr "attr spec tem de ter algum conteúdo" -#: pathspec.c:194 +#: pathspec.c:215 #, c-format msgid "invalid attribute name %s" msgstr "nome de atributo inválido %s" -#: pathspec.c:259 +#: pathspec.c:280 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "as definições globais 'glob' e 'noglob' de especificador de caminho " "(pathspec) são incompatíveis" -#: pathspec.c:266 +#: pathspec.c:287 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -5484,51 +6198,51 @@ msgstr "" "a definição global de especificador de caminho 'literal' é incompatível com " "todas as outras definições globais de especificador de caminho (pathspec)" -#: pathspec.c:306 +#: pathspec.c:327 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho" -#: pathspec.c:327 +#: pathspec.c:348 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Mágica do especificador de caminho '%.*s' inválida em '%s'" -#: pathspec.c:332 +#: pathspec.c:353 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Falta um ')' no final da mágica do especificador de caminho em '%s'" -#: pathspec.c:370 +#: pathspec.c:391 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Por implementar, magic pathspec '%c' em '%s'" -#: pathspec.c:429 +#: pathspec.c:450 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' e 'glob' são incompatíveis" -#: pathspec.c:445 +#: pathspec.c:466 #, fuzzy, c-format msgid "%s: '%s' is outside repository at '%s'" -msgstr "%s: '%s' está fora do repositório" +msgstr "%s: '%s' está fora do repositório em '%s'" -#: pathspec.c:521 +#: pathspec.c:542 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (mnemónica: '%c')" -#: pathspec.c:531 +#: pathspec.c:552 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: magic pathspec insustentado por este comando: %s" -#: pathspec.c:598 +#: pathspec.c:619 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "o especificador de caminho '%s' é indicado por uma ligação simbólica" -#: pathspec.c:643 +#: pathspec.c:664 #, c-format msgid "line is badly quoted: %s" msgstr "" @@ -5545,15 +6259,15 @@ msgstr "incapaz escrever pacote delim" #: pkt-line.c:106 #, fuzzy -msgid "unable to write stateless separator packet" -msgstr "incapaz escrever pacote de separador sem estado" +msgid "unable to write response end packet" +msgstr "incapaz escrever pacote fim de resposta" #: pkt-line.c:113 #, fuzzy msgid "flush packet write failed" msgstr "escrita de pacote flush falhou" -#: pkt-line.c:153 pkt-line.c:239 +#: pkt-line.c:153 pkt-line.c:265 msgid "protocol error: impossibly long line" msgstr "" @@ -5562,158 +6276,168 @@ msgstr "" msgid "packet write with format failed" msgstr "escrita de pacote com formato falhou" -#: pkt-line.c:203 +#: pkt-line.c:204 msgid "packet write failed - data exceeds max packet size" msgstr "" -#: pkt-line.c:210 pkt-line.c:217 -#, fuzzy -msgid "packet write failed" +#: pkt-line.c:222 +#, fuzzy, c-format +msgid "packet write failed: %s" msgstr "escrita de pacote falhou" -#: pkt-line.c:302 +#: pkt-line.c:328 pkt-line.c:329 #, fuzzy msgid "read error" msgstr "erro do programa" -#: pkt-line.c:310 +#: pkt-line.c:339 pkt-line.c:340 #, fuzzy msgid "the remote end hung up unexpectedly" msgstr "O remoto desligou após contacto inicial" -#: pkt-line.c:338 +#: pkt-line.c:369 pkt-line.c:371 #, fuzzy, c-format msgid "protocol error: bad line length character: %.4s" -msgstr "erro de protocolo: cabeçalho de pacote incorreto" +msgstr "" -#: pkt-line.c:352 pkt-line.c:357 +#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396 #, fuzzy, c-format msgid "protocol error: bad line length %d" -msgstr "erro de protocolo: cabeçalho de pacote incorreto" +msgstr "" -#: pkt-line.c:373 sideband.c:165 +#: pkt-line.c:413 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "erro remoto: %s" -#: preload-index.c:119 +#: preload-index.c:125 #, fuzzy msgid "Refreshing index" msgstr "Refrescando index" -#: preload-index.c:138 +#: preload-index.c:144 #, fuzzy, c-format msgid "unable to create threaded lstat: %s" msgstr "incapaz criar thread de lstat: %s" -#: pretty.c:983 +#: pretty.c:988 msgid "unable to parse --pretty format" msgstr "incapaz analisar formato de --pretty" -#: promisor-remote.c:30 +#: promisor-remote.c:31 msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "" -#: promisor-remote.c:35 promisor-remote.c:37 +#: promisor-remote.c:38 promisor-remote.c:40 msgid "promisor-remote: could not write to fetch subprocess" msgstr "" -#: promisor-remote.c:41 +#: promisor-remote.c:44 msgid "promisor-remote: could not close stdin to fetch subprocess" msgstr "" -#: promisor-remote.c:53 +#: promisor-remote.c:54 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "" +#: protocol-caps.c:103 +#, fuzzy +msgid "object-info: expected flush after arguments" +msgstr "--continue supõe argumento nenhum" + #: prune-packed.c:35 msgid "Removing duplicate objects" msgstr "A remover objetos duplicados" -#: range-diff.c:77 +#: range-diff.c:78 #, fuzzy msgid "could not start `log`" msgstr "incapaz começar `log`" -#: range-diff.c:79 +#: range-diff.c:80 #, fuzzy msgid "could not read `log` output" msgstr "incapaz ler output de `log`" -#: range-diff.c:98 sequencer.c:5310 +#: range-diff.c:101 sequencer.c:5550 #, fuzzy, c-format msgid "could not parse commit '%s'" msgstr "incapaz analisar commit '%s'" -#: range-diff.c:112 +#: range-diff.c:115 #, c-format msgid "" "could not parse first line of `log` output: did not start with 'commit ': " "'%s'" msgstr "" -#: range-diff.c:137 +#: range-diff.c:140 #, fuzzy, c-format msgid "could not parse git header '%.*s'" msgstr "incapaz analisar cabeçalho git '%.*s'" -#: range-diff.c:299 +#: range-diff.c:307 #, fuzzy msgid "failed to generate diff" -msgstr "falha ao criar o ficheiro %s" +msgstr "" + +#: range-diff.c:559 +#, fuzzy +msgid "--left-only and --right-only are mutually exclusive" +msgstr "" -#: range-diff.c:532 range-diff.c:534 +#: range-diff.c:562 range-diff.c:564 #, fuzzy, c-format msgid "could not parse log for '%s'" msgstr "incapaz analisar log para '%s'" -#: read-cache.c:682 +#: read-cache.c:710 #, fuzzy, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "%s: já existe no índice" -#: read-cache.c:698 +#: read-cache.c:726 #, fuzzy msgid "cannot create an empty blob in the object database" -msgstr "escrever o objeto na base de dados de objetos" +msgstr "" -#: read-cache.c:720 +#: read-cache.c:748 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" -#: read-cache.c:725 +#: read-cache.c:753 #, fuzzy, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' tem commit checked out nenhum" -#: read-cache.c:777 +#: read-cache.c:805 #, fuzzy, c-format msgid "unable to index file '%s'" msgstr "incapaz indexar ficheiro '%s'" -#: read-cache.c:796 +#: read-cache.c:824 #, fuzzy, c-format msgid "unable to add '%s' to index" msgstr "incapaz adicionar %s a index" -#: read-cache.c:807 +#: read-cache.c:835 #, fuzzy, c-format msgid "unable to stat '%s'" msgstr "incapaz obter estatutário de '%s'" -#: read-cache.c:1318 +#: read-cache.c:1358 #, fuzzy, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' aparece ambo como ficheiro e como pasta" -#: read-cache.c:1524 +#: read-cache.c:1573 #, fuzzy msgid "Refresh index" msgstr "Refresca index" -#: read-cache.c:1639 +#: read-cache.c:1705 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5722,7 +6446,7 @@ msgstr "" "index.version definido, mas com valor inválido.\n" "A usar a versão %i" -#: read-cache.c:1649 +#: read-cache.c:1715 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5731,140 +6455,145 @@ msgstr "" "GIT_INDEX_VERSION definido, mas com valor inválido.\n" "A usar a versão %i" -#: read-cache.c:1705 +#: read-cache.c:1771 #, fuzzy, c-format msgid "bad signature 0x%08x" -msgstr "adicionar uma assinatura" +msgstr "" -#: read-cache.c:1708 +#: read-cache.c:1774 #, fuzzy, c-format msgid "bad index version %d" msgstr "versão de índice '%s' incorreta" -#: read-cache.c:1717 +#: read-cache.c:1783 #, fuzzy msgid "bad index file sha1 signature" -msgstr "adicionar uma assinatura" +msgstr "" -#: read-cache.c:1747 +#: read-cache.c:1817 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" -#: read-cache.c:1749 +#: read-cache.c:1819 #, fuzzy, c-format msgid "ignoring %.4s extension" msgstr "modelo %s ignorado" -#: read-cache.c:1786 +#: read-cache.c:1856 #, fuzzy, c-format msgid "unknown index entry format 0x%08x" msgstr "formato de %.*s desconhecido %s" -#: read-cache.c:1802 +#: read-cache.c:1872 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "" -#: read-cache.c:1859 +#: read-cache.c:1929 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1862 +#: read-cache.c:1932 #, fuzzy, c-format msgid "multiple stage entries for merged file '%s'" msgstr "multíplas entradas de estágio para ficheiro juntado '%s'" -#: read-cache.c:1865 +#: read-cache.c:1935 #, fuzzy, c-format msgid "unordered stage entries for '%s'" msgstr "entradas de estágio desordenadas para '%s'" -#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 -#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 -#: builtin/submodule--helper.c:332 +#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987 +#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 +#: builtin/submodule--helper.c:331 msgid "index file corrupt" -msgstr "ficheiro de índice corrompido" +msgstr "" -#: read-cache.c:2115 +#: read-cache.c:2185 #, fuzzy, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "incapaz criar thread load_cache_entries: %s" -#: read-cache.c:2128 +#: read-cache.c:2198 #, fuzzy, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "incapaz juntar a thread load_cache_entries: %s" -#: read-cache.c:2161 +#: read-cache.c:2231 #, fuzzy, c-format msgid "%s: index file open failed" msgstr "falha ao adicionar ficheiros" -#: read-cache.c:2165 +#: read-cache.c:2235 #, fuzzy, c-format msgid "%s: cannot stat the open index" msgstr "%s: incapaz obter estatutário de index aberto" -#: read-cache.c:2169 +#: read-cache.c:2239 #, c-format msgid "%s: index file smaller than expected" msgstr "" -#: read-cache.c:2173 +#: read-cache.c:2243 #, fuzzy, c-format -msgid "%s: unable to map index file" -msgstr "%s: incapaz mapear ficheiro index" +msgid "%s: unable to map index file%s" +msgstr "%s: incapaz mapear ficheiro index%s" -#: read-cache.c:2215 +#: read-cache.c:2286 #, fuzzy, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "incapaz criar thread load_index_extensions: %s" -#: read-cache.c:2242 +#: read-cache.c:2313 #, fuzzy, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "incapaz juntar a thread load_index_extensions: %s" -#: read-cache.c:2274 +#: read-cache.c:2351 #, fuzzy, c-format msgid "could not freshen shared index '%s'" msgstr "incapaz refrescar index partilhado '%s'" -#: read-cache.c:2321 +#: read-cache.c:2398 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140 +#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 #, c-format msgid "could not close '%s'" msgstr "incapaz fechar '%s'" -#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231 +#: read-cache.c:3074 +#, fuzzy +msgid "failed to convert to a sparse-index" +msgstr "" + +#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440 #, fuzzy, c-format msgid "could not stat '%s'" msgstr "incapaz obter estatutário '%s'" -#: read-cache.c:3133 +#: read-cache.c:3158 #, c-format msgid "unable to open git dir: %s" msgstr "incapaz abrir pasta git: %s" -#: read-cache.c:3145 +#: read-cache.c:3170 #, c-format msgid "unable to unlink: %s" msgstr "incapaz deslinkar: %s" -#: read-cache.c:3170 +#: read-cache.c:3199 #, fuzzy, c-format msgid "cannot fix permission bits on '%s'" msgstr "incapaz arranjar bits de permissão em '%s'" -#: read-cache.c:3319 +#: read-cache.c:3348 #, fuzzy, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: incapaz baixar para estágio #0" @@ -5896,7 +6625,10 @@ msgid "" "r, reword <commit> = use commit, but edit the commit message\n" "e, edit <commit> = use commit, but stop for amending\n" "s, squash <commit> = use commit, but meld into previous commit\n" -"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n" +" commit's log message, unless -C is used, in which case\n" +" keep only this commit's message; -c is same as -C but\n" +" opens the editor\n" "x, exec <command> = run command (the rest of the line) using shell\n" "b, break = stop here (continue rebase later with 'git rebase --continue')\n" "d, drop <commit> = remove commit\n" @@ -5905,7 +6637,7 @@ msgid "" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" ". create a merge commit using the original merge commit's\n" ". message (or the oneline, if no original merge commit was\n" -". specified). Use -c <commit> to reword the commit message.\n" +". specified); use -c <commit> to reword the commit message\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -5921,14 +6653,14 @@ msgstr "" "\n" "Estas linhas pode ser reordenadas; são executadas de cima para baixo.\n" -#: rebase-interactive.c:63 +#: rebase-interactive.c:66 #, fuzzy, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Rebase $shortrevisions sobre $shortonto ($todocount comando)" msgstr[1] "Rebase $shortrevisions sobre $shortonto ($todocount comandos)" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5936,7 +6668,7 @@ msgstr "" "\n" "Remove linha nenhuma. Usa explicitamente 'drop' para remover um commit.\n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 +#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5944,7 +6676,7 @@ msgstr "" "\n" "Se remover uma linha daqui AQUELE COMMIT SERÁ PERDIDO.\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 +#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5958,7 +6690,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 +#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5968,19 +6700,19 @@ msgstr "" "No entanto, se remover tudo, o rebase será abortado.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607 -#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836 +#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271 #, fuzzy, c-format msgid "could not write '%s'" msgstr "incapaz escrever '%s'" -#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228 -#: builtin/rebase.c:252 +#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229 +#: builtin/rebase.c:253 #, fuzzy, c-format msgid "could not write '%s'." msgstr "incapaz escrever '%s'." -#: rebase-interactive.c:193 +#: rebase-interactive.c:196 #, fuzzy, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -5989,7 +6721,7 @@ msgstr "" "Aviso: alguns commits podem ter sido descartados acidentalmente.\n" "Commits descartados (mais novo para o mais velho):\n" -#: rebase-interactive.c:200 +#: rebase-interactive.c:203 #, fuzzy, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -6006,14 +6738,14 @@ msgstr "" "O comportamentos possíveis são: ignore, warn, error.\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394 -#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239 -#: builtin/rebase.c:264 +#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597 +#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240 +#: builtin/rebase.c:265 #, c-format msgid "could not read '%s'." msgstr "incapaz ler '%s'." -#: ref-filter.c:42 wt-status.c:1973 +#: ref-filter.c:42 wt-status.c:2036 msgid "gone" msgstr "desapareceu" @@ -6032,233 +6764,248 @@ msgstr "atrás %d" msgid "ahead %d, behind %d" msgstr "à frente %d, atrás %d" -#: ref-filter.c:169 +#: ref-filter.c:230 #, c-format msgid "expected format: %%(color:<color>)" msgstr "formato esperado: %%(color:<cor>)" -#: ref-filter.c:171 +#: ref-filter.c:232 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "cor desconhecida: %%(color:%s)" -#: ref-filter.c:193 +#: ref-filter.c:254 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "valor inteiro esperado refname:lstrip=%s" -#: ref-filter.c:197 +#: ref-filter.c:258 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valor inteiro esperado refname:rstrip=%s" -#: ref-filter.c:199 +#: ref-filter.c:260 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argumento %%(%s) desconhecido: %s" -#: ref-filter.c:254 +#: ref-filter.c:315 #, fuzzy, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) leva argumentos nenhuns" -#: ref-filter.c:276 +#: ref-filter.c:339 #, fuzzy, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "argumento %%(objectsize) desconhecido: %s" -#: ref-filter.c:284 +#: ref-filter.c:347 #, fuzzy, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) leva argumentos nenhuns" -#: ref-filter.c:296 +#: ref-filter.c:359 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) leva argumentos nenhuns" -#: ref-filter.c:309 +#: ref-filter.c:372 #, fuzzy, c-format msgid "unrecognized %%(subject) argument: %s" msgstr "argumento %%(subject) desconhecido: %s" -#: ref-filter.c:330 +#: ref-filter.c:391 +#, c-format +msgid "expected %%(trailers:key=<value>)" +msgstr "" + +#: ref-filter.c:393 #, fuzzy, c-format msgid "unknown %%(trailers) argument: %s" msgstr "argumento %%(trailers) desconhecido: %s" -#: ref-filter.c:363 +#: ref-filter.c:424 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positivo esperado contents:lines=%s" -#: ref-filter.c:365 +#: ref-filter.c:426 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argumento %%(contents) desconhecido: %s" -#: ref-filter.c:380 +#: ref-filter.c:441 #, fuzzy, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "valor positivo esperado contents:lines=%s" -#: ref-filter.c:384 +#: ref-filter.c:445 #, fuzzy, c-format msgid "unrecognized argument '%s' in %%(%s)" msgstr "argumento '%s' desconhecido em %%(%s)" -#: ref-filter.c:398 +#: ref-filter.c:459 #, fuzzy, c-format msgid "unrecognized email option: %s" msgstr "opção de email desconhecida: %s" -#: ref-filter.c:428 +#: ref-filter.c:489 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "formato esperado: %%(align:<largura>,<posição>)" -#: ref-filter.c:440 +#: ref-filter.c:501 #, c-format msgid "unrecognized position:%s" msgstr "posição desconhecida: %s" -#: ref-filter.c:447 +#: ref-filter.c:508 #, c-format msgid "unrecognized width:%s" msgstr "largura desconhecida: %s" -#: ref-filter.c:456 +#: ref-filter.c:517 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argumento %%(align) desconhecido: %s" -#: ref-filter.c:464 +#: ref-filter.c:525 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "largura positiva esperada com o átomo %%(algn)" -#: ref-filter.c:482 +#: ref-filter.c:543 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argumento %%(if) desconhecido: %s" -#: ref-filter.c:584 +#: ref-filter.c:645 #, c-format msgid "malformed field name: %.*s" msgstr "nome de ficheiro malformado: %.*s" -#: ref-filter.c:611 +#: ref-filter.c:672 #, c-format msgid "unknown field name: %.*s" msgstr "nome do campo desconhecido: %.*s" -#: ref-filter.c:615 +#: ref-filter.c:676 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" -#: ref-filter.c:739 +#: ref-filter.c:801 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "formato: átomo %%(if) utilizado sem átomo %%(then) correspondente" -#: ref-filter.c:802 +#: ref-filter.c:865 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "formato: átomo %%(then) utilizado sem átomo %%(if) correspondente" -#: ref-filter.c:804 +#: ref-filter.c:867 #, c-format msgid "format: %%(then) atom used more than once" msgstr "formato: átomo %%(then) utilizado mais que uma vez" -#: ref-filter.c:806 +#: ref-filter.c:869 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "formato: átomo %%(then) utilizado depois de %%(else)" -#: ref-filter.c:834 +#: ref-filter.c:897 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "formato: átomo %%(else) utilizado sem átomo %%(if) correspondente" -#: ref-filter.c:836 +#: ref-filter.c:899 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "formato: átomo %%(else) utilizado sem átomo %%(then) correspondente" -#: ref-filter.c:838 +#: ref-filter.c:901 #, c-format msgid "format: %%(else) atom used more than once" msgstr "formato: átomo %%(else) utilizado mais que uma vez" -#: ref-filter.c:853 +#: ref-filter.c:916 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formato: átomo %%(end) utilizado sem átomo correspondente" -#: ref-filter.c:910 +#: ref-filter.c:973 #, c-format msgid "malformed format string %s" -msgstr "cadeia malformada %s" +msgstr "formato de string %s malformado" -#: ref-filter.c:1549 +#: ref-filter.c:1621 #, fuzzy, c-format -msgid "no branch, rebasing %s" +msgid "(no branch, rebasing %s)" msgstr "(ramo nenhum, rebaseando %s)" -#: ref-filter.c:1552 +#: ref-filter.c:1624 #, fuzzy, c-format -msgid "no branch, rebasing detached HEAD %s" +msgid "(no branch, rebasing detached HEAD %s)" msgstr "(ramo nenhum, rebaseando HEAD solta %s)" -#: ref-filter.c:1555 +#: ref-filter.c:1627 #, fuzzy, c-format -msgid "no branch, bisect started on %s" +msgid "(no branch, bisect started on %s)" msgstr "(ramo nenhum, bisseção iniciada em %s)" -#: ref-filter.c:1565 +#: ref-filter.c:1631 +#, c-format +msgid "(HEAD detached at %s)" +msgstr "(HEAD destacada em %s)" + +#: ref-filter.c:1634 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD destacada de %s)" + +#: ref-filter.c:1637 #, fuzzy -msgid "no branch" +msgid "(no branch)" msgstr "(ramo nenhum)" -#: ref-filter.c:1599 ref-filter.c:1808 +#: ref-filter.c:1669 ref-filter.c:1880 #, c-format msgid "missing object %s for %s" -msgstr "falta o objeto %s de %s" +msgstr "" -#: ref-filter.c:1609 +#: ref-filter.c:1679 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "falha ao invocar parse_object_buffer sobre %s de %s" -#: ref-filter.c:2062 +#: ref-filter.c:2064 #, c-format msgid "malformed object at '%s'" msgstr "objeto malformado em '%s'" -#: ref-filter.c:2151 +#: ref-filter.c:2153 #, c-format msgid "ignoring ref with broken name %s" -msgstr "a referência %s com nome danificado foi ignorada" +msgstr "ignorando ref com nome quebrado %s" -#: ref-filter.c:2156 refs.c:660 +#: ref-filter.c:2158 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "a referência %s danificada foi ignorada" -#: ref-filter.c:2472 +#: ref-filter.c:2498 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: falta átomo %%(end)" -#: ref-filter.c:2571 +#: ref-filter.c:2592 #, c-format msgid "malformed object name %s" msgstr "nome de objeto malformado %s" -#: ref-filter.c:2576 +#: ref-filter.c:2597 #, fuzzy, c-format msgid "option `%s' must point to a commit" msgstr "opção '%s' tem apontar para um commit" @@ -6268,65 +7015,80 @@ msgstr "opção '%s' tem apontar para um commit" msgid "%s does not point to a valid object!" msgstr "'%s' aponta para objeto válido nenhum!" -#: refs.c:575 +#: refs.c:566 +#, c-format +msgid "" +"Using '%s' as the name for the initial branch. This default branch name\n" +"is subject to change. To configure the initial branch name to use in all\n" +"of your new repositories, which will suppress this warning, call:\n" +"\n" +"\tgit config --global init.defaultBranch <name>\n" +"\n" +"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n" +"'development'. The just-created branch can be renamed via this command:\n" +"\n" +"\tgit branch -m <name>\n" +msgstr "" + +#: refs.c:588 #, fuzzy, c-format msgid "could not retrieve `%s`" msgstr "incapaz recuperar '%s'" -#: refs.c:582 +#: refs.c:598 #, fuzzy, c-format msgid "invalid branch name: %s = %s" -msgstr "Nome de ramo inválido: '%s'" +msgstr "Nome de ramo inválido: %s = %s" -#: refs.c:658 +#: refs.c:674 #, fuzzy, c-format msgid "ignoring dangling symref %s" msgstr "a referência %s danificada foi ignorada" -#: refs.c:895 +#: refs.c:922 #, c-format msgid "log for ref %s has gap after %s" msgstr "" -#: refs.c:901 +#: refs.c:929 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "" -#: refs.c:960 +#: refs.c:994 #, c-format msgid "log for %s is empty" msgstr "" -#: refs.c:1052 +#: refs.c:1086 #, fuzzy, c-format msgid "refusing to update ref with bad name '%s'" -msgstr "a referência %s com nome danificado foi ignorada" +msgstr "recusando atualizar ref com nome inválido '%s'" -#: refs.c:1123 +#: refs.c:1157 #, fuzzy, c-format msgid "update_ref failed for ref '%s': %s" -msgstr "falha ao abrir '%s': %s" +msgstr "" -#: refs.c:1947 +#: refs.c:2051 #, fuzzy, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "atualizações múltiplas para ref '%s' proíbidas" -#: refs.c:2027 +#: refs.c:2131 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs.c:2038 +#: refs.c:2142 msgid "ref updates aborted by hook" msgstr "" -#: refs.c:2138 refs.c:2168 +#: refs.c:2242 refs.c:2272 #, fuzzy, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existe; incapaz criar '%s'" -#: refs.c:2144 refs.c:2179 +#: refs.c:2248 refs.c:2283 #, fuzzy, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "incapaz processar '%s' e '%s' ao mesmo tempo" @@ -6350,7 +7112,7 @@ msgstr "incapaz apagar referências: %s" #: refspec.c:170 #, fuzzy, c-format msgid "invalid refspec '%s'" -msgstr "ficheiro inválido: '%s'" +msgstr "" #: remote.c:351 #, c-format @@ -6390,12 +7152,12 @@ msgstr "" msgid "value '%s' of pattern has no '*'" msgstr "" -#: remote.c:1073 +#: remote.c:1083 #, fuzzy, c-format msgid "src refspec %s does not match any" msgstr "src refspec %s corresponde a nenhum" -#: remote.c:1078 +#: remote.c:1088 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -6404,7 +7166,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1093 +#: remote.c:1103 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6418,7 +7180,7 @@ msgid "" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -#: remote.c:1113 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6426,7 +7188,7 @@ msgid "" "'%s:refs/heads/%s'?" msgstr "" -#: remote.c:1118 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6434,7 +7196,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1123 +#: remote.c:1133 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6442,7 +7204,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1128 +#: remote.c:1138 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6450,114 +7212,115 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1164 +#: remote.c:1174 #, fuzzy, c-format msgid "%s cannot be resolved to branch" msgstr "%s incapaz ser resolvido para ramo" -#: remote.c:1175 +#: remote.c:1185 #, fuzzy, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "incapaz apagar '%s': ref remoto é inexistente" -#: remote.c:1187 +#: remote.c:1197 #, c-format msgid "dst refspec %s matches more than one" msgstr "" -#: remote.c:1194 +#: remote.c:1204 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" -#: remote.c:1714 remote.c:1815 +#: remote.c:1724 remote.c:1825 msgid "HEAD does not point to a branch" msgstr "HEAD aponta para ramo nenhum" -#: remote.c:1723 +#: remote.c:1733 #, c-format msgid "no such branch: '%s'" msgstr "ramo inexistente: '%s'" -#: remote.c:1726 +#: remote.c:1736 #, c-format msgid "no upstream configured for branch '%s'" msgstr "configurado upstream nenhum para ramo '%s'" -#: remote.c:1732 +#: remote.c:1742 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "incapaz gravar ramo upstream '%s' como ramo remote-tracking" -#: remote.c:1747 +#: remote.c:1757 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" -msgstr "destino de atirar '%s' em remoto '%s' tem ramo de tracking local nenhum" +msgstr "" +"destino de atirar '%s' em remoto '%s' tem ramo de tracking local nenhum" -#: remote.c:1759 +#: remote.c:1769 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "ramo '%s' tem remoto para atirar nenhum" -#: remote.c:1769 +#: remote.c:1779 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "refspecs de atirar para '%s'incluí '%s' nenhum" -#: remote.c:1782 +#: remote.c:1792 msgid "push has no destination (push.default is 'nothing')" msgstr "publicação sem destino (push.default é 'nothing')" -#: remote.c:1804 +#: remote.c:1814 msgid "cannot resolve 'simple' push to a single destination" -msgstr "incapaz resolver atiranço 'simple' para destino único" +msgstr "incapaz resolver atiro 'simple' para destino único" -#: remote.c:1933 +#: remote.c:1943 #, fuzzy, c-format msgid "couldn't find remote ref %s" msgstr "incapaz encontrar ref remoto %s" -#: remote.c:1946 +#: remote.c:1956 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "" -#: remote.c:2109 +#: remote.c:2119 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "A base do seu ramo é '%s', mas o ramo a montante desapareceu.\n" -#: remote.c:2113 +#: remote.c:2123 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (use \"git branch --unset-upstream\" para corrigir)\n" -#: remote.c:2116 +#: remote.c:2126 #, fuzzy, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "O seu ramo está atualizado com '%s'.\n" -#: remote.c:2120 +#: remote.c:2130 #, fuzzy, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "O seu ramo está à frente de '%s' por %d commit.\n" -#: remote.c:2123 +#: remote.c:2133 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2127 +#: remote.c:2137 #, 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] "O seu ramo está à frente de '%s' por %d commit.\n" msgstr[1] "O seu ramo está à frente de '%s' por %d commits.\n" -#: remote.c:2133 +#: remote.c:2143 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (use \"git push\" para publicar os commits locais)\n" -#: remote.c:2136 +#: remote.c:2146 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6569,11 +7332,11 @@ msgstr[1] "" "O seu ramo está atrás de '%s' por %d commits, podendo ser atualizado com " "avanço rápido.\n" -#: remote.c:2144 +#: remote.c:2154 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (use \"git pull\" para atualizar o seu ramo local)\n" -#: remote.c:2147 +#: remote.c:2157 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6588,11 +7351,11 @@ msgstr[1] "" "O seu ramo e '%s' divergiram,\n" "tendo cada um %d e %d commits diferentes, respetivamente.\n" -#: remote.c:2157 +#: remote.c:2167 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (use \"git pull\" para integrar o ramo remoto no seu ramo)\n" -#: remote.c:2348 +#: remote.c:2359 #, fuzzy, c-format msgid "cannot parse expected object name '%s'" msgstr "incapaz analisar nome de objeto esperado '%s'" @@ -6600,109 +7363,109 @@ msgstr "incapaz analisar nome de objeto esperado '%s'" #: replace-object.c:21 #, fuzzy, c-format msgid "bad replace ref name: %s" -msgstr "eliminar referências substituídas" +msgstr "substituição de nome de ref inválida: %s" #: replace-object.c:30 #, fuzzy, c-format msgid "duplicate replace ref: %s" -msgstr "eliminar referências substituídas" +msgstr "substituição duplicada de ref: %s" #: replace-object.c:82 #, fuzzy, c-format msgid "replace depth too high for object %s" msgstr "substituir a tag se esta existir" -#: rerere.c:217 rerere.c:226 rerere.c:229 +#: rerere.c:201 rerere.c:210 rerere.c:213 msgid "corrupt MERGE_RR" msgstr "" -#: rerere.c:264 rerere.c:269 +#: rerere.c:248 rerere.c:253 #, fuzzy msgid "unable to write rerere record" msgstr "incapaz escrever registro rerere" -#: rerere.c:495 +#: rerere.c:479 #, c-format msgid "there were errors while writing '%s' (%s)" msgstr "" -#: rerere.c:498 +#: rerere.c:482 #, fuzzy, c-format msgid "failed to flush '%s'" -msgstr "falha ao invocar stat de '%s'" +msgstr "" -#: rerere.c:503 rerere.c:1039 +#: rerere.c:487 rerere.c:1023 #, fuzzy, c-format msgid "could not parse conflict hunks in '%s'" msgstr "incapaz analisar pedaços conflituosos em '%s'" -#: rerere.c:684 +#: rerere.c:668 #, fuzzy, c-format msgid "failed utime() on '%s'" -msgstr "falha ao abrir '%s'" +msgstr "" -#: rerere.c:694 +#: rerere.c:678 #, fuzzy, c-format msgid "writing '%s' failed" -msgstr "falha ao criar '%s'" +msgstr "" -#: rerere.c:714 +#: rerere.c:698 #, c-format msgid "Staged '%s' using previous resolution." msgstr "" -#: rerere.c:753 +#: rerere.c:737 #, c-format msgid "Recorded resolution for '%s'." msgstr "" -#: rerere.c:788 +#: rerere.c:772 #, c-format msgid "Resolved '%s' using previous resolution." msgstr "" -#: rerere.c:803 +#: rerere.c:787 #, fuzzy, c-format msgid "cannot unlink stray '%s'" msgstr "incapaz deslinkar o perdido '%s'" -#: rerere.c:807 +#: rerere.c:791 #, c-format msgid "Recorded preimage for '%s'" msgstr "" -#: rerere.c:881 submodule.c:2082 builtin/log.c:1992 +#: rerere.c:865 submodule.c:2076 builtin/log.c:2002 #: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "incapaz criar pasta '%s'" -#: rerere.c:1057 +#: rerere.c:1041 #, fuzzy, c-format msgid "failed to update conflicted state in '%s'" msgstr "falha ao criar a ligação '%s'" -#: rerere.c:1068 rerere.c:1075 +#: rerere.c:1052 rerere.c:1059 #, fuzzy, c-format msgid "no remembered resolution for '%s'" msgstr "a faltar a lembrança da solução para '%s'" -#: rerere.c:1077 +#: rerere.c:1061 #, fuzzy, c-format msgid "cannot unlink '%s'" msgstr "incapaz de deslinkar '%s'" -#: rerere.c:1087 +#: rerere.c:1071 #, c-format msgid "Updated preimage for '%s'" msgstr "" -#: rerere.c:1096 +#: rerere.c:1080 #, fuzzy, c-format msgid "Forgot resolution for '%s'\n" msgstr "Está esquecida resolução para '%s'\n" -#: rerere.c:1199 +#: rerere.c:1191 #, fuzzy msgid "unable to open rr-cache directory" msgstr "incapaz abrir pasta rr-cache" @@ -6712,127 +7475,131 @@ msgstr "incapaz abrir pasta rr-cache" msgid "could not determine HEAD revision" msgstr "incapaz determinar revisão de HEAD" -#: reset.c:70 reset.c:76 sequencer.c:3460 +#: reset.c:70 reset.c:76 sequencer.c:3689 #, fuzzy, c-format msgid "failed to find tree of %s" msgstr "Falha ao procurar árvore de %s." -#: revision.c:2336 +#: revision.c:2344 msgid "--unpacked=<packfile> no longer supported" msgstr "" -#: revision.c:2356 -#, fuzzy, c-format -msgid "unknown value for --diff-merges: %s" -msgstr "valor desconhecido '%s' da chave '%s'" - -#: revision.c:2694 +#: revision.c:2684 msgid "your current branch appears to be broken" msgstr "o ramo atual parece estar danificado" -#: revision.c:2697 +#: revision.c:2687 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "teu ramo atual '%s' ainda contém commits nenhuns" -#: revision.c:2907 +#: revision.c:2893 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" -#: run-command.c:764 +#: run-command.c:766 msgid "open /dev/null failed" msgstr "falha ao abrir /dev/null" -#: run-command.c:1271 +#: run-command.c:1274 #, fuzzy, c-format msgid "cannot create async thread: %s" -msgstr "não foi possível criar thread: %s" +msgstr "incapaz criar thread assíncrona: %s" -#: run-command.c:1335 +#: run-command.c:1344 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" -#: send-pack.c:146 +#: send-pack.c:150 #, fuzzy msgid "unexpected flush packet while reading remote unpack status" -msgstr "não é possível analisar status de descompactação remota: %s" +msgstr "flush de pacotes inesperado enquanto lendo unpack status remoto" -#: send-pack.c:148 +#: send-pack.c:152 #, c-format msgid "unable to parse remote unpack status: %s" -msgstr "não é possível analisar status de descompactação remota: %s" +msgstr "incapaz analisar unpack status remota: %s" -#: send-pack.c:150 +#: send-pack.c:154 #, c-format msgid "remote unpack failed: %s" msgstr "descompactação remota falhou: %s" -#: send-pack.c:374 +#: send-pack.c:378 msgid "failed to sign the push certificate" msgstr "falha ao assinar o certificado de publicação" -#: send-pack.c:467 +#: send-pack.c:433 +#, fuzzy +msgid "send-pack: unable to fork off fetch subprocess" +msgstr "fetch-pack: incapaz de aforquilhar %s" + +#: send-pack.c:455 +msgid "push negotiation failed; proceeding anyway with push" +msgstr "" + +#: send-pack.c:526 #, fuzzy msgid "the receiving end does not support this repository's hash algorithm" -msgstr "o recetor não suporta opções de publicação" +msgstr "o recetor insustenta algoritmo hash deste repositório" -#: send-pack.c:476 +#: send-pack.c:535 msgid "the receiving end does not support --signed push" -msgstr "o recetor não suporta publicação com --signed" +msgstr "o recetor insustenta atiro --signed" -#: send-pack.c:478 +#: send-pack.c:537 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -"certificado de publicação não enviado uma vez que o recetor não suporta " -"publicação com --signed" +"certificado de atiro por enviar uma vez que o recetor insustenta atirocom --" +"signed" -#: send-pack.c:490 +#: send-pack.c:544 msgid "the receiving end does not support --atomic push" -msgstr "o recetor não suporta publicação com --atomic" +msgstr "o recetor insustenta atiro com --atomic" -#: send-pack.c:495 +#: send-pack.c:549 msgid "the receiving end does not support push options" -msgstr "o recetor não suporta opções de publicação" +msgstr "o recetor insustenta opções de atiro" -#: sequencer.c:195 +#: sequencer.c:196 #, fuzzy, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "Modo de limpeza inválido %s" -#: sequencer.c:323 +#: sequencer.c:324 #, fuzzy, c-format msgid "could not delete '%s'" msgstr "incapaz de apagar '%s'" -#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385 +#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402 #, c-format msgid "could not remove '%s'" -msgstr "não foi possível remover '%s'" +msgstr "incapaz remover '%s'" -#: sequencer.c:353 +#: sequencer.c:354 msgid "revert" msgstr "reverter" -#: sequencer.c:355 +#: sequencer.c:356 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:357 +#: sequencer.c:358 #, fuzzy msgid "rebase" msgstr "rebase -i" -#: sequencer.c:359 +#: sequencer.c:360 #, fuzzy, c-format msgid "unknown action: %d" msgstr "Ação desconhecida: %d" -#: sequencer.c:418 +#: sequencer.c:419 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6840,7 +7607,7 @@ msgstr "" "depois de resolver os conflitos, marque os caminhos corrigidos\n" "com 'git add <caminhos>' ou 'git rm <caminhos>'" -#: sequencer.c:421 +#: sequencer.c:422 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6850,43 +7617,43 @@ msgstr "" "com 'git add <caminhos>' ou 'git rm <caminhos>'\n" "e submeta o resultado com 'git commit'" -#: sequencer.c:434 sequencer.c:3062 +#: sequencer.c:435 sequencer.c:3271 #, c-format msgid "could not lock '%s'" -msgstr "não foi possível bloquear '%s'" +msgstr "incapaz bloquear '%s'" -#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080 -#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 +#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631 #, c-format msgid "could not write to '%s'" -msgstr "não foi possível escrever em '%s'" +msgstr "incapaz escrever em '%s'" -#: sequencer.c:441 +#: sequencer.c:442 #, c-format msgid "could not write eol to '%s'" -msgstr "não foi possível escrever fim de linha em '%s'" +msgstr "incapaz escrever fim de linha em '%s'" -#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082 -#: sequencer.c:3345 +#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 +#: sequencer.c:3555 #, fuzzy, c-format msgid "failed to finalize '%s'" msgstr "falha ao finalizar '%s'." -#: sequencer.c:485 +#: sequencer.c:486 #, c-format msgid "your local changes would be overwritten by %s." msgstr "as suas alterações locais serão substituídas ao %s." -#: sequencer.c:489 +#: sequencer.c:490 msgid "commit your changes or stash them to proceed." msgstr "submeta ou esconda as suas alterações para continuar." -#: sequencer.c:521 +#: sequencer.c:522 #, c-format msgid "%s: fast-forward" msgstr "%s: avanço rápido" -#: sequencer.c:560 builtin/tag.c:566 +#: sequencer.c:561 builtin/tag.c:609 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modo de limpeza inválido %s" @@ -6894,67 +7661,67 @@ msgstr "Modo de limpeza inválido %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:670 +#: sequencer.c:671 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Incapaz de escrever novo ficheiro index" -#: sequencer.c:687 +#: sequencer.c:685 #, fuzzy msgid "unable to update cache tree" -msgstr "não foi possível atualizar a árvore de cache" +msgstr "incapaz atualizar árvore de cache" -#: sequencer.c:701 +#: sequencer.c:699 #, fuzzy msgid "could not resolve HEAD commit" -msgstr "não foi possível resolver o commit HEAD" +msgstr "incapaz resolver memória HEAD" -#: sequencer.c:781 +#: sequencer.c:779 #, c-format msgid "no key present in '%.*s'" msgstr "" -#: sequencer.c:792 +#: sequencer.c:790 #, fuzzy, c-format msgid "unable to dequote value of '%s'" -msgstr "não é possível detetar automaticamente o nome (obteve-se '%s')" +msgstr "incapaz retirar valor, da citação '%s'" -#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729 +#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" -msgstr "não foi possível abrir '%s' para leitura" +msgstr "incapaz abrir '%s' para leitura" -#: sequencer.c:839 +#: sequencer.c:837 msgid "'GIT_AUTHOR_NAME' already given" msgstr "" -#: sequencer.c:844 +#: sequencer.c:842 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "" -#: sequencer.c:849 +#: sequencer.c:847 msgid "'GIT_AUTHOR_DATE' already given" msgstr "" -#: sequencer.c:853 +#: sequencer.c:851 #, fuzzy, c-format msgid "unknown variable '%s'" -msgstr "Formato de arquivo desconhecido '%s'" +msgstr "" -#: sequencer.c:858 +#: sequencer.c:856 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "" -#: sequencer.c:860 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "" -#: sequencer.c:862 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "" -#: sequencer.c:927 +#: sequencer.c:925 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6983,11 +7750,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1208 +#: sequencer.c:1212 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1214 +#: sequencer.c:1218 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7013,7 +7780,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1227 +#: sequencer.c:1231 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7037,365 +7804,370 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1269 +#: sequencer.c:1273 msgid "couldn't look up newly created commit" -msgstr "não foi possível consultar o commit recém-criado" +msgstr "incapaz consultar memória recém-criada" -#: sequencer.c:1271 +#: sequencer.c:1275 msgid "could not parse newly created commit" -msgstr "não foi possível analisar o commit recém-criado" +msgstr "incapaz analisar memória recém-criada" -#: sequencer.c:1317 +#: sequencer.c:1321 #, fuzzy msgid "unable to resolve HEAD after creating commit" -msgstr "não foi possível resolver o commit HEAD" +msgstr "incapaz resolver HEAD após criar memória" -#: sequencer.c:1319 +#: sequencer.c:1323 msgid "detached HEAD" msgstr "HEAD destacada" -#: sequencer.c:1323 +#: sequencer.c:1327 msgid " (root-commit)" msgstr " (commit-raiz)" -#: sequencer.c:1344 +#: sequencer.c:1348 #, fuzzy msgid "could not parse HEAD" -msgstr "não foi possível ler HEAD" +msgstr "incapaz processar HEAD" -#: sequencer.c:1346 +#: sequencer.c:1350 #, fuzzy, c-format msgid "HEAD %s is not a commit!" -msgstr "%s %s não é um commit!" +msgstr "HEAD %s é commit nenhum!" -#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702 msgid "could not parse HEAD commit" -msgstr "não foi possível analisar o commit HEAD" +msgstr "incapaz analisar commit HEAD" -#: sequencer.c:1403 sequencer.c:2100 +#: sequencer.c:1410 sequencer.c:2295 #, fuzzy msgid "unable to parse commit author" -msgstr "não foi possível analisar o commit %s" +msgstr "incapaz processar autor de commit" -#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706 msgid "git write-tree failed to write a tree" -msgstr "git write-tree falhou ao escrever uma árvore" +msgstr "" -#: sequencer.c:1447 sequencer.c:1565 +#: sequencer.c:1454 sequencer.c:1574 #, fuzzy, c-format msgid "unable to read commit message from '%s'" -msgstr "não foi possível ler a mensagem de commit de %s" +msgstr "incapaz ler mensagem de commit de '%s'" -#: sequencer.c:1476 sequencer.c:1508 +#: sequencer.c:1485 sequencer.c:1517 #, fuzzy, c-format msgid "invalid author identity '%s'" -msgstr "caminho inválido '%s'" +msgstr "" -#: sequencer.c:1482 +#: sequencer.c:1491 msgid "corrupt author: missing date information" msgstr "" -#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904 -#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909 +#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" -msgstr "falha ao escrever objeto de commit" +msgstr "" -#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199 +#: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" -msgstr "não foi possível atualizar %s" +msgstr "incapaz atualizar %s" -#: sequencer.c:1597 +#: sequencer.c:1606 #, fuzzy, c-format msgid "could not parse commit %s" -msgstr "não foi possível analisar o commit %s\n" +msgstr "incapaz processar commit %s" -#: sequencer.c:1602 +#: sequencer.c:1611 #, fuzzy, c-format msgid "could not parse parent commit %s" -msgstr "não foi possível analisar o commit pai %s\n" +msgstr "incapaz processar commit parente %s" -#: sequencer.c:1685 sequencer.c:1796 +#: sequencer.c:1694 sequencer.c:1975 #, c-format msgid "unknown command: %d" msgstr "comando desconhecido: %d" -#: sequencer.c:1743 sequencer.c:1768 +#: sequencer.c:1736 git-rebase--preserve-merges.sh:486 +msgid "This is the 1st commit message:" +msgstr "Esta é a 1ª mensagem de commit:" + +#: sequencer.c:1737 +#, c-format +msgid "This is the commit message #%d:" +msgstr "Esta é a mensagem de commit nº%d:" + +#: sequencer.c:1738 +msgid "The 1st commit message will be skipped:" +msgstr "A 1ª mensagem de commit será ignorada:" + +#: sequencer.c:1739 +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "A mensagem de commit #%d será ignorada:" + +#: sequencer.c:1740 #, c-format msgid "This is a combination of %d commits." msgstr "Isto é a combinação de %d commits." -#: sequencer.c:1753 +#: sequencer.c:1887 sequencer.c:1944 +#, c-format +msgid "cannot write '%s'" +msgstr "incapaz escrever '%s'" + +#: sequencer.c:1934 msgid "need a HEAD to fixup" msgstr "necessária uma HEAD para fixup" -#: sequencer.c:1755 sequencer.c:3372 +#: sequencer.c:1936 sequencer.c:3582 msgid "could not read HEAD" -msgstr "não foi possível ler HEAD" +msgstr "incapaz ler HEAD" -#: sequencer.c:1757 +#: sequencer.c:1938 msgid "could not read HEAD's commit message" -msgstr "não foi possível ler a mensagem de commit de HEAD" - -#: sequencer.c:1763 -#, c-format -msgid "cannot write '%s'" -msgstr "não é possível escrever '%s'" - -#: sequencer.c:1770 git-rebase--preserve-merges.sh:486 -msgid "This is the 1st commit message:" -msgstr "Esta é a 1ª mensagem de commit:" +msgstr "incapaz ler mensagem de commit de HEAD" -#: sequencer.c:1778 +#: sequencer.c:1962 #, c-format msgid "could not read commit message of %s" -msgstr "não foi possível ler a mensagem de commit de %s" +msgstr "incapaz ler mensagem de commit de %s" -#: sequencer.c:1785 -#, c-format -msgid "This is the commit message #%d:" -msgstr "Esta é a mensagem de commit nº%d:" - -#: sequencer.c:1791 -#, c-format -msgid "The commit message #%d will be skipped:" -msgstr "A mensagem de commit #%d será ignorada:" - -#: sequencer.c:1879 +#: sequencer.c:2072 msgid "your index file is unmerged." -msgstr "ficheiro de índice não integrado." +msgstr "teu ficheiro índex está por juntar." -#: sequencer.c:1886 +#: sequencer.c:2079 #, fuzzy msgid "cannot fixup root commit" -msgstr "não é possível encontrar o commit %s (%s)" +msgstr "incapaz consertar commit raíz" -#: sequencer.c:1905 +#: sequencer.c:2098 #, c-format msgid "commit %s is a merge but no -m option was given." -msgstr "o commit %s é uma integração mas não foi fornecida a opção -m." +msgstr "commit %s é uma junção mas foi fornecido opção -m nenhuma." -#: sequencer.c:1913 sequencer.c:1921 +#: sequencer.c:2106 sequencer.c:2114 #, c-format msgid "commit %s does not have parent %d" -msgstr "o commit %s não tem o pai %d" +msgstr "commit %s tem parente %d nenhum" -#: sequencer.c:1927 +#: sequencer.c:2120 #, c-format msgid "cannot get commit message for %s" -msgstr "não é possível obter a mensagem de commit de %s" +msgstr "incapaz obter mensagem de commit para %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1946 +#: sequencer.c:2139 #, c-format msgid "%s: cannot parse parent commit %s" -msgstr "%s: não foi possível analisar o commit pai %s" +msgstr "%s: incapaz processar commit parente %s" -#: sequencer.c:2011 +#: sequencer.c:2205 #, c-format msgid "could not rename '%s' to '%s'" -msgstr "não foi possível mudar o nome de '%s' para '%s'" +msgstr "incapaz renomear '%s' para '%s'" -#: sequencer.c:2071 +#: sequencer.c:2265 #, c-format msgid "could not revert %s... %s" -msgstr "não foi possível reverter %s... %s" +msgstr "incapaz reverter %s... %s" -#: sequencer.c:2072 +#: sequencer.c:2266 #, c-format msgid "could not apply %s... %s" -msgstr "não foi possível aplicar %s... %s" +msgstr "incapaz aplicar %s... %s" -#: sequencer.c:2092 +#: sequencer.c:2287 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "" -#: sequencer.c:2150 +#: sequencer.c:2345 #, c-format msgid "git %s: failed to read the index" -msgstr "git %s: falha ao ler o índice" +msgstr "git %s: ler cenário falhou" -#: sequencer.c:2157 +#: sequencer.c:2352 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: falha ao atualizar o índice" -#: sequencer.c:2234 +#: sequencer.c:2425 #, fuzzy, c-format msgid "%s does not accept arguments: '%s'" -msgstr "%%(body) não leva argumentos" +msgstr "%s rejeita argumentos: '%s'" -#: sequencer.c:2243 +#: sequencer.c:2434 #, fuzzy, c-format msgid "missing arguments for %s" -msgstr "falta o objeto %s de %s" +msgstr "" -#: sequencer.c:2274 +#: sequencer.c:2477 #, fuzzy, c-format msgid "could not parse '%s'" -msgstr "não foi possível analisar %s" +msgstr "incapaz processar '%s'" -#: sequencer.c:2335 +#: sequencer.c:2538 #, c-format msgid "invalid line %d: %.*s" msgstr "linha %d inválida: %.*s" -#: sequencer.c:2346 +#: sequencer.c:2549 #, c-format msgid "cannot '%s' without a previous commit" -msgstr "não é possível efetuar '%s' sem um commit anterior" +msgstr "incapaz '%s' sem um commit anterior" -#: sequencer.c:2432 +#: sequencer.c:2635 #, fuzzy msgid "cancelling a cherry picking in progress" msgstr "cancelando um cherry picking em curso" -#: sequencer.c:2441 +#: sequencer.c:2644 #, fuzzy msgid "cancelling a revert in progress" msgstr "cancelando uma reversão em curso" -#: sequencer.c:2485 +#: sequencer.c:2690 msgid "please fix this using 'git rebase --edit-todo'." msgstr "corrija-o usando 'git rebase --edit-todo'." -#: sequencer.c:2487 +#: sequencer.c:2692 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "folha de instruções inutilizável: '%s'" -#: sequencer.c:2492 +#: sequencer.c:2697 msgid "no commits parsed." msgstr "commits nenhuns analisados." -#: sequencer.c:2503 +#: sequencer.c:2708 msgid "cannot cherry-pick during a revert." -msgstr "não é possível efetuar cherry-pick durante uma reversão." +msgstr "incapaz apanhar durante uma reversão." -#: sequencer.c:2505 +#: sequencer.c:2710 msgid "cannot revert during a cherry-pick." -msgstr "não é possível reverter durante um cherry-pick." +msgstr "incapaz reverter durante uma apanha." -#: sequencer.c:2583 +#: sequencer.c:2788 #, c-format msgid "invalid value for %s: %s" -msgstr "valor inválido de %s: %s" +msgstr "valor inválido para %s: %s" -#: sequencer.c:2690 +#: sequencer.c:2897 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2710 +#: sequencer.c:2917 #, c-format msgid "malformed options sheet: '%s'" msgstr "folha de opções malformada: '%s'" -#: sequencer.c:2803 sequencer.c:4636 +#: sequencer.c:3012 sequencer.c:4868 msgid "empty commit set passed" msgstr "o conjunto de commits especificado está vazio" -#: sequencer.c:2820 +#: sequencer.c:3029 #, fuzzy msgid "revert is already in progress" msgstr "cherry-pick ou revert em curso" -#: sequencer.c:2822 +#: sequencer.c:3031 #, fuzzy, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\"" -#: sequencer.c:2825 +#: sequencer.c:3034 #, fuzzy msgid "cherry-pick is already in progress" msgstr "cherry-pick ou revert em curso" -#: sequencer.c:2827 +#: sequencer.c:3036 #, fuzzy, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\"" -#: sequencer.c:2841 +#: sequencer.c:3050 #, c-format msgid "could not create sequencer directory '%s'" -msgstr "não foi possível criar o diretório do sequenciador '%s'" +msgstr "incapaz criar pasta do sequenciador '%s'" -#: sequencer.c:2856 +#: sequencer.c:3065 msgid "could not lock HEAD" -msgstr "não foi possível bloquear HEAD" +msgstr "incapaz bloquear HEAD" -#: sequencer.c:2916 sequencer.c:4371 +#: sequencer.c:3125 sequencer.c:4581 msgid "no cherry-pick or revert in progress" msgstr "sem cherry-pick ou revert em curso" -#: sequencer.c:2918 sequencer.c:2929 +#: sequencer.c:3127 sequencer.c:3138 msgid "cannot resolve HEAD" -msgstr "não é possível resolver HEAD" +msgstr "incapaz resolver HEAD" -#: sequencer.c:2920 sequencer.c:2964 +#: sequencer.c:3129 sequencer.c:3173 msgid "cannot abort from a branch yet to be born" -msgstr "não é possível abortar um ramo ainda não criado" +msgstr "incapaz abortar de um ramo ainda por nascer" -#: sequencer.c:2950 builtin/grep.c:756 +#: sequencer.c:3159 builtin/grep.c:758 #, c-format msgid "cannot open '%s'" -msgstr "não é possível abrir '%s'" +msgstr "incapaz abrir '%s'" -#: sequencer.c:2952 +#: sequencer.c:3161 #, c-format msgid "cannot read '%s': %s" -msgstr "não é possível ler '%s': %s" +msgstr "incapaz ler '%s': %s" -#: sequencer.c:2953 +#: sequencer.c:3162 msgid "unexpected end of file" -msgstr "fim de ficheiro inesperado" +msgstr "" -#: sequencer.c:2959 +#: sequencer.c:3168 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "o ficheiro HEAD de pre-cherry-pick '%s' está corrompido" -#: sequencer.c:2970 +#: sequencer.c:3179 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Parece que moveste a HEAD. Recusando rebobinar, verifique a tua HEAD!" -#: sequencer.c:3011 +#: sequencer.c:3220 #, fuzzy msgid "no revert in progress" -msgstr "Rebase não está em curso?" +msgstr "em curso reversão nenhuma" -#: sequencer.c:3020 +#: sequencer.c:3229 #, fuzzy msgid "no cherry-pick in progress" msgstr "cherry-pick nenhum em curso" -#: sequencer.c:3030 +#: sequencer.c:3239 #, fuzzy msgid "failed to skip the commit" -msgstr "falha ao escrever objeto de commit" +msgstr "" -#: sequencer.c:3037 +#: sequencer.c:3246 msgid "there is nothing to skip" msgstr "" -#: sequencer.c:3040 +#: sequencer.c:3249 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:3202 sequencer.c:4263 +#: sequencer.c:3411 sequencer.c:4472 msgid "cannot read HEAD" -msgstr "não é possível ler HEAD" +msgstr "incapaz ler HEAD" -#: sequencer.c:3219 +#: sequencer.c:3428 #, fuzzy, c-format msgid "unable to copy '%s' to '%s'" -msgstr "não foi possível copiar '%s' para '%s'" +msgstr "incapaz copiar '%s' para '%s'" -#: sequencer.c:3227 +#: sequencer.c:3436 #, fuzzy, c-format msgid "" "You can amend the commit now, with\n" @@ -7414,27 +8186,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3237 +#: sequencer.c:3446 #, fuzzy, c-format msgid "Could not apply %s... %.*s" -msgstr "não foi possível aplicar %s... %s" +msgstr "Incapaz aplicar %s... %.*s" -#: sequencer.c:3244 +#: sequencer.c:3453 #, fuzzy, c-format msgid "Could not merge %.*s" -msgstr "Incapaz de juntar %.*s" +msgstr "Incapaz juntar %.*s" -#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640 +#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644 #, c-format msgid "could not copy '%s' to '%s'" -msgstr "não foi possível copiar '%s' para '%s'" +msgstr "incapaz copiar '%s' para '%s'" -#: sequencer.c:3274 +#: sequencer.c:3483 #, fuzzy, c-format msgid "Executing: %s\n" msgstr "A executar: %s\n" -#: sequencer.c:3289 +#: sequencer.c:3498 #, c-format msgid "" "execution failed: %s\n" @@ -7449,11 +8221,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3295 +#: sequencer.c:3504 msgid "and made changes to the index and/or the working tree\n" msgstr "e fez alterações ao índice e/ou à árvore de trabalho\n" -#: sequencer.c:3301 +#: sequencer.c:3510 #, c-format msgid "" "execution succeeded: %s\n" @@ -7470,94 +8242,94 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3362 +#: sequencer.c:3572 #, fuzzy, c-format msgid "illegal label name: '%.*s'" msgstr "nome de ficheiro malformado: %.*s" -#: sequencer.c:3416 +#: sequencer.c:3645 #, fuzzy msgid "writing fake root commit" msgstr "escrevendo commit de raíz falso" -#: sequencer.c:3421 +#: sequencer.c:3650 msgid "writing squash-onto" msgstr "" -#: sequencer.c:3505 +#: sequencer.c:3734 #, fuzzy, c-format msgid "could not resolve '%s'" -msgstr "não foi possível remover '%s'" +msgstr "incapaz resolver '%s'" -#: sequencer.c:3538 +#: sequencer.c:3767 #, fuzzy msgid "cannot merge without a current revision" -msgstr "não é possível efetuar '%s' sem um commit anterior" +msgstr "incapaz juntar sem uma revisão currente" -#: sequencer.c:3560 +#: sequencer.c:3789 #, fuzzy, c-format msgid "unable to parse '%.*s'" -msgstr "não foi possível criar '%s'" +msgstr "incapaz processar '%.*s'" -#: sequencer.c:3569 +#: sequencer.c:3798 #, fuzzy, c-format msgid "nothing to merge: '%.*s'" -msgstr "ignorado não integrado: '%.*s'" +msgstr "nada a juntar: '%.*s'" -#: sequencer.c:3581 +#: sequencer.c:3810 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3597 +#: sequencer.c:3826 #, fuzzy, c-format msgid "could not get commit message of '%s'" -msgstr "não foi possível ler a mensagem de commit de %s" +msgstr "incapaz obter mensagem de commit de '%s'" -#: sequencer.c:3780 +#: sequencer.c:4009 #, fuzzy, c-format msgid "could not even attempt to merge '%.*s'" -msgstr "não foi possível validar a tag '%s'" +msgstr "incapaz de tentar juntar '%.*s'" -#: sequencer.c:3796 +#: sequencer.c:4025 #, fuzzy msgid "merge: Unable to write new index file" msgstr "merge: Incapaz de escrever novo ficheiro index" -#: sequencer.c:3870 +#: sequencer.c:4099 msgid "Cannot autostash" msgstr "Incapaz de arrumar automaticamente (autostash)" -#: sequencer.c:3873 +#: sequencer.c:4102 #, fuzzy, c-format msgid "Unexpected stash response: '%s'" msgstr "Resposta de squash inexperada: '%s'" -#: sequencer.c:3879 +#: sequencer.c:4108 #, fuzzy, c-format msgid "Could not create directory for '%s'" msgstr "Incapaz de criar a pasta para '%s'" -#: sequencer.c:3882 +#: sequencer.c:4111 #, fuzzy, c-format msgid "Created autostash: %s\n" msgstr "Criado autostash: %s\n" -#: sequencer.c:3886 +#: sequencer.c:4115 #, fuzzy msgid "could not reset --hard" -msgstr "não foi possível ler orig-head" +msgstr "incapaz repor --hard" -#: sequencer.c:3911 +#: sequencer.c:4140 #, fuzzy, c-format msgid "Applied autostash.\n" msgstr "Autostash aplicado.\n" -#: sequencer.c:3923 +#: sequencer.c:4152 #, c-format msgid "cannot store %s" -msgstr "não é possível guardar %s" +msgstr "incapaz guardar %s" -#: sequencer.c:3926 +#: sequencer.c:4155 #, fuzzy, c-format msgid "" "%s\n" @@ -7568,30 +8340,30 @@ msgstr "" "As suas alterações estão guardadas na pilha.\n" "Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n" -#: sequencer.c:3931 +#: sequencer.c:4160 #, fuzzy msgid "Applying autostash resulted in conflicts." msgstr "Patch aplicado a '%s' com conflitos." -#: sequencer.c:3932 +#: sequencer.c:4161 msgid "Autostash exists; creating a new stash entry." msgstr "" -#: sequencer.c:4025 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4233 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" -msgstr "não foi possível destacar HEAD" +msgstr "incapaz soltar HEAD" -#: sequencer.c:4040 +#: sequencer.c:4248 #, fuzzy, c-format msgid "Stopped at HEAD\n" msgstr "Parou no HEAD\n" -#: sequencer.c:4042 +#: sequencer.c:4250 #, fuzzy, c-format msgid "Stopped at %s\n" msgstr "Parou a %s... %.*s\n" -#: sequencer.c:4050 +#: sequencer.c:4258 #, c-format msgid "" "Could not execute the todo command\n" @@ -7604,58 +8376,58 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:4096 +#: sequencer.c:4304 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "" -#: sequencer.c:4141 +#: sequencer.c:4350 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Parou no %s... %.*s\n" -#: sequencer.c:4212 +#: sequencer.c:4421 #, c-format msgid "unknown command %d" msgstr "comando desconhecido %d" -#: sequencer.c:4271 +#: sequencer.c:4480 msgid "could not read orig-head" -msgstr "não foi possível ler orig-head" +msgstr "incapaz ler orig-head" -#: sequencer.c:4276 +#: sequencer.c:4485 msgid "could not read 'onto'" -msgstr "não foi possível ler 'onto'" +msgstr "incapaz ler 'onto'" -#: sequencer.c:4290 +#: sequencer.c:4499 #, c-format msgid "could not update HEAD to %s" -msgstr "não foi possível atualizar HEAD para %s" +msgstr "incapaz atualizar HEAD para %s" -#: sequencer.c:4350 +#: sequencer.c:4559 #, fuzzy, c-format msgid "Successfully rebased and updated %s.\n" msgstr "O %s foi rebaseado e atualizado com sucesso.\n" -#: sequencer.c:4383 +#: sequencer.c:4611 msgid "cannot rebase: You have unstaged changes." -msgstr "não é possível rebasear: tem alterações não preparadas." +msgstr "incapaz rebasear: tem alterações despreparadas." -#: sequencer.c:4392 +#: sequencer.c:4620 msgid "cannot amend non-existing commit" -msgstr "não é possível emendar commit não-existente" +msgstr "incapaz emendar commit inexistente" -#: sequencer.c:4394 +#: sequencer.c:4622 #, c-format msgid "invalid file: '%s'" -msgstr "ficheiro inválido: '%s'" +msgstr "" -#: sequencer.c:4396 +#: sequencer.c:4624 #, c-format msgid "invalid contents: '%s'" msgstr "conteúdo inválido: '%s'" -#: sequencer.c:4399 +#: sequencer.c:4627 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7665,59 +8437,59 @@ msgstr "" "Tem alterações por submeter na árvore de trabalho. Submeta-as primeiro\n" "e execute 'git rebase --continue' de novo." -#: sequencer.c:4435 sequencer.c:4474 +#: sequencer.c:4663 sequencer.c:4702 #, fuzzy, c-format msgid "could not write file: '%s'" -msgstr "não foi possível criar o ficheiro '%s'" +msgstr "incapaz escrever ficheiro: '%s'" -#: sequencer.c:4490 +#: sequencer.c:4718 msgid "could not remove CHERRY_PICK_HEAD" -msgstr "não foi possível remover CHERRY_PICK_HEAD" +msgstr "incapaz remover CHERRY_PICK_HEAD" -#: sequencer.c:4497 +#: sequencer.c:4725 msgid "could not commit staged changes." -msgstr "não foi possível submeter as alterações preparadas." +msgstr "incapaz commit alterações preparadas." -#: sequencer.c:4613 +#: sequencer.c:4845 #, c-format msgid "%s: can't cherry-pick a %s" -msgstr "%s: não é possível efetuar cherry-pick de %s" +msgstr "%s: incapaz apanhar um %s" -#: sequencer.c:4617 +#: sequencer.c:4849 #, c-format msgid "%s: bad revision" msgstr "%s: revisão incorreta" -#: sequencer.c:4652 +#: sequencer.c:4884 msgid "can't revert as initial commit" -msgstr "não é possível reverter como commit inicial" +msgstr "incapaz reverter como commit inicial" -#: sequencer.c:5129 +#: sequencer.c:5361 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:5132 +#: sequencer.c:5364 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:5374 sequencer.c:5391 +#: sequencer.c:5614 sequencer.c:5631 #, fuzzy msgid "nothing to do" msgstr "nada a fazer" -#: sequencer.c:5410 +#: sequencer.c:5650 #, fuzzy msgid "could not skip unnecessary pick commands" msgstr "incapaz de saltar comandos pick desnecessários" -#: sequencer.c:5504 +#: sequencer.c:5750 msgid "the script was already rearranged." msgstr "" #: setup.c:133 #, fuzzy, c-format msgid "'%s' is outside repository at '%s'" -msgstr "%s: '%s' está fora do repositório" +msgstr "%s está fora do repositório em '%s'" #: setup.c:185 #, c-format @@ -7736,15 +8508,14 @@ msgid "" "Use '--' to separate paths from revisions, like this:\n" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -"argumento ambíguo '%s': revisão ou caminho desconhecidos não encontrado na " -"árvore de trabalho.\n" -"Use '--' para separar caminhos de revisões, assim:\n" +"argumento ambíguo '%s': revisão desconhecida ou path fora da working tree.\n" +"Usa '--' para separar paths de revisões, assim:\n" "'git <comando> [<revisão>...] -- [<ficheiro>...]'" #: setup.c:264 #, fuzzy, c-format msgid "option '%s' must come before non-option arguments" -msgstr "parar de analisar depois do primeiro argumento que não seja uma opção" +msgstr "opção '%s' tem de vir antes argumentos diferentes de opção" #: setup.c:283 #, c-format @@ -7760,106 +8531,111 @@ msgstr "" #: setup.c:419 #, fuzzy msgid "unable to set up work tree using invalid config" -msgstr "não é possível de obter o diretório de trabalho atual" +msgstr "incapaz preparar work tree usando config inválido" -#: setup.c:423 +#: setup.c:423 builtin/rev-parse.c:895 msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:661 +#: setup.c:658 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Esperava-se versão do repositório git <= %d, obteve-se %d" -#: setup.c:669 -msgid "unknown repository extensions found:" -msgstr "extensões de repositório desconhecidas encontradas:" +#: setup.c:666 +#, fuzzy +msgid "unknown repository extension found:" +msgid_plural "unknown repository extensions found:" +msgstr[0] "extensão de repositório desconhecida encontrada:" +msgstr[1] "extensões de repositório desconhecidas encontradas:" -#: setup.c:681 +#: setup.c:680 #, fuzzy -msgid "repo version is 0, but v1-only extensions found:" -msgstr "extensões de repositório desconhecidas encontradas:" +msgid "repo version is 0, but v1-only extension found:" +msgid_plural "repo version is 0, but v1-only extensions found:" +msgstr[0] "versão de repo é 0, mas encontrou-se extensão vi-only:" +msgstr[1] "versão de repo é 0, mas encontrou-se extensões vi-only:" -#: setup.c:700 +#: setup.c:701 #, fuzzy, c-format msgid "error opening '%s'" -msgstr "falha ao abrir '%s'" +msgstr "" -#: setup.c:702 +#: setup.c:703 #, fuzzy, c-format msgid "too large to be a .git file: '%s'" -msgstr "não foi possível ler o ficheiro de entrada '%s'" +msgstr "demasiado grande para ser um ficheiro .git: '%s'" -#: setup.c:704 +#: setup.c:705 #, fuzzy, c-format msgid "error reading %s" -msgstr "Erro ao rematar %s." +msgstr "erro lendo %s" -#: setup.c:706 +#: setup.c:707 #, fuzzy, c-format msgid "invalid gitfile format: %s" msgstr "formato de data inválido: %s" -#: setup.c:708 +#: setup.c:709 #, fuzzy, c-format msgid "no path in gitfile: %s" msgstr "gitfile sem path: %s" -#: setup.c:710 +#: setup.c:711 #, fuzzy, c-format msgid "not a git repository: %s" msgstr "é repositório git nenhum: %s" -#: setup.c:812 +#: setup.c:813 #, c-format msgid "'$%s' too big" msgstr "" -#: setup.c:826 +#: setup.c:827 #, fuzzy, c-format msgid "not a git repository: '%s'" msgstr "é repositório git nenhum: '%s'" -#: setup.c:855 setup.c:857 setup.c:888 +#: setup.c:856 setup.c:858 setup.c:889 #, fuzzy, c-format msgid "cannot chdir to '%s'" -msgstr "não é possível mudar para o diretório %s" +msgstr "incapaz chdir para '%s'" -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 +#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 #, fuzzy msgid "cannot come back to cwd" msgstr "incapaz de voltar para cwd" -#: setup.c:987 +#: setup.c:988 #, fuzzy, c-format msgid "failed to stat '%*s%s%s'" -msgstr "falha ao invocar stat de '%s'" +msgstr "" -#: setup.c:1225 +#: setup.c:1231 msgid "Unable to read current working directory" msgstr "Incapaz de ler pasta atual de trabalho" -#: setup.c:1234 setup.c:1240 +#: setup.c:1240 setup.c:1246 #, fuzzy, c-format msgid "cannot change to '%s'" -msgstr "não é possível mudar para '%s'" +msgstr "incapaz mudar para '%s'" -#: setup.c:1245 +#: setup.c:1251 #, fuzzy, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "é repositório git nenhum (ou em pastas parente nenhuma): %s" -#: setup.c:1251 +#: setup.c:1257 #, fuzzy, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" "é repositório git nenhum (ou em pai nenhum até ao ponto de montagem %s)\n" -"Parando na fronteira do sistema de ficheiros (GIT_DISCOVERY_ACROSS_FILESYSTEM " -"indefinido)." +"Parando na fronteira do sistema de ficheiros " +"(GIT_DISCOVERY_ACROSS_FILESYSTEM indefinido)." -#: setup.c:1362 +#: setup.c:1381 #, fuzzy, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7868,421 +8644,73 @@ msgstr "" "Problema com o valor core.sharedRepository modo de ficheiro (0%.3o).\n" "O dono dos ficheiros tem de ter sempre permissões de leitura e escrita." -#: setup.c:1409 +#: setup.c:1430 #, fuzzy msgid "open /dev/null or dup failed" msgstr "falha ao abrir /dev/null" -#: setup.c:1424 +#: setup.c:1445 #, fuzzy msgid "fork failed" msgstr "falha ao invocar fseek" -#: setup.c:1429 +#: setup.c:1450 t/helper/test-simple-ipc.c:285 #, fuzzy msgid "setsid failed" -msgstr "falha ao executar o comando stash" - -#: sha1-file.c:480 -#, c-format -msgid "object directory %s does not exist; check .git/objects/info/alternates" -msgstr "" - -#: sha1-file.c:531 -#, fuzzy, c-format -msgid "unable to normalize alternate object path: %s" -msgstr "não foi possível analisar o objeto: %s" - -#: sha1-file.c:603 -#, c-format -msgid "%s: ignoring alternate object stores, nesting too deep" -msgstr "" - -#: sha1-file.c:610 -#, fuzzy, c-format -msgid "unable to normalize object directory: %s" -msgstr "não foi possível analisar o objeto: %s" - -#: sha1-file.c:653 -#, fuzzy -msgid "unable to fdopen alternates lockfile" -msgstr "não foi possível escrever os parâmetros no ficheiro de configuração" - -#: sha1-file.c:671 -#, fuzzy -msgid "unable to read alternates file" -msgstr "não foi possível ler o ficheiro de índice" - -#: sha1-file.c:678 -#, fuzzy -msgid "unable to move new alternates file into place" -msgstr "não foi possível escrever novo ficheiro de índice" - -#: sha1-file.c:713 -#, c-format -msgid "path '%s' does not exist" -msgstr "o caminho '%s' não existe" - -#: sha1-file.c:734 -#, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "" -"ainda não é suportada a funcionalidade que permite ter o repositório de " -"referência '%s' como uma extração ligada." - -#: sha1-file.c:740 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "o repositório de referência '%s' não é um repositório local." - -#: sha1-file.c:746 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "o repositório de referência '%s' é raso" - -#: sha1-file.c:754 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "o repositório de referência '%s' está enxertado" - -#: sha1-file.c:814 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "" - -#: sha1-file.c:964 -#, c-format -msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" -msgstr "" - -#: sha1-file.c:985 -#, fuzzy -msgid "mmap failed" -msgstr "%s falhou" - -#: sha1-file.c:1149 -#, fuzzy, c-format -msgid "object file %s is empty" -msgstr "objeto local %s corrompido" - -#: sha1-file.c:1284 sha1-file.c:2477 -#, fuzzy, c-format -msgid "corrupt loose object '%s'" -msgstr "não foi possível analisar o objeto '%s'" - -#: sha1-file.c:1286 sha1-file.c:2481 -#, fuzzy, c-format -msgid "garbage at end of loose object '%s'" -msgstr "não foi possível analisar o objeto: %s" - -#: sha1-file.c:1328 -#, fuzzy -msgid "invalid object type" -msgstr "tipo de objeto incorreto." - -#: sha1-file.c:1412 -#, c-format -msgid "unable to unpack %s header with --allow-unknown-type" -msgstr "" - -#: sha1-file.c:1415 -#, fuzzy, c-format -msgid "unable to unpack %s header" -msgstr "não foi possível atualizar %s" - -#: sha1-file.c:1421 -#, c-format -msgid "unable to parse %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1424 -#, fuzzy, c-format -msgid "unable to parse %s header" -msgstr "não foi possível atualizar %s" - -#: sha1-file.c:1651 -#, fuzzy, c-format -msgid "failed to read object %s" -msgstr "falha ao ler o objeto '%s'." - -#: sha1-file.c:1655 -#, fuzzy, c-format -msgid "replacement %s not found for %s" -msgstr "modelos não encontrados em %s" - -#: sha1-file.c:1659 -#, fuzzy, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "objeto local %s corrompido" - -#: sha1-file.c:1663 -#, fuzzy, c-format -msgid "packed object %s (stored in %s) is corrupt" -msgstr "objeto local %s corrompido" - -#: sha1-file.c:1768 -#, fuzzy, c-format -msgid "unable to write file %s" -msgstr "não foi possível escrever %s" - -#: sha1-file.c:1775 -#, fuzzy, c-format -msgid "unable to set permission to '%s'" -msgstr "não foi possível resolver revisão: %s" - -#: sha1-file.c:1782 -#, fuzzy -msgid "file write error" -msgstr "falha ao escrever para rev-list" - -#: sha1-file.c:1802 -#, fuzzy -msgid "error when closing loose object file" -msgstr "erro ao fechar ficheiro de pacote" - -#: sha1-file.c:1867 -#, c-format -msgid "insufficient permission for adding an object to repository database %s" -msgstr "" - -#: sha1-file.c:1869 -#, fuzzy -msgid "unable to create temporary file" -msgstr "não foi possível criar índice temporário" - -#: sha1-file.c:1893 -#, fuzzy -msgid "unable to write loose object file" -msgstr "não é possível escrever o objeto de nota" - -#: sha1-file.c:1899 -#, fuzzy, c-format -msgid "unable to deflate new object %s (%d)" -msgstr "não é possível compactar objeto acrescentado (%d)" - -#: sha1-file.c:1903 -#, fuzzy, c-format -msgid "deflateEnd on object %s failed (%d)" -msgstr "falha de fstat de %s" - -#: sha1-file.c:1907 -#, c-format -msgid "confused by unstable object source data for %s" -msgstr "" - -#: sha1-file.c:1917 builtin/pack-objects.c:1086 -#, fuzzy, c-format -msgid "failed utime() on %s" -msgstr "falha ao abrir '%s'" - -#: sha1-file.c:1994 -#, fuzzy, c-format -msgid "cannot read object for %s" -msgstr "não foi possível ler o objeto %s" - -#: sha1-file.c:2045 -#, fuzzy -msgid "corrupt commit" -msgstr "substituir autor do commit" - -#: sha1-file.c:2053 -#, fuzzy -msgid "corrupt tag" -msgstr "mostrar tags" - -#: sha1-file.c:2153 -#, c-format -msgid "read error while indexing %s" -msgstr "" - -#: sha1-file.c:2156 -#, fuzzy, c-format -msgid "short read while indexing %s" -msgstr "não é possível ler o índice" - -#: sha1-file.c:2229 sha1-file.c:2239 -#, fuzzy, c-format -msgid "%s: failed to insert into database" -msgstr "gpg não assinou os dados" - -#: sha1-file.c:2245 -#, fuzzy, c-format -msgid "%s: unsupported file type" -msgstr "versão de índice %s não suportada" - -#: sha1-file.c:2269 -#, fuzzy, c-format -msgid "%s is not a valid object" -msgstr "%s não é um objeto '%s' válido" - -#: sha1-file.c:2271 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s não é um objeto '%s' válido" - -#: sha1-file.c:2298 builtin/index-pack.c:192 -#, c-format -msgid "unable to open %s" -msgstr "não foi possível abrir %s" - -#: sha1-file.c:2488 sha1-file.c:2541 -#, c-format -msgid "hash mismatch for %s (expected %s)" +#: sparse-index.c:162 +msgid "attempting to use sparse-index without cone mode" msgstr "" -#: sha1-file.c:2512 -#, fuzzy, c-format -msgid "unable to mmap %s" -msgstr "não foi possível abrir %s" - -#: sha1-file.c:2517 -#, fuzzy, c-format -msgid "unable to unpack header of %s" -msgstr "não foi possível atualizar %s" - -#: sha1-file.c:2523 -#, fuzzy, c-format -msgid "unable to parse header of %s" -msgstr "não foi possível ler %s" - -#: sha1-file.c:2534 -#, fuzzy, c-format -msgid "unable to unpack contents of %s" -msgstr "não é possível analisar o contacto: %s" - -#: sha1-name.c:486 -#, c-format -msgid "short SHA1 %s is ambiguous" -msgstr "SHA1 curto %s é ambíguo" - -#: sha1-name.c:497 -msgid "The candidates are:" -msgstr "Os candidatos são:" - -#: sha1-name.c:796 +#: sparse-index.c:174 #, fuzzy -msgid "" -"Git normally never creates a ref that ends with 40 hex characters\n" -"because it will be ignored when you just specify 40-hex. These refs\n" -"may be created by mistake. For example,\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" -"examine these refs and maybe delete them. Turn this message off by\n" -"running \"git config advice.objectNameWarning false\"" -msgstr "" -"Normalmente o Git nunca cria refs que terminem em 40 caracteres\n" -"hexadecimais, porque será ignorada quando apenas se indica 40-hex.\n" -"Poderam-se criar estas refs por engano. Como no exemplo,\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"onde \"$br\" fica vazio e uma ref de 40-hex é criada. Por favor\n" -"examine estas refs e talvez apague-as. Desative esta mensagem\n" -"executando \"git config advice.objectNameWarning false\"" - -#: sha1-name.c:916 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "" - -#: sha1-name.c:924 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "" - -#: sha1-name.c:1702 -#, fuzzy, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "O caminho '%s' está dentro do submódulo '%.*s'" - -#: sha1-name.c:1708 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" - -#: sha1-name.c:1717 -#, fuzzy, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "o caminho '%s' não existe" +msgid "unable to update cache-tree, staying full" +msgstr "incapaz atualizar árvore de cache" -#: sha1-name.c:1745 +#: sparse-index.c:261 #, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" - -#: sha1-name.c:1761 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" - -#: sha1-name.c:1769 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "" - -#: sha1-name.c:1771 -#, fuzzy, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "o caminho '%s' não tem a versão deles" - -#: sha1-name.c:1784 -#, fuzzy -msgid "relative path syntax can't be used outside working tree" +msgid "index entry is a directory, but not sparse (%08x)" msgstr "" -"Os caminhos relativos só podem ser usados a partir do topo da árvore de " -"trabalho" - -#: sha1-name.c:1922 -#, fuzzy, c-format -msgid "invalid object name '%.*s'." -msgstr "Nome de objeto inválido: '%s'." #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:848 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:850 +#: strbuf.c:852 #, c-format msgid "%u.%2.2u GiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:858 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:860 +#: strbuf.c:862 #, c-format msgid "%u.%2.2u MiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:867 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:869 +#: strbuf.c:871 #, c-format msgid "%u.%2.2u KiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:875 +#: strbuf.c:877 #, fuzzy, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -8290,33 +8718,33 @@ msgstr[0] "bytes" msgstr[1] "bytes" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:877 +#: strbuf.c:879 #, fuzzy, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "bytes" msgstr[1] "bytes" -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 -#: builtin/rebase.c:864 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738 +#: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" -msgstr "não foi possível abrir '%s' para escrita" +msgstr "incapaz abrir '%s' para escrita" -#: strbuf.c:1175 +#: strbuf.c:1177 #, fuzzy, c-format msgid "could not edit '%s'" -msgstr "não foi possível ler '%s'" +msgstr "incapaz editar '%s'" #: submodule-config.c:237 #, fuzzy, c-format msgid "ignoring suspicious submodule name: %s" -msgstr "a referência %s com nome danificado foi ignorada" +msgstr "ignorando nome suspeito de submódulo: %s" #: submodule-config.c:304 #, fuzzy msgid "negative values not allowed for submodule.fetchjobs" -msgstr "não é permitido valores negativos em submodule.fetchJobs" +msgstr "é proíbido valores negativos para submodule.fetchjobs" #: submodule-config.c:402 #, c-format @@ -8326,7 +8754,7 @@ msgstr "" #: submodule-config.c:499 #, c-format msgid "invalid value for %s" -msgstr "valor inválido de %s" +msgstr "" #: submodule-config.c:766 #, c-format @@ -8335,13 +8763,14 @@ msgstr "Incapaz de atualizar entrada de .gitmodules %s" #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" -msgstr "Incapaz de alterar .gitmodules por juntar, resolve os conflitos " -"de junção primeiro" +msgstr "" +"Incapaz de alterar .gitmodules por juntar, resolve os conflitos de junção " +"primeiro" #: submodule.c:118 submodule.c:147 #, c-format msgid "Could not find section in .gitmodules where path=%s" -msgstr "Secção de .gitmodules cujo path=%s não encontrada" +msgstr "Secção de .gitmodules cujo path=%s por encontrar" #: submodule.c:154 #, c-format @@ -8352,70 +8781,72 @@ msgstr "Incapaz de remover a entrada de .gitmodules para %s" msgid "staging updated .gitmodules failed" msgstr "falha ao preparar .gitmodules atualizado" -#: submodule.c:327 +#: submodule.c:328 #, fuzzy, c-format msgid "in unpopulated submodule '%s'" -msgstr "A ignorar submódulo '%s'" +msgstr "em submódulo despopulado '%s'" -#: submodule.c:358 +#: submodule.c:359 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "O caminho '%s' está dentro do submódulo '%.*s'" -#: submodule.c:434 +#: submodule.c:436 #, fuzzy, c-format msgid "bad --ignore-submodules argument: %s" msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'" -#: submodule.c:816 +#: submodule.c:805 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " "same. Skipping it." msgstr "" -#: submodule.c:919 +#: submodule.c:908 #, fuzzy, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" -msgstr "%s %s não é um commit!" +msgstr "entrada submódulo '%s' (%s) é um(a) %s, não um commit" -#: submodule.c:1004 +#: submodule.c:993 #, fuzzy, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " "submodule %s" -msgstr "não foi possível executar 'git status' no submódulo '%s'" +msgstr "" +"Incapaz executar comando 'git rev-list <commits> --not --remotes -n 1' " +"emsubmódulo %s" -#: submodule.c:1127 +#: submodule.c:1116 #, fuzzy, c-format msgid "process for submodule '%s' failed" msgstr "falha ao clonar '%s' no caminho de submódulo '%s'" -#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "Falha ao resolver HEAD numa referência válida." -#: submodule.c:1167 +#: submodule.c:1156 #, fuzzy, c-format msgid "Pushing submodule '%s'\n" -msgstr "A ignorar submódulo '%s'\n" +msgstr "Atirando submódulo '%s'\n" -#: submodule.c:1170 +#: submodule.c:1159 #, fuzzy, c-format msgid "Unable to push submodule '%s'\n" msgstr "Impossível enviar submódulo '%s'\n" -#: submodule.c:1462 +#: submodule.c:1451 #, fuzzy, c-format msgid "Fetching submodule %s%s\n" msgstr "Buscando submódulo %s%s\n" -#: submodule.c:1492 +#: submodule.c:1485 #, fuzzy, c-format msgid "Could not access submodule '%s'\n" msgstr "Submódulo '%s' inacessível\n" -#: submodule.c:1646 +#: submodule.c:1640 #, fuzzy, c-format msgid "" "Errors during submodule fetch:\n" @@ -8424,80 +8855,79 @@ msgstr "" "Erros na busca do submódulo:\n" "%s" -#: submodule.c:1671 +#: submodule.c:1665 #, c-format msgid "'%s' not recognized as a git repository" -msgstr "'%s' não é reconhecido como um repositório git" +msgstr "'%s' é irreconhecível como um repositório git" -#: submodule.c:1688 +#: submodule.c:1682 #, fuzzy, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" -msgstr "não foi possível executar 'git status' no submódulo '%s'" +msgstr "Incapaz executar 'git status' no submódulo '%s'" -#: submodule.c:1729 +#: submodule.c:1723 #, fuzzy, c-format msgid "'git status --porcelain=2' failed in submodule %s" -msgstr "não foi possível executar 'git status' no submódulo '%s'" +msgstr "'git status --porcelain=2' falhou no submódulo '%s'" -#: submodule.c:1804 +#: submodule.c:1798 #, c-format msgid "could not start 'git status' in submodule '%s'" -msgstr "não foi possível iniciar 'git status' no submódulo '%s'" +msgstr "incapaz iniciar 'git status' no submódulo '%s'" -#: submodule.c:1817 +#: submodule.c:1811 #, c-format msgid "could not run 'git status' in submodule '%s'" -msgstr "não foi possível executar 'git status' no submódulo '%s'" +msgstr "incapaz executar 'git status' no submódulo '%s'" -#: submodule.c:1832 +#: submodule.c:1826 #, fuzzy, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Incapaz de remover a definição core.worktree em submódulo '%s'" -#: submodule.c:1859 submodule.c:2169 +#: submodule.c:1853 submodule.c:2163 #, c-format msgid "could not recurse into submodule '%s'" -msgstr "não foi possível percorrer recursivamente o submódulo '%s'" +msgstr "incapaz percorrer recursivamente o submódulo '%s'" -#: submodule.c:1880 +#: submodule.c:1874 #, fuzzy msgid "could not reset submodule index" -msgstr "não foi possível percorrer recursivamente o submódulo '%s'" +msgstr "incapaz repor index de submódulo" -#: submodule.c:1922 +#: submodule.c:1916 #, c-format msgid "submodule '%s' has dirty index" msgstr "o submódulo '%s' tem índice sujo" -#: submodule.c:1974 +#: submodule.c:1968 #, fuzzy, c-format msgid "Submodule '%s' could not be updated." -msgstr "Submódulos alterados mas não atualizados:" +msgstr "Submódulo '%s' incapaz de ser atualizado." -#: submodule.c:2042 +#: submodule.c:2036 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "" -#: submodule.c:2063 +#: submodule.c:2057 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -"relocate_gitdir para submodule '%s' com mais do que uma árvore de trabalho " -"não suportado" +"relocate_gitdir para submodúlo '%s' com mais que uma worktree é insustentado" -#: submodule.c:2075 submodule.c:2134 +#: submodule.c:2069 submodule.c:2128 #, c-format msgid "could not lookup name for submodule '%s'" -msgstr "não foi possível procurar pelo submódulo '%s'" +msgstr "incapaz procurar nome para submódulo '%s'" -#: submodule.c:2079 +#: submodule.c:2073 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "" -#: submodule.c:2086 +#: submodule.c:2080 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8508,68 +8938,74 @@ msgstr "" "'%s' para\n" "'%s'\n" -#: submodule.c:2214 +#: submodule.c:2208 msgid "could not start ls-files in .." -msgstr "não foi possível iniciar ls-files em .." +msgstr "incapaz iniciar ls-files em .." -#: submodule.c:2254 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree retornou código de retorno inesperado %d" -#: trailer.c:236 +#: symlinks.c:244 +#, fuzzy, c-format +msgid "failed to lstat '%s'" +msgstr "" + +#: trailer.c:244 #, c-format msgid "running trailer command '%s' failed" msgstr "falha ao executar o comando trailer '%s'" -#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 -#: trailer.c:555 +#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566 +#: trailer.c:570 #, c-format msgid "unknown value '%s' for key '%s'" -msgstr "valor desconhecido '%s' da chave '%s'" +msgstr "valor desconhecido '%s' para chave '%s'" -#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 +#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299 +#: builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "mais do que um %s" -#: trailer.c:728 +#: trailer.c:743 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "token terminador vazio no terminador '%.*s'" -#: trailer.c:748 +#: trailer.c:763 #, c-format msgid "could not read input file '%s'" -msgstr "não foi possível ler o ficheiro de entrada '%s'" +msgstr "incapaz ler ficheiro de entrada '%s'" -#: trailer.c:751 +#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577 msgid "could not read from stdin" -msgstr "não foi possível ler da entrada padrão" +msgstr "incapaz ler da entrada padrão" -#: trailer.c:1009 wrapper.c:676 +#: trailer.c:1024 wrapper.c:676 #, c-format msgid "could not stat %s" -msgstr "não foi possível obter stat de %s" +msgstr "incapaz obter estatutário %s" -#: trailer.c:1011 +#: trailer.c:1026 #, c-format msgid "file %s is not a regular file" -msgstr "o ficheiro %s não é um ficheiro regular" +msgstr "ficheiro %s é ficheiro regular nenhum" -#: trailer.c:1013 +#: trailer.c:1028 #, c-format msgid "file %s is not writable by user" -msgstr "o ficheiro %s não pode ser escrito pelo utilizador" +msgstr "ficheiro %s é não-escrevível para utilizador" -#: trailer.c:1025 +#: trailer.c:1040 msgid "could not open temporary file" -msgstr "não foi possível abrir ficheiro temporário" +msgstr "incapaz abrir ficheiro temporário" -#: trailer.c:1065 +#: trailer.c:1080 #, c-format msgid "could not rename temporary file to %s" -msgstr "não foi possível mudar o nome do ficheiro temporário para %s" +msgstr "incapaz renomear ficheiro temporário para %s" #: transport-helper.c:62 transport-helper.c:91 #, fuzzy @@ -8599,24 +9035,24 @@ msgstr "" #: transport-helper.c:287 transport-helper.c:429 #, fuzzy, c-format msgid "%s unexpectedly said: '%s'" -msgstr "blob para %s '%s' esperado" +msgstr "" #: transport-helper.c:417 #, fuzzy, c-format msgid "%s also locked %s" -msgstr "'%s' não está trancada" +msgstr "%s também trancou %s" #: transport-helper.c:497 #, fuzzy msgid "couldn't run fast-import" -msgstr "não foi possível executar o comando stash." +msgstr "incapaz executar fast-import" #: transport-helper.c:520 #, fuzzy msgid "error while running fast-import" -msgstr "erro ao fechar ficheiro de pacote" +msgstr "" -#: transport-helper.c:549 transport-helper.c:1236 +#: transport-helper.c:549 transport-helper.c:1247 #, fuzzy, c-format msgid "could not read ref %s" msgstr "incapaz de ler ref %s" @@ -8633,134 +9069,138 @@ msgstr "" #: transport-helper.c:618 #, fuzzy msgid "invalid remote service path" -msgstr "referência inválida: %s" +msgstr "" -#: transport-helper.c:661 transport.c:1446 +#: transport-helper.c:661 transport.c:1477 #, fuzzy msgid "operation not supported by protocol" -msgstr "opção não suportada com --recurse-submodules." +msgstr "opção insustentado pelo protocolo" #: transport-helper.c:664 #, c-format msgid "can't connect to subservice %s" msgstr "" -#: transport-helper.c:745 +#: transport-helper.c:693 transport.c:400 +msgid "--negotiate-only requires protocol v2" +msgstr "" + +#: transport-helper.c:755 msgid "'option' without a matching 'ok/error' directive" msgstr "" -#: transport-helper.c:788 +#: transport-helper.c:798 #, fuzzy, c-format msgid "expected ok/error, helper said '%s'" -msgstr "blob para %s '%s' esperado" +msgstr "" -#: transport-helper.c:845 +#: transport-helper.c:855 #, fuzzy, c-format msgid "helper reported unexpected status of %s" -msgstr "ls-tree retornou código de retorno inesperado %d" +msgstr "helper reportou código de status inesperado de %s" -#: transport-helper.c:928 +#: transport-helper.c:938 #, fuzzy, c-format msgid "helper %s does not support dry-run" -msgstr "O servidor não suporta --deepen" +msgstr "helper %s insustenta dry-run" -#: transport-helper.c:931 +#: transport-helper.c:941 #, fuzzy, c-format msgid "helper %s does not support --signed" -msgstr "O servidor não suporta --shallow-since" +msgstr "helper %s insustenta --signed" -#: transport-helper.c:934 +#: transport-helper.c:944 #, fuzzy, c-format msgid "helper %s does not support --signed=if-asked" -msgstr "o recetor não suporta publicação com --signed" +msgstr "helper %s insustenta --signed=if-asked" -#: transport-helper.c:939 +#: transport-helper.c:949 #, fuzzy, c-format msgid "helper %s does not support --atomic" -msgstr "O servidor não suporta --shallow-since" +msgstr "helper %s insustenta --atomic" -#: transport-helper.c:943 +#: transport-helper.c:953 #, fuzzy, c-format msgid "helper %s does not support --%s" -msgstr "O servidor não suporta --shallow-since" +msgstr "helper %s insustenta --%s" -#: transport-helper.c:950 +#: transport-helper.c:960 #, fuzzy, c-format msgid "helper %s does not support 'push-option'" -msgstr "o recetor não suporta opções de publicação" +msgstr "helper %s insustenta 'push-option'" -#: transport-helper.c:1050 +#: transport-helper.c:1060 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:1055 +#: transport-helper.c:1065 #, fuzzy, c-format msgid "helper %s does not support 'force'" -msgstr "O servidor não suporta --deepen" +msgstr "helper %s insustenta 'force'" -#: transport-helper.c:1102 +#: transport-helper.c:1112 #, fuzzy msgid "couldn't run fast-export" -msgstr "não foi possível executar o comando stash." +msgstr "incapaz executar fast-export" -#: transport-helper.c:1107 +#: transport-helper.c:1117 #, fuzzy msgid "error while running fast-export" -msgstr "erro ao fechar ficheiro de pacote" +msgstr "" -#: transport-helper.c:1132 +#: transport-helper.c:1142 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" "Perhaps you should specify a branch.\n" msgstr "" -#: transport-helper.c:1213 +#: transport-helper.c:1224 #, fuzzy, c-format msgid "unsupported object format '%s'" msgstr "objeto malformado em '%s'" -#: transport-helper.c:1222 +#: transport-helper.c:1233 #, fuzzy, c-format msgid "malformed response in ref list: %s" -msgstr "folha de opções malformada: '%s'" +msgstr "resposta em lista de ref malformada: %s" -#: transport-helper.c:1374 +#: transport-helper.c:1385 #, fuzzy, c-format msgid "read(%s) failed" -msgstr "%s falhou" +msgstr "" -#: transport-helper.c:1401 +#: transport-helper.c:1412 #, fuzzy, c-format msgid "write(%s) failed" -msgstr "%s falhou" +msgstr "" -#: transport-helper.c:1450 +#: transport-helper.c:1461 #, fuzzy, c-format msgid "%s thread failed" -msgstr "%s falhou" +msgstr "" -#: transport-helper.c:1454 +#: transport-helper.c:1465 #, fuzzy, c-format msgid "%s thread failed to join: %s" -msgstr "falha ao abrir '%s'" +msgstr "" -#: transport-helper.c:1473 transport-helper.c:1477 +#: transport-helper.c:1484 transport-helper.c:1488 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1514 +#: transport-helper.c:1525 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1518 +#: transport-helper.c:1529 #, fuzzy, c-format msgid "%s process failed" -msgstr "%s falhou" +msgstr "" -#: transport-helper.c:1536 transport-helper.c:1545 +#: transport-helper.c:1547 transport-helper.c:1556 msgid "can't start thread for copying data" msgstr "" @@ -8772,45 +9212,50 @@ msgstr "Iria definir o ramo a montante de '%s' como '%s' de '%s'\n" #: transport.c:145 #, fuzzy, c-format msgid "could not read bundle '%s'" -msgstr "não foi possível ler o ficheiro '%s'" +msgstr "incapaz ler conjunto '%s'" -#: transport.c:220 +#: transport.c:223 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transporte: opção de profundidade '%s' inválida" -#: transport.c:269 +#: transport.c:275 msgid "see protocol.version in 'git help config' for more details" msgstr "" -#: transport.c:270 +#: transport.c:276 msgid "server options require protocol version 2 or later" msgstr "" -#: transport.c:727 +#: transport.c:403 +#, fuzzy +msgid "server does not support wait-for-done" +msgstr "Servidor insustenta --deepen" + +#: transport.c:755 #, fuzzy msgid "could not parse transport.color.* config" -msgstr "não foi possível analisar o autor do script" +msgstr "incapaz processar config transport.color.*" -#: transport.c:802 +#: transport.c:830 msgid "support for protocol v2 not implemented yet" msgstr "" -#: transport.c:936 +#: transport.c:965 #, fuzzy, c-format msgid "unknown value for config '%s': %s" -msgstr "valor desconhecido '%s' da chave '%s'" +msgstr "valor para config '%s' desconhecido: %s" -#: transport.c:1002 +#: transport.c:1031 #, fuzzy, c-format msgid "transport '%s' not allowed" -msgstr "ramo '%s' não encontrado." +msgstr "transport '%s' proibido" -#: transport.c:1055 +#: transport.c:1084 msgid "git-over-rsync is no longer supported" msgstr "" -#: transport.c:1157 +#: transport.c:1187 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8819,7 +9264,7 @@ msgstr "" "Os seguintes paths de submódulo contêm alterações que\n" "puderam ser encontradas em remoto nenhum:\n" -#: transport.c:1161 +#: transport.c:1191 #, c-format msgid "" "\n" @@ -8846,32 +9291,32 @@ msgstr "" "para publicá-las no remoto.\n" "\n" -#: transport.c:1169 +#: transport.c:1199 msgid "Aborting." msgstr "Abortado." -#: transport.c:1315 +#: transport.c:1346 #, fuzzy msgid "failed to push all needed submodules" msgstr "Falha ao adicionar o submódulo '$sm_path'" -#: tree-walk.c:32 +#: tree-walk.c:33 msgid "too-short tree object" msgstr "objeto árvore demasiado curto" -#: tree-walk.c:38 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "modo na entrada de árvore malformado" -#: tree-walk.c:42 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "nome de ficheiro vazio na entrada de árvore" -#: tree-walk.c:117 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "ficheiro de árvore demasiado curto" -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8881,7 +9326,7 @@ msgstr "" "extrair:\n" "%%sSubmeta as suas alterações ou esconda-as antes de trocar de ramo." -#: unpack-trees.c:115 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8891,7 +9336,7 @@ msgstr "" "extrair:\n" "%%s" -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8901,7 +9346,7 @@ msgstr "" "integrar:\n" "%%sSubmeta as suas alterações ou esconda-as antes de integrar." -#: unpack-trees.c:120 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8911,17 +9356,17 @@ msgstr "" "integrar:\n" "%%s" -#: unpack-trees.c:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" -"As suas alterações locais nos seguintes ficheiros seriam substituídas por " +"As tuas alterações locais aos seguintes ficheiros seriam substituídas por " "%s:\n" -"%%sSubmeta as suas alterações ou esconda-as antes de efetuar %s." +"%%sPor favor, faz commit ou stash às alterações antes de fazer %s." -#: unpack-trees.c:125 +#: unpack-trees.c:127 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8931,144 +9376,137 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:130 +#: unpack-trees.c:132 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -"Atualizar os seguintes diretórios perde os ficheiros não controlos dentro " -"deles:\n" +"Atualizar as seguintes pastas fará perder os seus ficheiros por seguir:\n" "%s" -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -"Os seguintes ficheiros não controlados na árvore de trabalho seriam " -"removidos ao extrair:\n" -"%%sMova ou remova-os antes de trocar de ramos." +"Os seguintes ficheiros por seguir da worktree seriam removidos no checkout:\n" +"%%sPor favor, move ou remove-os antes de trocar de ramos." -#: unpack-trees.c:136 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -"Os seguintes ficheiros não controlados na árvore de trabalho seriam " -"removidos ao extrair:\n" +"Os seguintes ficheiros por seguir da worktree seriam removidos no checkout:\n" "%%s" -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -"Os seguintes ficheiros não controlados na árvore de trabalho seriam " -"removidos ao integrar:\n" -"%%sPor favor, mova ou remova-os antes de integrar." +"Os seguintes ficheiros por seguir da worktree seriam removidos por uma " +"junção:\n" +"%%sPor favor, move ou remove-os antes da junção." -#: unpack-trees.c:141 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -"Os seguintes ficheiros não controlados na árvore de trabalho seriam " -"removidos ao integrar:\n" +"Os seguintes ficheiros por seguir da worktree seriam removidos pela junção:\n" "%%s" -#: unpack-trees.c:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -"Os seguintes ficheiros não controlados na árvore de trabalho seriam " -"removidos por %s:\n" -"%%sMova ou remova-os antes de efetuar %s." +"Os seguintes ficheiros por seguir da worktree seriam removidos por %s:\n" +"%%sPor favor, move ou remove-os antes de fazer %s." -#: unpack-trees.c:146 +#: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -"Os seguintes ficheiros não controlados na árvore de trabalho seriam " -"removidos por %s:\n" +"Os seguintes ficheiros por seguir da árvore de trabalho seriam removidos por " +"%s:\n" "%%s" -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, 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 "" -"Os seguintes ficheiros não controlados da árvore de trabalho seriam " -"substituídos ao extrair:\n" -"%%sMova ou remova-os antes de trocar de ramos." +"Os seguintes ficheiros por seguir da árvore de trabalho seriam substituídos " +"por um checkout:\n" +"%%sPor favor, move ou remove-os antes de trocar de ramos." -#: unpack-trees.c:154 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by " "checkout:\n" "%%s" msgstr "" -"Os seguintes ficheiros não controlados da árvore de trabalho seriam " -"substituídos ao extrair:\n" +"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por " +"checkout:\n" "%%s" -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -"Os seguintes ficheiros não controlados da árvore de trabalho seriam " -"substituídos ao integrar:\n" -"%%sMova ou remova-os antes de integrar." +"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por " +"junção:\n" +"%%sPor favor, move ou remove-os antes de juntares." -#: unpack-trees.c:159 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -"Os seguintes ficheiros não controlados da árvore de trabalho seriam " -"substituídos ao integrar:\n" +"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por " +"junção:\n" "%%s" -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -"Os seguintes ficheiros não controlados da árvore de trabalho seriam " -"substituídos por %s:\n" -"%%sMova ou remova-os antes de efetuar %s." +"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por %s:\n" +"%%sPor favor, move ou remove-os antes de fazer %s." -#: unpack-trees.c:164 +#: unpack-trees.c:166 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -"Os seguintes ficheiros não controlados da árvore de trabalho seriam " -"substituídos por %s:\n" +"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por %s:\n" "%%s" -#: unpack-trees.c:172 +#: unpack-trees.c:174 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Entrada '%s' sobrepõe-se a '%s'. Impossível vincular." -#: unpack-trees.c:175 +#: unpack-trees.c:177 #, c-format msgid "" "Cannot update submodule:\n" @@ -9077,7 +9515,7 @@ msgstr "" "Impossível atualizar submódulo:\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:180 #, c-format msgid "" "The following paths are not up to date and were left despite sparse " @@ -9085,7 +9523,7 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:180 +#: unpack-trees.c:182 #, fuzzy, c-format msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" @@ -9095,7 +9533,7 @@ msgstr "" "patterns:\n" "%s" -#: unpack-trees.c:182 +#: unpack-trees.c:184 #, c-format msgid "" "The following paths were already present and thus not updated despite sparse " @@ -9103,36 +9541,41 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:262 +#: unpack-trees.c:264 #, c-format msgid "Aborting\n" msgstr "A abortar\n" -#: unpack-trees.c:289 +#: unpack-trees.c:291 #, c-format msgid "" "After fixing the above paths, you may want to run `git sparse-checkout " "reapply`.\n" msgstr "" -#: unpack-trees.c:350 +#: unpack-trees.c:352 #, fuzzy msgid "Updating files" -msgstr "A atualizar %s" +msgstr "Atualizando ficheiros" -#: unpack-trees.c:382 +#: unpack-trees.c:384 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" "colliding group is in the working tree:\n" msgstr "" -#: unpack-trees.c:1498 +#: unpack-trees.c:1618 #, fuzzy msgid "Updating index flags" -msgstr "A atualizar %s" +msgstr "Atualizando flags de cenário" -#: upload-pack.c:1550 +#: unpack-trees.c:2707 +#, c-format +msgid "worktree and untracked commit have duplicate entries: %s" +msgstr "" + +#: upload-pack.c:1548 msgid "expected flush after fetch arguments" msgstr "" @@ -9147,11 +9590,11 @@ msgstr "sequencia de escape %XX inválida" #: urlmatch.c:215 msgid "missing host and scheme is not 'file:'" -msgstr "sistema anfitrião não indicado e o esquema não é do tipo 'file:'" +msgstr "faltando host e o esquema é diferente de 'file:'" #: urlmatch.c:232 msgid "a 'file:' URL may not have a port number" -msgstr "um URL do tipo 'file:' não pode ter um número de porta" +msgstr "um URL 'file:' tem de estar sem número de porta" #: urlmatch.c:247 msgid "invalid characters in host name" @@ -9168,97 +9611,134 @@ msgstr "segmento de caminho '..' inválido" #: walker.c:170 #, fuzzy msgid "Fetching objects" -msgstr "A verificar objetos" +msgstr "Buscando objetos" -#: worktree.c:236 builtin/am.c:2103 +#: worktree.c:236 builtin/am.c:2152 #, c-format msgid "failed to read '%s'" msgstr "falha ao ler '%s'" -#: worktree.c:283 +#: worktree.c:303 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" -#: worktree.c:294 +#: worktree.c:314 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" -#: worktree.c:306 +#: worktree.c:326 #, fuzzy, c-format msgid "'%s' does not exist" -msgstr "o caminho '%s' não existe" +msgstr "'%s' é inexistente" -#: worktree.c:312 +#: worktree.c:332 #, fuzzy, c-format msgid "'%s' is not a .git file, error code %d" -msgstr "'%s' não está trancada" +msgstr "'%s' é ficheiro .git nenhum, código de erro %d" -#: worktree.c:321 +#: worktree.c:341 #, fuzzy, c-format msgid "'%s' does not point back to '%s'" -msgstr "'%s' não aponta para um commit" +msgstr "'%s' aponta para algo diferente de '%s'" -#: worktree.c:587 +#: worktree.c:603 #, fuzzy msgid "not a directory" msgstr "é pasta nenhuma" -#: worktree.c:596 +#: worktree.c:612 #, fuzzy msgid ".git is not a file" msgstr "git show %s: ficheiro incorreto" -#: worktree.c:598 +#: worktree.c:614 msgid ".git file broken" msgstr "" -#: worktree.c:600 +#: worktree.c:616 #, fuzzy msgid ".git file incorrect" -msgstr "ficheiro de índice corrompido" +msgstr "" -#: worktree.c:670 +#: worktree.c:722 #, fuzzy msgid "not a valid path" -msgstr "nome de objeto inválido: %s" +msgstr "" -#: worktree.c:676 +#: worktree.c:728 #, fuzzy msgid "unable to locate repository; .git is not a file" -msgstr "não é possível escrever ficheiro de índice temporário" +msgstr "incapaz localizar repositório; .git é diferente de ficheiro" -#: worktree.c:679 +#: worktree.c:732 +#, fuzzy +msgid "unable to locate repository; .git file does not reference a repository" +msgstr "incapaz localizar repositório; .git é diferente de ficheiro" + +#: worktree.c:736 #, fuzzy msgid "unable to locate repository; .git file broken" -msgstr "não é possível escrever ficheiro de índice temporário" +msgstr "incapaz localizar repositório; .git está quebrado" -#: worktree.c:685 +#: worktree.c:742 msgid "gitdir unreadable" msgstr "" -#: worktree.c:689 +#: worktree.c:746 msgid "gitdir incorrect" msgstr "" +#: worktree.c:771 +#, fuzzy +msgid "not a valid directory" +msgstr "" + +#: worktree.c:777 +#, fuzzy +msgid "gitdir file does not exist" +msgstr "ficheiro gitdir é inexistente" + +#: worktree.c:782 worktree.c:791 +#, fuzzy, c-format +msgid "unable to read gitdir file (%s)" +msgstr "incapaz ler ficheiro gitdir (%s)" + +#: worktree.c:801 +#, c-format +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "" + +#: worktree.c:809 +#, fuzzy +msgid "invalid gitdir file" +msgstr "linha de Data inválida" + +#: worktree.c:817 +#, fuzzy +msgid "gitdir file points to non-existent location" +msgstr "" +"A remover worktrees/%s: o ficheiro gitdir aponta para uma localização " +"inexistente" + #: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" -msgstr "não foi possível abrir '%s' para leitura e escrita" +msgstr "incapaz abrir '%s' para leitura e escrita" #: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" -msgstr "não é possível aceder a '%s'" +msgstr "incapaz aceder '%s'" #: wrapper.c:607 msgid "unable to get current working directory" -msgstr "não é possível de obter o diretório de trabalho atual" +msgstr "incapaz obter pasta atual de trabalho" #: wt-status.c:158 msgid "Unmerged paths:" -msgstr "Caminhos não integrados:" +msgstr "Paths por juntar:" #: wt-status.c:187 wt-status.c:219 #, fuzzy @@ -9288,13 +9768,13 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (use \"git rm <ficheiro>...\" para marcar como resolvido)" -#: wt-status.c:211 wt-status.c:1070 +#: wt-status.c:211 wt-status.c:1125 msgid "Changes to be committed:" msgstr "Alterações para serem submetidas:" -#: wt-status.c:234 wt-status.c:1079 +#: wt-status.c:234 wt-status.c:1134 msgid "Changes not staged for commit:" -msgstr "Alterações não preparadas para submeter:" +msgstr "Alterações por preparar para commit:" #: wt-status.c:238 msgid " (use \"git add <file>...\" to update what will be committed)" @@ -9316,8 +9796,7 @@ msgstr "" #: wt-status.c:243 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -" (submeta ou descarte o conteúdo modificado ou não controlado nos " -"submódulos)" +" (faz commit ou descarta o conteúdo por seguir ou modificado nos submódulos)" #: wt-status.c:254 #, c-format @@ -9382,7 +9861,7 @@ msgstr "desconhecido:" #: wt-status.c:302 msgid "unmerged:" -msgstr "não integrado:" +msgstr "por juntar:" #: wt-status.c:382 msgid "new commits, " @@ -9394,24 +9873,24 @@ msgstr "conteúdo modificado, " #: wt-status.c:386 msgid "untracked content, " -msgstr "conteúdo não controlado, " +msgstr "conteúdo por seguir, " -#: wt-status.c:903 +#: wt-status.c:958 #, fuzzy, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Está a rebasear neste momento." msgstr[1] "Está a rebasear neste momento." -#: wt-status.c:934 +#: wt-status.c:989 msgid "Submodules changed but not updated:" -msgstr "Submódulos alterados mas não atualizados:" +msgstr "Submódulos alterados mas desatualizados:" -#: wt-status.c:936 +#: wt-status.c:991 msgid "Submodule changes to be committed:" msgstr "Alterações em submódulos para serem submetidas:" -#: wt-status.c:1018 +#: wt-status.c:1073 #, fuzzy msgid "" "Do not modify or remove the line above.\n" @@ -9420,7 +9899,7 @@ msgstr "" "Deixe estar a linha acima.\n" "Tudo abaixo será ignorado." -#: wt-status.c:1110 +#: wt-status.c:1165 #, c-format msgid "" "\n" @@ -9428,108 +9907,108 @@ msgid "" "You can use '--no-ahead-behind' to avoid this.\n" msgstr "" -#: wt-status.c:1140 +#: wt-status.c:1195 msgid "You have unmerged paths." -msgstr "Há caminhos não integrados." +msgstr "Tens paths por juntar." -#: wt-status.c:1143 +#: wt-status.c:1198 msgid " (fix conflicts and run \"git commit\")" msgstr " (corrija os conflitos e execute \"git commit\")" -#: wt-status.c:1145 +#: wt-status.c:1200 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (use \"git am --abort\" para abortar a integração)" -#: wt-status.c:1149 +#: wt-status.c:1204 msgid "All conflicts fixed but you are still merging." msgstr "Todos os conflitos foram corrigidos mas ainda está a integrar." -#: wt-status.c:1152 +#: wt-status.c:1207 msgid " (use \"git commit\" to conclude merge)" msgstr " (use \"git commit\" para concluir a integração)" -#: wt-status.c:1161 +#: wt-status.c:1216 msgid "You are in the middle of an am session." msgstr "Sessão am em curso." -#: wt-status.c:1164 +#: wt-status.c:1219 msgid "The current patch is empty." msgstr "O patch atual está vazio." -#: wt-status.c:1168 +#: wt-status.c:1223 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (corrija os conflitos e execute \"git am --continue\")" -#: wt-status.c:1170 +#: wt-status.c:1225 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (use \"git am --skip\" para ignorar este patch)" -#: wt-status.c:1172 +#: wt-status.c:1227 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (use \"git am --abort\" para restaurar o ramo original)" -#: wt-status.c:1305 +#: wt-status.c:1360 msgid "git-rebase-todo is missing." -msgstr "git-rebase-todo não existe." +msgstr "git-rebase-todo está faltando." -#: wt-status.c:1307 +#: wt-status.c:1362 msgid "No commands done." -msgstr "Nenhum comando concluído." +msgstr "Comando nenhum concluído." -#: wt-status.c:1310 +#: wt-status.c:1365 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Último comando concluído (%d comando concluído):" msgstr[1] "Últimos comandos concluídos (%d comandos concluídos):" -#: wt-status.c:1321 +#: wt-status.c:1376 #, c-format msgid " (see more in file %s)" msgstr " (veja mais no ficheiro %s)" -#: wt-status.c:1326 +#: wt-status.c:1381 msgid "No commands remaining." msgstr "Nenhum comando por concluir." -#: wt-status.c:1329 +#: wt-status.c:1384 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Próximo comando a executar (%d comando restante):" msgstr[1] "Próximos comandos a executar (%d comandos restantes):" -#: wt-status.c:1337 +#: wt-status.c:1392 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (use \"git rebase --edit-todo\" para visualizar e editar)" -#: wt-status.c:1349 +#: wt-status.c:1404 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Está a realizar rebase do ramo '%s' sobre '%s'." -#: wt-status.c:1354 +#: wt-status.c:1409 msgid "You are currently rebasing." msgstr "Está a rebasear neste momento." -#: wt-status.c:1367 +#: wt-status.c:1422 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (corrija os conflitos e execute \"git rebase --continue\")" -#: wt-status.c:1369 +#: wt-status.c:1424 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (use \"git rebase --skip\" para ignorar este patch)" -#: wt-status.c:1371 +#: wt-status.c:1426 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (use \"git rebase --abort\" para restaurar o ramo original)" -#: wt-status.c:1378 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (todos os conflitos foram corrigidos: execute \"git rebase --continue\")" -#: wt-status.c:1382 +#: wt-status.c:1437 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -9537,395 +10016,432 @@ msgstr "" "Está a dividir um commit ao mesmo tempo que se efetua rebase do ramo '%s' " "sobre '%s'." -#: wt-status.c:1387 +#: wt-status.c:1442 msgid "You are currently splitting a commit during a rebase." msgstr "Está a dividir um commit durante um rebase." -#: wt-status.c:1390 +#: wt-status.c:1445 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Assim que o diretório de trabalho estiver limpo, execute \"git rebase --" "continue\")" -#: wt-status.c:1394 +#: wt-status.c:1449 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Está a editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre " "'%s'." -#: wt-status.c:1399 +#: wt-status.c:1454 msgid "You are currently editing a commit during a rebase." msgstr "Está a editar um commit durante um rebase." -#: wt-status.c:1402 +#: wt-status.c:1457 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (use \"git commit --amend\" para emendar o commit atual)" -#: wt-status.c:1404 +#: wt-status.c:1459 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (use \"git rebase --continue\" assim que estiver satisfeito com as " "alterações)" -#: wt-status.c:1415 +#: wt-status.c:1470 #, fuzzy msgid "Cherry-pick currently in progress." msgstr "Cherry-pick atualmente em curso" -#: wt-status.c:1418 +#: wt-status.c:1473 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Está a realizar cherry-pick do commit %s." -#: wt-status.c:1425 +#: wt-status.c:1480 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (corrija os conflitos e execute \"git cherry-pick --continue\")" -#: wt-status.c:1428 +#: wt-status.c:1483 #, fuzzy msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (corrija os conflitos e execute \"git cherry-pick --continue\")" -#: wt-status.c:1431 +#: wt-status.c:1486 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (todos os conflitos foram corrigidos: execute \"git cherry-pick --continue" "\")" -#: wt-status.c:1433 +#: wt-status.c:1488 #, fuzzy msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (use \"git am --skip\" para ignorar este patch)" -#: wt-status.c:1435 +#: wt-status.c:1490 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (use \"git cherry-pick --abort\" para cancelar a operação de cherry-pick)" -#: wt-status.c:1445 +#: wt-status.c:1500 #, fuzzy msgid "Revert currently in progress." msgstr "abortar integração em curso" -#: wt-status.c:1448 +#: wt-status.c:1503 #, c-format msgid "You are currently reverting commit %s." msgstr "Está a reverter o commit %s neste comento." -#: wt-status.c:1454 +#: wt-status.c:1509 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (corrija dos conflitos e execute \"git revert --continue\")" -#: wt-status.c:1457 +#: wt-status.c:1512 #, fuzzy msgid " (run \"git revert --continue\" to continue)" msgstr " (corrija dos conflitos e execute \"git revert --continue\")" -#: wt-status.c:1460 +#: wt-status.c:1515 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (todos os conflitos foram corrigidos: execute \"git revert --continue\")" -#: wt-status.c:1462 +#: wt-status.c:1517 #, fuzzy msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (use \"git rebase --skip\" para ignorar este patch)" -#: wt-status.c:1464 +#: wt-status.c:1519 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (use \"git rever --abort\" para cancelar a operação de reversão)" -#: wt-status.c:1474 +#: wt-status.c:1529 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Está a bissetar, iniciado a partir do ramo '%s'." -#: wt-status.c:1478 +#: wt-status.c:1533 msgid "You are currently bisecting." msgstr "Está a bissetar neste momento." -#: wt-status.c:1481 +#: wt-status.c:1536 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (use \"git bisect reset\" para voltar ao ramo original)" -#: wt-status.c:1492 +#: wt-status.c:1547 +#, fuzzy +msgid "You are in a sparse checkout." +msgstr "Estás num checkout disperso." + +#: wt-status.c:1550 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "" -#: wt-status.c:1731 +#: wt-status.c:1794 msgid "On branch " msgstr "No ramo " -#: wt-status.c:1738 +#: wt-status.c:1801 msgid "interactive rebase in progress; onto " msgstr "rebase interativo em curso; sobre " -#: wt-status.c:1740 +#: wt-status.c:1803 msgid "rebase in progress; onto " msgstr "rebase em curso; sobre " -#: wt-status.c:1750 +#: wt-status.c:1808 +msgid "HEAD detached at " +msgstr "HEAD destacada em " + +#: wt-status.c:1810 +msgid "HEAD detached from " +msgstr "HEAD destacada de " + +#: wt-status.c:1813 msgid "Not currently on any branch." msgstr "Atualmente em ramo nenhum." -#: wt-status.c:1767 +#: wt-status.c:1830 msgid "Initial commit" msgstr "Memória inicial" -#: wt-status.c:1768 +#: wt-status.c:1831 #, fuzzy msgid "No commits yet" msgstr "Ainda commits nenhuns" -#: wt-status.c:1782 +#: wt-status.c:1845 msgid "Untracked files" -msgstr "Ficheiros não controlados" +msgstr "Ficheiros por seguir" -#: wt-status.c:1784 +#: wt-status.c:1847 msgid "Ignored files" msgstr "Ficheiros ignorados" -#: wt-status.c:1788 +#: wt-status.c:1851 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" "may speed it up, but you have to be careful not to forget to add\n" "new files yourself (see 'git help status')." msgstr "" -"A enumeração dos ficheiros não controlados demorou %.2f segundos\n" -"a concluir. 'status -uno' pode acelerar o processo, mas deve ter\n" -"cuidado de não se esquecer de adicionar novos ficheiros\n" -"(consulte 'git help status')." +"A enumeração dos ficheiros por controlar demorou %.2f segundos.\n" +"'status -uno' pode-o acelerar, mas tens de te lembrar de adicionares\n" +"os novos ficheiros (vê 'git help status')." -#: wt-status.c:1794 +#: wt-status.c:1857 #, c-format msgid "Untracked files not listed%s" -msgstr "Ficheiros não controlados não listados%s" +msgstr "Ficheiros por seguir fora da listagem%s" -#: wt-status.c:1796 +#: wt-status.c:1859 msgid " (use -u option to show untracked files)" -msgstr " (use a opção -u para mostrar os ficheiros não controlados)" +msgstr " (usa opção -u para mostrar ficheiros por seguir)" -#: wt-status.c:1802 +#: wt-status.c:1865 msgid "No changes" msgstr "Sem alterações" -#: wt-status.c:1807 +#: wt-status.c:1870 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" -msgstr "foi adicionado a commit alteração nenhuma (usa \"git add\" e/ou \"git " -"commit -a\")\n" +msgstr "" +"foi adicionado a commit alteração nenhuma (usa \"git add\" e/ou \"git commit " +"-a\")\n" -#: wt-status.c:1811 +#: wt-status.c:1874 #, c-format msgid "no changes added to commit\n" msgstr "foi adicionado a commit alteração nenhuma\n" -#: wt-status.c:1815 +#: wt-status.c:1878 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -"nada adicionado para commit mas há ficheiros por seguir presentes (usa" -"(\"git add\" para seguir)\n" +"nada adicionado para commit mas há ficheiros por seguir presentes (usa(\"git " +"add\" para seguir)\n" -#: wt-status.c:1819 +#: wt-status.c:1882 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "nada adicionado para commit mas ficheiros por seguir presentes\n" -#: wt-status.c:1823 +#: wt-status.c:1886 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "nada a commit (cria/copia ficheiros e usa \"git add\" para seguir)\n" -#: wt-status.c:1827 wt-status.c:1833 +#: wt-status.c:1890 wt-status.c:1896 #, c-format msgid "nothing to commit\n" msgstr "nada a commit\n" -#: wt-status.c:1830 +#: wt-status.c:1893 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "nada a commit (use -u para mostrar ficheiros por seguir)\n" -#: wt-status.c:1835 +#: wt-status.c:1898 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "nada a commitar, worktree limpa\n" -#: wt-status.c:1940 +#: wt-status.c:2003 #, fuzzy msgid "No commits yet on " -msgstr "Nenhum comando concluído." +msgstr "Memórias nenhumas em " -#: wt-status.c:1944 +#: wt-status.c:2007 msgid "HEAD (no branch)" msgstr "HEAD (ramo nenhum)" -#: wt-status.c:1975 +#: wt-status.c:2038 msgid "different" msgstr "diferente" -#: wt-status.c:1977 wt-status.c:1985 +#: wt-status.c:2040 wt-status.c:2048 msgid "behind " msgstr "atrás " -#: wt-status.c:1980 wt-status.c:1983 +#: wt-status.c:2043 wt-status.c:2046 msgid "ahead " msgstr "à frente " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2505 +#: wt-status.c:2569 #, c-format msgid "cannot %s: You have unstaged changes." -msgstr "não é possível efetuar %s: tem alterações não preparadas." +msgstr "incapaz efetuar %s: Tens alterações despreparadas." -#: wt-status.c:2511 +#: wt-status.c:2575 msgid "additionally, your index contains uncommitted changes." -msgstr "além disso, o índice contém alterações não submetidas." +msgstr "além disso, teu index contém alterações por memorizar." -#: wt-status.c:2513 +#: wt-status.c:2577 #, c-format msgid "cannot %s: Your index contains uncommitted changes." -msgstr "não é possível efetuar %s: o índice contém alterações não submetidas." +msgstr "incapaz efetuar %s: teu index contém alterações por memorizar." + +#: compat/simple-ipc/ipc-unix-socket.c:182 +#, fuzzy +msgid "could not send IPC command" +msgstr "incapaz encontrar commit %s" + +#: compat/simple-ipc/ipc-unix-socket.c:189 +#, fuzzy +msgid "could not read IPC response" +msgstr "incapaz de ler ref %s" + +#: compat/simple-ipc/ipc-unix-socket.c:866 +#, fuzzy, c-format +msgid "could not start accept_thread '%s'" +msgstr "" + +#: compat/simple-ipc/ipc-unix-socket.c:878 +#, fuzzy, c-format +msgid "could not start worker[0] for '%s'" +msgstr "incapaz analisar log para '%s'" -#: compat/precompose_utf8.c:58 builtin/clone.c:457 +#: compat/precompose_utf8.c:58 builtin/clone.c:461 #, c-format msgid "failed to unlink '%s'" -msgstr "falha ao invocar unlink de '%s'" +msgstr "falha ao unlink '%s'" #: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opções>] [--] <caminho>..." -#: builtin/add.c:88 +#: builtin/add.c:61 +#, fuzzy, c-format +msgid "cannot chmod %cx '%s'" +msgstr "incapaz chdir para '%s'" + +#: builtin/add.c:99 #, c-format msgid "unexpected diff status %c" msgstr "diff status inesperado %c" -#: builtin/add.c:93 builtin/commit.c:285 +#: builtin/add.c:104 builtin/commit.c:297 msgid "updating files failed" msgstr "falha ao atualizar os ficheiros" -#: builtin/add.c:103 +#: builtin/add.c:114 #, c-format msgid "remove '%s'\n" msgstr "remove '%s'\n" -#: builtin/add.c:178 +#: builtin/add.c:198 msgid "Unstaged changes after refreshing the index:" -msgstr "Alterações não preparadas depois de atualizar o índice:" +msgstr "Alterações despreparadas após refrescar index:" -#: builtin/add.c:272 builtin/rev-parse.c:908 +#: builtin/add.c:307 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "Incapaz ler o index" -#: builtin/add.c:283 +#: builtin/add.c:318 #, c-format msgid "Could not open '%s' for writing." msgstr "Incapaz de abrir '%s' para escrita." -#: builtin/add.c:287 +#: builtin/add.c:322 msgid "Could not write patch" msgstr "Incapaz de escrever patch" -#: builtin/add.c:290 +#: builtin/add.c:325 msgid "editing patch failed" msgstr "edição de patch falhou" -#: builtin/add.c:293 +#: builtin/add.c:328 #, c-format msgid "Could not stat '%s'" msgstr "Impossível fazer stat de '%s'" -#: builtin/add.c:295 +#: builtin/add.c:330 msgid "Empty patch. Aborted." msgstr "Patch vazio. Abortado." -#: builtin/add.c:300 +#: builtin/add.c:335 #, c-format msgid "Could not apply '%s'" msgstr "Impossível submeter '%s'" -#: builtin/add.c:308 +#: builtin/add.c:343 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Os seguintes caminhos estão ignorados por algum ficheiro .gitignore:\n" -#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 -#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 +#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550 +#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 msgid "dry run" msgstr "simular ação" -#: builtin/add.c:331 +#: builtin/add.c:366 msgid "interactive picking" msgstr "seleção interativa" -#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 msgid "select hunks interactively" msgstr "selecionar blocos interativamente" -#: builtin/add.c:333 +#: builtin/add.c:368 msgid "edit current diff and apply" msgstr "editar o diff atual e aplicá-lo" -#: builtin/add.c:334 +#: builtin/add.c:369 msgid "allow adding otherwise ignored files" msgstr "permitir adicionar ficheiros ignorados" -#: builtin/add.c:335 +#: builtin/add.c:370 msgid "update tracked files" msgstr "atualizar ficheiros controlados" -#: builtin/add.c:336 +#: builtin/add.c:371 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" -#: builtin/add.c:337 +#: builtin/add.c:372 msgid "record only the fact that the path will be added later" msgstr "registar apenas o facto de que o caminho será adicionado mais tarde" -#: builtin/add.c:338 +#: builtin/add.c:373 msgid "add changes from all tracked and untracked files" msgstr "" -"adicionar alterações de todos os ficheiros controlados ou não controlados" +"adicionar alterações de todos ficheiros seguidos e ficheiros por seguir" -#: builtin/add.c:341 +#: builtin/add.c:376 msgid "ignore paths removed in the working tree (same as --no-all)" -msgstr "" -"ignorar caminhos removidos na árvore de trabalho (o mesmo que --no-all)" +msgstr "ignorar paths removidos na worktree (o mesmo que --no-all)" -#: builtin/add.c:343 +#: builtin/add.c:378 msgid "don't add, only refresh the index" -msgstr "não adicionar, apenas atualizar o índice" +msgstr "deixa de adicionar, apenas atualiza o index" -#: builtin/add.c:344 +#: builtin/add.c:379 msgid "just skip files which cannot be added because of errors" -msgstr "ignorar ficheiros que não podem ser adicionados por causa de erros" +msgstr "apenas ignora ficheiros que, por causa de erros, ficam por adicionar" -#: builtin/add.c:345 +#: builtin/add.c:380 msgid "check if - even missing - files are ignored in dry run" msgstr "verificar quais os ficheiros ignorados na simulação" -#: builtin/add.c:347 builtin/update-index.c:1004 +#: builtin/add.c:382 builtin/update-index.c:1006 msgid "override the executable bit of the listed files" msgstr "substituir o bit executável dos ficheiros listados" -#: builtin/add.c:349 +#: builtin/add.c:384 #, fuzzy msgid "warn when adding an embedded repository" msgstr "criar um repositório nu" -#: builtin/add.c:351 +#: builtin/add.c:386 msgid "backend for `git stash -p`" msgstr "" -#: builtin/add.c:369 +#: builtin/add.c:404 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9943,172 +10459,175 @@ msgid "" "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:397 +#: builtin/add.c:432 #, fuzzy, c-format msgid "adding embedded git repository: %s" msgstr "--stdin requer um repositório git" -#: builtin/add.c:416 +#: builtin/add.c:451 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" "\"git config advice.addIgnoredFile false\"" msgstr "" -#: builtin/add.c:425 +#: builtin/add.c:460 msgid "adding files failed" msgstr "falha ao adicionar ficheiros" -#: builtin/add.c:453 builtin/commit.c:345 +#: builtin/add.c:488 +#, fuzzy +msgid "--dry-run is incompatible with --interactive/--patch" +msgstr "" + +#: builtin/add.c:490 builtin/commit.c:357 #, fuzzy msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "--first-parent é incompatível com --bisect" +msgstr "" -#: builtin/add.c:470 +#: builtin/add.c:507 #, fuzzy msgid "--pathspec-from-file is incompatible with --edit" -msgstr "--first-parent é incompatível com --bisect" +msgstr "" -#: builtin/add.c:482 +#: builtin/add.c:519 msgid "-A and -u are mutually incompatible" msgstr "-A e -u são mutuamente incompatíveis" -#: builtin/add.c:485 +#: builtin/add.c:522 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "A opção --ignore-missing só pode ser usada em conjunto com --dry-run" -#: builtin/add.c:489 +#: builtin/add.c:526 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "o parâmetro '%s' de --chmod tem de ser -x ou +x" -#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502 +#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 +#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633 #, fuzzy msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--patch é incompatível com --{hard,mixed,soft}" -#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508 +#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 +#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "" -#: builtin/add.c:518 +#: builtin/add.c:555 #, c-format msgid "Nothing specified, nothing added.\n" msgstr ".\n" -#: builtin/add.c:520 +#: builtin/add.c:557 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" "\"git config advice.addEmptyPathspec false\"" msgstr "" -#: builtin/am.c:352 +#: builtin/am.c:365 msgid "could not parse author script" -msgstr "não foi possível analisar o autor do script" +msgstr "incapaz processar script de autor" -#: builtin/am.c:436 +#: builtin/am.c:455 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' foi eliminado pelo hook applypatch-msg" -#: builtin/am.c:478 +#: builtin/am.c:497 #, c-format msgid "Malformed input line: '%s'." msgstr "Linha de entrada malformada: '%s'." -#: builtin/am.c:516 +#: builtin/am.c:535 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Falha ao copiar notas de '%s' para '%s'" -#: builtin/am.c:542 +#: builtin/am.c:561 msgid "fseek failed" -msgstr "falha ao invocar fseek" +msgstr "falha de fseek" -#: builtin/am.c:730 +#: builtin/am.c:749 #, c-format msgid "could not parse patch '%s'" -msgstr "não foi possível analisar o patch '%s'" +msgstr "incapaz processar patch '%s'" -#: builtin/am.c:795 +#: builtin/am.c:814 msgid "Only one StGIT patch series can be applied at once" msgstr "Só pode ser aplicada uma série de patches StGIT duma só vez" -#: builtin/am.c:843 +#: builtin/am.c:862 msgid "invalid timestamp" msgstr "carimbo de data/hora inválido" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:867 builtin/am.c:879 msgid "invalid Date line" msgstr "linha de Data inválida" -#: builtin/am.c:855 +#: builtin/am.c:874 msgid "invalid timezone offset" msgstr "mudança de fuso horário inválida" -#: builtin/am.c:948 +#: builtin/am.c:967 msgid "Patch format detection failed." msgstr "Falha ao detetar o formato do patch." -#: builtin/am.c:953 builtin/clone.c:410 +#: builtin/am.c:972 builtin/clone.c:414 #, c-format msgid "failed to create directory '%s'" msgstr "falha ao criar o diretório '%s'" -#: builtin/am.c:958 +#: builtin/am.c:977 msgid "Failed to split patches." msgstr "Falha ao dividir patches." -#: builtin/am.c:1089 +#: builtin/am.c:1126 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Após resolver este problema, execute \"%s --continue\"." -#: builtin/am.c:1090 +#: builtin/am.c:1127 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Se preferir ignorar este patch, execute \"%s --skip\"." -#: builtin/am.c:1091 +#: builtin/am.c:1128 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Para restaurar o ramo original e interromper a aplicação dos patches, " "execute \"%s --abort\"." -#: builtin/am.c:1174 +#: builtin/am.c:1223 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -#: builtin/am.c:1202 +#: builtin/am.c:1251 #, fuzzy msgid "Patch is empty." msgstr "O patch atual está vazio." -#: builtin/am.c:1267 +#: builtin/am.c:1316 #, fuzzy, c-format msgid "missing author line in commit %s" msgstr "Autor em falta: %s" -#: builtin/am.c:1270 +#: builtin/am.c:1319 #, fuzzy, c-format msgid "invalid ident line: %.*s" -msgstr "linha de identidade inválida: %s" +msgstr "linha de indentação inválida: %.*s" -#: builtin/am.c:1489 +#: builtin/am.c:1538 msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "" -"O repositório não tem os blobs necessários para recorrer a integração com 3 " -"pontos." +msgstr "Repositório falta blobs necessários para recorrer à tri-junção." -#: builtin/am.c:1491 +#: builtin/am.c:1540 msgid "Using index info to reconstruct a base tree..." msgstr "A usar informação do índice para reconstruir uma árvore de base..." -#: builtin/am.c:1510 +#: builtin/am.c:1559 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10116,26 +10635,26 @@ msgstr "" "Editaste o patch manualmente?\n" "No registo de index, aplica-se a blobs nenhuns." -#: builtin/am.c:1516 +#: builtin/am.c:1565 msgid "Falling back to patching base and 3-way merge..." msgstr "" "A recorrer a uma de base para aplicação de patches e integração com 3 " "pontos..." -#: builtin/am.c:1542 +#: builtin/am.c:1591 msgid "Failed to merge in the changes." msgstr "Falha ao integrar as alterações." -#: builtin/am.c:1574 +#: builtin/am.c:1623 msgid "applying to an empty history" msgstr "a aplicar a um histórico vazio" -#: builtin/am.c:1626 builtin/am.c:1630 +#: builtin/am.c:1675 builtin/am.c:1679 #, c-format msgid "cannot resume: %s does not exist." -msgstr "não é possível continuar: %s não existe." +msgstr "incapaz continuar: %s é inexistente." -#: builtin/am.c:1648 +#: builtin/am.c:1697 msgid "Commit Body is:" msgstr "Corpo do commit:" @@ -10143,39 +10662,39 @@ msgstr "Corpo do commit:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1658 +#: builtin/am.c:1707 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Aplicar? [y]sim/[n]ão/[e]ditar/[v]er patch/[a]ceitar todos: " -#: builtin/am.c:1704 builtin/commit.c:395 +#: builtin/am.c:1753 builtin/commit.c:408 msgid "unable to write index file" -msgstr "não é possível escrever o ficheiro de índice" +msgstr "incapaz escrever ficheiro de index" -#: builtin/am.c:1708 +#: builtin/am.c:1757 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" -msgstr "Índice modificado: não é possível aplicar patches (modificado: %s)" +msgstr "Index sujo: incapaz aplicar patches (sujo: %s)" -#: builtin/am.c:1748 builtin/am.c:1816 +#: builtin/am.c:1797 builtin/am.c:1865 #, c-format msgid "Applying: %.*s" msgstr "A aplicar: %.*s" -#: builtin/am.c:1765 +#: builtin/am.c:1814 msgid "No changes -- Patch already applied." msgstr "Nenhuma alteração -- Já foi aplicado o patch." -#: builtin/am.c:1771 +#: builtin/am.c:1820 #, c-format msgid "Patch failed at %s %.*s" msgstr "Falha ao aplicar o patch em %s %.*s" -#: builtin/am.c:1775 +#: builtin/am.c:1824 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -#: builtin/am.c:1819 +#: builtin/am.c:1868 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10185,7 +10704,7 @@ msgstr "" "Se há mais nada por preparar, provavelmente essas mesmas alterações\n" "já foram introduzidas; poderás querer saltar este patch." -#: builtin/am.c:1826 +#: builtin/am.c:1875 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10193,17 +10712,17 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 +#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Incapaz analisar objeto '%s'." -#: builtin/am.c:1985 +#: builtin/am.c:2034 msgid "failed to clean index" -msgstr "falha ao limpar o índice" +msgstr "" -#: builtin/am.c:2029 +#: builtin/am.c:2078 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10211,176 +10730,183 @@ msgstr "" "Parece que moveste HEAD desde a última falha de 'am'.\n" "Recusando rebobinar até ORIG_HEAD" -#: builtin/am.c:2136 +#: builtin/am.c:2185 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor inválido de --patch-format: %s" -#: builtin/am.c:2178 +#: builtin/am.c:2227 #, fuzzy, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Valor inválido de --patch-format: %s" -#: builtin/am.c:2182 +#: builtin/am.c:2231 #, fuzzy, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -msgstr "--first-parent é incompatível com --bisect" +msgstr "" -#: builtin/am.c:2213 +#: builtin/am.c:2262 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opções>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2214 +#: builtin/am.c:2263 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opções>] (--continue | --skip | --abort)" -#: builtin/am.c:2220 +#: builtin/am.c:2269 msgid "run interactively" msgstr "executar interativamente" -#: builtin/am.c:2222 +#: builtin/am.c:2271 msgid "historical option -- no-op" msgstr "opção histórica -- sem-ação" -#: builtin/am.c:2224 +#: builtin/am.c:2273 msgid "allow fall back on 3way merging if needed" msgstr "permitir recorrer a integração com 3 pontos se necessário" -#: builtin/am.c:2225 builtin/init-db.c:558 builtin/prune-packed.c:16 -#: builtin/repack.c:335 builtin/stash.c:815 +#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:472 builtin/stash.c:945 msgid "be quiet" msgstr "silencioso" -#: builtin/am.c:2227 +#: builtin/am.c:2276 #, fuzzy msgid "add a Signed-off-by trailer to the commit message" msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit" -#: builtin/am.c:2230 +#: builtin/am.c:2279 msgid "recode into utf8 (default)" msgstr "recodificar em utf8 (predefinição)" -#: builtin/am.c:2232 +#: builtin/am.c:2281 msgid "pass -k flag to git-mailinfo" msgstr "passar a opção -k ao git-mailinfo" -#: builtin/am.c:2234 +#: builtin/am.c:2283 msgid "pass -b flag to git-mailinfo" msgstr "passar a opção -b ao git-mailinfo" -#: builtin/am.c:2236 +#: builtin/am.c:2285 msgid "pass -m flag to git-mailinfo" msgstr "passar a opção -m ao git-mailinfo" -#: builtin/am.c:2238 +#: builtin/am.c:2287 msgid "pass --keep-cr flag to git-mailsplit for mbox format" -msgstr "passar a opção --keep-cr ao gitmailsplit para formato de mbox" +msgstr "passar flag --keep-cr para git-mailsplit para formato mbox" -#: builtin/am.c:2241 +#: builtin/am.c:2290 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -"não passar a opção --keep-cr ao git-mailsplit independentemente de am.keepcr" +"proibido passares --keep-cr para git-mailsplit independentemente de am." +"keepcr" -#: builtin/am.c:2244 +#: builtin/am.c:2293 msgid "strip everything before a scissors line" msgstr "retirar todo o conteúdo antes da linha de tesoura" -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2273 -msgid "pass it through git-apply" +#: builtin/am.c:2295 +#, fuzzy +msgid "pass it through git-mailinfo" msgstr "transmitir ao git-apply" -#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260 +#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307 +#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319 +#: builtin/am.c:2325 +msgid "pass it through git-apply" +msgstr "passa-o pelo git-apply" + +#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350 -#: builtin/repack.c:352 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 +#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 +#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176 +#: parse-options.h:317 msgid "n" msgstr "n" -#: builtin/am.c:2269 builtin/branch.c:659 builtin/bugreport.c:136 -#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137 +#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 #: builtin/verify-tag.c:38 msgid "format" msgstr "formato" -#: builtin/am.c:2270 +#: builtin/am.c:2322 msgid "format the patch(es) are in" msgstr "formato de apresentação de patches" -#: builtin/am.c:2276 +#: builtin/am.c:2328 msgid "override error message when patch failure occurs" msgstr "substituir a mensagem de erro quando a aplicação do patch falha" -#: builtin/am.c:2278 +#: builtin/am.c:2330 msgid "continue applying patches after resolving a conflict" msgstr "continuar a aplicar os patches depois de resolver os conflitos" -#: builtin/am.c:2281 +#: builtin/am.c:2333 msgid "synonyms for --continue" msgstr "sinónimo de --continue" -#: builtin/am.c:2284 +#: builtin/am.c:2336 msgid "skip the current patch" -msgstr "ignorar o patch atual" +msgstr "ignorar remendo atual" -#: builtin/am.c:2287 -msgid "restore the original branch and abort the patching operation." +#: builtin/am.c:2339 +#, fuzzy +msgid "restore the original branch and abort the patching operation" msgstr "restaurar o ramo original e abortar a operação de patch." -#: builtin/am.c:2290 -msgid "abort the patching operation but keep HEAD where it is." +#: builtin/am.c:2342 +msgid "abort the patching operation but keep HEAD where it is" msgstr "" -#: builtin/am.c:2294 +#: builtin/am.c:2346 #, fuzzy msgid "show the patch being applied" -msgstr "mostrar linhas não correspondidas" +msgstr "mostrar linhas sendo submetidas" -#: builtin/am.c:2299 +#: builtin/am.c:2351 msgid "lie about committer date" msgstr "mentir sobre a data de commit" -#: builtin/am.c:2301 +#: builtin/am.c:2353 msgid "use current timestamp for author date" msgstr "usar a data e hora atual como data de autor" -#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 -#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536 -#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419 +#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640 +#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 +#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 msgid "key-id" msgstr "id-chave" -#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395 +#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396 msgid "GPG-sign commits" msgstr "assinar os commits com GPG" -#: builtin/am.c:2307 +#: builtin/am.c:2359 msgid "(internal use for git-rebase)" msgstr "(uso interno de git-rebase)" -#: builtin/am.c:2325 +#: builtin/am.c:2377 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" -"A opção -b/--binary há muito que é ignorada e será\n" -"futuramente removida. Por favor não a use." +"A opção -b/--binary há muito que é ignorada e será removida.\n" +"Por favor deixa de usá-la." -#: builtin/am.c:2332 +#: builtin/am.c:2384 msgid "failed to read the index" -msgstr "falha ao ler o índice" +msgstr "falhou ler cenário" -#: builtin/am.c:2347 +#: builtin/am.c:2399 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "o diretório de rebesa anterior %s ainda existe, mas foi fornecida uma mbox." -#: builtin/am.c:2371 +#: builtin/am.c:2423 #, c-format msgid "" "Stray %s directory found.\n" @@ -10389,11 +10915,11 @@ msgstr "" "Diretório abandonado %s encontrado.\n" "Use \"git am --abort\" para o remover." -#: builtin/am.c:2377 +#: builtin/am.c:2429 msgid "Resolve operation not in progress, we are not resuming." -msgstr "A operação de resolução não está em curso, não retomando." +msgstr "A operação de resolução está parada, continuará parada." -#: builtin/am.c:2387 +#: builtin/am.c:2439 msgid "interactive mode requires patches on the command line" msgstr "" @@ -10404,11 +10930,11 @@ msgstr "git apply [<opções>] [<patch>...]" #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" -msgstr "não foi possível criar o ficheiro de arquivo '%s'" +msgstr "incapaz criar ficheiro de arquivo '%s'" #: builtin/archive.c:20 msgid "could not redirect output" -msgstr "não foi possível redirecionar a saída" +msgstr "incapaz redirecionar a saída" #: builtin/archive.c:37 msgid "git archive: Remote with no URL" @@ -10435,25 +10961,13 @@ msgstr "git archive: esvaziamento de cache (flush) esperado" #: builtin/bisect--helper.c:23 #, fuzzy msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "git bisect--helper --next-all [--no-checkout]" - -#: builtin/bisect--helper.c:24 -msgid "" -"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " -"<bad_term>" msgstr "" -#: builtin/bisect--helper.c:25 -msgid "" -"git bisect--helper --bisect-check-and-set-terms <command> <good_term> " -"<bad_term>" -msgstr "" - -#: builtin/bisect--helper.c:26 +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:25 #, fuzzy msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" @@ -10462,101 +10976,106 @@ msgstr "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:26 msgid "" "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " "[<paths>...]" msgstr "" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:28 #, fuzzy msgid "git bisect--helper --bisect-next" -msgstr "git bisect--helper --next-all [--no-checkout]" - -#: builtin/bisect--helper.c:31 -#, fuzzy -msgid "git bisect--helper --bisect-auto-next" -msgstr "git bisect--helper --next-all [--no-checkout]" +msgstr "" -#: builtin/bisect--helper.c:32 +#: builtin/bisect--helper.c:29 #, fuzzy msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" -msgstr "git bisect--helper --next-all [--no-checkout]" +msgstr "" -#: builtin/bisect--helper.c:33 +#: builtin/bisect--helper.c:30 #, fuzzy msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" -msgstr "git bisect--helper --next-all [--no-checkout]" +msgstr "" + +#: builtin/bisect--helper.c:31 +#, fuzzy +msgid "git bisect--helper --bisect-replay <filename>" +msgstr "" + +#: builtin/bisect--helper.c:32 +#, fuzzy +msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" +msgstr "" -#: builtin/bisect--helper.c:108 +#: builtin/bisect--helper.c:107 #, fuzzy, c-format msgid "cannot open file '%s' in mode '%s'" -msgstr "não é possível abrir o ficheiro '%s'" +msgstr "incapaz abrir ficheiro '%s' em modo '%s'" -#: builtin/bisect--helper.c:115 +#: builtin/bisect--helper.c:114 #, fuzzy, c-format msgid "could not write to file '%s'" -msgstr "não foi possível escrever em '%s'" +msgstr "incapaz escrever para ficheiro '%s'" -#: builtin/bisect--helper.c:154 +#: builtin/bisect--helper.c:155 #, fuzzy, c-format msgid "'%s' is not a valid term" -msgstr "'%s' não é uma referência válida." +msgstr "'%s' é um termo inválido." -#: builtin/bisect--helper.c:158 +#: builtin/bisect--helper.c:159 #, fuzzy, c-format msgid "can't use the builtin command '%s' as a term" -msgstr "não é possível usar o comando '$term' como um termo" +msgstr "incapaz usar comando embutido '%s' como um termo" -#: builtin/bisect--helper.c:168 +#: builtin/bisect--helper.c:169 #, fuzzy, c-format msgid "can't change the meaning of the term '%s'" -msgstr "não é possível alterar o significado do termo '$term'" +msgstr "incapaz alterar o significado do termo '%s'" -#: builtin/bisect--helper.c:178 +#: builtin/bisect--helper.c:179 msgid "please use two different terms" msgstr "por favor, usa dois termos diferentes" -#: builtin/bisect--helper.c:194 +#: builtin/bisect--helper.c:195 #, fuzzy, c-format msgid "We are not bisecting.\n" msgstr "Estamos bissetando nada.\n" -#: builtin/bisect--helper.c:202 +#: builtin/bisect--helper.c:203 #, fuzzy, c-format msgid "'%s' is not a valid commit" -msgstr "'%s' não é um commit" +msgstr "'%s' é um commit inválido" -#: builtin/bisect--helper.c:211 +#: builtin/bisect--helper.c:212 #, fuzzy, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "" "pude check out HEAD original '%s' nenhuma. Tenta 'git bisect reset <commit>'." -#: builtin/bisect--helper.c:255 +#: builtin/bisect--helper.c:256 #, fuzzy, c-format msgid "Bad bisect_write argument: %s" msgstr "Argumento de bisect_write incorreto: $state" -#: builtin/bisect--helper.c:260 +#: builtin/bisect--helper.c:261 #, fuzzy, c-format msgid "couldn't get the oid of the rev '%s'" -msgstr "não foi possível criar o diretório de árvore de trabalho '%s'" +msgstr "incapaz obter oid da rev '%s'" -#: builtin/bisect--helper.c:272 +#: builtin/bisect--helper.c:273 #, fuzzy, c-format msgid "couldn't open the file '%s'" msgstr "incapaz abrir o ficheiro '%s'" -#: builtin/bisect--helper.c:298 +#: builtin/bisect--helper.c:299 #, fuzzy, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "" "Comando inválido: está-se a bissetar usando os termos $TERM_BAD/$TERM_GOOD." -#: builtin/bisect--helper.c:325 +#: builtin/bisect--helper.c:326 #, fuzzy, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10565,7 +11084,7 @@ msgstr "" "Deve indicar pelo menos uma revisão $bad_syn e uma revisão $good_syn.\n" "(Pode usar \"git bisect $bad_syn\" e \"git bisect $good_syn\" para esse fim.)" -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:330 #, fuzzy, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10576,7 +11095,7 @@ msgstr "" "Indique pelo menos uma revisão $good_syn e uma revisão $bad_syn.\n" "(Pode usar \"git bisect $bad_syn\" e \"git bisect $good_syn\" para esse fim.)" -#: builtin/bisect--helper.c:349 +#: builtin/bisect--helper.c:350 #, fuzzy, c-format msgid "bisecting only with a %s commit" msgstr "Aviso: a bissetar só com um commit $TERM_BAD." @@ -10585,22 +11104,22 @@ msgstr "Aviso: a bissetar só com um commit $TERM_BAD." #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:357 +#: builtin/bisect--helper.c:358 msgid "Are you sure [Y/n]? " msgstr "Tem a certeza [Y/n]? " -#: builtin/bisect--helper.c:418 +#: builtin/bisect--helper.c:419 msgid "no terms defined" msgstr "termo nenhum definido" -#: builtin/bisect--helper.c:421 +#: builtin/bisect--helper.c:422 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "" -#: builtin/bisect--helper.c:431 +#: builtin/bisect--helper.c:432 #, fuzzy, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10609,57 +11128,57 @@ msgstr "" "argumento inválido %s para 'git bisect terms'.\n" "Opções suportadas: --term-good|--term-old e --term-bad|--term-new." -#: builtin/bisect--helper.c:498 +#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023 #, fuzzy msgid "revision walk setup failed\n" msgstr "falha ao configurar percurso de revisões\n" -#: builtin/bisect--helper.c:520 +#: builtin/bisect--helper.c:521 #, fuzzy, c-format msgid "could not open '%s' for appending" -msgstr "não foi possível abrir '%s' para leitura" +msgstr "incapaz abrir '%s' para acrescentar" -#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653 #, fuzzy msgid "'' is not a valid term" -msgstr "'$term' não é um termo válido" +msgstr "'' é um termo inválido" -#: builtin/bisect--helper.c:662 +#: builtin/bisect--helper.c:663 #, fuzzy, c-format msgid "unrecognized option: '%s'" -msgstr "posição não reconhecida:%s" +msgstr "opção desconhecida: '%s'" -#: builtin/bisect--helper.c:666 +#: builtin/bisect--helper.c:667 #, fuzzy, c-format msgid "'%s' does not appear to be a valid revision" -msgstr "'$arg' não parecer ser uma revisão válida" +msgstr "'%s' parece ser uma revisão inválida" -#: builtin/bisect--helper.c:697 +#: builtin/bisect--helper.c:698 #, fuzzy msgid "bad HEAD - I need a HEAD" msgstr "HEAD incorreta - é necessário uma HEAD" -#: builtin/bisect--helper.c:712 +#: builtin/bisect--helper.c:713 #, fuzzy, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-válido>'." -#: builtin/bisect--helper.c:733 +#: builtin/bisect--helper.c:734 msgid "won't bisect on cg-seek'ed tree" -msgstr "não é possível bissetar numa árvore \"cg-seek'ed\"" +msgstr "incapaz bissetar numa árvore \"cg-seek'ada\"" -#: builtin/bisect--helper.c:736 +#: builtin/bisect--helper.c:737 #, fuzzy msgid "bad HEAD - strange symbolic ref" msgstr "HEAD incorreta - referência simbólica desconhecida" -#: builtin/bisect--helper.c:756 +#: builtin/bisect--helper.c:757 #, fuzzy, c-format msgid "invalid ref: '%s'" -msgstr "ficheiro inválido: '%s'" +msgstr "" -#: builtin/bisect--helper.c:814 +#: builtin/bisect--helper.c:815 #, fuzzy msgid "You need to start by \"git bisect start\"\n" msgstr "Deve começar por executar \"git bisect start\"\n" @@ -10668,99 +11187,116 @@ msgstr "Deve começar por executar \"git bisect start\"\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:825 +#: builtin/bisect--helper.c:826 msgid "Do you want me to do it for you [Y/n]? " msgstr "Quer que o Git o faça por si [Y/n]? " -#: builtin/bisect--helper.c:843 +#: builtin/bisect--helper.c:844 #, fuzzy msgid "Please call `--bisect-state` with at least one argument" msgstr "Invoque 'bisect_state' com pelo menos um argumento." -#: builtin/bisect--helper.c:856 +#: builtin/bisect--helper.c:857 #, fuzzy, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect $TERM_BAD' só leva um argumento." -#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879 +#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882 #, fuzzy, c-format msgid "Bad rev input: %s" msgstr "Revisão incorreta na entrada: $arg" -#: builtin/bisect--helper.c:924 -#, fuzzy -msgid "reset the bisection state" -msgstr "remover uma secção: nome" +#: builtin/bisect--helper.c:889 +#, fuzzy, c-format +msgid "Bad rev input (not a commit): %s" +msgstr "Revisão incorreta na entrada: $arg" -#: builtin/bisect--helper.c:926 -msgid "write out the bisection state in BISECT_LOG" -msgstr "" +#: builtin/bisect--helper.c:921 +msgid "We are not bisecting." +msgstr "Estamos bissetando nada." + +#: builtin/bisect--helper.c:971 +#, fuzzy, c-format +msgid "'%s'?? what are you talking about?" +msgstr "?? de que é que estás a falar?" + +#: builtin/bisect--helper.c:983 +#, fuzzy, c-format +msgid "cannot read file '%s' for replaying" +msgstr "incapaz ler $file para reproduzir" -#: builtin/bisect--helper.c:928 -msgid "check and set terms in a bisection state" +#: builtin/bisect--helper.c:1056 +#, fuzzy +msgid "reset the bisection state" msgstr "" -#: builtin/bisect--helper.c:930 +#: builtin/bisect--helper.c:1058 msgid "check whether bad or good terms exist" msgstr "" -#: builtin/bisect--helper.c:932 +#: builtin/bisect--helper.c:1060 #, fuzzy msgid "print out the bisect terms" -msgstr "imprimir apenas as tags do objeto" +msgstr "imprimir termos de bifurcação" -#: builtin/bisect--helper.c:934 +#: builtin/bisect--helper.c:1062 msgid "start the bisect session" msgstr "" -#: builtin/bisect--helper.c:936 +#: builtin/bisect--helper.c:1064 #, fuzzy msgid "find the next bisection commit" -msgstr "não é possível emendar commit não-existente" +msgstr "encontra próximo commit de bisecção" -#: builtin/bisect--helper.c:938 -msgid "verify the next bisection state then checkout the next bisection commit" -msgstr "" - -#: builtin/bisect--helper.c:940 +#: builtin/bisect--helper.c:1066 msgid "mark the state of ref (or refs)" msgstr "" -#: builtin/bisect--helper.c:942 -msgid "no log for BISECT_WRITE" +#: builtin/bisect--helper.c:1068 +#, fuzzy +msgid "list the bisection steps so far" msgstr "" -#: builtin/bisect--helper.c:957 -msgid "--bisect-reset requires either no argument or a commit" +#: builtin/bisect--helper.c:1070 +msgid "replay the bisection process from the given file" msgstr "" -#: builtin/bisect--helper.c:961 +#: builtin/bisect--helper.c:1072 #, fuzzy -msgid "--bisect-write requires either 4 or 5 arguments" -msgstr ":strip= requer um inteiro positivo como argumento" +msgid "skip some commits for checkout" +msgstr "'%s' tem commit checked out nenhum" + +#: builtin/bisect--helper.c:1074 +msgid "no log for BISECT_WRITE" +msgstr "" -#: builtin/bisect--helper.c:967 -msgid "--check-and-set-terms requires 3 arguments" +#: builtin/bisect--helper.c:1089 +msgid "--bisect-reset requires either no argument or a commit" msgstr "" -#: builtin/bisect--helper.c:973 +#: builtin/bisect--helper.c:1094 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "" -#: builtin/bisect--helper.c:979 +#: builtin/bisect--helper.c:1100 #, fuzzy msgid "--bisect-terms requires 0 or 1 argument" msgstr ":strip= requer um inteiro positivo como argumento" -#: builtin/bisect--helper.c:988 +#: builtin/bisect--helper.c:1109 #, fuzzy msgid "--bisect-next requires 0 arguments" -msgstr "--continue não leva argumentos" +msgstr "--bisect-next requer 0 argumentos" + +#: builtin/bisect--helper.c:1120 +#, fuzzy +msgid "--bisect-log requires 0 arguments" +msgstr "--bisect-next requer 0 argumentos" -#: builtin/bisect--helper.c:994 +#: builtin/bisect--helper.c:1125 #, fuzzy -msgid "--bisect-auto-next requires 0 arguments" -msgstr "--continue não leva argumentos" +msgid "no logfile given" +msgstr "Nenhum ficheiro de log fornecido" #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" @@ -10779,149 +11315,171 @@ msgstr "a redirecionar para %s " msgid "must end with a color" msgstr "" -#: builtin/blame.c:730 +#: builtin/blame.c:728 #, fuzzy, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "ignorar cor inválida '%.*s' em log.graphColors" -#: builtin/blame.c:748 +#: builtin/blame.c:746 #, fuzzy msgid "invalid value for blame.coloring" -msgstr "valor inválido de %s" +msgstr "" -#: builtin/blame.c:847 +#: builtin/blame.c:845 #, c-format msgid "cannot find revision %s to ignore" msgstr "" -#: builtin/blame.c:869 -msgid "Show blame entries as we find them, incrementally" +#: builtin/blame.c:867 +#, fuzzy +msgid "show blame entries as we find them, incrementally" msgstr "" "Mostrar entradas de culpa à medida que forem encontradas, incrementalmente" -#: builtin/blame.c:870 +#: builtin/blame.c:868 #, fuzzy -msgid "Do not show object names of boundary commits (Default: off)" +msgid "do not show object names of boundary commits (Default: off)" msgstr "Mostar SHA-1 dos commits limite em branco (Predefinição: desativado)" -#: builtin/blame.c:871 -msgid "Do not treat root commits as boundaries (Default: off)" +#: builtin/blame.c:869 +#, fuzzy +msgid "do not treat root commits as boundaries (Default: off)" msgstr "Tratar commits raiz como limite nenhum (Predefinição: desativado)" -#: builtin/blame.c:872 -msgid "Show work cost statistics" +#: builtin/blame.c:870 +#, fuzzy +msgid "show work cost statistics" msgstr "Mostrar estatísticas de custo de atividade" -#: builtin/blame.c:873 -msgid "Force progress reporting" -msgstr "Forçar informação de progresso" +#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 +#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 +#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 +#: builtin/push.c:566 builtin/send-pack.c:198 +msgid "force progress reporting" +msgstr "forçar informação de progresso" -#: builtin/blame.c:874 -msgid "Show output score for blame entries" +#: builtin/blame.c:872 +#, fuzzy +msgid "show output score for blame entries" msgstr "Mostrar a pontuação das entradas de culpa" -#: builtin/blame.c:875 -msgid "Show original filename (Default: auto)" +#: builtin/blame.c:873 +#, fuzzy +msgid "show original filename (Default: auto)" msgstr "Mostrar o nome do ficheiro original (Predefinição: auto)" -#: builtin/blame.c:876 -msgid "Show original linenumber (Default: off)" +#: builtin/blame.c:874 +#, fuzzy +msgid "show original linenumber (Default: off)" msgstr "Mostrar números de linha originais (Predefinição: desativado)" -#: builtin/blame.c:877 -msgid "Show in a format designed for machine consumption" +#: builtin/blame.c:875 +#, fuzzy +msgid "show in a format designed for machine consumption" msgstr "Mostrar em formato próprio para ser consumo por uma máquina" -#: builtin/blame.c:878 -msgid "Show porcelain format with per-line commit information" +#: builtin/blame.c:876 +#, fuzzy +msgid "show porcelain format with per-line commit information" msgstr "Mostrar em formato de porcelana com informações de commit por linha" -#: builtin/blame.c:879 -msgid "Use the same output mode as git-annotate (Default: off)" +#: builtin/blame.c:877 +#, fuzzy +msgid "use the same output mode as git-annotate (Default: off)" msgstr "Usar o mesmo modo de saída que git-annotate (Predefinição: desativado)" -#: builtin/blame.c:880 -msgid "Show raw timestamp (Default: off)" +#: builtin/blame.c:878 +#, fuzzy +msgid "show raw timestamp (Default: off)" msgstr "Mostrar carimbo de data/hora em bruto (Predefinição: desativado)" -#: builtin/blame.c:881 -msgid "Show long commit SHA1 (Default: off)" +#: builtin/blame.c:879 +#, fuzzy +msgid "show long commit SHA1 (Default: off)" msgstr "Mostrar SHA1 longo de commit (Predefinição: desativado)" -#: builtin/blame.c:882 -msgid "Suppress author name and timestamp (Default: off)" +#: builtin/blame.c:880 +#, fuzzy +msgid "suppress author name and timestamp (Default: off)" msgstr "" "Suprimir nome de autor e carimbo de data/hora (Predefinição: desativado)" -#: builtin/blame.c:883 -msgid "Show author email instead of name (Default: off)" +#: builtin/blame.c:881 +#, fuzzy +msgid "show author email instead of name (Default: off)" msgstr "Mostrar o email do autor em vez do nome (Predefinição: desativado)" -#: builtin/blame.c:884 -msgid "Ignore whitespace differences" +#: builtin/blame.c:882 +#, fuzzy +msgid "ignore whitespace differences" msgstr "Ignorar as diferenças de espaço em branco" -#: builtin/blame.c:885 builtin/log.c:1813 +#: builtin/blame.c:883 builtin/log.c:1823 #, fuzzy msgid "rev" msgstr "reverter" -#: builtin/blame.c:885 +#: builtin/blame.c:883 #, fuzzy -msgid "Ignore <rev> when blaming" +msgid "ignore <rev> when blaming" msgstr "ignorar o índice ao verificar" -#: builtin/blame.c:886 +#: builtin/blame.c:884 #, fuzzy -msgid "Ignore revisions from <file>" -msgstr "ler mensagem de um ficheiro" +msgid "ignore revisions from <file>" +msgstr "" -#: builtin/blame.c:887 +#: builtin/blame.c:885 msgid "color redundant metadata from previous line differently" msgstr "" -#: builtin/blame.c:888 +#: builtin/blame.c:886 msgid "color lines by age" msgstr "" -#: builtin/blame.c:889 -msgid "Spend extra cycles to find better match" +#: builtin/blame.c:887 +#, fuzzy +msgid "spend extra cycles to find better match" msgstr "Despender ciclos extra para encontrar uma melhor correspondência" -#: builtin/blame.c:890 -msgid "Use revisions from <file> instead of calling git-rev-list" +#: builtin/blame.c:888 +#, fuzzy +msgid "use revisions from <file> instead of calling git-rev-list" msgstr "Usar revisões do <ficheiro> em vez de invocar git-rev-list" -#: builtin/blame.c:891 -msgid "Use <file>'s contents as the final image" +#: builtin/blame.c:889 +#, fuzzy +msgid "use <file>'s contents as the final image" msgstr "Usar o conteúdo do <ficheiro> como imagem final" -#: builtin/blame.c:892 builtin/blame.c:893 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "pontuação" -#: builtin/blame.c:892 -msgid "Find line copies within and across files" +#: builtin/blame.c:890 +#, fuzzy +msgid "find line copies within and across files" msgstr "Localizar linhas copiadas dentro e entre ficheiros" -#: builtin/blame.c:893 -msgid "Find line movements within and across files" +#: builtin/blame.c:891 +#, fuzzy +msgid "find line movements within and across files" msgstr "Localizar linhas movidas dentro e entre ficheiros" -#: builtin/blame.c:894 +#: builtin/blame.c:892 #, fuzzy msgid "range" msgstr "intervalo" -#: builtin/blame.c:895 +#: builtin/blame.c:893 #, fuzzy -msgid "Process only line range <start>,<end> or function :<funcname>" +msgid "process only line range <start>,<end> or function :<funcname>" msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1" -#: builtin/blame.c:947 +#: builtin/blame.c:945 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" -"--progress não pode ser usado com --incremental ou formatos de porcelana" +"estás proibido de usar --progress com --incremental ou formatos porcelain" #. TRANSLATORS: This string is used to tell us the #. maximum display width for a relative timestamp in @@ -10931,18 +11489,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:998 +#: builtin/blame.c:996 msgid "4 years, 11 months ago" msgstr "há 4 anos e 11 meses atrás" -#: builtin/blame.c:1114 +#: builtin/blame.c:1112 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "o ficheiro %s só tem %lu linha" msgstr[1] "o ficheiro %s só tem %lu linhas" -#: builtin/blame.c:1159 +#: builtin/blame.c:1157 msgid "Blaming lines" msgstr "Linhas de culpa" @@ -10982,8 +11540,8 @@ msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -"a eliminar o ramo '%s' integrado em\n" -" '%s', mas ainda não integrado em HEAD." +"eliminando ramo '%s' que foi juntado a\n" +" '%s', mas ainda está por juntar a HEAD." #: builtin/branch.c:158 #, c-format @@ -10991,8 +11549,8 @@ msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -"ramo '%s' não eliminado, visto que ainda não foi integrado em\n" -" '%s', apesar de já ter sido integrado em HEAD." +"mantendo ramo '%s' que ainda está por juntar a\n" +" '%s', apesar de já estar junto a HEAD." #: builtin/branch.c:172 #, c-format @@ -11005,133 +11563,121 @@ msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -"O ramo '%s' não foi totalmente integrado.\n" -"Se tem a certeza que o quer eliminar, execute 'git branch -D %s'." +"O ramo '%s' está por juntar na totalidade.\n" +"Se tens a certeza que queres eliminá-lo, executa 'git branch -D %s'." #: builtin/branch.c:189 msgid "Update of config-file failed" msgstr "Falha ao atualizar o ficheiro de configuração" -#: builtin/branch.c:220 +#: builtin/branch.c:223 msgid "cannot use -a with -d" -msgstr "não é possível usar -a com -d" +msgstr "incapaz usar -a com -d" -#: builtin/branch.c:226 +#: builtin/branch.c:230 msgid "Couldn't look up commit object for HEAD" msgstr "Incapaz de pesquisar objeto commit para HEAD" -#: builtin/branch.c:240 +#: builtin/branch.c:244 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Impossível apagar ramo '%s' checked out em '%s'" -#: builtin/branch.c:255 +#: builtin/branch.c:259 #, c-format msgid "remote-tracking branch '%s' not found." -msgstr "ramo de monitorização remoto '%s' não encontrado." +msgstr "ramo de monitorização remoto '%s' por encontrar." -#: builtin/branch.c:256 +#: builtin/branch.c:260 #, c-format msgid "branch '%s' not found." -msgstr "ramo '%s' não encontrado." - -#: builtin/branch.c:271 -#, c-format -msgid "Error deleting remote-tracking branch '%s'" -msgstr "Erro a eliminar o ramo de monitorização remoto '%s'" - -#: builtin/branch.c:272 -#, c-format -msgid "Error deleting branch '%s'" -msgstr "Erro a eliminar ramo '%s'" +msgstr "ramo '%s' por encontrar." -#: builtin/branch.c:279 +#: builtin/branch.c:291 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Ramo de monitorização remoto %s eliminado (era %s).\n" -#: builtin/branch.c:280 +#: builtin/branch.c:292 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Ramo %s eliminado (era %s).\n" -#: builtin/branch.c:429 builtin/tag.c:61 +#: builtin/branch.c:440 builtin/tag.c:63 #, fuzzy msgid "unable to parse format string" -msgstr "não foi possível analisar o formato" +msgstr "incapaz processar o formato string" -#: builtin/branch.c:460 +#: builtin/branch.c:471 #, fuzzy msgid "could not resolve HEAD" -msgstr "não foi possível resolver o commit HEAD" +msgstr "incapaz resolver HEAD" -#: builtin/branch.c:466 +#: builtin/branch.c:477 #, fuzzy, c-format msgid "HEAD (%s) points outside of refs/heads/" -msgstr "HEAD não encontrada em refs/heads!" +msgstr "HEAD (%s) aponta para fora de refs/heads/" -#: builtin/branch.c:481 +#: builtin/branch.c:492 #, c-format msgid "Branch %s is being rebased at %s" msgstr "O ramo %s está a ser rebaseado em %s" -#: builtin/branch.c:485 +#: builtin/branch.c:496 #, c-format msgid "Branch %s is being bisected at %s" msgstr "O ramo %s está a ser bissetado em %s" -#: builtin/branch.c:502 +#: builtin/branch.c:513 #, fuzzy msgid "cannot copy the current branch while not on any." -msgstr "" -"não é possível mudar o nome do ramo atual vista que não se encontra num ramo." +msgstr "apenas podes copiar o ramo corrente enquanto estás num." -#: builtin/branch.c:504 +#: builtin/branch.c:515 msgid "cannot rename the current branch while not on any." -msgstr "" -"não é possível mudar o nome do ramo atual vista que não se encontra num ramo." +msgstr "apenas podes renomear o ramo corrente enquanto estás num." -#: builtin/branch.c:515 +#: builtin/branch.c:526 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nome de ramo inválido: '%s'" -#: builtin/branch.c:542 +#: builtin/branch.c:555 msgid "Branch rename failed" msgstr "Falha ao mudar o nome do ramo" -#: builtin/branch.c:544 +#: builtin/branch.c:557 #, fuzzy msgid "Branch copy failed" msgstr "Falha ao mudar o nome do ramo" -#: builtin/branch.c:548 +#: builtin/branch.c:561 #, fuzzy, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "O ramo incorretamente denominado '%s' mudou de nome" -#: builtin/branch.c:551 +#: builtin/branch.c:564 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "O ramo incorretamente denominado '%s' mudou de nome" -#: builtin/branch.c:557 +#: builtin/branch.c:570 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" -msgstr "O nome do ramo mudou para %s, mas a HEAD não está atualizada!" +msgstr "Ramo renomeado para %s, mas HEAD está desatualizada!" -#: builtin/branch.c:566 +#: builtin/branch.c:579 msgid "Branch is renamed, but update of config-file failed" msgstr "" "O ramo mudou de nome, mas a atualização do ficheiro de configuração falhou" -#: builtin/branch.c:568 +#: builtin/branch.c:581 #, fuzzy msgid "Branch is copied, but update of config-file failed" msgstr "" "O ramo mudou de nome, mas a atualização do ficheiro de configuração falhou" -#: builtin/branch.c:584 +#: builtin/branch.c:597 #, c-format msgid "" "Please edit the description for the branch\n" @@ -11142,222 +11688,221 @@ msgstr "" " %s\n" "Linha começadas com '%c' serão ignoradas.\n" -#: builtin/branch.c:618 +#: builtin/branch.c:631 msgid "Generic options" msgstr "Opções genéricas" -#: builtin/branch.c:620 +#: builtin/branch.c:633 msgid "show hash and subject, give twice for upstream branch" msgstr "apresentar hash e assunto, duplique para ramos a montante" -#: builtin/branch.c:621 +#: builtin/branch.c:634 msgid "suppress informational messages" msgstr "suprimir mensagens informativas" -#: builtin/branch.c:622 +#: builtin/branch.c:635 msgid "set up tracking mode (see git-pull(1))" msgstr "configurar modo de seguimento (consulte git-pull(1))" -#: builtin/branch.c:624 +#: builtin/branch.c:637 #, fuzzy msgid "do not use" msgstr "esquema a usar" -#: builtin/branch.c:626 builtin/rebase.c:532 +#: builtin/branch.c:639 builtin/rebase.c:533 msgid "upstream" msgstr "a montante" -#: builtin/branch.c:626 +#: builtin/branch.c:639 msgid "change the upstream info" msgstr "alterar a informação do ramo a montante" -#: builtin/branch.c:627 +#: builtin/branch.c:640 #, fuzzy msgid "unset the upstream info" msgstr "Remover a informação do ramo a montante" -#: builtin/branch.c:628 +#: builtin/branch.c:641 msgid "use colored output" msgstr "usar saída colorida" -#: builtin/branch.c:629 +#: builtin/branch.c:642 msgid "act on remote-tracking branches" msgstr "atuar sobre ramos de monitorização remotos" -#: builtin/branch.c:631 builtin/branch.c:633 +#: builtin/branch.c:644 builtin/branch.c:646 msgid "print only branches that contain the commit" msgstr "imprimir apenas ramos que contenham o commit" -#: builtin/branch.c:632 builtin/branch.c:634 +#: builtin/branch.c:645 builtin/branch.c:647 msgid "print only branches that don't contain the commit" -msgstr "imprimir apenas ramos que não contenham o commit" +msgstr "imprimir apenas ramos que contenham outro commit" -#: builtin/branch.c:637 +#: builtin/branch.c:650 msgid "Specific git-branch actions:" msgstr "Ações específicas do git-branch:" -#: builtin/branch.c:638 +#: builtin/branch.c:651 msgid "list both remote-tracking and local branches" msgstr "listar ramos de monitorização remotos e ramos locais" -#: builtin/branch.c:640 +#: builtin/branch.c:653 msgid "delete fully merged branch" msgstr "eliminar um ramo totalmente integrado" -#: builtin/branch.c:641 +#: builtin/branch.c:654 msgid "delete branch (even if not merged)" -msgstr "eliminar um ramo (mesmo que não tenha sido integrado)" +msgstr "elimina ramo (mesmo que esteja por juntar)" -#: builtin/branch.c:642 +#: builtin/branch.c:655 msgid "move/rename a branch and its reflog" msgstr "mover ou mudar o nome de um ramo e o seu reflog" -#: builtin/branch.c:643 +#: builtin/branch.c:656 msgid "move/rename a branch, even if target exists" msgstr "mover ou mudar o nome de um ramo, mesmo que o destino já exista" -#: builtin/branch.c:644 +#: builtin/branch.c:657 #, fuzzy msgid "copy a branch and its reflog" msgstr "mover ou mudar o nome de um ramo e o seu reflog" -#: builtin/branch.c:645 +#: builtin/branch.c:658 #, fuzzy msgid "copy a branch, even if target exists" msgstr "mover ou mudar o nome de um ramo, mesmo que o destino já exista" -#: builtin/branch.c:646 +#: builtin/branch.c:659 msgid "list branch names" msgstr "listar os nomes dos ramos" -#: builtin/branch.c:647 +#: builtin/branch.c:660 #, fuzzy msgid "show current branch name" msgstr "Nenhum ramo atual." -#: builtin/branch.c:648 +#: builtin/branch.c:661 msgid "create the branch's reflog" msgstr "criar reflog do ramo" -#: builtin/branch.c:650 +#: builtin/branch.c:663 msgid "edit the description for the branch" msgstr "editar a descrição do ramo" -#: builtin/branch.c:651 +#: builtin/branch.c:664 msgid "force creation, move/rename, deletion" msgstr "forçar criação, mover/mudar o nome ou exclusão" -#: builtin/branch.c:652 +#: builtin/branch.c:665 msgid "print only branches that are merged" msgstr "imprimir apenas os ramos que foram integrados" -#: builtin/branch.c:653 +#: builtin/branch.c:666 msgid "print only branches that are not merged" -msgstr "imprimir apenas os ramos que não foram integrados" +msgstr "imprimir apenas ramos que estão por juntar" -#: builtin/branch.c:654 +#: builtin/branch.c:667 msgid "list branches in columns" msgstr "listar os ramos em colunas" -#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:434 +#: builtin/tag.c:477 msgid "object" msgstr "objeto" -#: builtin/branch.c:657 +#: builtin/branch.c:670 msgid "print only branches of the object" msgstr "imprimir apenas os ramos do objeto" -#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 +#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484 msgid "sorting and filtering are case insensitive" msgstr "ordenar e filtrar são insensíveis a maiúsculas" -#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 +#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "formato a usar na saída" -#: builtin/branch.c:682 builtin/clone.c:790 +#: builtin/branch.c:695 builtin/clone.c:794 msgid "HEAD not found below refs/heads!" -msgstr "HEAD não encontrada em refs/heads!" +msgstr "HEAD por encontrar em refs/heads!" -#: builtin/branch.c:706 +#: builtin/branch.c:719 msgid "--column and --verbose are incompatible" msgstr "--column e --verbose são incompatíveis" -#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 +#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799 msgid "branch name required" msgstr "nome do ramo é obrigatório" -#: builtin/branch.c:751 +#: builtin/branch.c:766 msgid "Cannot give description to detached HEAD" msgstr "Impossível dar descrição a HEAD solta" -#: builtin/branch.c:756 +#: builtin/branch.c:771 msgid "cannot edit description of more than one branch" -msgstr "não é possível editar a descrição de mais do que um ramo" +msgstr "incapaz editar descrição de mais do que um ramo" -#: builtin/branch.c:763 +#: builtin/branch.c:778 #, c-format msgid "No commit on branch '%s' yet." -msgstr "Ainda não há commits no ramo '%s'." +msgstr "Ramo '%s' ainda tem commit nenhum." -#: builtin/branch.c:766 +#: builtin/branch.c:781 #, c-format msgid "No branch named '%s'." msgstr "Ramo nenhum denominado '%s'." -#: builtin/branch.c:781 +#: builtin/branch.c:796 #, fuzzy msgid "too many branches for a copy operation" msgstr "demasiados ramos para uma operação de mudança de nome" -#: builtin/branch.c:790 +#: builtin/branch.c:805 #, fuzzy msgid "too many arguments for a rename operation" msgstr "demasiados ramos para uma operação de mudança de nome" -#: builtin/branch.c:795 +#: builtin/branch.c:810 #, fuzzy msgid "too many arguments to set new upstream" msgstr "demasiados ramos para definir novo ramo a montante" -#: builtin/branch.c:799 +#: builtin/branch.c:814 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -"não foi possível definir %s como ramo a montante de HEAD visto que esta não " -"aponta para um ramo." +"apenas pode definir upstream de HEAD para %s quando aponta para qualquer " +"ramo." -#: builtin/branch.c:802 builtin/branch.c:825 +#: builtin/branch.c:817 builtin/branch.c:840 #, c-format msgid "no such branch '%s'" -msgstr "o ramo '%s' não existe" +msgstr "esse ramo '%s' é inexistente" -#: builtin/branch.c:806 +#: builtin/branch.c:821 #, c-format msgid "branch '%s' does not exist" -msgstr "o ramo '%s' não existe" +msgstr "ramo '%s' é inexistente" -#: builtin/branch.c:819 +#: builtin/branch.c:834 #, fuzzy msgid "too many arguments to unset upstream" msgstr "demasiados ramos para remover a definição de ramo a montante" -#: builtin/branch.c:823 +#: builtin/branch.c:838 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -"não foi possível remover a definição de ramo a montante de HEAD visto que " -"esta não aponta para um ramo." +"apenas posso desdefinir upstream de HEAD quando aponta para qualquer ramo." -#: builtin/branch.c:829 +#: builtin/branch.c:844 #, c-format msgid "Branch '%s' has no upstream information" -msgstr "O ramo '%s' não tem informação sobre o ramo a montante" +msgstr "Ramo '%s' tem informação de upstream nenhuma" -#: builtin/branch.c:839 +#: builtin/branch.c:854 #, fuzzy msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" @@ -11366,7 +11911,7 @@ msgstr "" "As opções -a, e -r, em 'git branch' levam nome de branch nenhum.\n" "Quiseste utilizar: -a|-r --list <pattern>? " -#: builtin/branch.c:843 +#: builtin/branch.c:858 #, fuzzy msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " @@ -11420,39 +11965,39 @@ msgid "" "You can delete any lines you don't wish to share.\n" msgstr "" -#: builtin/bugreport.c:135 +#: builtin/bugreport.c:136 msgid "specify a destination for the bugreport file" msgstr "" -#: builtin/bugreport.c:137 +#: builtin/bugreport.c:138 msgid "specify a strftime format suffix for the filename" msgstr "" -#: builtin/bugreport.c:159 +#: builtin/bugreport.c:160 #, fuzzy, c-format msgid "could not create leading directories for '%s'" -msgstr "não foi possível criar os diretórios superiores de '%s'" +msgstr "incapaz criar pastas superiores para '%s'" -#: builtin/bugreport.c:166 +#: builtin/bugreport.c:167 msgid "System Info" msgstr "" -#: builtin/bugreport.c:169 +#: builtin/bugreport.c:170 #, fuzzy msgid "Enabled Hooks" -msgstr "não foi possível abrir %s" +msgstr "Hooks Ativados" -#: builtin/bugreport.c:176 +#: builtin/bugreport.c:177 #, fuzzy, c-format msgid "couldn't create a new file at '%s'" -msgstr "não foi possível criar o ficheiro '%s'" +msgstr "incapaz criar novo ficheiro em '%s'" -#: builtin/bugreport.c:179 +#: builtin/bugreport.c:180 #, fuzzy, c-format msgid "unable to write to %s" -msgstr "não foi possível escrever %s" +msgstr "incapaz escrever para %s" -#: builtin/bugreport.c:189 +#: builtin/bugreport.c:190 #, c-format msgid "Created new report at '%s'.\n" msgstr "" @@ -11475,19 +12020,19 @@ msgstr "" msgid "git bundle unbundle <file> [<refname>...]" msgstr "" -#: builtin/bundle.c:67 builtin/pack-objects.c:3480 +#: builtin/bundle.c:67 builtin/pack-objects.c:3907 msgid "do not show progress meter" -msgstr "não mostrar medidor de progresso" +msgstr "mostrar medidor de progresso nenhum" -#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +#: builtin/bundle.c:69 builtin/pack-objects.c:3909 msgid "show progress meter" msgstr "mostrar medidor de progresso" -#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +#: builtin/bundle.c:71 builtin/pack-objects.c:3911 msgid "show progress meter during object writing phase" msgstr "mostrar medidor de progresso durante a fase de escrita de objetos" -#: builtin/bundle.c:74 builtin/pack-objects.c:3487 +#: builtin/bundle.c:74 builtin/pack-objects.c:3914 msgid "similar to --all-progress when progress meter is shown" msgstr "semelhante a --all-progress quando o medidor de progresso é mostrado" @@ -11499,30 +12044,30 @@ msgstr "" msgid "Need a repository to create a bundle." msgstr "É necessário um repositório para criar um bundle." -#: builtin/bundle.c:107 +#: builtin/bundle.c:109 #, fuzzy msgid "do not show bundle details" -msgstr "não mostrar tags descascadas" +msgstr "mostrar nenhuns detalhes de conjunto" -#: builtin/bundle.c:122 +#: builtin/bundle.c:128 #, c-format msgid "%s is okay\n" msgstr "%s está ok\n" -#: builtin/bundle.c:163 +#: builtin/bundle.c:179 msgid "Need a repository to unbundle." msgstr "É preciso um repositório para desempacotar." -#: builtin/bundle.c:171 builtin/remote.c:1700 +#: builtin/bundle.c:191 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "ser verboso; deve ser colocado antes de um subcomando" -#: builtin/bundle.c:193 builtin/remote.c:1731 +#: builtin/bundle.c:213 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "Subcomando desconhecido: %s" -#: builtin/cat-file.c:598 +#: builtin/cat-file.c:596 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -11530,7 +12075,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <tipo> | --textconv | --filters) [--path=<caminho>] <objeto>" -#: builtin/cat-file.c:599 +#: builtin/cat-file.c:597 #, fuzzy msgid "" "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" @@ -11539,74 +12084,74 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:620 +#: builtin/cat-file.c:618 #, fuzzy msgid "only one batch option may be specified" msgstr "Nenhum nome de ramo especificado" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:636 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipo> pode ser um de: blob, tree, commit, tag" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:637 msgid "show object type" msgstr "mostrar tipo do objeto" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:638 msgid "show object size" msgstr "mostrar tamanho do objeto" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:640 msgid "exit with zero when there's no error" -msgstr "sair com retorno zero quando não houver erros" +msgstr "sair com retorno zero quando há erro nenhum" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:641 msgid "pretty-print object's content" msgstr "mostrar conteúdo do objeto com impressão bonita" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:643 msgid "for blob objects, run textconv on object's content" msgstr "executar textconv no conteúdo de objetos blob" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:645 msgid "for blob objects, run filters on object's content" msgstr "para objetos blob, correr filtros sobre o conteúdo do objeto" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:646 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:647 msgid "use a specific path for --textconv/--filters" msgstr "usar um caminho específico para --textconv/--filters" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:649 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "permitir que -s e -t funcionem com objetos danificados/corrompidos" -#: builtin/cat-file.c:652 +#: builtin/cat-file.c:650 msgid "buffer --batch output" msgstr "carregar a saída de --batch" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:652 msgid "show info and content of objects fed from the standard input" msgstr "mostrar informação e conteúdo dos objetos fornecidos na entrada padrão" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:656 msgid "show info about objects fed from the standard input" msgstr "mostrar informação sobre os objetos fornecidos na entrada padrão" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:660 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "seguir ligações simbólica no interior da árvore (usado com --batch ou --" "batch-check)" -#: builtin/cat-file.c:664 +#: builtin/cat-file.c:662 msgid "show all objects with --batch or --batch-check" msgstr "mostrar todos os objetos com --batch ou --batch-check" -#: builtin/cat-file.c:666 +#: builtin/cat-file.c:664 msgid "do not order --batch-all-objects output" msgstr "" @@ -11624,7 +12169,7 @@ msgstr "apresentar todos os atributos definidos no ficheiro" #: builtin/check-attr.c:22 msgid "use .gitattributes only from the index" -msgstr "usar .gitattributes apenas a partir do índice" +msgstr "usar .gitattributes apenas a partir de cenário" #: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102 msgid "read file names from stdin" @@ -11634,8 +12179,8 @@ msgstr "ler os nomes dos ficheiros da entrada padrão" msgid "terminate input and output records by a NUL character" msgstr "terminar registos da entrada e da saída com um carácter NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541 -#: builtin/worktree.c:561 +#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 +#: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "suprimir informação de progresso" @@ -11647,27 +12192,27 @@ msgstr "mostrar caminhos de entrada sem correspondência" msgid "ignore index when checking" msgstr "ignorar o índice ao verificar" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:165 msgid "cannot specify pathnames with --stdin" -msgstr "não é possível especificar caminhos com --stdin" +msgstr "incapaz especificar pathnames com --stdin" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:168 msgid "-z only makes sense with --stdin" msgstr "-z só faz sentido com --stdin" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:170 msgid "no path specified" msgstr "path nenhum especificado" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:174 msgid "--quiet is only valid with a single pathname" msgstr "--quiet só é válido com um único caminho" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:176 msgid "cannot have both --quiet and --verbose" -msgstr "não é possível usar --quiet e --verbose simultaneamente" +msgstr "incapaz usar ambos --quiet e --verbose" -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:179 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching só é válido com --verbose" @@ -11682,225 +12227,230 @@ msgstr "também ler contactos da entrada padrão" #: builtin/check-mailmap.c:25 #, c-format msgid "unable to parse contact: %s" -msgstr "não é possível analisar o contacto: %s" +msgstr "incapaz processar contato: %s" #: builtin/check-mailmap.c:48 msgid "no contacts specified" msgstr "contato nenhum especificado" -#: builtin/checkout-index.c:139 +#: builtin/checkout--worker.c:110 +#, fuzzy +msgid "git checkout--worker [<options>]" +msgstr "git checkout--worker [<opções>]" + +#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 +#: builtin/column.c:31 builtin/submodule--helper.c:1824 +#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835 +#: builtin/submodule--helper.c:2333 builtin/worktree.c:491 +#: builtin/worktree.c:728 +msgid "string" +msgstr "cadeia" + +#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202 +msgid "when creating files, prepend <string>" +msgstr "preceder <cadeia> ao criar ficheiros" + +#: builtin/checkout-index.c:152 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<opções>] [--] [<ficheiro>...]" -#: builtin/checkout-index.c:156 +#: builtin/checkout-index.c:169 msgid "stage should be between 1 and 3 or all" msgstr "stage deve ser um número entre 1 e 3 ou o parâmetro all" -#: builtin/checkout-index.c:173 +#: builtin/checkout-index.c:187 msgid "check out all files in the index" msgstr "extrair todos os ficheiros presentes no índice" -#: builtin/checkout-index.c:174 +#: builtin/checkout-index.c:188 msgid "force overwrite of existing files" msgstr "forçar substituição dos ficheiros existentes" -#: builtin/checkout-index.c:176 +#: builtin/checkout-index.c:190 msgid "no warning for existing files and files not in index" msgstr "" -"não mostrar aviso para ficheiros existentes e ficheiros não presentes no " -"índice" +"mostrar aviso nenhum para ficheiros existentes e ficheiros fora do index" -#: builtin/checkout-index.c:178 +#: builtin/checkout-index.c:192 msgid "don't checkout new files" -msgstr "não extrair novos ficheiros" +msgstr "extrair ficheiros novos nenhuns" -#: builtin/checkout-index.c:180 +#: builtin/checkout-index.c:194 msgid "update stat information in the index file" -msgstr "atualizar informação de stat no ficheiro de índice" +msgstr "atualizar informação de stat de ficheiro de cenário" -#: builtin/checkout-index.c:184 +#: builtin/checkout-index.c:198 msgid "read list of paths from the standard input" msgstr "ler lista de caminhos da entrada padrão" -#: builtin/checkout-index.c:186 +#: builtin/checkout-index.c:200 msgid "write the content to temporary files" msgstr "escrever o conteúdo em ficheiros temporários" -#: builtin/checkout-index.c:187 builtin/column.c:31 -#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 -#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:757 -msgid "string" -msgstr "cadeia" - -#: builtin/checkout-index.c:188 -msgid "when creating files, prepend <string>" -msgstr "preceder <cadeia> ao criar ficheiros" - -#: builtin/checkout-index.c:190 +#: builtin/checkout-index.c:204 msgid "copy out the files from named stage" msgstr "copiar os ficheiros do estágio indicado" -#: builtin/checkout.c:31 +#: builtin/checkout.c:33 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<opções>] <ramo>" -#: builtin/checkout.c:32 +#: builtin/checkout.c:34 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<opções>] [<ramo>] -- <ficheiro>..." -#: builtin/checkout.c:37 +#: builtin/checkout.c:39 #, fuzzy msgid "git switch [<options>] [<branch>]" -msgstr "git checkout [<opções>] <ramo>" +msgstr "git switch [<opções>] [<ramo>]" -#: builtin/checkout.c:42 +#: builtin/checkout.c:44 #, fuzzy msgid "git restore [<options>] [--source=<branch>] <file>..." -msgstr "git checkout [<opções>] [<ramo>] -- <ficheiro>..." +msgstr "git restore [<opções>] [--source=<ramo>] <ficheiro>..." -#: builtin/checkout.c:188 builtin/checkout.c:227 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have our version" -msgstr "o caminho '%s' não tem a nossa versão" +msgstr "path '%s' é diferente da nossa versão" -#: builtin/checkout.c:190 builtin/checkout.c:229 +#: builtin/checkout.c:192 builtin/checkout.c:231 #, c-format msgid "path '%s' does not have their version" -msgstr "o caminho '%s' não tem a versão deles" +msgstr "path '%s' é diferente da versão deles" -#: builtin/checkout.c:206 +#: builtin/checkout.c:208 #, c-format msgid "path '%s' does not have all necessary versions" -msgstr "o caminho '%s' não tem todas as versões necessárias" +msgstr "path '%s' falta todas as versões necessárias" -#: builtin/checkout.c:258 +#: builtin/checkout.c:261 #, c-format msgid "path '%s' does not have necessary versions" -msgstr "o caminho '%s' não tem as versões necessárias" +msgstr "path '%s' falta as versões necessárias" -#: builtin/checkout.c:275 +#: builtin/checkout.c:278 #, c-format msgid "path '%s': cannot merge" -msgstr "caminho '%s': não é possível integrar" +msgstr "path '%s': incapaz juntar" -#: builtin/checkout.c:291 +#: builtin/checkout.c:294 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossível adicionar o resultado da junção para '%s'" -#: builtin/checkout.c:396 +#: builtin/checkout.c:414 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:401 +#: builtin/checkout.c:419 #, fuzzy, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "%d caminho atualizado" msgstr[1] "%d caminhos atualizados" -#: builtin/checkout.c:408 +#: builtin/checkout.c:426 #, fuzzy, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" -msgstr[0] "falha ao ler o índice" -msgstr[1] "falha ao ler o índice" +msgstr[0] "" +msgstr[1] "" -#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 -#: builtin/checkout.c:441 +#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 +#: builtin/checkout.c:459 #, c-format msgid "'%s' cannot be used with updating paths" -msgstr "'%s' não pode ser usado com caminhos em atualização" +msgstr "'%s' incapaz ser usado com paths em atualização" -#: builtin/checkout.c:444 builtin/checkout.c:447 +#: builtin/checkout.c:462 builtin/checkout.c:465 #, c-format msgid "'%s' cannot be used with %s" -msgstr "'%s' não pode ser usado com %s" +msgstr "'%s' incapaz ser usado com %s" -#: builtin/checkout.c:451 +#: builtin/checkout.c:469 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Incapaz atualizar paths e mudar para ramo '%s' ao mesmo tempo." -#: builtin/checkout.c:455 +#: builtin/checkout.c:473 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "" -#: builtin/checkout.c:459 +#: builtin/checkout.c:477 #, fuzzy, c-format msgid "'%s' must be used when '%s' is not specified" -msgstr "'%s' não pode ser usado com '%s'" +msgstr "'%s' tem de ser usado quando '%s' está por ser especificado" -#: builtin/checkout.c:464 builtin/checkout.c:469 +#: builtin/checkout.c:482 builtin/checkout.c:487 #, fuzzy, c-format msgid "'%s' or '%s' cannot be used with %s" -msgstr "%s: %s não pode ser usado com %s" +msgstr "'%s' ou '%s' impossível ser usado com %s" -#: builtin/checkout.c:541 builtin/checkout.c:548 +#: builtin/checkout.c:563 builtin/checkout.c:570 #, c-format msgid "path '%s' is unmerged" -msgstr "o caminho '%s' não foi integrado" +msgstr "path '%s' está por juntar" -#: builtin/checkout.c:716 +#: builtin/checkout.c:739 msgid "you need to resolve your current index first" msgstr "primeiro deve resolver o índice atual" -#: builtin/checkout.c:770 +#: builtin/checkout.c:793 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:866 +#: builtin/checkout.c:886 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Incapaz fazer reflog para '%s': %s\n" -#: builtin/checkout.c:908 +#: builtin/checkout.c:928 msgid "HEAD is now at" msgstr "HEAD está agora em" -#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" -msgstr "não foi possível atualizar HEAD" +msgstr "incapaz atualizar HEAD" -#: builtin/checkout.c:916 +#: builtin/checkout.c:936 #, c-format msgid "Reset branch '%s'\n" msgstr "Repor ramo '%s'\n" -#: builtin/checkout.c:919 +#: builtin/checkout.c:939 #, c-format msgid "Already on '%s'\n" msgstr "Já em '%s'\n" -#: builtin/checkout.c:923 +#: builtin/checkout.c:943 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Mudou para e repôs o ramo '%s'\n" -#: builtin/checkout.c:925 builtin/checkout.c:1356 +#: builtin/checkout.c:945 builtin/checkout.c:1376 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Mudou para o novo ramo '%s'\n" -#: builtin/checkout.c:927 +#: builtin/checkout.c:947 #, c-format msgid "Switched to branch '%s'\n" msgstr "Mudou para o ramo '%s'\n" -#: builtin/checkout.c:978 +#: builtin/checkout.c:998 #, c-format msgid " ... and %d more.\n" msgstr " ... e mais %d.\n" -#: builtin/checkout.c:984 +#: builtin/checkout.c:1004 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11913,17 +12463,17 @@ msgid_plural "" "\n" "%s\n" msgstr[0] "" -"Aviso: estás deixando %d commit para trás, desconetado a qualquer dos " -"teus ramos:\n" +"Aviso: estás deixando %d commit para trás, desconetado a qualquer dos teus " +"ramos:\n" "\n" "%s\n" msgstr[1] "" -"Aviso: estás deixando %d commits para trás, desconetado a qualquer " -"dos teus ramos:\n" +"Aviso: estás deixando %d commits para trás, desconetado a qualquer dos teus " +"ramos:\n" "\n" "%s\n" -#: builtin/checkout.c:1003 +#: builtin/checkout.c:1023 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11950,26 +12500,26 @@ msgstr[1] "" " git branch <nome-do-novo-ramo> %s\n" "\n" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1058 msgid "internal error in revision walk" msgstr "erro interno durante o curso de revisões" -#: builtin/checkout.c:1042 +#: builtin/checkout.c:1062 msgid "Previous HEAD position was" msgstr "A posição anterior de HEAD era" -#: builtin/checkout.c:1082 builtin/checkout.c:1351 +#: builtin/checkout.c:1102 builtin/checkout.c:1371 msgid "You are on a branch yet to be born" -msgstr "Está num ramo ainda não criado" +msgstr "Está num ramo ainda por nascer" -#: builtin/checkout.c:1164 +#: builtin/checkout.c:1184 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" msgstr "" -#: builtin/checkout.c:1171 +#: builtin/checkout.c:1191 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -11981,225 +12531,217 @@ msgid "" "checkout.defaultRemote=origin in your config." msgstr "" -#: builtin/checkout.c:1181 +#: builtin/checkout.c:1201 #, fuzzy, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "atuar sobre ramos de monitorização remotos" -#: builtin/checkout.c:1247 +#: builtin/checkout.c:1267 #, fuzzy msgid "only one reference expected" msgstr "esperava-se apenas uma referência, %d fornecidas." -#: builtin/checkout.c:1264 +#: builtin/checkout.c:1284 #, c-format msgid "only one reference expected, %d given." msgstr "esperava-se apenas uma referência, %d fornecidas." -#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510 +#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "referência inválida: %s" -#: builtin/checkout.c:1323 builtin/checkout.c:1689 +#: builtin/checkout.c:1343 builtin/checkout.c:1709 #, c-format msgid "reference is not a tree: %s" -msgstr "a referência não é uma árvore: %s" +msgstr "referência é árvore nenhuma: %s" -#: builtin/checkout.c:1370 +#: builtin/checkout.c:1390 #, fuzzy, c-format msgid "a branch is expected, got tag '%s'" msgstr "esperado um ramo, recebi tag '%s'" -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1392 #, fuzzy, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s." -#: builtin/checkout.c:1373 builtin/checkout.c:1381 +#: builtin/checkout.c:1393 builtin/checkout.c:1401 #, fuzzy, c-format msgid "a branch is expected, got '%s'" msgstr "O ramo %s está a ser bissetado em %s" -#: builtin/checkout.c:1376 +#: builtin/checkout.c:1396 #, fuzzy, c-format msgid "a branch is expected, got commit '%s'" msgstr "é suposto um branch, recebi um commit '%s'" -#: builtin/checkout.c:1392 +#: builtin/checkout.c:1412 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1396 +#: builtin/checkout.c:1416 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1400 +#: builtin/checkout.c:1420 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1404 +#: builtin/checkout.c:1424 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1408 +#: builtin/checkout.c:1428 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1412 +#: builtin/checkout.c:1432 #, fuzzy msgid "you are switching branch while bisecting" msgstr "Está a bissetar neste momento." -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1439 msgid "paths cannot be used with switching branches" -msgstr "não podem ser usados caminhos ao mudar de ramo" +msgstr "incapaz mudar ramo com o uso de paths" -#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430 +#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 #, c-format msgid "'%s' cannot be used with switching branches" -msgstr "'%s' não pode ser usado ao mudar de ramo" +msgstr "incapaz de mudar ramo com o uso de '%s'" -#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440 -#: builtin/checkout.c:1445 builtin/checkout.c:1450 +#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 +#: builtin/checkout.c:1465 builtin/checkout.c:1470 #, c-format msgid "'%s' cannot be used with '%s'" -msgstr "'%s' não pode ser usado com '%s'" +msgstr "'%s' é incapaz de ser usado com '%s'" -#: builtin/checkout.c:1447 +#: builtin/checkout.c:1467 #, fuzzy, c-format msgid "'%s' cannot take <start-point>" -msgstr "'%s' não pode ser usado com caminhos em atualização" +msgstr "'%s' incapaz receber <start-point>" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1475 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Incapaz mudar ramo para '%s', pois está fora de ser um commit" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1482 #, fuzzy msgid "missing branch or commit argument" msgstr "Falta um nome dum ramo; tente -b" -#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84 -#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296 -#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575 -#: builtin/send-pack.c:198 -msgid "force progress reporting" -msgstr "forçar informação de progresso" - -#: builtin/checkout.c:1505 +#: builtin/checkout.c:1525 msgid "perform a 3-way merge with the new branch" msgstr "realizar uma integração com 3 pontos com o novo ramo" -#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322 +#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323 msgid "style" msgstr "estilo" -#: builtin/checkout.c:1507 +#: builtin/checkout.c:1527 msgid "conflict style (merge or diff3)" msgstr "estilo de conflito (merge ou diff3)" -#: builtin/checkout.c:1519 builtin/worktree.c:558 +#: builtin/checkout.c:1539 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "destacar HEAD no commit indicado" -#: builtin/checkout.c:1520 +#: builtin/checkout.c:1540 msgid "set upstream info for new branch" msgstr "definir a informação do ramo a montante do novo ramo" -#: builtin/checkout.c:1522 +#: builtin/checkout.c:1542 msgid "force checkout (throw away local modifications)" msgstr "forçar extração (descartar modificações locais)" -#: builtin/checkout.c:1524 +#: builtin/checkout.c:1544 msgid "new-branch" msgstr "novo-ramo" -#: builtin/checkout.c:1524 +#: builtin/checkout.c:1544 msgid "new unparented branch" msgstr "novo ramo sem pai" -#: builtin/checkout.c:1526 builtin/merge.c:300 +#: builtin/checkout.c:1546 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "atualizar ficheiros ignorados (predefinição)" -#: builtin/checkout.c:1529 +#: builtin/checkout.c:1549 msgid "do not check if another worktree is holding the given ref" -msgstr "" -"não verificar se outra árvore de trabalho contém a referência fornecida" +msgstr "incapaz verificar se outra worktree contém referência dada" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1562 msgid "checkout our version for unmerged files" -msgstr "extrair a nossa versão dos ficheiros não integrados" +msgstr "checkout a nossa versão dos ficheiros por juntar" -#: builtin/checkout.c:1545 +#: builtin/checkout.c:1565 msgid "checkout their version for unmerged files" -msgstr "extrair a versão deles dos ficheiros não integrados" +msgstr "checkout a versão deles dos ficheiros por juntar" -#: builtin/checkout.c:1549 +#: builtin/checkout.c:1569 msgid "do not limit pathspecs to sparse entries only" -msgstr "não restringir especificadores de caminho a entradas esparsas" +msgstr "abrange especificadores de path além de entradas dispersas" -#: builtin/checkout.c:1604 +#: builtin/checkout.c:1624 #, fuzzy, c-format msgid "-%c, -%c and --orphan are mutually exclusive" -msgstr "-b, -B e --orphan são mutuamente exclusivos" +msgstr "" -#: builtin/checkout.c:1608 +#: builtin/checkout.c:1628 #, fuzzy msgid "-p and --overlay are mutually exclusive" -msgstr "-b, -B e --orphan são mutuamente exclusivos" +msgstr "" -#: builtin/checkout.c:1645 +#: builtin/checkout.c:1665 msgid "--track needs a branch name" msgstr "--track requer um nome dum ramo" -#: builtin/checkout.c:1650 +#: builtin/checkout.c:1670 #, fuzzy, c-format msgid "missing branch name; try -%c" msgstr "Falta um nome dum ramo; tente -b" -#: builtin/checkout.c:1682 +#: builtin/checkout.c:1702 #, fuzzy, c-format msgid "could not resolve %s" -msgstr "não foi possível remover '%s'" +msgstr "incapaz resolver %s" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1718 msgid "invalid path specification" msgstr "especificação de caminho inválida" -#: builtin/checkout.c:1705 +#: builtin/checkout.c:1725 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1709 +#: builtin/checkout.c:1729 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" -msgstr "git checkout: --detach não aceita um caminho como argumento '%s'" +msgstr "git checkout: --detach recusa path '%s' como argumento" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1738 #, fuzzy msgid "--pathspec-from-file is incompatible with --detach" -msgstr "--first-parent é incompatível com --bisect" +msgstr "" -#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499 +#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630 #, fuzzy msgid "--pathspec-from-file is incompatible with --patch" -msgstr "--first-parent é incompatível com --bisect" +msgstr "" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1754 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12207,80 +12749,80 @@ msgstr "" "git checkout: --ours/--theirs, --force e --merge são incompatíveis\n" "durante a extração do índice." -#: builtin/checkout.c:1739 +#: builtin/checkout.c:1759 #, fuzzy msgid "you must specify path(s) to restore" msgstr "Deve especificar um diretório." -#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816 -#: builtin/checkout.c:1818 builtin/clone.c:122 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 -#: builtin/worktree.c:556 +#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 +#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484 +#: builtin/worktree.c:486 msgid "branch" msgstr "ramo" -#: builtin/checkout.c:1766 +#: builtin/checkout.c:1786 msgid "create and checkout a new branch" msgstr "criar e extrair um novo ramo" -#: builtin/checkout.c:1768 +#: builtin/checkout.c:1788 msgid "create/reset and checkout a branch" msgstr "criar/repor e extrair um ramo" -#: builtin/checkout.c:1769 +#: builtin/checkout.c:1789 msgid "create reflog for new branch" msgstr "criar reflog do novo ramo" -#: builtin/checkout.c:1771 +#: builtin/checkout.c:1791 #, fuzzy msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1792 #, fuzzy msgid "use overlay mode (default)" -msgstr "eliminar referências soltas (predefinição)" +msgstr "" -#: builtin/checkout.c:1817 +#: builtin/checkout.c:1837 #, fuzzy msgid "create and switch to a new branch" msgstr "criar e extrair um novo ramo" -#: builtin/checkout.c:1819 +#: builtin/checkout.c:1839 #, fuzzy msgid "create/reset and switch to a branch" msgstr "criar/repor e extrair um ramo" -#: builtin/checkout.c:1821 +#: builtin/checkout.c:1841 #, fuzzy msgid "second guess 'git switch <no-such-branch>'" msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'" -#: builtin/checkout.c:1823 +#: builtin/checkout.c:1843 #, fuzzy msgid "throw away local modifications" msgstr "forçar extração (descartar modificações locais)" -#: builtin/checkout.c:1857 +#: builtin/checkout.c:1877 msgid "which tree-ish to checkout from" msgstr "" -#: builtin/checkout.c:1859 +#: builtin/checkout.c:1879 #, fuzzy msgid "restore the index" -msgstr "falha ao ler o índice" +msgstr "restaurar o cenário" -#: builtin/checkout.c:1861 +#: builtin/checkout.c:1881 #, fuzzy msgid "restore the working tree (default)" msgstr "Mostrar o estado da árvores de trabalho" -#: builtin/checkout.c:1863 +#: builtin/checkout.c:1883 #, fuzzy msgid "ignore unmerged entries" msgstr "ignora unmerged entries" -#: builtin/checkout.c:1864 +#: builtin/checkout.c:1884 msgid "use overlay mode" msgstr "" @@ -12310,17 +12852,12 @@ msgstr "A ignorar o repositório %s\n" msgid "Would skip repository %s\n" msgstr "Ignoraria o repositório %s\n" -#: builtin/clean.c:37 -#, c-format -msgid "failed to remove %s" -msgstr "falha ao remover %s" - #: builtin/clean.c:38 #, fuzzy, c-format msgid "could not lstat %s\n" -msgstr "não foi possível obter stat de %s\n" +msgstr "incapaz lstat %s\n" -#: builtin/clean.c:302 git-add--interactive.perl:593 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12333,7 +12870,7 @@ msgstr "" "foo - selecionar item baseado no prefixo único\n" " - (vazio) seleciona nada\n" -#: builtin/clean.c:306 git-add--interactive.perl:602 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12354,33 +12891,33 @@ msgstr "" "* - escolher todos os itens\n" " - (vazio) concluir seleção\n" -#: builtin/clean.c:521 git-add--interactive.perl:568 +#: builtin/clean.c:519 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "O quê (%s)?\n" -#: builtin/clean.c:661 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "Introduza padrões a ignorar>> " -#: builtin/clean.c:696 +#: builtin/clean.c:693 #, c-format msgid "WARNING: Cannot find items matched by: %s" -msgstr "AVISO: não foram encontrados itens correspondentes a: %s" +msgstr "AVISO: incapaz encontrar items correspondentes a: %s" -#: builtin/clean.c:717 +#: builtin/clean.c:714 msgid "Select items to delete" msgstr "Selecione itens para eliminar" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:755 #, c-format msgid "Remove %s [y/N]? " msgstr "Remover %s [y/N]? " -#: builtin/clean.c:789 +#: builtin/clean.c:786 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12398,52 +12935,52 @@ msgstr "" "help - esta ajuda\n" "? - ajuda para seleção em linha de comandos" -#: builtin/clean.c:825 +#: builtin/clean.c:822 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Removeria o seguinte item:" msgstr[1] "Removeria os seguintes itens:" -#: builtin/clean.c:841 +#: builtin/clean.c:838 msgid "No more files to clean, exiting." msgstr "Mais ficheiro por limpar nenhum, saindo." -#: builtin/clean.c:903 +#: builtin/clean.c:900 msgid "do not print names of files removed" -msgstr "não imprimir os nomes dos ficheiros removidos" +msgstr "incapaz imprimir nomes de ficheiros removidos" -#: builtin/clean.c:905 +#: builtin/clean.c:902 msgid "force" msgstr "forçar" -#: builtin/clean.c:906 +#: builtin/clean.c:903 msgid "interactive cleaning" msgstr "limpeza interativa" -#: builtin/clean.c:908 +#: builtin/clean.c:905 msgid "remove whole directories" msgstr "remover diretórios inteiros" -#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185 -#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "padrão" -#: builtin/clean.c:910 +#: builtin/clean.c:907 msgid "add <pattern> to ignore rules" msgstr "adicionar <padrão> às regras ignoradas" -#: builtin/clean.c:911 +#: builtin/clean.c:908 msgid "remove ignored files, too" msgstr "também remover ficheiros ignorados" -#: builtin/clean.c:913 +#: builtin/clean.c:910 msgid "remove only ignored files" msgstr "remover apenas ficheiros ignorados" -#: builtin/clean.c:929 +#: builtin/clean.c:925 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -12451,7 +12988,7 @@ msgstr "" "clean.requireForce definido como true e nenhum -i, -n, ou -f fornecido; " "recusando limpar" -#: builtin/clean.c:932 +#: builtin/clean.c:928 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -12459,171 +12996,177 @@ msgstr "" "clean.requireForce predefinido como true e nenhum -i, -n, ou -f fornecido; " "recusando limpar" -#: builtin/clean.c:944 +#: builtin/clean.c:940 msgid "-x and -X cannot be used together" -msgstr "-x e -X não pode ser usados juntos" +msgstr "-x e -X incapazes de ser usados juntos" #: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opções>] [--] <repo> [<dir>]" -#: builtin/clone.c:94 +#: builtin/clone.c:96 +#, fuzzy +msgid "don't clone shallow repository" +msgstr "para clonar de um repositório local" + +#: builtin/clone.c:98 msgid "don't create a checkout" -msgstr "não criar uma extração" +msgstr "cria checkout nenhum" -#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:553 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542 msgid "create a bare repository" msgstr "criar um repositório nu" -#: builtin/clone.c:99 +#: builtin/clone.c:103 msgid "create a mirror repository (implies bare)" msgstr "criar um repositório espelhado (implica repositório nu)" -#: builtin/clone.c:101 +#: builtin/clone.c:105 msgid "to clone from a local repository" msgstr "para clonar de um repositório local" -#: builtin/clone.c:103 +#: builtin/clone.c:107 msgid "don't use local hardlinks, always copy" -msgstr "não usar ligações fixas, copiar sempre" +msgstr "usa hardlinks nenhuns, copia sempre" -#: builtin/clone.c:105 +#: builtin/clone.c:109 msgid "setup as shared repository" msgstr "configurar como repositório partilhado" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "pathspec" msgstr "pathspec" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "initialize submodules in the clone" msgstr "inicializar submódulos no clone" -#: builtin/clone.c:111 +#: builtin/clone.c:115 msgid "number of submodules cloned in parallel" msgstr "número de submódulos clonados em paralelo" -#: builtin/clone.c:112 builtin/init-db.c:550 +#: builtin/clone.c:116 builtin/init-db.c:539 msgid "template-directory" msgstr "diretório-modelo" -#: builtin/clone.c:113 builtin/init-db.c:551 +#: builtin/clone.c:117 builtin/init-db.c:540 msgid "directory from which templates will be used" msgstr "diretório que contém os modelos usados" -#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831 #: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "repositório de referência" -#: builtin/clone.c:119 builtin/submodule--helper.c:1833 +#: builtin/clone.c:123 builtin/submodule--helper.c:1833 #: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "usar --reference apenas para clonar" -#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:561 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358 +#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495 +#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 msgid "name" msgstr "nome" -#: builtin/clone.c:121 +#: builtin/clone.c:125 msgid "use <name> instead of 'origin' to track upstream" msgstr "usar <nome> em vez de 'origin' para seguir o ramo a montante" -#: builtin/clone.c:123 +#: builtin/clone.c:127 msgid "checkout <branch> instead of the remote's HEAD" -msgstr "extrair <ramo> em vez da HEAD do remoto" +msgstr "observar <ramo> em vez de HEAD de remoto" -#: builtin/clone.c:125 +#: builtin/clone.c:129 msgid "path to git-upload-pack on the remote" msgstr "caminho para git-upload-pack no remoto" -#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862 #: builtin/pull.c:208 msgid "depth" msgstr "profundidade" -#: builtin/clone.c:127 +#: builtin/clone.c:131 msgid "create a shallow clone of that depth" msgstr "criar um clone raso com essa profundidade" -#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964 #: builtin/pull.c:211 msgid "time" msgstr "hora" -#: builtin/clone.c:129 +#: builtin/clone.c:133 msgid "create a shallow clone since a specific time" msgstr "criar um clone raso desde uma data específica" -#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317 +#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318 msgid "revision" msgstr "revisão" -#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215 +#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "aprofundar o histórico de um clone raso, excluindo a revisão" -#: builtin/clone.c:133 builtin/submodule--helper.c:1843 +#: builtin/clone.c:137 builtin/submodule--helper.c:1843 #: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "clonar apenas um ramo, HEAD ou --branch" -#: builtin/clone.c:135 +#: builtin/clone.c:139 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" -#: builtin/clone.c:137 +#: builtin/clone.c:141 msgid "any cloned submodules will be shallow" msgstr "qualquer submódulo clonado será raso" -#: builtin/clone.c:138 builtin/init-db.c:559 +#: builtin/clone.c:142 builtin/init-db.c:548 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:139 builtin/init-db.c:560 +#: builtin/clone.c:143 builtin/init-db.c:549 msgid "separate git dir from working tree" msgstr "separar o repositório git da árvore de trabalho" -#: builtin/clone.c:140 +#: builtin/clone.c:144 msgid "key=value" msgstr "chave=valor" -#: builtin/clone.c:141 +#: builtin/clone.c:145 msgid "set config inside the new repository" msgstr "definir configuração dentro do novo repositório" -#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 -#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196 msgid "server-specific" msgstr "específico do servidor" -#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 -#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197 msgid "option to transmit" msgstr "opção para transmitir" -#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234 -#: builtin/push.c:585 +#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 +#: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "usar apenas endereços IPv4" -#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237 -#: builtin/push.c:587 +#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 +#: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "usar apenas endereços IPv6" -#: builtin/clone.c:150 +#: builtin/clone.c:154 #, fuzzy msgid "any cloned submodules will use their remote-tracking branch" msgstr "qualquer submódulo clonado será raso" -#: builtin/clone.c:152 +#: builtin/clone.c:156 msgid "initialize sparse-checkout file to include only files at root" msgstr "" -#: builtin/clone.c:288 +#: builtin/clone.c:292 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12631,42 +13174,42 @@ msgstr "" "Incapaz adivinhar nome de pasta.\n" "Por favor especifique uma pasta na linha de comandos" -#: builtin/clone.c:341 +#: builtin/clone.c:345 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Incapaz adicionar sobressalente para '%s': %s\n" -#: builtin/clone.c:414 +#: builtin/clone.c:418 #, c-format msgid "%s exists and is not a directory" -msgstr "%s existe e não é um diretório" +msgstr "%s existe e é pasta nenhuma" -#: builtin/clone.c:432 +#: builtin/clone.c:436 #, fuzzy, c-format msgid "failed to start iterator over '%s'" -msgstr "falha ao escrever para '%s'" +msgstr "falhou começar iterador em '%s'" -#: builtin/clone.c:463 +#: builtin/clone.c:467 #, c-format msgid "failed to create link '%s'" msgstr "falha ao criar a ligação '%s'" -#: builtin/clone.c:467 +#: builtin/clone.c:471 #, c-format msgid "failed to copy file to '%s'" msgstr "falha ao copiar o ficheiro para '%s'" -#: builtin/clone.c:472 +#: builtin/clone.c:476 #, fuzzy, c-format msgid "failed to iterate over '%s'" msgstr "falha ao remover '%s'" -#: builtin/clone.c:499 +#: builtin/clone.c:503 #, c-format msgid "done.\n" msgstr "concluído.\n" -#: builtin/clone.c:513 +#: builtin/clone.c:517 #, fuzzy msgid "" "Clone succeeded, but checkout failed.\n" @@ -12677,150 +13220,152 @@ msgstr "" "Pode inspecionar o que foi extraído com 'git status'\n" "e repetir a extração com 'git checkout -f HEAD'\n" -#: builtin/clone.c:590 +#: builtin/clone.c:594 #, c-format msgid "Could not find remote branch %s to clone." -msgstr "Ramo remoto %s não encontrado para clonar." +msgstr "Incapaz encontrar ramo remoto %s para clonar." -#: builtin/clone.c:709 +#: builtin/clone.c:713 #, c-format msgid "unable to update %s" -msgstr "não foi possível atualizar %s" +msgstr "incapaz atualizar %s" -#: builtin/clone.c:757 +#: builtin/clone.c:761 #, fuzzy msgid "failed to initialize sparse-checkout" msgstr "falha ao finalizar integração de notas" -#: builtin/clone.c:780 +#: builtin/clone.c:784 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "remote HEAD refere-se a referência inexistente, impossível fazer checkout.\n" -#: builtin/clone.c:812 +#: builtin/clone.c:816 msgid "unable to checkout working tree" -msgstr "não foi possível extrair a árvore de trabalho" +msgstr "incapaz de checkout working tree" -#: builtin/clone.c:887 +#: builtin/clone.c:894 msgid "unable to write parameters to config file" -msgstr "não foi possível escrever os parâmetros no ficheiro de configuração" +msgstr "incapaz escrever parâmetros para ficheiro config" -#: builtin/clone.c:950 +#: builtin/clone.c:957 msgid "cannot repack to clean up" -msgstr "não é possível reempacotar para limpar" +msgstr "incapaz reempacotar para limpar" -#: builtin/clone.c:952 +#: builtin/clone.c:959 msgid "cannot unlink temporary alternates file" -msgstr "" -"não é possível invocar unlink sobre o ficheiro sobressalente temporário" +msgstr "incapaz unlink ficheiro sobressalente temporário" -#: builtin/clone.c:992 builtin/receive-pack.c:2493 +#: builtin/clone.c:1001 builtin/receive-pack.c:2490 msgid "Too many arguments." -msgstr "Demasiados argumentos." +msgstr "" -#: builtin/clone.c:996 +#: builtin/clone.c:1005 msgid "You must specify a repository to clone." msgstr "Deve especificar um repositório para clonar." -#: builtin/clone.c:1009 +#: builtin/clone.c:1018 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "as opções --bare e --origin %s são incompatíveis." -#: builtin/clone.c:1012 +#: builtin/clone.c:1021 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare e --separate-git-dir são incompatíveis." -#: builtin/clone.c:1025 +#: builtin/clone.c:1035 #, c-format msgid "repository '%s' does not exist" -msgstr "o repositório '%s' não existe" +msgstr "repositório '%s' é inexistente" -#: builtin/clone.c:1029 builtin/fetch.c:1841 +#: builtin/clone.c:1039 builtin/fetch.c:2014 #, c-format msgid "depth %s is not a positive number" -msgstr "profundidade %s não é um número positivo" +msgstr "profundidade %s é número positivo nenhum" -#: builtin/clone.c:1039 +#: builtin/clone.c:1049 #, c-format msgid "destination path '%s' already exists and is not an empty directory." -msgstr "o caminho de destino '%s' já existe e não é um diretório vazio." +msgstr "path de destino '%s' já existe e é pasta vazia nenhum." -#: builtin/clone.c:1045 +#: builtin/clone.c:1055 #, fuzzy, c-format msgid "repository path '%s' already exists and is not an empty directory." -msgstr "o caminho de destino '%s' já existe e não é um diretório vazio." +msgstr "path de repositório '%s' já existe e é diretório vazio nenhum." -#: builtin/clone.c:1059 +#: builtin/clone.c:1069 #, c-format msgid "working tree '%s' already exists." msgstr "a árvore de trabalho '%s' já existe." -#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271 -#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386 +#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 +#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312 #, c-format msgid "could not create leading directories of '%s'" -msgstr "não foi possível criar os diretórios superiores de '%s'" +msgstr "incapaz criar as pastas superiores de '%s'" -#: builtin/clone.c:1079 +#: builtin/clone.c:1089 #, c-format msgid "could not create work tree dir '%s'" -msgstr "não foi possível criar o diretório de árvore de trabalho '%s'" +msgstr "incapaz criar pasta de work tree '%s'" -#: builtin/clone.c:1099 +#: builtin/clone.c:1109 #, c-format msgid "Cloning into bare repository '%s'...\n" -msgstr "A clonar no repositório nu '%s'...\n" +msgstr "Clonando em repositório nú '%s'...\n" -#: builtin/clone.c:1101 +#: builtin/clone.c:1111 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonando em '%s'...\n" -#: builtin/clone.c:1125 +#: builtin/clone.c:1135 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -"clone --recursive não é compatível com ambos --reference e --reference-if-" -"able" +"clone --recursive é incompatível com ambos --reference e --reference-if-able" -#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705 +#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705 #, c-format msgid "'%s' is not a valid remote name" -msgstr "'%s' não é um nome de remoto válido" +msgstr "'%s' é nome de remoto inválido" -#: builtin/clone.c:1210 +#: builtin/clone.c:1229 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth é ignorado em clones locais; use file:// ." -#: builtin/clone.c:1212 +#: builtin/clone.c:1231 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since é ignorado em clones locais; use file:// ." -#: builtin/clone.c:1214 +#: builtin/clone.c:1233 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude é ignorado em clones locais; use file:// ." -#: builtin/clone.c:1216 +#: builtin/clone.c:1235 #, fuzzy msgid "--filter is ignored in local clones; use file:// instead." msgstr "--depth é ignorado em clones locais; use file:// ." -#: builtin/clone.c:1219 +#: builtin/clone.c:1240 msgid "source repository is shallow, ignoring --local" msgstr "o repositório de origem é raso, --local ignorado" -#: builtin/clone.c:1224 +#: builtin/clone.c:1245 msgid "--local is ignored" msgstr "--local ignorado" -#: builtin/clone.c:1308 builtin/clone.c:1316 +#: builtin/clone.c:1324 builtin/clone.c:1383 +msgid "remote transport reported error" +msgstr "transporte remoto reportou erro" + +#: builtin/clone.c:1336 builtin/clone.c:1344 #, c-format msgid "Remote branch %s not found in upstream %s" -msgstr "O ramo remoto %s não foi encontrado no repositório a montante %s" +msgstr "Ramo remoto %s por encontrar em upstream %s" -#: builtin/clone.c:1319 +#: builtin/clone.c:1347 msgid "You appear to have cloned an empty repository." msgstr "Parece foi clonado um repositório vazio." @@ -12837,19 +13382,23 @@ msgid "layout to use" msgstr "esquema a usar" #: builtin/column.c:30 -msgid "Maximum width" +#, fuzzy +msgid "maximum width" msgstr "Largura máxima" #: builtin/column.c:31 -msgid "Padding space on left border" +#, fuzzy +msgid "padding space on left border" msgstr "Espaço de preenchimento na borda esquerda" #: builtin/column.c:32 -msgid "Padding space on right border" +#, fuzzy +msgid "padding space on right border" msgstr "Espaço de preenchimento na borda direita" #: builtin/column.c:33 -msgid "Padding space between columns" +#, fuzzy +msgid "padding space between columns" msgstr "Espaço de preenchimento entre colunas" #: builtin/column.c:51 @@ -12871,16 +13420,16 @@ msgstr "" #: builtin/commit-graph.c:64 #, fuzzy, c-format msgid "could not find object directory matching %s" -msgstr "não foi possível ler o objeto %s da ligação simbólica %s" +msgstr "incapaz encontrar pasta objeto correspondendo %s" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769 +#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779 msgid "dir" msgstr "dir" #: builtin/commit-graph.c:81 builtin/commit-graph.c:211 #: builtin/commit-graph.c:317 -msgid "The object directory to store the graph" +msgid "the object directory to store the graph" msgstr "" #: builtin/commit-graph.c:83 @@ -12895,7 +13444,7 @@ msgstr "Incapaz abrir commit-graph '%s'" #: builtin/commit-graph.c:142 #, fuzzy, c-format msgid "unrecognized --split argument, %s" -msgstr "argumento não reconhecido: %s" +msgstr "argumento --split desconhecido, %s" #: builtin/commit-graph.c:155 #, fuzzy, c-format @@ -12905,7 +13454,7 @@ msgstr "reutilizar o objeto de nota especificado" #: builtin/commit-graph.c:160 #, fuzzy, c-format msgid "invalid object: %s" -msgstr "nome de objeto inválido: %s" +msgstr "" #: builtin/commit-graph.c:213 msgid "start walk at all refs" @@ -12967,25 +13516,25 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562 #, fuzzy, c-format msgid "not a valid object name %s" -msgstr "%s não é um nome de objeto válido" +msgstr "nome de objeto inválido %s" #: builtin/commit-tree.c:93 #, fuzzy, c-format msgid "git commit-tree: failed to open '%s'" -msgstr "falha ao abrir '%s'" +msgstr "" #: builtin/commit-tree.c:96 #, fuzzy, c-format msgid "git commit-tree: failed to read '%s'" -msgstr "git write-tree falhou ao escrever uma árvore" +msgstr "" #: builtin/commit-tree.c:98 #, fuzzy, c-format msgid "git commit-tree: failed to close '%s'" -msgstr "git write-tree falhou ao escrever uma árvore" +msgstr "" #: builtin/commit-tree.c:111 #, fuzzy @@ -12995,24 +13544,24 @@ msgstr "número-pai" #: builtin/commit-tree.c:112 #, fuzzy msgid "id of a parent commit object" -msgstr "falha ao escrever objeto de commit" +msgstr "" -#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470 -#: builtin/tag.c:413 +#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601 +#: builtin/tag.c:456 msgid "message" msgstr "mensagem" -#: builtin/commit-tree.c:115 builtin/commit.c:1504 +#: builtin/commit-tree.c:115 builtin/commit.c:1624 msgid "commit message" msgstr "mensagem de commit" #: builtin/commit-tree.c:118 #, fuzzy msgid "read commit log message from file" -msgstr "ler mensagem de um ficheiro" +msgstr "" -#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298 +#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "assinar o commit com GPG" @@ -13020,12 +13569,12 @@ msgstr "assinar o commit com GPG" #: builtin/commit-tree.c:133 #, fuzzy msgid "must give exactly one tree" -msgstr "É necessário exatamente um intervalo." +msgstr "" #: builtin/commit-tree.c:140 #, fuzzy msgid "git commit-tree: failed to read" -msgstr "git write-tree falhou ao escrever uma árvore" +msgstr "" #: builtin/commit.c:41 msgid "git commit [<options>] [--] <pathspec>..." @@ -13083,114 +13632,160 @@ msgid "" "\n" msgstr "" -#: builtin/commit.c:312 +#: builtin/commit.c:324 msgid "failed to unpack HEAD tree object" msgstr "falha ao descompactar o objeto árvore HEAD" -#: builtin/commit.c:348 +#: builtin/commit.c:360 #, fuzzy msgid "--pathspec-from-file with -a does not make sense" -msgstr "Indicar caminhos com -a não faz sentido." +msgstr "--pathspe de ficheiro com -a faz sentido nenhum." -#: builtin/commit.c:361 +#: builtin/commit.c:374 msgid "No paths with --include/--only does not make sense." -msgstr "As opções --include/--only não fazem sentido sem indicar caminhos." +msgstr "--include/--only fazem sentido nenhum sem indicar paths." -#: builtin/commit.c:373 +#: builtin/commit.c:386 msgid "unable to create temporary index" -msgstr "não foi possível criar índice temporário" +msgstr "incapaz criar index temporário" -#: builtin/commit.c:382 +#: builtin/commit.c:395 msgid "interactive add failed" msgstr "falha ao adicionar interativamente" -#: builtin/commit.c:397 +#: builtin/commit.c:410 msgid "unable to update temporary index" -msgstr "não é possível atualizar o índice temporário" +msgstr "incapaz atualizar index temporário" -#: builtin/commit.c:399 +#: builtin/commit.c:412 msgid "Failed to update main cache tree" msgstr "Falha ao atualizar a árvore de cache principal" -#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 +#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508 msgid "unable to write new_index file" -msgstr "não é possível escrever o ficheiro new_index" +msgstr "incapaz escrever ficheiro new_index" -#: builtin/commit.c:476 +#: builtin/commit.c:489 msgid "cannot do a partial commit during a merge." -msgstr "não é possível fazer um commit parcial durante uma integração." +msgstr "incapaz fazer commit parcial durante uma junção." -#: builtin/commit.c:478 +#: builtin/commit.c:491 msgid "cannot do a partial commit during a cherry-pick." -msgstr "não é possível fazer um commit parcial durante um cherry-pick." +msgstr "incapaz fazer commit parcial durante um cherry-pick." -#: builtin/commit.c:480 +#: builtin/commit.c:493 #, fuzzy msgid "cannot do a partial commit during a rebase." -msgstr "não é possível fazer um commit parcial durante uma integração." +msgstr "incapaz fazer commit parcial durante um rebase." -#: builtin/commit.c:488 +#: builtin/commit.c:501 msgid "cannot read the index" -msgstr "não é possível ler o índice" +msgstr "incapaz ler o index" -#: builtin/commit.c:507 +#: builtin/commit.c:520 msgid "unable to write temporary index file" -msgstr "não é possível escrever ficheiro de índice temporário" +msgstr "incapaz escrever ficheiro de index temporário" -#: builtin/commit.c:605 +#: builtin/commit.c:618 #, c-format msgid "commit '%s' lacks author header" -msgstr "o commit '%s' não tem cabeçalho de autor" +msgstr "commit '%s' falta cabeçalho de autor" -#: builtin/commit.c:607 +#: builtin/commit.c:620 #, c-format msgid "commit '%s' has malformed author line" msgstr "o commit '%s' tem a linha de autor malformada" -#: builtin/commit.c:626 +#: builtin/commit.c:639 msgid "malformed --author parameter" msgstr "parâmetro --author malformado" -#: builtin/commit.c:679 +#: builtin/commit.c:692 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -"não foi possível selecionar um carácter de comentário que\n" -"não estivesse já a ser usado na mensagem de commit atual" +"incapaz selecionar um carácter de comentário fica por usar\n" +"na mensagem de commit atual" -#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 +#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165 #, c-format msgid "could not lookup commit %s" -msgstr "não foi possível consultar o commit %s" +msgstr "incapaz consultar commit %s" -#: builtin/commit.c:729 builtin/shortlog.c:425 +#: builtin/commit.c:758 builtin/shortlog.c:413 #, c-format msgid "(reading log message from standard input)\n" msgstr "(a ler mensagem de log da entrada padrão)\n" -#: builtin/commit.c:731 +#: builtin/commit.c:760 msgid "could not read log from standard input" -msgstr "não foi possível ler o log da entrada padrão" +msgstr "incapaz ler log da entrada padrão" -#: builtin/commit.c:735 +#: builtin/commit.c:764 #, c-format msgid "could not read log file '%s'" -msgstr "não é possível ler o ficheiro de log '%s'" +msgstr "incapaz ler ficheiro de log '%s'" -#: builtin/commit.c:766 builtin/commit.c:782 +#: builtin/commit.c:801 +#, fuzzy, c-format +msgid "cannot combine -m with --fixup:%s" +msgstr "incapaz de combinar '--root' com '--fork-point'" + +#: builtin/commit.c:813 builtin/commit.c:829 msgid "could not read SQUASH_MSG" -msgstr "não foi possível ler SQUASH_MSG" +msgstr "incapaz ler SQUASH_MSG" -#: builtin/commit.c:773 +#: builtin/commit.c:820 msgid "could not read MERGE_MSG" -msgstr "não foi possível ler MERGE_MSG" +msgstr "incapaz ler MERGE_MSG" -#: builtin/commit.c:833 +#: builtin/commit.c:880 msgid "could not write commit template" -msgstr "não foi possível escrever o modelo de commit" +msgstr "incapaz escrever o modelo de commit" -#: builtin/commit.c:853 +#: builtin/commit.c:893 +#, fuzzy, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored.\n" +msgstr "" +"Introduza a mensagem de commit das suas alterações.\n" +"Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n" +"aborta o commit.\n" + +#: builtin/commit.c:895 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"Introduza a mensagem de commit das suas alterações.\n" +"Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n" +"aborta o commit.\n" + +#: builtin/commit.c:899 +#, fuzzy, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +msgstr "" +"Introduzia a mensagem de commit das suas alterações.\n" +"Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n" +"Uma mensagem vazia aborta o commit.\n" + +#: builtin/commit.c:903 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"Introduzia a mensagem de commit das suas alterações.\n" +"Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n" +"Uma mensagem vazia aborta o commit.\n" + +#: builtin/commit.c:915 #, fuzzy msgid "" "\n" @@ -13200,12 +13795,12 @@ msgid "" "and try again.\n" msgstr "" "\n" -"Parece que está a submeter uma integração.\n" -"Se não for o caso, remova o ficheiro\n" +"Parece que estás a fazer commit a uma junção.\n" +"Se isto é incorreto, remove o ficheiro\n" "\tgit update-ref -d MERGE_HEAD\n" "e tenta de novo.\n" -#: builtin/commit.c:858 +#: builtin/commit.c:920 #, fuzzy msgid "" "\n" @@ -13215,189 +13810,198 @@ msgid "" "and try again.\n" msgstr "" "\n" -"Parece que está a submeter um cherry-pick.\n" -"Se não é o caso, remova o ficheiro\n" +"Parece que está a fazer commit a um cherry-pick.\n" +"Se é incorreto, remove o ficheiro\n" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "e tenta de novo.\n" -#: builtin/commit.c:868 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be ignored, and an empty message aborts the commit.\n" -msgstr "" -"Introduza a mensagem de commit das suas alterações.\n" -"Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n" -"aborta o commit.\n" - -#: builtin/commit.c:876 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be kept; you may remove them yourself if you want to.\n" -"An empty message aborts the commit.\n" -msgstr "" -"Introduzia a mensagem de commit das suas alterações.\n" -"Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n" -"Uma mensagem vazia aborta o commit.\n" - -#: builtin/commit.c:893 +#: builtin/commit.c:947 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:901 +#: builtin/commit.c:955 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:908 +#: builtin/commit.c:962 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommitter: %.*s <%.*s>" -#: builtin/commit.c:926 +#: builtin/commit.c:980 msgid "Cannot read index" msgstr "Incapaz ler index" -#: builtin/commit.c:997 +#: builtin/commit.c:1025 +#, fuzzy +msgid "unable to pass trailers to --trailers" +msgstr "incapaz processar cabeçalho de %s" + +#: builtin/commit.c:1065 msgid "Error building trees" msgstr "Erro ao construir árvores" -#: builtin/commit.c:1011 builtin/tag.c:276 +#: builtin/commit.c:1079 builtin/tag.c:319 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Indique a mensagem usando apenas as opções -m ou -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1123 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -"--author '%s' não é do tipo 'Nome <email>' e não corresponde a um autor " -"existente" +"--author '%s' é diferente 'Nome <email>' e corresponde a um autor inexistente" -#: builtin/commit.c:1069 +#: builtin/commit.c:1137 #, fuzzy, c-format msgid "Invalid ignored mode '%s'" -msgstr "Modo inválido de ficheiros não controlados '%s'" +msgstr "Modo de ignorar inválido '%s'" -#: builtin/commit.c:1087 builtin/commit.c:1331 +#: builtin/commit.c:1155 builtin/commit.c:1448 #, c-format msgid "Invalid untracked files mode '%s'" -msgstr "Modo inválido de ficheiros não controlados '%s'" +msgstr "Modo inválido de ficheiros por seguir '%s'" -#: builtin/commit.c:1127 +#: builtin/commit.c:1195 msgid "--long and -z are incompatible" msgstr "--long e -z são incompatíveis" -#: builtin/commit.c:1171 +#: builtin/commit.c:1226 +#, fuzzy +msgid "You are in the middle of a merge -- cannot reword." +msgstr "Estás no meio de junção -- incapaz emendar." + +#: builtin/commit.c:1228 +#, fuzzy +msgid "You are in the middle of a cherry-pick -- cannot reword." +msgstr "Estás no meio de cherry-pick -- incapaz emendar." + +#: builtin/commit.c:1231 +#, c-format +msgid "cannot combine reword option of --fixup with path '%s'" +msgstr "" + +#: builtin/commit.c:1233 +msgid "" +"reword option of --fixup is mutually exclusive with --patch/--interactive/--" +"all/--include/--only" +msgstr "" + +#: builtin/commit.c:1252 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambos --reset-author e --author faz sentido nenhum" -#: builtin/commit.c:1180 +#: builtin/commit.c:1261 msgid "You have nothing to amend." msgstr "Tens nada para emendar." -#: builtin/commit.c:1183 +#: builtin/commit.c:1264 msgid "You are in the middle of a merge -- cannot amend." -msgstr "Integração em curso -- não é possível emendar." +msgstr "Estás no meio de junção -- incapaz emendar." -#: builtin/commit.c:1185 +#: builtin/commit.c:1266 msgid "You are in the middle of a cherry-pick -- cannot amend." -msgstr "Cherry-pick em curso -- não é possível emendar." +msgstr "Estás no meio de cherry-pick -- incapaz emendar." -#: builtin/commit.c:1187 +#: builtin/commit.c:1268 #, fuzzy msgid "You are in the middle of a rebase -- cannot amend." -msgstr "Integração em curso -- não é possível emendar." +msgstr "Estás no meio de rebase -- incapaz emendar." -#: builtin/commit.c:1190 +#: builtin/commit.c:1271 msgid "Options --squash and --fixup cannot be used together" -msgstr "As opções --squash e --fixup não podem ser usadas juntas" +msgstr "Opções --squash e --fixup incapaz serem usadas juntas" -#: builtin/commit.c:1200 +#: builtin/commit.c:1281 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Apenas um entre -c/-C/-F/--fixup pode ser usado." -#: builtin/commit.c:1202 +#: builtin/commit.c:1283 #, fuzzy msgid "Option -m cannot be combined with -c/-C/-F." -msgstr "A opção -m não pode ser combinada com -c/C/-F/--fixup." +msgstr "Opção -m incapaz ser combinada com -c/C/-F." -#: builtin/commit.c:1211 +#: builtin/commit.c:1292 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author só pode ser usado com -C, -c ou --amend." -#: builtin/commit.c:1229 +#: builtin/commit.c:1310 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Apenas um entre --include/--only/--all/--interactive/--patch pode ser usado." -#: builtin/commit.c:1235 +#: builtin/commit.c:1338 +#, fuzzy, c-format +msgid "unknown option: --fixup=%s:%s" +msgstr "desconheço opção: %s\n" + +#: builtin/commit.c:1352 #, fuzzy, c-format msgid "paths '%s ...' with -a does not make sense" -msgstr "Indicar caminhos com -a não faz sentido." +msgstr "paths '%s ...' com -a faz sentido nenhum" -#: builtin/commit.c:1366 builtin/commit.c:1527 +#: builtin/commit.c:1483 builtin/commit.c:1652 msgid "show status concisely" msgstr "mostrar status de forma concisa" -#: builtin/commit.c:1368 builtin/commit.c:1529 +#: builtin/commit.c:1485 builtin/commit.c:1654 msgid "show branch information" msgstr "mostrar informação do ramo" -#: builtin/commit.c:1370 +#: builtin/commit.c:1487 #, fuzzy msgid "show stash information" msgstr "mostrar informação do ramo" -#: builtin/commit.c:1372 builtin/commit.c:1531 +#: builtin/commit.c:1489 builtin/commit.c:1656 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1374 +#: builtin/commit.c:1491 msgid "version" msgstr "versão" -#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 -#: builtin/worktree.c:725 +#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551 +#: builtin/worktree.c:690 msgid "machine-readable output" msgstr "saída inteligível por máquina" -#: builtin/commit.c:1377 builtin/commit.c:1535 +#: builtin/commit.c:1494 builtin/commit.c:1660 msgid "show status in long format (default)" msgstr "apresentar status em formato longo (predefinição)" -#: builtin/commit.c:1380 builtin/commit.c:1538 +#: builtin/commit.c:1497 builtin/commit.c:1663 msgid "terminate entries with NUL" msgstr "terminar entradas com NUL" -#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 -#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1406 parse-options.h:336 +#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666 +#: builtin/fast-export.c:1198 builtin/fast-export.c:1201 +#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 msgid "mode" msgstr "modo" -#: builtin/commit.c:1383 builtin/commit.c:1541 +#: builtin/commit.c:1500 builtin/commit.c:1666 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -"mostrar ficheiros não controlados, modo é opcional: all, normal, no. " -"(Predefinição: all)" +"mostrar ficheiros por seguir, modo opcional: all, normal, no. (Predefinição: " +"all)" -#: builtin/commit.c:1387 +#: builtin/commit.c:1504 #, fuzzy msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" -"mostrar ficheiros não controlados, modo é opcional: all, normal, no. " -"(Predefinição: all)" +"mostrar ficheiros ignorados, modo opcional: traditional, matching, no. " +"(Predefinição: tradicional)" -#: builtin/commit.c:1389 parse-options.h:192 +#: builtin/commit.c:1506 parse-options.h:193 msgid "when" msgstr "quando" -#: builtin/commit.c:1390 +#: builtin/commit.c:1507 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -13405,182 +14009,205 @@ msgstr "" "ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. " "(Predefinição: all)" -#: builtin/commit.c:1392 +#: builtin/commit.c:1509 msgid "list untracked files in columns" -msgstr "listar ficheiros não controlados em colunas" +msgstr "listar ficheiros por seguir em colunas" -#: builtin/commit.c:1393 +#: builtin/commit.c:1510 #, fuzzy msgid "do not detect renames" -msgstr "não consultar remotos" +msgstr "detecção renomeação nenhuma" -#: builtin/commit.c:1395 +#: builtin/commit.c:1512 msgid "detect renames, optionally set similarity index" msgstr "" -#: builtin/commit.c:1415 +#: builtin/commit.c:1535 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" -#: builtin/commit.c:1497 +#: builtin/commit.c:1617 msgid "suppress summary after successful commit" msgstr "suprimir o resumo depois de submeter com sucesso" -#: builtin/commit.c:1498 +#: builtin/commit.c:1618 msgid "show diff in commit message template" msgstr "mostrar diff no modelo da mensagem de commit" -#: builtin/commit.c:1500 +#: builtin/commit.c:1620 msgid "Commit message options" msgstr "Opções de mensagem de commit" -#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415 +#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458 msgid "read message from file" -msgstr "ler mensagem de um ficheiro" +msgstr "ler mensagem de ficheiro" -#: builtin/commit.c:1502 +#: builtin/commit.c:1622 msgid "author" msgstr "autor" -#: builtin/commit.c:1502 +#: builtin/commit.c:1622 msgid "override author for commit" msgstr "substituir autor do commit" -#: builtin/commit.c:1503 builtin/gc.c:542 +#: builtin/commit.c:1623 builtin/gc.c:550 msgid "date" msgstr "data" -#: builtin/commit.c:1503 +#: builtin/commit.c:1623 msgid "override date for commit" msgstr "substituir data do commit" -#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 -#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 +#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632 +#: parse-options.h:329 ref-filter.h:90 msgid "commit" msgstr "commit" -#: builtin/commit.c:1505 +#: builtin/commit.c:1625 msgid "reuse and edit message from specified commit" msgstr "reutilizar e editar a mensagem de um commit especificado" -#: builtin/commit.c:1506 +#: builtin/commit.c:1626 msgid "reuse message from specified commit" msgstr "reutilizar a mensagem de um commit especificado" -#: builtin/commit.c:1507 -msgid "use autosquash formatted message to fixup specified commit" +#. TRANSLATORS: Leave "[(amend|reword):]" as-is, +#. and only translate <commit>. +#. +#: builtin/commit.c:1631 +#, fuzzy +msgid "[(amend|reword):]commit" +msgstr "emendar o commit anterior" + +#: builtin/commit.c:1631 +#, fuzzy +msgid "" +"use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" "usar mensagem com formato autosquash para corrigir o commit especificado" -#: builtin/commit.c:1508 +#: builtin/commit.c:1632 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usar mensagem com formato autosquash para esmagar o commit especificado" -#: builtin/commit.c:1509 +#: builtin/commit.c:1633 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "agora sou eu o autor do commit (usado com C/-c/--amend)" -#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301 +#: builtin/commit.c:1634 builtin/interpret-trailers.c:111 +msgid "trailer" +msgstr "terminador" + +#: builtin/commit.c:1634 +msgid "add custom trailer(s)" +msgstr "" + +#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 #, fuzzy msgid "add a Signed-off-by trailer" msgstr "adicionar Signed-off-by:" -#: builtin/commit.c:1511 +#: builtin/commit.c:1636 msgid "use specified template file" msgstr "usar ficheiro de modelo especificado" -#: builtin/commit.c:1512 +#: builtin/commit.c:1637 msgid "force edit of commit" msgstr "forçar edição do commit" -#: builtin/commit.c:1514 +#: builtin/commit.c:1639 msgid "include status in commit message template" msgstr "incluir status no modelo da mensagem de commit" -#: builtin/commit.c:1519 +#: builtin/commit.c:1644 msgid "Commit contents options" msgstr "Opções de conteúdo do commit" -#: builtin/commit.c:1520 +#: builtin/commit.c:1645 msgid "commit all changed files" msgstr "submeter todos os ficheiros alterados" -#: builtin/commit.c:1521 +#: builtin/commit.c:1646 msgid "add specified files to index for commit" msgstr "adicionar ficheiros especificados ao índice para submeter" -#: builtin/commit.c:1522 +#: builtin/commit.c:1647 msgid "interactively add files" msgstr "adicionar ficheiros interativamente" -#: builtin/commit.c:1523 +#: builtin/commit.c:1648 msgid "interactively add changes" msgstr "adicionar alterações interativamente" -#: builtin/commit.c:1524 +#: builtin/commit.c:1649 msgid "commit only specified files" msgstr "submeter somente os ficheiros especificados" -#: builtin/commit.c:1525 +#: builtin/commit.c:1650 msgid "bypass pre-commit and commit-msg hooks" msgstr "ignorar pre-commit e commit-msg hooks" -#: builtin/commit.c:1526 +#: builtin/commit.c:1651 msgid "show what would be committed" msgstr "mostrar o que seria submetido" -#: builtin/commit.c:1539 +#: builtin/commit.c:1664 msgid "amend previous commit" msgstr "emendar o commit anterior" -#: builtin/commit.c:1540 +#: builtin/commit.c:1665 msgid "bypass post-rewrite hook" msgstr "ignorar post-rewrite hook" -#: builtin/commit.c:1547 +#: builtin/commit.c:1672 msgid "ok to record an empty change" msgstr "aceitar o registo duma alteração vazia" -#: builtin/commit.c:1549 +#: builtin/commit.c:1674 msgid "ok to record a change with an empty message" msgstr "aceitar o registo duma alteração com uma mensagem vazia" -#: builtin/commit.c:1622 +#: builtin/commit.c:1747 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" -msgstr "Ficheiro MERGE_HEAD corrompido (%s)" +msgstr "Ficheiro MERGE_HEAD roto (%s)" -#: builtin/commit.c:1629 +#: builtin/commit.c:1754 msgid "could not read MERGE_MODE" -msgstr "não foi possível ler MERGE_MODE" +msgstr "incapaz ler MERGE_MODE" -#: builtin/commit.c:1650 +#: builtin/commit.c:1775 #, c-format msgid "could not read commit message: %s" -msgstr "não foi possível ler a mensagem de commit: %s" +msgstr "incapaz ler mensagem de commit: %s" -#: builtin/commit.c:1657 +#: builtin/commit.c:1782 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n" -#: builtin/commit.c:1662 +#: builtin/commit.c:1787 #, c-format msgid "Aborting commit; you did not edit the message.\n" -msgstr "A abortar o commit; não editou a mensagem.\n" +msgstr "Abortando commit; mensagem ficou por editar.\n" -#: builtin/commit.c:1696 +#: builtin/commit.c:1798 +#, fuzzy, c-format +msgid "Aborting commit due to empty commit message body.\n" +msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n" + +#: builtin/commit.c:1834 #, fuzzy msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" -"O repositório foi atualizado, mas não foi possível escrever\n" -"o ficheiro new_index. Verifique se o disco não está cheio\n" -"e que a quota não foi excedida e execute \"git reset HEAD\" para recuperar." +"Repositório foi atualizado, mas incapaz escrever ficheiro new_index.\n" +"Verifica se tens espaço em disco e que a quota está por preencher,\n" +"e executa \"git restore --staged :/\" para recuperar." #: builtin/config.c:11 msgid "git config [<options>]" @@ -13589,7 +14216,7 @@ msgstr "git config [<opções>]" #: builtin/config.c:109 builtin/env--helper.c:27 #, fuzzy, c-format msgid "unrecognized --type argument, %s" -msgstr "argumento não reconhecido: %s" +msgstr "argumento --type desconhecido: %s" #: builtin/config.c:121 #, fuzzy @@ -13610,12 +14237,12 @@ msgstr "usar ficheiro de configuração do sistema" #: builtin/config.c:133 msgid "use repository config file" -msgstr "usar ficheiro de configuração do repositório" +msgstr "" #: builtin/config.c:134 #, fuzzy msgid "use per-worktree config file" -msgstr "usar ficheiro de configuração do repositório" +msgstr "" #: builtin/config.c:135 msgid "use given config file" @@ -13678,7 +14305,7 @@ msgstr "mudar o nome da secção: nome-antigo novo-nome" #: builtin/config.c:147 msgid "remove a section: name" -msgstr "remover uma secção: nome" +msgstr "remove secção: nome" #: builtin/config.c:148 msgid "list all" @@ -13786,16 +14413,16 @@ msgstr "chave inválida: %s" #: builtin/config.c:377 #, fuzzy, c-format msgid "failed to format default config value: %s" -msgstr "falha ao criar o ficheiro %s" +msgstr "" #: builtin/config.c:441 #, fuzzy, c-format msgid "cannot parse color '%s'" -msgstr "não é possível abrir o ficheiro '%s'" +msgstr "incapaz processar cor '%s'" #: builtin/config.c:483 msgid "unable to parse default color value" -msgstr "não é possível analisar o valor de cor por omissão" +msgstr "incapaz processar valor de cor padrão" #: builtin/config.c:536 builtin/config.c:833 #, fuzzy @@ -13834,17 +14461,17 @@ msgstr "" #: builtin/config.c:658 #, fuzzy msgid "--local can only be used inside a git repository" -msgstr "--cached fora de um repositório" +msgstr "" #: builtin/config.c:660 #, fuzzy msgid "--blob can only be used inside a git repository" -msgstr "--cached fora de um repositório" +msgstr "" #: builtin/config.c:662 #, fuzzy msgid "--worktree can only be used inside a git repository" -msgstr "'%s' não é reconhecido como um repositório git" +msgstr "--worktree apenas pode ser usado dentro repositório git" #: builtin/config.c:684 msgid "$HOME not set" @@ -13886,12 +14513,12 @@ msgstr "" #: builtin/config.c:822 #, fuzzy, c-format msgid "unable to read config file '%s'" -msgstr "não é possível ler o ficheiro de assinatura '%s'" +msgstr "incapaz ler ficheiro config '%s'" #: builtin/config.c:825 #, fuzzy msgid "error processing config file(s)" -msgstr "usar ficheiro de configuração do repositório" +msgstr "" #: builtin/config.c:835 #, fuzzy @@ -13906,7 +14533,7 @@ msgstr "editar blobs tem suporte nenhum" #: builtin/config.c:851 #, c-format msgid "cannot create configuration file %s" -msgstr "não é possível criar o ficheiro de configuração %s" +msgstr "incapaz criar ficheiro de configuração %s" #: builtin/config.c:864 #, c-format @@ -13914,13 +14541,13 @@ msgid "" "cannot overwrite multiple values with a single value\n" " Use a regexp, --add or --replace-all to change %s." msgstr "" -"não é possível substituir múltiplos valores por um único valor\n" +"incapaz sobrescrever múltiplos valores com um único valor\n" " Usa uma regexp, --add ou --replace-all para alterar %s." #: builtin/config.c:943 builtin/config.c:954 #, fuzzy, c-format msgid "no such section: %s" -msgstr "referência inexistente %s" +msgstr "secção inexistente: %s" #: builtin/count-objects.c:90 msgid "git count-objects [-v] [-H | --human-readable]" @@ -13930,7 +14557,7 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "imprimir dimensões em formato inteligível por humanos" -#: builtin/credential-cache--daemon.c:226 +#: builtin/credential-cache--daemon.c:227 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -13944,11 +14571,11 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: builtin/credential-cache--daemon.c:275 +#: builtin/credential-cache--daemon.c:276 msgid "print debugging messages to stderr" msgstr "imprimir mensagens de depuração no stderr" -#: builtin/credential-cache--daemon.c:315 +#: builtin/credential-cache--daemon.c:316 msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "" @@ -13959,7 +14586,7 @@ msgstr "" #: builtin/credential-store.c:66 #, fuzzy, c-format msgid "unable to get credential storage lock in %d ms" -msgstr "não é possível de obter o diretório de trabalho atual" +msgstr "incapaz obter bloqueio de armazenamento de credenciais em %d ms" #: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" @@ -13984,7 +14611,7 @@ msgstr "anotado" #: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" -msgstr "a tag anotada %s não está disponível" +msgstr "tag anotada %s está indisponível" #: builtin/describe.c:281 #, fuzzy, c-format @@ -14046,12 +14673,12 @@ msgstr "à procurar da descrição de %s\n" #: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" -msgstr "%s não é um nome de objeto válido" +msgstr "%s é nome de objeto inválido" #: builtin/describe.c:540 #, fuzzy, c-format msgid "%s is neither a commit nor blob" -msgstr "'%s' não é um commit" +msgstr "'%s' é nem commit nem blob" #: builtin/describe.c:554 msgid "find the tag that comes after the commit" @@ -14067,7 +14694,7 @@ msgstr "usar uma referência qualquer" #: builtin/describe.c:557 msgid "use any tag, even unannotated" -msgstr "usar uma tag qualquer, mesmo não anotada" +msgstr "usa qualquer tag, mesmo uma por anotar" #: builtin/describe.c:558 msgid "always use long format" @@ -14091,7 +14718,7 @@ msgstr "apenas considerar tags que correspondam ao <padrão>" #: builtin/describe.c:568 msgid "do not consider tags matching <pattern>" -msgstr "não considerar tags que correspondam ao <padrão>" +msgstr "descarta tags que correspondam ao <padrão>" #: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" @@ -14119,11 +14746,11 @@ msgstr "--long é incompatível com --abbrev=0" #: builtin/describe.c:622 msgid "No names found, cannot describe anything." -msgstr "Nenhum nome encontrado, não é possível descrever." +msgstr "Nenhum nome encontrado, incapaz descrever qualquer coisa." #: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" -msgstr "--dirty é incompatível com commits ou semelhantes" +msgstr "--dirty é incompatível com mnemónicas" #: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" @@ -14132,166 +14759,166 @@ msgstr "--broken é incompatível com commits ou semelhantes" #: builtin/diff-tree.c:155 #, fuzzy msgid "--stdin and --merge-base are mutually exclusive" -msgstr "-b, -B e --orphan são mutuamente exclusivos" +msgstr "" #: builtin/diff-tree.c:157 msgid "--merge-base only works with two commits" msgstr "" -#: builtin/diff.c:91 +#: builtin/diff.c:92 #, c-format msgid "'%s': not a regular file or symlink" -msgstr "'%s': não é um ficheiro regular nem uma ligação simbólica" +msgstr "'%s': é ficheiro normal nenhum e é ligação simbólica nenhuma" -#: builtin/diff.c:258 +#: builtin/diff.c:259 #, c-format msgid "invalid option: %s" -msgstr "opção inválida: %s" +msgstr "" -#: builtin/diff.c:375 +#: builtin/diff.c:376 #, c-format msgid "%s...%s: no merge base" msgstr "" -#: builtin/diff.c:485 +#: builtin/diff.c:486 msgid "Not a git repository" msgstr "É repositório git nenhum" -#: builtin/diff.c:530 builtin/grep.c:681 +#: builtin/diff.c:532 builtin/grep.c:684 #, c-format msgid "invalid object '%s' given." msgstr "objeto inválido '%s' fornecido." -#: builtin/diff.c:541 +#: builtin/diff.c:543 #, c-format msgid "more than two blobs given: '%s'" msgstr "mais do que dois blobs fornecidos: '%s'" -#: builtin/diff.c:546 +#: builtin/diff.c:548 #, c-format msgid "unhandled object '%s' given." msgstr "objeto sem tratamento '%s' fornecido." -#: builtin/diff.c:580 +#: builtin/diff.c:582 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "" -#: builtin/difftool.c:30 +#: builtin/difftool.c:31 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<opções>] [<commit> [<commit>]] [--] [<caminho>...]" -#: builtin/difftool.c:260 +#: builtin/difftool.c:261 #, c-format msgid "failed: %d" msgstr "falha: %d" -#: builtin/difftool.c:302 +#: builtin/difftool.c:303 #, c-format msgid "could not read symlink %s" -msgstr "não foi possível ler a ligação simbólica %s" +msgstr "incapaz ler ligação simbólica %s" -#: builtin/difftool.c:304 +#: builtin/difftool.c:305 #, c-format msgid "could not read symlink file %s" -msgstr "não foi possível ler o ficheiro de ligação simbólica %s" +msgstr "incapaz ler ficheiro de ligação simbólica %s" -#: builtin/difftool.c:312 +#: builtin/difftool.c:313 #, c-format msgid "could not read object %s for symlink %s" -msgstr "não foi possível ler o objeto %s da ligação simbólica %s" +msgstr "incapaz ler o objeto %s para ligação simbólica %s" -#: builtin/difftool.c:412 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "" -"formatos diff combinado('-c' e '--cc') não são suportados em\n" -"modo diff diretório ('-d' e '--dir-diff')." +"formatos diff combinado('-c' e '--cc') são insustentados em\n" +"modo diff pasta('-d' e '--dir-diff')." -#: builtin/difftool.c:633 +#: builtin/difftool.c:637 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "ambos os ficheiros modificados: '%s' e '%s'." -#: builtin/difftool.c:635 +#: builtin/difftool.c:639 msgid "working tree file has been left." msgstr "ficheiro de árvore de trabalho foi deixado." -#: builtin/difftool.c:646 +#: builtin/difftool.c:650 #, c-format msgid "temporary files exist in '%s'." msgstr "existem ficheiros temporários em '%s'." -#: builtin/difftool.c:647 +#: builtin/difftool.c:651 msgid "you may want to cleanup or recover these." msgstr "pode querer limpar ou recuperá-los." -#: builtin/difftool.c:696 +#: builtin/difftool.c:699 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "use 'diff.guitool' em vez de 'diff.tool'" -#: builtin/difftool.c:698 +#: builtin/difftool.c:701 msgid "perform a full-directory diff" msgstr "efetuar diff diretório completo" -#: builtin/difftool.c:700 +#: builtin/difftool.c:703 msgid "do not prompt before launching a diff tool" -msgstr "não perguntar antes de lançar uma ferramenta diff" +msgstr "deixar de perguntar antes de lançar ferramenta diff" -#: builtin/difftool.c:705 +#: builtin/difftool.c:708 msgid "use symlinks in dir-diff mode" msgstr "usar symlinks no modi dir-diff" -#: builtin/difftool.c:706 +#: builtin/difftool.c:709 #, fuzzy msgid "tool" -msgstr "<ferramenta>" +msgstr "ferramenta" -#: builtin/difftool.c:707 +#: builtin/difftool.c:710 msgid "use the specified diff tool" msgstr "usar a ferramenta diff especificada" -#: builtin/difftool.c:709 +#: builtin/difftool.c:712 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "imprimir uma lista de ferramentas diff que podem ser usadas com '--tool'" -#: builtin/difftool.c:712 +#: builtin/difftool.c:715 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" "fazer com que 'git-difftool' termine quando uma ferramenta diff invocada " -"retorna um código de saída não nulo" +"retorna um código de saída diferente de zero" -#: builtin/difftool.c:715 +#: builtin/difftool.c:718 msgid "specify a custom command for viewing diffs" msgstr "especificar um comando personalizado para ver diffs" -#: builtin/difftool.c:716 +#: builtin/difftool.c:719 msgid "passed to `diff`" msgstr "" -#: builtin/difftool.c:731 +#: builtin/difftool.c:734 msgid "difftool requires worktree or --no-index" msgstr "" -#: builtin/difftool.c:738 +#: builtin/difftool.c:741 #, fuzzy msgid "--dir-diff is incompatible with --no-index" -msgstr "--dirty é incompatível com commits ou semelhantes" +msgstr "--dir-diff é incompatível com --no-index" -#: builtin/difftool.c:741 +#: builtin/difftool.c:744 #, fuzzy msgid "--gui, --tool and --extcmd are mutually exclusive" -msgstr "-b, -B e --detach são mutuamente exclusivos" +msgstr "" -#: builtin/difftool.c:749 +#: builtin/difftool.c:752 msgid "no <tool> given for --tool=<tool>" msgstr "<ferramenta> nenhuma dada a --tool=<ferramenta>" -#: builtin/difftool.c:756 +#: builtin/difftool.c:759 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "<cmd> nenhum dado a --extcmd=<cmd>" @@ -14331,106 +14958,113 @@ msgstr "git fast-export [opções-de-rev-list]" msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1177 msgid "--anonymize-map token cannot be empty" msgstr "" -#: builtin/fast-export.c:1198 +#: builtin/fast-export.c:1197 msgid "show progress after <n> objects" msgstr "mostrar progresso depois de <n> objetos" -#: builtin/fast-export.c:1200 +#: builtin/fast-export.c:1199 msgid "select handling of signed tags" msgstr "selecionar o tratamento de tags assinadas" -#: builtin/fast-export.c:1203 +#: builtin/fast-export.c:1202 msgid "select handling of tags that tag filtered objects" msgstr "selecionar o tratamento de tags que apontem para objetos filtrados" -#: builtin/fast-export.c:1206 +#: builtin/fast-export.c:1205 #, fuzzy msgid "select handling of commit messages in an alternate encoding" msgstr "selecionar o tratamento de tags que apontem para objetos filtrados" -#: builtin/fast-export.c:1209 -msgid "Dump marks to this file" +#: builtin/fast-export.c:1208 +#, fuzzy +msgid "dump marks to this file" msgstr "Capturar marcas neste ficheiro" -#: builtin/fast-export.c:1211 -msgid "Import marks from this file" +#: builtin/fast-export.c:1210 +#, fuzzy +msgid "import marks from this file" msgstr "Importar marcas deste ficheiro" -#: builtin/fast-export.c:1215 +#: builtin/fast-export.c:1214 #, fuzzy -msgid "Import marks from this file if it exists" +msgid "import marks from this file if it exists" msgstr "Importar marcas deste ficheiro" -#: builtin/fast-export.c:1217 -msgid "Fake a tagger when tags lack one" -msgstr "Inventar um autor de tag para tags que não tenham um" +#: builtin/fast-export.c:1216 +#, fuzzy +msgid "fake a tagger when tags lack one" +msgstr "Falsear um \"tageador\" para quando falte um às tags" -#: builtin/fast-export.c:1219 -msgid "Output full tree for each commit" +#: builtin/fast-export.c:1218 +#, fuzzy +msgid "output full tree for each commit" msgstr "Mostrar a árvore completa para cada commit" -#: builtin/fast-export.c:1221 -msgid "Use the done feature to terminate the stream" +#: builtin/fast-export.c:1220 +#, fuzzy +msgid "use the done feature to terminate the stream" msgstr "Usar a funcionalidade done para terminar o fluxo" -#: builtin/fast-export.c:1222 -msgid "Skip output of blob data" +#: builtin/fast-export.c:1221 +#, fuzzy +msgid "skip output of blob data" msgstr "Ignorar a exibição de dados de blob" -#: builtin/fast-export.c:1223 builtin/log.c:1816 +#: builtin/fast-export.c:1222 builtin/log.c:1826 msgid "refspec" msgstr "especificador de referência" -#: builtin/fast-export.c:1224 -msgid "Apply refspec to exported refs" +#: builtin/fast-export.c:1223 +#, fuzzy +msgid "apply refspec to exported refs" msgstr "Aplicar o especificador de referência a referências exportadas" -#: builtin/fast-export.c:1225 +#: builtin/fast-export.c:1224 msgid "anonymize output" msgstr "anonimizar saída" -#: builtin/fast-export.c:1226 +#: builtin/fast-export.c:1225 msgid "from:to" msgstr "" -#: builtin/fast-export.c:1227 +#: builtin/fast-export.c:1226 msgid "convert <from> to <to> in anonymized output" msgstr "" -#: builtin/fast-export.c:1230 -msgid "Reference parents which are not in fast-export stream by object id" +#: builtin/fast-export.c:1229 +msgid "reference parents which are not in fast-export stream by object id" msgstr "" -#: builtin/fast-export.c:1232 -msgid "Show original object ids of blobs/commits" +#: builtin/fast-export.c:1231 +msgid "show original object ids of blobs/commits" msgstr "" -#: builtin/fast-export.c:1234 -msgid "Label tags with mark ids" +#: builtin/fast-export.c:1233 +msgid "label tags with mark ids" msgstr "" -#: builtin/fast-export.c:1257 +#: builtin/fast-export.c:1256 #, fuzzy msgid "--anonymize-map without --anonymize does not make sense" -msgstr "--name-only não faz sentido" +msgstr "--anonymize-map sem --anonymize faz sentido nenhum" -#: builtin/fast-export.c:1272 +#: builtin/fast-export.c:1271 msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "" #: builtin/fast-import.c:3088 #, fuzzy, c-format msgid "Missing from marks for submodule '%s'" -msgstr "A ignorar submódulo '%s'" +msgstr "" #: builtin/fast-import.c:3090 #, fuzzy, c-format msgid "Missing to marks for submodule '%s'" -msgstr "A ignorar submódulo '%s'" +msgstr "" #: builtin/fast-import.c:3225 #, c-format @@ -14451,10 +15085,10 @@ msgstr "" msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "" -#: builtin/fetch-pack.c:241 +#: builtin/fetch-pack.c:242 #, fuzzy, c-format msgid "Lockfile created but not reported: %s" -msgstr "Submódulos alterados mas não atualizados:" +msgstr "Ficheiro de bloqueio criado mas por reportar: %s" #: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" @@ -14473,203 +15107,215 @@ msgstr "git fetch --multiple [<opções>] [(<repositório> | <grupo>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opções>]" -#: builtin/fetch.c:119 +#: builtin/fetch.c:122 msgid "fetch.parallel cannot be negative" msgstr "" -#: builtin/fetch.c:142 builtin/pull.c:185 +#: builtin/fetch.c:145 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "obter de todos os remotos" -#: builtin/fetch.c:144 builtin/pull.c:245 +#: builtin/fetch.c:147 builtin/pull.c:245 #, fuzzy msgid "set upstream for git pull/fetch" -msgstr "definir o ramo a montante usado com git pull/status" +msgstr "definir upstream para git pull/fetch" -#: builtin/fetch.c:146 builtin/pull.c:188 +#: builtin/fetch.c:149 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "acrescentar a .git/FETCH_HEAD em vez de substituir" -#: builtin/fetch.c:148 builtin/pull.c:191 +#: builtin/fetch.c:151 +#, fuzzy +msgid "use atomic transaction to update references" +msgstr "solicitar transação atómica no servidor remoto" + +#: builtin/fetch.c:153 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "caminho para o comando upload pack no remoto" -#: builtin/fetch.c:149 +#: builtin/fetch.c:154 #, fuzzy msgid "force overwrite of local reference" msgstr "forçar a substituição do ramo local" -#: builtin/fetch.c:151 +#: builtin/fetch.c:156 msgid "fetch from multiple remotes" msgstr "obter de múltiplos remotos" -#: builtin/fetch.c:153 builtin/pull.c:195 +#: builtin/fetch.c:158 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "obter todas as tags e objetos associados" -#: builtin/fetch.c:155 +#: builtin/fetch.c:160 msgid "do not fetch all tags (--no-tags)" -msgstr "não obter todas as tags (--no-tags)" +msgstr "buscar tag nenhuma (--no-tags)" -#: builtin/fetch.c:157 +#: builtin/fetch.c:162 msgid "number of submodules fetched in parallel" msgstr "número de submódulos obtidos em paralelo" -#: builtin/fetch.c:159 builtin/pull.c:198 -msgid "prune remote-tracking branches no longer on remote" +#: builtin/fetch.c:164 +msgid "modify the refspec to place all refs within refs/prefetch/" msgstr "" -"eliminar os ramos de monitorização remotos que já não existem no remoto" -#: builtin/fetch.c:161 +#: builtin/fetch.c:166 builtin/pull.c:198 +msgid "prune remote-tracking branches no longer on remote" +msgstr "podar ramos de monitorização remotos que deixaram de estar no remoto" + +#: builtin/fetch.c:168 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 +#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:163 +#: builtin/fetch.c:170 msgid "control recursive fetching of submodules" msgstr "controlar a obtenção recursiva de submódulos" -#: builtin/fetch.c:168 +#: builtin/fetch.c:175 #, fuzzy msgid "write fetched references to the FETCH_HEAD file" msgstr "escrever o arquivo para este ficheiro" -#: builtin/fetch.c:169 builtin/pull.c:206 +#: builtin/fetch.c:176 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "manter o pacote transferido" -#: builtin/fetch.c:171 +#: builtin/fetch.c:178 msgid "allow updating of HEAD ref" msgstr "permitir a atualização da referência HEAD" -#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "aprofundar o histórico de um clone raso" -#: builtin/fetch.c:176 builtin/pull.c:212 +#: builtin/fetch.c:183 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "aprofundar o histórico de repositório raso com base na data" -#: builtin/fetch.c:182 builtin/pull.c:221 +#: builtin/fetch.c:189 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "converter num repositório completo" -#: builtin/fetch.c:185 +#: builtin/fetch.c:192 msgid "prepend this to submodule path output" msgstr "preceder isto ao caminho do submódulo" -#: builtin/fetch.c:188 +#: builtin/fetch.c:195 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:192 builtin/pull.c:224 +#: builtin/fetch.c:199 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "aceitar referência que atualizem .git/shallow" -#: builtin/fetch.c:193 builtin/pull.c:226 +#: builtin/fetch.c:200 builtin/pull.c:226 msgid "refmap" msgstr "mapa de referências" -#: builtin/fetch.c:194 builtin/pull.c:227 +#: builtin/fetch.c:201 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "especificar mapa de referências" -#: builtin/fetch.c:201 builtin/pull.c:240 +#: builtin/fetch.c:208 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "" -#: builtin/fetch.c:204 builtin/fetch.c:206 +#: builtin/fetch.c:210 +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" +msgstr "" + +#: builtin/fetch.c:213 builtin/fetch.c:215 #, fuzzy msgid "run 'maintenance --auto' after fetching" -msgstr "eliminar remotos depois de obter" +msgstr "executar 'maintenance --auto' após buscar" -#: builtin/fetch.c:208 builtin/pull.c:243 +#: builtin/fetch.c:217 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "" -#: builtin/fetch.c:210 +#: builtin/fetch.c:219 #, fuzzy msgid "write the commit-graph after fetching" -msgstr "eliminar remotos depois de obter" +msgstr "escrever commit-graph após buscar" -#: builtin/fetch.c:212 +#: builtin/fetch.c:221 #, fuzzy msgid "accept refspecs from stdin" msgstr "ler referências do stdin" -#: builtin/fetch.c:523 +#: builtin/fetch.c:586 msgid "Couldn't find remote ref HEAD" -msgstr "Referência remota HEAD não encontrada" +msgstr "Incapaz de encontrar ref remota HEAD" -#: builtin/fetch.c:677 +#: builtin/fetch.c:757 #, c-format msgid "configuration fetch.output contains invalid value %s" -msgstr "a configuração fetch.output contém o valor inválido %s" +msgstr "configuração fetch.output contém valor inválido %s" -#: builtin/fetch.c:775 +#: builtin/fetch.c:856 #, c-format msgid "object %s not found" -msgstr "objeto %s não encontrado" +msgstr "objeto %s por encontrar" -#: builtin/fetch.c:779 +#: builtin/fetch.c:860 msgid "[up to date]" msgstr "[atualizado]" -#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 +#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961 msgid "[rejected]" msgstr "[rejeitado]" -#: builtin/fetch.c:793 +#: builtin/fetch.c:874 msgid "can't fetch in current branch" -msgstr "não é possível obter no ramo atual" +msgstr "incapaz buscar no ramo atual" -#: builtin/fetch.c:803 +#: builtin/fetch.c:884 msgid "[tag update]" msgstr "[tag atualizada]" -#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 -#: builtin/fetch.c:875 +#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944 +#: builtin/fetch.c:956 msgid "unable to update local ref" -msgstr "não é possível atualizar a referência local" +msgstr "incapaz atualizar ref local" -#: builtin/fetch.c:808 +#: builtin/fetch.c:889 msgid "would clobber existing tag" msgstr "" -#: builtin/fetch.c:830 +#: builtin/fetch.c:911 msgid "[new tag]" msgstr "[nova tag]" -#: builtin/fetch.c:833 +#: builtin/fetch.c:914 msgid "[new branch]" msgstr "[novo ramo]" -#: builtin/fetch.c:836 +#: builtin/fetch.c:917 msgid "[new ref]" msgstr "[nova referência]" -#: builtin/fetch.c:875 +#: builtin/fetch.c:956 msgid "forced update" msgstr "atualização forçada" -#: builtin/fetch.c:880 +#: builtin/fetch.c:961 msgid "non-fast-forward" msgstr "sem avanço-rápido" -#: builtin/fetch.c:901 +#: builtin/fetch.c:1065 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" "flag or run 'git config fetch.showForcedUpdates true'." msgstr "" -#: builtin/fetch.c:905 +#: builtin/fetch.c:1069 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14678,105 +15324,104 @@ msgid "" " to avoid this check.\n" msgstr "" -#: builtin/fetch.c:939 +#: builtin/fetch.c:1101 #, c-format msgid "%s did not send all necessary objects\n" -msgstr "%s não enviou todos os objetos necessários\n" +msgstr "%s ficou por enviar todos objetos necessários\n" -#: builtin/fetch.c:960 -#, c-format -msgid "reject %s because shallow roots are not allowed to be updated" -msgstr "%s rejeitado, porque as raízes rasas não podem ser atualizadas" +#: builtin/fetch.c:1129 +#, fuzzy, c-format +msgid "rejected %s because shallow roots are not allowed to be updated" +msgstr "%s rejeitada, porque raízes rasas são proibidas de ser atualizadas" -#: builtin/fetch.c:1053 builtin/fetch.c:1191 +#: builtin/fetch.c:1206 builtin/fetch.c:1357 #, c-format msgid "From %.*s\n" msgstr "De %.*s\n" -#: builtin/fetch.c:1064 +#: builtin/fetch.c:1228 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -"algumas referências locais não puderam ser atualizadas; tente executar\n" -" 'git remote prune %s' para remover algum ramo antigo em conflito" +"algumas refs locais ficaram desatualizadas; tenta executar\n" +" 'git remote prune %s' para remover algum ramo antigo e conflituoso" -#: builtin/fetch.c:1161 +#: builtin/fetch.c:1327 #, c-format msgid " (%s will become dangling)" msgstr " (%s ficará suspenso)" -#: builtin/fetch.c:1162 +#: builtin/fetch.c:1328 #, c-format msgid " (%s has become dangling)" msgstr " (%s ficou suspenso)" -#: builtin/fetch.c:1194 +#: builtin/fetch.c:1360 msgid "[deleted]" msgstr "[eliminado]" -#: builtin/fetch.c:1195 builtin/remote.c:1118 +#: builtin/fetch.c:1361 builtin/remote.c:1118 msgid "(none)" msgstr "(nenhum)" -#: builtin/fetch.c:1218 +#: builtin/fetch.c:1384 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" -msgstr "Obtenção de objetos no ramo atual %s de um repositório não nu recusada" +msgstr "Recusando buscar para o ramo atual %s de repositório diferente de nu" -#: builtin/fetch.c:1237 +#: builtin/fetch.c:1403 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" -msgstr "O valor \"%2$s\" da opção \"%1$s\" não é válido em %3$s" +msgstr "Opção \"%s\" com valor \"%s\" é inválido para %s" -#: builtin/fetch.c:1240 +#: builtin/fetch.c:1406 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Opção \"%s\" ignorada em %s\n" -#: builtin/fetch.c:1448 +#: builtin/fetch.c:1618 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "" -#: builtin/fetch.c:1463 +#: builtin/fetch.c:1633 #, fuzzy msgid "not setting upstream for a remote remote-tracking branch" -msgstr "" -"o ramo a montante '%s' não está guardado como um ramo de monitorização remoto" +msgstr "desdefinindo upstream para remoto de ramo de monitorização remoto" -#: builtin/fetch.c:1465 +#: builtin/fetch.c:1635 #, fuzzy msgid "not setting upstream for a remote tag" -msgstr "definir o ramo a montante usado com git pull/status" +msgstr "" -#: builtin/fetch.c:1467 +#: builtin/fetch.c:1637 #, fuzzy msgid "unknown branch type" -msgstr "objeto de tipo desconhecido %d" +msgstr "tipo de ramo desconhecido" -#: builtin/fetch.c:1469 +#: builtin/fetch.c:1639 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." msgstr "" -#: builtin/fetch.c:1598 builtin/fetch.c:1661 +#: builtin/fetch.c:1768 builtin/fetch.c:1831 #, c-format msgid "Fetching %s\n" msgstr "A obter de %s\n" -#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 +#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Incapaz buscar %s" -#: builtin/fetch.c:1620 +#: builtin/fetch.c:1790 #, fuzzy, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "fetch '%s' impossível (exit code: %d)\n" -#: builtin/fetch.c:1724 +#: builtin/fetch.c:1894 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14784,53 +15429,70 @@ msgstr "" "Nenhum repositório remoto especificado. Especifique um URL ou\n" "o nome remoto a partir do qual as novas revisões devem ser obtidas." -#: builtin/fetch.c:1760 +#: builtin/fetch.c:1930 msgid "You need to specify a tag name." msgstr "Deve especificar um nome para a tag." -#: builtin/fetch.c:1825 +#: builtin/fetch.c:1994 +msgid "--negotiate-only needs one or more --negotiate-tip=*" +msgstr "--negotiate-only precisa de um ou mais --negotiate-tip=*" + +#: builtin/fetch.c:1998 msgid "Negative depth in --deepen is not supported" msgstr "Profundidade negativa em --deepen tem suporte nenhum" -#: builtin/fetch.c:1827 +#: builtin/fetch.c:2000 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen e --depth são mutuamente exclusivos" -#: builtin/fetch.c:1832 +#: builtin/fetch.c:2005 msgid "--depth and --unshallow cannot be used together" -msgstr "--depth e --unshallow não podem ser usados juntos" +msgstr "--depth e --unshallow incapazes serem usados juntos" -#: builtin/fetch.c:1834 +#: builtin/fetch.c:2007 msgid "--unshallow on a complete repository does not make sense" -msgstr "usar --unshallow num repositório completo não faz sentido" +msgstr "--unshallow num repositório completo faz sentido nenhum" -#: builtin/fetch.c:1851 +#: builtin/fetch.c:2024 msgid "fetch --all does not take a repository argument" -msgstr "fetch --all não leva um repositório como argumento" +msgstr "fetch --all leva como argumento repositório nenhum" -#: builtin/fetch.c:1853 +#: builtin/fetch.c:2026 msgid "fetch --all does not make sense with refspecs" -msgstr "fetch --all não faz sentido com especificadores de referência" +msgstr "fetch --all com refspecs, faz sentido nenhum" -#: builtin/fetch.c:1862 +#: builtin/fetch.c:2035 #, c-format msgid "No such remote or remote group: %s" -msgstr "O remoto ou grupo remoto não existe: %s" +msgstr "Remoto ou grupo remoto inexistente: %s" -#: builtin/fetch.c:1869 +#: builtin/fetch.c:2042 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Buscar um grupo e especificar refspecs faz sentido nenhum" -#: builtin/fetch.c:1887 +#: builtin/fetch.c:2058 +msgid "must supply remote when using --negotiate-only" +msgstr "" + +#: builtin/fetch.c:2063 +msgid "Protocol does not support --negotiate-only, exiting." +msgstr "" + +#: builtin/fetch.c:2082 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "" -#: builtin/fetch.c:1891 +#: builtin/fetch.c:2086 +#, fuzzy +msgid "--atomic can only be used when fetching from one remote" +msgstr "" + +#: builtin/fetch.c:2090 #, fuzzy msgid "--stdin can only be used when fetching from one remote" -msgstr "A opção --exec só pode ser usada em conjunto com --remote" +msgstr "" #: builtin/fmt-merge-msg.c:7 msgid "" @@ -14876,53 +15538,53 @@ msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]" msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -#: builtin/for-each-ref.c:28 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for shells" msgstr "" "envolver os marcadores de posição em aspas de forma adequada para " "interpretadores de comandos" -#: builtin/for-each-ref.c:30 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for perl" msgstr "envolver os marcadores de posição em aspas de forma adequada para perl" -#: builtin/for-each-ref.c:32 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for python" msgstr "" "envolver os marcadores de posição em aspas de forma adequada para python" -#: builtin/for-each-ref.c:34 +#: builtin/for-each-ref.c:36 msgid "quote placeholders suitably for Tcl" msgstr "envolver os marcadores de posição em aspas de forma adequada para Tcl" -#: builtin/for-each-ref.c:37 +#: builtin/for-each-ref.c:39 msgid "show only <n> matched refs" msgstr "mostrar apenas <n> referências correspondidas" -#: builtin/for-each-ref.c:39 builtin/tag.c:440 +#: builtin/for-each-ref.c:41 builtin/tag.c:483 #, fuzzy msgid "respect format colors" msgstr "formato esperado: %%(color:<cor>)" -#: builtin/for-each-ref.c:42 +#: builtin/for-each-ref.c:44 msgid "print only refs which points at the given object" msgstr "imprimir apenas referências que apontem para o objeto fornecido" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:46 msgid "print only refs that are merged" msgstr "imprimir apenas referenciadas integradas" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:47 msgid "print only refs that are not merged" -msgstr "imprimir apenas referências não integrada" +msgstr "imprimir apenas refs que estão por juntar" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:48 msgid "print only refs which contain the commit" -msgstr "imprimir apenas referências que contenham o commit" +msgstr "imprimir apenas refs que contenham o commit" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:49 msgid "print only refs which don't contain the commit" -msgstr "imprimir apenas referências que não contenham o commit" +msgstr "imprimir apenas refs que contenham outros commits" #: builtin/for-each-repo.c:9 msgid "git for-each-repo --config=<config> <command-args>" @@ -14940,249 +15602,249 @@ msgstr "" msgid "missing --config=<config>" msgstr "" -#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 +#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129 #, fuzzy msgid "unknown" -msgstr "desconhecido:" +msgstr "desconhecido" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:101 builtin/fsck.c:121 +#: builtin/fsck.c:78 builtin/fsck.c:100 #, fuzzy, c-format msgid "error in %s %s: %s" -msgstr "erro no objeto: %s" +msgstr "erro em %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:115 +#: builtin/fsck.c:94 #, fuzzy, c-format msgid "warning in %s %s: %s" -msgstr "não é possível abrir %s: %s" +msgstr "aviso em %s %s: %s" -#: builtin/fsck.c:144 builtin/fsck.c:147 +#: builtin/fsck.c:124 builtin/fsck.c:127 #, c-format msgid "broken link from %7s %s" msgstr "" -#: builtin/fsck.c:156 +#: builtin/fsck.c:136 #, fuzzy msgid "wrong object type in link" -msgstr "objeto de tipo desconhecido %d" +msgstr "link com tipo de objeto errado" -#: builtin/fsck.c:172 +#: builtin/fsck.c:152 #, c-format msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" -#: builtin/fsck.c:283 +#: builtin/fsck.c:264 #, fuzzy, c-format msgid "missing %s %s" -msgstr "falta o objeto %s de %s" +msgstr "" -#: builtin/fsck.c:310 +#: builtin/fsck.c:291 #, fuzzy, c-format msgid "unreachable %s %s" msgstr "já se tem %s (%s)" -#: builtin/fsck.c:330 +#: builtin/fsck.c:311 #, fuzzy, c-format msgid "dangling %s %s" msgstr "balanceando %s %s" -#: builtin/fsck.c:340 +#: builtin/fsck.c:321 #, fuzzy msgid "could not create lost-found" -msgstr "não foi possível criar o ficheiro '%s'" +msgstr "incapaz criar lost-found" -#: builtin/fsck.c:351 +#: builtin/fsck.c:332 #, fuzzy, c-format msgid "could not finish '%s'" -msgstr "não foi possível reiniciar '%s'" +msgstr "incapaz acabar '%s'" -#: builtin/fsck.c:368 +#: builtin/fsck.c:349 #, fuzzy, c-format msgid "Checking %s" -msgstr "A verificar objetos" +msgstr "Verificando %s" -#: builtin/fsck.c:406 +#: builtin/fsck.c:387 #, fuzzy, c-format msgid "Checking connectivity (%d objects)" -msgstr "A verificar conectividade" +msgstr "Verificando conectividade (%d objetos)" -#: builtin/fsck.c:425 +#: builtin/fsck.c:406 #, fuzzy, c-format msgid "Checking %s %s" -msgstr "A verificar o patch %s..." +msgstr "Verificando %s %s" -#: builtin/fsck.c:430 +#: builtin/fsck.c:411 msgid "broken links" -msgstr "" +msgstr "links quebrados" -#: builtin/fsck.c:439 +#: builtin/fsck.c:420 #, fuzzy, c-format msgid "root %s" -msgstr "raiz" +msgstr "raiz %s" -#: builtin/fsck.c:447 +#: builtin/fsck.c:428 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "" -#: builtin/fsck.c:476 +#: builtin/fsck.c:457 #, c-format msgid "%s: object corrupt or missing" msgstr "" -#: builtin/fsck.c:501 +#: builtin/fsck.c:482 #, fuzzy, c-format msgid "%s: invalid reflog entry %s" -msgstr "referência inválida: %s" +msgstr "" -#: builtin/fsck.c:515 +#: builtin/fsck.c:496 #, fuzzy, c-format msgid "Checking reflog %s->%s" msgstr "Verificando reflog %s->%s" -#: builtin/fsck.c:549 +#: builtin/fsck.c:530 #, fuzzy, c-format msgid "%s: invalid sha1 pointer %s" msgstr "linha rasa inválida: %s" -#: builtin/fsck.c:556 +#: builtin/fsck.c:537 #, fuzzy, c-format msgid "%s: not a commit" -msgstr "'%s' não é um commit" +msgstr "%s: é commit nenhum" -#: builtin/fsck.c:610 +#: builtin/fsck.c:591 #, fuzzy msgid "notice: No default references" -msgstr "não foi possível eliminar as referências: %s" +msgstr "notificação: Referências padrão nenhumas" -#: builtin/fsck.c:625 +#: builtin/fsck.c:606 #, fuzzy, c-format msgid "%s: object corrupt or missing: %s" -msgstr "objeto não encontrado: %s" +msgstr "%s: objeto roto ou em falta: %s" -#: builtin/fsck.c:638 +#: builtin/fsck.c:619 #, fuzzy, c-format msgid "%s: object could not be parsed: %s" -msgstr "não foi possível analisar %s" +msgstr "%s: objeto incapaz de ser processado: %s" -#: builtin/fsck.c:658 +#: builtin/fsck.c:639 #, fuzzy, c-format msgid "bad sha1 file: %s" -msgstr "linha rasa inválida: %s" +msgstr "mau ficheiro sha1: %s" -#: builtin/fsck.c:673 +#: builtin/fsck.c:654 #, fuzzy msgid "Checking object directory" -msgstr "A verificar diretórios de objetos" +msgstr "Verificando pasta objeto" -#: builtin/fsck.c:676 +#: builtin/fsck.c:657 msgid "Checking object directories" -msgstr "A verificar diretórios de objetos" +msgstr "Verificando pastas objeto" -#: builtin/fsck.c:691 +#: builtin/fsck.c:672 #, fuzzy, c-format msgid "Checking %s link" -msgstr "A extrair ficheiros" +msgstr "Verfificando ligação %s" -#: builtin/fsck.c:696 builtin/index-pack.c:865 +#: builtin/fsck.c:677 builtin/index-pack.c:864 #, c-format msgid "invalid %s" -msgstr "inválido %s" +msgstr "%s inválido" -#: builtin/fsck.c:703 +#: builtin/fsck.c:684 #, fuzzy, c-format msgid "%s points to something strange (%s)" -msgstr "%s - não é algo se possa integrar" +msgstr "%s aponta para algo estranho (%s)" -#: builtin/fsck.c:709 +#: builtin/fsck.c:690 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "" -#: builtin/fsck.c:713 +#: builtin/fsck.c:694 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "" -#: builtin/fsck.c:725 +#: builtin/fsck.c:706 #, fuzzy msgid "Checking cache tree" -msgstr "A verificar o patch %s..." +msgstr "" -#: builtin/fsck.c:730 +#: builtin/fsck.c:711 #, fuzzy, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "Falha ao atualizar a árvore de cache principal" -#: builtin/fsck.c:739 +#: builtin/fsck.c:720 msgid "non-tree in cache-tree" msgstr "" -#: builtin/fsck.c:770 +#: builtin/fsck.c:751 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opções>] [<objeto>...]" -#: builtin/fsck.c:776 +#: builtin/fsck.c:757 msgid "show unreachable objects" msgstr "mostrar objetos inalcançáveis" -#: builtin/fsck.c:777 +#: builtin/fsck.c:758 msgid "show dangling objects" msgstr "mostrar objetos suspensos" -#: builtin/fsck.c:778 +#: builtin/fsck.c:759 msgid "report tags" msgstr "mostrar tags" -#: builtin/fsck.c:779 +#: builtin/fsck.c:760 msgid "report root nodes" msgstr "mostrar nós raiz" -#: builtin/fsck.c:780 +#: builtin/fsck.c:761 msgid "make index objects head nodes" msgstr "considerar objetos do índice como nós cabeça" -#: builtin/fsck.c:781 +#: builtin/fsck.c:762 msgid "make reflogs head nodes (default)" msgstr "considerar os reflogs como nós cabeça (predefinição)" -#: builtin/fsck.c:782 +#: builtin/fsck.c:763 msgid "also consider packs and alternate objects" msgstr "considerar também pacotes e objetos sobressalente" -#: builtin/fsck.c:783 +#: builtin/fsck.c:764 msgid "check only connectivity" msgstr "verificar só a conetividade" -#: builtin/fsck.c:784 +#: builtin/fsck.c:765 builtin/mktag.c:75 msgid "enable more strict checking" msgstr "ativar verificação mais rigorosa" -#: builtin/fsck.c:786 +#: builtin/fsck.c:767 msgid "write dangling objects in .git/lost-found" msgstr "escrever objetos suspensos em .git/lost-found" -#: builtin/fsck.c:787 builtin/prune.c:134 +#: builtin/fsck.c:768 builtin/prune.c:134 msgid "show progress" msgstr "mostrar progresso" -#: builtin/fsck.c:788 +#: builtin/fsck.c:769 msgid "show verbose names for reachable objects" msgstr "mostrar nomes verbosos de objetos inalcançáveis" -#: builtin/fsck.c:847 builtin/index-pack.c:261 +#: builtin/fsck.c:828 builtin/index-pack.c:262 msgid "Checking objects" -msgstr "A verificar objetos" +msgstr "Verificando objetos" -#: builtin/fsck.c:875 +#: builtin/fsck.c:856 #, fuzzy, c-format msgid "%s: object missing" msgstr "mostrar tamanho do objeto" -#: builtin/fsck.c:886 +#: builtin/fsck.c:867 #, fuzzy, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho" @@ -15191,27 +15853,27 @@ msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho" msgid "git gc [<options>]" msgstr "git gc [<opções>]" -#: builtin/gc.c:94 +#: builtin/gc.c:93 #, c-format msgid "Failed to fstat %s: %s" msgstr "falha ao invocar fstat sobre %s: %s" -#: builtin/gc.c:130 +#: builtin/gc.c:129 #, fuzzy, c-format msgid "failed to parse '%s' value '%s'" -msgstr "falha ao abrir '%s': %s" +msgstr "" -#: builtin/gc.c:479 builtin/init-db.c:58 +#: builtin/gc.c:487 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" -msgstr "não é possível invocar stat sobre '%s'" +msgstr "incapaz estatutar '%s'" -#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530 +#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573 #, c-format msgid "cannot read '%s'" -msgstr "não é possível ler '%s'" +msgstr "incapaz ler '%s'" -#: builtin/gc.c:495 +#: builtin/gc.c:503 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -15221,211 +15883,240 @@ msgid "" "%s" msgstr "" "A última execução do gc reportou o seguinte.\n" -"Corrija a origem do problema e remova %s.\n" -"A limpeza automática não será realizada enquanto o ficheiro existir.\n" +"Corrije a origem do problema e remove %s.\n" +"A limpeza automática apenas será realizada quando o ficheiro for removido.\n" "\n" "%s" -#: builtin/gc.c:543 +#: builtin/gc.c:551 msgid "prune unreferenced objects" -msgstr "eliminar ficheiros não referenciados" +msgstr "podar objetos por referênciar" -#: builtin/gc.c:545 +#: builtin/gc.c:553 msgid "be more thorough (increased runtime)" msgstr "ser mais minucioso (aumenta o tempo de execução)" -#: builtin/gc.c:546 +#: builtin/gc.c:554 msgid "enable auto-gc mode" msgstr "ativar modo auto-gc" -#: builtin/gc.c:549 +#: builtin/gc.c:557 msgid "force running gc even if there may be another gc running" msgstr "forçar a execução do gc mesmo que haja outro gc a executar" -#: builtin/gc.c:552 +#: builtin/gc.c:560 msgid "repack all other packs except the largest pack" msgstr "" -#: builtin/gc.c:569 +#: builtin/gc.c:576 #, fuzzy, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "falha ao analisar o valor %s de gc.logexpiry" -#: builtin/gc.c:580 +#: builtin/gc.c:587 #, fuzzy, c-format msgid "failed to parse prune expiry value %s" msgstr "falha ao analisar o valor %s de gc.logexpiry" -#: builtin/gc.c:600 +#: builtin/gc.c:607 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -"Autocompactando o repositório para desempenho ótimizado, em segundo plano.\n" +"Auto-empacotando repositório, em segundo plano, para desempenho otimizado.\n" -#: builtin/gc.c:602 +#: builtin/gc.c:609 #, c-format msgid "Auto packing the repository for optimum performance.\n" -msgstr "Autocompactando o repositório para desempenho ótimizado.\n" +msgstr "Auto-empacotando repositório para desempenho otimizado.\n" -#: builtin/gc.c:603 +#: builtin/gc.c:610 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vê \"git help gc\" para manual de manutenção.\n" -#: builtin/gc.c:643 +#: builtin/gc.c:650 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -"gc já a executar na máquina '%s' pid %<PRIuMAX> (use --force se não for o " -"caso)" +"gc já a executar na máquina '%s' pid %<PRIuMAX> (usa --force caso contrário)" -#: builtin/gc.c:698 +#: builtin/gc.c:705 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Existem demasiados objeto soltos inalcançáveis; execute 'git prune' para os " "remover." -#: builtin/gc.c:708 +#: builtin/gc.c:715 msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" msgstr "" -#: builtin/gc.c:738 +#: builtin/gc.c:745 msgid "--no-schedule is not allowed" msgstr "" -#: builtin/gc.c:743 +#: builtin/gc.c:750 #, fuzzy, c-format msgid "unrecognized --schedule argument '%s'" -msgstr "argumento não reconhecido: %s" +msgstr "argumento --schedule desconhecido: '%s'" -#: builtin/gc.c:862 +#: builtin/gc.c:869 #, fuzzy msgid "failed to write commit-graph" -msgstr "falha ao escrever objeto de commit" +msgstr "" -#: builtin/gc.c:901 +#: builtin/gc.c:905 #, fuzzy -msgid "failed to fill remotes" -msgstr "falha ao remover %s" +msgid "failed to prefetch remotes" +msgstr "" -#: builtin/gc.c:1024 +#: builtin/gc.c:1022 #, fuzzy msgid "failed to start 'git pack-objects' process" msgstr "começar processo 'git pack-objects' falhou" -#: builtin/gc.c:1041 +#: builtin/gc.c:1039 #, fuzzy msgid "failed to finish 'git pack-objects' process" msgstr "terminar processo 'git pack-objects' falhou" -#: builtin/gc.c:1093 +#: builtin/gc.c:1091 #, fuzzy msgid "failed to write multi-pack-index" -msgstr "falha ao limpar o índice" +msgstr "" -#: builtin/gc.c:1111 +#: builtin/gc.c:1109 msgid "'git multi-pack-index expire' failed" msgstr "" -#: builtin/gc.c:1172 +#: builtin/gc.c:1170 #, fuzzy msgid "'git multi-pack-index repack' failed" -msgstr "falha ao ler o ficheiro de comando '%s'" +msgstr "" -#: builtin/gc.c:1181 +#: builtin/gc.c:1179 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" -#: builtin/gc.c:1279 +#: builtin/gc.c:1283 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "" -#: builtin/gc.c:1309 +#: builtin/gc.c:1313 #, fuzzy, c-format msgid "task '%s' failed" -msgstr "falha ao mudar o nome de '%s'" +msgstr "tarefa '%s' falhou" -#: builtin/gc.c:1389 +#: builtin/gc.c:1395 #, fuzzy, c-format msgid "'%s' is not a valid task" -msgstr "'%s' não é uma referência válida." +msgstr "'%s' é uma tarefa inválida" -#: builtin/gc.c:1394 +#: builtin/gc.c:1400 #, fuzzy, c-format msgid "task '%s' cannot be selected multiple times" -msgstr "'%s' não pode ser usado com %s" +msgstr "tarefa '%s' apenas pode ser selecionada uma vez" -#: builtin/gc.c:1409 +#: builtin/gc.c:1415 msgid "run tasks based on the state of the repository" msgstr "" -#: builtin/gc.c:1410 +#: builtin/gc.c:1416 msgid "frequency" msgstr "" -#: builtin/gc.c:1411 +#: builtin/gc.c:1417 msgid "run tasks based on frequency" msgstr "" -#: builtin/gc.c:1414 +#: builtin/gc.c:1420 msgid "do not report progress or other information over stderr" msgstr "" -#: builtin/gc.c:1415 +#: builtin/gc.c:1421 msgid "task" msgstr "" -#: builtin/gc.c:1416 +#: builtin/gc.c:1422 #, fuzzy msgid "run a specific task" msgstr "corre uma tarefa específica" -#: builtin/gc.c:1433 +#: builtin/gc.c:1439 msgid "use at most one of --auto and --schedule=<frequency>" msgstr "" -#: builtin/gc.c:1467 +#: builtin/gc.c:1482 #, fuzzy msgid "failed to run 'git config'" -msgstr "falha ao escrever para '%s'" +msgstr "falhou executar 'git config'" -#: builtin/gc.c:1512 -msgid "another process is scheduling background maintenance" +#: builtin/gc.c:1547 +#, fuzzy, c-format +msgid "failed to expand path '%s'" +msgstr "falha ao criar o caminho '%s'%s" + +#: builtin/gc.c:1576 +#, fuzzy +msgid "failed to start launchctl" +msgstr "Falha ao iniciar emacsclient." + +#: builtin/gc.c:1613 +#, fuzzy, c-format +msgid "failed to create directories for '%s'" +msgstr "falha ao criar o diretório '%s'" + +#: builtin/gc.c:1674 +#, fuzzy, c-format +msgid "failed to bootstrap service %s" +msgstr "bootstrap serviços %s falhou" + +#: builtin/gc.c:1745 +#, fuzzy +msgid "failed to create temp xml file" +msgstr "" + +#: builtin/gc.c:1835 +#, fuzzy +msgid "failed to start schtasks" msgstr "" -#: builtin/gc.c:1525 +#: builtin/gc.c:1879 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" -#: builtin/gc.c:1544 +#: builtin/gc.c:1896 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" -#: builtin/gc.c:1550 +#: builtin/gc.c:1900 #, fuzzy msgid "failed to open stdin of 'crontab'" -msgstr "falha ao abrir '%s'" +msgstr "" -#: builtin/gc.c:1592 +#: builtin/gc.c:1942 msgid "'crontab' died" msgstr "" -#: builtin/gc.c:1605 +#: builtin/gc.c:1976 +msgid "another process is scheduling background maintenance" +msgstr "" + +#: builtin/gc.c:2000 #, fuzzy msgid "failed to add repo to global config" -msgstr "falha ao ler o ficheiro de comando '%s'" +msgstr "" -#: builtin/gc.c:1615 +#: builtin/gc.c:2010 #, fuzzy msgid "git maintenance <subcommand> [<options>]" msgstr "git notes prune [<opções>]" -#: builtin/gc.c:1634 +#: builtin/gc.c:2029 #, fuzzy, c-format msgid "invalid subcommand: %s" msgstr "commit inválido %s" @@ -15434,12 +16125,12 @@ msgstr "commit inválido %s" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opções>] [-e] <padrão> [<rev>...] [[--] <caminho>...]" -#: builtin/grep.c:225 +#: builtin/grep.c:223 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: falha ao criar thread: %s" -#: builtin/grep.c:279 +#: builtin/grep.c:277 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "o número de threads especificado em %2$s é inválido (%1$d)" @@ -15448,271 +16139,272 @@ msgstr "o número de threads especificado em %2$s é inválido (%1$d)" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 -#: builtin/pack-objects.c:2936 +#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791 +#: builtin/pack-objects.c:3129 #, c-format msgid "no threads support, ignoring %s" msgstr "sem suporte de threads, %s ignorado" -#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 +#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643 #, c-format msgid "unable to read tree (%s)" -msgstr "não foi possível ler a árvore (%s)" +msgstr "incapaz ler árvore (%s)" -#: builtin/grep.c:655 +#: builtin/grep.c:658 #, c-format msgid "unable to grep from object of type %s" -msgstr "não foi possível efetuar grep de objetos do tipo %s" +msgstr "incapaz efetuar grep a objetos do tipo %s" -#: builtin/grep.c:736 +#: builtin/grep.c:738 #, c-format msgid "switch `%c' expects a numerical value" -msgstr "a opção '%c' espera um valor numérico" +msgstr "" -#: builtin/grep.c:835 +#: builtin/grep.c:837 msgid "search in index instead of in the work tree" msgstr "procurar no índice em vez de procurar na árvore de trabalho" -#: builtin/grep.c:837 +#: builtin/grep.c:839 msgid "find in contents not managed by git" -msgstr "procurar em conteúdos não geridos pelo git" +msgstr "procurar em conteúdos fora da gestão do git" -#: builtin/grep.c:839 +#: builtin/grep.c:841 msgid "search in both tracked and untracked files" -msgstr "procurar em ficheiros controlados e não controlados" +msgstr "procurar em ficheiros monitorizados e por monitorizar" -#: builtin/grep.c:841 +#: builtin/grep.c:843 msgid "ignore files specified via '.gitignore'" msgstr "ignorar ficheiros especificados via '.gitignore'" -#: builtin/grep.c:843 +#: builtin/grep.c:845 msgid "recursively search in each submodule" msgstr "procurar recursivamente em cada submódulo" -#: builtin/grep.c:846 +#: builtin/grep.c:848 msgid "show non-matching lines" -msgstr "mostrar linhas não correspondidas" +msgstr "mostrar linhas por corresponder" -#: builtin/grep.c:848 +#: builtin/grep.c:850 msgid "case insensitive matching" -msgstr "não diferenciar maiúsculas de minúsculas" +msgstr "correspondência insensível a maiúsculas e minúsculas" -#: builtin/grep.c:850 +#: builtin/grep.c:852 msgid "match patterns only at word boundaries" msgstr "corresponder padrões apenas a palavras" -#: builtin/grep.c:852 +#: builtin/grep.c:854 msgid "process binary files as text" msgstr "processar ficheiros binários como texto" -#: builtin/grep.c:854 +#: builtin/grep.c:856 msgid "don't match patterns in binary files" msgstr "ignorar ficheiros binários" -#: builtin/grep.c:857 +#: builtin/grep.c:859 msgid "process binary files with textconv filters" msgstr "processar ficheiros binários com filtros textconv" -#: builtin/grep.c:859 +#: builtin/grep.c:861 #, fuzzy msgid "search in subdirectories (default)" -msgstr "eliminar referências soltas (predefinição)" +msgstr "" -#: builtin/grep.c:861 +#: builtin/grep.c:863 msgid "descend at most <depth> levels" msgstr "descer no máximo até <profundidade>" -#: builtin/grep.c:865 +#: builtin/grep.c:867 msgid "use extended POSIX regular expressions" msgstr "usar expressões regulares estendidas do POSIX" -#: builtin/grep.c:868 +#: builtin/grep.c:870 msgid "use basic POSIX regular expressions (default)" msgstr "usar expressões regulares básicas do POSIX (predefinição)" -#: builtin/grep.c:871 +#: builtin/grep.c:873 msgid "interpret patterns as fixed strings" msgstr "interpretar padrões como cadeias de caracteres fixas" -#: builtin/grep.c:874 +#: builtin/grep.c:876 msgid "use Perl-compatible regular expressions" msgstr "usar expressões regulares compatíveis com Perl" -#: builtin/grep.c:877 +#: builtin/grep.c:879 msgid "show line numbers" msgstr "mostrar números de linha" -#: builtin/grep.c:878 +#: builtin/grep.c:880 #, fuzzy msgid "show column number of first match" msgstr "mostrar apenas nomes de ficheiro sem correspondência" -#: builtin/grep.c:879 +#: builtin/grep.c:881 msgid "don't show filenames" -msgstr "não mostrar nomes de ficheiro" +msgstr "esconder nomes de ficheiro" -#: builtin/grep.c:880 +#: builtin/grep.c:882 msgid "show filenames" msgstr "mostrar nomes de ficheiro" -#: builtin/grep.c:882 +#: builtin/grep.c:884 msgid "show filenames relative to top directory" msgstr "mostrar nomes de ficheiro relativamente ao diretório superior" -#: builtin/grep.c:884 +#: builtin/grep.c:886 msgid "show only filenames instead of matching lines" msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas" -#: builtin/grep.c:886 +#: builtin/grep.c:888 msgid "synonym for --files-with-matches" msgstr "sinónimo de --files-with-matches" -#: builtin/grep.c:889 +#: builtin/grep.c:891 msgid "show only the names of files without match" msgstr "mostrar apenas nomes de ficheiro sem correspondência" -#: builtin/grep.c:891 +#: builtin/grep.c:893 msgid "print NUL after filenames" msgstr "imprimir NUL depois dos nomes de ficheiro" -#: builtin/grep.c:894 +#: builtin/grep.c:896 #, fuzzy msgid "show only matching parts of a line" -msgstr "mostrar linhas não correspondidas" +msgstr "mostrar apenas partes da linha correspondentes" -#: builtin/grep.c:896 +#: builtin/grep.c:898 msgid "show the number of matches instead of matching lines" msgstr "mostrar o número de correspondências em vez das linha correspondidas" -#: builtin/grep.c:897 +#: builtin/grep.c:899 msgid "highlight matches" msgstr "realçar correspondências" -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "print empty line between matches from different files" msgstr "" "imprimir uma linha em branco entre correspondências de diferentes ficheiros" -#: builtin/grep.c:901 +#: builtin/grep.c:903 msgid "show filename only once above matches from same file" msgstr "" "mostrar só uma vez o nome do ficheiro acima das correspondências dentro do " "mesmo ficheiro" -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "show <n> context lines before and after matches" msgstr "mostrar <n> linhas de contexto antes e depois das correspondências" -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "show <n> context lines before matches" msgstr "mostrar <n> linhas de contexto antes das correspondências" -#: builtin/grep.c:909 +#: builtin/grep.c:911 msgid "show <n> context lines after matches" msgstr "mostrar <n> linhas de contexto depois das correspondências" -#: builtin/grep.c:911 +#: builtin/grep.c:913 msgid "use <n> worker threads" msgstr "usar <n> threads de trabalho" -#: builtin/grep.c:912 +#: builtin/grep.c:914 msgid "shortcut for -C NUM" msgstr "atalho para -C NUM" -#: builtin/grep.c:915 +#: builtin/grep.c:917 msgid "show a line with the function name before matches" msgstr "mostrar uma linha com o nome da função antes das correspondências" -#: builtin/grep.c:917 +#: builtin/grep.c:919 msgid "show the surrounding function" msgstr "mostrar a função circundante" -#: builtin/grep.c:920 +#: builtin/grep.c:922 msgid "read patterns from file" msgstr "ler padrões do ficheiro" -#: builtin/grep.c:922 +#: builtin/grep.c:924 msgid "match <pattern>" msgstr "procurar <padrão>" -#: builtin/grep.c:924 +#: builtin/grep.c:926 msgid "combine patterns specified with -e" msgstr "combinar padrões especificados com -e" -#: builtin/grep.c:936 +#: builtin/grep.c:938 msgid "indicate hit with exit status without output" -msgstr "indicar padrão encontrado no valor de saída, mas não imprimir" +msgstr "indicar correspondência, sem output, com status de saída" -#: builtin/grep.c:938 +#: builtin/grep.c:940 msgid "show only matches from files that match all patterns" msgstr "" "mostrar apenas correspondências de ficheiro que tenham todos os padrões" -#: builtin/grep.c:940 -msgid "show parse tree for grep expression" -msgstr "mostrar árvore de analise da expressões grep" - -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "pager" msgstr "paginador" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "show matching files in the pager" msgstr "mostrar ficheiros com correspondências no paginador" -#: builtin/grep.c:948 +#: builtin/grep.c:947 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir invocar grep(1) (ignorado nesta compilação)" -#: builtin/grep.c:1014 +#: builtin/grep.c:1013 #, fuzzy msgid "no pattern given" msgstr "fornecido pattern nenhum" -#: builtin/grep.c:1050 +#: builtin/grep.c:1049 msgid "--no-index or --untracked cannot be used with revs" -msgstr "--no-index ou --untracked não podem ser usados em revisões" +msgstr "--no-index ou --untracked incapazes serem usados em revs" -#: builtin/grep.c:1058 +#: builtin/grep.c:1057 #, c-format msgid "unable to resolve revision: %s" -msgstr "não foi possível resolver revisão: %s" +msgstr "incapaz resolver revisão: %s" -#: builtin/grep.c:1088 +#: builtin/grep.c:1087 #, fuzzy msgid "--untracked not supported with --recurse-submodules" -msgstr "opção não suportada com --recurse-submodules." +msgstr "--untracked insustentada com --recurse-submodules" -#: builtin/grep.c:1092 +#: builtin/grep.c:1091 msgid "invalid option combination, ignoring --threads" msgstr "" -#: builtin/grep.c:1095 builtin/pack-objects.c:3655 +#: builtin/grep.c:1094 builtin/pack-objects.c:4090 #, fuzzy msgid "no threads support, ignoring --threads" msgstr "sem suporte de threads, %s ignorado" -#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 +#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126 #, c-format msgid "invalid number of threads specified (%d)" msgstr "número de threads especificado inválido (%d)" -#: builtin/grep.c:1132 +#: builtin/grep.c:1131 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager só funciona na árvore de trabalho" -#: builtin/grep.c:1158 +#: builtin/grep.c:1157 #, fuzzy msgid "--cached or --untracked cannot be used with --no-index" -msgstr "--cached ou --untracked não podem ser usados com --no-index." +msgstr "--cached ou --untracked proibidos serem usados com --no-index" + +#: builtin/grep.c:1160 +#, fuzzy +msgid "--untracked cannot be used with --cached" +msgstr "--cached ou --untracked proibidos serem usados com --no-index" -#: builtin/grep.c:1164 +#: builtin/grep.c:1166 #, fuzzy msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" -"--[no-]exclude-standard não podem ser usados em conteúdos não controlados." +"--[no-]exclude-standard proibidos serem usados para conteúdos monitorizados" -#: builtin/grep.c:1172 +#: builtin/grep.c:1174 #, fuzzy msgid "both --cached and trees are given" msgstr "--cached e árvores foram fornecidos simultaneamente." @@ -15735,7 +16427,7 @@ msgstr "tipo do objeto" #: builtin/hash-object.c:99 msgid "write the object into the object database" -msgstr "escrever o objeto na base de dados de objetos" +msgstr "" #: builtin/hash-object.c:101 msgid "read the object from stdin" @@ -15771,15 +16463,15 @@ msgstr "imprimir lista de guias úteis" #: builtin/help.c:50 #, fuzzy msgid "print all configuration variable names" -msgstr "não é possível criar o ficheiro de configuração %s" +msgstr "imprimir todas nomes variáveis de configuração" #: builtin/help.c:52 msgid "show man page" -msgstr "mostrar página do manual" +msgstr "mostrar página man" #: builtin/help.c:53 msgid "show manual in web browser" -msgstr "mostrar o manual no navegador web" +msgstr "mostrar manual no navegador web" #: builtin/help.c:55 msgid "show info page" @@ -15788,7 +16480,7 @@ msgstr "mostrar página info" #: builtin/help.c:57 #, fuzzy msgid "print command description" -msgstr "imprimir conteúdo do commit" +msgstr "imprimir descrição de comando" #: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" @@ -15797,7 +16489,7 @@ msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]" #: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" -msgstr "formato de ajuda não reconhecido '%s'" +msgstr "formato de ajuda '%s' desconhecido" #: builtin/help.c:190 msgid "Failed to start emacsclient." @@ -15815,7 +16507,7 @@ msgstr "a versão do emacsclient '%d' é demasiado antiga (< 22)." #: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" -msgstr "falha ao executar '%s'" +msgstr "falhou exec a '%s'" #: builtin/help.c:307 #, c-format @@ -15823,8 +16515,8 @@ msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -"'%s': caminho para visualizador de manual não suportado.\n" -"Considere usar 'man.<ferramenta>.cmd'." +"'%s': path para visualizador man insustentado.\n" +"Por favor, considera usar 'man.<ferramenta>.cmd' invés." #: builtin/help.c:319 #, c-format @@ -15840,422 +16532,422 @@ msgstr "" msgid "'%s': unknown man viewer." msgstr "'%s': visualizador de manual desconhecido." -#: builtin/help.c:453 +#: builtin/help.c:452 msgid "no man viewer handled the request" msgstr "atendeu ao pedido visualizador de man nenhum" -#: builtin/help.c:461 +#: builtin/help.c:459 msgid "no info viewer handled the request" msgstr "atendeu ao pedido visualizador de info nenhum" -#: builtin/help.c:520 builtin/help.c:531 git.c:337 +#: builtin/help.c:517 builtin/help.c:528 git.c:348 #, fuzzy, c-format msgid "'%s' is aliased to '%s'" msgstr "'git %s' é um alias de '%s'" -#: builtin/help.c:534 git.c:369 +#: builtin/help.c:531 git.c:380 #, fuzzy, c-format msgid "bad alias.%s string: %s" msgstr "Valor de branch.%s.mergeoptions incorreto: %s" -#: builtin/help.c:563 builtin/help.c:593 +#: builtin/help.c:561 builtin/help.c:591 #, c-format msgid "usage: %s%s" msgstr "utilização: %s%s" -#: builtin/help.c:577 +#: builtin/help.c:575 msgid "'git help config' for more information" msgstr "" -#: builtin/index-pack.c:221 +#: builtin/index-pack.c:222 #, c-format msgid "object type mismatch at %s" msgstr "incompatibilidade de tipo de objeto em %s" -#: builtin/index-pack.c:241 +#: builtin/index-pack.c:242 #, c-format msgid "did not receive expected object %s" -msgstr "o objeto esperado %s não foi recebido" +msgstr "objeto esperado %s ficou por ser recebido" -#: builtin/index-pack.c:244 +#: builtin/index-pack.c:245 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objeto %s: tipo esperado %s, obtido %s" -#: builtin/index-pack.c:294 +#: builtin/index-pack.c:295 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" -msgstr[0] "não é possível preencher %d byte" -msgstr[1] "não é possível preencher %d bytes" +msgstr[0] "incapaz preencher %d byte" +msgstr[1] "incapaz preencher %d bytes" -#: builtin/index-pack.c:304 +#: builtin/index-pack.c:305 msgid "early EOF" -msgstr "fim de ficheiro (EOF) prematuro" +msgstr "EOF prematuro" -#: builtin/index-pack.c:305 +#: builtin/index-pack.c:306 msgid "read error on input" msgstr "erro de leitura da entrada" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:318 msgid "used more bytes than were available" msgstr "foram usados mais bytes dos que estavam disponíveis" -#: builtin/index-pack.c:324 builtin/pack-objects.c:619 +#: builtin/index-pack.c:325 builtin/pack-objects.c:756 msgid "pack too large for current definition of off_t" msgstr "pacote demasiado grande para a definição atual de off_t" -#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:328 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "o pacote excede o tamanho máximo permitido" -#: builtin/index-pack.c:342 builtin/repack.c:286 +#: builtin/index-pack.c:343 #, c-format msgid "unable to create '%s'" -msgstr "não foi possível criar '%s'" +msgstr "incapaz criar '%s'" -#: builtin/index-pack.c:348 +#: builtin/index-pack.c:349 #, c-format msgid "cannot open packfile '%s'" -msgstr "não é possível abrir o ficheiro de pacote '%s'" +msgstr "incapaz abrir ficheiro de pacote '%s'" -#: builtin/index-pack.c:362 +#: builtin/index-pack.c:363 msgid "pack signature mismatch" -msgstr "a assinatura do pacote não corresponde" +msgstr "assinatura de pacote faz correspondência nenhuma" -#: builtin/index-pack.c:364 +#: builtin/index-pack.c:365 #, c-format msgid "pack version %<PRIu32> unsupported" -msgstr "versão de pacote %<PRIu32> não suportada" +msgstr "versão de pacote %<PRIu32> insustentada" -#: builtin/index-pack.c:382 +#: builtin/index-pack.c:381 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "pacote com objeto incorreto no offset %<PRIuMAX>: %s" -#: builtin/index-pack.c:488 +#: builtin/index-pack.c:487 #, c-format msgid "inflate returned %d" msgstr "a descompactação retornou %d" -#: builtin/index-pack.c:537 +#: builtin/index-pack.c:536 msgid "offset value overflow for delta base object" msgstr "delta de objeto base com capacidade excedida no valor de offset" -#: builtin/index-pack.c:545 +#: builtin/index-pack.c:544 msgid "delta base offset is out of bound" -msgstr "offset da base delta está fora do limite" +msgstr "offset de base delta está fora de limite" -#: builtin/index-pack.c:553 +#: builtin/index-pack.c:552 #, c-format msgid "unknown object type %d" -msgstr "objeto de tipo desconhecido %d" +msgstr "tipo de objeto %d desconhecido" -#: builtin/index-pack.c:584 +#: builtin/index-pack.c:583 msgid "cannot pread pack file" -msgstr "não é possível invocar pread sobre o ficheiro de pacote" +msgstr "incapaz invocar pread sobre ficheiro de pacote" -#: builtin/index-pack.c:586 +#: builtin/index-pack.c:585 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "fim prematuro de ficheiro de pacote, falta %<PRIuMAX> byte" msgstr[1] "fim prematuro de ficheiro de pacote, faltam %<PRIuMAX> bytes" -#: builtin/index-pack.c:612 +#: builtin/index-pack.c:611 msgid "serious inflate inconsistency" msgstr "inconsistência de descompactação grave" -#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 -#: builtin/index-pack.c:826 builtin/index-pack.c:835 +#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786 +#: builtin/index-pack.c:825 builtin/index-pack.c:834 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLISÃO DE SHA1 COM %s ENCONTRADA!" -#: builtin/index-pack.c:760 builtin/pack-objects.c:171 -#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 +#: builtin/index-pack.c:759 builtin/pack-objects.c:292 +#: builtin/pack-objects.c:352 builtin/pack-objects.c:458 #, c-format msgid "unable to read %s" -msgstr "não foi possível ler %s" +msgstr "incapaz ler %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object info %s" -msgstr "não é possível ler informação de objeto existente %s" +msgstr "incapaz ler informação existente de objeto %s" -#: builtin/index-pack.c:832 +#: builtin/index-pack.c:831 #, c-format msgid "cannot read existing object %s" -msgstr "não é possível ler o objeto existente %s" +msgstr "incapaz ler objeto existente %s" -#: builtin/index-pack.c:846 +#: builtin/index-pack.c:845 #, c-format msgid "invalid blob object %s" msgstr "objeto blob inválido %s" -#: builtin/index-pack.c:849 builtin/index-pack.c:868 +#: builtin/index-pack.c:848 builtin/index-pack.c:867 #, fuzzy msgid "fsck error in packed object" -msgstr "ignorar objetos compactados" +msgstr "" -#: builtin/index-pack.c:870 +#: builtin/index-pack.c:869 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Nem todos os objetos filhos de %s são alcançáveis" -#: builtin/index-pack.c:931 builtin/index-pack.c:978 +#: builtin/index-pack.c:930 builtin/index-pack.c:977 msgid "failed to apply delta" msgstr "falha ao aplicar delta" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1160 msgid "Receiving objects" msgstr "A receber objetos" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1160 msgid "Indexing objects" msgstr "A indexar objetos" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1194 msgid "pack is corrupted (SHA1 mismatch)" -msgstr "pacote corrompido (SHA1 não corresponde)" +msgstr "pacote roto (SHA1 sem correspondência)" -#: builtin/index-pack.c:1200 +#: builtin/index-pack.c:1199 msgid "cannot fstat packfile" -msgstr "não é possível invocar fstat sobre o ficheiro de pacote" +msgstr "incapaz fstat ficheiro de pacote" -#: builtin/index-pack.c:1203 +#: builtin/index-pack.c:1202 msgid "pack has junk at the end" msgstr "pacote com lixo no final" -#: builtin/index-pack.c:1215 +#: builtin/index-pack.c:1214 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "extrema confusão em parse_pack_objects()" -#: builtin/index-pack.c:1238 +#: builtin/index-pack.c:1237 msgid "Resolving deltas" msgstr "A resolver deltas" -#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 +#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892 #, c-format msgid "unable to create thread: %s" -msgstr "não foi possível criar thread: %s" +msgstr "incapaz criar thread: %s" -#: builtin/index-pack.c:1282 +#: builtin/index-pack.c:1281 msgid "confusion beyond insanity" msgstr "extrema confusão" -#: builtin/index-pack.c:1288 +#: builtin/index-pack.c:1287 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "concluído com %d objeto local" msgstr[1] "concluído com %d objetos locais" -#: builtin/index-pack.c:1300 +#: builtin/index-pack.c:1299 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Soma de verificação inesperada no final de %s (corrupção no disco?)" -#: builtin/index-pack.c:1304 +#: builtin/index-pack.c:1303 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" -msgstr[0] "pacote com %d delta não resolvido" -msgstr[1] "pacote com %d deltas não resolvidos" +msgstr[0] "pacote tem %d delta por resolver" +msgstr[1] "pacote tem %d deltas por resolver" -#: builtin/index-pack.c:1328 +#: builtin/index-pack.c:1327 #, c-format msgid "unable to deflate appended object (%d)" -msgstr "não é possível compactar objeto acrescentado (%d)" +msgstr "incapaz descompactar objeto acrescentado (%d)" -#: builtin/index-pack.c:1424 +#: builtin/index-pack.c:1423 #, c-format msgid "local object %s is corrupt" -msgstr "objeto local %s corrompido" +msgstr "" #: builtin/index-pack.c:1444 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "o nome do ficheiro de pacote '%s' não termina em '.pack'" +#, fuzzy, c-format +msgid "packfile name '%s' does not end with '.%s'" +msgstr "ao nome de ficheiro de pacote '%s' falta terminar em '.pack'" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1468 #, fuzzy, c-format msgid "cannot write %s file '%s'" -msgstr "não é possível escrever o ficheiro de conservação '%s'" +msgstr "incapaz escrever ficheiro %s '%s'" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1476 #, fuzzy, c-format msgid "cannot close written %s file '%s'" -msgstr "não é possível fechar o ficheiro de conservação '%s' escrito" +msgstr "incapaz fechar ficheiro %s gravado '%s'" -#: builtin/index-pack.c:1501 +#: builtin/index-pack.c:1502 msgid "error while closing pack file" -msgstr "erro ao fechar ficheiro de pacote" +msgstr "" -#: builtin/index-pack.c:1515 +#: builtin/index-pack.c:1516 msgid "cannot store pack file" -msgstr "não é possível guardar ficheiro de pacote" +msgstr "incapaz guardar ficheiro de pacote" -#: builtin/index-pack.c:1523 +#: builtin/index-pack.c:1524 msgid "cannot store index file" -msgstr "não é possível guardar o ficheiro índice" +msgstr "incapaz guardar ficheiro index" -#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 +#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> incorreto" -#: builtin/index-pack.c:1631 +#: builtin/index-pack.c:1649 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Incapaz abrir ficheiro pack existente '%s'" -#: builtin/index-pack.c:1633 +#: builtin/index-pack.c:1651 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Incapaz abrir ficheiro idx existente para '%s'" -#: builtin/index-pack.c:1681 +#: builtin/index-pack.c:1699 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" -msgstr[0] "%d objeto não delta" -msgstr[1] "%d objetos não delta" +msgstr[0] "não-delta: %d objeto" +msgstr[1] "não-delta: %d objetos" -#: builtin/index-pack.c:1688 +#: builtin/index-pack.c:1706 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "comprimento de cadeia = %d: %lu objeto" msgstr[1] "comprimento de cadeia = %d: %lu objetos" -#: builtin/index-pack.c:1728 +#: builtin/index-pack.c:1748 msgid "Cannot come back to cwd" msgstr "Incapaz voltar a cwd" -#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 -#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 +#: builtin/index-pack.c:1802 builtin/index-pack.c:1805 +#: builtin/index-pack.c:1821 builtin/index-pack.c:1825 #, c-format msgid "bad %s" -msgstr "mau %s" +msgstr "%s incorreto" -#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 +#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614 #, fuzzy, c-format msgid "unknown hash algorithm '%s'" -msgstr "Formato de arquivo desconhecido '%s'" +msgstr "" -#: builtin/index-pack.c:1821 +#: builtin/index-pack.c:1850 msgid "--fix-thin cannot be used without --stdin" -msgstr "--fix-thin não pode ser usado sem --stdin" +msgstr "--fix-thin requer ser usado com --stdin" -#: builtin/index-pack.c:1823 +#: builtin/index-pack.c:1852 msgid "--stdin requires a git repository" msgstr "--stdin requer um repositório git" -#: builtin/index-pack.c:1825 +#: builtin/index-pack.c:1854 #, fuzzy msgid "--object-format cannot be used with --stdin" -msgstr "--fix-thin não pode ser usado sem --stdin" +msgstr "--object-format incapaz ser usado com --stdin" -#: builtin/index-pack.c:1831 +#: builtin/index-pack.c:1869 msgid "--verify with no packfile name given" msgstr "--verify sem nome do ficheiro de pacote indicado" -#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584 #, fuzzy msgid "fsck error in pack objects" msgstr "erro no objeto: %s" -#: builtin/init-db.c:64 +#: builtin/init-db.c:63 #, c-format msgid "cannot stat template '%s'" -msgstr "não é possível invocar stat sobre o modelo '%s'" +msgstr "incapaz obter estatutário a modelo '%s'" -#: builtin/init-db.c:69 +#: builtin/init-db.c:68 #, c-format msgid "cannot opendir '%s'" -msgstr "não é possível abrir (opendir) '%s'" +msgstr "incapaz opendir '%s'" -#: builtin/init-db.c:81 +#: builtin/init-db.c:80 #, c-format msgid "cannot readlink '%s'" -msgstr "não é possível ler (readlink) '%s'" +msgstr "incapaz readlink '%s'" -#: builtin/init-db.c:83 +#: builtin/init-db.c:82 #, c-format msgid "cannot symlink '%s' '%s'" -msgstr "não é possível criar a ligação simbólica '%s' '%s'" +msgstr "incapaz symlink '%s' '%s'" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "cannot copy '%s' to '%s'" -msgstr "não é possível copiar '%s' para '%s'" +msgstr "incapaz copiar '%s' para '%s'" -#: builtin/init-db.c:93 +#: builtin/init-db.c:92 #, c-format msgid "ignoring template %s" -msgstr "modelo %s ignorado" +msgstr "ignorando modelo %s" -#: builtin/init-db.c:124 +#: builtin/init-db.c:123 #, fuzzy, c-format msgid "templates not found in %s" -msgstr "modelos não encontrados em %s" +msgstr "modelos em %s por encontrar" -#: builtin/init-db.c:139 +#: builtin/init-db.c:138 #, c-format msgid "not copying templates from '%s': %s" -msgstr "modelos não copiados de '%s': %s" +msgstr "deixando de copiar modelos de '%s': %s" -#: builtin/init-db.c:274 +#: builtin/init-db.c:263 #, fuzzy, c-format msgid "invalid initial branch name: '%s'" -msgstr "Nome de ramo inválido: '%s'" +msgstr "Nome de ramo inicial inválido: '%s'" -#: builtin/init-db.c:366 +#: builtin/init-db.c:354 #, c-format msgid "unable to handle file type %d" -msgstr "não foi possível processar o tipo de ficheiro %d" +msgstr "incapaz lidar com tipo de ficheiro %d" -#: builtin/init-db.c:369 +#: builtin/init-db.c:357 #, c-format msgid "unable to move %s to %s" -msgstr "não foi possível mover %s para %s" +msgstr "incapaz mover %s para %s" -#: builtin/init-db.c:385 +#: builtin/init-db.c:373 msgid "attempt to reinitialize repository with different hash" msgstr "" -#: builtin/init-db.c:409 builtin/init-db.c:412 +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "%s já existe" -#: builtin/init-db.c:443 +#: builtin/init-db.c:432 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "" -#: builtin/init-db.c:474 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Reiniciei respositório partilhado existente de Git em %s%s\n" -#: builtin/init-db.c:475 +#: builtin/init-db.c:464 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Reiniciei repositório existente de Git em %s%s\n" -#: builtin/init-db.c:479 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Iniciei repositório vazio partilhado de Git em %s%s\n" -#: builtin/init-db.c:480 +#: builtin/init-db.c:469 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Iniciei repositório vazio de Git em %s%s\n" -#: builtin/init-db.c:529 +#: builtin/init-db.c:518 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -16263,58 +16955,58 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<diretório-modelo>] [--" "shared[=<permissões>]] [<diretório>]" -#: builtin/init-db.c:555 +#: builtin/init-db.c:544 msgid "permissions" msgstr "permissões" -#: builtin/init-db.c:556 +#: builtin/init-db.c:545 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "especificar que o repositório git será partilhado por vários utilizadores" -#: builtin/init-db.c:562 +#: builtin/init-db.c:551 #, fuzzy msgid "override the name of the initial branch" msgstr "substituir o bit executável dos ficheiros listados" -#: builtin/init-db.c:563 builtin/verify-pack.c:74 +#: builtin/init-db.c:552 builtin/verify-pack.c:74 msgid "hash" msgstr "" -#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "" -#: builtin/init-db.c:571 +#: builtin/init-db.c:560 #, fuzzy msgid "--separate-git-dir and --bare are mutually exclusive" -msgstr "--deepen e --depth são mutuamente exclusivos" +msgstr "" -#: builtin/init-db.c:600 builtin/init-db.c:605 +#: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" -msgstr "não é possível criar o diretório %s" +msgstr "incapaz mkdir %s" -#: builtin/init-db.c:609 builtin/init-db.c:664 +#: builtin/init-db.c:600 builtin/init-db.c:655 #, c-format msgid "cannot chdir to %s" -msgstr "não é possível mudar para o diretório %s" +msgstr "incapaz chdir para %s" -#: builtin/init-db.c:636 +#: builtin/init-db.c:627 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -"%s (ou --work-tree=<diretório>) não é permitido sem especificar %s (ou --git-" +"%s (ou --work-tree=<diretório>) só é permitido se especificar %s (ou --git-" "dir=<diretório>)" -#: builtin/init-db.c:688 +#: builtin/init-db.c:679 #, c-format msgid "Cannot access work tree '%s'" msgstr "Incapaz aceder work tree '%s'" -#: builtin/init-db.c:693 +#: builtin/init-db.c:684 #, fuzzy msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir incompatível com repositório nú" @@ -16371,10 +17063,6 @@ msgstr "Opções de integração" msgid "do not treat --- specially" msgstr "" -#: builtin/interpret-trailers.c:111 -msgid "trailer" -msgstr "terminador" - #: builtin/interpret-trailers.c:112 msgid "trailer(s) to add" msgstr "terminadores a adicionar" @@ -16382,143 +17070,145 @@ msgstr "terminadores a adicionar" #: builtin/interpret-trailers.c:123 #, fuzzy msgid "--trailer with --only-input does not make sense" -msgstr "--name-only não faz sentido" +msgstr "--trailer com --only-input faz sentido nenhum" #: builtin/interpret-trailers.c:133 msgid "no input file given for in-place editing" msgstr "fornecido para edição in-place, ficheiro de entrada nenhum" -#: builtin/log.c:58 +#: builtin/log.c:59 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opções>] [<intervalo-de-revisões>] [[--] <caminho>...]" -#: builtin/log.c:59 +#: builtin/log.c:60 msgid "git show [<options>] <object>..." msgstr "git show [<opções>] <objeto>..." -#: builtin/log.c:112 +#: builtin/log.c:113 #, c-format msgid "invalid --decorate option: %s" msgstr "opção --decorate inválida: %s" -#: builtin/log.c:179 +#: builtin/log.c:180 msgid "show source" msgstr "mostrar origem" -#: builtin/log.c:180 -msgid "Use mail map file" +#: builtin/log.c:181 +#, fuzzy +msgid "use mail map file" msgstr "usar ficheiro de mapeamento de correio" -#: builtin/log.c:183 +#: builtin/log.c:184 #, fuzzy msgid "only decorate refs that match <pattern>" msgstr "usar apenas referência que correspondam ao <padrão>" -#: builtin/log.c:185 +#: builtin/log.c:186 #, fuzzy msgid "do not decorate refs that match <pattern>" -msgstr "não considerar tags que correspondam ao <padrão>" +msgstr "deixar por decorar refs correspondentes a <padrão>" -#: builtin/log.c:186 +#: builtin/log.c:187 msgid "decorate options" msgstr "opções de decoração" -#: builtin/log.c:189 +#: builtin/log.c:190 +#, fuzzy msgid "" -"Trace the evolution of line range <start>,<end> or function :<funcname> in " +"trace the evolution of line range <start>,<end> or function :<funcname> in " "<file>" -msgstr "" +msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1" -#: builtin/log.c:212 +#: builtin/log.c:213 #, fuzzy msgid "-L<range>:<file> cannot be used with pathspec" -msgstr "%s: %s não pode ser usado com %s" +msgstr "-L<alcance>:<ficheiro>incapaz ser usado com especificador de path" -#: builtin/log.c:302 +#: builtin/log.c:306 #, c-format msgid "Final output: %d %s\n" -msgstr "Resultado final: %d %s\n" +msgstr "Output final: %d %s\n" -#: builtin/log.c:564 +#: builtin/log.c:571 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ficheiro incorreto" -#: builtin/log.c:579 builtin/log.c:674 +#: builtin/log.c:586 builtin/log.c:676 #, fuzzy, c-format msgid "could not read object %s" msgstr "incapaz ler objeto %s" -#: builtin/log.c:699 +#: builtin/log.c:701 #, fuzzy, c-format msgid "unknown type: %d" msgstr "Tipo desconhecido: %d" -#: builtin/log.c:848 +#: builtin/log.c:846 #, c-format msgid "%s: invalid cover from description mode" msgstr "" -#: builtin/log.c:855 +#: builtin/log.c:853 msgid "format.headers without value" msgstr "format.headers sem valor" -#: builtin/log.c:984 +#: builtin/log.c:982 #, fuzzy, c-format msgid "cannot open patch file %s" msgstr "incapaz abrir ficheiro patch %s" -#: builtin/log.c:1001 +#: builtin/log.c:999 #, fuzzy msgid "need exactly one range" -msgstr "É necessário exatamente um intervalo." +msgstr "" -#: builtin/log.c:1011 +#: builtin/log.c:1009 #, fuzzy msgid "not a range" msgstr "é intervalo nenhum" -#: builtin/log.c:1175 +#: builtin/log.c:1173 #, fuzzy msgid "cover letter needs email format" msgstr "A carta de apresentação precisa de um formato de e-mail" -#: builtin/log.c:1181 +#: builtin/log.c:1179 #, fuzzy msgid "failed to create cover-letter file" -msgstr "Falha ao criar os ficheiros de saída" +msgstr "" -#: builtin/log.c:1262 +#: builtin/log.c:1266 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to incorreto: %s" -#: builtin/log.c:1289 +#: builtin/log.c:1293 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opções>] [<desde> | <intervalo-de-revisões>]" -#: builtin/log.c:1347 +#: builtin/log.c:1351 #, fuzzy msgid "two output directories?" msgstr "Dois diretórios de saída?" -#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332 +#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 #, fuzzy, c-format msgid "unknown commit %s" msgstr "Commit desconhecido %s" -#: builtin/log.c:1509 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, fuzzy, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "falha ao resolver '%s' como uma referência válida." -#: builtin/log.c:1518 +#: builtin/log.c:1522 #, fuzzy msgid "could not find exact merge base" msgstr "incapaz encontrar a exata base de junção." -#: builtin/log.c:1528 +#: builtin/log.c:1532 #, fuzzy msgid "" "failed to get upstream, if you want to record base commit automatically,\n" @@ -16530,415 +17220,422 @@ msgstr "" "use branch --set-upstream-to para seguir um ramo remoto.\n" "Ou pode especificar o commit base com --base=<base-commit-id> manualmente." -#: builtin/log.c:1551 +#: builtin/log.c:1555 #, fuzzy msgid "failed to find exact merge base" msgstr "Falha ao procurar base exata de integração" -#: builtin/log.c:1568 +#: builtin/log.c:1572 msgid "base commit should be the ancestor of revision list" msgstr "o commit base deve ser o antecessor da lista de revisões" -#: builtin/log.c:1578 +#: builtin/log.c:1582 msgid "base commit shouldn't be in revision list" -msgstr "o commit base não deve fazer parte da lista de revisões" +msgstr "commit base devia estar fora da lista de revisões" -#: builtin/log.c:1636 +#: builtin/log.c:1640 msgid "cannot get patch id" -msgstr "não é possível obter o id do patch" +msgstr "incapaz obter id de patch" -#: builtin/log.c:1693 +#: builtin/log.c:1703 #, fuzzy msgid "failed to infer range-diff origin of current series" msgstr "falha ao guardar ligação à referência de notas atual (%s)" -#: builtin/log.c:1695 +#: builtin/log.c:1705 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "" -#: builtin/log.c:1739 +#: builtin/log.c:1749 msgid "use [PATCH n/m] even with a single patch" msgstr "usar [PATCH n/m] mesmo com um único patch" -#: builtin/log.c:1742 +#: builtin/log.c:1752 msgid "use [PATCH] even with multiple patches" msgstr "usar [PATCH] mesmo com múltiplos patches" -#: builtin/log.c:1746 +#: builtin/log.c:1756 msgid "print patches to standard out" msgstr "imprimir patches para a saída padrão" -#: builtin/log.c:1748 +#: builtin/log.c:1758 msgid "generate a cover letter" msgstr "gerar uma carta de apresentação" -#: builtin/log.c:1750 +#: builtin/log.c:1760 msgid "use simple number sequence for output file names" msgstr "" "usar uma sequência de números simples para denominar os ficheiros gerados" -#: builtin/log.c:1751 +#: builtin/log.c:1761 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1752 +#: builtin/log.c:1762 msgid "use <sfx> instead of '.patch'" msgstr "usar <sfx> em vez de '.patch'" -#: builtin/log.c:1754 +#: builtin/log.c:1764 msgid "start numbering patches at <n> instead of 1" msgstr "começar a numerar os patches em <n> em vez de 1" -#: builtin/log.c:1756 +#: builtin/log.c:1765 +msgid "reroll-count" +msgstr "" + +#: builtin/log.c:1766 msgid "mark the series as Nth re-roll" msgstr "marcar a série como a n-ésima reiteração" -#: builtin/log.c:1758 +#: builtin/log.c:1768 #, fuzzy msgid "max length of output filename" msgstr "tamanho máximo de cada ficheiro de pacote gerado" -#: builtin/log.c:1760 -msgid "Use [RFC PATCH] instead of [PATCH]" +#: builtin/log.c:1770 +#, fuzzy +msgid "use [RFC PATCH] instead of [PATCH]" msgstr "Usar [RFC PATCH] em vez de [PATCH]" -#: builtin/log.c:1763 +#: builtin/log.c:1773 msgid "cover-from-description-mode" msgstr "" -#: builtin/log.c:1764 +#: builtin/log.c:1774 msgid "generate parts of a cover letter based on a branch's description" msgstr "" -#: builtin/log.c:1766 -msgid "Use [<prefix>] instead of [PATCH]" +#: builtin/log.c:1776 +#, fuzzy +msgid "use [<prefix>] instead of [PATCH]" msgstr "usar [<prefixo>] em vez de [PATCH]" -#: builtin/log.c:1769 +#: builtin/log.c:1779 msgid "store resulting files in <dir>" msgstr "guardar os ficheiros resultantes em <dir>" -#: builtin/log.c:1772 +#: builtin/log.c:1782 msgid "don't strip/add [PATCH]" -msgstr "não tirar/inserir [PATCH]" +msgstr "deixar de despir/adicionar [PATCH]" -#: builtin/log.c:1775 +#: builtin/log.c:1785 msgid "don't output binary diffs" -msgstr "não gerar diffs binários" +msgstr "deixar de gerar diffs binários" -#: builtin/log.c:1777 +#: builtin/log.c:1787 msgid "output all-zero hash in From header" msgstr "preencher o cabeçalho From com hash de zeros" -#: builtin/log.c:1779 +#: builtin/log.c:1789 msgid "don't include a patch matching a commit upstream" -msgstr "não incluir um patch que coincida com um commit a montante" +msgstr "incluir nenhum patch correspondente commit upstream" -#: builtin/log.c:1781 +#: builtin/log.c:1791 msgid "show patch format instead of default (patch + stat)" msgstr "" "mostrar no formato de patch em vez de no formato por omissão (patch + stat)" -#: builtin/log.c:1783 +#: builtin/log.c:1793 msgid "Messaging" msgstr "Mensagem" -#: builtin/log.c:1784 +#: builtin/log.c:1794 msgid "header" msgstr "cabeçalho" -#: builtin/log.c:1785 +#: builtin/log.c:1795 msgid "add email header" msgstr "adicionar cabeçalho de e-mail" -#: builtin/log.c:1786 builtin/log.c:1787 +#: builtin/log.c:1796 builtin/log.c:1797 msgid "email" msgstr "e-mail" -#: builtin/log.c:1786 +#: builtin/log.c:1796 msgid "add To: header" msgstr "adicionar cabeçalho To:" -#: builtin/log.c:1787 +#: builtin/log.c:1797 msgid "add Cc: header" msgstr "adicionar cabeçalho Cc:" -#: builtin/log.c:1788 +#: builtin/log.c:1798 msgid "ident" msgstr "identidade" -#: builtin/log.c:1789 +#: builtin/log.c:1799 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -"definir o endereço From como <identidade> (ou como identidade do committer " -"se não indicado)" +"definir endereço From para <identidade> (ou, identidade do committer, caso " +"contrário)" -#: builtin/log.c:1791 +#: builtin/log.c:1801 msgid "message-id" msgstr "id-mensagem" -#: builtin/log.c:1792 +#: builtin/log.c:1802 msgid "make first mail a reply to <message-id>" msgstr "usar o primeiro email para responder a <id-mensagem>" -#: builtin/log.c:1793 builtin/log.c:1796 +#: builtin/log.c:1803 builtin/log.c:1806 msgid "boundary" msgstr "limite" -#: builtin/log.c:1794 +#: builtin/log.c:1804 msgid "attach the patch" msgstr "anexar o patch" -#: builtin/log.c:1797 +#: builtin/log.c:1807 msgid "inline the patch" msgstr "incorporar o patch" -#: builtin/log.c:1801 +#: builtin/log.c:1811 msgid "enable message threading, styles: shallow, deep" msgstr "ativar mensagens por tópicos, estilos: shallow (raso), deep (profundo)" -#: builtin/log.c:1803 +#: builtin/log.c:1813 msgid "signature" msgstr "assinatura" -#: builtin/log.c:1804 +#: builtin/log.c:1814 msgid "add a signature" msgstr "adicionar uma assinatura" -#: builtin/log.c:1805 +#: builtin/log.c:1815 msgid "base-commit" msgstr "commit-base" -#: builtin/log.c:1806 +#: builtin/log.c:1816 msgid "add prerequisite tree info to the patch series" msgstr "adicionar informação pré-requisito da árvore à série de patches" -#: builtin/log.c:1809 +#: builtin/log.c:1819 msgid "add a signature from a file" msgstr "adicionar uma assinatura de um ficheiro" -#: builtin/log.c:1810 +#: builtin/log.c:1820 msgid "don't print the patch filenames" -msgstr "não imprimir os nomes dos ficheiros de patch" +msgstr "imprimir nomes de ficheiros de patch nenhuns" -#: builtin/log.c:1812 +#: builtin/log.c:1822 #, fuzzy msgid "show progress while generating patches" msgstr "mostrar medidor de progresso durante a fase de escrita de objetos" -#: builtin/log.c:1814 +#: builtin/log.c:1824 msgid "show changes against <rev> in cover letter or single patch" msgstr "" -#: builtin/log.c:1817 +#: builtin/log.c:1827 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" -#: builtin/log.c:1819 +#: builtin/log.c:1829 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "" -#: builtin/log.c:1905 +#: builtin/log.c:1916 #, c-format msgid "invalid ident line: %s" -msgstr "linha de identidade inválida: %s" +msgstr "linha de indentação inválida: %s" -#: builtin/log.c:1920 +#: builtin/log.c:1931 #, fuzzy msgid "-n and -k are mutually exclusive" msgstr "-n e -k são mutuamente exclusivos." -#: builtin/log.c:1922 +#: builtin/log.c:1933 #, fuzzy msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc e -k são mutuamente exclusivos." -#: builtin/log.c:1930 +#: builtin/log.c:1941 msgid "--name-only does not make sense" -msgstr "--name-only não faz sentido" +msgstr "--name-only faz sentido nenhum" -#: builtin/log.c:1932 +#: builtin/log.c:1943 msgid "--name-status does not make sense" -msgstr "--name-status não faz sentido" +msgstr "--name-status faz sentido nenhum" -#: builtin/log.c:1934 +#: builtin/log.c:1945 msgid "--check does not make sense" -msgstr "--check não faz sentido" +msgstr "--check faz sentido nenhum" -#: builtin/log.c:1956 +#: builtin/log.c:1967 #, fuzzy msgid "--stdout, --output, and --output-directory are mutually exclusive" -msgstr "-b, -B e --detach são mutuamente exclusivos" +msgstr "" -#: builtin/log.c:2079 +#: builtin/log.c:2089 msgid "--interdiff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:2083 +#: builtin/log.c:2093 msgid "Interdiff:" msgstr "" -#: builtin/log.c:2084 +#: builtin/log.c:2094 #, c-format msgid "Interdiff against v%d:" msgstr "" -#: builtin/log.c:2090 +#: builtin/log.c:2100 msgid "--creation-factor requires --range-diff" msgstr "" -#: builtin/log.c:2094 +#: builtin/log.c:2104 msgid "--range-diff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:2102 +#: builtin/log.c:2112 msgid "Range-diff:" msgstr "" -#: builtin/log.c:2103 +#: builtin/log.c:2113 #, c-format msgid "Range-diff against v%d:" msgstr "" -#: builtin/log.c:2114 +#: builtin/log.c:2124 #, c-format msgid "unable to read signature file '%s'" -msgstr "não é possível ler o ficheiro de assinatura '%s'" +msgstr "incapaz ler ficheiro de assinatura '%s'" -#: builtin/log.c:2150 +#: builtin/log.c:2160 #, fuzzy msgid "Generating patches" msgstr "falha ao editar patch" -#: builtin/log.c:2194 +#: builtin/log.c:2204 #, fuzzy msgid "failed to create output files" -msgstr "Falha ao criar os ficheiros de saída" +msgstr "" -#: builtin/log.c:2253 +#: builtin/log.c:2263 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<ramo-a-montante> [<head> [<limite>]]]" -#: builtin/log.c:2307 +#: builtin/log.c:2317 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -"O ramo remoto seguido não foi encontrado, especifique <ramo-a-montante> " +"Incapaz encontrar ramo monitorizado remoto, por favor especifica <upstream> " "manualmente.\n" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:563 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opções>] [<ficheiro>...]" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:619 msgid "identify the file status with tags" msgstr "identificar o estado do ficheiro com tags" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:621 msgid "use lowercase letters for 'assume unchanged' files" -msgstr "" -"usar letras minúsculas para ficheiros 'assumido não alterado' ('assume " -"unchanged')" +msgstr "usar letras minúsculas para ficheiros 'assume unchanged'" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:623 #, fuzzy msgid "use lowercase letters for 'fsmonitor clean' files" -msgstr "" -"usar letras minúsculas para ficheiros 'assumido não alterado' ('assume " -"unchanged')" +msgstr "usar letras minúsculas para ficheiros 'fsmonitor clean'" -#: builtin/ls-files.c:533 +#: builtin/ls-files.c:625 msgid "show cached files in the output (default)" msgstr "mostrar ficheiros em cache na saída (predefinição)" -#: builtin/ls-files.c:535 +#: builtin/ls-files.c:627 msgid "show deleted files in the output" msgstr "mostrar ficheiros eliminados na saída" -#: builtin/ls-files.c:537 +#: builtin/ls-files.c:629 msgid "show modified files in the output" msgstr "mostrar ficheiros modificados na saída" -#: builtin/ls-files.c:539 +#: builtin/ls-files.c:631 msgid "show other files in the output" msgstr "mostrar outros ficheiros na saída" -#: builtin/ls-files.c:541 +#: builtin/ls-files.c:633 msgid "show ignored files in the output" msgstr "mostrar ficheiros ignorados na saída" -#: builtin/ls-files.c:544 +#: builtin/ls-files.c:636 msgid "show staged contents' object name in the output" msgstr "mostrar nome de objetos com conteúdo preparado, na saída" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:638 msgid "show files on the filesystem that need to be removed" msgstr "" "mostrar ficheiros no sistema de ficheiros que precisam de ser removidos" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:640 msgid "show 'other' directories' names only" msgstr "mostrar nomes de diretórios 'other' (outro)" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:642 msgid "show line endings of files" msgstr "mostrar finais de linha dos ficheiros" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:644 msgid "don't show empty directories" -msgstr "não mostrar diretórios vazios" +msgstr "mostrar pastas vazias nenhumas" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:647 msgid "show unmerged files in the output" -msgstr "mostrar ficheiros não integrados na saída" +msgstr "mostrar ficheiros por juntar no output" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:649 msgid "show resolve-undo information" msgstr "mostrar informação de resolver-desfazer" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:651 msgid "skip files matching pattern" msgstr "ignorar ficheiros que correspondam ao padrão" -#: builtin/ls-files.c:562 +#: builtin/ls-files.c:654 msgid "exclude patterns are read from <file>" msgstr "ler padrões de exclusão do <ficheiro>" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:657 msgid "read additional per-directory exclude patterns in <file>" msgstr "ler padrões de exclusão por diretório do <ficheiro>" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:659 msgid "add the standard git exclusions" msgstr "incluir as exclusões standard do git" -#: builtin/ls-files.c:571 +#: builtin/ls-files.c:663 msgid "make the output relative to the project top directory" msgstr "mostrar os caminhos relativamente ao diretório superior do projeto" -#: builtin/ls-files.c:574 +#: builtin/ls-files.c:666 msgid "recurse through submodules" -msgstr "percorrer submódulos recursivamente" +msgstr "percorrer recursivamente submódulos" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:668 msgid "if any <file> is not in the index, treat this as an error" -msgstr "se um <ficheiro> não estiver no índice, tratar como erro" +msgstr "se estiver no index <ficheiro> nenhum, tratar como erro" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:669 msgid "tree-ish" msgstr "árvore-etc" -#: builtin/ls-files.c:578 +#: builtin/ls-files.c:670 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "fingir que os caminhos removidos desde <árvore-etc> ainda estão presentes" -#: builtin/ls-files.c:580 +#: builtin/ls-files.c:672 msgid "show debugging data" msgstr "mostrar dados de depuração" +#: builtin/ls-files.c:674 +#, fuzzy +msgid "suppress duplicate entries" +msgstr "suprimir a cadeias de caracteres de nomes" + #: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" @@ -16949,39 +17646,39 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<repositório> [<referências>...]]" -#: builtin/ls-remote.c:59 +#: builtin/ls-remote.c:60 msgid "do not print remote URL" -msgstr "não imprimir URL remoto" +msgstr "imprimir URL remoto nenhum" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399 msgid "exec" msgstr "exec" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 +#: builtin/ls-remote.c:62 builtin/ls-remote.c:64 msgid "path of git-upload-pack on the remote host" msgstr "caminho para git-upload-pack no servidor remoto" -#: builtin/ls-remote.c:65 +#: builtin/ls-remote.c:66 msgid "limit to tags" msgstr "restringir-se a tags" -#: builtin/ls-remote.c:66 +#: builtin/ls-remote.c:67 msgid "limit to heads" msgstr "restringir-se a cabeças" -#: builtin/ls-remote.c:67 +#: builtin/ls-remote.c:68 msgid "do not show peeled tags" -msgstr "não mostrar tags descascadas" +msgstr "mostrar nenhumas tags descascadas" -#: builtin/ls-remote.c:69 +#: builtin/ls-remote.c:70 msgid "take url.<base>.insteadOf into account" msgstr "ter url.<base>.insteadOf em conta" -#: builtin/ls-remote.c:72 +#: builtin/ls-remote.c:73 msgid "exit with exit code 2 if no matching refs are found" -msgstr "terminar com código de saída 2 se não forem encontradas referências" +msgstr "terminar com código de saída 2 se forem encontradas refs nenhumas" -#: builtin/ls-remote.c:75 +#: builtin/ls-remote.c:76 msgid "show underlying ref in addition to the object pointed by it" msgstr "mostrar a referência subjacente em adição ao objeto por ela apontado" @@ -17020,7 +17717,60 @@ msgstr "usar nomes de caminho completos" #: builtin/ls-tree.c:145 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" -"mostrar a árvore completa; não apenas o diretório atual (implica --full-name)" +"listar toda árvore; e para além do diretório atual (implica --full-name)" + +#. TRANSLATORS: keep <> in "<" mail ">" info. +#: builtin/mailinfo.c:14 +#, fuzzy +msgid "git mailinfo [<options>] <msg> <patch> < mail >info" +msgstr "git merge [<opções>] <msg> HEAD <commit>" + +#: builtin/mailinfo.c:58 +#, fuzzy +msgid "keep subject" +msgstr "manter assunto" + +#: builtin/mailinfo.c:60 +msgid "keep non patch brackets in subject" +msgstr "" + +#: builtin/mailinfo.c:62 +#, fuzzy +msgid "copy Message-ID to the end of commit message" +msgstr "Esta é a 2ª mensagem de commit:" + +#: builtin/mailinfo.c:64 +msgid "re-code metadata to i18n.commitEncoding" +msgstr "" + +#: builtin/mailinfo.c:67 +msgid "disable charset re-coding of metadata" +msgstr "" + +#: builtin/mailinfo.c:69 +msgid "encoding" +msgstr "" + +#: builtin/mailinfo.c:70 +msgid "re-code metadata to this encoding" +msgstr "" + +#: builtin/mailinfo.c:72 +msgid "use scissors" +msgstr "" + +#: builtin/mailinfo.c:73 +#, fuzzy +msgid "<action>" +msgstr "ação" + +#: builtin/mailinfo.c:74 +msgid "action when quoted CR is found" +msgstr "" + +#: builtin/mailinfo.c:77 +msgid "use headers in message's body" +msgstr "" #: builtin/mailsplit.c:241 #, c-format @@ -17057,11 +17807,11 @@ msgstr "encontrar antecessores de uma única integração com n pontos" #: builtin/merge-base.c:147 msgid "list revs not reachable from others" -msgstr "listar revisões não alcançáveis a partir de outras" +msgstr "listar revs apenas alcançáveis pelos nossos" #: builtin/merge-base.c:149 msgid "is the first one ancestor of the other?" -msgstr "o primeiro é antecessor do segundo?" +msgstr "é o primeiro antecessor do outro?" #: builtin/merge-base.c:151 msgid "find where <commit> forked from reflog of <ref>" @@ -17102,7 +17852,7 @@ msgstr "usar este comprimento de marcador para os conflitos" #: builtin/merge-file.c:45 msgid "do not warn about conflicts" -msgstr "não alertar sobre conflitos" +msgstr "deixar de alertar sobre conflitos" #: builtin/merge-file.c:47 msgid "set labels for file1/orig-file/file2" @@ -17111,221 +17861,215 @@ msgstr "definir identificares para ficheiro1/ficheiro-orig/ficheiro2" #: builtin/merge-recursive.c:47 #, c-format msgid "unknown option %s" -msgstr "opção desconhecido %s" +msgstr "" #: builtin/merge-recursive.c:53 #, c-format msgid "could not parse object '%s'" -msgstr "não foi possível analisar o objeto '%s'" +msgstr "incapaz processar objeto '%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] "não é possível processar mais do que %d base. Ignorar %s." -msgstr[1] "não é possível processar mais do que %d bases. Ignorar %s." +msgstr[0] "incapaz lidar mais do que %d base. Ignorando %s." +msgstr[1] "incapaz lidar mais do que %d bases. Ignorando %s." #: builtin/merge-recursive.c:65 msgid "not handling anything other than two heads merge." -msgstr "não se pode processar outra coisa senão integração de duas cabeças." +msgstr "apenas lidando com junção de duas heads" #: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 #, c-format msgid "could not resolve ref '%s'" -msgstr "não foi possível resolver a referência %s" +msgstr "incapaz resolver ref '%s'" #: builtin/merge-recursive.c:82 #, c-format msgid "Merging %s with %s\n" -msgstr "A integrar %s com %s\n" +msgstr "Juntando %s com %s\n" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opções>] [<commit>...]" -#: builtin/merge.c:58 -msgid "git merge --abort" -msgstr "git merge --abort" - -#: builtin/merge.c:59 -msgid "git merge --continue" -msgstr "git merge --continue" - -#: builtin/merge.c:122 +#: builtin/merge.c:123 msgid "switch `m' requires a value" msgstr "a opção 'm' requer um valor" -#: builtin/merge.c:145 +#: builtin/merge.c:146 #, fuzzy, c-format msgid "option `%s' requires a value" msgstr "a opção '%s' requer um valor" -#: builtin/merge.c:198 +#: builtin/merge.c:199 #, c-format msgid "Could not find merge strategy '%s'.\n" -msgstr "Estratégia de integração '%s' não encontrada.\n" +msgstr "Incapaz encontrar estratégia de junção '%s'.\n" -#: builtin/merge.c:199 +#: builtin/merge.c:200 #, c-format msgid "Available strategies are:" msgstr "Estratégias disponíveis:" -#: builtin/merge.c:204 +#: builtin/merge.c:205 #, c-format msgid "Available custom strategies are:" msgstr "Estratégias personalizadas disponíveis:" -#: builtin/merge.c:255 builtin/pull.c:133 +#: builtin/merge.c:256 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" -msgstr "não apresentar um diffstat ao fim da integração" +msgstr "mostrar diffstat nenhuma ao fim da junção" -#: builtin/merge.c:258 builtin/pull.c:136 +#: builtin/merge.c:259 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" -msgstr "mostrar um diffstat ao fim da integração" +msgstr "mostrar um diffstat ao fim da junção" -#: builtin/merge.c:259 builtin/pull.c:139 +#: builtin/merge.c:260 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(sinónimo de --stat)" -#: builtin/merge.c:261 builtin/pull.c:142 +#: builtin/merge.c:262 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "adicionar (no máximo <n>) entradas do shortlog à mensagem de commit da " "integração" -#: builtin/merge.c:264 builtin/pull.c:148 +#: builtin/merge.c:265 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "criar um único commit em vez de realizar uma integração" -#: builtin/merge.c:266 builtin/pull.c:151 +#: builtin/merge.c:267 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "realizar um commit se a integração for bem sucedida (predefinição)" -#: builtin/merge.c:268 builtin/pull.c:154 +#: builtin/merge.c:269 builtin/pull.c:154 msgid "edit message before committing" msgstr "editar a mensagem antes de submeter" -#: builtin/merge.c:270 +#: builtin/merge.c:271 msgid "allow fast-forward (default)" msgstr "permitir avanço rápido (predefinição)" -#: builtin/merge.c:272 builtin/pull.c:161 +#: builtin/merge.c:273 builtin/pull.c:161 msgid "abort if fast-forward is not possible" -msgstr "abortar se não é possível efetuar avanço rápido" +msgstr "abortar se fast-forward é impossível" -#: builtin/merge.c:276 builtin/pull.c:164 +#: builtin/merge.c:277 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "verificar se o commit tem uma assinatura GPG válida" -#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114 +#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114 msgid "strategy" msgstr "estratégia" -#: builtin/merge.c:278 builtin/pull.c:169 +#: builtin/merge.c:279 builtin/pull.c:169 msgid "merge strategy to use" msgstr "estratégia de integração a usar" -#: builtin/merge.c:279 builtin/pull.c:172 +#: builtin/merge.c:280 builtin/pull.c:172 msgid "option=value" msgstr "opção=valor" -#: builtin/merge.c:280 builtin/pull.c:173 +#: builtin/merge.c:281 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "opções da estratégia de integração selecionada" -#: builtin/merge.c:282 +#: builtin/merge.c:283 msgid "merge commit message (for a non-fast-forward merge)" -msgstr "mensagem de commit (de integração não suscetível a avanço rápido)" +msgstr "mensagem de commit de junção (para junções non-fast-forward)" -#: builtin/merge.c:289 +#: builtin/merge.c:290 msgid "abort the current in-progress merge" msgstr "abortar integração em curso" -#: builtin/merge.c:291 +#: builtin/merge.c:292 #, fuzzy msgid "--abort but leave index and working tree alone" msgstr "repor HEAD, índice e árvore de trabalho" -#: builtin/merge.c:293 +#: builtin/merge.c:294 msgid "continue the current in-progress merge" msgstr "continuar a integração em curso" -#: builtin/merge.c:295 builtin/pull.c:180 +#: builtin/merge.c:296 builtin/pull.c:180 msgid "allow merging unrelated histories" -msgstr "permitir integração de históricos não relacionados" +msgstr "permitir junção de históricos diferentes" -#: builtin/merge.c:302 +#: builtin/merge.c:303 #, fuzzy msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "ignorar pre-commit e commit-msg hooks" -#: builtin/merge.c:319 +#: builtin/merge.c:320 msgid "could not run stash." -msgstr "não foi possível executar o comando stash." +msgstr "incapaz executar stash." -#: builtin/merge.c:324 +#: builtin/merge.c:325 msgid "stash failed" -msgstr "falha ao executar o comando stash" +msgstr "" -#: builtin/merge.c:329 +#: builtin/merge.c:330 #, c-format msgid "not a valid object: %s" -msgstr "nome de objeto inválido: %s" +msgstr "" -#: builtin/merge.c:351 builtin/merge.c:368 +#: builtin/merge.c:352 builtin/merge.c:369 msgid "read-tree failed" msgstr "falha ao executar o comando read-tree" -#: builtin/merge.c:398 -msgid " (nothing to squash)" +#: builtin/merge.c:400 +#, fuzzy +msgid "Already up to date. (nothing to squash)" msgstr " (nada para esmagar)" -#: builtin/merge.c:409 +#: builtin/merge.c:414 #, c-format msgid "Squash commit -- not updating HEAD\n" -msgstr "Commit esmagado -- HEAD não atualizada\n" +msgstr "Squash commit -- deixar HEAD por atualizar\n" -#: builtin/merge.c:459 +#: builtin/merge.c:464 #, c-format msgid "No merge message -- not updating HEAD\n" -msgstr "Nenhuma mensagem de integração -- HEAD não atualizada\n" +msgstr "Mensagem de junção nenhuma -- deixar HEAD por atualizar\n" -#: builtin/merge.c:510 +#: builtin/merge.c:515 #, c-format msgid "'%s' does not point to a commit" -msgstr "'%s' não aponta para um commit" +msgstr "'%s' aponta para commit nenhum" -#: builtin/merge.c:597 +#: builtin/merge.c:602 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Valor de branch.%s.mergeoptions incorreto: %s" -#: builtin/merge.c:723 +#: builtin/merge.c:728 msgid "Not handling anything other than two heads merge." msgstr "Lidando nada além da junção de duas heads." -#: builtin/merge.c:736 +#: builtin/merge.c:741 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opção desconhecida de merge-recursive: -X%s" -#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" -msgstr "não foi possível escrever %s" +msgstr "incapaz escrever %s" -#: builtin/merge.c:807 +#: builtin/merge.c:812 #, c-format msgid "Could not read from '%s'" msgstr "Incapaz ler de '%s'" -#: builtin/merge.c:816 +#: builtin/merge.c:821 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" -msgstr "Usa 'git commit' para completar a junção. Committando junção nenhuma.\n" +msgstr "" +"Usa 'git commit' para completar a junção. Committando junção nenhuma.\n" -#: builtin/merge.c:822 +#: builtin/merge.c:827 #, fuzzy msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -17337,12 +18081,12 @@ msgstr "" "branch.\n" "\n" -#: builtin/merge.c:827 +#: builtin/merge.c:832 #, fuzzy msgid "An empty message aborts the commit.\n" msgstr "Uma mensagem vazia aborta o commit.\n" -#: builtin/merge.c:830 +#: builtin/merge.c:835 #, fuzzy, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -17351,75 +18095,75 @@ msgstr "" "Linhas começadas com '%c' são ignoradas, e uma messagem vazia aborta\n" "o commit.\n" -#: builtin/merge.c:883 +#: builtin/merge.c:888 msgid "Empty commit message." msgstr "Mensagem commit vazia." -#: builtin/merge.c:898 +#: builtin/merge.c:903 #, c-format msgid "Wonderful.\n" msgstr "Maravilhoso.\n" -#: builtin/merge.c:959 +#: builtin/merge.c:964 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Merge automático falhou; resolve os conflitos e depois podes commitar o " "resultado.\n" -#: builtin/merge.c:998 +#: builtin/merge.c:1003 msgid "No current branch." msgstr "Nenhum ramo atual." -#: builtin/merge.c:1000 +#: builtin/merge.c:1005 msgid "No remote for the current branch." msgstr "Ŕamo atual de remoto nenhum." -#: builtin/merge.c:1002 +#: builtin/merge.c:1007 msgid "No default upstream defined for the current branch." msgstr "Ramo atual sem upstream default definido." -#: builtin/merge.c:1007 +#: builtin/merge.c:1012 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Nenhum ramo de monitorização remoto seguido por %s de %s" -#: builtin/merge.c:1064 +#: builtin/merge.c:1069 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor '%s' incorreto no ambiente '%s'" -#: builtin/merge.c:1167 +#: builtin/merge.c:1172 #, c-format msgid "not something we can merge in %s: %s" -msgstr "não se pode integrar em %s: %s" +msgstr "podemos juntar em %s nenhum(a): %s" -#: builtin/merge.c:1201 +#: builtin/merge.c:1206 msgid "not something we can merge" -msgstr "não se pode integrar" +msgstr "podemos juntar nada" -#: builtin/merge.c:1311 +#: builtin/merge.c:1316 msgid "--abort expects no arguments" -msgstr "--abort não leva argumentos" +msgstr "--abort supõe argumento nenhum" -#: builtin/merge.c:1315 +#: builtin/merge.c:1320 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Há junção nenhuma para abortar (MERGE_HEAD faltando)." -#: builtin/merge.c:1333 +#: builtin/merge.c:1338 #, fuzzy msgid "--quit expects no arguments" -msgstr "--abort não leva argumentos" +msgstr "--abort supõe argumento nenhum" -#: builtin/merge.c:1346 +#: builtin/merge.c:1351 msgid "--continue expects no arguments" -msgstr "--continue não leva argumentos" +msgstr "--continue supõe argumento nenhum" -#: builtin/merge.c:1350 +#: builtin/merge.c:1355 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Há junção nenhuma em curso (MERGE_HEAD faltando)." -#: builtin/merge.c:1366 +#: builtin/merge.c:1371 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17427,111 +18171,143 @@ msgstr "" "Junção está por concluir (MERGE_HEAD existe).\n" "Por favor, faz commit das tuas alterações antes de juntar." -#: builtin/merge.c:1373 +#: builtin/merge.c:1378 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -"Cherry-pick não concluído (CHERRY_PICK_HEAD presente).\n" -"Submeta as suas alterações antes de integrar." +"Cherry-pick por concluir (existe CHERRY_PICK_HEAD).\n" +"Por favor, memorize suas alterações antes de juntar." -#: builtin/merge.c:1376 +#: builtin/merge.c:1381 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." -msgstr "Cherry-pick não concluído (CHERRY_PICK_HEAD presente)." +msgstr "Cherry-pick por concluir (existe CHERRY_PICK_HEAD)." -#: builtin/merge.c:1390 +#: builtin/merge.c:1395 msgid "You cannot combine --squash with --no-ff." msgstr "Impossível combinar --squash com --no-ff." -#: builtin/merge.c:1392 +#: builtin/merge.c:1397 #, fuzzy msgid "You cannot combine --squash with --commit." msgstr "Impossível combinar --squash com --commit." -#: builtin/merge.c:1408 +#: builtin/merge.c:1413 msgid "No commit specified and merge.defaultToUpstream not set." -msgstr "Nenhum commit especificado e merge.defaultToUpstream não definido." +msgstr "Especificado commit nenhum e merge.defaultToUpstream indefinido." -#: builtin/merge.c:1425 +#: builtin/merge.c:1430 msgid "Squash commit into empty head not supported yet" msgstr "Esmagar commit para uma cabeça vazia por enquanto tem suporte nenhum" -#: builtin/merge.c:1427 +#: builtin/merge.c:1432 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Non-fast-forward commit para uma cabeça vazia faz sentido nenhum" -#: builtin/merge.c:1432 +#: builtin/merge.c:1437 #, c-format msgid "%s - not something we can merge" -msgstr "%s - não é algo se possa integrar" +msgstr "%s - nada que se pode juntar" -#: builtin/merge.c:1434 +#: builtin/merge.c:1439 msgid "Can merge only exactly one commit into empty head" msgstr "Só se pode integrar exatamente um commit numa cabeça vazia" -#: builtin/merge.c:1515 +#: builtin/merge.c:1520 msgid "refusing to merge unrelated histories" -msgstr "integração de históricos não relacionados recusada" - -#: builtin/merge.c:1524 -#, fuzzy -msgid "Already up to date." -msgstr "Já está atualizado." +msgstr "recusando juntar históricos diferentes" -#: builtin/merge.c:1534 +#: builtin/merge.c:1539 #, c-format msgid "Updating %s..%s\n" msgstr "Atualizando %s..%s\n" -#: builtin/merge.c:1580 +#: builtin/merge.c:1585 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "A tentar integração mesmo trivial no interior do índice...\n" -#: builtin/merge.c:1587 +#: builtin/merge.c:1592 #, c-format msgid "Nope.\n" msgstr "Nada.\n" -#: builtin/merge.c:1612 -#, fuzzy -msgid "Already up to date. Yeeah!" -msgstr "Já está atualizado. Sim!" - -#: builtin/merge.c:1618 +#: builtin/merge.c:1623 msgid "Not possible to fast-forward, aborting." msgstr "Impossível fazer fast-forward, abortando." -#: builtin/merge.c:1646 builtin/merge.c:1711 +#: builtin/merge.c:1651 builtin/merge.c:1716 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Recuando a árvore para estado pristino...\n" -#: builtin/merge.c:1650 +#: builtin/merge.c:1655 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Tentando estratégia merge %s...\n" -#: builtin/merge.c:1702 +#: builtin/merge.c:1707 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "A junção lidou com estratégia de junção nenhuma.\n" -#: builtin/merge.c:1704 +#: builtin/merge.c:1709 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Falha ao integrar com a estratégia %s.\n" -#: builtin/merge.c:1713 +#: builtin/merge.c:1718 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "A usar %s para preparar resolução manual.\n" -#: builtin/merge.c:1727 +#: builtin/merge.c:1732 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "Merge automática correu bem; parei antes de commitar como pedido\n" +#: builtin/mktag.c:10 +msgid "git mktag" +msgstr "" + +#: builtin/mktag.c:27 +#, fuzzy, c-format +msgid "warning: tag input does not pass fsck: %s" +msgstr "aviso: `:include:` insustentado: %s\n" + +#: builtin/mktag.c:38 +#, c-format +msgid "error: tag input does not pass fsck: %s" +msgstr "" + +#: builtin/mktag.c:41 +#, c-format +msgid "%d (FSCK_IGNORE?) should never trigger this callback" +msgstr "" + +#: builtin/mktag.c:56 +#, fuzzy, c-format +msgid "could not read tagged object '%s'" +msgstr "incapaz ler objeto %s" + +#: builtin/mktag.c:59 +#, fuzzy, c-format +msgid "object '%s' tagged as '%s', but is a '%s' type" +msgstr "objeto %s é %s, é %s nenhum(a)" + +#: builtin/mktag.c:97 +msgid "tag on stdin did not pass our strict fsck check" +msgstr "" + +#: builtin/mktag.c:100 +#, fuzzy +msgid "tag on stdin did not refer to a valid object" +msgstr "'%s' aponta para objeto válido nenhum!" + +#: builtin/mktag.c:103 builtin/tag.c:243 +msgid "unable to write tag file" +msgstr "incapaz escrever ficheiro de tag" + #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -17542,38 +18318,51 @@ msgstr "a entrada termina com NUL" #: builtin/mktree.c:155 builtin/write-tree.c:26 msgid "allow missing objects" -msgstr "permitir objetos não presentes" +msgstr "permitir objetos que faltam" #: builtin/mktree.c:156 msgid "allow creation of more than one tree" msgstr "permitir a criação de mais do que uma árvore" -#: builtin/multi-pack-index.c:9 -msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" -msgstr "" +#: builtin/multi-pack-index.c:10 +#, fuzzy +msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]" +msgstr "git multi-pack-index [<opções>] write [--preferred-pack=<pacote>]" + +#: builtin/multi-pack-index.c:13 +#, fuzzy +msgid "git multi-pack-index [<options>] verify" +msgstr "git multi-pack-index [<opções>] verify" + +#: builtin/multi-pack-index.c:16 +#, fuzzy +msgid "git multi-pack-index [<options>] expire" +msgstr "git multi-pack-index [<opções>] expire" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:19 +#, fuzzy +msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" +msgstr "git multi-pack-index [<opções>] repack [--batch-size=<tamanho>]" + +#: builtin/multi-pack-index.c:54 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" -#: builtin/multi-pack-index.c:29 -msgid "" -"during repack, collect pack-files of smaller size into a batch that is " -"larger than this size" +#: builtin/multi-pack-index.c:69 +msgid "preferred-pack" msgstr "" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 -#, fuzzy -msgid "too many arguments" -msgstr "Demasiados argumentos." +#: builtin/multi-pack-index.c:70 +msgid "pack for reuse when computing a multi-pack bitmap" +msgstr "" -#: builtin/multi-pack-index.c:60 -msgid "--batch-size option is only for 'repack' subcommand" +#: builtin/multi-pack-index.c:128 +msgid "" +"during repack, collect pack-files of smaller size into a batch that is " +"larger than this size" msgstr "" -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:179 #, fuzzy, c-format msgid "unrecognized subcommand: %s" msgstr "subcomando desconhecido: %s" @@ -17608,7 +18397,7 @@ msgstr "ignorar erros ao mover/mudar o nome" #: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" -msgstr "o destino '%s' não é um diretório" +msgstr "destino '%s' é pasta nenhuma" #: builtin/mv.c:181 #, c-format @@ -17621,15 +18410,15 @@ msgstr "origem incorreta" #: builtin/mv.c:188 msgid "can not move directory into itself" -msgstr "não é possível mover um diretório para dentro de si próprio" +msgstr "incapaz mover pasta para si mesma" #: builtin/mv.c:191 msgid "cannot move directory over file" -msgstr "não é possível mover um diretório para um ficheiro" +msgstr "incapaz mover pasta para um ficheiro" #: builtin/mv.c:200 msgid "source directory is empty" -msgstr "o diretório de origem está vazio" +msgstr "pasta de origem está vazia" #: builtin/mv.c:225 msgid "not under version control" @@ -17658,7 +18447,7 @@ msgstr "múltiplas origens para o mesmo destino" #: builtin/mv.c:246 msgid "destination directory does not exist" -msgstr "o diretório de destino não existe" +msgstr "pasta de destino é inexistente" #: builtin/mv.c:253 #, c-format @@ -17670,10 +18459,10 @@ msgstr "%s, origem=%s, destino=%s" msgid "Renaming %s to %s\n" msgstr "A mudar de nome de %s para %s\n" -#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667 #, c-format msgid "renaming '%s' failed" -msgstr "falha ao mudar o nome de '%s'" +msgstr "renomear '%s' falhou" #: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." @@ -17838,11 +18627,11 @@ msgstr "Escreva/edite as notas do seguinte objeto:" #: builtin/notes.c:150 #, c-format msgid "unable to start 'show' for object '%s'" -msgstr "não foi possível iniciar o comando 'show' sobre o objeto '%s'" +msgstr "incapaz iniciar 'show' para objeto '%s'" #: builtin/notes.c:154 msgid "could not read 'show' output" -msgstr "não foi possível ler a saída do comando 'show'" +msgstr "incapaz ler output de 'show'" #: builtin/notes.c:162 #, c-format @@ -17855,17 +18644,17 @@ msgstr "forneça o conteúdo da nota usando a opção -m ou -F" #: builtin/notes.c:206 msgid "unable to write note object" -msgstr "não é possível escrever o objeto de nota" +msgstr "incapaz escrever para objeto de nota" #: builtin/notes.c:208 #, c-format msgid "the note contents have been left in %s" msgstr "o conteúdo da nota foi colocado em %s" -#: builtin/notes.c:242 builtin/tag.c:533 +#: builtin/notes.c:242 builtin/tag.c:576 #, c-format msgid "could not open or read '%s'" -msgstr "não foi possível abrir ou ler '%s'" +msgstr "incapaz abrir ou ler '%s'" #: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 #: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 @@ -17882,7 +18671,7 @@ msgstr "falha ao ler o objeto '%s'." #: builtin/notes.c:268 #, c-format msgid "cannot read note data from non-blob object '%s'." -msgstr "não é possível ler os dados da nota de um objeto não-blob '%s'." +msgstr "incapaz ler dados de nota, de objeto não-blob '%s'." #: builtin/notes.c:309 #, c-format @@ -17905,8 +18694,10 @@ msgstr "foi recusado efetuar %s de notas em %s (fora de refs/notes/)" #: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 #: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 #: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 -msgid "too many parameters" -msgstr "demasiados parâmetros" +#: builtin/prune-packed.c:25 builtin/tag.c:586 +#, fuzzy +msgid "too many arguments" +msgstr "" #: builtin/notes.c:389 builtin/notes.c:678 #, c-format @@ -17965,8 +18756,9 @@ msgid "load rewriting config for <command> (implies --stdin)" msgstr "carregar configuração de reescrita do <comando> (implica --stdin)" #: builtin/notes.c:517 -msgid "too few parameters" -msgstr "parâmetros insuficientes" +#, fuzzy +msgid "too few arguments" +msgstr "" #: builtin/notes.c:538 #, c-format @@ -17974,8 +18766,8 @@ msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -"Incapaz copiar notas. Encontrei Notas existentes para objeto %s. Usa '-f' para " -"subscrever notas existentes" +"Incapaz copiar notas. Encontrei Notas existentes para objeto %s. Usa '-f' " +"para subscrever notas existentes" #: builtin/notes.c:550 #, c-format @@ -18009,11 +18801,11 @@ msgstr "falha ao ler referência NOTES_MERGE_PARTIAL" #: builtin/notes.c:724 msgid "could not find commit from NOTES_MERGE_PARTIAL." -msgstr "não foi possível encontrar o commit de NOTES_MERGE_PARTIAL." +msgstr "incapaz encontrar commit a partir de NOTES_MERGE_PARTIAL." #: builtin/notes.c:726 msgid "could not parse commit from NOTES_MERGE_PARTIAL." -msgstr "não foi possível analisar o commit de NOTES_MERGE_PARTIAL." +msgstr "incapaz processar commit a partir de NOTES_MERGE_PARTIAL." #: builtin/notes.c:739 msgid "failed to resolve NOTES_MERGE_REF" @@ -18046,11 +18838,11 @@ msgstr "" #: builtin/notes.c:790 msgid "Committing unmerged notes" -msgstr "A submeter notas não integradas" +msgstr "Memorizando notas por juntar" #: builtin/notes.c:792 msgid "finalize notes merge by committing unmerged notes" -msgstr "concluir integração de notas, submetendo notas não integradas" +msgstr "concluir junção de notas, memorizando notas por juntar" #: builtin/notes.c:794 msgid "Aborting notes merge resolution" @@ -18062,7 +18854,7 @@ msgstr "abortar integração das notas" #: builtin/notes.c:807 msgid "cannot mix --commit, --abort or -s/--strategy" -msgstr "não é possível misturar --commit, --abort ou -s/--strategy" +msgstr "incapaz misturar --commit, --abort ou -s/--strategy" #: builtin/notes.c:812 msgid "must specify a notes ref to merge" @@ -18094,7 +18886,7 @@ msgstr "" "submeta o resultado com 'git notes merge --commit' ou aborte a integração " "com 'git notes merge --abort'.\n" -#: builtin/notes.c:897 builtin/tag.c:546 +#: builtin/notes.c:897 builtin/tag.c:589 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Falha ao resolver '%s' numa referência válida." @@ -18106,15 +18898,15 @@ msgstr "O objeto %s tem nota nenhuma\n" #: builtin/notes.c:912 msgid "attempt to remove non-existent note is not an error" -msgstr "não considerar como erro a remoção de uma nota não existente" +msgstr "apenas é erro se remover nota existente" #: builtin/notes.c:915 msgid "read object names from the standard input" msgstr "ler nome dos objetos da entrada padrão" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146 msgid "do not remove, show only" -msgstr "não remover, mostrar apenas" +msgstr "remover nada, apenas mostrar" #: builtin/notes.c:955 msgid "report pruned notes" @@ -18128,401 +18920,447 @@ msgstr "notes-ref" msgid "use notes from <notes-ref>" msgstr "usar notas de <notes-ref>" -#: builtin/notes.c:1034 builtin/stash.c:1604 +#: builtin/notes.c:1034 builtin/stash.c:1735 #, c-format msgid "unknown subcommand: %s" msgstr "subcomando desconhecido: %s" -#: builtin/pack-objects.c:54 +#: builtin/pack-objects.c:182 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<opções>...] [< <lista-referências> | < <lista-" "objetos>]" -#: builtin/pack-objects.c:55 +#: builtin/pack-objects.c:183 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<opções>...] <nome-base> [< <lista-referências> | < <lista-" "objetos>]" -#: builtin/pack-objects.c:443 +#: builtin/pack-objects.c:572 +#, c-format +msgid "" +"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " +"pack %s" +msgstr "" + +#: builtin/pack-objects.c:580 #, fuzzy, c-format msgid "bad packed object CRC for %s" -msgstr "ignorar objetos compactados" +msgstr "" -#: builtin/pack-objects.c:454 +#: builtin/pack-objects.c:591 #, fuzzy, c-format msgid "corrupt packed object for %s" -msgstr "ignorar objetos compactados" +msgstr "" -#: builtin/pack-objects.c:585 +#: builtin/pack-objects.c:722 #, fuzzy, c-format msgid "recursive delta detected for object %s" -msgstr "o objeto esperado %s não foi recebido" +msgstr "delta recursivo detetado para objeto %s" -#: builtin/pack-objects.c:796 +#: builtin/pack-objects.c:941 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:1004 +#: builtin/pack-objects.c:1036 +#, fuzzy, c-format +msgid "expected object at offset %<PRIuMAX> in pack %s" +msgstr "pacote com objeto incorreto no offset %<PRIuMAX>: %s" + +#: builtin/pack-objects.c:1155 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "a desativar escrita de mapa de bits, os pacotes são divididos devido a pack." "packSizeLimit" -#: builtin/pack-objects.c:1017 +#: builtin/pack-objects.c:1168 msgid "Writing objects" -msgstr "A escrever objetos" +msgstr "" -#: builtin/pack-objects.c:1078 builtin/update-index.c:90 +#: builtin/pack-objects.c:1229 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" -msgstr "falha ao invocar stat de %s" +msgstr "falhou stat a %s" -#: builtin/pack-objects.c:1131 +#: builtin/pack-objects.c:1281 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:1348 +#: builtin/pack-objects.c:1523 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -"a desativar escrita de mapa de bits, visto que alguns objetos não estão a " -"ser compactados" +"desativando escrita bitmap, visto a incapacidade de alguns objetos serem " +"compactados" -#: builtin/pack-objects.c:1796 +#: builtin/pack-objects.c:1971 #, fuzzy, c-format msgid "delta base offset overflow in pack for %s" -msgstr "offset da base delta está fora do limite" +msgstr "" -#: builtin/pack-objects.c:1805 +#: builtin/pack-objects.c:1980 #, fuzzy, c-format msgid "delta base offset out of bound for %s" -msgstr "offset da base delta está fora do limite" +msgstr "offset de base delta está fora do limite para %s" -#: builtin/pack-objects.c:2086 +#: builtin/pack-objects.c:2261 msgid "Counting objects" msgstr "A contar objetos" -#: builtin/pack-objects.c:2231 +#: builtin/pack-objects.c:2426 #, fuzzy, c-format msgid "unable to parse object header of %s" -msgstr "não foi possível analisar o objeto: %s" +msgstr "incapaz processar cabeçalho de objeto de %s" -#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 -#: builtin/pack-objects.c:2327 +#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512 +#: builtin/pack-objects.c:2522 #, fuzzy, c-format msgid "object %s cannot be read" -msgstr "objeto %s não encontrado" +msgstr "objeto %s incapaz ser lido" -#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 +#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" -#: builtin/pack-objects.c:2341 +#: builtin/pack-objects.c:2536 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2656 +#: builtin/pack-objects.c:2851 #, c-format msgid "Delta compression using up to %d threads" msgstr "" -#: builtin/pack-objects.c:2795 +#: builtin/pack-objects.c:2990 #, fuzzy, c-format msgid "unable to pack objects reachable from tag %s" msgstr "incluir objetos alcançáveis a partir de qualquer referência" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:3076 msgid "Compressing objects" msgstr "A comprimir objetos" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:3082 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:2961 +#: builtin/pack-objects.c:3161 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" "hash> <uri>' (got '%s')" msgstr "" -#: builtin/pack-objects.c:2964 +#: builtin/pack-objects.c:3164 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "" -#: builtin/pack-objects.c:2993 +#: builtin/pack-objects.c:3199 +#, fuzzy, c-format +msgid "could not get type of object %s in pack %s" +msgstr "incapaz obter tipo de objeto %s" + +#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335 +#, fuzzy, c-format +msgid "could not find pack '%s'" +msgstr "incapaz acabar '%s'" + +#: builtin/pack-objects.c:3378 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2999 +#: builtin/pack-objects.c:3384 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:3097 +#: builtin/pack-objects.c:3482 #, fuzzy msgid "invalid value for --missing" -msgstr "valor inválido de %s" +msgstr "" -#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650 #, fuzzy msgid "cannot open pack index" -msgstr "não é possível invocar pread sobre o ficheiro de pacote" +msgstr "incapaz abrir index pack" -#: builtin/pack-objects.c:3187 +#: builtin/pack-objects.c:3572 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3658 #, fuzzy msgid "unable to force loose object" -msgstr "não é possível escrever o objeto de nota" +msgstr "incapaz forçar objeto solto" -#: builtin/pack-objects.c:3365 +#: builtin/pack-objects.c:3788 #, fuzzy, c-format msgid "not a rev '%s'" -msgstr "não é possível ler '%s'" +msgstr "rev '%s' nenhum" -#: builtin/pack-objects.c:3368 +#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061 #, fuzzy, c-format msgid "bad revision '%s'" -msgstr "repositório '%s' incorreto" +msgstr "revisão '%s' incorreto" -#: builtin/pack-objects.c:3393 +#: builtin/pack-objects.c:3819 #, fuzzy msgid "unable to add recent objects" -msgstr "não foi possível analisar o objeto: %s" +msgstr "incapaz adicionar objetos recentes" -#: builtin/pack-objects.c:3446 +#: builtin/pack-objects.c:3872 #, c-format msgid "unsupported index version %s" -msgstr "versão de índice %s não suportada" +msgstr "versão de index %s insustentada" -#: builtin/pack-objects.c:3450 +#: builtin/pack-objects.c:3876 #, c-format msgid "bad index version '%s'" msgstr "versão de índice '%s' incorreta" -#: builtin/pack-objects.c:3488 +#: builtin/pack-objects.c:3915 #, fuzzy msgid "<version>[,<offset>]" msgstr "versão[,offset]" -#: builtin/pack-objects.c:3489 +#: builtin/pack-objects.c:3916 msgid "write the pack index file in the specified idx format version" msgstr "" "escrever o ficheiro de índice do pacote na versão de formato especificada" -#: builtin/pack-objects.c:3492 +#: builtin/pack-objects.c:3919 msgid "maximum size of each output pack file" msgstr "tamanho máximo de cada ficheiro de pacote gerado" -#: builtin/pack-objects.c:3494 +#: builtin/pack-objects.c:3921 msgid "ignore borrowed objects from alternate object store" msgstr "ignorar objetos emprestados do arquivo de objetos sobressalentes" -#: builtin/pack-objects.c:3496 +#: builtin/pack-objects.c:3923 msgid "ignore packed objects" -msgstr "ignorar objetos compactados" +msgstr "" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3925 msgid "limit pack window by objects" msgstr "limitar a janela de compactação por objetos" -#: builtin/pack-objects.c:3500 +#: builtin/pack-objects.c:3927 msgid "limit pack window by memory in addition to object limit" msgstr "" "limitar a janela de compactação por memória em adição ao limite por objetos" -#: builtin/pack-objects.c:3502 +#: builtin/pack-objects.c:3929 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "tamanho máximo de cadeias delta permitidas no pacote resultante" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3931 msgid "reuse existing deltas" msgstr "reutilizar deltas existentes" -#: builtin/pack-objects.c:3506 +#: builtin/pack-objects.c:3933 msgid "reuse existing objects" msgstr "reutilizar objetos existentes" -#: builtin/pack-objects.c:3508 +#: builtin/pack-objects.c:3935 msgid "use OFS_DELTA objects" msgstr "usar objetos OFS_DELTA" -#: builtin/pack-objects.c:3510 +#: builtin/pack-objects.c:3937 msgid "use threads when searching for best delta matches" msgstr "usar threads ao procurar pela melhor correspondência delta" -#: builtin/pack-objects.c:3512 +#: builtin/pack-objects.c:3939 msgid "do not create an empty pack output" -msgstr "não criar um pacote vazio" +msgstr "criar output de pack vazio nenhum" -#: builtin/pack-objects.c:3514 +#: builtin/pack-objects.c:3941 msgid "read revision arguments from standard input" msgstr "ler argumentos de revisão da entrada padrão" -#: builtin/pack-objects.c:3516 +#: builtin/pack-objects.c:3943 msgid "limit the objects to those that are not yet packed" -msgstr "restringir-se aos objetos que ainda não foram compactados" +msgstr "restringir-se aos objetos que ainda estão por compactar" -#: builtin/pack-objects.c:3519 +#: builtin/pack-objects.c:3946 msgid "include objects reachable from any reference" msgstr "incluir objetos alcançáveis a partir de qualquer referência" -#: builtin/pack-objects.c:3522 +#: builtin/pack-objects.c:3949 msgid "include objects referred by reflog entries" msgstr "incluir objetos referenciados por entradas do reflog" -#: builtin/pack-objects.c:3525 +#: builtin/pack-objects.c:3952 msgid "include objects referred to by the index" msgstr "incluir objetos referenciados pelo índice" -#: builtin/pack-objects.c:3528 +#: builtin/pack-objects.c:3955 +#, fuzzy +msgid "read packs from stdin" +msgstr "" + +#: builtin/pack-objects.c:3957 msgid "output pack to stdout" msgstr "gerar pacote para a saída padrão" -#: builtin/pack-objects.c:3530 +#: builtin/pack-objects.c:3959 msgid "include tag objects that refer to objects to be packed" msgstr "incluir objetos tag que refiram objetos a compactar" -#: builtin/pack-objects.c:3532 +#: builtin/pack-objects.c:3961 msgid "keep unreachable objects" msgstr "manter objetos inalcançáveis" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3963 msgid "pack loose unreachable objects" msgstr "empacotar objetos soltos inalcançáveis" -#: builtin/pack-objects.c:3536 +#: builtin/pack-objects.c:3965 msgid "unpack unreachable objects newer than <time>" msgstr "descompactar objetos inalcançáveis mais recentes que <tempo>" -#: builtin/pack-objects.c:3539 +#: builtin/pack-objects.c:3968 msgid "use the sparse reachability algorithm" msgstr "" -#: builtin/pack-objects.c:3541 +#: builtin/pack-objects.c:3970 msgid "create thin packs" msgstr "criar pacotes finos" -#: builtin/pack-objects.c:3543 +#: builtin/pack-objects.c:3972 msgid "create packs suitable for shallow fetches" msgstr "criar pacotes adequados para obter em repositórios pouco profundos" -#: builtin/pack-objects.c:3545 +#: builtin/pack-objects.c:3974 msgid "ignore packs that have companion .keep file" msgstr "ignorar pacotes que tenham um ficheiro .keep" -#: builtin/pack-objects.c:3547 +#: builtin/pack-objects.c:3976 #, fuzzy msgid "ignore this pack" msgstr "usar pacote fino" -#: builtin/pack-objects.c:3549 +#: builtin/pack-objects.c:3978 msgid "pack compression level" msgstr "nível de compactação do pacote" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3980 msgid "do not hide commits by grafts" -msgstr "não esconder commits introduzidos por enxertos" +msgstr "esconder commits por enxertos nenhuns" -#: builtin/pack-objects.c:3553 +#: builtin/pack-objects.c:3982 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usar um índice de mapa de bits se disponível, para acelerar a contagem de " "objetos" -#: builtin/pack-objects.c:3555 +#: builtin/pack-objects.c:3984 msgid "write a bitmap index together with the pack index" msgstr "escrever um índice de mapa de bits juntamente com o índice do pacote" -#: builtin/pack-objects.c:3559 +#: builtin/pack-objects.c:3988 #, fuzzy msgid "write a bitmap index if possible" msgstr "escrever índice de mapa de bits" -#: builtin/pack-objects.c:3563 +#: builtin/pack-objects.c:3992 #, fuzzy msgid "handling for missing objects" -msgstr "permitir objetos não presentes" +msgstr "lidando para objetos que faltem" -#: builtin/pack-objects.c:3566 +#: builtin/pack-objects.c:3995 msgid "do not pack objects in promisor packfiles" msgstr "" -#: builtin/pack-objects.c:3568 +#: builtin/pack-objects.c:3997 #, fuzzy msgid "respect islands during delta compression" msgstr "dimensão da janela usada em compressão de deltas" -#: builtin/pack-objects.c:3570 +#: builtin/pack-objects.c:3999 msgid "protocol" msgstr "" -#: builtin/pack-objects.c:3571 +#: builtin/pack-objects.c:4000 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" -#: builtin/pack-objects.c:3600 +#: builtin/pack-objects.c:4033 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "" -#: builtin/pack-objects.c:3605 +#: builtin/pack-objects.c:4038 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "" -#: builtin/pack-objects.c:3659 +#: builtin/pack-objects.c:4094 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" -#: builtin/pack-objects.c:3661 +#: builtin/pack-objects.c:4096 msgid "minimum pack size limit is 1 MiB" msgstr "" -#: builtin/pack-objects.c:3666 +#: builtin/pack-objects.c:4101 #, fuzzy msgid "--thin cannot be used to build an indexable pack" -msgstr "--fix-thin não pode ser usado sem --stdin" +msgstr "incapaz usar --thin para construir pack indexável" -#: builtin/pack-objects.c:3669 +#: builtin/pack-objects.c:4104 #, fuzzy msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable e -A são incompatíveis" -#: builtin/pack-objects.c:3675 +#: builtin/pack-objects.c:4110 #, fuzzy msgid "cannot use --filter without --stdout" -msgstr "não é possível usar -a com -d" +msgstr "usar --filter com --stdout" + +#: builtin/pack-objects.c:4112 +#, fuzzy +msgid "cannot use --filter with --stdin-packs" +msgstr "usar --filter com --stdout" -#: builtin/pack-objects.c:3735 +#: builtin/pack-objects.c:4116 +#, fuzzy +msgid "cannot use internal rev list with --stdin-packs" +msgstr "incapaz especificar pathnames com --stdin" + +#: builtin/pack-objects.c:4175 #, fuzzy msgid "Enumerating objects" -msgstr "A escrever objetos" +msgstr "" -#: builtin/pack-objects.c:3766 +#: builtin/pack-objects.c:4212 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" "reused %<PRIu32>" msgstr "" +#: builtin/pack-redundant.c:601 +msgid "" +"'git pack-redundant' is nominated for removal.\n" +"If you still use this command, please add an extra\n" +"option, '--i-still-use-this', on the command line\n" +"and let us know you still use it by sending an e-mail\n" +"to <git@vger.kernel.org>. Thanks.\n" +msgstr "" + #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<opções>]" @@ -18533,7 +19371,7 @@ msgstr "compactar tudo" #: builtin/pack-refs.c:17 msgid "prune loose refs (default)" -msgstr "eliminar referências soltas (predefinição)" +msgstr "podar refs soltas (predefinição)" #: builtin/prune-packed.c:6 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" @@ -18558,7 +19396,7 @@ msgstr "" #: builtin/prune.c:152 msgid "cannot prune in a precious-objects repo" -msgstr "não é possível limpar num repositório de objetos-preciosos" +msgstr "incapaz podar num repo de precious-objects" #: builtin/pull.c:45 builtin/pull.c:47 #, c-format @@ -18582,11 +19420,11 @@ msgstr "Opções relativas a integração" msgid "incorporate changes by rebasing rather than merging" msgstr "incorporar alterações por rebase em vez de integrar" -#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126 msgid "allow fast-forward" msgstr "permitir avanço rápido" -#: builtin/pull.c:167 parse-options.h:339 +#: builtin/pull.c:167 parse-options.h:340 #, fuzzy msgid "automatically stash/stash pop before and after" msgstr "empilhar/desempilhar automaticamente antes de depois de rebase" @@ -18608,37 +19446,18 @@ msgstr "número de submódulos com pull em paralelo" msgid "Invalid value for pull.ff: %s" msgstr "Valor inválido de pull.ff: %s" -#: builtin/pull.c:348 -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 "" - -#: builtin/pull.c:458 +#: builtin/pull.c:445 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." -msgstr "" -"As refs que obteste tem candidato nenhum para onde rebasear." +msgstr "As refs que obteste tem candidato nenhum para onde rebasear." -#: builtin/pull.c:460 +#: builtin/pull.c:447 msgid "" "There are no candidates for merging among the refs that you just fetched." -msgstr "" -"As refs que obteste tem candidato nenhum para junção." +msgstr "As refs que obteste tem candidato nenhum para junção." -#: builtin/pull.c:461 +#: builtin/pull.c:448 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -18646,86 +19465,101 @@ msgstr "" "Normalmente isto significa que forneceste um wildcard especificador de ref\n" "que tem correspondência nenhuma no lado do remoto." -#: builtin/pull.c:464 +#: builtin/pull.c:451 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" "a branch. Because this is not the default configured remote\n" "for your current branch, you must specify a branch on the command line." msgstr "" -"Solicitou puxar o remoto '%s', mas não especificou um ramo.\n" -"Uma vez que este não é o remoto configurado por predefinição\n" -"do ramo atual, deve especificar um ramo na linha de comandos." +"Pediste para agarrar remoto '%s', mas falta especificar um ramo.\n" +"Visto que o remoto configurado como predefinido para o ramo atual é\n" +"outro, deves de especificar um ramo na linha de comandos." -#: builtin/pull.c:469 builtin/rebase.c:1246 +#: builtin/pull.c:456 builtin/rebase.c:1248 msgid "You are not currently on a branch." msgstr "Atualmente estás em ramo nenhum." -#: builtin/pull.c:471 builtin/pull.c:486 +#: builtin/pull.c:458 builtin/pull.c:473 msgid "Please specify which branch you want to rebase against." msgstr "Especifique o ramo sobre o qual pretende realizar rebase." -#: builtin/pull.c:473 builtin/pull.c:488 +#: builtin/pull.c:460 builtin/pull.c:475 msgid "Please specify which branch you want to merge with." msgstr "Especifique o ramo com o qual pretende integrar." -#: builtin/pull.c:474 builtin/pull.c:489 +#: builtin/pull.c:461 builtin/pull.c:476 msgid "See git-pull(1) for details." msgstr "Consulte git-pull(1) para obter mais detalhes." -#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 -#: builtin/rebase.c:1252 +#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 +#: builtin/rebase.c:1254 msgid "<remote>" msgstr "<remoto>" -#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 +#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483 msgid "<branch>" msgstr "<ramo>" -#: builtin/pull.c:484 builtin/rebase.c:1244 +#: builtin/pull.c:471 builtin/rebase.c:1246 msgid "There is no tracking information for the current branch." msgstr "O ramo atual tem informação de tracking nenhuma." -#: builtin/pull.c:493 +#: builtin/pull.c:480 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Se deseja definir o ramo que deve ser seguido por este ramo, pode fazê-lo " "com:" -#: builtin/pull.c:498 +#: builtin/pull.c:485 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "" -"A configuração indica para integrar com a referência '%s'\n" -"do remoto, mas aquela referência não foi obtida." +"Tua configuração indica para juntar com ref '%s'\n" +"a partir do remoto, mas essa ref está por buscar." -#: builtin/pull.c:609 +#: builtin/pull.c:596 #, fuzzy, c-format msgid "unable to access commit %s" -msgstr "não foi possível analisar o commit %s" +msgstr "incapaz acessar commit %s" -#: builtin/pull.c:915 +#: builtin/pull.c:902 msgid "ignoring --verify-signatures for rebase" msgstr "ignorado --verify-signatures para rebase" -#: builtin/pull.c:972 -msgid "Updating an unborn branch with changes added to the index." +#: builtin/pull.c:930 +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 "" -"A atualizar um ramo que ainda não foi criado e com alterações adicionadas ao " -"índice." -#: builtin/pull.c:976 +#: builtin/pull.c:990 +msgid "Updating an unborn branch with changes added to the index." +msgstr "Atualizando um ramo por nascer com alterações adicionadas ao índex." + +#: builtin/pull.c:994 msgid "pull with rebase" msgstr "pull com rebase" -#: builtin/pull.c:977 +#: builtin/pull.c:995 msgid "please commit or stash them." msgstr "submeta ou esconda-as." -#: builtin/pull.c:1002 +#: builtin/pull.c:1020 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -18736,7 +19570,7 @@ msgstr "" "a avançar a árvore de trabalho a partir do\n" "commit %s." -#: builtin/pull.c:1008 +#: builtin/pull.c:1026 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -18753,15 +19587,15 @@ msgstr "" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:1023 +#: builtin/pull.c:1041 msgid "Cannot merge multiple branches into empty head." msgstr "Incapaz de juntar ramos múltiplos para head vazia." -#: builtin/pull.c:1027 +#: builtin/pull.c:1045 msgid "Cannot rebase onto multiple branches." msgstr "Incapaz de rebasear sobre ramos múltiplos." -#: builtin/pull.c:1041 +#: builtin/pull.c:1065 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" @@ -18800,14 +19634,14 @@ msgid "" " git push %s HEAD\n" "%s" msgstr "" -"O ramo a montante do ramo atual não coincide com o nome do ramo atual.\n" -"Para publicar no ramo a montante no remoto, use\n" +"Ramo upstream do ramo atual corresponde com nome ramo atual nenhum.\n" +"Para atirar para ramo upstream do remoto, usa\n" "\n" " git push %s HEAD:%s\n" "\n" -"Para publicar no ramo com o mesmo nome no remoto, use\n" +"Para atirar para ramo com o mesmo nome no remoto, usa\n" "\n" -" git push %s %s\n" +" git push %s HEAD\n" "%s" #: builtin/push.c:182 @@ -18824,7 +19658,7 @@ msgstr "" "\n" " git push %s HEAD:<nome-de-ramo-remoto>\n" -#: builtin/push.c:194 +#: builtin/push.c:191 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -18837,29 +19671,28 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:202 +#: builtin/push.c:199 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "O ramo atual %s tem múltiplos ramos a montante, publicação recusada." -#: builtin/push.c:205 +#: builtin/push.c:217 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "Indicou refspecs nenhum para atirar, e push.default é \"nothing\"." + +#: builtin/push.c:243 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" "your current branch '%s', without telling me what to push\n" "to update which remote branch." msgstr "" -"O remoto '%s', no qual pretende publicar, não é o remoto a montante\n" -"do ramo atual '%s'. Deve indicar o que pretende publicar e que ramo\n" -"remoto atualizar." - -#: builtin/push.c:260 -msgid "" -"You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "" -"Indicou refspecs nenhum para atirar, e push.default é \"nothing\"." +"Estás atirando para remoto '%s', que é nenhum upstream do teu\n" +"ramo atual '%s', sem dizer-me o que atirar para atualizar\n" +"um qualquer ramo remoto." -#: builtin/push.c:267 +#: builtin/push.c:258 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -18871,7 +19704,7 @@ msgstr "" "'git pull ...') antes de publicar de novo.\n" "Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes." -#: builtin/push.c:273 +#: builtin/push.c:264 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -18883,7 +19716,7 @@ msgstr "" "as alterações remotas (e.g. 'git pull ...') antes de publicar de novo.\n" "Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes." -#: builtin/push.c:279 +#: builtin/push.c:270 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -18897,11 +19730,11 @@ msgstr "" "de fazeres novo push.\n" "Vê a 'Note about fast-forwards' do 'git push --help' para detalhes." -#: builtin/push.c:286 +#: builtin/push.c:277 msgid "Updates were rejected because the tag already exists in the remote." msgstr "As atualizações foram rejeitadas porque a tag já existe no remoto." -#: builtin/push.c:289 +#: builtin/push.c:280 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -18911,7 +19744,7 @@ msgstr "" "fora de commit, ou atualizar uma ref remota fazendo-a apontar para um\n" "objeto fora de commit, sem usar a opção '--force'.\n" -#: builtin/push.c:294 +#: builtin/push.c:285 #, fuzzy msgid "" "Updates were rejected because the tip of the remote-tracking\n" @@ -18924,104 +19757,104 @@ msgstr "" "'git pull ...') antes de publicar de novo.\n" "Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes." -#: builtin/push.c:364 +#: builtin/push.c:355 #, c-format msgid "Pushing to %s\n" msgstr "Fazendo push para %s\n" -#: builtin/push.c:371 +#: builtin/push.c:362 #, c-format msgid "failed to push some refs to '%s'" msgstr "falha ao publicar algumas referências em '%s'" -#: builtin/push.c:553 +#: builtin/push.c:544 msgid "repository" msgstr "repositório" -#: builtin/push.c:554 builtin/send-pack.c:189 +#: builtin/push.c:545 builtin/send-pack.c:189 msgid "push all refs" msgstr "publicar todas as referências" -#: builtin/push.c:555 builtin/send-pack.c:191 +#: builtin/push.c:546 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "replicar todas as referências" -#: builtin/push.c:557 +#: builtin/push.c:548 msgid "delete refs" msgstr "eliminar referências" -#: builtin/push.c:558 +#: builtin/push.c:549 msgid "push tags (can't be used with --all or --mirror)" -msgstr "publicar tags (não pode ser usado com --all ou --mirror)" +msgstr "atirar tags (incapaz ser usado com --all ou --mirror)" -#: builtin/push.c:561 builtin/send-pack.c:192 +#: builtin/push.c:552 builtin/send-pack.c:192 msgid "force updates" msgstr "forçar atualização" -#: builtin/push.c:562 builtin/send-pack.c:204 +#: builtin/push.c:553 builtin/send-pack.c:204 #, fuzzy msgid "<refname>:<expect>" msgstr "nome da referência>:<esperado" -#: builtin/push.c:563 builtin/send-pack.c:205 +#: builtin/push.c:554 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "exigir que o antigo valor da referência tenha este valor" -#: builtin/push.c:566 builtin/send-pack.c:208 +#: builtin/push.c:557 builtin/send-pack.c:208 msgid "require remote updates to be integrated locally" msgstr "" -#: builtin/push.c:569 +#: builtin/push.c:560 msgid "control recursive pushing of submodules" msgstr "controlar a publicação recursiva de submódulos" -#: builtin/push.c:570 builtin/send-pack.c:199 +#: builtin/push.c:561 builtin/send-pack.c:199 msgid "use thin pack" msgstr "usar pacote fino" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186 #: builtin/send-pack.c:187 msgid "receive pack program" msgstr "programa receive pack" -#: builtin/push.c:573 +#: builtin/push.c:564 msgid "set upstream for git pull/status" -msgstr "definir o ramo a montante usado com git pull/status" +msgstr "definir upstream para git pull/status" -#: builtin/push.c:576 +#: builtin/push.c:567 msgid "prune locally removed refs" msgstr "eliminar referências removidas localmente" -#: builtin/push.c:578 +#: builtin/push.c:569 msgid "bypass pre-push hook" msgstr "ignorar pre-push hook" -#: builtin/push.c:579 +#: builtin/push.c:570 msgid "push missing but relevant tags" msgstr "publicar tags perdidas mas relevantes" -#: builtin/push.c:581 builtin/send-pack.c:193 +#: builtin/push.c:572 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "assinar publicação com GPG" -#: builtin/push.c:583 builtin/send-pack.c:200 +#: builtin/push.c:574 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "solicitar transação atómica no servidor remoto" -#: builtin/push.c:601 +#: builtin/push.c:592 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete é incompatível com --all, --mirror e --tags" -#: builtin/push.c:603 +#: builtin/push.c:594 msgid "--delete doesn't make sense without any refs" -msgstr "--delete não faz sentido sem uma referência" +msgstr "--delete apenas faz sentido com uma ref" -#: builtin/push.c:623 +#: builtin/push.c:614 #, c-format msgid "bad repository '%s'" msgstr "repositório '%s' incorreto" -#: builtin/push.c:624 +#: builtin/push.c:615 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -19033,85 +19866,91 @@ msgid "" "\n" " git push <name>\n" msgstr "" -"Destino de publicação não definido.\n" -"Indique um URL na linha de comandos ou configure um repositório remoto " +"Destino de atirar indefinido.\n" +"Indica um URL da linha de comandos ou configure um repositório remoto " "usando\n" "\n" " git remote add <nome> <url>\n" "\n" -"e publique usando o nome remoto\n" +"e depois atire usando o nome remoto\n" "\n" " git push <nome>\n" -#: builtin/push.c:639 +#: builtin/push.c:630 msgid "--all and --tags are incompatible" msgstr "--all e --tags são incompatíveis" -#: builtin/push.c:641 +#: builtin/push.c:632 msgid "--all can't be combined with refspecs" -msgstr "--all não pode ser combinado com especificadores de referências" +msgstr "incapaz combinar --all com refspecs" -#: builtin/push.c:645 +#: builtin/push.c:636 msgid "--mirror and --tags are incompatible" msgstr "--mirror e --tags são incompatíveis" -#: builtin/push.c:647 +#: builtin/push.c:638 msgid "--mirror can't be combined with refspecs" -msgstr "--mirror não pode ser combinado com especificadores de referências" +msgstr "incapaz combinar --mirror com refspecs" -#: builtin/push.c:650 +#: builtin/push.c:641 msgid "--all and --mirror are incompatible" msgstr "--all e --mirror são incompatíveis" -#: builtin/push.c:657 +#: builtin/push.c:648 msgid "push options must not have new line characters" -msgstr "as opções de publicação não podem ter carateres de nova linha" +msgstr "opções de atiranço podem ter caracteres de nova linha nenhuns" -#: builtin/range-diff.c:8 +#: builtin/range-diff.c:9 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "" -#: builtin/range-diff.c:9 +#: builtin/range-diff.c:10 #, fuzzy msgid "git range-diff [<options>] <old-tip>...<new-tip>" msgstr "git merge [<opções>] [<commit>...]" -#: builtin/range-diff.c:10 +#: builtin/range-diff.c:11 #, fuzzy msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git mv [<opções>] <origem>... <destino>" -#: builtin/range-diff.c:22 -msgid "Percentage by which creation is weighted" -msgstr "" - -#: builtin/range-diff.c:24 +#: builtin/range-diff.c:30 #, fuzzy msgid "use simple diff colors" msgstr "usar a ferramenta diff especificada" -#: builtin/range-diff.c:26 +#: builtin/range-diff.c:32 #, fuzzy msgid "notes" msgstr "notes-ref" -#: builtin/range-diff.c:26 +#: builtin/range-diff.c:32 msgid "passed to 'git log'" msgstr "" -#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#: builtin/range-diff.c:35 +#, fuzzy +msgid "only emit output related to the first range" +msgstr "mostrar apenas commits fora do primeiro ramo" + +#: builtin/range-diff.c:37 +#, fuzzy +msgid "only emit output related to the second range" +msgstr "mostrar os caminhos relativamente ao diretório superior do projeto" + +#: builtin/range-diff.c:60 builtin/range-diff.c:64 #, fuzzy, c-format -msgid "no .. in range: '%s'" +msgid "not a commit range: '%s'" msgstr "ramo inexistente: '%s'" -#: builtin/range-diff.c:64 +#: builtin/range-diff.c:74 msgid "single arg format must be symmetric range" msgstr "" -#: builtin/range-diff.c:79 +#: builtin/range-diff.c:89 #, fuzzy msgid "need two commit ranges" -msgstr "editar a mensagem de commit" +msgstr "preciso dois intervalos de memórias" #: builtin/read-tree.c:41 msgid "" @@ -19142,17 +19981,15 @@ msgstr "realizar uma integração em adição a uma leitura" #: builtin/read-tree.c:133 msgid "3-way merge if no file level merging required" -msgstr "" -"integrar com 3 pontos se a integração ao nível de ficheiros não for " -"necessária" +msgstr "tri-junção se dispensar junção ao nível de ficheiros" #: builtin/read-tree.c:135 msgid "3-way merge in presence of adds and removes" -msgstr "integrar com 3 ponto na presença de adições e remoções" +msgstr "tri-junção na presença de adições e remoções" #: builtin/read-tree.c:137 msgid "same as -m, but discard unmerged entries" -msgstr "o mesmo que -m, mas descartar entradas não integradas" +msgstr "o mesmo que -m, mas descartar entradas por juntar" #: builtin/read-tree.c:138 msgid "<subdirectory>/" @@ -19176,11 +20013,11 @@ msgstr "permitir que os ficheiros explicitamente ignorados sejam substituídos" #: builtin/read-tree.c:148 msgid "don't check the working tree after merging" -msgstr "não verificar a árvore de trabalho depois de integrar" +msgstr "verifica nenhuma worktree após junção" #: builtin/read-tree.c:149 msgid "don't update the index or the work tree" -msgstr "não atualizar o índice ou a árvore de trabalho" +msgstr "atualizar index nenhum e worktree nenhuma" #: builtin/read-tree.c:151 msgid "skip applying sparse checkout filter" @@ -19216,213 +20053,213 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git am [<opções>] (--continue | --skip | --abort)" -#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244 +#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245 #, fuzzy, c-format msgid "unusable todo list: '%s'" -msgstr "não é possível invocar unlink: %s" +msgstr "lista de tarefas inutilizável: '%s'" -#: builtin/rebase.c:310 +#: builtin/rebase.c:311 #, fuzzy, c-format msgid "could not create temporary %s" -msgstr "não foi possível criar ficheiro temporário" +msgstr "incapaz criar %s temporário" -#: builtin/rebase.c:316 +#: builtin/rebase.c:317 #, fuzzy msgid "could not mark as interactive" msgstr "incapaz marcar como interativo" -#: builtin/rebase.c:369 +#: builtin/rebase.c:370 #, fuzzy msgid "could not generate todo list" -msgstr "não foi possível escrever para %s" +msgstr "incapaz gerar lista de tarefas" -#: builtin/rebase.c:411 +#: builtin/rebase.c:412 msgid "a base commit must be provided with --upstream or --onto" msgstr "" -#: builtin/rebase.c:480 +#: builtin/rebase.c:481 #, fuzzy msgid "git rebase--interactive [<options>]" msgstr "git rebase--helper [<opções>]" -#: builtin/rebase.c:493 builtin/rebase.c:1388 +#: builtin/rebase.c:494 builtin/rebase.c:1389 msgid "keep commits which start empty" msgstr "" -#: builtin/rebase.c:497 builtin/revert.c:128 +#: builtin/rebase.c:498 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "permitir commits com mensagens vazias" -#: builtin/rebase.c:499 +#: builtin/rebase.c:500 #, fuzzy msgid "rebase merge commits" msgstr "mergetag incorreta no commit '%s'" -#: builtin/rebase.c:501 +#: builtin/rebase.c:502 msgid "keep original branch points of cousins" msgstr "" -#: builtin/rebase.c:503 +#: builtin/rebase.c:504 msgid "move commits that begin with squash!/fixup!" msgstr "" -#: builtin/rebase.c:504 +#: builtin/rebase.c:505 #, fuzzy msgid "sign commits" msgstr "assinar os commits com GPG" -#: builtin/rebase.c:506 builtin/rebase.c:1327 +#: builtin/rebase.c:507 builtin/rebase.c:1328 msgid "display a diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:508 +#: builtin/rebase.c:509 msgid "continue rebase" msgstr "continuar rebase" -#: builtin/rebase.c:510 +#: builtin/rebase.c:511 #, fuzzy msgid "skip commit" msgstr "commit" -#: builtin/rebase.c:511 +#: builtin/rebase.c:512 #, fuzzy msgid "edit the todo list" -msgstr "falha ao escrever para rev-list" +msgstr "" -#: builtin/rebase.c:513 +#: builtin/rebase.c:514 #, fuzzy msgid "show the current patch" -msgstr "ignorar o patch atual" +msgstr "mostrar remendo atual" -#: builtin/rebase.c:516 +#: builtin/rebase.c:517 msgid "shorten commit ids in the todo list" msgstr "" -#: builtin/rebase.c:518 +#: builtin/rebase.c:519 msgid "expand commit ids in the todo list" msgstr "" -#: builtin/rebase.c:520 +#: builtin/rebase.c:521 msgid "check the todo list" msgstr "" -#: builtin/rebase.c:522 +#: builtin/rebase.c:523 msgid "rearrange fixup/squash lines" msgstr "" -#: builtin/rebase.c:524 +#: builtin/rebase.c:525 msgid "insert exec commands in todo list" msgstr "" -#: builtin/rebase.c:525 +#: builtin/rebase.c:526 msgid "onto" msgstr "" -#: builtin/rebase.c:528 +#: builtin/rebase.c:529 #, fuzzy msgid "restrict-revision" -msgstr "revisão" +msgstr "revisão-restrita" -#: builtin/rebase.c:528 +#: builtin/rebase.c:529 #, fuzzy msgid "restrict revision" -msgstr "revisão" +msgstr "revisão restrita" -#: builtin/rebase.c:530 +#: builtin/rebase.c:531 msgid "squash-onto" msgstr "" -#: builtin/rebase.c:531 +#: builtin/rebase.c:532 msgid "squash onto" msgstr "" -#: builtin/rebase.c:533 +#: builtin/rebase.c:534 #, fuzzy msgid "the upstream commit" msgstr "Remover a informação do ramo a montante" -#: builtin/rebase.c:535 +#: builtin/rebase.c:536 #, fuzzy msgid "head-name" msgstr "mudar nome" -#: builtin/rebase.c:535 +#: builtin/rebase.c:536 #, fuzzy msgid "head name" msgstr "à frente " -#: builtin/rebase.c:540 +#: builtin/rebase.c:541 #, fuzzy msgid "rebase strategy" msgstr "estratégia de integração" -#: builtin/rebase.c:541 +#: builtin/rebase.c:542 #, fuzzy msgid "strategy-opts" msgstr "estratégia" -#: builtin/rebase.c:542 +#: builtin/rebase.c:543 #, fuzzy msgid "strategy options" msgstr "opções de decoração" -#: builtin/rebase.c:543 +#: builtin/rebase.c:544 msgid "switch-to" msgstr "" -#: builtin/rebase.c:544 +#: builtin/rebase.c:545 msgid "the branch or commit to checkout" msgstr "" -#: builtin/rebase.c:545 +#: builtin/rebase.c:546 #, fuzzy msgid "onto-name" -msgstr "nome" +msgstr "para-nome" -#: builtin/rebase.c:545 +#: builtin/rebase.c:546 #, fuzzy msgid "onto name" -msgstr "nome do remoto" +msgstr "para nome" -#: builtin/rebase.c:546 +#: builtin/rebase.c:547 #, fuzzy msgid "cmd" msgstr "comando" -#: builtin/rebase.c:546 +#: builtin/rebase.c:547 #, fuzzy msgid "the command to run" -msgstr "Nenhum comando concluído." +msgstr "" -#: builtin/rebase.c:549 builtin/rebase.c:1421 +#: builtin/rebase.c:550 builtin/rebase.c:1422 msgid "automatically re-schedule any `exec` that fails" msgstr "" -#: builtin/rebase.c:565 +#: builtin/rebase.c:566 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "" -#: builtin/rebase.c:581 +#: builtin/rebase.c:582 #, c-format msgid "%s requires the merge backend" msgstr "" -#: builtin/rebase.c:624 +#: builtin/rebase.c:625 #, fuzzy, c-format msgid "could not get 'onto': '%s'" -msgstr "não foi possível definir '%s' como '%s'" +msgstr "incapaz obter 'onto': '%s'" -#: builtin/rebase.c:641 +#: builtin/rebase.c:642 #, fuzzy, c-format msgid "invalid orig-head: '%s'" -msgstr "ficheiro inválido: '%s'" +msgstr "orig-head inválida: '%s'" -#: builtin/rebase.c:666 +#: builtin/rebase.c:667 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "" -#: builtin/rebase.c:811 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81 #, fuzzy msgid "" "Resolve all conflicts manually, mark them as resolved with\n" @@ -19436,7 +20273,7 @@ msgstr "" "Para extrair o ramo original e interromper o rebase, execute \"git rebase --" "abort\"." -#: builtin/rebase.c:894 +#: builtin/rebase.c:896 #, c-format msgid "" "\n" @@ -19448,14 +20285,14 @@ msgid "" "As a result, git cannot rebase them." msgstr "" -#: builtin/rebase.c:1220 +#: builtin/rebase.c:1222 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" "\"." msgstr "" -#: builtin/rebase.c:1238 +#: builtin/rebase.c:1240 #, fuzzy, c-format msgid "" "%s\n" @@ -19472,7 +20309,7 @@ msgstr "" " git rebase '<branch>'\n" "\n" -#: builtin/rebase.c:1254 +#: builtin/rebase.c:1256 #, fuzzy, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -19485,209 +20322,201 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:1284 +#: builtin/rebase.c:1286 msgid "exec commands cannot contain newlines" msgstr "" -#: builtin/rebase.c:1288 +#: builtin/rebase.c:1290 msgid "empty exec command" msgstr "" -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1319 #, fuzzy msgid "rebase onto given branch instead of upstream" msgstr "demasiados ramos para remover a definição de ramo a montante" -#: builtin/rebase.c:1320 +#: builtin/rebase.c:1321 #, fuzzy msgid "use the merge-base of upstream and branch as the current base" -msgstr "o ramo a montante solicitado '%s' não existe" +msgstr "usar a base de junção de upstream e ramo como base atual" -#: builtin/rebase.c:1322 +#: builtin/rebase.c:1323 #, fuzzy msgid "allow pre-rebase hook to run" msgstr "Rebase recusado pelo hook pre-rebase." -#: builtin/rebase.c:1324 +#: builtin/rebase.c:1325 msgid "be quiet. implies --no-stat" msgstr "" -#: builtin/rebase.c:1330 +#: builtin/rebase.c:1331 #, fuzzy msgid "do not show diffstat of what changed upstream" -msgstr "não apresentar um diffstat ao fim da integração" +msgstr "esconder diffstat de o que alterou upstream" -#: builtin/rebase.c:1333 +#: builtin/rebase.c:1334 #, fuzzy msgid "add a Signed-off-by trailer to each commit" msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit" -#: builtin/rebase.c:1336 +#: builtin/rebase.c:1337 #, fuzzy msgid "make committer date match author date" msgstr "agrupar por committer em vez de autor" -#: builtin/rebase.c:1338 +#: builtin/rebase.c:1339 msgid "ignore author date and use current date" msgstr "" -#: builtin/rebase.c:1340 +#: builtin/rebase.c:1341 #, fuzzy msgid "synonym of --reset-author-date" -msgstr "sinónimo de --files-with-matches" +msgstr "sinónimo de --reset-author-date" -#: builtin/rebase.c:1342 builtin/rebase.c:1346 +#: builtin/rebase.c:1343 builtin/rebase.c:1347 #, fuzzy msgid "passed to 'git apply'" -msgstr "transmitir ao git-apply" +msgstr "passado para 'git apply'" -#: builtin/rebase.c:1344 +#: builtin/rebase.c:1345 #, fuzzy msgid "ignore changes in whitespace" -msgstr "ignorar alterações de espaço em branco ao procurar contexto" +msgstr "" -#: builtin/rebase.c:1348 builtin/rebase.c:1351 +#: builtin/rebase.c:1349 builtin/rebase.c:1352 msgid "cherry-pick all commits, even if unchanged" msgstr "" -#: builtin/rebase.c:1353 +#: builtin/rebase.c:1354 #, fuzzy msgid "continue" msgstr "continuar rebase" -#: builtin/rebase.c:1356 +#: builtin/rebase.c:1357 #, fuzzy msgid "skip current patch and continue" -msgstr "ignorar o patch atual" +msgstr "ignorar remendo atual e continuar" -#: builtin/rebase.c:1358 +#: builtin/rebase.c:1359 #, fuzzy msgid "abort and check out the original branch" msgstr " (use \"git rebase --abort\" para restaurar o ramo original)" -#: builtin/rebase.c:1361 +#: builtin/rebase.c:1362 msgid "abort but keep HEAD where it is" msgstr "" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1363 #, fuzzy msgid "edit the todo list during an interactive rebase" -msgstr "A ação --edit-todo só pode ser usada durante um rebase interativo." +msgstr "editar a lista de afazeres durante rebase interativa" -#: builtin/rebase.c:1365 +#: builtin/rebase.c:1366 msgid "show the patch file being applied or merged" msgstr "" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1369 msgid "use apply strategies to rebase" msgstr "" -#: builtin/rebase.c:1372 +#: builtin/rebase.c:1373 #, fuzzy msgid "use merging strategies to rebase" msgstr "estratégia de integração a usar" -#: builtin/rebase.c:1376 +#: builtin/rebase.c:1377 msgid "let the user edit the list of commits to rebase" msgstr "" -#: builtin/rebase.c:1380 +#: builtin/rebase.c:1381 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" -#: builtin/rebase.c:1385 +#: builtin/rebase.c:1386 msgid "how to handle commits that become empty" msgstr "" -#: builtin/rebase.c:1392 +#: builtin/rebase.c:1393 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" -#: builtin/rebase.c:1399 +#: builtin/rebase.c:1400 msgid "add exec lines after each commit of the editable list" msgstr "" -#: builtin/rebase.c:1403 +#: builtin/rebase.c:1404 #, fuzzy msgid "allow rebasing commits with empty messages" msgstr "permitir commits com mensagens vazias" -#: builtin/rebase.c:1407 +#: builtin/rebase.c:1408 msgid "try to rebase merges instead of skipping them" msgstr "" -#: builtin/rebase.c:1410 +#: builtin/rebase.c:1411 #, fuzzy msgid "use 'merge-base --fork-point' to refine upstream" msgstr "git merge-base --fork-point <referência> [<commit>]" -#: builtin/rebase.c:1412 +#: builtin/rebase.c:1413 #, fuzzy msgid "use the given merge strategy" msgstr "opção de estratégia de integração" -#: builtin/rebase.c:1414 builtin/revert.c:115 +#: builtin/rebase.c:1415 builtin/revert.c:115 msgid "option" msgstr "opção" -#: builtin/rebase.c:1415 +#: builtin/rebase.c:1416 msgid "pass the argument through to the merge strategy" msgstr "" -#: builtin/rebase.c:1418 +#: builtin/rebase.c:1419 msgid "rebase all reachable commits up to the root(s)" msgstr "" -#: builtin/rebase.c:1423 +#: builtin/rebase.c:1424 msgid "apply all changes, even those already present upstream" msgstr "" -#: builtin/rebase.c:1440 -msgid "" -"the rebase.useBuiltin support has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"o suporte a rebase.useBuiltin foi removido!\n" -"Vê essa entry em 'git help config' para detalhes." - -#: builtin/rebase.c:1446 +#: builtin/rebase.c:1442 #, fuzzy msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Parece que 'git am' está em curso. Incapaz de rebasear." -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1483 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" -#: builtin/rebase.c:1492 +#: builtin/rebase.c:1488 #, fuzzy msgid "cannot combine '--keep-base' with '--onto'" msgstr "incapaz de combinar '--keep-base' com '--onto'" -#: builtin/rebase.c:1494 +#: builtin/rebase.c:1490 #, fuzzy msgid "cannot combine '--keep-base' with '--root'" msgstr "incapaz de combinar '--keep-base' com '--root'" -#: builtin/rebase.c:1498 +#: builtin/rebase.c:1494 #, fuzzy msgid "cannot combine '--root' with '--fork-point'" msgstr "incapaz de combinar '--root' com '--fork-point'" -#: builtin/rebase.c:1501 +#: builtin/rebase.c:1497 msgid "No rebase in progress?" -msgstr "Rebase não está em curso?" +msgstr "Algum rebase em curso?" -#: builtin/rebase.c:1505 +#: builtin/rebase.c:1501 msgid "The --edit-todo action can only be used during interactive rebase." -msgstr "A ação --edit-todo só pode ser usada durante um rebase interativo." +msgstr "A ação --edit-todo só pode ser usada durante uma rebase interativa." -#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122 msgid "Cannot read HEAD" msgstr "Incapaz ler HEAD" -#: builtin/rebase.c:1540 +#: builtin/rebase.c:1536 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -19695,17 +20524,17 @@ msgstr "" "Deve editar todos os conflitos da integração\n" "e marcá-los como resolvidos usando git add" -#: builtin/rebase.c:1559 +#: builtin/rebase.c:1555 #, fuzzy msgid "could not discard worktree changes" msgstr "incapaz de descartar alterações de worktree" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1574 #, fuzzy, c-format msgid "could not move back to %s" msgstr "incapaz de retroceder a %s" -#: builtin/rebase.c:1624 +#: builtin/rebase.c:1620 #, fuzzy, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -19717,146 +20546,146 @@ msgid "" "and run me again. I am stopping in case you still have something\n" "valuable there.\n" msgstr "" -"Parece que já existe um diretório %s, e\n" -"é possível que outro processo de rebase já esteja em curso.\n" -"Se for o caso, tente\n" +"Parece que já existe uma pasta %s, e\n" +"pregunto-me se estás a meio de outro rebase. Se for o caso,\n" +"por favor tenta\n" "\t%s\n" -"Se não for o caso,\n" +"Caso eu esteja errado, faz por favor\n" "\t%s\n" -"e execute o comando de novo. A execução foi interrompida no caso de\n" -"ainda ter algo importante nesse sítio.\n" +"e execute-me novamente. Estou parando caso ainda tenhas algo\n" +"de valor aí.\n" -#: builtin/rebase.c:1652 +#: builtin/rebase.c:1648 #, fuzzy msgid "switch `C' expects a numerical value" -msgstr "a opção '%c' espera um valor numérico" +msgstr "" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1690 #, fuzzy, c-format msgid "Unknown mode: %s" msgstr "Mode de --patch desconhecido: %s" -#: builtin/rebase.c:1733 +#: builtin/rebase.c:1729 msgid "--strategy requires --merge or --interactive" msgstr "" -#: builtin/rebase.c:1763 +#: builtin/rebase.c:1759 msgid "cannot combine apply options with merge options" msgstr "" -#: builtin/rebase.c:1776 +#: builtin/rebase.c:1772 #, fuzzy, c-format msgid "Unknown rebase backend: %s" -msgstr "Subcomando desconhecido: %s" +msgstr "" -#: builtin/rebase.c:1806 +#: builtin/rebase.c:1802 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "" -#: builtin/rebase.c:1826 +#: builtin/rebase.c:1822 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "" -#: builtin/rebase.c:1830 +#: builtin/rebase.c:1826 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" -#: builtin/rebase.c:1854 +#: builtin/rebase.c:1850 #, fuzzy, c-format msgid "invalid upstream '%s'" -msgstr "caminho inválido '%s'" +msgstr "" -#: builtin/rebase.c:1860 +#: builtin/rebase.c:1856 #, fuzzy msgid "Could not create new root commit" -msgstr "não foi possível analisar o commit recém-criado" +msgstr "incapaz criar novo commit raiz" -#: builtin/rebase.c:1886 +#: builtin/rebase.c:1882 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1885 #, fuzzy, c-format msgid "'%s': need exactly one merge base" -msgstr "É necessário exatamente um intervalo." +msgstr "" -#: builtin/rebase.c:1897 +#: builtin/rebase.c:1893 #, fuzzy, c-format msgid "Does not point to a valid commit '%s'" msgstr "Aponta nada para commit válido '%s'" -#: builtin/rebase.c:1923 +#: builtin/rebase.c:1921 #, fuzzy, c-format msgid "fatal: no such branch/commit '%s'" -msgstr "o ramo '%s' não existe" +msgstr "fatal: nenhum ramo/commit '%s'" -#: builtin/rebase.c:1931 builtin/submodule--helper.c:40 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:39 #: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Referência inexistente: %s" -#: builtin/rebase.c:1942 +#: builtin/rebase.c:1940 #, fuzzy msgid "Could not resolve HEAD to a revision" msgstr "Foi impossível resolver HEAD para uma revisão" -#: builtin/rebase.c:1963 +#: builtin/rebase.c:1961 msgid "Please commit or stash them." msgstr "Submeta ou esconda-as." -#: builtin/rebase.c:1999 +#: builtin/rebase.c:1997 #, fuzzy, c-format msgid "could not switch to %s" -msgstr "não foi possível escrever para %s" +msgstr "incapaz alternar para %s" -#: builtin/rebase.c:2010 +#: builtin/rebase.c:2008 #, fuzzy msgid "HEAD is up to date." msgstr "HEAD está agora em" -#: builtin/rebase.c:2012 +#: builtin/rebase.c:2010 #, fuzzy, c-format msgid "Current branch %s is up to date.\n" msgstr "Branch atual %s está atualizado.\n" -#: builtin/rebase.c:2020 +#: builtin/rebase.c:2018 #, fuzzy msgid "HEAD is up to date, rebase forced." msgstr "O ramo atual $branch_name está atualizado, rebase forçado." -#: builtin/rebase.c:2022 +#: builtin/rebase.c:2020 #, fuzzy, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Branch actual %s está atualizado, rebase forçado.\n" -#: builtin/rebase.c:2030 +#: builtin/rebase.c:2028 msgid "The pre-rebase hook refused to rebase." msgstr "Rebase recusado pelo hook pre-rebase." -#: builtin/rebase.c:2037 +#: builtin/rebase.c:2035 #, fuzzy, c-format msgid "Changes to %s:\n" msgstr "Modificações para %s:\n" -#: builtin/rebase.c:2040 +#: builtin/rebase.c:2038 #, fuzzy, c-format msgid "Changes from %s to %s:\n" msgstr "Modificações de %s para %s:\n" -#: builtin/rebase.c:2065 +#: builtin/rebase.c:2063 #, fuzzy, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "Primeiro, recuando head para refazer o teu trabalho em cima dela...\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2072 #, fuzzy msgid "Could not detach HEAD" -msgstr "não foi possível destacar HEAD" +msgstr "incapaz soltar HEAD" -#: builtin/rebase.c:2083 +#: builtin/rebase.c:2081 #, fuzzy, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avançei-rápido %s para %s.\n" @@ -19865,7 +20694,7 @@ msgstr "Avançei-rápido %s para %s.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:1276 +#: builtin/receive-pack.c:1275 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" @@ -19882,20 +20711,20 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" "Por predefinição, atualizar o ramo atual num repositório não-nu\n" -"é proibido, porque tornará o índice e a árvore de trabalho inconsistentes\n" -"com o que publicou e requererá 'git reset --hard' para igualar a\n" -"árvore de trabalho à HEAD.\n" +"é proibido, porque tornará o index e a worktree inconsistentes\n" +"com o que atiraste, e requererá 'git reset --hard' para igualar a\n" +"worktree com HEAD.\n" "\n" -"Pode definir a variável configuração 'receive.denyCurrentBranch'\n" -"como 'ignore' ou 'warn' no repositório remoto para permitir publicar\n" -"para o ramo atual dele; no entanto, não é recomendando a menos que\n" -"consiga de outra forma atualizar a árvore de trabalho dele para\n" -"refletir o que publicou.\n" +"Podes definir variável configuração 'receive.denyCurrentBranch'\n" +"como 'ignore' ou 'warn' no repositório remoto para permitir atirar\n" +"para o ramo atual deste; no entanto, é recomendando nada disto a\n" +"menos que consigas outra forma de atualizar a worktree dele para\n" +"refletir o que atiraste.\n" "\n" -"Para suprimir esta mensagem e manter o comportamento predefinido, defina\n" +"Para suprimir esta mensagem e manter o comportamento predefinido, define\n" "a variável de configuração 'receive.denyCurrentBranch' como 'refuse'." -#: builtin/receive-pack.c:1296 +#: builtin/receive-pack.c:1295 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" @@ -19915,11 +20744,11 @@ msgstr "" "\n" "Para suprimir esta mensagem, podes definí-la como 'refuse'." -#: builtin/receive-pack.c:2481 +#: builtin/receive-pack.c:2478 msgid "quiet" msgstr "silencioso" -#: builtin/receive-pack.c:2495 +#: builtin/receive-pack.c:2492 msgid "You must specify a directory." msgstr "Deve especificar um diretório." @@ -19943,39 +20772,39 @@ msgstr "" #: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" -msgstr "'%s' não é um carimbo de data/hora válido" +msgstr "'%s' é um carimbo de data/hora inválido" -#: builtin/reflog.c:606 +#: builtin/reflog.c:609 #, fuzzy, c-format msgid "Marking reachable objects..." -msgstr "manter objetos inalcançáveis" +msgstr "" -#: builtin/reflog.c:644 +#: builtin/reflog.c:647 #, c-format msgid "%s points nowhere!" msgstr "" -#: builtin/reflog.c:696 +#: builtin/reflog.c:699 #, fuzzy msgid "no reflog specified to delete" msgstr "especificado reflog nenhum para apagar" -#: builtin/reflog.c:705 +#: builtin/reflog.c:708 #, fuzzy, c-format msgid "not a reflog: %s" msgstr "reflog inválido: %s" -#: builtin/reflog.c:710 +#: builtin/reflog.c:713 #, fuzzy, c-format msgid "no reflog for '%s'" msgstr "reflog nenhum para '%s'" -#: builtin/reflog.c:756 +#: builtin/reflog.c:759 #, fuzzy, c-format msgid "invalid ref format: %s" msgstr "formato de ref inválido: %s" -#: builtin/reflog.c:765 +#: builtin/reflog.c:768 msgid "git reflog [ show | expire | delete | exists ]" msgstr "" @@ -20064,7 +20893,7 @@ msgstr "git remote update [<opções>] [<grupo> | <remoto>]..." #: builtin/remote.c:99 #, c-format msgid "Updating %s" -msgstr "A atualizar %s" +msgstr "Atualizando %s" #: builtin/remote.c:131 msgid "" @@ -20105,7 +20934,7 @@ msgstr "configurar o remoto como um espelho para publicar ou obter" #: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" -msgstr "especificar um ramo mestre não faz sentido com --mirror" +msgstr "especificar um ramo master com --mirror faz sentido nenhum" #: builtin/remote.c:188 msgid "specifying branches to track makes sense only with fetch mirrors" @@ -20137,7 +20966,7 @@ msgstr "(apagar)" #: builtin/remote.c:655 #, fuzzy, c-format msgid "could not set '%s'" -msgstr "não foi possível reiniciar '%s'" +msgstr "incapaz definir '%s'" #: builtin/remote.c:660 #, c-format @@ -20147,7 +20976,7 @@ msgid "" "now names the non-existent remote '%s'" msgstr "" -#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 +#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943 #, fuzzy, c-format msgid "No such remote: '%s'" msgstr "Remoto inexistente '%s'" @@ -20164,20 +20993,18 @@ msgid "" "\t%s\n" "\tPlease update the configuration manually if necessary." msgstr "" -"O seguinte especificador de referência, não-predefinido e usado para obter " -"objetos, não foi atualizado\n" -"\t%s\n" -"\tAtualize a configuração manualmente se necessário." +"Deixando por atualizar refspec que é diferente de pré-definido\t%s\n" +"\tPor favor, atualiza a configuração manualmente se necessário." #: builtin/remote.c:770 #, c-format msgid "deleting '%s' failed" -msgstr "falha ao eliminar '%s'" +msgstr "falha ao apagar '%s'" #: builtin/remote.c:804 #, c-format msgid "creating '%s' failed" -msgstr "falha ao criar '%s'" +msgstr "falhou criar '%s'" #: builtin/remote.c:882 msgid "" @@ -20187,11 +21014,12 @@ msgid_plural "" "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" "to delete them, use:" msgstr[0] "" -"Nota: Um ramo fora da hierarquia refs/remotes/ não foi removido;\n" -"para o remover, use:" +"Nota: Um ramo fora da hierarquia refs/remotes/ está por remover;\n" +"para apagá-lo, usa:" msgstr[1] "" -"Nota: alguns ramos fora da hierarquia refs/remotes/ não foram removidos;\n" -"para os remover, use:" +"Nota: Alguns ramos fora da hierarquia refs/remotes/ estão por serem " +"removidos;\n" +"para os apagá-los, usa:" #: builtin/remote.c:896 #, c-format @@ -20218,8 +21046,7 @@ msgstr " ???" #: builtin/remote.c:1047 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" -msgstr "" -"branch.%s.merge inválido; não é possível rebasear sobre mais do que um ramo" +msgstr "branch.%s.merge inválido; incapaz rebasear sobre > 1 ramo" #: builtin/remote.c:1056 #, c-format @@ -20293,7 +21120,7 @@ msgstr " %-*s publica em %s" #: builtin/remote.c:1212 msgid "do not query remotes" -msgstr "não consultar remotos" +msgstr "faz consulta a remotos nenhuns" #: builtin/remote.c:1239 #, c-format @@ -20303,7 +21130,7 @@ msgstr "* remoto %s" #: builtin/remote.c:1240 #, c-format msgid " Fetch URL: %s" -msgstr " Obter do URL: %s" +msgstr " Buscar URL: %s" #: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396 msgid "(no URL)" @@ -20316,7 +21143,7 @@ msgstr "(URL nenhum)" #: builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " Push URL: %s" -msgstr " Publicar no URL: %s" +msgstr " Atirar URL: %s" #: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263 #, c-format @@ -20325,7 +21152,7 @@ msgstr " Ramo HEAD: %s" #: builtin/remote.c:1259 msgid "(not queried)" -msgstr "(não consultado)" +msgstr "(nada consultado)" #: builtin/remote.c:1261 msgid "(unknown)" @@ -20346,7 +21173,7 @@ msgstr[1] " Ramos remotos:%s" #: builtin/remote.c:1280 builtin/remote.c:1306 msgid " (status not queried)" -msgstr " (estado não consultado)" +msgstr " (estado é nada consultado)" #: builtin/remote.c:1289 msgid " Local branch configured for 'git pull':" @@ -20428,7 +21255,7 @@ msgstr " * [eliminado] %s" #: builtin/remote.c:1457 msgid "prune remotes after fetching" -msgstr "eliminar remotos depois de obter" +msgstr "podar remotos após buscar" #: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647 #, c-format @@ -20470,7 +21297,7 @@ msgstr "eliminar URLs" #: builtin/remote.c:1632 msgid "--add --delete doesn't make sense" -msgstr "--add --delete não faz sentido" +msgstr "--add --delete faz sentido nenhum" #: builtin/remote.c:1673 #, c-format @@ -20480,142 +21307,166 @@ msgstr "Padrão de URL antigo inválido: %s" #: builtin/remote.c:1681 #, c-format msgid "No such URL found: %s" -msgstr "URL não encontrado: %s" +msgstr "URL por encontrar: %s" #: builtin/remote.c:1683 msgid "Will not delete all non-push URLs" -msgstr "Eliminarei apenas alguns URLs de não-atirar" +msgstr "Apagarei apenas alguns URLs de não-atirar" -#: builtin/repack.c:25 +#: builtin/repack.c:26 msgid "git repack [<options>]" msgstr "git repack [<opções>]" -#: builtin/repack.c:30 +#: builtin/repack.c:31 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -"Repacks incrementais são incompatíveis com bitmap indexes. Usa\n" -"--no-write-bitmap-índex ou desative a configuração pack.writebitmaps." +"Repacks incrementais são incompatíveis com indexes bitmap. Usa\n" +"--no-write-bitmap-index ou desativa a configuração pack.writebitmaps ." -#: builtin/repack.c:197 +#: builtin/repack.c:198 msgid "could not start pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:268 builtin/repack.c:447 +#: builtin/repack.c:270 builtin/repack.c:630 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -#: builtin/repack.c:295 +#: builtin/repack.c:294 msgid "could not finish pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:323 +#: builtin/repack.c:309 +#, fuzzy, c-format +msgid "cannot open index for %s" +msgstr "incapaz opendir '%s'" + +#: builtin/repack.c:368 +#, c-format +msgid "pack %s too large to consider in geometric progression" +msgstr "" + +#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413 +#, c-format +msgid "pack %s too large to roll up" +msgstr "" + +#: builtin/repack.c:460 msgid "pack everything in a single pack" msgstr "compactar tudo num único pacote" -#: builtin/repack.c:325 +#: builtin/repack.c:462 msgid "same as -a, and turn unreachable objects loose" msgstr "o mesmo que -a, e soltar objetos inalcançáveis" -#: builtin/repack.c:328 +#: builtin/repack.c:465 msgid "remove redundant packs, and run git-prune-packed" msgstr "remover pacotes redundantes e executar git-prune-packed" -#: builtin/repack.c:330 +#: builtin/repack.c:467 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passar --no-reuse-delta ao git-pack-objects" -#: builtin/repack.c:332 +#: builtin/repack.c:469 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passar --no-reuse-object ao git-pack-objects" -#: builtin/repack.c:334 +#: builtin/repack.c:471 msgid "do not run git-update-server-info" -msgstr "não executar git-update-server-info" +msgstr "executar git-update-server-info nenhum" -#: builtin/repack.c:337 +#: builtin/repack.c:474 msgid "pass --local to git-pack-objects" -msgstr "passar --local ao git-pack-objects" +msgstr "passar --local para git-pack-objects" -#: builtin/repack.c:339 +#: builtin/repack.c:476 msgid "write bitmap index" msgstr "escrever índice de mapa de bits" -#: builtin/repack.c:341 +#: builtin/repack.c:478 #, fuzzy msgid "pass --delta-islands to git-pack-objects" msgstr "passar --local ao git-pack-objects" -#: builtin/repack.c:342 +#: builtin/repack.c:479 msgid "approxidate" msgstr "aproximar" -#: builtin/repack.c:343 +#: builtin/repack.c:480 msgid "with -A, do not loosen objects older than this" -msgstr "com -A, não soltar mais objetos além destes" +msgstr "com -A, deixar de soltar objetos mais velhos que isto" -#: builtin/repack.c:345 +#: builtin/repack.c:482 msgid "with -a, repack unreachable objects" msgstr "com -a, reempacotar objetos inalcançáveis" -#: builtin/repack.c:347 +#: builtin/repack.c:484 msgid "size of the window used for delta compression" msgstr "dimensão da janela usada em compressão de deltas" -#: builtin/repack.c:348 builtin/repack.c:354 +#: builtin/repack.c:485 builtin/repack.c:491 msgid "bytes" msgstr "bytes" -#: builtin/repack.c:349 +#: builtin/repack.c:486 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "o mesmo que o anterior, mas limitar a memória usada em vez do número de " "entradas" -#: builtin/repack.c:351 +#: builtin/repack.c:488 msgid "limits the maximum delta depth" msgstr "limitar a profundidade máxima de delta" -#: builtin/repack.c:353 +#: builtin/repack.c:490 #, fuzzy msgid "limits the maximum number of threads" msgstr "limitar a profundidade máxima de delta" -#: builtin/repack.c:355 +#: builtin/repack.c:492 msgid "maximum size of each packfile" msgstr "tamanho máximo de cada ficheiro de pacote" -#: builtin/repack.c:357 +#: builtin/repack.c:494 msgid "repack objects in packs marked with .keep" msgstr "reempacotar objetos em pacotes marcados com .keep" -#: builtin/repack.c:359 +#: builtin/repack.c:496 #, fuzzy msgid "do not repack this pack" msgstr "criar pacotes finos" -#: builtin/repack.c:369 +#: builtin/repack.c:498 +msgid "find a geometric progression with factor <N>" +msgstr "" + +#: builtin/repack.c:508 msgid "cannot delete packs in a precious-objects repo" -msgstr "não é possível eliminar pacotes num repositório de objetos-preciosos" +msgstr "incapaz apagar pacotes num repo de precious-objects" -#: builtin/repack.c:373 +#: builtin/repack.c:512 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable e -A são incompatíveis" -#: builtin/repack.c:456 +#: builtin/repack.c:527 +#, fuzzy +msgid "--geometric is incompatible with -A, -a" +msgstr "" + +#: builtin/repack.c:639 msgid "Nothing new to pack." msgstr "" -#: builtin/repack.c:486 +#: builtin/repack.c:669 #, fuzzy, c-format msgid "missing required file: %s" -msgstr "falta o objeto %s de %s" +msgstr "" -#: builtin/repack.c:488 +#: builtin/repack.c:671 #, fuzzy, c-format msgid "could not unlink: %s" -msgstr "não foi possível bloquear '%s'" +msgstr "incapaz unlink: %s" #: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" @@ -20652,22 +21503,22 @@ msgstr "" #: builtin/replace.c:125 #, fuzzy, c-format msgid "replace ref '%s' not found" -msgstr "ramo '%s' não encontrado." +msgstr "ref substituição '%s' por encontrar" #: builtin/replace.c:141 #, fuzzy, c-format msgid "Deleted replace ref '%s'" -msgstr "eliminar referências substituídas" +msgstr "Ref substituição '%s' apagada" #: builtin/replace.c:153 #, fuzzy, c-format msgid "'%s' is not a valid ref name" -msgstr "'%s' não é um nome de remoto válido" +msgstr "'%s' é nome de ref inválido" #: builtin/replace.c:158 #, fuzzy, c-format msgid "replace ref '%s' already exists" -msgstr "a tag '%s' já existe" +msgstr "ref substituição '%s' já existe" #: builtin/replace.c:178 #, c-format @@ -20680,7 +21531,7 @@ msgstr "" #: builtin/replace.c:229 #, fuzzy, c-format msgid "unable to open %s for writing" -msgstr "não foi possível abrir %s para escrita" +msgstr "incapaz abrir %s para escrita" #: builtin/replace.c:242 msgid "cat-file reported failure" @@ -20689,48 +21540,48 @@ msgstr "" #: builtin/replace.c:258 #, fuzzy, c-format msgid "unable to open %s for reading" -msgstr "não é possível abrir ou ler %s" +msgstr "incapaz abrir %s para ler" #: builtin/replace.c:272 #, fuzzy msgid "unable to spawn mktree" -msgstr "não foi possível ler a árvore (%s)" +msgstr "incapaz lançar mktree" #: builtin/replace.c:276 #, fuzzy msgid "unable to read from mktree" -msgstr "não foi possível ler a árvore (%s)" +msgstr "incapaz ler de mktree" #: builtin/replace.c:285 #, fuzzy msgid "mktree reported failure" -msgstr "falha ao reverter" +msgstr "mktree reportou falha" #: builtin/replace.c:289 #, fuzzy msgid "mktree did not return an object name" -msgstr "o remoto não enviou todos os objetos necessários" +msgstr "mktree retornou nome de objeto nenhum" #: builtin/replace.c:298 #, fuzzy, c-format msgid "unable to fstat %s" -msgstr "não foi possível atualizar %s" +msgstr "incapaz fstat %s" #: builtin/replace.c:303 #, fuzzy msgid "unable to write object to database" -msgstr "não é possível escrever o objeto de nota" +msgstr "incapaz escrever objeto para base de dados" #: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 #: builtin/replace.c:454 #, fuzzy, c-format msgid "not a valid object name: '%s'" -msgstr "Nome de objeto inválido: '%s'" +msgstr "nome de objeto inválido: '%s'" #: builtin/replace.c:326 #, fuzzy, c-format msgid "unable to get object type for %s" -msgstr "não foi possível efetuar grep de objetos do tipo %s" +msgstr "incapaz obter tipo de objetos para %s" #: builtin/replace.c:342 #, fuzzy @@ -20745,7 +21596,7 @@ msgstr "" #: builtin/replace.c:384 #, fuzzy, c-format msgid "could not parse %s as a commit" -msgstr "não foi possível analisar o commit HEAD" +msgstr "incapaz processar %s como commit" #: builtin/replace.c:416 #, c-format @@ -20778,7 +21629,7 @@ msgstr "a assinatura será removida do commit suplente!" #: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" -msgstr "não foi possível escrever o commit suplente de: '%s'" +msgstr "incapaz escrever o commit substituto para: '%s'" #: builtin/replace.c:488 #, c-format @@ -20805,7 +21656,7 @@ msgstr "listar referências substituídas" #: builtin/replace.c:549 msgid "delete replace refs" -msgstr "eliminar referências substituídas" +msgstr "eliminar refs de substituição" #: builtin/replace.c:550 msgid "edit existing object" @@ -20826,7 +21677,7 @@ msgstr "substituir a referência se esta existir" #: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" -msgstr "não mostrar o conteúdo de --edit com impressão bonita" +msgstr "incapaz pretty-print conteúdo para --edit" #: builtin/replace.c:556 msgid "use this format" @@ -20835,17 +21686,17 @@ msgstr "usar este formato" #: builtin/replace.c:569 #, fuzzy msgid "--format cannot be used when not listing" -msgstr "--fix-thin não pode ser usado sem --stdin" +msgstr "--format apenas pode ser usado quando faz listagem" #: builtin/replace.c:577 #, fuzzy msgid "-f only makes sense when writing a replacement" -msgstr "-z só faz sentido com --stdin" +msgstr "" #: builtin/replace.c:581 #, fuzzy msgid "--raw only makes sense with --edit" -msgstr "-z só faz sentido com --stdin" +msgstr "" #: builtin/replace.c:587 msgid "-d needs at least one argument" @@ -20858,7 +21709,7 @@ msgstr "" #: builtin/replace.c:599 #, fuzzy msgid "-e needs exactly one argument" -msgstr "É necessário exatamente um intervalo." +msgstr "" #: builtin/replace.c:605 msgid "-g needs at least one argument" @@ -20867,7 +21718,7 @@ msgstr "" #: builtin/replace.c:611 #, fuzzy msgid "--convert-graft-file takes no argument" -msgstr "--continue não leva argumentos" +msgstr "--convert-graft-file leva argumento nenhum" #: builtin/replace.c:617 #, fuzzy @@ -20879,18 +21730,18 @@ msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "" "git rerere [clear | forget <caminho>... | status | remaining | diff | gc]" -#: builtin/rerere.c:60 +#: builtin/rerere.c:58 msgid "register clean resolutions in index" msgstr "registar resoluções limpas no índice" -#: builtin/rerere.c:79 +#: builtin/rerere.c:77 msgid "'git rerere forget' without paths is deprecated" msgstr "" -#: builtin/rerere.c:113 +#: builtin/rerere.c:111 #, fuzzy, c-format msgid "unable to generate diff for '%s'" -msgstr "não foi possível criar '%s'" +msgstr "incapaz gerar diff para '%s'" #: builtin/reset.c:32 msgid "" @@ -20956,8 +21807,8 @@ msgstr "HEAD está agora em %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "Incapaz de fazer uma reposição %s durante uma junção." -#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:594 -#: builtin/stash.c:618 +#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663 +#: builtin/stash.c:687 msgid "be quiet, only report errors" msgstr "silencioso, só reportar erros" @@ -21016,7 +21867,7 @@ msgstr "-N só pode ser usado com --mixed" #: builtin/reset.c:413 msgid "Unstaged changes after reset:" -msgstr "Alterações não preparadas depois de repor:" +msgstr "Alterações despreparadas depois de reposição:" #: builtin/reset.c:416 #, c-format @@ -21036,22 +21887,22 @@ msgstr "Incapaz repor ficheiro index para a revisão '%s'." msgid "Could not write new index file." msgstr "Incapaz escrever novo ficheiro index." -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:541 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "" -#: builtin/rev-list.c:560 +#: builtin/rev-list.c:602 msgid "object filtering requires --objects" msgstr "" -#: builtin/rev-list.c:610 +#: builtin/rev-list.c:674 msgid "rev-list does not support display of notes" -msgstr "rev-list não suporta apresentação de notas" +msgstr "rev-list insustenta mostrar notas" -#: builtin/rev-list.c:615 +#: builtin/rev-list.c:679 #, fuzzy msgid "marked counting is incompatible with --objects" -msgstr "--first-parent é incompatível com --bisect" +msgstr "" #: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -21063,12 +21914,26 @@ msgstr "conservar '--' passado como argumento" #: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" -msgstr "parar de analisar depois do primeiro argumento que não seja uma opção" +msgstr "parei de processar após o primeiro argumento diferente de opção" #: builtin/rev-parse.c:419 msgid "output in stuck long form" msgstr "mostrar em formato fixo e longo" +#: builtin/rev-parse.c:438 +#, fuzzy +msgid "premature end of input" +msgstr "fim de input prematuro" + +#: builtin/rev-parse.c:442 +msgid "no usage string given before the `--' separator" +msgstr "antes do separador '--' foi dado string de utilização nenhuma" + +#: builtin/rev-parse.c:548 +#, fuzzy +msgid "Needed a single revision" +msgstr "Precisava uma única revisão" + #: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" @@ -21084,6 +21949,56 @@ msgstr "" "Execute \"git rev-parse --parseopt -h\" para mais informação com a primeira " "utilização." +#: builtin/rev-parse.c:712 +#, fuzzy +msgid "--resolve-git-dir requires an argument" +msgstr "--resolve-git-dir requer argumento" + +#: builtin/rev-parse.c:715 +#, fuzzy, c-format +msgid "not a gitdir '%s'" +msgstr "gitdir '%s' nenhuma" + +#: builtin/rev-parse.c:739 +#, fuzzy +msgid "--git-path requires an argument" +msgstr "--git-path requer argumento" + +#: builtin/rev-parse.c:749 +#, fuzzy +msgid "-n requires an argument" +msgstr "-n requer argumento" + +#: builtin/rev-parse.c:763 +#, fuzzy +msgid "--path-format requires an argument" +msgstr "--path-format requer argumento" + +#: builtin/rev-parse.c:769 +#, fuzzy, c-format +msgid "unknown argument to --path-format: %s" +msgstr "argumento desconhecido para --path-format: %s" + +#: builtin/rev-parse.c:776 +#, fuzzy +msgid "--default requires an argument" +msgstr "--default requer argumento" + +#: builtin/rev-parse.c:782 +#, fuzzy +msgid "--prefix requires an argument" +msgstr "--prefix requer argumento" + +#: builtin/rev-parse.c:851 +#, fuzzy, c-format +msgid "unknown mode for --abbrev-ref: %s" +msgstr "modo desconhecido para --abbrev-ref: %s" + +#: builtin/rev-parse.c:1023 +#, fuzzy, c-format +msgid "unknown mode for --show-object-format: %s" +msgstr "modo desconhecido para --show-object-format: %s" + #: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<opções>] <commit-etc>..." @@ -21103,12 +22018,12 @@ msgstr "git cherry-pick <subcommando>" #: builtin/revert.c:72 #, fuzzy, c-format msgid "option `%s' expects a number greater than zero" -msgstr "a opção '%c' espera um valor numérico" +msgstr "" #: builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" -msgstr "%s: %s não pode ser usado com %s" +msgstr "%s: %s incapaz ser usado com %s" #: builtin/revert.c:102 msgid "end revert or cherry-pick sequence" @@ -21125,15 +22040,15 @@ msgstr "cancelar reversão ou cherry-pick" #: builtin/revert.c:105 #, fuzzy msgid "skip current commit and continue" -msgstr "imprimir conteúdo do commit" +msgstr "" #: builtin/revert.c:107 msgid "don't automatically commit" -msgstr "não submeter automaticamente" +msgstr "memorizar automaticamente nada" #: builtin/revert.c:108 msgid "edit the commit message" -msgstr "editar a mensagem de commit" +msgstr "editar mensagem de memória" #: builtin/revert.c:111 msgid "parent-number" @@ -21163,19 +22078,19 @@ msgstr "preservar commits inicialmente vazios" msgid "keep redundant, empty commits" msgstr "manter commits redundantes e vazios" -#: builtin/revert.c:239 +#: builtin/revert.c:237 msgid "revert failed" msgstr "falha ao reverter" -#: builtin/revert.c:252 +#: builtin/revert.c:250 msgid "cherry-pick failed" msgstr "falha ao efetuar cherry-pick" -#: builtin/rm.c:19 +#: builtin/rm.c:20 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<opções>] [--] <ficheiro>..." -#: builtin/rm.c:207 +#: builtin/rm.c:208 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -21189,7 +22104,7 @@ msgstr[1] "" "os seguintes ficheiros têm staged content diferente quer no ficheiro\n" "quer em HEAD:" -#: builtin/rm.c:212 +#: builtin/rm.c:213 msgid "" "\n" "(use -f to force removal)" @@ -21197,13 +22112,13 @@ msgstr "" "\n" "(usa -f para forçar remoção)" -#: builtin/rm.c:216 +#: builtin/rm.c:217 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "o seguinte ficheiro contém alterações preparadas no índice:" msgstr[1] "os seguintes ficheiros contêm alterações preparadas no índice:" -#: builtin/rm.c:220 builtin/rm.c:229 +#: builtin/rm.c:221 builtin/rm.c:230 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -21211,51 +22126,51 @@ msgstr "" "\n" "(use --cached para manter o ficheiro, ou -f para forçar remoção)" -#: builtin/rm.c:226 +#: builtin/rm.c:227 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "o seguinte ficheiro contém alterações locais:" msgstr[1] "os seguintes ficheiros contêm alterações locais:" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "do not list removed files" -msgstr "não listar ficheiros removidos" +msgstr "listar ficheiros removidos nenhuns" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "only remove from the index" msgstr "remover apenas do índice" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "override the up-to-date check" msgstr "ignorar verificação de atualização" -#: builtin/rm.c:246 +#: builtin/rm.c:247 msgid "allow recursive removal" msgstr "permitir remoção recursiva" -#: builtin/rm.c:248 +#: builtin/rm.c:249 msgid "exit with a zero status even if nothing matched" -msgstr "sair com valor zero mesmo quando não há correspondência" +msgstr "sair com valor zero mesmo se nada corresponder" -#: builtin/rm.c:282 +#: builtin/rm.c:283 msgid "No pathspec was given. Which files should I remove?" msgstr "" -#: builtin/rm.c:305 +#: builtin/rm.c:310 #, fuzzy msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Prepare as suas alterações em .gitmodules ou esconda-as para prosseguir" -#: builtin/rm.c:323 +#: builtin/rm.c:331 #, c-format msgid "not removing '%s' recursively without -r" -msgstr "não remover '%s' recursivamente sem -r" +msgstr "removendo '%s' recursivamente apenas com -r" -#: builtin/rm.c:362 +#: builtin/rm.c:379 #, c-format msgid "git rm: unable to remove %s" -msgstr "git rm: não é possível remover %s" +msgstr "git rm: incapaz remover %s" #: builtin/send-pack.c:20 msgid "" @@ -21271,7 +22186,7 @@ msgstr "" #: builtin/send-pack.c:188 msgid "remote name" -msgstr "nome do remoto" +msgstr "nome de remoto" #: builtin/send-pack.c:201 msgid "use stateless RPC protocol" @@ -21294,57 +22209,61 @@ msgstr "" #: builtin/shortlog.c:17 #, fuzzy msgid "git log --pretty=short | git shortlog [<options>]" -msgstr "git worktree list [<opções>]" +msgstr "git log --pretty=short | git shortlog [<opções>]" -#: builtin/shortlog.c:135 +#: builtin/shortlog.c:123 msgid "using multiple --group options with stdin is not supported" msgstr "" -#: builtin/shortlog.c:145 +#: builtin/shortlog.c:133 msgid "using --group=trailer with stdin is not supported" msgstr "" -#: builtin/shortlog.c:335 +#: builtin/shortlog.c:323 #, fuzzy, c-format msgid "unknown group type: %s" msgstr "Tipo desconhecido: %d" -#: builtin/shortlog.c:363 -msgid "Group by committer rather than author" +#: builtin/shortlog.c:351 +#, fuzzy +msgid "group by committer rather than author" msgstr "agrupar por committer em vez de autor" -#: builtin/shortlog.c:366 +#: builtin/shortlog.c:354 msgid "sort output according to the number of commits per author" msgstr "ordenar saída de acordo com o número de commits por autor" -#: builtin/shortlog.c:368 -msgid "Suppress commit descriptions, only provides commit count" +#: builtin/shortlog.c:356 +#, fuzzy +msgid "suppress commit descriptions, only provides commit count" msgstr "suprimir a descrição dos commits, fornecer apenas o número de commits" -#: builtin/shortlog.c:370 -msgid "Show the email address of each author" +#: builtin/shortlog.c:358 +#, fuzzy +msgid "show the email address of each author" msgstr "Mostrar o endereço de e-mail de cada autor" -#: builtin/shortlog.c:371 +#: builtin/shortlog.c:359 msgid "<w>[,<i1>[,<i2>]]" msgstr "" -#: builtin/shortlog.c:372 -msgid "Linewrap output" +#: builtin/shortlog.c:360 +#, fuzzy +msgid "linewrap output" msgstr "ajustar linhas" -#: builtin/shortlog.c:374 +#: builtin/shortlog.c:362 msgid "field" msgstr "" -#: builtin/shortlog.c:375 -msgid "Group by field" +#: builtin/shortlog.c:363 +msgid "group by field" msgstr "" -#: builtin/shortlog.c:403 +#: builtin/shortlog.c:391 #, fuzzy msgid "too many arguments given outside repository" -msgstr "%s: '%s' está fora do repositório" +msgstr "" #: builtin/show-branch.c:13 msgid "" @@ -21366,8 +22285,8 @@ msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referência>]" #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" -msgstr[0] "ignorar %s; não é possível processar mais do que %d referência" -msgstr[1] "ingorar %s; não é possível processar mais do que %d referências" +msgstr[0] "ignorando %s; incapaz lidar mais que %d ref" +msgstr[1] "ignorando %s; incapaz lidar mais que %d refs" #: builtin/show-branch.c:548 #, c-format @@ -21380,7 +22299,7 @@ msgstr "mostrar os ramos de monitorização remotos e os ramos locais" #: builtin/show-branch.c:647 msgid "show remote-tracking branches" -msgstr "mostrar os ramos de monitorização remotos" +msgstr "" #: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" @@ -21416,11 +22335,11 @@ msgstr "mostrar referências inalcançáveis a partir de outras referências" #: builtin/show-branch.c:664 msgid "show commits in topological order" -msgstr "mostrar commits em ordem topológica" +msgstr "mostrar memórias em ordem topológica" #: builtin/show-branch.c:667 msgid "show only commits not on the first branch" -msgstr "mostrar apenas commits não presentes no primeiro ramo" +msgstr "mostrar apenas commits fora do primeiro ramo" #: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" @@ -21463,24 +22382,24 @@ msgstr[1] "apenas %d entradas podem ser mostradas neste momento." #: builtin/show-branch.c:745 #, c-format msgid "no such ref %s" -msgstr "referência inexistente %s" +msgstr "ref inexistente %s" #: builtin/show-branch.c:831 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." -msgstr[0] "não é possível processar mais do que %d revisão." -msgstr[1] "não é possível processar mais do que %d revisões." +msgstr[0] "incapaz lidar mais que %d rev." +msgstr[1] "incapaz lidar mais que %d revs." #: builtin/show-branch.c:835 #, c-format msgid "'%s' is not a valid ref." -msgstr "'%s' não é uma referência válida." +msgstr "'%s' é uma ref inválida." #: builtin/show-branch.c:838 #, c-format msgid "cannot find commit %s (%s)" -msgstr "não é possível encontrar o commit %s (%s)" +msgstr "incapaz encontrar commit %s (%s)" #: builtin/show-index.c:21 msgid "hash-algorithm" @@ -21530,116 +22449,121 @@ msgstr "mostrar hash SHA1 com <n> digitos" #: builtin/show-ref.c:177 msgid "do not print results to stdout (useful with --verify)" -msgstr "não imprimir resultados para o stdout (útil com --verify)" +msgstr "imprimir resultados nenhuns para stdout (útil com --verify)" #: builtin/show-ref.c:179 msgid "show refs from stdin that aren't in local repository" -msgstr "mostrar referências do stdin que não estão no repositório local" +msgstr "mostrar refs de stdin que estão fora do repositório local" -#: builtin/sparse-checkout.c:21 +#: builtin/sparse-checkout.c:22 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "" -#: builtin/sparse-checkout.c:50 +#: builtin/sparse-checkout.c:46 #, fuzzy msgid "git sparse-checkout list" msgstr "git archive --list" -#: builtin/sparse-checkout.c:76 +#: builtin/sparse-checkout.c:72 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" -#: builtin/sparse-checkout.c:228 +#: builtin/sparse-checkout.c:227 #, fuzzy msgid "failed to create directory for sparse-checkout file" msgstr "falha ao criar o diretório %s" -#: builtin/sparse-checkout.c:269 +#: builtin/sparse-checkout.c:268 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "" -#: builtin/sparse-checkout.c:271 +#: builtin/sparse-checkout.c:270 msgid "failed to set extensions.worktreeConfig setting" msgstr "" -#: builtin/sparse-checkout.c:288 -msgid "git sparse-checkout init [--cone]" +#: builtin/sparse-checkout.c:290 +msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" msgstr "" -#: builtin/sparse-checkout.c:307 +#: builtin/sparse-checkout.c:310 msgid "initialize the sparse-checkout in cone mode" msgstr "" -#: builtin/sparse-checkout.c:344 +#: builtin/sparse-checkout.c:312 +msgid "toggle the use of a sparse index" +msgstr "" + +#: builtin/sparse-checkout.c:340 +#, fuzzy +msgid "failed to modify sparse-index config" +msgstr "" + +#: builtin/sparse-checkout.c:361 #, c-format msgid "failed to open '%s'" msgstr "falha ao abrir '%s'" -#: builtin/sparse-checkout.c:401 +#: builtin/sparse-checkout.c:419 #, fuzzy, c-format msgid "could not normalize path %s" -msgstr "não foi possível analisar o patch '%s'" +msgstr "incapaz normalizar patch %s" -#: builtin/sparse-checkout.c:413 +#: builtin/sparse-checkout.c:431 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "" -#: builtin/sparse-checkout.c:438 +#: builtin/sparse-checkout.c:456 #, fuzzy, c-format msgid "unable to unquote C-style string '%s'" -msgstr "não é possível ler a ligação simbólica %s" +msgstr "incapaz de unquote string de C-style '%s'" -#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516 +#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 msgid "unable to load existing sparse-checkout patterns" msgstr "" -#: builtin/sparse-checkout.c:561 +#: builtin/sparse-checkout.c:579 #, fuzzy msgid "read patterns from standard in" -msgstr "ler atualizações da entrada padrão" +msgstr "" -#: builtin/sparse-checkout.c:576 +#: builtin/sparse-checkout.c:594 msgid "git sparse-checkout reapply" msgstr "" -#: builtin/sparse-checkout.c:595 +#: builtin/sparse-checkout.c:613 #, fuzzy msgid "git sparse-checkout disable" msgstr "ignorar a aplicação do filtro de extração esparsa" -#: builtin/sparse-checkout.c:623 +#: builtin/sparse-checkout.c:644 #, fuzzy msgid "error while refreshing working directory" -msgstr "não é possível de obter o diretório de trabalho atual" +msgstr "erro enquanto refrescava pasta de trabalho" -#: builtin/stash.c:22 builtin/stash.c:38 +#: builtin/stash.c:24 builtin/stash.c:40 #, fuzzy msgid "git stash list [<options>]" -msgstr "git worktree list [<opções>]" +msgstr "git stash list [<opções>]" -#: builtin/stash.c:23 builtin/stash.c:43 +#: builtin/stash.c:25 builtin/stash.c:45 #, fuzzy msgid "git stash show [<options>] [<stash>]" -msgstr "git remote show [<opções>] <nome>" +msgstr "git stash show [<opções>] [<escondido>]" -#: builtin/stash.c:24 builtin/stash.c:48 +#: builtin/stash.c:26 builtin/stash.c:50 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "" -#: builtin/stash.c:25 +#: builtin/stash.c:27 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "" -#: builtin/stash.c:26 builtin/stash.c:63 +#: builtin/stash.c:28 builtin/stash.c:65 #, fuzzy msgid "git stash branch <branchname> [<stash>]" -msgstr "git branch [<opções>] [-l] [-f] <nome-ramo> [<ponto-de-partida>]" - -#: builtin/stash.c:27 builtin/stash.c:68 -msgid "git stash clear" -msgstr "" +msgstr "git stash branch <nome-de-ramo> [<escondido>]" -#: builtin/stash.c:28 +#: builtin/stash.c:30 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" @@ -21647,210 +22571,239 @@ msgid "" " [--] [<pathspec>...]]" msgstr "" -#: builtin/stash.c:32 builtin/stash.c:85 +#: builtin/stash.c:34 builtin/stash.c:87 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" msgstr "" -#: builtin/stash.c:53 +#: builtin/stash.c:55 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "" -#: builtin/stash.c:58 +#: builtin/stash.c:60 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "" -#: builtin/stash.c:73 +#: builtin/stash.c:75 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "" -#: builtin/stash.c:78 +#: builtin/stash.c:80 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" " [--] [<pathspec>...]]" msgstr "" -#: builtin/stash.c:128 +#: builtin/stash.c:130 #, fuzzy, c-format msgid "'%s' is not a stash-like commit" -msgstr "'$args' não é um commit semelhante a pilha" +msgstr "'%s' é commit tipo-arrumos nenhum" -#: builtin/stash.c:148 +#: builtin/stash.c:150 #, fuzzy, c-format msgid "Too many revisions specified:%s" msgstr "Demasiadas revisões especificadas: $REV" -#: builtin/stash.c:162 +#: builtin/stash.c:164 #, fuzzy msgid "No stash entries found." msgstr "Nenhuma pilha encontrada." -#: builtin/stash.c:176 +#: builtin/stash.c:178 #, fuzzy, c-format msgid "%s is not a valid reference" -msgstr "'%s' não é uma referência válida." +msgstr "%s é referência inválida" + +#: builtin/stash.c:227 +#, fuzzy +msgid "git stash clear with arguments is unimplemented" +msgstr "git stash clear com parâmetros está por implementar" -#: builtin/stash.c:225 -msgid "git stash clear with parameters is unimplemented" -msgstr "não está implementado git stash clear com parâmetros" +#: builtin/stash.c:431 +#, c-format +msgid "" +"WARNING: Untracked file in way of tracked file! Renaming\n" +" %s -> %s\n" +" to make room.\n" +msgstr "" -#: builtin/stash.c:404 +#: builtin/stash.c:492 #, fuzzy msgid "cannot apply a stash in the middle of a merge" msgstr "incapaz aplicar arrumação durante uma junção" -#: builtin/stash.c:415 +#: builtin/stash.c:503 #, fuzzy, c-format msgid "could not generate diff %s^!." -msgstr "não foi possível ler '%s'." +msgstr "incapaz gerar diff %s^!." -#: builtin/stash.c:422 +#: builtin/stash.c:510 #, fuzzy msgid "conflicts in index. Try without --index." -msgstr "Conflitos no índice. Tente sem --index." +msgstr "Conflitos no index. Tenta sem --index." -#: builtin/stash.c:428 +#: builtin/stash.c:516 #, fuzzy msgid "could not save index tree" msgstr "incapaz guardar árvore index" -#: builtin/stash.c:437 +#: builtin/stash.c:525 #, fuzzy msgid "could not restore untracked files from stash" -msgstr "incapaz restaurar ficheiros por controlar de arrumos" +msgstr "incapaz restaurar ficheiros por seguir de arrumos" -#: builtin/stash.c:451 +#: builtin/stash.c:539 #, fuzzy, c-format msgid "Merging %s with %s" msgstr "Juntando %s com %s" -#: builtin/stash.c:461 +#: builtin/stash.c:549 msgid "Index was not unstashed." -msgstr "O índice não foi reposto." +msgstr "Index está por despreparar." -#: builtin/stash.c:522 builtin/stash.c:620 +#: builtin/stash.c:591 builtin/stash.c:689 #, fuzzy msgid "attempt to recreate the index" -msgstr "falha ao ler o índice" +msgstr "" -#: builtin/stash.c:566 +#: builtin/stash.c:635 #, fuzzy, c-format msgid "Dropped %s (%s)" msgstr "A descartar ${REV} ($s)" -#: builtin/stash.c:569 +#: builtin/stash.c:638 #, fuzzy, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Incapaz descartar entrada de arrumos" -#: builtin/stash.c:582 +#: builtin/stash.c:651 #, fuzzy, c-format msgid "'%s' is not a stash reference" -msgstr "'$args' não é uma referência de pilha" +msgstr "'%s' é referência de arrumos nenhuma" -#: builtin/stash.c:632 +#: builtin/stash.c:701 #, fuzzy msgid "The stash entry is kept in case you need it again." msgstr "A pilha é guarda no caso de precisar dela de novo." -#: builtin/stash.c:655 +#: builtin/stash.c:724 msgid "No branch name specified" msgstr "Nenhum nome de ramo especificado" -#: builtin/stash.c:799 builtin/stash.c:836 +#: builtin/stash.c:808 +#, fuzzy +msgid "failed to parse tree" +msgstr "falhou processar árvore" + +#: builtin/stash.c:819 +#, fuzzy +msgid "failed to unpack trees" +msgstr "falha ao descompactar o objeto árvore HEAD" + +#: builtin/stash.c:839 +#, fuzzy +msgid "include untracked files in the stash" +msgstr "incluir ficheiros desmonitorizados de esconderijo" + +#: builtin/stash.c:842 +#, fuzzy +msgid "only show untracked files in the stash" +msgstr "mostrar apenas ficheiros desmonitorizados de esconderijo" + +#: builtin/stash.c:929 builtin/stash.c:966 #, fuzzy, c-format msgid "Cannot update %s with %s" msgstr "Incapaz atualizar %s com %s" -#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667 #, fuzzy msgid "stash message" msgstr "mensagem da tag" -#: builtin/stash.c:827 +#: builtin/stash.c:957 msgid "\"git stash store\" requires one <commit> argument" msgstr "" -#: builtin/stash.c:1042 +#: builtin/stash.c:1171 msgid "No changes selected" msgstr "Nenhuma alteração selecionada" -#: builtin/stash.c:1142 +#: builtin/stash.c:1271 msgid "You do not have the initial commit yet" -msgstr "O commit inicial ainda não existe" +msgstr "Commit inicial ainda é inexistente" -#: builtin/stash.c:1169 +#: builtin/stash.c:1298 msgid "Cannot save the current index state" msgstr "Incapaz guardar estado atual de index" -#: builtin/stash.c:1178 +#: builtin/stash.c:1307 msgid "Cannot save the untracked files" -msgstr "Incapaz de guardar ficheiros por controlar" +msgstr "Incapaz de guardar ficheiros por seguir" -#: builtin/stash.c:1189 builtin/stash.c:1198 +#: builtin/stash.c:1318 builtin/stash.c:1327 msgid "Cannot save the current worktree state" msgstr "Incapaz guardar o estado atual de worktree" -#: builtin/stash.c:1226 +#: builtin/stash.c:1355 msgid "Cannot record working tree state" msgstr "Incapaz gravar o estado de worktree" -#: builtin/stash.c:1275 +#: builtin/stash.c:1404 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Impossível usar --patch e --include-untracked ou --all ao mesmo tempo" -#: builtin/stash.c:1291 +#: builtin/stash.c:1422 #, fuzzy msgid "Did you forget to 'git add'?" msgstr "Será que falta 'git add'?" -#: builtin/stash.c:1306 +#: builtin/stash.c:1437 msgid "No local changes to save" msgstr "Com alterações locais para guardar nenhumas" -#: builtin/stash.c:1313 +#: builtin/stash.c:1444 msgid "Cannot initialize stash" msgstr "Incapaz inicializar arrumos" -#: builtin/stash.c:1328 +#: builtin/stash.c:1459 msgid "Cannot save the current status" msgstr "Incapaz guardar o estado atual" -#: builtin/stash.c:1333 +#: builtin/stash.c:1464 #, fuzzy, c-format msgid "Saved working directory and index state %s" msgstr "Diretório de trabalho e estado do índice $stash_msg guardados" -#: builtin/stash.c:1423 +#: builtin/stash.c:1554 msgid "Cannot remove worktree changes" msgstr "Incapaz remover alterações de worktree" -#: builtin/stash.c:1462 builtin/stash.c:1527 +#: builtin/stash.c:1593 builtin/stash.c:1658 msgid "keep index" msgstr "" -#: builtin/stash.c:1464 builtin/stash.c:1529 +#: builtin/stash.c:1595 builtin/stash.c:1660 msgid "stash in patch mode" msgstr "" -#: builtin/stash.c:1465 builtin/stash.c:1530 +#: builtin/stash.c:1596 builtin/stash.c:1661 #, fuzzy msgid "quiet mode" -msgstr "silencioso" +msgstr "modo silencioso" -#: builtin/stash.c:1467 builtin/stash.c:1532 +#: builtin/stash.c:1598 builtin/stash.c:1663 #, fuzzy msgid "include untracked files in stash" -msgstr "listar ficheiros não controlados em colunas" +msgstr "incluir ficheiros desmonitorizados de esconderijo" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1600 builtin/stash.c:1665 #, fuzzy msgid "include ignore files" msgstr "mostrar ficheiros ignorados" -#: builtin/stash.c:1569 +#: builtin/stash.c:1700 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -21873,25 +22826,25 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "preceder cada linha com um carácter de comentário e um espaço" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Esperava-se um nome completo de uma referência, obteve-se %s" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:63 msgid "submodule--helper print-default-remote takes no arguments" msgstr "" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:101 #, c-format msgid "cannot strip one component off url '%s'" -msgstr "não é possível tirar um componente do URL '%s'" +msgstr "incapaz despir um componente a partir do url '%s'" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "âncora alternativa para caminhos relativos" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:414 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]" @@ -21923,13 +22876,14 @@ msgstr "" #: builtin/submodule--helper.c:565 #, fuzzy -msgid "Suppress output of entering each submodule command" -msgstr "Suprimir a saída ao inicializar um submódulo" +msgid "suppress output of entering each submodule command" +msgstr "" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:1487 #, fuzzy -msgid "Recurse into nested submodules" -msgstr "percorrer submódulos recursivamente" +msgid "recurse into nested submodules" +msgstr "percorrer recursivamente submódulos aninhados" #: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" @@ -21941,8 +22895,8 @@ msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "" -"não é possível encontrar configuração '%s'. Assumir que este repositório é o " -"próprio repositório a montante autoritário." +"incapaz encontrar configuração '%s'. Assumindo que este repositório é o " +"próprio repositório upstream autoritário." #: builtin/submodule--helper.c:666 #, c-format @@ -21962,48 +22916,46 @@ msgstr "aviso: modo command update sugerido para submódulo '%s'\n" #: builtin/submodule--helper.c:687 #, c-format msgid "Failed to register update mode for submodule path '%s'" -msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'" +msgstr "" #: builtin/submodule--helper.c:709 -msgid "Suppress output for initializing a submodule" -msgstr "Suprimir a saída ao inicializar um submódulo" +#, fuzzy +msgid "suppress output for initializing a submodule" +msgstr "" #: builtin/submodule--helper.c:714 #, fuzzy msgid "git submodule--helper init [<options>] [<path>]" -msgstr "git submodule--helper init [<caminho>]" +msgstr "" #: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" -msgstr "para path '%s' encontrei em .gitmodules, mapeamento de submódulo nenhum" +msgstr "" +"para path '%s' encontrei em .gitmodules, mapeamento de submódulo nenhum" #: builtin/submodule--helper.c:835 #, fuzzy, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" -msgstr "não foi possível percorrer recursivamente o submódulo '%s'" +msgstr "incapaz resolver ref HEAD dentro de submódulo '%s'" #: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, fuzzy, c-format msgid "failed to recurse into submodule '%s'" -msgstr "não foi possível percorrer recursivamente o submódulo '%s'" +msgstr "falha a percorrer recursivamente dentro de submódulo '%s'" #: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 #, fuzzy -msgid "Suppress submodule status output" +msgid "suppress submodule status output" msgstr "preceder isto ao caminho do submódulo" #: builtin/submodule--helper.c:887 +#, fuzzy msgid "" -"Use commit stored in the index instead of the one stored in the submodule " +"use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" -#: builtin/submodule--helper.c:888 -#, fuzzy -msgid "recurse into nested submodules" -msgstr "percorrer submódulos recursivamente" - #: builtin/submodule--helper.c:893 #, fuzzy msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" @@ -22031,21 +22983,22 @@ msgstr "[%s]" #: builtin/submodule--helper.c:1055 #, fuzzy, c-format msgid "couldn't hash object from '%s'" -msgstr "não foi possível analisar o objeto '%s'" +msgstr "incapaz fazer hash a objeto a partir de '%s'" #: builtin/submodule--helper.c:1059 #, fuzzy, c-format msgid "unexpected mode %o\n" -msgstr "estou à espera de um modo diferente de %o\n" +msgstr "modo inesperado %o\n" #: builtin/submodule--helper.c:1300 #, fuzzy msgid "use the commit stored in the index instead of the submodule HEAD" -msgstr "extrair <ramo> em vez da HEAD do remoto" +msgstr "" #: builtin/submodule--helper.c:1302 -msgid "to compare the commit in the index with that in the submodule HEAD" -msgstr "" +#, fuzzy +msgid "compare the commit in the index with that in the submodule HEAD" +msgstr "compara a memória no arquivador com aquela no submódulo HEAD" #: builtin/submodule--helper.c:1304 msgid "skip submodules with 'ignore_config' value set to 'all'" @@ -22059,22 +23012,22 @@ msgstr "restringir-se a cabeças" #: builtin/submodule--helper.c:1311 #, fuzzy msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" -msgstr "git submodule--helper init [<caminho>]" +msgstr "" #: builtin/submodule--helper.c:1335 #, fuzzy msgid "could not fetch a revision for HEAD" -msgstr "não foi possível destacar HEAD" +msgstr "incapaz buscar uma revisão para HEAD" #: builtin/submodule--helper.c:1340 #, fuzzy msgid "--cached and --files are mutually exclusive" -msgstr "--deepen e --depth são mutuamente exclusivos" +msgstr "" #: builtin/submodule--helper.c:1407 #, fuzzy, c-format msgid "Synchronizing submodule url for '%s'\n" -msgstr "Sincronizando URL do submódule '%s'\n" +msgstr "Sincronizando url de submódulo para '%s'\n" #: builtin/submodule--helper.c:1413 #, fuzzy, c-format @@ -22084,22 +23037,22 @@ msgstr "Falha ao registar o URL do caminho de submódulo '%s'" #: builtin/submodule--helper.c:1427 #, fuzzy, c-format msgid "failed to get the default remote for submodule '%s'" -msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'" +msgstr "" #: builtin/submodule--helper.c:1438 #, fuzzy, c-format msgid "failed to update remote for submodule '%s'" -msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'" +msgstr "" #: builtin/submodule--helper.c:1485 #, fuzzy -msgid "Suppress output of synchronizing submodule url" -msgstr "Suprimir a saída ao inicializar um submódulo" +msgid "suppress output of synchronizing submodule url" +msgstr "" #: builtin/submodule--helper.c:1492 #, fuzzy msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" -msgstr "git submodule--helper init [<caminho>]" +msgstr "" #: builtin/submodule--helper.c:1546 #, fuzzy, c-format @@ -22140,13 +23093,13 @@ msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Submódulo '%s' (%s) unregistred para caminho '%s'\n" #: builtin/submodule--helper.c:1624 -msgid "Remove submodule working trees even if they contain local changes" +msgid "remove submodule working trees even if they contain local changes" msgstr "" #: builtin/submodule--helper.c:1625 #, fuzzy -msgid "Unregister all submodules" -msgstr "percorrer submódulos recursivamente" +msgid "unregister all submodules" +msgstr "" #: builtin/submodule--helper.c:1630 msgid "" @@ -22169,17 +23122,17 @@ msgstr "" #: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" -msgstr "o submódulo '%s' não pode adicionar sobressalente: %s" +msgstr "submódulo '%s' incapaz adicionar alternativo: %s" #: builtin/submodule--helper.c:1791 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" -msgstr "O valor '%s' de submodule.alternateErrorStrategy não é reconhecido" +msgstr "Valor '%s' de submodule.alternateErrorStrategy é irreconhecível" #: builtin/submodule--helper.c:1798 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" -msgstr "O valor '%s' de submodule.alternateLocation não é reconhecido" +msgstr "Valor '%s' de submodule.alternateLocation é irreconhecível" #: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" @@ -22229,41 +23182,41 @@ msgstr "falha ao clonar '%s' no caminho de submódulo '%s'" #: builtin/submodule--helper.c:1888 #, fuzzy, c-format msgid "directory not empty: '%s'" -msgstr "o diretório de origem está vazio" +msgstr "pasta com conteúdo: '%s'" #: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" -msgstr "não foi possível obter o diretório do submódulo de '%s'" +msgstr "incapaz obter pasta de submódulo para '%s'" #: builtin/submodule--helper.c:1936 #, fuzzy, c-format msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'" +msgstr "" #: builtin/submodule--helper.c:1940 #, fuzzy, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" -msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'" +msgstr "" #: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" -msgstr "Caminho de submódulo '%s' não inicializado" +msgstr "Path de submódulo '%s' por inicializar" #: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" -msgstr "Pretendia usar 'update --init'?" +msgstr "Pretendias usar 'update --init'?" #: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" -msgstr "A ignorar submódulo %s não integrado" +msgstr "Passando à frente submódulo por juntar %s" #: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" -msgstr "A ignorar submódulo '%s'" +msgstr "Passando à frente submódulo '%s'" #: builtin/submodule--helper.c:2254 #, c-format @@ -22277,7 +23230,7 @@ msgstr "Falha ao clonar '%s' pela segunda vez, abortado" #: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" -msgstr "caminho para a árvore de trabalho" +msgstr "caminho para árvore de trabalho" #: builtin/submodule--helper.c:2330 msgid "path into the working tree, across nested submodule boundaries" @@ -22290,7 +23243,8 @@ msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout ou none" #: builtin/submodule--helper.c:2340 -msgid "Create a shallow clone truncated to the specified number of revisions" +#, fuzzy +msgid "create a shallow clone truncated to the specified number of revisions" msgstr "criar um clone raso, truncado ao número especificado de revisões" #: builtin/submodule--helper.c:2343 @@ -22303,7 +23257,7 @@ msgstr "se o clone inicial deve seguir a recomendação rasa" #: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" -msgstr "não imprimir progresso da clonagem" +msgstr "imprimir progresso da clonagem nenhum" #: builtin/submodule--helper.c:2357 #, fuzzy @@ -22326,11 +23280,11 @@ msgstr "" #: builtin/submodule--helper.c:2541 #, fuzzy, c-format msgid "could not get a repository handle for submodule '%s'" -msgstr "não foi possível procurar pelo submódulo '%s'" +msgstr "incapaz obter pega de repositório para submódulo '%s'" #: builtin/submodule--helper.c:2574 msgid "recurse into submodules" -msgstr "percorrer submódulos recursivamente" +msgstr "percorrer recursivamente submódulos" #: builtin/submodule--helper.c:2580 #, fuzzy @@ -22354,12 +23308,12 @@ msgstr "git submodule--helper name <caminho>" #: builtin/submodule--helper.c:2645 #, fuzzy msgid "git submodule--helper config --unset <name>" -msgstr "git submodule--helper init [<caminho>]" +msgstr "" #: builtin/submodule--helper.c:2646 #, fuzzy msgid "git submodule--helper config --check-writeable" -msgstr "git submodule--helper init [<caminho>]" +msgstr "" #: builtin/submodule--helper.c:2665 git-submodule.sh:150 #, fuzzy, sh-format @@ -22369,34 +23323,34 @@ msgstr "" #: builtin/submodule--helper.c:2681 #, fuzzy -msgid "Suppress output for setting url of a submodule" -msgstr "Suprimir a saída ao inicializar um submódulo" +msgid "suppress output for setting url of a submodule" +msgstr "" #: builtin/submodule--helper.c:2685 #, fuzzy msgid "git submodule--helper set-url [--quiet] <path> <newurl>" -msgstr "git submodule--helper init [<caminho>]" +msgstr "" #: builtin/submodule--helper.c:2718 #, fuzzy msgid "set the default tracking branch to master" -msgstr "mostrar os ramos de monitorização remotos" +msgstr "" #: builtin/submodule--helper.c:2720 #, fuzzy msgid "set the default tracking branch" -msgstr "mostrar os ramos de monitorização remotos" +msgstr "" #: builtin/submodule--helper.c:2724 #, fuzzy msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]" +msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <caminho>" #: builtin/submodule--helper.c:2725 #, fuzzy msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]" +msgstr "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <ramo> <caminho>" #: builtin/submodule--helper.c:2732 #, fuzzy @@ -22406,17 +23360,17 @@ msgstr "nome do ramo é obrigatório" #: builtin/submodule--helper.c:2735 #, fuzzy msgid "--branch and --default are mutually exclusive" -msgstr "--deepen e --depth são mutuamente exclusivos" +msgstr "" -#: builtin/submodule--helper.c:2792 git.c:438 git.c:711 +#: builtin/submodule--helper.c:2792 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" -msgstr "%s não suporta --super-prefix" +msgstr "%s insustenta --super-prefix" #: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "'%s' não é um subcomando válido de submodule--helper" +msgstr "'%s' é subcomando inválido de submodule--helper" #: builtin/symbolic-ref.c:8 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -22426,24 +23380,23 @@ msgstr "git symbolic-ref [<opções>] <nome> [<referência>]" msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <nome>" -#: builtin/symbolic-ref.c:40 +#: builtin/symbolic-ref.c:42 msgid "suppress error message for non-symbolic (detached) refs" -msgstr "" -"suprimir mensagens de erro sobre referências não-simbólicas (destacadas)" +msgstr "suprimir mensagens de erro sobre refs não-simbólicas (destacadas)" -#: builtin/symbolic-ref.c:41 +#: builtin/symbolic-ref.c:43 msgid "delete symbolic ref" -msgstr "eliminar referências simbólicas" +msgstr "apagar ref simbólica" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c:44 msgid "shorten ref output" -msgstr "encurtar a apresentação de referências" +msgstr "encurtar output de ref" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 msgid "reason" msgstr "razão" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 +#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 msgid "reason of the update" msgstr "razão da atualização" @@ -22477,17 +23430,17 @@ msgstr "" msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<formato>] <nometag>..." -#: builtin/tag.c:89 +#: builtin/tag.c:100 #, c-format msgid "tag '%s' not found." -msgstr "tag '%s' não encontrada." +msgstr "tag '%s' por encontrar." -#: builtin/tag.c:105 +#: builtin/tag.c:135 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Apaguei tag '%s' (era %s)\n" -#: builtin/tag.c:135 +#: builtin/tag.c:170 #, c-format msgid "" "\n" @@ -22500,7 +23453,7 @@ msgstr "" " %s\n" "Linha começadas com '%c' serão ignoradas.\n" -#: builtin/tag.c:139 +#: builtin/tag.c:174 #, c-format msgid "" "\n" @@ -22514,15 +23467,11 @@ msgstr "" " %s\n" "Linhas começadas com '%c' serão mantidas; se queres, podes apagá-las.\n" -#: builtin/tag.c:198 +#: builtin/tag.c:241 msgid "unable to sign the tag" -msgstr "não foi possível assinar a tag" - -#: builtin/tag.c:200 -msgid "unable to write tag file" -msgstr "não foi possível escrever o ficheiro da tag" +msgstr "incapaz assinar a tag" -#: builtin/tag.c:216 +#: builtin/tag.c:259 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -22531,146 +23480,142 @@ msgid "" "\tgit tag -f %s %s^{}" msgstr "" -#: builtin/tag.c:232 +#: builtin/tag.c:275 msgid "bad object type." msgstr "tipo de objeto incorreto." -#: builtin/tag.c:285 +#: builtin/tag.c:328 msgid "no tag message?" msgstr "sem mensagem de tag?" -#: builtin/tag.c:292 +#: builtin/tag.c:335 #, c-format msgid "The tag message has been left in %s\n" msgstr "Deixei a mensagem da tag em %s\n" -#: builtin/tag.c:403 +#: builtin/tag.c:446 msgid "list tag names" msgstr "listar os nomes das tag" -#: builtin/tag.c:405 +#: builtin/tag.c:448 msgid "print <n> lines of each tag message" msgstr "imprimir <n> linhas de cada mensagem de tag" -#: builtin/tag.c:407 +#: builtin/tag.c:450 msgid "delete tags" msgstr "eliminar tags" -#: builtin/tag.c:408 +#: builtin/tag.c:451 msgid "verify tags" msgstr "verificar tags" -#: builtin/tag.c:410 +#: builtin/tag.c:453 msgid "Tag creation options" msgstr "Opções de criação de tags" -#: builtin/tag.c:412 +#: builtin/tag.c:455 msgid "annotated tag, needs a message" msgstr "tag anotada, é necessário uma mensagem" -#: builtin/tag.c:414 +#: builtin/tag.c:457 msgid "tag message" msgstr "mensagem da tag" -#: builtin/tag.c:416 +#: builtin/tag.c:459 #, fuzzy msgid "force edit of tag message" msgstr "forçar edição do commit" -#: builtin/tag.c:417 +#: builtin/tag.c:460 msgid "annotated and GPG-signed tag" msgstr "tag anotada e assinada com GPG" -#: builtin/tag.c:420 +#: builtin/tag.c:463 msgid "use another key to sign the tag" msgstr "usar outra chave para assinar a tag" -#: builtin/tag.c:421 +#: builtin/tag.c:464 msgid "replace the tag if exists" msgstr "substituir a tag se esta existir" -#: builtin/tag.c:422 builtin/update-ref.c:505 +#: builtin/tag.c:465 builtin/update-ref.c:505 msgid "create a reflog" msgstr "criar um reflog" -#: builtin/tag.c:424 +#: builtin/tag.c:467 msgid "Tag listing options" msgstr "Opções de listagem de tags" -#: builtin/tag.c:425 +#: builtin/tag.c:468 msgid "show tag list in columns" msgstr "mostrar a lista de tags em colunas" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:469 builtin/tag.c:471 msgid "print only tags that contain the commit" msgstr "imprimir apenas tags que contenham o commit" -#: builtin/tag.c:427 builtin/tag.c:429 +#: builtin/tag.c:470 builtin/tag.c:472 msgid "print only tags that don't contain the commit" -msgstr "imprimir apenas tags que não contenham o commit" +msgstr "imprimir apenas tags a que falte o commit" -#: builtin/tag.c:430 +#: builtin/tag.c:473 msgid "print only tags that are merged" msgstr "imprimir apenas as tags que foram integradas" -#: builtin/tag.c:431 +#: builtin/tag.c:474 msgid "print only tags that are not merged" -msgstr "imprimir apenas as tags que não foram integradas" +msgstr "imprimir apenas as tags que estão por juntar" -#: builtin/tag.c:435 +#: builtin/tag.c:478 msgid "print only tags of the object" -msgstr "imprimir apenas as tags do objeto" +msgstr "imprimir apenas etiquetas do objeto" -#: builtin/tag.c:483 +#: builtin/tag.c:526 msgid "--column and -n are incompatible" msgstr "--column e -n são incompatíveis" -#: builtin/tag.c:505 +#: builtin/tag.c:548 msgid "-n option is only allowed in list mode" msgstr "a opção -n só é permitida no modo lista" -#: builtin/tag.c:507 +#: builtin/tag.c:550 msgid "--contains option is only allowed in list mode" msgstr "a opção --contains só é permitida no modo lista" -#: builtin/tag.c:509 +#: builtin/tag.c:552 msgid "--no-contains option is only allowed in list mode" -msgstr "a opção --contains só é permitida no modo lista" +msgstr "opção --no-contains só é permitida no modo lista" -#: builtin/tag.c:511 +#: builtin/tag.c:554 msgid "--points-at option is only allowed in list mode" msgstr "a opção --points-at só é permitida no modo lista" -#: builtin/tag.c:513 +#: builtin/tag.c:556 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "as opções --merged e --no-merged só são permitidas no modo lista" -#: builtin/tag.c:524 +#: builtin/tag.c:567 msgid "only one -F or -m option is allowed." msgstr "só é permitido um opção -F ou -m." -#: builtin/tag.c:543 -msgid "too many params" -msgstr "demasiado parâmetros" - -#: builtin/tag.c:549 +#: builtin/tag.c:592 #, c-format msgid "'%s' is not a valid tag name." -msgstr "'%s' não é um nome de tag válido." +msgstr "'%s' é nome de tag inválido." -#: builtin/tag.c:554 +#: builtin/tag.c:597 #, c-format msgid "tag '%s' already exists" msgstr "a tag '%s' já existe" -#: builtin/tag.c:585 +#: builtin/tag.c:628 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Atualizei tag '%s' (era %s)\n" -#: builtin/unpack-objects.c:502 +#: builtin/unpack-objects.c:504 msgid "Unpacking objects" -msgstr "A descompactar objetos" +msgstr "Desempacotando objetos" #: builtin/update-index.c:84 #, c-format @@ -22680,7 +23625,7 @@ msgstr "falha ao criar o diretório %s" #: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" -msgstr "falha ao criar o ficheiro %s" +msgstr "falhou criar ficheiro %s" #: builtin/update-index.c:108 #, c-format @@ -22695,39 +23640,32 @@ msgstr "falha ao eliminar o diretório %s" #: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " -msgstr "A testar mtime em '%s' " +msgstr "Testando mtime em '%s' " #: builtin/update-index.c:154 msgid "directory stat info does not change after adding a new file" msgstr "" -"a informação de stat do diretório não mudou depois de adicionar um novo " -"ficheiro" +"info de stat da pasta mantêm-se inalterada após adicionar novo ficheiro" #: builtin/update-index.c:167 msgid "directory stat info does not change after adding a new directory" -msgstr "" -"a informação de stat do diretório não mudou depois de adicionar um novo " -"diretório" +msgstr "info de stat da pasta mantêm-se inalterada após adicionar nova pasta" #: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" -msgstr "a informação de stat mudou depois de atualizar um ficheiro" +msgstr "info de stat muda após atualizar ficheiro" #: builtin/update-index.c:191 msgid "directory stat info changes after adding a file inside subdirectory" -msgstr "" -"a informação de stat do diretório mudou depois de adicionar um ficheiro " -"dentro dum subdiretório" +msgstr "info de stat da pasta muda após adicionar ficheiro dentro de subpasta" #: builtin/update-index.c:202 msgid "directory stat info does not change after deleting a file" -msgstr "" -"a informação de stat do diretório não mudou depois de eliminar um ficheiro" +msgstr "info de stat da pasta mantêm-se inalterada após apagar ficheiro" #: builtin/update-index.c:215 msgid "directory stat info does not change after deleting a directory" -msgstr "" -"a informação de stat do diretório não mudou depois de eliminar um diretório" +msgstr "info de stat da pasta mantêm-se inalterada após apagar pasta" #: builtin/update-index.c:222 msgid " OK" @@ -22737,149 +23675,148 @@ msgstr " OK" msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opções>] [--] [<ficheiro>...]" -#: builtin/update-index.c:974 +#: builtin/update-index.c:976 msgid "continue refresh even when index needs update" msgstr "continuar a refrescar mesmo quando o índice precise de ser atualizado" -#: builtin/update-index.c:977 +#: builtin/update-index.c:979 msgid "refresh: ignore submodules" msgstr "refrescar: ignorar submódulos" -#: builtin/update-index.c:980 +#: builtin/update-index.c:982 msgid "do not ignore new files" -msgstr "não ignorar novos ficheiros" +msgstr "considera novos ficheiros" -#: builtin/update-index.c:982 +#: builtin/update-index.c:984 msgid "let files replace directories and vice-versa" msgstr "deixar que os ficheiros substituam os diretórios e vice-versa" -#: builtin/update-index.c:984 +#: builtin/update-index.c:986 msgid "notice files missing from worktree" msgstr "avisar sobre ficheiros que faltem na árvore de trabalho" -#: builtin/update-index.c:986 +#: builtin/update-index.c:988 msgid "refresh even if index contains unmerged entries" -msgstr "refrescar mesmo que o índice contenha entradas não integradas" +msgstr "refrescar mesmo se índex contenha entradas por juntar" -#: builtin/update-index.c:989 +#: builtin/update-index.c:991 msgid "refresh stat information" msgstr "refrescar informação de stat" -#: builtin/update-index.c:993 +#: builtin/update-index.c:995 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "como --refresh, mas ignorar a definição assume-unchanged" -#: builtin/update-index.c:997 +#: builtin/update-index.c:999 msgid "<mode>,<object>,<path>" msgstr "<modo>,<objeto>,<caminho>" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1000 msgid "add the specified entry to the index" msgstr "adicionar o elemento especificado ao índice" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1010 msgid "mark files as \"not changing\"" -msgstr "marcar ficheiros como \"não alterados\"" +msgstr "marcar ficheiros como \"não alterar\"" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1013 msgid "clear assumed-unchanged bit" msgstr "limpar o bit assumed-unchanged" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1016 msgid "mark files as \"index-only\"" msgstr "marcar ficheiros como \"únicos do índice\"" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1019 msgid "clear skip-worktree bit" msgstr "limpar o bit ignorar-árvore-de-trabalho" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1022 msgid "do not touch index-only entries" msgstr "" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1024 msgid "add to index only; do not add content to object database" msgstr "" -"só adicionar ao índice; não adicionar o conteúdo à base de dados de objetos" +"adicionar apenas a index; não adicionar conteúdo à base de dados de objetos" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1026 msgid "remove named paths even if present in worktree" msgstr "" "remover os caminhos mencionado mesmo se estiverem presentes na árvore de " "trabalho" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1028 msgid "with --stdin: input lines are terminated by null bytes" msgstr "com --stdin: as linhas da entrada são terminadas com bytes nulos" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1030 msgid "read list of paths to be updated from standard input" msgstr "ler lista de caminho a atualizar da entrada padrão" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1034 msgid "add entries from standard input to the index" msgstr "adicionar elementos da entrada padrão ao índice" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1038 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "repovoar as fases nº2 e nº3 dos caminhos listados" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1042 msgid "only update entries that differ from HEAD" msgstr "atualizar apenas elementos que difiram de HEAD" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1046 msgid "ignore files missing from worktree" -msgstr "ignorar ficheiros não presentes na árvore de trabalho" +msgstr "ignorar ficheiros ausentes da worktree" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1049 msgid "report actions to standard output" -msgstr "mostrar ações na saída padrão" +msgstr "reportar ações na saída padrão" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1051 msgid "(for porcelains) forget saved unresolved conflicts" -msgstr "" -"(para porcelanas) esquecer conflitos guardados que não foram resolvidos" +msgstr "(para porcelains) esquecer conflitos guardados que estão por resolver" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1055 msgid "write index in this format" msgstr "escrever o índice neste formato" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1057 msgid "enable or disable split index" msgstr "ativar ou desativar a divisão do índice" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1059 msgid "enable/disable untracked cache" -msgstr "ativar ou desativar cache não controlada" +msgstr "ativar/desativar cache por monitorizar" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1061 msgid "test if the filesystem supports untracked cache" -msgstr "testar se o sistema de ficheiros suporta cache não controlada" +msgstr "testar se sistema de ficheiros sustenta cache por monitorizar" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1063 msgid "enable untracked cache without testing the filesystem" -msgstr "ativar cache não controlada sem testar o sistema de ficheiros" +msgstr "ativar cache por monitorizar sem testar o sistema de ficheiros" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1065 msgid "write out the index even if is not flagged as changed" msgstr "" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1067 #, fuzzy msgid "enable or disable file system monitor" msgstr "ativar ou desativar a divisão do índice" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1069 #, fuzzy msgid "mark files as fsmonitor valid" -msgstr "marcar ficheiros como \"não alterados\"" +msgstr "marcar ficheiros válidos para fsmonitor" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1072 msgid "clear fsmonitor valid bit" -msgstr "" +msgstr "limpar bit válido de fsmonitor" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1175 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -22887,7 +23824,7 @@ msgstr "" "core.splitIndex está definida como false; remova ou altere-a se pretende " "mesmo ativar índice separado" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1184 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -22895,43 +23832,43 @@ msgstr "" "core.splitIndex está definida como true; remova ou altere-a se pretende " "mesmo desativar índice separado" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1196 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "" -"core.untrackedCache está definida como true; remova ou altere-a se pretende " -"mesmo desativar a cache não controlada" +"core.untrackedCache está definida como true; remove ou altera-a, se queres " +"mesmo desativar a cache por monitorizar" -#: builtin/update-index.c:1198 +#: builtin/update-index.c:1200 msgid "Untracked cache disabled" -msgstr "A cache não controlada está desativada" +msgstr "Cache por monitorizar está desativada" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1208 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" msgstr "" -"core.untrackedCache está definida como false; remova ou altere-a se pretende " -"mesmo ativar a cache não controlada" +"core.untrackedCache está definida como false; remove ou altera-a, se queres " +"mesmo ativar a cache por monitorizar" -#: builtin/update-index.c:1210 +#: builtin/update-index.c:1212 #, c-format msgid "Untracked cache enabled for '%s'" -msgstr "A cache não controlada de '%s' foi ativada." +msgstr "Cache por monitorizar ativada para '%s'" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1220 #, fuzzy msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "core.splitIndex está definida como false; remova ou altere-a se pretende " "mesmo ativar índice separado" -#: builtin/update-index.c:1222 +#: builtin/update-index.c:1224 msgid "fsmonitor enabled" msgstr "" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1227 #, fuzzy msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" @@ -22939,7 +23876,7 @@ msgstr "" "core.splitIndex está definida como true; remova ou altere-a se pretende " "mesmo desativar índice separado" -#: builtin/update-index.c:1229 +#: builtin/update-index.c:1231 msgid "fsmonitor disabled" msgstr "" @@ -22963,8 +23900,7 @@ msgstr "eliminar a referência" #: builtin/update-ref.c:502 msgid "update <refname> not the one it points to" -msgstr "" -"atualizar a referência <nome-da-referência>, não a referência que esta aponta" +msgstr "atualizar <nome-ref>, não à qual esta aponta" #: builtin/update-ref.c:503 msgid "stdin has NUL-terminated arguments" @@ -22972,7 +23908,7 @@ msgstr "os argumentos da entrada padrão terminam em NUL" #: builtin/update-ref.c:504 msgid "read updates from stdin" -msgstr "ler atualizações da entrada padrão" +msgstr "ler atualizações de entrada padrão" #: builtin/update-server-info.c:7 msgid "git update-server-info [--force]" @@ -22996,7 +23932,7 @@ msgstr "sair imediatamente depois do anúncio inicial da referência" #: builtin/upload-pack.c:27 msgid "do not try <directory>/.git/ if <directory> is no Git directory" -msgstr "não tentar <diretório>/.git/ se o <diretório> não for um diretório Git" +msgstr "tentar <pasta>/.git/ apenas se <pasta> for pasta Git" #: builtin/upload-pack.c:29 msgid "interrupt transfer after <n> seconds of inactivity" @@ -23008,7 +23944,7 @@ msgstr "git verify-commit [-v | --verbose] <commit>..." #: builtin/verify-commit.c:68 msgid "print commit contents" -msgstr "imprimir conteúdo do commit" +msgstr "imprimir conteúdo do memória" #: builtin/verify-commit.c:69 builtin/verify-tag.c:37 msgid "print raw gpg status output" @@ -23034,292 +23970,286 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..." msgid "print tag contents" msgstr "imprimir conteúdo da tag" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 #, fuzzy msgid "git worktree add [<options>] <path> [<commit-ish>]" -msgstr "git worktree add [<opções>] <caminho> [<ramo>]" +msgstr "git worktree add [<opções>] <caminho> [<mnemónica>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "git worktree list [<opções>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<opções>] <caminho>" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 #, fuzzy msgid "git worktree move <worktree> <new-path>" -msgstr "git worktree lock [<opções>] <caminho>" +msgstr "git worktree move <árvore-de-trabalho> <novo-caminho>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<opções>]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 #, fuzzy msgid "git worktree remove [<options>] <worktree>" -msgstr "git worktree lock [<opções>] <caminho>" +msgstr "git worktree remove [<opções>] <árvore-de-trabalho>" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "git worktree unlock <caminho>" -#: builtin/worktree.c:60 builtin/worktree.c:973 +#: builtin/worktree.c:61 builtin/worktree.c:944 #, fuzzy, c-format msgid "failed to delete '%s'" -msgstr "falha ao executar '%s'" - -#: builtin/worktree.c:85 -#, fuzzy -msgid "not a valid directory" -msgstr "nome de objeto inválido: %s" - -#: builtin/worktree.c:91 -#, fuzzy -msgid "gitdir file does not exist" -msgstr "A remover worktrees/%s: o ficheiro gitdir não existe" +msgstr "falhou apagar '%s'" -#: builtin/worktree.c:96 builtin/worktree.c:105 -#, fuzzy, c-format -msgid "unable to read gitdir file (%s)" -msgstr "não foi possível ler a árvore (%s)" - -#: builtin/worktree.c:115 -#, c-format -msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" -msgstr "" - -#: builtin/worktree.c:123 -#, fuzzy -msgid "invalid gitdir file" -msgstr "linha de Data inválida" - -#: builtin/worktree.c:131 -#, fuzzy -msgid "gitdir file points to non-existent location" -msgstr "" -"A remover worktrees/%s: o ficheiro gitdir aponta para uma localização " -"inexistente" - -#: builtin/worktree.c:146 +#: builtin/worktree.c:74 #, fuzzy, c-format msgid "Removing %s/%s: %s" msgstr "A remover %s" -#: builtin/worktree.c:221 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "reportar árvores de trabalho podadas" -#: builtin/worktree.c:223 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" msgstr "expirar árvores de trabalho mais antigos que <tempo>" -#: builtin/worktree.c:293 +#: builtin/worktree.c:219 #, c-format msgid "'%s' already exists" msgstr "'%s' já existe" -#: builtin/worktree.c:302 +#: builtin/worktree.c:228 #, fuzzy, c-format msgid "unusable worktree destination '%s'" -msgstr "não é possível ler o ficheiro de assinatura '%s'" +msgstr "destino '%s' de worktree inutilizável" -#: builtin/worktree.c:307 +#: builtin/worktree.c:233 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" "use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:309 +#: builtin/worktree.c:235 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" "use '%s -f' to override, or 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:360 +#: builtin/worktree.c:286 #, c-format msgid "could not create directory of '%s'" -msgstr "não foi possível criar o diretório de '%s'" +msgstr "incapaz criar diretório de '%s'" -#: builtin/worktree.c:494 builtin/worktree.c:500 +#: builtin/worktree.c:308 +msgid "initializing" +msgstr "iniciando" + +#: builtin/worktree.c:420 builtin/worktree.c:426 #, fuzzy, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Erro a eliminar ramo '%s'" -#: builtin/worktree.c:496 +#: builtin/worktree.c:422 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" -#: builtin/worktree.c:505 +#: builtin/worktree.c:431 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "" -#: builtin/worktree.c:511 +#: builtin/worktree.c:437 #, fuzzy, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "A preparar %s (identificador %s)" -#: builtin/worktree.c:552 +#: builtin/worktree.c:482 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "extrair o <ramo> mesmo se já tenha sido extraído noutra árvore de trabalho" -#: builtin/worktree.c:555 +#: builtin/worktree.c:485 msgid "create a new branch" msgstr "criar um novo ramo" -#: builtin/worktree.c:557 +#: builtin/worktree.c:487 msgid "create or reset a branch" msgstr "criar ou repor um ramo" -#: builtin/worktree.c:559 +#: builtin/worktree.c:489 msgid "populate the new working tree" msgstr "povoar a nova árvore de trabalho" -#: builtin/worktree.c:560 +#: builtin/worktree.c:490 #, fuzzy msgid "keep the new working tree locked" msgstr "povoar a nova árvore de trabalho" -#: builtin/worktree.c:563 +#: builtin/worktree.c:492 builtin/worktree.c:729 +msgid "reason for locking" +msgstr "razão para trancar" + +#: builtin/worktree.c:495 #, fuzzy msgid "set up tracking mode (see git-branch(1))" msgstr "configurar modo de seguimento (consulte git-pull(1))" -#: builtin/worktree.c:566 +#: builtin/worktree.c:498 #, fuzzy msgid "try to match the new branch name with a remote-tracking branch" -msgstr "" -"o ramo a montante '%s' não está guardado como um ramo de monitorização remoto" +msgstr "tenta corresponder nome de novo ramo com ramo de monitorização remoto" -#: builtin/worktree.c:574 +#: builtin/worktree.c:506 msgid "-b, -B, and --detach are mutually exclusive" -msgstr "-b, -B e --detach são mutuamente exclusivos" +msgstr "" + +#: builtin/worktree.c:508 +#, fuzzy +msgid "--reason requires --lock" +msgstr "--reason requer --lock" + +#: builtin/worktree.c:512 +msgid "added with --lock" +msgstr "adicionado com --lock" -#: builtin/worktree.c:635 +#: builtin/worktree.c:574 #, fuzzy msgid "--[no-]track can only be used if a new branch is created" -msgstr "A ação --edit-todo só pode ser usada durante um rebase interativo." +msgstr "" -#: builtin/worktree.c:758 -msgid "reason for locking" -msgstr "razão de trancar" +#: builtin/worktree.c:691 +msgid "show extended annotations and reasons, if available" +msgstr "" + +#: builtin/worktree.c:693 +#, fuzzy +msgid "add 'prunable' annotation to worktrees older than <time>" +msgstr "expirar árvores de trabalho mais antigos que <tempo>" + +#: builtin/worktree.c:702 +#, fuzzy +msgid "--verbose and --porcelain are mutually exclusive" +msgstr "" -#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877 -#: builtin/worktree.c:1001 +#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 +#: builtin/worktree.c:972 #, c-format msgid "'%s' is not a working tree" -msgstr "'%s' não é uma árvore de trabalho" +msgstr "'%s' é working tree nenhuma" -#: builtin/worktree.c:772 builtin/worktree.c:805 +#: builtin/worktree.c:743 builtin/worktree.c:776 msgid "The main working tree cannot be locked or unlocked" -msgstr "A árvore de trabalho principal não pode ser trancada nem destrancada" +msgstr "Working tree principal incapaz de ser trancada ou destrancada" -#: builtin/worktree.c:777 +#: builtin/worktree.c:748 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' já está trancada, razão: %s" -#: builtin/worktree.c:779 +#: builtin/worktree.c:750 #, c-format msgid "'%s' is already locked" msgstr "'%s' já está trancada" -#: builtin/worktree.c:807 +#: builtin/worktree.c:778 #, c-format msgid "'%s' is not locked" -msgstr "'%s' não está trancada" +msgstr "'%s' está destrancada" -#: builtin/worktree.c:848 +#: builtin/worktree.c:819 msgid "working trees containing submodules cannot be moved or removed" msgstr "" -#: builtin/worktree.c:856 +#: builtin/worktree.c:827 #, fuzzy msgid "force move even if worktree is dirty or locked" msgstr "forçar mover/mudar o nome mesmo que o destino exista" -#: builtin/worktree.c:879 builtin/worktree.c:1003 +#: builtin/worktree.c:850 builtin/worktree.c:974 #, fuzzy, c-format msgid "'%s' is a main working tree" -msgstr "'%s' não é uma árvore de trabalho" +msgstr "'%s' é uma working tree principal" -#: builtin/worktree.c:884 +#: builtin/worktree.c:855 #, fuzzy, c-format msgid "could not figure out destination name from '%s'" -msgstr "não foi possível migrar o diretório git de '%s' para '%s'" +msgstr "incapaz descobrir nome de destino a partir de '%s'" -#: builtin/worktree.c:897 +#: builtin/worktree.c:868 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:899 +#: builtin/worktree.c:870 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:902 +#: builtin/worktree.c:873 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" -#: builtin/worktree.c:907 +#: builtin/worktree.c:878 #, fuzzy, c-format msgid "failed to move '%s' to '%s'" -msgstr "falha ao abrir '%s': %s" +msgstr "" -#: builtin/worktree.c:953 +#: builtin/worktree.c:924 #, fuzzy, c-format msgid "failed to run 'git status' on '%s'" -msgstr "falha ao escrever para '%s'" +msgstr "falhou executar 'git status' em '%s'" -#: builtin/worktree.c:957 +#: builtin/worktree.c:928 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -#: builtin/worktree.c:962 +#: builtin/worktree.c:933 #, fuzzy, c-format msgid "failed to run 'git status' on '%s', code %d" -msgstr "não foi possível executar 'git status' no submódulo '%s'" +msgstr "falhou executar 'git status' em '%s', código %d" -#: builtin/worktree.c:985 +#: builtin/worktree.c:956 msgid "force removal even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:1008 +#: builtin/worktree.c:979 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:1010 +#: builtin/worktree.c:981 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:1013 +#: builtin/worktree.c:984 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" -#: builtin/worktree.c:1037 +#: builtin/worktree.c:1008 #, fuzzy, c-format msgid "repair: %s: %s" msgstr "%s: %s" -#: builtin/worktree.c:1040 +#: builtin/worktree.c:1011 #, fuzzy, c-format msgid "error: %s: %s" msgstr "%s: %s" @@ -23340,45 +24270,6 @@ msgstr "escrever objeto árvore do subdiretório <prefixo>" msgid "only useful for debugging" msgstr "apenas útil para depuração" -#: http-fetch.c:114 -#, c-format -msgid "argument to --packfile must be a valid hash (got '%s')" -msgstr "" - -#: http-fetch.c:122 -#, fuzzy -msgid "not a git repository" -msgstr "é repositório git nenhum" - -#: t/helper/test-fast-rebase.c:141 -#, fuzzy -msgid "unhandled options" -msgstr "Opções gerais" - -#: t/helper/test-fast-rebase.c:146 -#, fuzzy -msgid "error preparing revisions" -msgstr "Erro ao rematar %s." - -#: t/helper/test-reach.c:154 -#, fuzzy, c-format -msgid "commit %s is not marked reachable" -msgstr "o commit %s não tem o pai %d" - -#: t/helper/test-reach.c:164 -msgid "too many commits marked reachable" -msgstr "" - -#: t/helper/test-serve-v2.c:7 -#, fuzzy -msgid "test-tool serve-v2 [<options>]" -msgstr "git rebase--helper [<opções>]" - -#: t/helper/test-serve-v2.c:19 -#, fuzzy -msgid "exit immediately after advertising capabilities" -msgstr "sair imediatamente depois do anúncio inicial da referência" - #: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" @@ -23386,10 +24277,11 @@ msgid "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" +" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" " <command> [<args>]" msgstr "" -#: git.c:35 +#: git.c:36 #, fuzzy msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" @@ -23402,89 +24294,94 @@ msgstr "" "para ler sobre um subcomando específico ou conceito específico.\n" "Vê 'git help git' para visão geral do sistema." -#: git.c:187 +#: git.c:188 #, c-format msgid "no directory given for --git-dir\n" msgstr "" -#: git.c:201 +#: git.c:202 #, c-format msgid "no namespace given for --namespace\n" msgstr "" -#: git.c:215 +#: git.c:216 #, c-format msgid "no directory given for --work-tree\n" msgstr "" -#: git.c:229 +#: git.c:230 #, fuzzy, c-format msgid "no prefix given for --super-prefix\n" msgstr "--super-prefix recebeu prefixo nenhum\n" -#: git.c:251 +#: git.c:252 #, c-format msgid "-c expects a configuration string\n" msgstr "" -#: git.c:289 +#: git.c:260 +#, c-format +msgid "no config key given for --config-env\n" +msgstr "" + +#: git.c:300 #, c-format msgid "no directory given for -C\n" msgstr "" -#: git.c:315 +#: git.c:326 #, fuzzy, c-format msgid "unknown option: %s\n" msgstr "desconheço opção: %s\n" -#: git.c:364 +#: git.c:375 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "" -#: git.c:373 +#: git.c:384 #, c-format msgid "" "alias '%s' changes environment variables.\n" "You can use '!git' in the alias to do this" msgstr "" -#: git.c:380 +#: git.c:391 #, c-format msgid "empty alias for %s" msgstr "" -#: git.c:383 +#: git.c:394 #, c-format msgid "recursive alias: %s" msgstr "" -#: git.c:465 +#: git.c:476 #, fuzzy msgid "write failure on standard output" -msgstr "mostrar ações na saída padrão" +msgstr "" -#: git.c:467 +#: git.c:478 #, fuzzy msgid "unknown write failure on standard output" -msgstr "mostrar ações na saída padrão" +msgstr "" -#: git.c:469 +#: git.c:480 #, fuzzy msgid "close failed on standard output" msgstr "enviar resultados para a saída padrão" -#: git.c:820 +#: git.c:833 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "" -#: git.c:870 +#: git.c:883 #, fuzzy, c-format msgid "cannot handle %s as a builtin" -msgstr "não é possível enviar mensagem como 7bit" +msgstr "incapaz lidar %s como um builtin" -#: git.c:883 +#: git.c:896 #, fuzzy, c-format msgid "" "usage: %s\n" @@ -23493,16 +24390,172 @@ msgstr "" "utilização: %s\n" "\n" -#: git.c:903 +#: git.c:916 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" -#: git.c:915 +#: git.c:928 #, fuzzy, c-format msgid "failed to run command '%s': %s\n" msgstr "incapaz de executar comando '%s': %s\n" +#: http-fetch.c:118 +#, c-format +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "" + +#: http-fetch.c:128 +#, fuzzy +msgid "not a git repository" +msgstr "é repositório git nenhum" + +#: http-fetch.c:134 +msgid "--packfile requires --index-pack-args" +msgstr "" + +#: http-fetch.c:143 +#, fuzzy +msgid "--index-pack-args can only be used with --packfile" +msgstr "-N só pode ser usado com --mixed" + +#: t/helper/test-fast-rebase.c:141 +#, fuzzy +msgid "unhandled options" +msgstr "Opções gerais" + +#: t/helper/test-fast-rebase.c:146 +#, fuzzy +msgid "error preparing revisions" +msgstr "erro preparando revisões" + +#: t/helper/test-reach.c:154 +#, fuzzy, c-format +msgid "commit %s is not marked reachable" +msgstr "commit %s está a ser tratado como inalcançável" + +#: t/helper/test-reach.c:164 +msgid "too many commits marked reachable" +msgstr "" + +#: t/helper/test-serve-v2.c:7 +#, fuzzy +msgid "test-tool serve-v2 [<options>]" +msgstr "git rebase--helper [<opções>]" + +#: t/helper/test-serve-v2.c:19 +#, fuzzy +msgid "exit immediately after advertising capabilities" +msgstr "sair imediatamente depois do anúncio inicial da referência" + +#: t/helper/test-simple-ipc.c:262 +#, c-format +msgid "socket/pipe already in use: '%s'" +msgstr "" + +#: t/helper/test-simple-ipc.c:264 +#, fuzzy, c-format +msgid "could not start server on: '%s'" +msgstr "" + +#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331 +msgid "could not spawn daemon in the background" +msgstr "" + +#: t/helper/test-simple-ipc.c:356 +#, fuzzy +msgid "waitpid failed" +msgstr "" + +#: t/helper/test-simple-ipc.c:376 +msgid "daemon not online yet" +msgstr "" + +#: t/helper/test-simple-ipc.c:406 +#, fuzzy +msgid "daemon failed to start" +msgstr "" + +#: t/helper/test-simple-ipc.c:410 +msgid "waitpid is confused" +msgstr "" + +#: t/helper/test-simple-ipc.c:541 +msgid "daemon has not shutdown yet" +msgstr "" + +#: t/helper/test-simple-ipc.c:682 +msgid "test-helper simple-ipc is-active [<name>] [<options>]" +msgstr "" + +#: t/helper/test-simple-ipc.c:683 +msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]" +msgstr "" + +#: t/helper/test-simple-ipc.c:684 +msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" +msgstr "" + +#: t/helper/test-simple-ipc.c:685 +msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" +msgstr "" + +#: t/helper/test-simple-ipc.c:686 +msgid "test-helper simple-ipc send [<name>] [<token>]" +msgstr "" + +#: t/helper/test-simple-ipc.c:687 +msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" +msgstr "" + +#: t/helper/test-simple-ipc.c:688 +msgid "" +"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " +"[<batchsize>]" +msgstr "" + +#: t/helper/test-simple-ipc.c:696 +msgid "name or pathname of unix domain socket" +msgstr "" + +#: t/helper/test-simple-ipc.c:698 +msgid "named-pipe name" +msgstr "" + +#: t/helper/test-simple-ipc.c:700 +msgid "number of threads in server thread pool" +msgstr "" + +#: t/helper/test-simple-ipc.c:701 +msgid "seconds to wait for daemon to start or stop" +msgstr "" + +#: t/helper/test-simple-ipc.c:703 +msgid "number of bytes" +msgstr "" + +#: t/helper/test-simple-ipc.c:704 +#, fuzzy +msgid "number of requests per thread" +msgstr "incapaz criar thread: %s" + +#: t/helper/test-simple-ipc.c:706 +#, fuzzy +msgid "byte" +msgstr "bytes" + +#: t/helper/test-simple-ipc.c:706 +msgid "ballast character" +msgstr "" + +#: t/helper/test-simple-ipc.c:707 +msgid "token" +msgstr "" + +#: t/helper/test-simple-ipc.c:707 +msgid "command token to send to the server" +msgstr "" + #: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" @@ -23541,7 +24594,7 @@ msgstr "" msgid "Could not set SSL backend to '%s': already set" msgstr "Incapaz de definir backend SSL para '%s': já definido" -#: http.c:2025 +#: http.c:2034 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -23555,12 +24608,12 @@ msgstr "" #: remote-curl.c:183 #, fuzzy, c-format msgid "invalid quoting in push-option value: '%s'" -msgstr "opção inválida: %s" +msgstr "" #: remote-curl.c:307 #, fuzzy, c-format msgid "%sinfo/refs not valid: is this a git repository?" -msgstr "'%s' não é reconhecido como um repositório git" +msgstr "%sinfo/refs é inválido; isto é um repositório git?" #: remote-curl.c:408 msgid "invalid server response; expected service, got flush packet" @@ -23569,12 +24622,12 @@ msgstr "" #: remote-curl.c:439 #, fuzzy, c-format msgid "invalid server response; got '%s'" -msgstr "referência inválida: %s" +msgstr "" #: remote-curl.c:499 #, fuzzy, c-format msgid "repository '%s' not found" -msgstr "o repositório '%s' não existe" +msgstr "repositório '%s' inexistente" #: remote-curl.c:503 #, fuzzy, c-format @@ -23584,106 +24637,107 @@ msgstr "Falha ao executar: $rest" #: remote-curl.c:507 #, c-format msgid "unable to access '%s': %s" -msgstr "não é possível aceder a '%s': %s" +msgstr "incapaz aceder '%s': %s" #: remote-curl.c:513 #, c-format msgid "redirecting to %s" msgstr "a redirecionar para %s " -#: remote-curl.c:642 +#: remote-curl.c:644 msgid "shouldn't have EOF when not gentle on EOF" msgstr "" -#: remote-curl.c:654 -msgid "remote server sent stateless separator" -msgstr "" +#: remote-curl.c:656 +#, fuzzy +msgid "remote server sent unexpected response end packet" +msgstr "servidor remoto enviou pacote fim de resposta inesperado" -#: remote-curl.c:724 +#: remote-curl.c:726 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" -#: remote-curl.c:754 +#: remote-curl.c:756 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "" -#: remote-curl.c:756 +#: remote-curl.c:758 msgid "remote-curl: unexpected response end packet" msgstr "" -#: remote-curl.c:832 +#: remote-curl.c:834 #, fuzzy, c-format msgid "RPC failed; %s" msgstr "falha: %d" -#: remote-curl.c:872 +#: remote-curl.c:874 #, fuzzy msgid "cannot handle pushes this big" -msgstr "não é possível processar mais do que %d revisão." +msgstr "incapaz atirar algo tão grande" -#: remote-curl.c:987 +#: remote-curl.c:989 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "" -#: remote-curl.c:991 +#: remote-curl.c:993 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "" -#: remote-curl.c:1041 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of length header were received" msgstr "" -#: remote-curl.c:1043 +#: remote-curl.c:1045 #, c-format msgid "%d bytes of body are still expected" msgstr "" -#: remote-curl.c:1132 +#: remote-curl.c:1134 #, fuzzy msgid "dumb http transport does not support shallow capabilities" -msgstr "O servidor não suporta clientes rasos" +msgstr "transporte http estúpido insustenta capacidades shallow" -#: remote-curl.c:1147 +#: remote-curl.c:1149 #, fuzzy msgid "fetch failed." -msgstr "falha ao executar o comando stash" +msgstr "" -#: remote-curl.c:1193 +#: remote-curl.c:1195 msgid "cannot fetch by sha1 over smart http" msgstr "" -#: remote-curl.c:1237 remote-curl.c:1243 +#: remote-curl.c:1239 remote-curl.c:1245 #, fuzzy, c-format msgid "protocol error: expected sha/ref, got '%s'" -msgstr "erro de protocolo: cabeçalho de pacote incorreto" +msgstr "" -#: remote-curl.c:1255 remote-curl.c:1373 +#: remote-curl.c:1257 remote-curl.c:1375 #, fuzzy, c-format msgid "http transport does not support %s" -msgstr "O servidor não suporta STARTTLS! %s" +msgstr "transporte http insustenta %s" -#: remote-curl.c:1291 +#: remote-curl.c:1293 #, fuzzy msgid "git-http-push failed" -msgstr "falha ao executar o comando stash" +msgstr "" -#: remote-curl.c:1479 +#: remote-curl.c:1481 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "" -#: remote-curl.c:1511 +#: remote-curl.c:1513 msgid "remote-curl: error reading command stream from git" msgstr "" -#: remote-curl.c:1518 +#: remote-curl.c:1520 msgid "remote-curl: fetch attempted without a local repo" msgstr "" -#: remote-curl.c:1559 +#: remote-curl.c:1561 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "" @@ -23697,56 +24751,56 @@ msgstr "" msgid "no libc information available\n" msgstr "informação libc indisponível\n" -#: list-objects-filter-options.h:91 +#: list-objects-filter-options.h:94 msgid "args" msgstr "" -#: list-objects-filter-options.h:92 +#: list-objects-filter-options.h:95 #, fuzzy msgid "object filtering" msgstr "tipo do objeto" -#: parse-options.h:183 +#: parse-options.h:184 msgid "expiry-date" msgstr "data-de-validade" -#: parse-options.h:197 +#: parse-options.h:198 msgid "no-op (backward compatibility)" msgstr "sem-ação (retrocompatibilidade)" -#: parse-options.h:309 +#: parse-options.h:310 msgid "be more verbose" msgstr "ser mais verboso" -#: parse-options.h:311 +#: parse-options.h:312 msgid "be more quiet" msgstr "ser mais silencioso" -#: parse-options.h:317 +#: parse-options.h:318 #, fuzzy msgid "use <n> digits to display object names" msgstr "usar <n> dígitos para mostrar SHA-1s" -#: parse-options.h:336 +#: parse-options.h:337 msgid "how to strip spaces and #comments from message" msgstr "como retirar espaços e #comentários da mensagem" -#: parse-options.h:337 +#: parse-options.h:338 #, fuzzy msgid "read pathspec from file" msgstr "ler padrões do ficheiro" -#: parse-options.h:338 +#: parse-options.h:339 #, fuzzy msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "os caminhos estão separados por caracteres NUL" -#: ref-filter.h:96 +#: ref-filter.h:99 msgid "key" msgstr "chave" -#: ref-filter.h:96 +#: ref-filter.h:99 msgid "field name to sort on" msgstr "nome do campo pelo qual ordernar" @@ -23755,14 +24809,6 @@ msgid "update the index with reused conflict resolution if possible" msgstr "" "atualizar o índice com resoluções de conflitos reutilizadas se possível" -#: wt-status.h:80 -msgid "HEAD detached at " -msgstr "HEAD destacada em " - -#: wt-status.h:81 -msgid "HEAD detached from " -msgstr "HEAD destacada de " - #: command-list.h:50 msgid "Add file contents to the index" msgstr "Adicionar conteúdos de ficheiros ao índice" @@ -23817,7 +24863,7 @@ msgstr "" #: command-list.h:62 #, fuzzy msgid "Display gitattributes information" -msgstr "usar .gitattributes apenas a partir do índice" +msgstr "" #: command-list.h:63 msgid "Debug gitignore / exclude files" @@ -23835,7 +24881,7 @@ msgstr "Mudar de ramos ou restaurar os ficheiros da árvore de trabalho" #: command-list.h:66 #, fuzzy msgid "Copy files from the index to the working tree" -msgstr "caminho para a árvore de trabalho" +msgstr "" #: command-list.h:67 msgid "Ensures that a reference name is well formed" @@ -23856,7 +24902,7 @@ msgstr "" #: command-list.h:71 #, fuzzy msgid "Remove untracked files from the working tree" -msgstr "Remover ficheiros da árvore de trabalho e do índice" +msgstr "" #: command-list.h:72 msgid "Clone a repository into a new directory" @@ -23869,7 +24915,7 @@ msgstr "listar os ramos em colunas" #: command-list.h:74 msgid "Record changes to the repository" -msgstr "Gravar alterações no repositório" +msgstr "Gravar alterações para o repositório" #: command-list.h:75 msgid "Write and verify Git commit-graph files" @@ -23878,7 +24924,7 @@ msgstr "" #: command-list.h:76 #, fuzzy msgid "Create a new commit object" -msgstr "falha ao escrever objeto de commit" +msgstr "" #: command-list.h:77 msgid "Get and set repository or global options" @@ -23928,12 +24974,12 @@ msgstr "" #: command-list.h:88 #, fuzzy msgid "Compares files in the working tree and the index" -msgstr "Remover ficheiros da árvore de trabalho e do índice" +msgstr "" #: command-list.h:89 #, fuzzy msgid "Compare a tree to the working tree or index" -msgstr "caminho para a árvore de trabalho" +msgstr "" #: command-list.h:90 msgid "Compares the content and mode of blobs found via two tree objects" @@ -23953,12 +24999,12 @@ msgstr "" #: command-list.h:94 msgid "Download objects and refs from another repository" -msgstr "Transferir objetos e referências doutro repositório" +msgstr "Download objectos e refs de outro repositório" #: command-list.h:95 #, fuzzy msgid "Receive missing objects from another repository" -msgstr "Transferir objetos e referências doutro repositório" +msgstr "" #: command-list.h:96 #, fuzzy @@ -23968,12 +25014,12 @@ msgstr " Ramo remoto:%s" #: command-list.h:97 #, fuzzy msgid "Produce a merge commit message" -msgstr "editar a mensagem de commit" +msgstr "" #: command-list.h:98 #, fuzzy msgid "Output information on each ref" -msgstr "atualizar informação de stat no ficheiro de índice" +msgstr "" #: command-list.h:99 msgid "Run a Git command on a list of repositories" @@ -23986,7 +25032,7 @@ msgstr "" #: command-list.h:101 #, fuzzy msgid "Verifies the connectivity and validity of the objects in the database" -msgstr "escrever o objeto na base de dados de objetos" +msgstr "" #: command-list.h:102 msgid "Cleanup unnecessary files and optimize the local repository" @@ -24019,12 +25065,12 @@ msgstr "" #: command-list.h:109 #, fuzzy msgid "Download from a remote Git repository via HTTP" -msgstr "Transferir objetos e referências doutro repositório" +msgstr "" #: command-list.h:110 #, fuzzy msgid "Push objects over HTTP/DAV to another repository" -msgstr "Transferir objetos e referências doutro repositório" +msgstr "" #: command-list.h:111 msgid "Send a collection of patches from stdin to an IMAP folder" @@ -24068,7 +25114,7 @@ msgstr "repositório de referência" #: command-list.h:120 #, fuzzy msgid "List the contents of a tree object" -msgstr "imprimir apenas as tags do objeto" +msgstr "" #: command-list.h:121 msgid "Extracts patch and authorship from a single e-mail message" @@ -24119,7 +25165,7 @@ msgstr "" #: command-list.h:132 #, fuzzy -msgid "Creates a tag object" +msgid "Creates a tag object with extra validation" msgstr "outro objeto tag" #: command-list.h:133 @@ -24137,7 +25183,7 @@ msgstr "" #: command-list.h:136 #, fuzzy msgid "Add or inspect object notes" -msgstr "o objeto esperado %s não foi recebido" +msgstr "Adicionar ou inspecionar notas de objeto" #: command-list.h:137 msgid "Import from and submit to Perforce repositories" @@ -24146,12 +25192,12 @@ msgstr "" #: command-list.h:138 #, fuzzy msgid "Create a packed archive of objects" -msgstr "ignorar objetos compactados" +msgstr "" #: command-list.h:139 #, fuzzy msgid "Find redundant pack files" -msgstr "não é possível invocar pread sobre o ficheiro de pacote" +msgstr "Encontrar ficheiros de pacote redundantes" #: command-list.h:140 msgid "Pack heads and tags for efficient repository access" @@ -24164,7 +25210,7 @@ msgstr "" #: command-list.h:142 #, fuzzy msgid "Prune all unreachable objects from the object database" -msgstr "escrever o objeto na base de dados de objetos" +msgstr "" #: command-list.h:143 msgid "Remove extra objects that are already in pack files" @@ -24190,7 +25236,7 @@ msgstr "" #: command-list.h:148 #, fuzzy msgid "Reads tree information into the index" -msgstr "atualizar informação de stat no ficheiro de índice" +msgstr "" #: command-list.h:149 msgid "Reapply commits on top of another base tip" @@ -24199,7 +25245,7 @@ msgstr "Reaplicar commits no topo de outra base" #: command-list.h:150 #, fuzzy msgid "Receive what is pushed into the repository" -msgstr "Gravar alterações no repositório" +msgstr "Receber para o repositório, o que foi atirado" #: command-list.h:151 #, fuzzy @@ -24209,12 +25255,12 @@ msgstr "mostrar informação de resolver-desfazer" #: command-list.h:152 #, fuzzy msgid "Manage set of tracked repositories" -msgstr "Gravar alterações no repositório" +msgstr "" #: command-list.h:153 #, fuzzy msgid "Pack unpacked objects in a repository" -msgstr "--cached fora de um repositório" +msgstr "" #: command-list.h:154 #, fuzzy @@ -24241,12 +25287,12 @@ msgstr "Mudar de ramos ou restaurar os ficheiros da árvore de trabalho" #: command-list.h:159 #, fuzzy msgid "Revert some existing commits" -msgstr "não é possível emendar commit não-existente" +msgstr "Reverter algumas memórias existentes" #: command-list.h:160 #, fuzzy msgid "Lists commit objects in reverse chronological order" -msgstr "mostrar commits em ordem topológica" +msgstr "" #: command-list.h:161 #, fuzzy @@ -24255,7 +25301,7 @@ msgstr "demasiados parâmetros" #: command-list.h:162 msgid "Remove files from the working tree and from the index" -msgstr "Remover ficheiros da árvore de trabalho e do índice" +msgstr "" #: command-list.h:163 msgid "Send a collection of patches as emails" @@ -24264,7 +25310,7 @@ msgstr "" #: command-list.h:164 #, fuzzy msgid "Push objects over Git protocol to another repository" -msgstr "Transferir objetos e referências doutro repositório" +msgstr "" #: command-list.h:165 msgid "Restricted login shell for Git-only SSH access" @@ -24290,7 +25336,7 @@ msgstr "" #: command-list.h:170 #, fuzzy msgid "List references in a local repository" -msgstr "o repositório de referência '%s' não é um repositório local." +msgstr "Lista referências num repositório local" #: command-list.h:171 msgid "Git's i18n setup code for shell scripts" @@ -24355,7 +25401,7 @@ msgstr "" #: command-list.h:185 #, fuzzy msgid "Register file contents in the working tree to the index" -msgstr "Remover ficheiros da árvore de trabalho e do índice" +msgstr "" #: command-list.h:186 msgid "Update the object name stored in a ref safely" @@ -24380,38 +25426,38 @@ msgstr "" #: command-list.h:191 #, fuzzy msgid "Check the GPG signature of commits" -msgstr "assinar o commit com GPG" +msgstr "Verifica assinatura GPG de memórias" #: command-list.h:192 #, fuzzy msgid "Validate packed Git archive files" -msgstr "não foi possível criar o ficheiro de arquivo '%s'" +msgstr "Validar ficheiros pacote de arquivo Git" #: command-list.h:193 msgid "Check the GPG signature of tags" -msgstr "" +msgstr "Verifica assinatura GPG de tags" #: command-list.h:194 msgid "Git web interface (web frontend to Git repositories)" -msgstr "" +msgstr "Interface web de Git (frontend web para repositórios Git)" #: command-list.h:195 msgid "Show logs with difference each commit introduces" -msgstr "" +msgstr "Mostrar logs com diferenças que cada memória introduz" #: command-list.h:196 #, fuzzy msgid "Manage multiple working trees" -msgstr "caminho para a árvore de trabalho" +msgstr "Gerir múltiplas working trees" #: command-list.h:197 #, fuzzy msgid "Create a tree object from the current index" -msgstr "ler o objeto da entrada padrão" +msgstr "Criar um objeto tree a partir de index atual" #: command-list.h:198 msgid "Defining attributes per path" -msgstr "Definir atributos por caminho" +msgstr "Definir atributos por path" #: command-list.h:199 msgid "Git command-line interface and conventions" @@ -24445,7 +25491,7 @@ msgstr "" #: command-list.h:206 #, fuzzy msgid "A Git Glossary" -msgstr "Um Glossário do Git" +msgstr "Um Glossário de Git" #: command-list.h:207 msgid "Hooks used by Git" @@ -24454,74 +25500,60 @@ msgstr "" #: command-list.h:208 msgid "Specifies intentionally untracked files to ignore" msgstr "" -"Especificar ficheiros não controlados para serem intencionalmente ignorados" +"Especificar ficheiros por monitorizar intencionalmente, para serem ignorados" #: command-list.h:209 +msgid "Map author/committer names and/or E-Mail addresses" +msgstr "" + +#: command-list.h:210 msgid "Defining submodule properties" msgstr "Definir propriedades de submódulos" -#: command-list.h:210 +#: command-list.h:211 msgid "Git namespaces" msgstr "" -#: command-list.h:211 +#: command-list.h:212 msgid "Helper programs to interact with remote repositories" msgstr "" -#: command-list.h:212 +#: command-list.h:213 msgid "Git Repository Layout" msgstr "" -#: command-list.h:213 +#: command-list.h:214 msgid "Specifying revisions and ranges for Git" msgstr "Especificar revisões e intervalos do Git" -#: command-list.h:214 +#: command-list.h:215 msgid "Mounting one repository inside another" msgstr "" -#: command-list.h:215 +#: command-list.h:216 #, fuzzy msgid "A tutorial introduction to Git: part two" msgstr "Uma introdução ao Git (versão 1.5.1 ou mais recente)" -#: command-list.h:216 +#: command-list.h:217 #, fuzzy msgid "A tutorial introduction to Git" msgstr "Uma introdução ao Git (versão 1.5.1 ou mais recente)" -#: command-list.h:217 +#: command-list.h:218 msgid "An overview of recommended workflows with Git" msgstr "Uma descrição geral dos fluxos de trabalho recomendados para o Git" -#: git-bisect.sh:48 -#, sh-format -msgid "Bad rev input: $arg" -msgstr "Revisão incorreta na entrada: $arg" - -#: git-bisect.sh:82 -msgid "No logfile given" -msgstr "Nenhum ficheiro de log fornecido" - -#: git-bisect.sh:83 -#, sh-format -msgid "cannot read $file for replaying" -msgstr "não é possível ler $file para reproduzir" - -#: git-bisect.sh:105 -msgid "?? what are you talking about?" -msgstr "?? do que é que está a falar?" - -#: git-bisect.sh:115 +#: git-bisect.sh:68 msgid "bisect run failed: no command provided." msgstr "" -#: git-bisect.sh:120 +#: git-bisect.sh:73 #, sh-format msgid "running $command" -msgstr "a executar $command" +msgstr "executando $command" -#: git-bisect.sh:127 +#: git-bisect.sh:80 #, sh-format msgid "" "bisect run failed:\n" @@ -24530,11 +25562,11 @@ msgstr "" "bissetar impossível:\n" "exit code $res de '$command' é < 0 ou >= 128" -#: git-bisect.sh:152 +#: git-bisect.sh:105 msgid "bisect run cannot continue any more" -msgstr "não é possível continuar a bissetar" +msgstr "bisseção incapaz de continuar" -#: git-bisect.sh:158 +#: git-bisect.sh:111 #, fuzzy, sh-format msgid "" "bisect run failed:\n" @@ -24543,14 +25575,10 @@ msgstr "" "bisseção impossível:\n" "'bisect_state $state' retornou código $res de erro" -#: git-bisect.sh:165 +#: git-bisect.sh:118 msgid "bisect run success" msgstr "bissecção concluída com sucesso" -#: git-bisect.sh:173 -msgid "We are not bisecting." -msgstr "Estamos bissetando nada." - #: git-merge-octopus.sh:46 msgid "" "Error: Your local changes to the following files would be overwritten by " @@ -24561,7 +25589,7 @@ msgstr "" #: git-merge-octopus.sh:61 msgid "Automated merge did not work." -msgstr "A integração automática não funcionou." +msgstr "Junção automática falhou." #: git-merge-octopus.sh:62 msgid "Should not be doing an octopus." @@ -24589,7 +25617,7 @@ msgstr "A tentar integração simples com $pretty_name" #: git-merge-octopus.sh:102 msgid "Simple merge did not work, trying automatic merge." -msgstr "A integração simples não funcionou, a tentar integração automática." +msgstr "Junção simples falhou, tentando junção automática." #: git-submodule.sh:179 msgid "Relative path can only be used from the toplevel of the working tree" @@ -24610,22 +25638,22 @@ msgstr "'$sm_path' já existe no índice" #: git-submodule.sh:211 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" -msgstr "'$sm_path' já existe no índicee não é um submódulo" +msgstr "'$sm_path' já existe no index e é submódulo nenhum" #: git-submodule.sh:218 #, fuzzy, sh-format msgid "'$sm_path' does not have a commit checked out" -msgstr "o caminho '%s' não tem a versão deles" +msgstr "'$sm_path' tem memória nenhuma checked out" #: git-submodule.sh:249 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" -msgstr "A adicionar repositório existente em '$sm_path' ao índice" +msgstr "Adicionando repo existente em '$sm_path' ao index" #: git-submodule.sh:251 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" -msgstr "'$sm_path' já existe e não é uma repositório git válido" +msgstr "'$sm_path' já existe e é repositório git inválido" #: git-submodule.sh:259 #, sh-format @@ -24667,7 +25695,7 @@ msgstr "Falha ao adicionar o submódulo '$sm_path'" #: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" -msgstr "Falha ao registar o submódulo '$sm_path'" +msgstr "Falha ao registar submódulo '$sm_path'" #: git-submodule.sh:568 #, sh-format @@ -24684,7 +25712,8 @@ msgstr "Incapaz de buscar em path de submódulo '$sm_path'" msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" -msgstr "Incapaz de encontrar revisão atual ${remote_name}/${branch} em path de " +msgstr "" +"Incapaz de encontrar revisão atual ${remote_name}/${branch} em path de " "submódulo '$sm_path'" #: git-submodule.sh:601 @@ -24692,8 +25721,9 @@ msgstr "Incapaz de encontrar revisão atual ${remote_name}/${branch} em path de msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" -msgstr "Incapaz de buscar em path de submódulo '$displaypath'; tentando " -"buscar $sha1 directamente:" +msgstr "" +"Incapaz de buscar em path de submódulo '$displaypath'; tentando buscar $sha1 " +"directamente:" #: git-submodule.sh:607 #, sh-format @@ -24701,8 +25731,8 @@ msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "" -"Obteve-se no caminho de submódulo '$displaypath', mas não continha $sha1. " -"Falha ao obter aquele commit diretamente." +"Buscado na path de submódulo '$displaypath', mas continha nenhum $sha1. " +"Falha ao buscar aquela memória diretamente." #: git-submodule.sh:614 #, sh-format @@ -24712,7 +25742,7 @@ msgstr "Incapaz de checkout '$sha1' no path de submódulo '$displaypath'" #: git-submodule.sh:615 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" -msgstr "Caminho de submódulo '$displaypath': '$sha1' extraído" +msgstr "Path de submódulo '$displaypath': '$sha1' checked out" #: git-submodule.sh:619 #, sh-format @@ -24722,7 +25752,7 @@ msgstr "Incapaz de rebasear '$sha1' em path de submódulo '$displaypath'" #: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" -msgstr "Caminho de submódulo '$displaypath': rebase concluído em '$sha1'" +msgstr "Path de submódulo '$displaypath': rebaseado em '$sha1'" #: git-submodule.sh:625 #, sh-format @@ -24835,7 +25865,7 @@ msgstr "" #: git-rebase--preserve-merges.sh:285 #, sh-format msgid "$sha1: not a commit that can be picked" -msgstr "$sha1: não é um commit que se possa apanhar" +msgstr "$sha1: é memória nenhuma que possa ser escolhida" #: git-rebase--preserve-merges.sh:324 #, sh-format @@ -24844,12 +25874,12 @@ msgstr "Nome de commit inválido: $sha1" #: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" -msgstr "Incapaz escrever sha1 substituto de commit" +msgstr "Incapaz escrever sha1 substituto atual de commit" #: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" -msgstr "Avanço-rápido para $sha1" +msgstr "Avanço para $sha1" #: git-rebase--preserve-merges.sh:407 #, sh-format @@ -24879,12 +25909,12 @@ msgstr "Incapaz apanhar $sha1" #: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" -msgstr "Esta é a mensagem de commit nº${n}:" +msgstr "Esta é a mensagem de memória #${n}:" #: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" -msgstr "A mensagem de commit nº${n} será ignorada:" +msgstr "Mensagem de memória #${n} será ignorada:" #: git-rebase--preserve-merges.sh:473 #, sh-format @@ -25068,11 +26098,11 @@ msgstr[1] "Rebase $shortrevisions sobre $shortonto ($todocount comandos)" #: git-rebase--preserve-merges.sh:945 msgid "Note that empty commits are commented out" -msgstr "Note que commits vazios são comentados" +msgstr "Note que memórias vazias são comentadas" #: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" -msgstr "Incapaz inicializar commits reescritos" +msgstr "Incapaz inicializar memórias reescritas" #: git-sh-setup.sh:89 git-sh-setup.sh:94 #, sh-format @@ -25082,12 +26112,12 @@ msgstr "utilização: $dashless $USAGE" #: git-sh-setup.sh:191 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" -msgstr "Incapaz chdir para $cdup, o topo da working tree" +msgstr "Incapaz chdir para $cdup, o topo da árvore de trabalho" #: git-sh-setup.sh:200 git-sh-setup.sh:207 #, sh-format msgid "fatal: $program_name cannot be used without a working tree." -msgstr "fatal: $program_name não pode ser usado sem uma árvore de trabalho." +msgstr "fatal: $program_name apenas pode ser usado com uma árvore de trabalho." #: git-sh-setup.sh:221 msgid "Cannot rebase: You have unstaged changes." @@ -25108,20 +26138,20 @@ msgstr "Incapaz $action: Tens alterações despreparadas." #: git-sh-setup.sh:243 msgid "Cannot rebase: Your index contains uncommitted changes." -msgstr "Incapaz rebasear: Teu index contém alterações por commitar." +msgstr "Incapaz rebasear: Teu index contém alterações por memorizar." #: git-sh-setup.sh:246 msgid "Cannot pull with rebase: Your index contains uncommitted changes." -msgstr "Incapaz agarrar com rebase: Teu index contém alterações por commitar." +msgstr "Incapaz agarrar com rebase: Teu index contém alterações por memorizar." #: git-sh-setup.sh:249 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." -msgstr "Incapaz $action: Teu index contém alterações por commitar." +msgstr "Incapaz $action: Teu index contém alterações por memorizar." #: git-sh-setup.sh:253 msgid "Additionally, your index contains uncommitted changes." -msgstr "Além disso, o índice contém alterações não submetidas." +msgstr "Além disso, teu index contém alterações por memorizar." #: git-sh-setup.sh:373 msgid "You need to run this command from the toplevel of the working tree." @@ -25184,14 +26214,13 @@ msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "" -"Se patch aplica-se corretamente, a edição do hunk será marcada\n" -"imediatamente como descartada." +"Se patch aplica-se corretamente, o pedaço editado será marcado\n" +"imediatamente como descartado." #: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for writing: %s" -msgstr "" -"não foi possível abrir o ficheiro de edição do excerto para escrita: %s" +msgstr "falha a abrir ficheiro de edição do pedaço para escrita: %s" #: git-add--interactive.perl:1121 #, perl-format @@ -25209,8 +26238,7 @@ msgstr "" #: git-add--interactive.perl:1143 #, perl-format msgid "failed to open hunk edit file for reading: %s" -msgstr "" -"não foi possível abrir o ficheiro de edição do excerto para leitura: %s" +msgstr "falha a abrir ficheiro de edição do pedaço para leitura: %s" #: git-add--interactive.perl:1251 msgid "" @@ -25220,11 +26248,11 @@ msgid "" "a - stage this hunk and all later hunks in the file\n" "d - do not stage this hunk or any of the later hunks in the file" msgstr "" -"y - preparar este excerto\n" -"n - não preparar este excerto\n" -"q - sair; não preparar este excerto nem os restantes\n" -"a - preparar este excerto e todos os excertos seguintes no ficheiro\n" -"d - não preparar este excerto nem os excertos seguintes no ficheiro" +"y - preparar este pedaço\n" +"n - despreparar este pedaço\n" +"q - sair; despreparar este pedaço e os restantes\n" +"a - preparar este pedaço e os próximos deste ficheiro\n" +"d - despreparar este pedaço e os próximos deste ficheiro" #: git-add--interactive.perl:1257 msgid "" @@ -25234,11 +26262,11 @@ msgid "" "a - stash this hunk and all later hunks in the file\n" "d - do not stash this hunk or any of the later hunks in the file" msgstr "" -"y - esconder este excerto\n" -"n - não esconder este excerto\n" -"q - sair; não esconder este excerto nem os restantes\n" -"a - esconder este excerto e todos os seguintes no ficheiro\n" -"d - não esconder este excerto nem os excertos seguintes no ficheiro" +"y - arrumar este pedaço\n" +"n - deixar este pedaço fora dos arrumos\n" +"q - sair; deixar este pedaço e os restantes fora dos arrumos\n" +"a - arrumar este pedaço e os próximos deste ficheiro\n" +"d - deixar este pedaço e os próximos deste ficheiro fora dos arrumos" #: git-add--interactive.perl:1263 msgid "" @@ -25248,11 +26276,11 @@ msgid "" "a - unstage this hunk and all later hunks in the file\n" "d - do not unstage this hunk or any of the later hunks in the file" msgstr "" -"y - despreparar este excerto\n" -"n - não despreparar este excerto\n" -"q - sair; não despreparar este excerto nem outros restantes\n" -"a - despreparar este excerto e todos os excertos seguintes no ficheiro\n" -"d - não despreparar este excerto nem os excertos seguintes no ficheiro" +"y - despreparar este pedaço\n" +"n - preparar este pedaço\n" +"q - sair; preparar este pedaço e os restantes\n" +"a - despreparar este pedaço e os próximos deste ficheiro\n" +"d - preparar este pedaço e os próximos deste ficheiro" #: git-add--interactive.perl:1269 msgid "" @@ -25262,11 +26290,11 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -"y - aplicar este excerto ao índice\n" -"n - não aplicar este excerto ao índice\n" -"q - sair; não aplicar este excerto nem os restantes\n" -"a - aplicar este excerto e todos os excertos seguintes no ficheiro\n" -"d - não aplicar este excerto nem os excertos seguintes no ficheiro" +"y - submeter este pedaço ao index\n" +"n - deixar este pedaço de fora do index\n" +"q - sair; deixar de fora este pedaço e os restantes\n" +"a - submeter este pedaço e os próximos deste ficheiro\n" +"d - deixar de fora este pedaço e os próximos deste ficheiro" #: git-add--interactive.perl:1275 git-add--interactive.perl:1293 msgid "" @@ -25276,11 +26304,11 @@ msgid "" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -"y - descartar este excerto da árvore de trabalho\n" -"n - não descartar este excerto da árvore de trabalho\n" -"q - sair; não descartar este excerto nem os restantes\n" -"a - descartar este excerto e todos os excertos seguintes no ficheiro\n" -"d - não descartar este excerto nem os excertos seguintes no ficheiro" +"y - descartar este pedaço da árvore de trabalho\n" +"n - manter este pedaço na árvore de trabalho\n" +"q - sair; considerar este pedaço e os restantes\n" +"a - descartar este pedaço e os os próximos deste ficheiro\n" +"d - manter este pedaço e os próximos deste ficheiro" #: git-add--interactive.perl:1281 msgid "" @@ -25290,11 +26318,11 @@ msgid "" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -"y - descartar este pedaço de index e worktree\n" -"n - manter este pedeço no index e worktree\n" -"q - sair; manter este pedaço e qualquer outro restante\n" -"a - descartar este pedaço e qualquer próximo deste ficheiro\n" -"d - manter este pedaço e qualquer próximo deste ficheiro" +"y - descartar este pedaço de index e árvore de trabalho\n" +"n - manter este pedaço no index e árvore de trabalho\n" +"q - sair; manter este pedaço e os restante\n" +"a - descartar este pedaço e os próximos deste ficheiro\n" +"d - manter este pedaço e os próximos deste ficheiro" #: git-add--interactive.perl:1287 msgid "" @@ -25304,11 +26332,11 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -"y - aplicar este excerto ao índice e à árvore de trabalho\n" -"n - não aplicar este excerto ao índice e à árvore de trabalho\n" -"q - sair; não aplicar este excerto ou restantes\n" -"a - aplicar este excerto e todos os excertos seguintes no ficheiro\n" -"d - não aplicar este excerto nem os excertos seguintes no ficheiro" +"y - submeter este pedaço ao index e à árvore de trabalho\n" +"n - deixar este pedaço fora de índice e à árvore de trabalho\n" +"q - sair; deixar de fora este pedaço e restantes\n" +"a - submeter este pedaço e os próximos deste ficheiro\n" +"d - deixar de fora este pedaço e os próximos deste ficheiro" #: git-add--interactive.perl:1299 #, fuzzy @@ -25319,11 +26347,11 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -"y - aplicar este excerto ao índice e à árvore de trabalho\n" -"n - não aplicar este excerto ao índice e à árvore de trabalho\n" -"q - sair; não aplicar este excerto ou restantes\n" -"a - aplicar este excerto e todos os excertos seguintes no ficheiro\n" -"d - não aplicar este excerto nem os excertos seguintes no ficheiro" +"y - submeter este pedaço à árvore de trabalho\n" +"n - deixar este pedaço de fora da árvore de trabalho\n" +"q - sair; deixar de fora este pedaço e restantes\n" +"a - submeter este pedaço e os próximos deste ficheiro\n" +"d - deixar de fora este pedaço e os próximos deste ficheiro" #: git-add--interactive.perl:1314 msgid "" @@ -25337,24 +26365,24 @@ msgid "" "e - manually edit the current hunk\n" "? - print help\n" msgstr "" -"g - selecionar um excerto para ir\n" -"/ - procurar por um excerto correspondendo à regex dada\n" -"j - deixar este excerto indecidido, ver excerto seguinte indecidido\n" -"J - deixar este excerto indecidido, ver excerto seguinte\n" -"k - deixar este excerto indecidido, ver excerto anterior indecidido\n" -"K - deixar este excerto indecidido, ver excerto anterior\n" -"s - dividir o excerto atual em excertos mais pequenos\n" -"e - editar manualmente o excerto atual\n" +"g - selecionar um pedaço para ir\n" +"/ - procurar por um pedaço correspondendo à regex dada\n" +"j - deixar este pedaço indecidido, ver pedaço seguinte indecidido\n" +"J - deixar este pedaço indecidido, ver pedaço seguinte\n" +"k - deixar este pedaço indecidido, ver pedaço anterior indecidido\n" +"K - deixar este pedaço indecidido, ver pedaço anterior\n" +"s - dividir o pedaço atual em pedaços mais pequenos\n" +"e - editar manualmente o pedaço atual\n" "? - imprimir ajuda\n" #: git-add--interactive.perl:1345 msgid "The selected hunks do not apply to the index!\n" -msgstr "Os excertos selecionados não aplicam ao índice!\n" +msgstr "Os pedaços selecionados ficam de fora de index!\n" #: git-add--interactive.perl:1360 #, perl-format msgid "ignoring unmerged: %s\n" -msgstr "ignorado não integrado: %s\n" +msgstr "ignorando por juntar: %s\n" #: git-add--interactive.perl:1479 #, fuzzy, perl-format @@ -25379,7 +26407,7 @@ msgstr "" #, fuzzy, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "" -"Aplicar este excerto ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? " +"Aplicar este pedaço ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? " #: git-add--interactive.perl:1599 msgid "No other hunks to goto\n" @@ -25394,8 +26422,8 @@ msgstr "Número inválido: '%s'\n" #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" -msgstr[0] "Lamento, apenas %d excerto disponível.\n" -msgstr[1] "Lamento, apenas %d excertos disponíveis.\n" +msgstr[0] "Lamento, apenas %d pedaço disponível.\n" +msgstr[1] "Lamento, apenas %d pedaços disponíveis.\n" #: git-add--interactive.perl:1657 msgid "No other hunks to search\n" @@ -25408,15 +26436,15 @@ msgstr "Regexp de pesquisa malformada %s: %s\n" #: git-add--interactive.perl:1684 msgid "No hunk matches the given pattern\n" -msgstr "Nenhum excerto corresponde ao padrão fornecido\n" +msgstr "Nenhum pedaço corresponde ao padrão fornecido\n" #: git-add--interactive.perl:1696 git-add--interactive.perl:1718 msgid "No previous hunk\n" -msgstr "Nenhum excerto anterior\n" +msgstr "Nenhum pedaço anterior\n" #: git-add--interactive.perl:1705 git-add--interactive.perl:1724 msgid "No next hunk\n" -msgstr "Nenhum excerto seguinte\n" +msgstr "Nenhum pedaço seguinte\n" #: git-add--interactive.perl:1730 msgid "Sorry, cannot split this hunk\n" @@ -25426,8 +26454,8 @@ msgstr "" #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" -msgstr[0] "Dividir em %d excerto.\n" -msgstr[1] "Dividir em %d excertos.\n" +msgstr[0] "Dividir em %d pedaço.\n" +msgstr[1] "Dividir em %d pedaços.\n" #: git-add--interactive.perl:1746 msgid "Sorry, cannot edit this hunk\n" @@ -25445,14 +26473,14 @@ msgid "" "add untracked - add contents of untracked files to the staged set of " "changes\n" msgstr "" -"status - mostrar caminhos com alterações\n" +"status - mostrar paths com alterações\n" "update - adicionar o estado da árvore de trabalho ao conjunto de " "alterações preparadas\n" "revert - reverter conjunto de alterações preparadas de volta à versão " -"de HEAD\n" -"patch - escolher excertos e atualizar seletivamente\n" -"diff - ver diff entre HEAD e índice\n" -"add untracked - adicionar conteúdos de ficheiros não controlados ao conjunto " +"HEAD\n" +"patch - escolher pedaços e atualizar seletivamente\n" +"diff - ver diff entre HEAD e index\n" +"add untracked - adicionar conteúdos de ficheiros por monitorizar ao conjunto " "de alterações preparadas\n" #: git-add--interactive.perl:1828 git-add--interactive.perl:1840 @@ -25472,81 +26500,86 @@ msgstr "Mode de --patch desconhecido: %s" msgid "invalid argument %s, expecting --" msgstr "argumento inválido %s, esperava-se --" -#: git-send-email.perl:138 +#: git-send-email.perl:129 msgid "local zone differs from GMT by a non-minute interval\n" -msgstr "a zona local difere de GMT por um intervalo não arrendado ao minuto\n" +msgstr "zona local difere de GMT por um intervalo diferente de minuto\n" -#: git-send-email.perl:145 git-send-email.perl:151 +#: git-send-email.perl:136 git-send-email.perl:142 msgid "local time offset greater than or equal to 24 hours\n" msgstr "a diferença de tempo local é maior ou igual a 24 horas\n" -#: git-send-email.perl:223 git-send-email.perl:229 +#: git-send-email.perl:214 +#, perl-format +msgid "fatal: command '%s' died with exit code %d" +msgstr "" + +#: git-send-email.perl:227 msgid "the editor exited uncleanly, aborting everything" msgstr "o editor saiu com erros, abortar tudo" -#: git-send-email.perl:312 +#: git-send-email.perl:316 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' contém uma versão intermédia do e-mail que esteve a compor.\n" -#: git-send-email.perl:317 +#: git-send-email.perl:321 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' contém o e-mail composto.\n" -#: git-send-email.perl:410 +#: git-send-email.perl:450 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases incompatível com outras opções\n" -#: git-send-email.perl:484 +#: git-send-email.perl:525 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" "Set sendemail.forbidSendmailVariables to false to disable this check.\n" msgstr "" -#: git-send-email.perl:489 git-send-email.perl:691 +#: git-send-email.perl:530 git-send-email.perl:746 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Incapaz executar git format-patch fora de um repositório\n" -#: git-send-email.perl:492 +#: git-send-email.perl:533 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "" -#: git-send-email.perl:505 +#: git-send-email.perl:546 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Campo de --suppress-cc desconhecido: '%s'\n" -#: git-send-email.perl:536 +#: git-send-email.perl:577 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Definidição --confirm desconhecida: '%s'\n" -#: git-send-email.perl:564 +#: git-send-email.perl:617 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" -msgstr "aviso: sendmail alias com aspas não é suportado: %s\n" +msgstr "aviso: alias sendmail com aspas é insustentado: %s\n" -#: git-send-email.perl:566 +#: git-send-email.perl:619 #, perl-format msgid "warning: `:include:` not supported: %s\n" -msgstr "aviso: `:include:` não suportado: %s\n" +msgstr "aviso: `:include:` insustentado: %s\n" -#: git-send-email.perl:568 +#: git-send-email.perl:621 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" -msgstr "aviso: `/file` ou redireção `|pipe` não suportado: %s\n" +msgstr "aviso: `/file` ou redireção `|pipe` é insustentado: %s\n" -#: git-send-email.perl:573 +#: git-send-email.perl:626 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" -msgstr "aviso: linha sendmail não é reconhecida: %s\n" +msgstr "aviso: linha sendmail está por reconhecer: %s\n" -#: git-send-email.perl:657 +#: git-send-email.perl:711 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -25561,21 +26594,12 @@ msgstr "" " * Dizendo \"./%s\" se pretende um ficheiro; ou\n" " * Passando a opção --format-patch se pretende um intervalo de commits.\n" -#: git-send-email.perl:678 +#: git-send-email.perl:732 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Falha ao abrir diretório %s: %s" -#: git-send-email.perl:702 -#, perl-format -msgid "" -"fatal: %s: %s\n" -"warning: no patches were sent\n" -msgstr "" -"fatal: %s: %s\n" -"aviso: enviado patch nenhum\n" - -#: git-send-email.perl:713 +#: git-send-email.perl:767 msgid "" "\n" "No patch files specified!\n" @@ -25585,17 +26609,17 @@ msgstr "" "Nenhum ficheiro patch especificado!\n" "\n" -#: git-send-email.perl:726 +#: git-send-email.perl:780 #, perl-format msgid "No subject line in %s?" msgstr "Nenhum linha de assunto em %s?" -#: git-send-email.perl:736 +#: git-send-email.perl:791 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Falha ao abrir %s para escrita: %s" -#: git-send-email.perl:747 +#: git-send-email.perl:802 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -25605,43 +26629,43 @@ msgid "" msgstr "" "Linhas começadas com \"GIT:\" serão removidos.\n" "Considere incluir um diffstat geral ou tabela de conteúdos\n" -"do patch que está a escrever.\n" +"para o patch que está a escrever.\n" "\n" -"Apague o conteúdo do corpo se não deseja enviar um sumário.\n" +"Apague o conteúdo do corpo se deseja enviar um sumário nenhum.\n" -#: git-send-email.perl:771 +#: git-send-email.perl:826 #, perl-format msgid "Failed to open %s: %s" msgstr "Falha ao abrir %s: %s" -#: git-send-email.perl:788 +#: git-send-email.perl:843 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Falha ao abrir %s.final: %s" -#: git-send-email.perl:831 +#: git-send-email.perl:886 msgid "Summary email is empty, skipping it\n" msgstr "O e-mail de sumário está vazio, saltá-lo à frente\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:866 +#: git-send-email.perl:935 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Tem a certeza que quer usar <%s> [y/N]? " -#: git-send-email.perl:921 +#: git-send-email.perl:990 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" -"Os seguintes ficheiros são 8bit, mas não declaram um Content-Transfer-" -"Encoding.\n" +"Os seguintes ficheiros são 8bit, mas declaram Content-Transfer-Encoding " +"nenhum.\n" -#: git-send-email.perl:926 +#: git-send-email.perl:995 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Que codificação 8bit se deve declarar [UTF-8]? " -#: git-send-email.perl:934 +#: git-send-email.perl:1003 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -25654,39 +26678,39 @@ msgstr "" "tem o assunto modelo '*** SUBJECT HERE ***'. Passe --force se pretende mesmo " "enviar.\n" -#: git-send-email.perl:953 +#: git-send-email.perl:1022 msgid "To whom should the emails be sent (if anyone)?" msgstr "Para quem devem ser enviados os e-mails (se alguém)?" -#: git-send-email.perl:971 +#: git-send-email.perl:1040 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal: alias '%s' expande para si próprio\n" -#: git-send-email.perl:983 +#: git-send-email.perl:1052 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Message-ID para ser usado como In-Reply-To para o primeiro e-mail (se " "algum)? " -#: git-send-email.perl:1041 git-send-email.perl:1049 +#: git-send-email.perl:1114 git-send-email.perl:1122 #, perl-format msgid "error: unable to extract a valid address from: %s\n" -msgstr "erro: não é possível extrair um endereço válido de: %s\n" +msgstr "erro: incapaz extrair endereço válido de: %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1053 +#: git-send-email.perl:1126 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "O que fazer com este endereço? ([q]uit|[d]rop|[e]dit): " -#: git-send-email.perl:1370 +#: git-send-email.perl:1446 #, perl-format msgid "CA path \"%s\" does not exist" -msgstr "O caminho de CA '%s' não existe" +msgstr "Path CA \"%s\" é inexistente" -#: git-send-email.perl:1453 +#: git-send-email.perl:1529 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -25713,1058 +26737,145 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1468 +#: git-send-email.perl:1544 #, fuzzy msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Enviar este e-mail? ([y]es|[n]o|[q]uit|[a]ll): " -#: git-send-email.perl:1471 +#: git-send-email.perl:1547 msgid "Send this email reply required" msgstr "É necessária resposta se deseja enviar este e-mail" -#: git-send-email.perl:1499 +#: git-send-email.perl:1581 msgid "The required SMTP server is not properly defined." -msgstr "O servidor SMTP necessário não está definido corretamente." +msgstr "O servidor SMTP necessário está definido incorretamente." -#: git-send-email.perl:1546 +#: git-send-email.perl:1628 #, perl-format msgid "Server does not support STARTTLS! %s" -msgstr "O servidor não suporta STARTTLS! %s" +msgstr "O servidor insustenta STARTTLS! %s" -#: git-send-email.perl:1551 git-send-email.perl:1555 +#: git-send-email.perl:1633 git-send-email.perl:1637 #, perl-format msgid "STARTTLS failed! %s" -msgstr "" +msgstr "Falhou STARTTLS! %s" -#: git-send-email.perl:1564 +#: git-send-email.perl:1646 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." -msgstr "Incapaz inicializar SMTP devidamente. Verifica configuração e usa --smtp-debug." +msgstr "" +"Incapaz inicializar SMTP devidamente. Verifica configuração e usa --smtp-" +"debug." -#: git-send-email.perl:1582 +#: git-send-email.perl:1664 #, perl-format msgid "Failed to send %s\n" msgstr "Falha ao enviar %s\n" -#: git-send-email.perl:1585 +#: git-send-email.perl:1667 #, perl-format msgid "Dry-Sent %s\n" msgstr "Simulado-Enviado %s\n" -#: git-send-email.perl:1585 +#: git-send-email.perl:1667 #, perl-format msgid "Sent %s\n" msgstr "Enviado %s\n" -#: git-send-email.perl:1587 +#: git-send-email.perl:1669 msgid "Dry-OK. Log says:\n" msgstr "Simulado-OK. O registo diz:\n" -#: git-send-email.perl:1587 +#: git-send-email.perl:1669 msgid "OK. Log says:\n" msgstr "OK. O registo diz:\n" -#: git-send-email.perl:1599 +#: git-send-email.perl:1688 msgid "Result: " msgstr "Resultado: " -#: git-send-email.perl:1602 +#: git-send-email.perl:1691 msgid "Result: OK\n" msgstr "Resultado: OK\n" -#: git-send-email.perl:1620 +#: git-send-email.perl:1709 #, perl-format msgid "can't open file %s" -msgstr "não é possível abrir o ficheiro %s" +msgstr "incapaz abrir ficheiro %s" -#: git-send-email.perl:1667 git-send-email.perl:1687 +#: git-send-email.perl:1756 git-send-email.perl:1776 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Adicionar cc: %s da linha '%s'\n" -#: git-send-email.perl:1673 +#: git-send-email.perl:1762 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Adicionar para: %s da linha '%s'\n" -#: git-send-email.perl:1730 +#: git-send-email.perl:1819 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Adicionar cc: %s da linha '%s'\n" -#: git-send-email.perl:1765 +#: git-send-email.perl:1854 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Adicionar cc: %s da linha '%s'\n" -#: git-send-email.perl:1876 +#: git-send-email.perl:1965 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Incapaz executar '%s'" -#: git-send-email.perl:1883 +#: git-send-email.perl:1972 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Adicionar %s: %s de: '%s'\n" -#: git-send-email.perl:1887 +#: git-send-email.perl:1976 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) falha ao fechar pipe para '%s'" -#: git-send-email.perl:1917 +#: git-send-email.perl:2006 msgid "cannot send message as 7bit" -msgstr "não é possível enviar mensagem como 7bit" +msgstr "incapaz enviar mensagem como 7bit" -#: git-send-email.perl:1925 +#: git-send-email.perl:2014 msgid "invalid transfer encoding" msgstr "codificação de transferência inválida" -#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 +#: git-send-email.perl:2051 +#, fuzzy, perl-format +msgid "" +"fatal: %s: rejected by sendemail-validate hook\n" +"%s\n" +"warning: no patches were sent\n" +msgstr "" +"fatal: %s: %s\n" +"aviso: enviado patch nenhum\n" + +#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124 #, perl-format msgid "unable to open %s: %s\n" -msgstr "não é possível abrir %s: %s\n" +msgstr "incapaz abrir %s: %s\n" -#: git-send-email.perl:1969 -#, perl-format -msgid "%s: patch contains a line longer than 998 characters" -msgstr "%s: o patch contém uma linha mais longa que 998 carateres" +#: git-send-email.perl:2064 +#, fuzzy, perl-format +msgid "" +"fatal: %s:%d is longer than 998 characters\n" +"warning: no patches were sent\n" +msgstr "" +"fatal: %s: %s\n" +"aviso: enviado patch nenhum\n" -#: git-send-email.perl:1986 +#: git-send-email.perl:2082 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Saltar %s com sufixo de backup '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1990 +#: git-send-email.perl:2086 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Deseja mesmo enviar %s? [y|N]: " - -#~ msgid "store only" -#~ msgstr "armazenar apenas" - -#~ msgid "compress faster" -#~ msgstr "compressão rápida" - -#~ msgid "compress better" -#~ msgstr "compressão ótima" - -#, fuzzy, c-format -#~ msgid "unexpected duplicate commit id %s" -#~ msgstr "não foi possível analisar o commit %s" - -#, fuzzy, c-format -#~ msgid "%s: not a valid OID" -#~ msgstr "'%s' não é uma referência válida." - -#, fuzzy, c-format -#~ msgid "invalid committer '%s'" -#~ msgstr "commit inválido %s" - -#, fuzzy, c-format -#~ msgid "invalid committer: %s" -#~ msgstr "commit inválido %s" - -#, fuzzy -#~ msgid "git bisect--helper --next-all" -#~ msgstr "git bisect--helper --next-all [--no-checkout]" - -#, fuzzy -#~ msgid "git bisect--helper --bisect-clean-state" -#~ msgstr "git bisect--helper --next-all [--no-checkout]" - -#, fuzzy -#~ msgid "git bisect--helper --bisect-autostart" -#~ msgstr "git bisect--helper --next-all [--no-checkout]" - -#~ msgid "perform 'git bisect next'" -#~ msgstr "executar 'git bisect next'" - -#, fuzzy -#~ msgid "--write-terms requires two arguments" -#~ msgstr "--abort não leva argumentos" - -#, fuzzy -#~ msgid "--bisect-clean-state requires no arguments" -#~ msgstr "--continue não leva argumentos" - -#, fuzzy -#~ msgid "--bisect-autostart does not accept arguments" -#~ msgstr "%%(subject) não leva argumentos" - -#~ msgid "n,m" -#~ msgstr "n,m" - -#~ msgid "Process line range n,m in file, counting from 1" -#~ msgstr "processar intervalo de linhas n,m, a contar a partir de 1" - -#~ msgid "name of output directory is too long" -#~ msgstr "o nome do diretório de saída é demasiado longo" - -#~ msgid "standard output, or directory, which one?" -#~ msgstr "saída padrão, ou diretório, qual deles?" - -#, c-format -#~ msgid "failed to remove '%s'" -#~ msgstr "falha ao remover '%s'" - -#, sh-format -#~ msgid "Bad rev input: $bisected_head" -#~ msgstr "Revisão incorreta na entrada: $bisected_head" - -#, sh-format -#~ msgid "Bad rev input: $rev" -#~ msgstr "Revisão incorreta na entrada: $rev" - -#, sh-format -#~ msgid "See git-${cmd}(1) for details." -#~ msgstr "Consulte git-${cmd}(1) para obter mais detalhes." - -#, c-format -#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -#~ msgstr "" -#~ "valor '%s' de core.untrackedCache desconhecido; usar 'keep' valor por " -#~ "omissão" - -#~ msgid "git fetch-pack: expected ACK/NAK, got EOF" -#~ msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se EOF" - -#~ msgid "Server supports multi_ack_detailed" -#~ msgstr "O servidor suporta multi_ack_detailed" - -#~ msgid "Server supports no-done" -#~ msgstr "O servidor suporta no-done" - -#~ msgid "Server supports multi_ack" -#~ msgstr "O servidor suporta muilti_ack" - -#~ msgid "Server supports side-band-64k" -#~ msgstr "O servidor suporta side-band-64k" - -#~ msgid "Server supports allow-tip-sha1-in-want" -#~ msgstr "O servidor suporta allow-tip-sha1-in-want" - -#~ msgid "Server supports allow-reachable-sha1-in-want" -#~ msgstr "O servidor suporta allow-reachable-sha1-in-want" - -#, c-format -#~ msgid "in %0.1f seconds automatically..." -#~ msgstr "automaticamente em %0.1f..." - -#~ msgid "error building trees" -#~ msgstr "erro ao construir árvores" - -#, c-format -#~ msgid "Renaming %s to %s and %s to %s instead" -#~ msgstr "A mudar o nome de %s para %s e de %s para %s, em alternativa" - -#~ msgid "" -#~ "empty strings as pathspecs will be made invalid in upcoming releases. " -#~ "please use . instead if you meant to match all paths" -#~ msgstr "" -#~ "cadeias de caracteres vazias como especificadores de caminho tornar-se-ão " -#~ "inválidas nas próximas versões. Use . para corresponder a todos os " -#~ "caminhos" - -#, c-format -#~ msgid "Could not open '%s' for writing" -#~ msgstr "Incapaz abrir '%s' para escrita" - -#, c-format -#~ msgid "positive value expected objectname:short=%s" -#~ msgstr "valor positivo esperado objectname:short=%s" - -#, c-format -#~ msgid "(HEAD detached at %s)" -#~ msgstr "(HEAD destacada em %s)" - -#, c-format -#~ msgid "(HEAD detached from %s)" -#~ msgstr "(HEAD destacada de %s)" - -#~ msgid "Internal error" -#~ msgstr "Erro interno" - -#, c-format -#~ msgid "dup2(%d,%d) failed" -#~ msgstr "dup2(%d,%d) falhou" - -#, c-format -#~ msgid "" -#~ "invalid 1st line of squash message:\n" -#~ "\n" -#~ "\t%.*s" -#~ msgstr "" -#~ "1ª linha inválida da mensagem de squash:\n" -#~ "\n" -#~ "\t%.*s" - -#, c-format -#~ msgid "mainline was specified but commit %s is not a merge." -#~ msgstr "" -#~ "a linha principal foi especificada mas o commit %s não é uma integração." - -#~ msgid "BUG: returned path string doesn't match cwd?" -#~ msgstr "BUG: returned path string doesn't match cwd?" - -#, c-format -#~ msgid "" -#~ "Cannot update sparse checkout: the following entries are not up-to-date:\n" -#~ "%s" -#~ msgstr "" -#~ "Impossível actualizar sparse checkout: estas entradas estão " -#~ "desactualizadas:\n" -#~ "%s" - -#, c-format -#~ msgid "" -#~ "The following working tree files would be overwritten by sparse checkout " -#~ "update:\n" -#~ "%s" -#~ msgstr "" -#~ "Os seguintes ficheiros na árvore de trabalho seriam substituídos ao " -#~ "atualizar a extração esparsa:\n" -#~ "%s" - -#, c-format -#~ msgid "" -#~ "The following working tree files would be removed by sparse checkout " -#~ "update:\n" -#~ "%s" -#~ msgstr "" -#~ "Os seguintes ficheiros na árvore de trabalho seriam removidos ao " -#~ "atualizar a extração esparsa:\n" -#~ "%s" - -#, c-format -#~ msgid "submodule update strategy not supported for submodule '%s'" -#~ msgstr "não foi possível procurar pelo submódulo '%s'" - -#, c-format -#~ msgid "could not close %s" -#~ msgstr "não foi possível fechar %s" - -#~ msgid "Initial commit on " -#~ msgstr "Commit inicial em " - -#~ msgid "(+/-)x" -#~ msgstr "(+/-)x" - -#, c-format -#~ msgid "Use -f if you really want to add them.\n" -#~ msgstr "Use -f se deseja mesmo adicioná-los.\n" - -#~ msgid "Patch is empty. Was it split wrong?" -#~ msgstr "O patch está vazio. Foi dividido incorretamente?" - -#~ msgid "cannot be interactive without stdin connected to a terminal." -#~ msgstr "" -#~ "não é possível entrar em modo interativo sem um entrada padrão conectada " -#~ "a um terminal." - -#, c-format -#~ msgid "The copy of the patch that failed is found in: %s" -#~ msgstr "A cópia do patch que falhou encontra-se em: %s" - -#~ msgid "" -#~ "You still have unmerged paths in your index.\n" -#~ "Did you forget to use 'git add'?" -#~ msgstr "" -#~ "Ainda há caminhos não integrados no índice.\n" -#~ "Esqueceu-se de usar 'git add'?" - -#~ msgid "update BISECT_HEAD instead of checking out the current commit" -#~ msgstr "atualizar BISECT_HEAD em vez de extrair o commit atual" - -#~ msgid "Use an experimental heuristic to improve diffs" -#~ msgstr "Usar um heurística experimental para melhorar diffs" - -#~ msgid "change upstream info" -#~ msgstr "alterar a informação do ramo a montante" - -#~ msgid "it does not make sense to create 'HEAD' manually" -#~ msgstr "não faz sentido criar 'HEAD' manualmente" - -#, c-format -#~ msgid "" -#~ "\n" -#~ "If you wanted to make '%s' track '%s', do this:\n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "Se quer que '%s' siga '%s', faça:\n" -#~ "\n" - -#, c-format -#~ msgid "" -#~ "Cannot update paths and switch to branch '%s' at the same time.\n" -#~ "Did you intend to checkout '%s' which can not be resolved as commit?" -#~ msgstr "" -#~ " possível atualizar os caminho e mudar para o ramo '%s' ao mesmo tempo.\n" -#~ "Pretendia extrair '%s' o qual não pode ser resolvido como commit?" - -#, c-format -#~ msgid "failed to stat %s\n" -#~ msgstr "falha ao invocar stat de %s\n" - -#~ msgid "" -#~ "If you wish to skip this commit, use:\n" -#~ "\n" -#~ " git reset\n" -#~ "\n" -#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n" -#~ "the remaining commits.\n" -#~ msgstr "" -#~ "Se deseja ignorar este commit, use:\n" -#~ "\n" -#~ " git reset\n" -#~ "\n" -#~ "Depois \"git cherry-pick --continue\" irá retomar o cherry-pick\n" -#~ "dos restantes commits.\n" - -#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..." -#~ msgstr "Caminhos explícitos especificados sem -i ou -o; assumindo --only..." - -#~ msgid "default" -#~ msgstr "predefinição" - -#, c-format -#~ msgid "annotated tag %s has no embedded name" -#~ msgstr "tag anotada %s falta o nome incorporado" - -#~ msgid "<command>" -#~ msgstr "<comando>" - -#~ msgid "default mode for recursion" -#~ msgstr "modo recursivo por omissão" - -#, c-format -#~ msgid "Don't know how to fetch from %s" -#~ msgstr "Desconheço como buscar de %s" - -#, c-format -#~ msgid "Can't stat %s" -#~ msgstr "não é possível invocar stat sobre %s" - -#~ msgid "basename" -#~ msgstr "nomebase" - -#~ msgid "Everyday Git With 20 Commands Or So" -#~ msgstr "Diário Git com mais ou menos 20 Comandos" - -#~ msgid "Error in object" -#~ msgstr "Erro no objeto" - -#~ msgid "print only names (no SHA-1)" -#~ msgstr "imprimir apenas nomes (sem SHA-1)" - -#~ msgid "--[no-]autostash option is only valid with --rebase." -#~ msgstr "a opção --[no-]autostash só é válida com --rebase." - -#~ msgid "abort rebase" -#~ msgstr "abortar rebase" - -#~ msgid "push|fetch" -#~ msgstr "push|fetch" - -#~ msgid "w[,i1[,i2]]" -#~ msgstr "w[,i1[,i2]]" - -#~ msgid "submodule--helper subcommand must be called with a subcommand" -#~ msgstr "o subcomando submodule--helper deve ser invocado com um subcomando" - -#~ msgid "tag: tagging " -#~ msgstr "tag: a colocar tag" - -#~ msgid "commit object" -#~ msgstr "objeto commit" - -#~ msgid "blob object" -#~ msgstr "objeto blob" - -#, c-format -#~ msgid "Removing worktrees/%s: not a valid directory" -#~ msgstr "A remover worktrees/%s: diretório inválido" - -#, c-format -#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)" -#~ msgstr "A remover worktrees/%s: não é possível ler o ficheiro gitdir (%s)" - -#, c-format -#~ msgid "Removing worktrees/%s: invalid gitdir file" -#~ msgstr "A remover worktrees/%s: ficheiro gitdir inválido" - -#, sh-format -#~ msgid "unrecognised option: '$arg'" -#~ msgstr "opção não reconhecida: '$arg'" - -#, sh-format -#~ msgid "'$invalid' is not a valid commit" -#~ msgstr "'$invalid' não é um commit válido" - -#, sh-format -#~ msgid "invalid upstream $upstream_name" -#~ msgstr "$upstream_name a montante inválido" - -#, sh-format -#~ msgid "$onto_name: there are more than one merge bases" -#~ msgstr "$onto_name: há mais do que uma base de integração" - -#, sh-format -#~ msgid "$onto_name: there is no merge base" -#~ msgstr "$onto_name: há base de junção nenhuma" - -#, sh-format -#~ msgid "fatal: no such branch: $branch_name" -#~ msgstr "fatal: ramo inexistente: $branch_name" - -#, sh-format -#~ msgid "Fast-forwarded $branch_name to $onto_name." -#~ msgstr "$branch_name avançado rapidamente para $onto_name." - -#~ msgid "Cannot remove temporary index (can't happen)" -#~ msgstr "Incapaz remover index temporário (pode acontecer de maneira nenhuma)" - -#, sh-format -#~ msgid "" -#~ "error: unknown option for 'stash save': $option\n" -#~ " To provide a message, use git stash save -- '$option'" -#~ msgstr "" -#~ "erro: desconheço opção de 'stash save': $option\n" -#~ " Fornecendo mensagem, usa git stash save -- '$option'" - -#, sh-format -#~ msgid "unknown option: $opt" -#~ msgstr "opção desconhecido: $opt" - -#, sh-format -#~ msgid "$reference is not a valid reference" -#~ msgstr "$reference não é uma referência válida" - -#~ msgid "Cannot unstage modified files" -#~ msgstr "Incapaz despreparar ficheiros modificado" - -#~ msgid "(To restore them type \"git stash apply\")" -#~ msgstr "(Para os restaurar execute \"git stash apply\")" - -#, sh-format -#~ msgid "" -#~ "The following path is ignored by one of your .gitignore files:\n" -#~ "$sm_path\n" -#~ "Use -f if you really want to add it." -#~ msgstr "" -#~ "O seguinte caminho foi ignorado por um ficheiro .gitignore:\n" -#~ "$sm_path\n" -#~ "Use -f se pretende mesmo adicioná-lo." - -#, sh-format -#~ msgid "Entering '$displaypath'" -#~ msgstr "A entrar em '$displaypath'" - -#, sh-format -#~ msgid "Stopping at '$displaypath'; script returned non-zero status." -#~ msgstr "" -#~ "Interrompido em '$displaypath'; o script retornou um valor diferente de " -#~ "zero." - -#, sh-format -#~ msgid "pathspec and --all are incompatible" -#~ msgstr "especificador de caminho e --all são incompatíveis" - -#, sh-format -#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" -#~ msgstr "" -#~ "O registo do submódulo '$name' ($url) foi removido do caminho " -#~ "'$displaypath'" - -#~ msgid "The --cached option cannot be used with the --files option" -#~ msgstr "A opção --cached não pode ser usada com a opção --files" - -#, sh-format -#~ msgid " Warn: $display_name doesn't contain commit $sha1_src" -#~ msgstr " Aviso: $display_name não contém o commit $sha1_src" - -#, sh-format -#~ msgid " Warn: $display_name doesn't contain commit $sha1_dst" -#~ msgstr " Warn: $display_name não contém o commit $sha1_dst" - -#, sh-format -#~ msgid "" -#~ " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -#~ msgstr " Warn: $display_name contém os commits $sha1_src e $sha1_dst" - -#, sh-format -#~ msgid "Failed to recurse into submodule path '$sm_path'" -#~ msgstr "Falha ao percorrer recursivamente o caminho de submódulo '$sm_path'" - -#, sh-format -#~ msgid "" -#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" -#~ " - $line" -#~ msgstr "" -#~ "Aviso: falta o SHA-1 ou a seguinte linha não tem um commit:\n" -#~ " - $line" - -#, sh-format -#~ msgid "" -#~ "Warning: the command isn't recognized in the following line:\n" -#~ " - $line" -#~ msgstr "" -#~ "Aviso: o comando não é reconhecido na seguinte linha:\n" -#~ " - $line" - -#~ msgid "Or you can abort the rebase with 'git rebase --abort'." -#~ msgstr "Ou pode abortar o rebase com 'git rebase --abort'." - -#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" -#~ msgstr "Os campos To/Cc/Bcc não são interpretados ainda, foram ignorados\n" - -#~ msgid "" -#~ "There is nothing to exclude from by :(exclude) patterns.\n" -#~ "Perhaps you forgot to add either ':/' or '.' ?" -#~ msgstr "" -#~ "Há nada a excluir de acordo com a pattern :(exclude).\n" -#~ "Talvez tenhas-te esquecido de acrescentar ':/' ou '.' ?" - -#~ msgid "unrecognized format: %%(%s)" -#~ msgstr "formato não reconhecido: %%(%s)" - -#~ msgid "ref '%s' does not have %ld components to :strip" -#~ msgstr "a referência '%s' não tem %ld componentes como se indica em :strip" - -#~ msgid "[%s: gone]" -#~ msgstr "[%s: desaparecido]" - -#~ msgid "[%s: behind %d]" -#~ msgstr "[%s: atrás %d]" - -#~ msgid "[%s: ahead %d]" -#~ msgstr "[%s: à frente %d]" - -#~ msgid "[%s: ahead %d, behind %d]" -#~ msgstr "[%s: à frente %d, atrás %d]" - -#~ msgid " **** invalid ref ****" -#~ msgstr " **** referências inválida ****" - -#~ msgid "insanely long object directory %.*s" -#~ msgstr "diretório de objetos demasiado longo %.*s" - -#~ msgid "git merge [<options>] <msg> HEAD <commit>" -#~ msgstr "git merge [<opções>] <msg> HEAD <commit>" - -#~ msgid "tag name too long: %.*s..." -#~ msgstr "o nome da tag é demasiado longo: %.*s..." - -#~ msgid "tag header too big." -#~ msgstr "cabeçalho da tag demasiado longo." - -#~ msgid "" -#~ "If the patch applies cleanly, the edited hunk will immediately be\n" -#~ "marked for discarding" -#~ msgstr "" -#~ "Se o patch se aplicar corretamente, o excerto editado será marcado\n" -#~ "para ser descartado imediatamente." - -#~ msgid "Use an experimental blank-line-based heuristic to improve diffs" -#~ msgstr "" -#~ "Usar uma heurística experimental baseada em linhas brancas para melhorar " -#~ "diffs" - -#~ msgid "Clever... amending the last one with dirty index." -#~ msgstr "Inteligente... a emendar o último commit com o índice sujo." - -#~ msgid "" -#~ "the following submodule (or one of its nested submodules)\n" -#~ "uses a .git directory:" -#~ msgid_plural "" -#~ "the following submodules (or one of their nested submodules)\n" -#~ "use a .git directory:" -#~ msgstr[0] "" -#~ "o submódulo seguinte (ou um dos seus submódulos aninhados)\n" -#~ "usa um diretório .git:" -#~ msgstr[1] "" -#~ "os submódulos seguintes (ou um dos seus submódulos)\n" -#~ "usam um diretório .git:" - -#~ msgid "" -#~ "\n" -#~ "(use 'rm -rf' if you really want to remove it including all of its " -#~ "history)" -#~ msgstr "" -#~ "\n" -#~ "(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)" - -#~ msgid "Could not write to %s" -#~ msgstr "Incapaz escrever em %s" - -#~ msgid "Error wrapping up %s." -#~ msgstr "Erro ao rematar %s." - -#~ msgid "Your local changes would be overwritten by cherry-pick." -#~ msgstr "As suas alterações locais serão substituídas por cherry-pick." - -#~ msgid "Cannot revert during another revert." -#~ msgstr "Incapaz reverter durante outra reversão." - -#~ msgid "Cannot cherry-pick during another cherry-pick." -#~ msgstr "Incapaz apanhar durante outra apanha." - -#~ msgid "Could not open %s" -#~ msgstr "Incapaz abrir %s" - -#~ msgid "Could not format %s." -#~ msgstr "Incapaz formatar %s." - -#~ msgid "You need to set your committer info first" -#~ msgstr "Primeiro tem de definir a sua informação de committer" - -#~ msgid "bad numeric config value '%s' for '%s': invalid unit" -#~ msgstr "" -#~ "valor numérico '%s' da configuração '%s' incorreto: unidade inválida" - -#~ msgid "bad numeric config value '%s' for '%s' in blob %s: invalid unit" -#~ msgstr "" -#~ "valor numérico '%s' da configuração '%s' incorreto no blob %s: unidade " -#~ "inválida" - -#~ msgid "bad numeric config value '%s' for '%s' in file %s: invalid unit" -#~ msgstr "" -#~ "valor numérico '%s' da configuração '%s' incorreto no ficheiro %s: " -#~ "unidade inválida" - -#~ msgid "" -#~ "bad numeric config value '%s' for '%s' in standard input: invalid unit" -#~ msgstr "" -#~ "valor numérico '%s' da configuração '%s' incorreto na entrada padrão: " -#~ "unidade inválida" - -#~ msgid "" -#~ "bad numeric config value '%s' for '%s' in submodule-blob %s: invalid unit" -#~ msgstr "" -#~ "valor numérico '%s' da configuração '%s' incorreto no submódulo-blob %s: " -#~ "unidade inválida" - -#~ msgid "" -#~ "bad numeric config value '%s' for '%s' in command line %s: invalid unit" -#~ msgstr "" -#~ "valor numérico '%s' da configuração '%s' incorreto na linha de comandos " -#~ "%s: unidade inválida" - -#~ msgid "bad numeric config value '%s' for '%s' in %s: invalid unit" -#~ msgstr "" -#~ "valor numérico '%s' da configuração '%s' incorreto em %s: unidade inválida" - -#~ msgid "This is the 2nd commit message:" -#~ msgstr "Esta é a 2ª mensagem de commit:" - -#~ msgid "This is the 3rd commit message:" -#~ msgstr "Esta é a 3ª mensagem de commit:" - -#~ msgid "This is the 4th commit message:" -#~ msgstr "Esta é a 4ª mensagem de commit:" - -#~ msgid "This is the 5th commit message:" -#~ msgstr "Esta é a 5ª mensagem de commit:" - -#~ msgid "This is the 6th commit message:" -#~ msgstr "Esta é a 6ª mensagem de commit:" - -#~ msgid "This is the 7th commit message:" -#~ msgstr "Esta é a 7ª mensagem de commit:" - -#~ msgid "This is the 8th commit message:" -#~ msgstr "Esta é a 8ª mensagem de commit:" - -#~ msgid "This is the 9th commit message:" -#~ msgstr "Esta é a 9ª mensagem de commit:" - -#~ msgid "This is the 10th commit message:" -#~ msgstr "Esta é a 10ª mensagem de commit:" - -#~ msgid "This is the ${n}th commit message:" -#~ msgstr "Esta é a ${n}ª mensagem de commit:" - -#~ msgid "This is the ${n}st commit message:" -#~ msgstr "Está é a ${n}ª mensagem de commit:" - -#~ msgid "This is the ${n}nd commit message:" -#~ msgstr "Esta é a ${n}ª mensagem de commit:" - -#~ msgid "This is the ${n}rd commit message:" -#~ msgstr "Esta é a ${n}ª mensagem de commit:" - -#~ msgid "The 1st commit message will be skipped:" -#~ msgstr "A 1ª mensagem de commit será ignorada:" - -#~ msgid "The 2nd commit message will be skipped:" -#~ msgstr "A 2ª mensagem de commit será ignorada:" - -#~ msgid "The 3rd commit message will be skipped:" -#~ msgstr "A 3ª mensagem de commit será ignorada:" - -#~ msgid "The 4th commit message will be skipped:" -#~ msgstr "A 4ª mensagem de commit será ignorada:" - -#~ msgid "The 5th commit message will be skipped:" -#~ msgstr "A 5ª mensagem de commit será ignorada:" - -#~ msgid "The 6th commit message will be skipped:" -#~ msgstr "A 6ª mensagem de commit será ignorada:" - -#~ msgid "The 7th commit message will be skipped:" -#~ msgstr "A 7ª mensagem de commit será ignorada:" - -#~ msgid "The 8th commit message will be skipped:" -#~ msgstr "A 8ª mensagem de commit será ignorada:" - -#~ msgid "The 9th commit message will be skipped:" -#~ msgstr "A 9ª mensagem de commit será ignorada:" - -#~ msgid "The 10th commit message will be skipped:" -#~ msgstr "A 10ª mensagem de commit será ignorada:" - -#~ msgid "The ${n}th commit message will be skipped:" -#~ msgstr "A ${n}ª mensagem de commit será ignorada:" - -#~ msgid "The ${n}st commit message will be skipped:" -#~ msgstr "A ${n}ª mensagem de commit será ignorada:" - -#~ msgid "The ${n}nd commit message will be skipped:" -#~ msgstr "A ${n}ª mensagem de commit será ignorada:" - -#~ msgid "The ${n}rd commit message will be skipped:" -#~ msgstr "A ${n}ª mensagem de commit será ignorada:" - -#~ msgid "could not run gpg." -#~ msgstr "não foi possível executar gpg." - -#~ msgid "gpg did not accept the data" -#~ msgstr "gpg não aceitou os dados" - -#~ msgid "unsupported object type in the tree" -#~ msgstr "tipo de objeto sem suporte encontrado na árvore" - -#~ msgid "Fatal merge failure, shouldn't happen." -#~ msgstr "Falha de integração fatal, não devia acontecer." - -#~ msgid "Unprocessed path??? %s" -#~ msgstr "Caminho não processado??? %s" - -#~ msgid "Cannot %s during a %s" -#~ msgstr "Incapaz %s durante %s" - -#~ msgid "Can't cherry-pick into empty head" -#~ msgstr "Incapaz apanhar para uma head vazia" - -#~ msgid "could not write branch description template" -#~ msgstr "não foi possível escrever o modelo da descrição do ramo" - -#~ msgid "corrupt index file" -#~ msgstr "ficheiro de índice corrompido" - -#~ msgid "detach the HEAD at named commit" -#~ msgstr "destacar HEAD no commit indicado" - -#~ msgid "Checking connectivity... " -#~ msgstr "A verificar a conectividade... " - -#~ msgid " (unable to update local ref)" -#~ msgstr " (não é possível atualizar a referência local)" - -#~ msgid "Reinitialized existing" -#~ msgstr "existente reinicializado" - -#~ msgid "Initialized empty" -#~ msgstr "vazio inicializado" - -#~ msgid " shared" -#~ msgstr " partilhado" - -#~ msgid "Verify that the named commit has a valid GPG signature" -#~ msgstr "verificar se o commit tem uma assinatura GPG válida" - -#~ msgid "Writing SQUASH_MSG" -#~ msgstr "A escrever SQUASH_MSG" - -#~ msgid "Finishing SQUASH_MSG" -#~ msgstr "A concluir SQUASH_MSG" - -#~ msgid " and with remote" -#~ msgstr " e com o remoto" - -#~ msgid "removing '%s' failed" -#~ msgstr "falha ao remover '%s'" - -#~ msgid "" -#~ "If you want to reuse this local git directory instead of cloning again " -#~ "from" -#~ msgstr "" -#~ "Se deseja reutilizar este diretório git local em vez de clonar de novo de" - -#~ msgid "" -#~ "use the '--force' option. If the local git directory is not the correct " -#~ "repo" -#~ msgstr "" -#~ "use a opção '--force'. Se o diretório git local não é o repositório " -#~ "correto" - -#~ msgid "" -#~ "or you are unsure what this means choose another name with the '--name' " -#~ "option." -#~ msgstr "" -#~ "ou se não tem a certeza do que isto significa, escolha outro nome com a " -#~ "opção '--name'." - -#~ msgid "Submodule work tree '$displaypath' contains a .git directory" -#~ msgstr "" -#~ "A árvore de trabalho do submódulo '$displaypath' contém um diretório .git" - -#~ msgid "" -#~ "(use 'rm -rf' if you really want to remove it including all of its " -#~ "history)" -#~ msgstr "" -#~ "(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)" - -#~ msgid "'%s': %s" -#~ msgstr "'%s': %s" - -#~ msgid " git branch -d %s\n" -#~ msgstr " git branch -d %s\n" - -#~ msgid " git branch --set-upstream-to %s\n" -#~ msgstr " git branch --set-upstream-to %s\n" - -#~ msgid "cannot open %s: %s\n" -#~ msgstr "não é possível abrir %s: %s\n" - -#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed" -#~ msgstr "" -#~ "Prepare as suas alterações em .gitmodules ou esconda-as (stash) para " -#~ "prosseguir" - -#~ msgid "failed to remove: %s" -#~ msgstr "falha ao remover: %s" - -#~ msgid "The --exec option must be used with the --interactive option" -#~ msgstr "A opção --exec deve ser usada com a opção --interactive" - -#~ msgid "" -#~ "Submodule path '$displaypath' not initialized\n" -#~ "Maybe you want to use 'update --init'?" -#~ msgstr "" -#~ "Submódulo em '$displaypath' não inicializado\n" -#~ "Talvez queira usar 'update --init'?" - -#~ msgid "improper format entered align:%s" -#~ msgstr "formato impróprio introduzido align:%s" - -#~ msgid "" -#~ "push.default is unset; its implicit value has changed in\n" -#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" -#~ "and maintain the traditional behavior, use:\n" -#~ "\n" -#~ " git config --global push.default matching\n" -#~ "\n" -#~ "To squelch this message and adopt the new behavior now, use:\n" -#~ "\n" -#~ " git config --global push.default simple\n" -#~ "\n" -#~ "When push.default is set to 'matching', git will push local branches\n" -#~ "to the remote branches that already exist with the same name.\n" -#~ "\n" -#~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n" -#~ "behavior, which only pushes the current branch to the corresponding\n" -#~ "remote branch that 'git pull' uses to update the current branch.\n" -#~ "\n" -#~ "See 'git help config' and search for 'push.default' for further " -#~ "information.\n" -#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" -#~ "'current' instead of 'simple' if you sometimes use older versions of Git)" -#~ msgstr "" -#~ "push.default não está definido; o seu valor implícito foi alterado\n" -#~ "no Git 2.0 de 'matching' para 'simple'. Para suprimir esta mensagem\n" -#~ "e manter o comportamento tradicional, use:\n" -#~ "\n" -#~ " git config --global push.default matching\n" -#~ "\n" -#~ "Para suprimir esta mensagem e adotar o novo comportamento, use:\n" -#~ "\n" -#~ " git config --global push.default simple\n" -#~ "\n" -#~ "Quando push.default está definido como 'matching', o Git publica\n" -#~ "os ramos locais nos ramos remotos que já existam com o mesmo nome.\n" -#~ "\n" -#~ "Desde a versão 2.0, o Git assume o comportamento mais conservativo " -#~ "'simple',\n" -#~ "publicando só o ramo atual no ramo remoto correspondente, que é usado\n" -#~ "para atualizar o ramo atual com 'git pull'.\n" -#~ "Consulte 'git help config' e procure por 'push.default' para mais " -#~ "informações.\n" -#~ "(o modo 'simple' foi introduzido no Git 1.7.11. Use o modo semelhante\n" -#~ "'current' em vez de 'simple' se por vezes usa versões anteriores do Git)" - -#~ msgid "check|on-demand|no" -#~ msgstr "check|on-demand|no" - -#~ msgid "Could not append '%s'" -#~ msgstr "Incapaz acrescentar '%s'" - -#~ msgid "Testing " -#~ msgstr "A testar " - -#~ msgid "Forward-port local commits to the updated upstream head" -#~ msgstr "" -#~ "Migrar commits locais para a cabeça atualizada em relação ao ramo a " -#~ "montante" - -#~ msgid " %d file changed" -#~ msgid_plural " %d files changed" -#~ msgstr[0] " %d ficheiro modificado" -#~ msgstr[1] " %d ficheiros modificados" - -#~ msgid ", %d insertion(+)" -#~ msgid_plural ", %d insertions(+)" -#~ msgstr[0] ", %d adição(+)" -#~ msgstr[1] ", %d adições(+)" - -#~ msgid ", %d deletion(-)" -#~ msgid_plural ", %d deletions(-)" -#~ msgstr[0] ", %d eliminado(-)" -#~ msgstr[1] ", %d eliminados(-)" - -#~ msgid "You do not have a valid HEAD" -#~ msgstr "Você não tem uma HEAD válida" - -#~ msgid "bug" -#~ msgstr "erro" - -#~ msgid "copied: %s -> %s" -#~ msgstr "copiado: %s -> %s" - -#~ msgid "modified: %s" -#~ msgstr "modificado: %s" - -#~ msgid "renamed: %s -> %s" -#~ msgstr "mudado de nome: %s -> %s" - -#~ msgid ", behind " -#~ msgstr ", atrás " - -#~ msgid "no files added" -#~ msgstr "adicionado ficheiro nenhum" - -#~ msgid "Could not extract email from committer identity." -#~ msgstr "Incapaz extrair email apartir identidade committer." - -#~ msgid "option %s does not accept negative form" -#~ msgstr "opção %s não aceita formato negativo" - -#~ msgid "Applying: $FIRSTLINE" -#~ msgstr "Aplicando: $FIRSTLINE" - -#~ msgid "--" -#~ msgstr "--" - -#~ msgid "Please enter the commit message for your changes." -#~ msgstr "Por favor insira a mensagem de commit das suas alterações." @@ -1,8 +1,8 @@ # Turkish translations for Git # Git Türkçe çevirileri -# Copyright (C) 2020-2021 Emir SARI <bitigchi@me.com> +# Copyright (C) 2020-2021 Emir SARI <emir_sari@msn.com> # This file is distributed under the same license as the Git package. -# Emir SARI <bitigchi@me.com>, 2020-2021 +# Emir SARI <emir_sari@msn.com>, 2020-2021 # # ######################################################### # # Git Türkçe kavramlar dizini / Git Turkish Glossary # @@ -90,9 +90,9 @@ msgid "" msgstr "" "Project-Id-Version: Git Turkish Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-05-17 16:02+0800\n" -"PO-Revision-Date: 2021-05-17 18:00+0300\n" -"Last-Translator: Emir SARI <bitigchi@me.com>\n" +"POT-Creation-Date: 2021-08-03 17:06+0800\n" +"PO-Revision-Date: 2021-08-03 18:00+0300\n" +"Last-Translator: Emir SARI <emir_sari@msn.com>\n" "Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n" "Language: tr\n" "MIME-Version: 1.0\n" @@ -106,7 +106,7 @@ msgid "Huh (%s)?" msgstr "Pardon (%s)?" #: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 -#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 +#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 #: builtin/rebase.c:1953 msgid "could not read index" msgstr "indeks okunamadı" @@ -135,7 +135,7 @@ msgstr "Güncelle" msgid "could not stage '%s'" msgstr "'%s' hazırlanamadı" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707 msgid "could not write index" msgstr "indeks yazılamadı" @@ -193,12 +193,12 @@ msgstr[1] "%d yol eklendi\n" msgid "ignoring unmerged: %s" msgstr "birleştirilmeyenler yok sayılıyor: %s" -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 +#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "Yalnızca ikili dosyalar değiştirildi.\n" -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 +#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "Değişiklik yok.\n" @@ -275,11 +275,11 @@ msgstr "numaralandırılmış bir öge seç" msgid "(empty) select nothing" msgstr "(boş) hiçbir şey seçme" -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 +#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** Komutlar ***" -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 +#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893 msgid "What now" msgstr "Şimdi ne olacak" @@ -291,12 +291,12 @@ msgstr "hazırlanmış" msgid "unstaged" msgstr "hazırlanmamış" -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 -#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309 +#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 -#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327 -#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 #: git-add--interactive.perl:213 msgid "path" msgstr "yol" @@ -305,7 +305,7 @@ msgstr "yol" msgid "could not refresh index" msgstr "indeks yenilenemedi" -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 +#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "Güle güle.\n" @@ -608,34 +608,34 @@ msgstr "" "a - bu parçayı ve sonraki tüm parçaları uygula\n" "d - bu parçayı veya sonraki parçalardan herhangi birini uygulama\n" -#: add-patch.c:342 +#: add-patch.c:343 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "parça üstbilgisi '%.*s' ayrıştırılamadı" -#: add-patch.c:361 add-patch.c:365 +#: add-patch.c:362 add-patch.c:366 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "renklendirilmiş parça üstbilgisi '%.*s' ayrıştırılamadı" -#: add-patch.c:419 +#: add-patch.c:420 msgid "could not parse diff" msgstr "diff ayrıştırılamadı" -#: add-patch.c:438 +#: add-patch.c:439 msgid "could not parse colored diff" msgstr "renklendirilmiş diff ayrıştırılamadı" -#: add-patch.c:452 +#: add-patch.c:453 #, c-format msgid "failed to run '%s'" msgstr "'%s' çalıştırılamadı" -#: add-patch.c:611 +#: add-patch.c:612 msgid "mismatched output from interactive.diffFilter" msgstr "interactive.diffFilter ögesinden eşleşmeyen çıktı" -#: add-patch.c:612 +#: add-patch.c:613 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -643,7 +643,7 @@ msgstr "" "Süzgeciniz kendisinin girdi ve çıktı satırları arasında\n" "birebir karşılık sağlamalıdır." -#: add-patch.c:790 +#: add-patch.c:791 #, c-format msgid "" "expected context line #%d in\n" @@ -652,7 +652,7 @@ msgstr "" "şurada bağlam satırı #%d bekleniyordu:\n" "%.*s" -#: add-patch.c:805 +#: add-patch.c:806 #, c-format msgid "" "hunks do not overlap:\n" @@ -665,11 +665,11 @@ msgstr "" "\tşununla bitmiyor:\n" "%.*s" -#: add-patch.c:1081 git-add--interactive.perl:1115 +#: add-patch.c:1082 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "El ile parça düzenleme kipi -- hızlıca öğrenmek için aşağıya bakın.\n" -#: add-patch.c:1085 +#: add-patch.c:1086 #, c-format msgid "" "---\n" @@ -683,7 +683,7 @@ msgstr "" "%c kaldırılacak.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1099 git-add--interactive.perl:1129 +#: add-patch.c:1100 git-add--interactive.perl:1129 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" @@ -693,11 +693,11 @@ msgstr "" "sunulacaktır. Parçanın tüm satırları kaldırılırsa düzenleme durdurulur\n" "ve parça değiştirilmeden bırakılır.\n" -#: add-patch.c:1132 +#: add-patch.c:1133 msgid "could not parse hunk header" msgstr "parça üstbilgisi ayrıştırılamadı" -#: add-patch.c:1177 +#: add-patch.c:1178 msgid "'git apply --cached' failed" msgstr "'git apply --cached' başarısız oldu" @@ -713,26 +713,26 @@ msgstr "'git apply --cached' başarısız oldu" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1246 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Düzenlediğiniz parça uygulanamıyor. Yeniden düzenlensin mi (\"n (hayır)\" " "ıskartaya çıkarır!) [y/n]? " -#: add-patch.c:1289 +#: add-patch.c:1290 msgid "The selected hunks do not apply to the index!" msgstr "Seçili parçalar indekse uygulanamıyor!" -#: add-patch.c:1290 git-add--interactive.perl:1346 +#: add-patch.c:1291 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "Çalışma ağacına yine de uygulansın mı? " -#: add-patch.c:1297 git-add--interactive.perl:1349 +#: add-patch.c:1298 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "Hiçbir şey uygulanmadı.\n" -#: add-patch.c:1354 +#: add-patch.c:1355 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -754,69 +754,69 @@ msgstr "" "e - geçerli parçayı el ile düzenle\n" "? - yardımı yazdır\n" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1517 add-patch.c:1527 msgid "No previous hunk" msgstr "Öncesinde parça yok" -#: add-patch.c:1521 add-patch.c:1531 +#: add-patch.c:1522 add-patch.c:1532 msgid "No next hunk" msgstr "Sonrasında parça yok" -#: add-patch.c:1537 +#: add-patch.c:1538 msgid "No other hunks to goto" msgstr "Gidilecek başka bir parça yok" -#: add-patch.c:1548 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " msgstr "hangi parçaya gidilsin (daha fazla görmek için <ret>)? " -#: add-patch.c:1549 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "hangi parçaya gidilsin? " -#: add-patch.c:1560 +#: add-patch.c:1561 #, c-format msgid "Invalid number: '%s'" msgstr "Geçersiz sayı: '%s'" -#: add-patch.c:1565 +#: add-patch.c:1566 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "Üzgünüm, yalnızca %d parça kullanılabilir." msgstr[1] "Üzgünüm, yalnızca %d parça kullanılabilir." -#: add-patch.c:1574 +#: add-patch.c:1575 msgid "No other hunks to search" msgstr "Aranacak başka parça yok" -#: add-patch.c:1580 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "düzenli ifade aransın mı? " -#: add-patch.c:1595 +#: add-patch.c:1596 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Hatalı oluşturulmuş düzenli ifade %s: %s" -#: add-patch.c:1612 +#: add-patch.c:1613 msgid "No hunk matches the given pattern" msgstr "Verilen dizgi ile eşleşen bir parça yok" -#: add-patch.c:1619 +#: add-patch.c:1620 msgid "Sorry, cannot split this hunk" msgstr "Üzgünüm, bu parça bölünemiyor" -#: add-patch.c:1623 +#: add-patch.c:1624 #, c-format msgid "Split into %d hunks." msgstr "%d parçaya bölündü." -#: add-patch.c:1627 +#: add-patch.c:1628 msgid "Sorry, cannot edit this hunk" msgstr "Üzgünüm, bu parça düzenlenemiyor" -#: add-patch.c:1679 +#: add-patch.c:1680 msgid "'git apply' failed" msgstr "'git apply' başarısız oldu" @@ -896,8 +896,9 @@ msgstr "" #: advice.c:303 msgid "" "Disable or modify the sparsity rules if you intend to update such entries." -msgstr "Böyle girdileri güncellemeyi düşünüyorsanız aralıklandırma kurallarını " -"devre dışı bırakın veya değiştirin." +msgstr "" +"Böyle girdileri güncellemeyi düşünüyorsanız aralıklandırma kurallarını devre " +"dışı bırakın veya değiştirin." #: advice.c:310 #, c-format @@ -1256,8 +1257,8 @@ msgstr "%s: yanlış tür" msgid "%s has type %o, expected %o" msgstr "%s, %o türüne iye, %o bekleniyordu" -#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 -#: read-cache.c:1351 +#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892 +#: read-cache.c:1353 #, c-format msgid "invalid path '%s'" msgstr "geçersiz yol '%s'" @@ -1347,7 +1348,7 @@ msgstr "yeni oluşturulan %s dosyası için yardımcı bellek oluşturulamıyor" msgid "unable to add cache entry for %s" msgstr "%s için önbellek girdisi eklenemiyor" -#: apply.c:4376 builtin/bisect--helper.c:523 +#: apply.c:4376 builtin/bisect--helper.c:525 #, c-format msgid "failed to write to '%s'" msgstr "şuraya yazılamadı: '%s'" @@ -1437,7 +1438,7 @@ msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "Boşluk hataları düzeltildikten sonra %d satır uygulandı." msgstr[1] "Boşluk hataları düzeltildikten sonra %d satır uygulandı." -#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "Yeni indeks dosyası yazılamıyor" @@ -1449,7 +1450,7 @@ msgstr "verilen yol ile eşleşen değişiklikleri uygulama" msgid "apply changes matching the given path" msgstr "verilen yol ile eşleşen değişiklikleri uygula" -#: apply.c:5000 builtin/am.c:2317 +#: apply.c:5000 builtin/am.c:2318 msgid "num" msgstr "sayı" @@ -1513,9 +1514,9 @@ msgstr "yollar NUL karakteri ile ayrılır" msgid "ensure at least <n> lines of context match" msgstr "en az <n> bağlam satırının eşleştiğinden emin ol" -#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 +#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991 #: builtin/rebase.c:1347 msgid "action" msgstr "eylem" @@ -1545,8 +1546,8 @@ msgid "allow overlapping hunks" msgstr "üst üste binen parçalara izin ver" #: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 -#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 -#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "ayrıntı ver" @@ -1558,7 +1559,7 @@ msgstr "dosya sonunda yanlışlıkla algılanan eksik yenisatırı hoş gör" msgid "do not trust the line counts in the hunk headers" msgstr "parça üstbilgisindeki satır sayımına güvenme" -#: apply.c:5059 builtin/am.c:2305 +#: apply.c:5059 builtin/am.c:2306 msgid "root" msgstr "kök" @@ -1600,7 +1601,7 @@ msgstr "yol geçerli UTF-8 değil: %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "yol çok uzun (%d karakter, SHA1: %s): %s" -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 #, c-format msgid "deflate error (%d)" msgstr "söndürme hatası (%d)" @@ -1634,13 +1635,13 @@ msgid "cannot read %s" msgstr "%s okunamıyor" #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 -#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 +#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833 #: builtin/merge.c:1143 #, c-format msgid "could not read '%s'" msgstr "'%s' okunamadı" -#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 +#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "yol belirteci '%s' hiçbir dosya ile eşleşmedi" @@ -1682,7 +1683,7 @@ msgstr "biçim" msgid "archive format" msgstr "arşiv biçimi" -#: archive.c:553 builtin/log.c:1772 +#: archive.c:553 builtin/log.c:1775 msgid "prefix" msgstr "önek" @@ -1693,7 +1694,7 @@ msgstr "öneki arşivdeki tüm yol adlarının başına ekle" #: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105 +#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105 #: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" @@ -1724,7 +1725,7 @@ msgid "list supported archive formats" msgstr "desteklenen arşiv biçimlerini listele" #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "depo" @@ -1732,7 +1733,7 @@ msgstr "depo" msgid "retrieve the archive from remote repository <repo>" msgstr "arşivi uzak konum deposu <depo>'dan al" -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717 #: builtin/notes.c:498 msgid "command" msgstr "komut" @@ -1918,11 +1919,11 @@ msgstr "" "--reverse ve --first-parent birlikte en son işlemenin belirtilmesini " "gerektiriyor" -#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 -#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 -#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 -#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 -#: builtin/pack-objects.c:3661 builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414 +#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346 +#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806 +#: builtin/pack-objects.c:3821 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "revizyonda gezinme ayarlaması başarısız oldu" @@ -2086,118 +2087,118 @@ msgstr "'%s' çıkışı '%s' konumunda halihazırda yapılmış" msgid "HEAD of working tree %s is not updated" msgstr "%s çalışma ağacının HEAD'i güncellenmemiş" -#: bundle.c:41 +#: bundle.c:44 #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "bilinmeyen demet sağlama algoritması: %s" -#: bundle.c:45 +#: bundle.c:48 #, c-format msgid "unknown capability '%s'" msgstr "bilinmeyen yetenek '%s'" -#: bundle.c:71 +#: bundle.c:74 #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "'%s' bir v2 veya v3 demet dosyası gibi görünmüyor" -#: bundle.c:110 +#: bundle.c:113 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "tanımlanamayan üstbilgi: %s%s (%d)" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 #: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "'%s' açılamadı" -#: bundle.c:189 +#: bundle.c:198 msgid "Repository lacks these prerequisite commits:" msgstr "Depo aşağıdaki önkoşul işlemelere iye değil:" -#: bundle.c:192 +#: bundle.c:201 msgid "need a repository to verify a bundle" msgstr "bir demeti doğrulamak için bir depo gerekiyor" -#: bundle.c:243 +#: bundle.c:257 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Demet şu başvuruyu içeriyor:" msgstr[1] "Demet şu %d başvuruyu içeriyor:" -#: bundle.c:250 +#: bundle.c:264 msgid "The bundle records a complete history." msgstr "Demet tam bir geçmiş kaydını yazar." -#: bundle.c:252 +#: bundle.c:266 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Demet şu işlemeyi gerektiriyor:" msgstr[1] "Demet şu %d işlemeyi gerektiriyor:" -#: bundle.c:319 +#: bundle.c:333 msgid "unable to dup bundle descriptor" msgstr "demet açıklayıcısı çoğaltılamıyor" -#: bundle.c:326 +#: bundle.c:340 msgid "Could not spawn pack-objects" msgstr "pack-objects ortaya çıkarılamadı" -#: bundle.c:337 +#: bundle.c:351 msgid "pack-objects died" msgstr "pack-objects sonlandı" -#: bundle.c:386 +#: bundle.c:400 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "'%s' başvurusu revizyon listesi seçenekleri tarafından dışlandı" -#: bundle.c:490 +#: bundle.c:504 #, c-format msgid "unsupported bundle version %d" msgstr "desteklenmeyen demet sürümü %d" -#: bundle.c:492 +#: bundle.c:506 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "demet sürümü %d, %s algoritması ile yazılamıyor" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "tanımlanamayan argüman: %s" -#: bundle.c:539 +#: bundle.c:553 msgid "Refusing to create empty bundle." msgstr "Boş demet oluşturma reddediliyor." -#: bundle.c:549 +#: bundle.c:563 #, c-format msgid "cannot create '%s'" msgstr "'%s' oluşturulamıyor" -#: bundle.c:574 +#: bundle.c:588 msgid "index-pack died" msgstr "index-pack sonlandı" -#: chunk-format.c:113 +#: chunk-format.c:117 msgid "terminating chunk id appears earlier than expected" msgstr "iri parça numarası sonlandırması beklenenden önce ortaya çıkıyor" -#: chunk-format.c:122 +#: chunk-format.c:126 #, c-format msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" msgstr "düzgün olmayan iri parça ofseti %<PRIx64> ve %<PRIx64>" -#: chunk-format.c:129 +#: chunk-format.c:133 #, c-format msgid "duplicate chunk ID %<PRIx32> found" msgstr "yinelenmiş iri parça numarası %<PRIx32> bulundu" -#: chunk-format.c:143 +#: chunk-format.c:147 #, c-format msgid "final chunk has non-zero id %<PRIx32>" msgstr "en son iri parçanın numarası sıfır olmayan %<PRIx32>" @@ -2265,12 +2266,12 @@ msgstr "%s işlemesi bulunamadı" msgid "commit-graph requires overflow generation data but has none" msgstr "commit-graph, taşım oluşturma verisi gerektiriyor; ancak hiç yok" -#: commit-graph.c:1075 builtin/am.c:1340 +#: commit-graph.c:1075 builtin/am.c:1341 #, c-format msgid "unable to parse commit %s" msgstr "%s işlemesi ayrıştırılamıyor" -#: commit-graph.c:1337 builtin/pack-objects.c:2897 +#: commit-graph.c:1337 builtin/pack-objects.c:3057 #, c-format msgid "unable to get type of object %s" msgstr "%s nesnesinin türü alınamıyor" @@ -2333,7 +2334,7 @@ msgstr "İşleme grafiğindeki ek sınırlar bulunuyor" msgid "failed to write correct number of base graph ids" msgstr "temel grafiği numaralarının doğru sayısı yazılamadı" -#: commit-graph.c:1812 midx.c:906 +#: commit-graph.c:1812 midx.c:911 #, c-format msgid "unable to create leading directories of %s" msgstr "%s öncü dizinleri oluşturulamıyor" @@ -2383,59 +2384,59 @@ msgstr "" msgid "too many commits to write graph" msgstr "grafik yazımı için çok fazla işleme" -#: commit-graph.c:2450 +#: commit-graph.c:2449 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "commit-graph dosyasının sağlama toplamı yanlış ve büyük olasılıkla hasar " "görmüş" -#: commit-graph.c:2460 +#: commit-graph.c:2459 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "commit-graph hatalı nesne tanımlayıcı sırasına iye: %s, sonra %s" -#: commit-graph.c:2470 commit-graph.c:2485 +#: commit-graph.c:2469 commit-graph.c:2484 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "commit-graph hatalı fanout değerine iye: fanout[%d] = %u != %u" -#: commit-graph.c:2477 +#: commit-graph.c:2476 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "%s işlemesi commit-graph'tan ayrıştırılamadı" -#: commit-graph.c:2495 +#: commit-graph.c:2494 msgid "Verifying commits in commit graph" msgstr "İşleme grafiğindeki işlemeler doğrulanıyor" -#: commit-graph.c:2510 +#: commit-graph.c:2509 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "%s işlemesi commit-graph için olan nesne veritabanından ayrıştırılamadı" -#: commit-graph.c:2517 +#: commit-graph.c:2516 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "commit-graph'teki %s işlemesi için olan kök ağaç nesne tanımlayıcısı %s != %s" -#: commit-graph.c:2527 +#: commit-graph.c:2526 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "%s işlemesi için olan commit-graph üst öge listesi çok uzun" -#: commit-graph.c:2536 +#: commit-graph.c:2535 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s için olan commit-graph üst ögesi %s != %s" -#: commit-graph.c:2550 +#: commit-graph.c:2549 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "%s işlemesi için olan commit-graph üst öge listesi erkenden sonlanıyor" -#: commit-graph.c:2555 +#: commit-graph.c:2554 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2443,7 +2444,7 @@ msgstr "" "%s işlemesi için commit-graph kuşak sayısı sıfır; ancak başka yerlerde " "sıfırdan farklı" -#: commit-graph.c:2559 +#: commit-graph.c:2558 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2451,19 +2452,19 @@ msgstr "" "%s işlemesi için commit-graph kuşak sayısı sıfırdan farklı; ancak başka " "yerlerde sıfır" -#: commit-graph.c:2576 +#: commit-graph.c:2575 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "%s işlemesi için commit-graph kuşağı %<PRIuMAX> < %<PRIuMAX>" -#: commit-graph.c:2582 +#: commit-graph.c:2581 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "%s işlemesi için commit-graph içindeki işleme tarihi %<PRIuMAX> != %<PRIuMAX>" -#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416 -#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417 +#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "%s ayrıştırılamadı" @@ -2755,7 +2756,7 @@ msgstr "%s için hatalı oluşturulmuş değer: %s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "nothing, matching, simple, upstream veya current içinden biri olmalı" -#: config.c:1687 builtin/pack-objects.c:3924 +#: config.c:1687 builtin/pack-objects.c:4084 #, c-format msgid "bad pack compression level %d" msgstr "hatalı paket sıkıştırma düzeyi %d" @@ -2775,110 +2776,110 @@ msgstr "'%s' başvurusu ikili bir nesneye işaret etmiyor" msgid "unable to resolve config blob '%s'" msgstr "'%s' yapılandırma ikili nesnesi çözülemiyor" -#: config.c:1873 +#: config.c:1874 #, c-format msgid "failed to parse %s" msgstr "%s ayrıştırılamadı" -#: config.c:1929 +#: config.c:1930 msgid "unable to parse command-line config" msgstr "komut satırı yapılandırması ayrıştırılamıyor" -#: config.c:2293 +#: config.c:2294 msgid "unknown error occurred while reading the configuration files" msgstr "yapılandırma dosyaları okunurken beklenmedik bir hata oluştu" -#: config.c:2467 +#: config.c:2468 #, c-format msgid "Invalid %s: '%s'" msgstr "Geçersiz %s: '%s'" -#: config.c:2512 +#: config.c:2513 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange değeri '%d' 0 ve 100 arasında olmalı" -#: config.c:2558 +#: config.c:2559 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "'%s' komut satırı yapılandırmasından ayrıştırılamıyor" -#: config.c:2560 +#: config.c:2561 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "hatalı yapılandırma değişkeni '%s', '%s' dosyası %d. satırda" -#: config.c:2644 +#: config.c:2645 #, c-format msgid "invalid section name '%s'" msgstr "geçersiz bölüm adı '%s'" -#: config.c:2676 +#: config.c:2677 #, c-format msgid "%s has multiple values" msgstr "%s birden çok değere iye" -#: config.c:2705 +#: config.c:2706 #, c-format msgid "failed to write new configuration file %s" msgstr "yeni yapılandırma dosyası %s yazılamadı" -#: config.c:2957 config.c:3283 +#: config.c:2958 config.c:3285 #, c-format msgid "could not lock config file %s" msgstr "%s yapılandırma dosyası kilitlenemedi" -#: config.c:2968 +#: config.c:2969 #, c-format msgid "opening %s" msgstr "%s açılıyor" -#: config.c:3005 builtin/config.c:361 +#: config.c:3006 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "geçersiz dizgi: %s" -#: config.c:3030 +#: config.c:3031 #, c-format msgid "invalid config file %s" msgstr "geçersiz yapılandırma dosyası %s" -#: config.c:3043 config.c:3296 +#: config.c:3044 config.c:3298 #, c-format msgid "fstat on %s failed" msgstr "%s üzerinde fstat başarısız oldu" -#: config.c:3054 +#: config.c:3055 #, c-format -msgid "unable to mmap '%s'" -msgstr "'%s' mmap yapılamıyor" +msgid "unable to mmap '%s'%s" +msgstr "'%s'%s mmap yapılamıyor" -#: config.c:3063 config.c:3301 +#: config.c:3065 config.c:3303 #, c-format msgid "chmod on %s failed" msgstr "%s üzerinde chmod başarısız oldu" -#: config.c:3148 config.c:3398 +#: config.c:3150 config.c:3400 #, c-format msgid "could not write config file %s" msgstr "%s yapılandırma dosyası yazılamadı" -#: config.c:3182 +#: config.c:3184 #, c-format msgid "could not set '%s' to '%s'" msgstr "'%s', '%s' olarak ayarlanamadı" -#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "'%s' ayarı kapatılamadı" -#: config.c:3274 +#: config.c:3276 #, c-format msgid "invalid section name: %s" msgstr "geçersiz bölüm adı: %s" -#: config.c:3441 +#: config.c:3443 #, c-format msgid "missing value for '%s'" msgstr "'%s' için değer eksik" @@ -3055,7 +3056,7 @@ msgstr "garip yol adı '%s' engellendi" msgid "unable to fork" msgstr "çatallanamıyor" -#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Bağlantı denetleniyor" @@ -3320,36 +3321,36 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "%d delta adası imlendi, bitti.\n" -#: diff-merges.c:80 +#: diff-merges.c:70 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "--diff-merges için bilinmeyen değer: %s" -#: diff-lib.c:538 +#: diff-lib.c:557 msgid "--merge-base does not work with ranges" msgstr "--merge-base erimlerle çalışmaz" -#: diff-lib.c:540 +#: diff-lib.c:559 msgid "--merge-base only works with commits" msgstr "--merge-base yalnızca işlemelerle çalışır" -#: diff-lib.c:557 +#: diff-lib.c:576 msgid "unable to get HEAD" msgstr "HEAD alınamıyor" -#: diff-lib.c:564 +#: diff-lib.c:583 msgid "no merge base found" msgstr "bir birleştirme temeli bulunamadı" -#: diff-lib.c:566 +#: diff-lib.c:585 msgid "multiple merge bases found" msgstr "birden çok birleştirme temeli bulundu" -#: diff-no-index.c:238 +#: diff-no-index.c:237 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<seçenekler>] <yol> <yol>" -#: diff-no-index.c:263 +#: diff-no-index.c:262 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" @@ -3406,35 +3407,49 @@ msgstr "" "'diff.dirstat' yapılandırma değişkeninde hatalar bulundu:\n" "%s" -#: diff.c:4278 +#: diff.c:4282 #, c-format msgid "external diff died, stopping at %s" msgstr "dış diff sonlandı, %s konumunda durdu" -#: diff.c:4630 +#: diff.c:4634 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check ve -s birlikte kullanılmaz" -#: diff.c:4633 +#: diff.c:4637 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S ve --find-object birlikte kullanılmaz" -#: diff.c:4712 +#: diff.c:4640 +msgid "" +"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" +msgstr "" +"-G ve --pickaxe-regex birlikte kullanılamaz, --pickaxe-regex'i -S ile kullanın" + +#: diff.c:4643 +msgid "" +"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +"with -G and -S" +msgstr "" +"--pickaxe-all ve --find-object birlikte kullanılamaz, --pickaxe-all'u -G ve " +"-S ile kullanın" + +#: diff.c:4722 msgid "--follow requires exactly one pathspec" msgstr "--follow tam olarak yalnızca bir yol belirteci gerektiriyor" -#: diff.c:4760 +#: diff.c:4770 #, c-format msgid "invalid --stat value: %s" msgstr "geçersiz --stat değeri: %s" -#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 +#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s bir sayısal değer bekliyor" -#: diff.c:4797 +#: diff.c:4807 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3443,42 +3458,42 @@ msgstr "" "--dirstat/-X seçenek parametresi ayrıştırılamadı:\n" "%s" -#: diff.c:4882 +#: diff.c:4892 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "şurada bilinmeyen değişiklik sınıfı '%c': -diff-filter=%s" -#: diff.c:4906 +#: diff.c:4916 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "şundan sonra bilinmeyen değer: ws-error-highlight=%.*s" -#: diff.c:4920 +#: diff.c:4930 #, c-format msgid "unable to resolve '%s'" msgstr "'%s' çözülemiyor" -#: diff.c:4970 diff.c:4976 +#: diff.c:4980 diff.c:4986 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s <n>/<m> biçimi bekliyor" -#: diff.c:4988 +#: diff.c:4998 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s bir karakter bekliyor, '%s' aldı" -#: diff.c:5009 +#: diff.c:5019 #, c-format msgid "bad --color-moved argument: %s" msgstr "hatalı --color-moved argümanı: %s" -#: diff.c:5028 +#: diff.c:5038 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws içinde geçersiz kip '%s'" -#: diff.c:5068 +#: diff.c:5078 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3486,162 +3501,162 @@ msgstr "" "diff-algorithm seçeneği şunları kabul eder: \"myers\", \"minimal\", " "\"patience\" ve \"histogram\"" -#: diff.c:5104 diff.c:5124 +#: diff.c:5114 diff.c:5134 #, c-format msgid "invalid argument to %s" msgstr "%s için geçersiz argüman" -#: diff.c:5228 +#: diff.c:5238 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "-I'ya geçersiz düzenli ifade verildi: '%s'" -#: diff.c:5277 +#: diff.c:5287 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "--submodule seçenek parametresi ayrıştırılamadı: '%s'" -#: diff.c:5333 +#: diff.c:5343 #, c-format msgid "bad --word-diff argument: %s" msgstr "hatalı --word-diff argümanı: %s" -#: diff.c:5369 +#: diff.c:5379 msgid "Diff output format options" msgstr "Diff çıktısı biçimlendirme seçenekleri" -#: diff.c:5371 diff.c:5377 +#: diff.c:5381 diff.c:5387 msgid "generate patch" msgstr "yama oluştur" -#: diff.c:5374 builtin/log.c:179 +#: diff.c:5384 builtin/log.c:179 msgid "suppress diff output" msgstr "diff çıktısını gizle" -#: diff.c:5379 diff.c:5493 diff.c:5500 +#: diff.c:5389 diff.c:5503 diff.c:5510 msgid "<n>" msgstr "<n>" -#: diff.c:5380 diff.c:5383 +#: diff.c:5390 diff.c:5393 msgid "generate diffs with <n> lines context" msgstr "diff'leri <n> satır bağlamlı oluştur" -#: diff.c:5385 +#: diff.c:5395 msgid "generate the diff in raw format" msgstr "diff'i ham biçimde oluştur" -#: diff.c:5388 +#: diff.c:5398 msgid "synonym for '-p --raw'" msgstr "'-p --raw eşanlamlısı" -#: diff.c:5392 +#: diff.c:5402 msgid "synonym for '-p --stat'" msgstr "'-p --stat eşanlamlısı" -#: diff.c:5396 +#: diff.c:5406 msgid "machine friendly --stat" msgstr "makinede okunabilen --stat" -#: diff.c:5399 +#: diff.c:5409 msgid "output only the last line of --stat" msgstr "--stat'ın yalnızca son satırını çıktı ver" -#: diff.c:5401 diff.c:5409 +#: diff.c:5411 diff.c:5419 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5402 +#: diff.c:5412 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "her alt dizin için göreceli bir miktar değişikliğin dağıtımını çıktı ver" -#: diff.c:5406 +#: diff.c:5416 msgid "synonym for --dirstat=cumulative" msgstr "--dirstat-cumulative eşanlamlısı" -#: diff.c:5410 +#: diff.c:5420 msgid "synonym for --dirstat=files,param1,param2..." msgstr "--dirstat=files,param1,param2... eşanlamlısı" -#: diff.c:5414 +#: diff.c:5424 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "değişiklikler çakışma imleyicileri veya boşluk hataları doğuruyorsa uyar" -#: diff.c:5417 +#: diff.c:5427 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "sıkışık özet; örn. oluşumlar, yeniden adlandırmalar ve kip değişiklikleri" -#: diff.c:5420 +#: diff.c:5430 msgid "show only names of changed files" msgstr "yalnızca değiştirilen dosyaların adlarını göster" -#: diff.c:5423 +#: diff.c:5433 msgid "show only names and status of changed files" msgstr "yalnızca değiştirilen dosyaların adlarını ve durumlarını göster" -#: diff.c:5425 +#: diff.c:5435 msgid "<width>[,<name-width>[,<count>]]" msgstr "<genişlik>[,<ad-genişlik>[,<sayım>]]" -#: diff.c:5426 +#: diff.c:5436 msgid "generate diffstat" msgstr "diffstat oluştur" -#: diff.c:5428 diff.c:5431 diff.c:5434 +#: diff.c:5438 diff.c:5441 diff.c:5444 msgid "<width>" msgstr "<genişlik>" -#: diff.c:5429 +#: diff.c:5439 msgid "generate diffstat with a given width" msgstr "diffstat'ı verilmiş bir genişlik ile oluştur" -#: diff.c:5432 +#: diff.c:5442 msgid "generate diffstat with a given name width" msgstr "diffstat'ı verilmiş bir ad genişliği ile oluştur" -#: diff.c:5435 +#: diff.c:5445 msgid "generate diffstat with a given graph width" msgstr "diffstat'ı verilmiş bir grafik genişliği ile oluştur" -#: diff.c:5437 +#: diff.c:5447 msgid "<count>" msgstr "<sayım>" -#: diff.c:5438 +#: diff.c:5448 msgid "generate diffstat with limited lines" msgstr "diffstat'ı kısıtlı satırlarla oluştur" -#: diff.c:5441 +#: diff.c:5451 msgid "generate compact summary in diffstat" msgstr "diffstat içinde ufak özet oluştur" -#: diff.c:5444 +#: diff.c:5454 msgid "output a binary diff that can be applied" msgstr "uygulanabilir bir ikili diff çıktısı ver" -#: diff.c:5447 +#: diff.c:5457 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "\"index\" satırlarında tam ön ve songörüntü nesne adlarını göster" -#: diff.c:5449 +#: diff.c:5459 msgid "show colored diff" msgstr "renkli diff göster" -#: diff.c:5450 +#: diff.c:5460 msgid "<kind>" msgstr "<çeşit>" -#: diff.c:5451 +#: diff.c:5461 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" "diff'teki boşluk hatalarını 'context', 'old' veya 'new' satırlarında vurgula" -#: diff.c:5454 +#: diff.c:5464 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3649,88 +3664,88 @@ msgstr "" "--raw veya --numstat içinde yol adlarını tahrip etme ve çıktı alanı " "sonlandırıcıları olarak NUL'ları kullan" -#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572 +#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582 msgid "<prefix>" msgstr "<önek>" -#: diff.c:5458 +#: diff.c:5468 msgid "show the given source prefix instead of \"a/\"" msgstr "\"a/\" yerine verilmiş kaynak önekini göster" -#: diff.c:5461 +#: diff.c:5471 msgid "show the given destination prefix instead of \"b/\"" msgstr "\"b/\"yerine verilmiş kaynak önekini göster" -#: diff.c:5464 +#: diff.c:5474 msgid "prepend an additional prefix to every line of output" msgstr "çıktının her satırının başına ek bir önek ekle" -#: diff.c:5467 +#: diff.c:5477 msgid "do not show any source or destination prefix" msgstr "hiçbir kaynak ve hedef önekini gösterme" -#: diff.c:5470 +#: diff.c:5480 msgid "show context between diff hunks up to the specified number of lines" msgstr "diff parçaları arasındaki bağlamı belirtilen satır sayısı kadar göster" -#: diff.c:5474 diff.c:5479 diff.c:5484 +#: diff.c:5484 diff.c:5489 diff.c:5494 msgid "<char>" msgstr "<karakter>" -#: diff.c:5475 +#: diff.c:5485 msgid "specify the character to indicate a new line instead of '+'" msgstr "yeni satırı belirtmek için '+' yerine kullanılacak karakteri belirle" -#: diff.c:5480 +#: diff.c:5490 msgid "specify the character to indicate an old line instead of '-'" msgstr "eski satırı belirtmek için '-' yerine kullanılacak karakteri belirle" -#: diff.c:5485 +#: diff.c:5495 msgid "specify the character to indicate a context instead of ' '" msgstr "bağlam belirtmek için ' ' yerine kullanılacak karakteri belirle" -#: diff.c:5488 +#: diff.c:5498 msgid "Diff rename options" msgstr "Diff yeniden adlandırma seçenekleri" -#: diff.c:5489 +#: diff.c:5499 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5490 +#: diff.c:5500 msgid "break complete rewrite changes into pairs of delete and create" msgstr "tam yeniden yazım değişikliklerini silme ve oluşturma olarak ayır" -#: diff.c:5494 +#: diff.c:5504 msgid "detect renames" msgstr "yeniden adlandırmaları algıla" -#: diff.c:5498 +#: diff.c:5508 msgid "omit the preimage for deletes" msgstr "silmeler için öngörüntüyü atla" -#: diff.c:5501 +#: diff.c:5511 msgid "detect copies" msgstr "kopyaları algıla" -#: diff.c:5505 +#: diff.c:5515 msgid "use unmodified files as source to find copies" msgstr "değiştirilmemiş dosyaları kopyaları bulmak için kaynak olarak kullan" -#: diff.c:5507 +#: diff.c:5517 msgid "disable rename detection" msgstr "yeniden adlandırma algılamasını devre dışı bırak" -#: diff.c:5510 +#: diff.c:5520 msgid "use empty blobs as rename source" msgstr "boş ikili nesneleri yeniden adlandırma kaynağı olarak kullan" -#: diff.c:5512 +#: diff.c:5522 msgid "continue listing the history of a file beyond renames" msgstr "" "bir dosyanın geçmişini listelemeyi yeniden adlandırmaların ötesinde sürdür" -#: diff.c:5515 +#: diff.c:5525 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3738,234 +3753,233 @@ msgstr "" "eğer yeniden adlandırma/kopyalama hedeflerinin sayısı verilen sınırı aşarsa " "yeniden adlandırma/kopyalama algılamasını önle" -#: diff.c:5517 +#: diff.c:5527 msgid "Diff algorithm options" msgstr "Diff algoritma seçenekleri" -#: diff.c:5519 +#: diff.c:5529 msgid "produce the smallest possible diff" msgstr "olabilecek en küçük diff'i üret" -#: diff.c:5522 +#: diff.c:5532 msgid "ignore whitespace when comparing lines" msgstr "satırları karşılaştırırken boşlukları yok say" -#: diff.c:5525 +#: diff.c:5535 msgid "ignore changes in amount of whitespace" msgstr "boşluk sayısındaki değişiklikleri yok say" -#: diff.c:5528 +#: diff.c:5538 msgid "ignore changes in whitespace at EOL" msgstr "satır sonundaki boşluk değişikliklerini yok say" -#: diff.c:5531 +#: diff.c:5541 msgid "ignore carrier-return at the end of line" msgstr "satır sonundaki satırbaşı karakterini yok say" -#: diff.c:5534 +#: diff.c:5544 msgid "ignore changes whose lines are all blank" msgstr "satırlarının tümü boş olan değişiklikleri yok say" -#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606 +#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616 msgid "<regex>" msgstr "<ifade>" -#: diff.c:5537 +#: diff.c:5547 msgid "ignore changes whose all lines match <regex>" msgstr "satırlarının tümü <ifade> ile eşleşen değişiklikleri yok say" -#: diff.c:5540 +#: diff.c:5550 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "diff parça sınırlarını kolay okuma için bulgusal olarak kaydır" -#: diff.c:5543 +#: diff.c:5553 msgid "generate diff using the \"patience diff\" algorithm" msgstr "diff'i \"patience diff\" algoritmasını kullanarak oluştur" -#: diff.c:5547 +#: diff.c:5557 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "diff'i \"histogram diff\" algoritmasını kullanarak oluştur" -#: diff.c:5549 +#: diff.c:5559 msgid "<algorithm>" msgstr "<algoritma>" -#: diff.c:5550 +#: diff.c:5560 msgid "choose a diff algorithm" msgstr "bir diff algoritması seç" -#: diff.c:5552 +#: diff.c:5562 msgid "<text>" msgstr "<metin>" -#: diff.c:5553 +#: diff.c:5563 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "diff'i \"anchored diff\" algoritmasını kullanarak oluştur" -#: diff.c:5555 diff.c:5564 diff.c:5567 +#: diff.c:5565 diff.c:5574 diff.c:5577 msgid "<mode>" msgstr "<kip>" -#: diff.c:5556 +#: diff.c:5566 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "sözcük diff'ini değiştirilen sözcükleri sınırlandırmak için <kip> kullanarak " "göster" -#: diff.c:5559 +#: diff.c:5569 msgid "use <regex> to decide what a word is" msgstr "bir sözcüğün ne olduğuna karar vermek için <ifade> kullan" -#: diff.c:5562 +#: diff.c:5572 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "şuna eşdeğer: --word-diff=color --word-diff-regex=<ifade>" -#: diff.c:5565 +#: diff.c:5575 msgid "moved lines of code are colored differently" msgstr "taşınan kod satırları farklı renklendirilir" -#: diff.c:5568 +#: diff.c:5578 msgid "how white spaces are ignored in --color-moved" msgstr "boşluklar --color-moved içinde nasıl yok sayılır" -#: diff.c:5571 +#: diff.c:5581 msgid "Other diff options" msgstr "Diğer diff seçenekleri" -#: diff.c:5573 +#: diff.c:5583 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "altdizinden çalıştırıldığında dışarıdaki değişiklikleri hariç tut ve " "göreceli yolları göster" -#: diff.c:5577 +#: diff.c:5587 msgid "treat all files as text" msgstr "tüm dosyaları metin olarak varsay" -#: diff.c:5579 +#: diff.c:5589 msgid "swap two inputs, reverse the diff" msgstr "iki girdiyi değiştir, diff'i tersine döndür" -#: diff.c:5581 +#: diff.c:5591 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "ayrımlar varsa 1 ile, yoksa 0 ile çık" -#: diff.c:5583 +#: diff.c:5593 msgid "disable all output of the program" msgstr "tüm program çıktısını devre dışı bırak" -#: diff.c:5585 +#: diff.c:5595 msgid "allow an external diff helper to be executed" msgstr "bir dış diff yardımcısının çalıştırılmasına izin ver" -#: diff.c:5587 +#: diff.c:5597 msgid "run external text conversion filters when comparing binary files" msgstr "" "ikili dosyaları karşılaştırırken dış metin dönüştürme süzgeçlerini çalıştır" -#: diff.c:5589 +#: diff.c:5599 msgid "<when>" msgstr "<ne-zaman>" -#: diff.c:5590 +#: diff.c:5600 msgid "ignore changes to submodules in the diff generation" msgstr "diff oluştururken altmodüllere olan değişiklikleri yok say" -#: diff.c:5593 +#: diff.c:5603 msgid "<format>" msgstr "<biçim>" -#: diff.c:5594 +#: diff.c:5604 msgid "specify how differences in submodules are shown" msgstr "altmodüllerdeki değişikliklerin nasıl gösterileceğini belirt" -#: diff.c:5598 +#: diff.c:5608 msgid "hide 'git add -N' entries from the index" msgstr "indeksten 'git add -N' girdilerini gizle" -#: diff.c:5601 +#: diff.c:5611 msgid "treat 'git add -N' entries as real in the index" msgstr "indekste 'git add -N' girdilerine gerçekmiş gibi davran" -#: diff.c:5603 +#: diff.c:5613 msgid "<string>" msgstr "<dizi>" -#: diff.c:5604 +#: diff.c:5614 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "belirtilen dizinin görülme sayısını değiştiren ayrımlara bak" -#: diff.c:5607 +#: diff.c:5617 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "belirtilen düzenli ifadenin görülme sayısını değiştiren ayrımlara bak" -#: diff.c:5610 +#: diff.c:5620 msgid "show all changes in the changeset with -S or -G" msgstr "değişiklik setinde -S veya -G içeren tüm değişiklikleri göster" -#: diff.c:5613 +#: diff.c:5623 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "-S içindeki <dizi>'yi genişletilmiş POSIX düzenli ifadesi olarak işle" -#: diff.c:5616 +#: diff.c:5626 msgid "control the order in which files appear in the output" msgstr "dosyaların çıktıda hangi sırayla görüneceğini denetle" -#: diff.c:5617 diff.c:5620 +#: diff.c:5627 diff.c:5630 msgid "<path>" msgstr "<yol>" -#: diff.c:5618 +#: diff.c:5628 msgid "show the change in the specified path first" msgstr "öncelikle belirtilen yoldaki değişikliği göster" -#: diff.c:5621 +#: diff.c:5631 msgid "skip the output to the specified path" msgstr "belirtilen yola olan çıktıyı atla" -#: diff.c:5623 +#: diff.c:5633 msgid "<object-id>" msgstr "<nesne-no>" -#: diff.c:5624 +#: diff.c:5634 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "belirtilen nesnenin görülme sayısını değiştiren ayrımlara bak" -#: diff.c:5626 +#: diff.c:5636 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5627 +#: diff.c:5637 msgid "select files by diff type" msgstr "dosyaları diff türüne göre seç" -#: diff.c:5629 +#: diff.c:5639 msgid "<file>" msgstr "<dosya>" -#: diff.c:5630 +#: diff.c:5640 msgid "Output to a specific file" msgstr "belirli bir dosyaya çıktı ver" -#: diff.c:6287 -msgid "inexact rename detection was skipped due to too many files." -msgstr "" -"Kesin olmayan yeniden adlandırma algılaması çok fazla dosya olmasından " -"dolayı atlandı." +#: diff.c:6298 +msgid "exhaustive rename detection was skipped due to too many files." +msgstr "Geniş kapsamlı yeniden adlandırma algılaması çok fazla dosya " +"olmasından dolayı atlandı." -#: diff.c:6290 +#: diff.c:6301 msgid "only found copies from modified paths due to too many files." msgstr "" "Çok fazla dosya olmasından dolayı yalnızca değiştirilen yollardan kopyalar " "bulundu." -#: diff.c:6293 +#: diff.c:6304 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3978,7 +3992,7 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "orderfile '%s' okunamadı" -#: diffcore-rename.c:1418 +#: diffcore-rename.c:1510 msgid "Performing inexact rename detection" msgstr "Kesin olmayan yeniden adlandırma algılaması gerçekleştiriliyor" @@ -3987,59 +4001,59 @@ msgstr "Kesin olmayan yeniden adlandırma algılaması gerçekleştiriliyor" msgid "No such path '%s' in the diff" msgstr "diff'te '%s' diye bir yol yok" -#: dir.c:578 +#: dir.c:593 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "yol belirteci '%s' git'in tanıdığı herhangi bir dosya ile eşleşmedi" -#: dir.c:718 dir.c:747 dir.c:760 +#: dir.c:733 dir.c:762 dir.c:775 #, c-format msgid "unrecognized pattern: '%s'" msgstr "tanımlanamayan dizgi: '%s'" -#: dir.c:777 dir.c:791 +#: dir.c:792 dir.c:806 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "tanımlanamayan negatif dizgi: '%s'" -#: dir.c:809 +#: dir.c:824 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "sparse-checkout dosyanızın sorunları olabilir: '%s' dizgisi yinelenmiş" -#: dir.c:819 +#: dir.c:834 msgid "disabling cone pattern matching" msgstr "koni dizgi eşleşmesi devre dışı bırakılıyor" -#: dir.c:1206 +#: dir.c:1221 #, c-format msgid "cannot use %s as an exclude file" msgstr "%s bir 'exclude' dosyası olarak kullanılamıyor" -#: dir.c:2314 +#: dir.c:2358 #, c-format msgid "could not open directory '%s'" msgstr "'%s' dizini açılamadı" -#: dir.c:2614 +#: dir.c:2660 msgid "failed to get kernel name and information" msgstr "çekirdek adı ve bilgisi alınamadı" -#: dir.c:2738 +#: dir.c:2784 msgid "untracked cache is disabled on this system or location" msgstr "izlenmeyen önbellek bu sistemde veya konumda devre dışı bırakılmış" -#: dir.c:3543 +#: dir.c:3617 #, c-format msgid "index file corrupt in repo %s" msgstr "%s deposundaki indeks dosyası hasarlı" -#: dir.c:3590 dir.c:3595 +#: dir.c:3664 dir.c:3669 #, c-format msgid "could not create directories for %s" msgstr "%s için dizinler oluşturulamadı" -#: dir.c:3624 +#: dir.c:3698 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "git dizini '%s' konumundan '%s' konumuna göç ettirilemedi" @@ -4049,11 +4063,11 @@ msgstr "git dizini '%s' konumundan '%s' konumuna göç ettirilemedi" msgid "hint: Waiting for your editor to close the file...%c" msgstr "İpucu: Düzenleyicinizin dosyayı kapatması bekleniyor...%c" -#: entry.c:179 +#: entry.c:176 msgid "Filtering content" msgstr "İçerik süzülüyor" -#: entry.c:500 +#: entry.c:497 #, c-format msgid "could not stat file '%s'" msgstr "'%s' dosyasının bilgileri alınamadı" @@ -4228,7 +4242,7 @@ msgstr "ortak işleme yok" msgid "source repository is shallow, reject to clone." msgstr "kaynak depo sığ, klonlama için reddet" -#: fetch-pack.c:1128 fetch-pack.c:1651 +#: fetch-pack.c:1128 fetch-pack.c:1660 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: getirme başarısız" @@ -4250,7 +4264,7 @@ msgstr "Sunucu sığ istekleri desteklemiyor" msgid "Server supports filter" msgstr "Sunucu süzgeç destekliyor" -#: fetch-pack.c:1329 fetch-pack.c:2034 +#: fetch-pack.c:1329 fetch-pack.c:2043 msgid "unable to write request to remote" msgstr "uzak konuma istek yazılamıyor" @@ -4306,24 +4320,24 @@ msgstr "aranan başvurular işlenirken hata: %d" msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: yanıt sonu paketi bekleniyordu" -#: fetch-pack.c:1930 +#: fetch-pack.c:1939 msgid "no matching remote head" msgstr "eşleşen uzak dal ucu yok" -#: fetch-pack.c:1953 builtin/clone.c:697 +#: fetch-pack.c:1962 builtin/clone.c:697 msgid "remote did not send all necessary objects" msgstr "uzak konum gereken tüm nesneleri göndermedi" -#: fetch-pack.c:2056 +#: fetch-pack.c:2065 msgid "unexpected 'ready' from remote" msgstr "uzak konumdan beklenmedik 'ready'" -#: fetch-pack.c:2079 +#: fetch-pack.c:2088 #, c-format msgid "no such remote ref %s" msgstr "böyle bir uzak başvuru yok: %s" -#: fetch-pack.c:2082 +#: fetch-pack.c:2091 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Sunucu %s tanıtılmamış nesnesi için isteğe izin vermiyor" @@ -4343,8 +4357,8 @@ msgstr "gpg veriyi imzalayamadı" #: graph.c:98 #, c-format -msgid "ignore invalid color '%.*s' in log.graphColors" -msgstr "log.graphColors içindeki '%.*s' geçersiz rengini yok say" +msgid "ignored invalid color '%.*s' in log.graphColors" +msgstr "log.graphColors içindeki '%.*s' geçersiz renk yok sayıldı" #: grep.c:531 msgid "" @@ -4354,18 +4368,18 @@ msgstr "" "verilen dizgi NULL baytı içeriyor (-f <dosya> aracılığıyla). Bu yalnızca " "PCRE v2 altında -P ile desteklenir" -#: grep.c:1893 +#: grep.c:1895 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': %s okunamıyor" -#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 #: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "'%s' dosyasının bilgileri alınamadı" -#: grep.c:1921 +#: grep.c:1923 #, c-format msgid "'%s': short read" msgstr "'%s': kısa okuma" @@ -4606,7 +4620,7 @@ msgstr "sparse:path süzgeçleri desteği artık yok" #: list-objects-filter-options.c:105 #, c-format -msgid "'%s' for 'object:type=<type>' isnot a valid object type" +msgid "'%s' for 'object:type=<type>' is not a valid object type" msgstr "'object:type=<tür>' için '%s' geçerli bir nesne türü değil" #: list-objects-filter-options.c:124 @@ -4653,7 +4667,7 @@ msgstr "" "'%s' girdisi (%s ağacında) ikili nesne kipine iye; ancak bir ikili geniş " "nesne değil" -#: list-objects.c:395 +#: list-objects.c:398 #, c-format msgid "unable to load root tree for commit %s" msgstr "%s işlemesi için kök ağacı yüklenemiyor" @@ -4700,32 +4714,32 @@ msgstr "alıntılanmış CRLF algılandı" msgid "bad action '%s' for '%s'" msgstr "hatalı eylem '%s', '%s' için" -#: merge-ort.c:1116 merge-recursive.c:1205 +#: merge-ort.c:1228 merge-recursive.c:1206 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "%s altmodülü birleştirilemedi (çıkış yapılmadı)" -#: merge-ort.c:1125 merge-recursive.c:1212 +#: merge-ort.c:1237 merge-recursive.c:1213 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "%s altmodülü birleştirilemedi (işlemeler mevcut değil)" -#: merge-ort.c:1134 merge-recursive.c:1219 +#: merge-ort.c:1246 merge-recursive.c:1220 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "%s altmodülü birleştirilemedi (işlemeler merge-base'i takip etmiyor)" -#: merge-ort.c:1144 merge-ort.c:1151 +#: merge-ort.c:1256 merge-ort.c:1263 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "Not: %s altmodülü %s yönüne ileri sarılıyor" -#: merge-ort.c:1172 +#: merge-ort.c:1284 #, c-format msgid "Failed to merge submodule %s" msgstr "'%s' altmodülünü birleştirilemedi" -#: merge-ort.c:1179 +#: merge-ort.c:1291 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4734,7 +4748,7 @@ msgstr "" "%s altmodülü birleştirilemedi; ancak olası bir birleştirme çözümü mevcut:\n" "%s\n" -#: merge-ort.c:1183 merge-recursive.c:1273 +#: merge-ort.c:1295 merge-recursive.c:1274 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4750,7 +4764,7 @@ msgstr "" "\n" "komutu bu öneriyi kabul edecektir.\n" -#: merge-ort.c:1196 +#: merge-ort.c:1308 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4760,21 +4774,21 @@ msgstr "" "mevcut:\n" "%s" -#: merge-ort.c:1415 merge-recursive.c:1362 +#: merge-ort.c:1527 merge-recursive.c:1363 msgid "Failed to execute internal merge" msgstr "İç birleştirme çalıştırılamadı" -#: merge-ort.c:1420 merge-recursive.c:1367 +#: merge-ort.c:1532 merge-recursive.c:1368 #, c-format msgid "Unable to add %s to database" msgstr "%s veritabanına eklenemedi" -#: merge-ort.c:1427 merge-recursive.c:1400 +#: merge-ort.c:1539 merge-recursive.c:1401 #, c-format msgid "Auto-merging %s" msgstr "%s kendiliğinden birleştiriliyor" -#: merge-ort.c:1566 merge-recursive.c:2122 +#: merge-ort.c:1678 merge-recursive.c:2123 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4784,7 +4798,7 @@ msgstr "" "örtülü yeniden adlandırmanın aşağıdaki yolları oraya koymasına engel oluyor: " "%s." -#: merge-ort.c:1576 merge-recursive.c:2132 +#: merge-ort.c:1688 merge-recursive.c:2133 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4794,7 +4808,7 @@ msgstr "" "eşlemlenemiyor; örtülü dizin yeniden adlandırmaları aşağıdaki yolları oraya " "koymayı denedi: %s." -#: merge-ort.c:1634 +#: merge-ort.c:1746 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4805,7 +4819,7 @@ msgstr "" "adlandırılacağı belirsiz; herhangi bir hedef dosyaların çoğunu almadan " "birden çok başka dizine yeniden adlandırılmıştı." -#: merge-ort.c:1788 merge-recursive.c:2468 +#: merge-ort.c:1900 merge-recursive.c:2469 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4814,7 +4828,7 @@ msgstr "" "UYARI: %s -> %s yeniden adlandırmasını %s ögesine uygulamadan kaçınılıyor, " "çünkü %s ögesinin kendisi yeniden adlandırıldı." -#: merge-ort.c:1932 merge-recursive.c:3244 +#: merge-ort.c:2044 merge-recursive.c:3252 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4823,7 +4837,7 @@ msgstr "" "Yol güncellendi: %s, (%s içinde eklenen) %s içinde yeniden adlandırılan bir " "dizinde; onu %s konumuna taşıdı." -#: merge-ort.c:1939 merge-recursive.c:3251 +#: merge-ort.c:2051 merge-recursive.c:3259 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4832,7 +4846,7 @@ msgstr "" "Yol güncellendi: %s, %s olarak yeniden adlandırıldı (%s içinde), %s içinde " "yeniden adlandırılan bir dizinde; onu %s konumuna taşıdı." -#: merge-ort.c:1952 merge-recursive.c:3247 +#: merge-ort.c:2064 merge-recursive.c:3255 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4841,7 +4855,7 @@ msgstr "" "ÇAKIŞMA (dosya konumu): %s, (%s içinde eklenen) %s içinde yeniden " "adlandırılan bir dizinde, belki de %s konumuna taşınmalı." -#: merge-ort.c:1960 merge-recursive.c:3254 +#: merge-ort.c:2072 merge-recursive.c:3262 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4850,14 +4864,14 @@ msgstr "" "ÇAKIŞMA (dosya konumu): %s, %s olarak yeniden adlandırıldı (%s içinde), %s " "içinde yeniden adlandırılan bir dizinde, belki de %s konumuna taşınmalı." -#: merge-ort.c:2103 +#: merge-ort.c:2228 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "ÇAKIŞMA (y. adlandır/y. adlandır): %s->%s olarak adlandırıldı (%s içinde) ve " "ek olarak %s olarak da adlandırıldı (%s içinde)." -#: merge-ort.c:2198 +#: merge-ort.c:2323 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4868,24 +4882,24 @@ msgstr "" "içerik çakışmaları var ve başka bir yolla çarpışıyor; bu iç içe geçmiş " "çakışmaimleyicilerine neden olabilir." -#: merge-ort.c:2217 merge-ort.c:2241 +#: merge-ort.c:2342 merge-ort.c:2366 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" "ÇAKIŞMA (yeniden adlandır/sil): %s->%s olarak adlandırıldı (%s içinde); " "ancak %s içinde silindi." -#: merge-ort.c:2550 merge-recursive.c:3002 +#: merge-ort.c:2819 merge-recursive.c:3013 #, c-format msgid "cannot read object %s" msgstr "%s nesnesi okunamıyor" -#: merge-ort.c:2553 merge-recursive.c:3005 +#: merge-ort.c:2822 merge-recursive.c:3016 #, c-format msgid "object %s is not a blob" msgstr "%s nesnesi ikili bir nesne değil" -#: merge-ort.c:2981 +#: merge-ort.c:3250 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " @@ -4894,7 +4908,7 @@ msgstr "" "ÇAKIŞMA (dosya/dizin): Dizin, şuradan %s yolunda: %s; bunun yerine %s " "konumuna taşınıyor." -#: merge-ort.c:3055 +#: merge-ort.c:3326 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " @@ -4904,7 +4918,7 @@ msgstr "" "ikisi de yeniden adlandırıldı; böylelikle başka bir yerde kayıtları " "yazılabilir." -#: merge-ort.c:3062 +#: merge-ort.c:3333 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " @@ -4914,24 +4928,24 @@ msgstr "" "bir tanesi yeniden adlandırıldı; böylelikle her birinin başka bir yerde " "kayıtları yazılabilir." -#: merge-ort.c:3162 merge-recursive.c:3081 +#: merge-ort.c:3433 merge-recursive.c:3092 msgid "content" msgstr "içerik" -#: merge-ort.c:3164 merge-recursive.c:3085 +#: merge-ort.c:3435 merge-recursive.c:3096 msgid "add/add" msgstr "ekle/ekle" -#: merge-ort.c:3166 merge-recursive.c:3130 +#: merge-ort.c:3437 merge-recursive.c:3141 msgid "submodule" msgstr "altmodül" -#: merge-ort.c:3168 merge-recursive.c:3131 +#: merge-ort.c:3439 merge-recursive.c:3142 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "ÇAKIŞMA (%s): %s içinde birleştirme çakışması" -#: merge-ort.c:3198 +#: merge-ort.c:3470 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4940,24 +4954,24 @@ msgstr "" "ÇAKIŞMA (değiştir/sil): %s silindi (%s içinde) ve %s içinde değiştirildi. %s " "sürümü (şunun: %s) ağaçta bırakıldı." -#: merge-ort.c:3433 +#: merge-ort.c:3757 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " "copy renamed to %s" msgstr "" -"Not: %s güncel değil ve çakışmalı sürümlerin çıkışının önünde; eski kopya " -"%s olarak yeniden adlandırıldı." +"Not: %s güncel değil ve çakışmalı sürümlerin çıkışının önünde; eski kopya %s " +"olarak yeniden adlandırıldı." #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:3730 +#: merge-ort.c:4116 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "şu ağaçlar için birleştirme bilgisi toplama başarısız: %s, %s, %s" -#: merge-ort-wrappers.c:13 merge-recursive.c:3699 +#: merge-ort-wrappers.c:13 merge-recursive.c:3707 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4967,107 +4981,107 @@ msgstr "" "yazılacak:\n" "\t%s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402 +#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402 msgid "Already up to date." msgstr "Tümü güncel." -#: merge-recursive.c:356 +#: merge-recursive.c:357 msgid "(bad commit)\n" msgstr "(hatalı işleme)\n" -#: merge-recursive.c:379 +#: merge-recursive.c:380 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" "add_cacheinfo '%s' yolu için başarısız oldu; birleştirme iptal ediliyor." -#: merge-recursive.c:388 +#: merge-recursive.c:389 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo '%s' yolu için yenilenemedi; birleştirme iptal ediliyor." -#: merge-recursive.c:876 +#: merge-recursive.c:877 #, c-format msgid "failed to create path '%s'%s" msgstr "'%s'%s yolu oluşturulamadı" -#: merge-recursive.c:887 +#: merge-recursive.c:888 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Altdizine yer açmak için %s kaldırılıyor\n" -#: merge-recursive.c:901 merge-recursive.c:920 +#: merge-recursive.c:902 merge-recursive.c:921 msgid ": perhaps a D/F conflict?" msgstr ": bir D/F çakışması olabilir mi?" -#: merge-recursive.c:910 +#: merge-recursive.c:911 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "'%s' konumundaki izlenmeyen dosyayı kaybetme reddediliyor" -#: merge-recursive.c:951 builtin/cat-file.c:41 +#: merge-recursive.c:952 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "%s '%s' nesnesi okunamıyor" -#: merge-recursive.c:956 +#: merge-recursive.c:957 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' için ikili nesne bekleniyordu" -#: merge-recursive.c:981 +#: merge-recursive.c:982 #, c-format msgid "failed to open '%s': %s" msgstr "'%s' açılamadı: %s" -#: merge-recursive.c:992 +#: merge-recursive.c:993 #, c-format msgid "failed to symlink '%s': %s" msgstr "'%s' için sembolik bağ oluşturulamadı: %s" -#: merge-recursive.c:997 +#: merge-recursive.c:998 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "şununla ne yapılacağı bilinmiyor: %06o %s '%s'" -#: merge-recursive.c:1227 merge-recursive.c:1239 +#: merge-recursive.c:1228 merge-recursive.c:1240 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "%s altmodülü şu işlemeye ileri sarılıyor:" -#: merge-recursive.c:1230 merge-recursive.c:1242 +#: merge-recursive.c:1231 merge-recursive.c:1243 #, c-format msgid "Fast-forwarding submodule %s" msgstr "%s altmodülü ileri sarılıyor" -#: merge-recursive.c:1265 +#: merge-recursive.c:1266 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "%s altmodülü birleştirilemedi (işlemeleri takip eden birleştirme bulunamadı)" -#: merge-recursive.c:1269 +#: merge-recursive.c:1270 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "%s altmodülü birleştirilemedi (ileri sarım değil)" -#: merge-recursive.c:1270 +#: merge-recursive.c:1271 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Şu altmodül için olası bir birleştirme çözümü bulundu:\n" -#: merge-recursive.c:1282 +#: merge-recursive.c:1283 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "%s altmodülü birleştirilemedi (birden çok birleştirme bulundu)" -#: merge-recursive.c:1424 +#: merge-recursive.c:1425 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Hata: %s konumundaki izlenmeyen dosyayı kaybetme reddediliyor, bunun yerine " "%s konumuna yazılacak." -#: merge-recursive.c:1496 +#: merge-recursive.c:1497 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5076,7 +5090,7 @@ msgstr "" "ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s (%s içinde). %s (%s) sürümü " "ağaçta bırakıldı." -#: merge-recursive.c:1501 +#: merge-recursive.c:1502 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5085,7 +5099,7 @@ msgstr "" "ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s şuraya: %s (%s içinde). %s " "(%s) sürümü ağaçta bırakıldı." -#: merge-recursive.c:1508 +#: merge-recursive.c:1509 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5094,7 +5108,7 @@ msgstr "" "ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s (%s içinde). %s (%s) sürümü " "ağaçta %s konumunda bırakıldı." -#: merge-recursive.c:1513 +#: merge-recursive.c:1514 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5103,45 +5117,45 @@ msgstr "" "ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s şuraya: %s (%s içinde). %s " "(%s) sürümü ağaçta %s konumunda bırakıldı." -#: merge-recursive.c:1548 +#: merge-recursive.c:1549 msgid "rename" msgstr "yeniden adlandır" -#: merge-recursive.c:1548 +#: merge-recursive.c:1549 msgid "renamed" msgstr "yeniden adlandırıldı" -#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158 +#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "%s konumundaki kirli dosyayı kaybetme reddediliyor" -#: merge-recursive.c:1609 +#: merge-recursive.c:1610 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Engel olduğu halde %s konumundaki izlenmeyen dosyayı kaybetme reddediliyor." -#: merge-recursive.c:1667 +#: merge-recursive.c:1668 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "ÇAKIŞMA (yeniden adlandır/ekle): %s->%s olarak adlandırıldı (%s içinde). %s " "eklendi (%s içinde)." -#: merge-recursive.c:1698 +#: merge-recursive.c:1699 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s bir dizin (%s içinde), bunun yerine %s olarak ekleniyor" -#: merge-recursive.c:1703 +#: merge-recursive.c:1704 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "%s konumundaki izlenmeyen dosyayı kaybetme reddediliyor, bunun yerine %s " "olarak ekleniyor" -#: merge-recursive.c:1730 +#: merge-recursive.c:1731 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5150,18 +5164,18 @@ msgstr "" "ÇAKIŞMA (y. adlandır/y. adlandır): \"%s\"->\"%s\" olarak adlandır (\"%s\" " "dalında), \"%s\"->\"%s\" olarak adlandır (\"%s\"%s içinde)" -#: merge-recursive.c:1735 +#: merge-recursive.c:1736 msgid " (left unresolved)" msgstr " (çözülmeden bırakıldı)" -#: merge-recursive.c:1827 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "ÇAKIŞMA (y. adlandır/y. adlandır): %s->%s olarak adlandır (%s içinde). %s->" "%s olarak adlandır (%s içinde)" -#: merge-recursive.c:2090 +#: merge-recursive.c:2091 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5172,7 +5186,7 @@ msgstr "" "yerleştirileceği belirsiz; çünkü %s dizini birden çok başka dizine yeniden " "adlandırılırken hiçbir hedef dosyaların büyük çoğunluğunu almadı." -#: merge-recursive.c:2224 +#: merge-recursive.c:2225 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5181,79 +5195,79 @@ msgstr "" "ÇAKIŞMA (y. adlandır/y. adlandır): Dizini %s->%s olarak adlandır (%s " "içinde). Dizini %s->%s olarak adlandır (%s içinde)." -#: merge-recursive.c:3069 +#: merge-recursive.c:3080 msgid "modify" msgstr "değiştir" -#: merge-recursive.c:3069 +#: merge-recursive.c:3080 msgid "modified" msgstr "değiştirilmiş" -#: merge-recursive.c:3108 +#: merge-recursive.c:3119 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s atlandı (mevcut ile aynı biçimde birleştirildi)" -#: merge-recursive.c:3161 +#: merge-recursive.c:3172 #, c-format msgid "Adding as %s instead" msgstr "Bunun yerine %s olarak ekleniyor" -#: merge-recursive.c:3368 +#: merge-recursive.c:3376 #, c-format msgid "Removing %s" msgstr "%s kaldırılıyor" -#: merge-recursive.c:3391 +#: merge-recursive.c:3399 msgid "file/directory" msgstr "dosya/dizin" -#: merge-recursive.c:3396 +#: merge-recursive.c:3404 msgid "directory/file" msgstr "dizin/dosya" -#: merge-recursive.c:3403 +#: merge-recursive.c:3411 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "ÇAKIŞMA (%s): %s adıyla bir dizin var (%s içinde). %s, %s olarak ekleniyor." -#: merge-recursive.c:3412 +#: merge-recursive.c:3420 #, c-format msgid "Adding %s" msgstr "%s ekleniyor" -#: merge-recursive.c:3421 +#: merge-recursive.c:3429 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "ÇAKIŞMA (ekle/ekle): %s içinde birleştirme çakışması" -#: merge-recursive.c:3474 +#: merge-recursive.c:3482 #, c-format msgid "merging of trees %s and %s failed" msgstr "%s ve %s ağaçlarının birleştirilmesi başarısız" -#: merge-recursive.c:3568 +#: merge-recursive.c:3576 msgid "Merging:" msgstr "Birleştiriliyor:" -#: merge-recursive.c:3581 +#: merge-recursive.c:3589 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u ortak ata bulundu:" msgstr[1] "%u ortak ata bulundu:" -#: merge-recursive.c:3631 +#: merge-recursive.c:3639 msgid "merge returned no commit" msgstr "birleştirme herhangi bir işleme döndürmedi" -#: merge-recursive.c:3796 +#: merge-recursive.c:3804 #, c-format msgid "Could not parse object '%s'" msgstr "'%s' nesnesi ayrıştırılamadı" -#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900 +#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900 #: builtin/stash.c:473 msgid "Unable to write index." msgstr "İndeks yazılamıyor." @@ -5262,7 +5276,7 @@ msgstr "İndeks yazılamıyor." msgid "failed to read the cache" msgstr "önbellek okunamadı" -#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965 +#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966 #: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 #: builtin/stash.c:267 msgid "unable to write new index file" @@ -5337,106 +5351,114 @@ msgstr "pack-index '%s' açılamadı" msgid "failed to locate object %d in packfile" msgstr "%d nesnesi paket dosyasında bulunamadı" -#: midx.c:880 builtin/index-pack.c:1535 +#: midx.c:880 builtin/index-pack.c:1533 msgid "cannot store reverse index file" msgstr "ters indeks dosyası depolanamıyor" -#: midx.c:933 +#: midx.c:920 +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "mevcut multi-pack-index yok sayılıyor; sağlama toplamı uyumsuzluğu" + +#: midx.c:943 msgid "Adding packfiles to multi-pack-index" msgstr "Paket dosyaları multi-pack-index'e ekleniyor" -#: midx.c:979 +#: midx.c:989 #, c-format msgid "did not see pack-file %s to drop" msgstr "bırakılacak pack-file %s görülmedi" -#: midx.c:1024 +#: midx.c:1034 #, c-format msgid "unknown preferred pack: '%s'" msgstr "bilinmeyen tercih edilen paket: '%s'" -#: midx.c:1029 +#: midx.c:1039 #, c-format msgid "preferred pack '%s' is expired" msgstr "tercih edilen '%s' paketinin süresi geçmiş" -#: midx.c:1045 +#: midx.c:1055 msgid "no pack files to index." msgstr "indekslenecek paket dosyası yok." -#: midx.c:1125 builtin/clean.c:37 +#: midx.c:1135 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "%s kaldırılamadı" -#: midx.c:1156 +#: midx.c:1166 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "multi-pack-index %s konumunda temizlenemedi" -#: midx.c:1214 +#: midx.c:1225 msgid "multi-pack-index file exists, but failed to parse" msgstr "multi-pack-index dosyası mevcut, ancak ayrıştırılamadı" -#: midx.c:1222 +#: midx.c:1233 +msgid "incorrect checksum" +msgstr "yanlış sağlama toplamı" + +#: midx.c:1236 msgid "Looking for referenced packfiles" msgstr "Başvurulmuş paket dosyaları aranıyor" -#: midx.c:1237 +#: midx.c:1251 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "oid fanout sırasız: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1242 +#: midx.c:1256 msgid "the midx contains no oid" msgstr "midx bir oid içermiyor" -#: midx.c:1251 +#: midx.c:1265 msgid "Verifying OID order in multi-pack-index" msgstr "multi-pack-index içindeki OID sırası doğrulanıyor" -#: midx.c:1260 +#: midx.c:1274 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "oid araması sırasız: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1280 +#: midx.c:1294 msgid "Sorting objects by packfile" msgstr "Nesneler paket dosyasına göre sıralanıyor" -#: midx.c:1287 +#: midx.c:1301 msgid "Verifying object offsets" msgstr "Nesne ofsetleri doğrulanıyor" -#: midx.c:1303 +#: midx.c:1317 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "şunun için paket girdisi yüklenemedi: oid[%d] = %s" -#: midx.c:1309 +#: midx.c:1323 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "paket dosyası %s için pack-index yüklenemedi" -#: midx.c:1318 +#: midx.c:1332 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "şunun için yanlış nesne ofseti: oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1343 +#: midx.c:1357 msgid "Counting referenced objects" msgstr "Başvurulmuş nesneler sayılıyor" -#: midx.c:1353 +#: midx.c:1367 msgid "Finding and deleting unreferenced packfiles" msgstr "Başvurulmamış paket dosyaları bulunuyor ve siliniyor" -#: midx.c:1544 +#: midx.c:1558 msgid "could not start pack-objects" msgstr "pack-objects başlatılamadı" -#: midx.c:1564 +#: midx.c:1578 msgid "could not finish pack-objects" msgstr "pack-objects bitirilemedi" @@ -5500,266 +5522,267 @@ msgstr "Hatalı %s değeri: '%s'" msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "nesne dizini %s yok; şurayı denetleyin: .git/objects/info/alternates" -#: object-file.c:577 +#: object-file.c:584 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "alternatif nesne yolu olağanlaştırılamıyor: %s" -#: object-file.c:649 +#: object-file.c:658 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: alternatif nesne depoları yok sayılıyor, iç içe geçme pek derin" -#: object-file.c:656 +#: object-file.c:665 #, c-format msgid "unable to normalize object directory: %s" msgstr "nesne dizini olağanlaştırılamıyor: %s" -#: object-file.c:699 +#: object-file.c:708 msgid "unable to fdopen alternates lockfile" msgstr "alternatifler kilit dosyası fdopen yapılamıyor" -#: object-file.c:717 +#: object-file.c:726 msgid "unable to read alternates file" msgstr "alternatifler dosyası okunamıyor" -#: object-file.c:724 +#: object-file.c:733 msgid "unable to move new alternates file into place" msgstr "yeni alternatifler dosyası yerine taşınamıyor" -#: object-file.c:759 +#: object-file.c:768 #, c-format msgid "path '%s' does not exist" msgstr "'%s' diye bir yol yok" -#: object-file.c:780 +#: object-file.c:789 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "Bağlantı yapılmış çıkış olarak '%s' başvuru deposu henüz desteklenmiyor." -#: object-file.c:786 +#: object-file.c:795 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "Başvuru deposu '%s' yerel bir depo değil." -#: object-file.c:792 +#: object-file.c:801 #, c-format msgid "reference repository '%s' is shallow" msgstr "başvuru deposu '%s' sığ" -#: object-file.c:800 +#: object-file.c:809 #, c-format msgid "reference repository '%s' is grafted" msgstr "başvuru deposu '%s' aşılı" -#: object-file.c:860 +#: object-file.c:869 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "alternatif başvurular ayrıştırılırken geçersiz satır: %s" -#: object-file.c:1010 +#: object-file.c:1019 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "%<PRIuMAX>, %<PRIuMAX> sınırı üzerinden mmap yapılmaya çalışılıyor" -#: object-file.c:1031 -msgid "mmap failed" -msgstr "mmap başarısız" +#: object-file.c:1054 +#, c-format +msgid "mmap failed%s" +msgstr "mmap başarısız%s" -#: object-file.c:1195 +#: object-file.c:1218 #, c-format msgid "object file %s is empty" msgstr "nesne dosyası %s boş" -#: object-file.c:1330 object-file.c:2524 +#: object-file.c:1353 object-file.c:2548 #, c-format msgid "corrupt loose object '%s'" msgstr "hasar görmüş gevşek nesne '%s'" -#: object-file.c:1332 object-file.c:2528 +#: object-file.c:1355 object-file.c:2552 #, c-format msgid "garbage at end of loose object '%s'" msgstr "gevşek nesne '%s' sonunda anlamsız veri" -#: object-file.c:1374 +#: object-file.c:1397 msgid "invalid object type" msgstr "geçersiz nesne türü" -#: object-file.c:1458 +#: object-file.c:1481 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "%s üstbilgisi --allow-unknown-type ile açılamıyor" -#: object-file.c:1461 +#: object-file.c:1484 #, c-format msgid "unable to unpack %s header" msgstr "%s üstbilgisi açılamıyor" -#: object-file.c:1467 +#: object-file.c:1490 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "%s üstbilgisi paketi --allow-unknown-type ile ayrıştırılamıyor" -#: object-file.c:1470 +#: object-file.c:1493 #, c-format msgid "unable to parse %s header" msgstr "%s üstbilgisi ayrıştırılamıyor" -#: object-file.c:1697 +#: object-file.c:1717 #, c-format msgid "failed to read object %s" msgstr "%s nesnesi okunamadı" -#: object-file.c:1701 +#: object-file.c:1721 #, c-format msgid "replacement %s not found for %s" msgstr "%s yedeği %s için bulunamadı" -#: object-file.c:1705 +#: object-file.c:1725 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "%s gevşek nesnesi (%s içinde depolanıyor) hasar görmüş" -#: object-file.c:1709 +#: object-file.c:1729 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "paketlenmiş nesne %s (%s içinde depolanıyor) hasar görmüş" -#: object-file.c:1814 +#: object-file.c:1834 #, c-format msgid "unable to write file %s" msgstr "%s dosyası yazılamıyor" -#: object-file.c:1821 +#: object-file.c:1841 #, c-format msgid "unable to set permission to '%s'" msgstr "'%s' ögesine izin ayarlanamıyor" -#: object-file.c:1828 +#: object-file.c:1848 msgid "file write error" msgstr "dosya yazım hatası" -#: object-file.c:1848 +#: object-file.c:1868 msgid "error when closing loose object file" msgstr "gevşek nesne dosyası kapatılırken hata" -#: object-file.c:1913 +#: object-file.c:1933 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "%s depo veritabanına nesne eklemek için yetersiz izin" -#: object-file.c:1915 +#: object-file.c:1935 msgid "unable to create temporary file" msgstr "geçici dosya oluşturulamıyor" -#: object-file.c:1939 +#: object-file.c:1959 msgid "unable to write loose object file" msgstr "gevşek nesne dosyası yazılamıyor" -#: object-file.c:1945 +#: object-file.c:1965 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "yeni nesne %s söndürülemiyor (%d)" -#: object-file.c:1949 +#: object-file.c:1969 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "%s nesnesi üzerinde deflateEnd başarısız oldu (%d)" -#: object-file.c:1953 +#: object-file.c:1973 #, c-format msgid "confused by unstable object source data for %s" msgstr "%s için olan nesne kaynak verisinden dolayı kafa karışıklığı" -#: object-file.c:1963 builtin/pack-objects.c:1097 +#: object-file.c:1983 builtin/pack-objects.c:1237 #, c-format msgid "failed utime() on %s" msgstr "%s üzerinde utime() başarısız" -#: object-file.c:2040 +#: object-file.c:2060 #, c-format msgid "cannot read object for %s" msgstr "%s için nesne okunamıyor" -#: object-file.c:2091 +#: object-file.c:2111 msgid "corrupt commit" msgstr "hasar görmüş işleme" -#: object-file.c:2099 +#: object-file.c:2119 msgid "corrupt tag" msgstr "hasar görmüş etiket" -#: object-file.c:2199 +#: object-file.c:2219 #, c-format msgid "read error while indexing %s" msgstr "%s indekslenirken okuma hatası" -#: object-file.c:2202 +#: object-file.c:2222 #, c-format msgid "short read while indexing %s" msgstr "%s indekslenirken kısa read" -#: object-file.c:2275 object-file.c:2285 +#: object-file.c:2295 object-file.c:2305 #, c-format msgid "%s: failed to insert into database" msgstr "%s: veritabanına ekleme başarısız" -#: object-file.c:2291 +#: object-file.c:2311 #, c-format msgid "%s: unsupported file type" msgstr "%s: desteklenmeyen dosya türü" -#: object-file.c:2315 +#: object-file.c:2335 #, c-format msgid "%s is not a valid object" msgstr "%s geçerli bir nesne değil" -#: object-file.c:2317 +#: object-file.c:2337 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s geçerli bir '%s' nesnesi değil" -#: object-file.c:2344 builtin/index-pack.c:192 +#: object-file.c:2364 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "%s açılamıyor" -#: object-file.c:2535 object-file.c:2588 +#: object-file.c:2559 object-file.c:2612 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s için sağlama uyuşmazlığı (%s bekleniyordu)" -#: object-file.c:2559 +#: object-file.c:2583 #, c-format msgid "unable to mmap %s" msgstr "%s mmap yapılamadı" -#: object-file.c:2564 +#: object-file.c:2588 #, c-format msgid "unable to unpack header of %s" msgstr "%s üstbilgisi açılamıyor" -#: object-file.c:2570 +#: object-file.c:2594 #, c-format msgid "unable to parse header of %s" msgstr "%s üstbilgisi ayrıştırılamıyor" -#: object-file.c:2581 +#: object-file.c:2605 #, c-format msgid "unable to unpack contents of %s" msgstr "%s içeriği açılamıyor" -#: object-name.c:486 +#: object-name.c:480 #, c-format msgid "short object ID %s is ambiguous" msgstr "kısa nesne ID'si %s belirsiz" -#: object-name.c:497 +#: object-name.c:491 msgid "The candidates are:" msgstr "Adaylar:" -#: object-name.c:796 +#: object-name.c:790 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -5782,22 +5805,22 @@ msgstr "" "iletiyi\n" "kapatmak için \"git config advice.objectNameWarning\" yapın." -#: object-name.c:916 +#: object-name.c:910 #, c-format msgid "log for '%.*s' only goes back to %s" msgstr "'%.*s' günlüğü yalnızca şuna geri gider: %s" -#: object-name.c:924 +#: object-name.c:918 #, c-format msgid "log for '%.*s' only has %d entries" msgstr "'%.*s' günlüğünde yalnızca %d girdi var" -#: object-name.c:1702 +#: object-name.c:1696 #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "'%s' yolu disk üzerinde mevcut; ancak '%.*s' içinde değil" -#: object-name.c:1708 +#: object-name.c:1702 #, c-format msgid "" "path '%s' exists, but not '%s'\n" @@ -5806,12 +5829,12 @@ msgstr "" "'%s' yolu mevcut; ancak '%s' değil\n" "İpucu: Şunu mu demek istediniz: '%.*s:%s', nam-ı diğer '%.*s:./%s'?" -#: object-name.c:1717 +#: object-name.c:1711 #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "'%s' yolu '%.*s' içinde mevcut değil" -#: object-name.c:1745 +#: object-name.c:1739 #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" @@ -5820,7 +5843,7 @@ msgstr "" "'%s' yolu indekste; ancak %d numaralı alanda değil\n" "İpucu: Şunu mu demek istediniz: ':%d:%s'?" -#: object-name.c:1761 +#: object-name.c:1755 #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" @@ -5829,21 +5852,21 @@ msgstr "" "'%s' yolu indekste; ancak '%s' değil\n" "İpucu: Şunu mu demek istediniz: '%d:%s', nam-ı diğer ':%d:./%s'?" -#: object-name.c:1769 +#: object-name.c:1763 #, c-format msgid "path '%s' exists on disk, but not in the index" msgstr "'%s' yolu diskte mevcut; ancak indekste değil" -#: object-name.c:1771 +#: object-name.c:1765 #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "'%s' diye bir yol yok (ne diskte ne de indekste)" -#: object-name.c:1784 +#: object-name.c:1778 msgid "relative path syntax can't be used outside working tree" msgstr "göreceli yol sözdizimi çalışma ağacı dışında kullanılamaz" -#: object-name.c:1922 +#: object-name.c:1916 #, c-format msgid "invalid object name '%.*s'." msgstr "geçersiz nesne adı: '%.*s'" @@ -5858,27 +5881,27 @@ msgstr "geçersiz nesne türü \"%s\"" msgid "object %s is a %s, not a %s" msgstr "%s nesnesi bir %s, %s değil" -#: object.c:232 +#: object.c:250 #, c-format msgid "object %s has unknown type id %d" msgstr "%s nesnesi %d bilinmeyen tür numarasına iye" -#: object.c:245 +#: object.c:263 #, c-format msgid "unable to parse object: %s" msgstr "nesne ayrıştırılamıyor: %s" -#: object.c:265 object.c:277 +#: object.c:283 object.c:295 #, c-format msgid "hash mismatch %s" msgstr "sağlama uyuşmazlığı %s" -#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251 +#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411 #, c-format msgid "unable to get size of %s" msgstr "%s boyutu alınamıyor" -#: pack-bitmap.c:1547 builtin/rev-list.c:92 +#: pack-bitmap.c:1571 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "%s ögesinin disk kullanımı alınamıyor" @@ -5931,12 +5954,17 @@ msgstr "vaat dosyası '%s' yazılamadı" msgid "offset before end of packfile (broken .idx?)" msgstr "ofset paket dosyasının sonundan önce (bozuk .idx?)" -#: packfile.c:1937 +#: packfile.c:655 +#, c-format +msgid "packfile %s cannot be mapped%s" +msgstr "paket dosyası %s eşlemlenemiyor%s" + +#: packfile.c:1934 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "ofset %s için paket indeksinin başlangıcından önce (hasarlı indeks?)" -#: packfile.c:1941 +#: packfile.c:1938 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "ofset %s için paket indeksinin sonundan ötede (kırpılmış index?)" @@ -6139,8 +6167,8 @@ msgid "unable to write delim packet" msgstr "sınırlandıran paket yazılamıyor" #: pkt-line.c:106 -msgid "unable to write stateless separator packet" -msgstr "durumsuz ayırıcı paketi yazılamıyor" +msgid "unable to write response end packet" +msgstr "yanıt sonu paketi yazılamıyor" #: pkt-line.c:113 msgid "flush packet write failed" @@ -6199,19 +6227,19 @@ msgstr "iş parçacıklarına ayrılmış 'lstat' oluşturulamıyor: %s" msgid "unable to parse --pretty format" msgstr "--pretty biçimi ayrıştırılamıyor" -#: promisor-remote.c:30 +#: promisor-remote.c:31 msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "promisor-remote: getirme altişlemi çatallanamıyor" -#: promisor-remote.c:35 promisor-remote.c:37 +#: promisor-remote.c:38 promisor-remote.c:40 msgid "promisor-remote: could not write to fetch subprocess" msgstr "promisor-remote: getirme altişlemine yazılamıyor" -#: promisor-remote.c:41 +#: promisor-remote.c:44 msgid "promisor-remote: could not close stdin to fetch subprocess" msgstr "promisor-remote: altişlemi getirmek için stdin kapatılamıyor" -#: promisor-remote.c:53 +#: promisor-remote.c:54 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "vaatçi uzak konum adı '/' ile başlayamaz: %s" @@ -6232,7 +6260,7 @@ msgstr "'log' başlatılamadı" msgid "could not read `log` output" msgstr "'log' çıktısı okunamadı" -#: range-diff.c:101 sequencer.c:5551 +#: range-diff.c:101 sequencer.c:5550 #, c-format msgid "could not parse commit '%s'" msgstr "'%s' işlemesi ayrıştırılamadı" @@ -6250,64 +6278,64 @@ msgstr "" msgid "could not parse git header '%.*s'" msgstr "git üstbilgisi '%.*s' ayrıştırılamadı" -#: range-diff.c:306 +#: range-diff.c:307 msgid "failed to generate diff" msgstr "diff oluşturulamadı" -#: range-diff.c:558 +#: range-diff.c:559 msgid "--left-only and --right-only are mutually exclusive" msgstr "-p ve --overlay birlikte kullanılmaz" -#: range-diff.c:561 range-diff.c:563 +#: range-diff.c:562 range-diff.c:564 #, c-format msgid "could not parse log for '%s'" msgstr "'%s' günlüğü ayrıştırılamadı" -#: read-cache.c:708 +#: read-cache.c:710 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "dosya arması '%s' eklenmeyecek ('%s' indekste halihazırda var)" -#: read-cache.c:724 +#: read-cache.c:726 msgid "cannot create an empty blob in the object database" msgstr "nesne veritabanında boş ikili bir nesne oluşturulamıyor" -#: read-cache.c:746 +#: read-cache.c:748 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%s: yalnızca sıradan dosyalar, sembolik bağlar ve git dizinleri eklenebilir" -#: read-cache.c:751 +#: read-cache.c:753 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' çıkışı yapılmış bir işlemeye iye değil" -#: read-cache.c:803 +#: read-cache.c:805 #, c-format msgid "unable to index file '%s'" msgstr "'%s' dosyası indekslenemiyor" -#: read-cache.c:822 +#: read-cache.c:824 #, c-format msgid "unable to add '%s' to index" msgstr "'%s' indekse eklenemiyor" -#: read-cache.c:833 +#: read-cache.c:835 #, c-format msgid "unable to stat '%s'" msgstr "'%s' dosyasının bilgileri alınamıyor" -#: read-cache.c:1356 +#: read-cache.c:1358 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' hem bir dosya hem de bir dizin olarak görünüyor" -#: read-cache.c:1571 +#: read-cache.c:1573 msgid "Refresh index" msgstr "İndeks yenileniyor" -#: read-cache.c:1700 +#: read-cache.c:1705 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6316,7 +6344,7 @@ msgstr "" "index.version ayarlanmış; ancak değer geçersiz.\n" "%i sürümü kullanılıyor" -#: read-cache.c:1710 +#: read-cache.c:1715 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6325,143 +6353,143 @@ msgstr "" "GIT_INDEX_VERSION ayarlanmış; ancak değer geçersiz.\n" "%i sürümü kullanılıyor" -#: read-cache.c:1766 +#: read-cache.c:1771 #, c-format msgid "bad signature 0x%08x" msgstr "hatalı imza 0x%08x" -#: read-cache.c:1769 +#: read-cache.c:1774 #, c-format msgid "bad index version %d" msgstr "hatalı indeks sürümü %d" -#: read-cache.c:1778 +#: read-cache.c:1783 msgid "bad index file sha1 signature" msgstr "hatalı indeks dosyası sha1 imzası" -#: read-cache.c:1812 +#: read-cache.c:1817 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "indeks bizim anlamadığımız %.4s imzası kullanıyor" -#: read-cache.c:1814 +#: read-cache.c:1819 #, c-format msgid "ignoring %.4s extension" msgstr "%.4s uzantısı yok sayılıyor" -#: read-cache.c:1851 +#: read-cache.c:1856 #, c-format msgid "unknown index entry format 0x%08x" msgstr "bilinmeyen indeks girdisi biçimi 0x%08x" -#: read-cache.c:1867 +#: read-cache.c:1872 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "indekste hatalı oluşturulmuş ad alanı, '%s' yolu yakınında" -#: read-cache.c:1924 +#: read-cache.c:1929 msgid "unordered stage entries in index" msgstr "indekste sırasız hazırlama alanı girdileri" -#: read-cache.c:1927 +#: read-cache.c:1932 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "birleştirilmiş dosya '%s' için çoklu hazırlama alanı girdileri" -#: read-cache.c:1930 +#: read-cache.c:1935 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' için sırasız hazırlama alanı girdileri" -#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991 +#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 -#: builtin/submodule--helper.c:332 +#: builtin/submodule--helper.c:331 msgid "index file corrupt" msgstr "indeks dosyası hasar görmüş" -#: read-cache.c:2180 +#: read-cache.c:2185 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "load_cache_entries iş parçacığı oluşturulamıyor: %s" -#: read-cache.c:2193 +#: read-cache.c:2198 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "load_cache_entries iş parçacığı ucu birleştirilemiyor: %s" -#: read-cache.c:2226 +#: read-cache.c:2231 #, c-format msgid "%s: index file open failed" msgstr "%s: indeks dosyası açılamadı" -#: read-cache.c:2230 +#: read-cache.c:2235 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: açık indeksin bilgileri alınamıyor" -#: read-cache.c:2234 +#: read-cache.c:2239 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: indeks dosyası beklenenden daha küçük" -#: read-cache.c:2238 +#: read-cache.c:2243 #, c-format -msgid "%s: unable to map index file" -msgstr "%s: indeks dosyası eşlemlenemiyor" +msgid "%s: unable to map index file%s" +msgstr "%s: indeks dosyası eşlemlenemiyor%s" -#: read-cache.c:2280 +#: read-cache.c:2286 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "load_index_extensions iş parçacığı oluşturulamıyor: %s" -#: read-cache.c:2307 +#: read-cache.c:2313 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "load_index_extensions iş parçacığı ucu birleştirilemiyor: %s" -#: read-cache.c:2345 +#: read-cache.c:2351 #, c-format msgid "could not freshen shared index '%s'" msgstr "paylaşılan indeks '%s' tazelenemedi" -#: read-cache.c:2392 +#: read-cache.c:2398 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "bozuk indeks, %s bekleniyordu (%s içinde), %s alındı" -#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 +#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 #, c-format msgid "could not close '%s'" msgstr "'%s' kapatılamadı" -#: read-cache.c:3138 +#: read-cache.c:3074 msgid "failed to convert to a sparse-index" msgstr "bir sparse-index'e dönüştürülemedi" -#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441 +#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440 #, c-format msgid "could not stat '%s'" msgstr "'%s' bilgileri alınamadı" -#: read-cache.c:3222 +#: read-cache.c:3158 #, c-format msgid "unable to open git dir: %s" msgstr "git dizini açılamıyor: %s" -#: read-cache.c:3234 +#: read-cache.c:3170 #, c-format msgid "unable to unlink: %s" msgstr "bağlantı kesilemiyor: %s" -#: read-cache.c:3263 +#: read-cache.c:3199 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "'%s' üzerindeki izin bitleri onarılamıyor" -#: read-cache.c:3412 +#: read-cache.c:3348 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: #0 numaralı hazırlama alanına bırakılamıyor" @@ -6580,8 +6608,8 @@ msgstr "" "Ancak tümünü kaldırırsanız yeniden temellendirme iptal edilecektir.\n" "\n" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816 -#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836 +#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271 #, c-format msgid "could not write '%s'" msgstr "'%s' yazılamadı" @@ -6625,7 +6653,7 @@ msgstr "" msgid "could not read '%s'." msgstr "'%s' okunamadı." -#: ref-filter.c:42 wt-status.c:1978 +#: ref-filter.c:42 wt-status.c:2036 msgid "gone" msgstr "gitti" @@ -6644,248 +6672,248 @@ msgstr "%d arkasında" msgid "ahead %d, behind %d" msgstr "%d önünde, %d arkasında" -#: ref-filter.c:175 +#: ref-filter.c:230 #, c-format msgid "expected format: %%(color:<color>)" msgstr "beklenen biçim: %%(color:<renk>)" -#: ref-filter.c:177 +#: ref-filter.c:232 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "tanımlanamayan renk: %%(color:%s)" -#: ref-filter.c:199 +#: ref-filter.c:254 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Tamsayı değeri şunu bekliyordu: refname:lstrip=%s" -#: ref-filter.c:203 +#: ref-filter.c:258 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Tamsayı değeri şunu bekliyordu: refname:rstrip=%s" -#: ref-filter.c:205 +#: ref-filter.c:260 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "tanımlanamayan %%(%s) argümanı: %s" -#: ref-filter.c:260 +#: ref-filter.c:315 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) argüman almıyor" -#: ref-filter.c:282 +#: ref-filter.c:339 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "tanımlanamayan %%(objectsize) argümanı: %s" -#: ref-filter.c:290 +#: ref-filter.c:347 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) argüman almıyor" -#: ref-filter.c:302 +#: ref-filter.c:359 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) argüman almıyor" -#: ref-filter.c:315 +#: ref-filter.c:372 #, c-format msgid "unrecognized %%(subject) argument: %s" msgstr "tanımlanamayan %%(subject) argümanı: %s" -#: ref-filter.c:334 +#: ref-filter.c:391 #, c-format msgid "expected %%(trailers:key=<value>)" msgstr "%%(trailers:key=<değer>) bekleniyordu" -#: ref-filter.c:336 +#: ref-filter.c:393 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "bilinmeyen %%(trailers) argümanı: %s" -#: ref-filter.c:367 +#: ref-filter.c:424 #, c-format msgid "positive value expected contents:lines=%s" msgstr "pozitif değer şunu bekliyordu: contents:lines=%s" -#: ref-filter.c:369 +#: ref-filter.c:426 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "tanımlanamayan %%(contents) argümanı: %s" -#: ref-filter.c:384 +#: ref-filter.c:441 #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "pozitif değer şurada '%s' bekliyordu: %%(%s)" -#: ref-filter.c:388 +#: ref-filter.c:445 #, c-format msgid "unrecognized argument '%s' in %%(%s)" msgstr "şurada tanımlanamayan argüman '%s': %%(%s)" -#: ref-filter.c:402 +#: ref-filter.c:459 #, c-format msgid "unrecognized email option: %s" msgstr "tanımlanamayan e-posta seçeneği: %s" -#: ref-filter.c:432 +#: ref-filter.c:489 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "beklenen biçim: %%(align:<genişlik>,<konum>)" -#: ref-filter.c:444 +#: ref-filter.c:501 #, c-format msgid "unrecognized position:%s" msgstr "tanımlanamayan konum:%s" -#: ref-filter.c:451 +#: ref-filter.c:508 #, c-format msgid "unrecognized width:%s" msgstr "tanımlanamayan genişlik:%s" -#: ref-filter.c:460 +#: ref-filter.c:517 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "tanımlanamayan %%(align) argümanı: %s" -#: ref-filter.c:468 +#: ref-filter.c:525 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "pozitif genişlik %%(align) ögeciği ile birlikte bekleniyordu" -#: ref-filter.c:486 +#: ref-filter.c:543 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "tanımlanamayan %%(if) argümanı: %s" -#: ref-filter.c:588 +#: ref-filter.c:645 #, c-format msgid "malformed field name: %.*s" msgstr "hatalı oluşturulmuş alan adı: %.*s" -#: ref-filter.c:615 +#: ref-filter.c:672 #, c-format msgid "unknown field name: %.*s" msgstr "bilinmeyen alan adı: %.*s" -#: ref-filter.c:619 +#: ref-filter.c:676 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "bir git deposu değil; ancak '%.*s' alanı nesne verisine erişim gerektiriyor" -#: ref-filter.c:743 +#: ref-filter.c:801 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "biçim: %%(if) ögeciği bir %%(then) ögeciği olmadan kullanıldı" -#: ref-filter.c:807 +#: ref-filter.c:865 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "biçim: %%(then) ögeciği bir %%(if) ögeciği olmadan kullanıldı" -#: ref-filter.c:809 +#: ref-filter.c:867 #, c-format msgid "format: %%(then) atom used more than once" msgstr "biçim: %%(then) ögeciği birden çok kez kullanıldı" -#: ref-filter.c:811 +#: ref-filter.c:869 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "biçim: %%(then) ögeciği %%(else) ögeciğinden sonra kullanıldı" -#: ref-filter.c:839 +#: ref-filter.c:897 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "biçim: %%(else) ögeciği bir %%(if) ögeciği olmadan kullanıldı" -#: ref-filter.c:841 +#: ref-filter.c:899 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "biçim: %%(else) ögeciği bir %%(then) ögeciği olmadan kullanıldı" -#: ref-filter.c:843 +#: ref-filter.c:901 #, c-format msgid "format: %%(else) atom used more than once" msgstr "biçim: %%(else) ögeciği birden çok kez kullanıldı" -#: ref-filter.c:858 +#: ref-filter.c:916 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "biçim: %%(end) ögeciği eş ögeciği olmadan kullanıldı" -#: ref-filter.c:915 +#: ref-filter.c:973 #, c-format msgid "malformed format string %s" msgstr "hatalı oluşturulmuş biçim dizisi %s" -#: ref-filter.c:1556 +#: ref-filter.c:1621 #, c-format msgid "(no branch, rebasing %s)" msgstr "(dal yok, %s yeniden temellendiriliyor)" -#: ref-filter.c:1559 +#: ref-filter.c:1624 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(dal yok, ayrık HEAD %s yeniden temellendiriliyor)" -#: ref-filter.c:1562 +#: ref-filter.c:1627 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(dal yok, ikili arama %s üzerinde başladı)" -#: ref-filter.c:1566 +#: ref-filter.c:1631 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD, %s konumunda ayrıldı)" -#: ref-filter.c:1569 +#: ref-filter.c:1634 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD, %s ögesinden ayrıldı)" -#: ref-filter.c:1572 +#: ref-filter.c:1637 msgid "(no branch)" msgstr "(dal yok)" -#: ref-filter.c:1604 ref-filter.c:1813 +#: ref-filter.c:1669 ref-filter.c:1880 #, c-format msgid "missing object %s for %s" msgstr "eksik nesne %s (%s için)" -#: ref-filter.c:1614 +#: ref-filter.c:1679 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer %s üzerinde başarısız oldu (%s için)" -#: ref-filter.c:1997 +#: ref-filter.c:2064 #, c-format msgid "malformed object at '%s'" msgstr "'%s' konumunda hatalı oluşturulmuş nesne" -#: ref-filter.c:2086 +#: ref-filter.c:2153 #, c-format msgid "ignoring ref with broken name %s" msgstr "bozuk ada iye %s başvurusu yok sayılıyor" -#: ref-filter.c:2091 refs.c:676 +#: ref-filter.c:2158 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "bozuk başvuru %s yok sayılıyor" -#: ref-filter.c:2431 +#: ref-filter.c:2498 #, c-format msgid "format: %%(end) atom missing" msgstr "biçim: %%(end) ögeciği eksik" -#: ref-filter.c:2525 +#: ref-filter.c:2592 #, c-format msgid "malformed object name %s" msgstr "hatalı oluşturulmuş nesne adı %s" -#: ref-filter.c:2530 +#: ref-filter.c:2597 #, c-format msgid "option `%s' must point to a commit" msgstr "'%s' bir işlemeye işaret etmeli" @@ -7341,8 +7369,8 @@ msgstr "'%s' başıboşunun bağlantısı kesilemiyor" msgid "Recorded preimage for '%s'" msgstr "'%s' için öngörüntü kaydedildi" -#: rerere.c:865 submodule.c:2089 builtin/log.c:2000 -#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891 +#: rerere.c:865 submodule.c:2076 builtin/log.c:2002 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "'%s' dizini oluşturulamadı" @@ -7380,38 +7408,38 @@ msgstr "rr-cache dizini açılamıyor" msgid "could not determine HEAD revision" msgstr "HEAD revizyonu saptanamadı" -#: reset.c:70 reset.c:76 sequencer.c:3669 +#: reset.c:70 reset.c:76 sequencer.c:3689 #, c-format msgid "failed to find tree of %s" msgstr "%s ögesinin ağacı bulunamadı" -#: revision.c:2343 +#: revision.c:2344 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<paketdosyası> artık desteklenmiyor" -#: revision.c:2683 +#: revision.c:2684 msgid "your current branch appears to be broken" msgstr "geçerli dalınız bozuk gibi görünüyor" -#: revision.c:2686 +#: revision.c:2687 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "geçerli dalınız '%s' içinde henüz bir işleme yok" -#: revision.c:2892 +#: revision.c:2893 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L, -p ve -s dışında başka diff biçimlerini henüz desteklemiyor" -#: run-command.c:767 +#: run-command.c:766 msgid "open /dev/null failed" msgstr "/dev/null açılamadı" -#: run-command.c:1275 +#: run-command.c:1274 #, c-format msgid "cannot create async thread: %s" msgstr "async iş parçacığı oluşturulamadı: %s" -#: run-command.c:1345 +#: run-command.c:1344 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -7446,15 +7474,15 @@ msgstr "send-pack: getirme altişlemi çatallanamıyor" msgid "push negotiation failed; proceeding anyway with push" msgstr "itme pazarlığı başarısız; yine de itme olmadan sürdürülüyor" -#: send-pack.c:520 +#: send-pack.c:526 msgid "the receiving end does not support this repository's hash algorithm" msgstr "alıcı uç bu deponun sağlama algoritmasını desteklemiyor" -#: send-pack.c:529 +#: send-pack.c:535 msgid "the receiving end does not support --signed push" msgstr "alıcı uç --signed itmeyi desteklemiyor" -#: send-pack.c:531 +#: send-pack.c:537 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -7462,11 +7490,11 @@ msgstr "" "alıcı uç --signed itmeyi desteklemediğinden dolayı bir itme sertifikası " "gönderilmiyor" -#: send-pack.c:543 +#: send-pack.c:544 msgid "the receiving end does not support --atomic push" msgstr "alıcı uç --atomic itmeyi desteklemiyor" -#: send-pack.c:548 +#: send-pack.c:549 msgid "the receiving end does not support push options" msgstr "alıcı uç itme seçeneklerini desteklemiyor" @@ -7526,7 +7554,7 @@ msgid "could not lock '%s'" msgstr "'%s' kilitlenemedi" #: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 -#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631 +#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "şuraya yazılamadı: '%s'" @@ -7537,7 +7565,7 @@ msgid "could not write eol to '%s'" msgstr "satır sonu şuraya yazılamadı: '%s'" #: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 -#: sequencer.c:3554 +#: sequencer.c:3555 #, c-format msgid "failed to finalize '%s'" msgstr "'%s' tamamlanamadı" @@ -7587,8 +7615,8 @@ msgstr "'%.*s' içinde bir anahtar yok" msgid "unable to dequote value of '%s'" msgstr "'%s' ögesinin tırnakları kaldırılamıyor" -#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728 -#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729 +#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "'%s' okuma için açılamadı" @@ -7735,7 +7763,7 @@ msgstr "HEAD ayrıştırılamadı" msgid "HEAD %s is not a commit!" msgstr "HEAD %s bir işleme değil" -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702 msgid "could not parse HEAD commit" msgstr "HEAD işlemesi ayrıştırılamadı" @@ -7743,7 +7771,7 @@ msgstr "HEAD işlemesi ayrıştırılamadı" msgid "unable to parse commit author" msgstr "işleme yazarı ayrıştırılamıyor" -#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706 msgid "git write-tree failed to write a tree" msgstr "git write-tree bir ağaca yazamadı" @@ -7761,12 +7789,13 @@ msgstr "geçersiz yazar kimliği '%s'" msgid "corrupt author: missing date information" msgstr "hasar görmüş yazar: tarih bilgisi eksik" -#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909 #: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "işleme nesnesi yazılamadı" -#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199 +#: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "%s güncellenemedi" @@ -7818,7 +7847,7 @@ msgstr "'%s' yazılamıyor" msgid "need a HEAD to fixup" msgstr "düzeltmek için bir HEAD gerekiyor" -#: sequencer.c:1936 sequencer.c:3581 +#: sequencer.c:1936 sequencer.c:3582 msgid "could not read HEAD" msgstr "HEAD okunamadı" @@ -7959,7 +7988,7 @@ msgstr "kullanılabilir olmayan squash-onto" msgid "malformed options sheet: '%s'" msgstr "hatalı oluşturulmuş seçenekler tablosu: '%s'" -#: sequencer.c:3012 sequencer.c:4869 +#: sequencer.c:3012 sequencer.c:4868 msgid "empty commit set passed" msgstr "boş işleme seti aktarıldı" @@ -7990,7 +8019,7 @@ msgstr "ardıştırıcı dizini '%s' oluşturulamadı" msgid "could not lock HEAD" msgstr "HEAD kilitlenemedi" -#: sequencer.c:3125 sequencer.c:4582 +#: sequencer.c:3125 sequencer.c:4581 msgid "no cherry-pick or revert in progress" msgstr "süren bir seç-al veya geri al yok" @@ -8002,7 +8031,7 @@ msgstr "HEAD çözülemiyor" msgid "cannot abort from a branch yet to be born" msgstr "daha doğmamış bir daldan iptal edilemiyor" -#: sequencer.c:3159 builtin/grep.c:759 +#: sequencer.c:3159 builtin/grep.c:758 #, c-format msgid "cannot open '%s'" msgstr "'%s' açılamıyor" @@ -8050,7 +8079,7 @@ msgstr "" "İşlemeyi yaptınız mı?\n" "\"git %s --continue\" deneyin.\"" -#: sequencer.c:3411 sequencer.c:4473 +#: sequencer.c:3411 sequencer.c:4472 msgid "cannot read HEAD" msgstr "HEAD okunamıyor" @@ -8134,90 +8163,90 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3571 +#: sequencer.c:3572 #, c-format msgid "illegal label name: '%.*s'" msgstr "izin verilmeyen etiket adı: '%.*s'" -#: sequencer.c:3625 +#: sequencer.c:3645 msgid "writing fake root commit" msgstr "sahte kök işlemesi yazılıyor" -#: sequencer.c:3630 +#: sequencer.c:3650 msgid "writing squash-onto" msgstr "squash-onto yazılıyor" -#: sequencer.c:3714 +#: sequencer.c:3734 #, c-format msgid "could not resolve '%s'" msgstr "'%s' çözülemedi" -#: sequencer.c:3747 +#: sequencer.c:3767 msgid "cannot merge without a current revision" msgstr "güncel bir revizyon olmadan birleştirilemiyor" -#: sequencer.c:3769 +#: sequencer.c:3789 #, c-format msgid "unable to parse '%.*s'" msgstr "'%.*s' ayrıştırılamıyor" -#: sequencer.c:3778 +#: sequencer.c:3798 #, c-format msgid "nothing to merge: '%.*s'" msgstr "birleştirilecek bir şey yok: '%.*s'" -#: sequencer.c:3790 +#: sequencer.c:3810 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "ahtapot birleştirmesi bir [yeni kök]ün üzerinde çalıştırılamaz" -#: sequencer.c:3806 +#: sequencer.c:3826 #, c-format msgid "could not get commit message of '%s'" msgstr "'%s' işlemesinin işleme iletisi alınamadı" -#: sequencer.c:3989 +#: sequencer.c:4009 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "şunu birleştirme girişiminde bulunulamadı bile: '%.*s'" -#: sequencer.c:4005 +#: sequencer.c:4025 msgid "merge: Unable to write new index file" msgstr "merge: Yeni indeks dosyası yazılamıyor" -#: sequencer.c:4079 +#: sequencer.c:4099 msgid "Cannot autostash" msgstr "Kendiliğinden zulalanamıyor" -#: sequencer.c:4082 +#: sequencer.c:4102 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Beklenmedik zula yanıtı: '%s'" -#: sequencer.c:4088 +#: sequencer.c:4108 #, c-format msgid "Could not create directory for '%s'" msgstr "'%s' için dizin oluşturulamadı" -#: sequencer.c:4091 +#: sequencer.c:4111 #, c-format msgid "Created autostash: %s\n" msgstr "Zula kendiliğinden oluşturuldu: %s\n" -#: sequencer.c:4095 +#: sequencer.c:4115 msgid "could not reset --hard" msgstr "'reset --hard' yapılamadı" -#: sequencer.c:4120 +#: sequencer.c:4140 #, c-format msgid "Applied autostash.\n" msgstr "Kendiliğinden zulalama uygulandı.\n" -#: sequencer.c:4132 +#: sequencer.c:4152 #, c-format msgid "cannot store %s" msgstr "%s depolanamıyor" -#: sequencer.c:4135 +#: sequencer.c:4155 #, c-format msgid "" "%s\n" @@ -8228,29 +8257,29 @@ msgstr "" "Değişiklikleriniz zulada güvende.\n" "İstediğiniz zaman \"git stash pop\" veya \"git stash drop\" yapabilirsiniz.\n" -#: sequencer.c:4140 +#: sequencer.c:4160 msgid "Applying autostash resulted in conflicts." msgstr "Kendiliğinden zulalama çakışmalara neden oldu." -#: sequencer.c:4141 +#: sequencer.c:4161 msgid "Autostash exists; creating a new stash entry." msgstr "Kendiliğinden zulalama mevcut; yeni bir zula girdisi oluşturuluyor." -#: sequencer.c:4234 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4233 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "HEAD ayrılamadı" -#: sequencer.c:4249 +#: sequencer.c:4248 #, c-format msgid "Stopped at HEAD\n" msgstr "HEAD'de duruldu\n" -#: sequencer.c:4251 +#: sequencer.c:4250 #, c-format msgid "Stopped at %s\n" msgstr "%s konumunda duruldu\n" -#: sequencer.c:4259 +#: sequencer.c:4258 #, c-format msgid "" "Could not execute the todo command\n" @@ -8271,58 +8300,58 @@ msgstr "" "\tgit rebase --edit-todo\n" "\tgit rebase --continue\n" -#: sequencer.c:4305 +#: sequencer.c:4304 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Yeniden temellendiriliyor: (%d/%d)%s" -#: sequencer.c:4351 +#: sequencer.c:4350 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "%s konumunda durdu... %.*s\n" -#: sequencer.c:4422 +#: sequencer.c:4421 #, c-format msgid "unknown command %d" msgstr "bilinmeyen komut %d" -#: sequencer.c:4481 +#: sequencer.c:4480 msgid "could not read orig-head" msgstr "orig-head okunamadı" -#: sequencer.c:4486 +#: sequencer.c:4485 msgid "could not read 'onto'" msgstr "'onto' okunamadı" -#: sequencer.c:4500 +#: sequencer.c:4499 #, c-format msgid "could not update HEAD to %s" msgstr "HEAD şu konuma güncellenemedi: %s" -#: sequencer.c:4560 +#: sequencer.c:4559 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "%s başarıyla yeniden temellendirildi ve güncellendi.\n" -#: sequencer.c:4612 +#: sequencer.c:4611 msgid "cannot rebase: You have unstaged changes." msgstr "Yeniden temellendirilemiyor: Hazırlanmamış değişiklikleriniz var." -#: sequencer.c:4621 +#: sequencer.c:4620 msgid "cannot amend non-existing commit" msgstr "var olmayan işleme değiştirilemiyor" -#: sequencer.c:4623 +#: sequencer.c:4622 #, c-format msgid "invalid file: '%s'" msgstr "geçersiz dosya: '%s'" -#: sequencer.c:4625 +#: sequencer.c:4624 #, c-format msgid "invalid contents: '%s'" msgstr "geçersiz içerik: '%s'" -#: sequencer.c:4628 +#: sequencer.c:4627 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8332,50 +8361,50 @@ msgstr "" "Çalışma ağacınızda işlenmemiş değişiklikleriniz var. Lütfen önce\n" "onları işleyin ve ardından 'git rebase --continue' yapın." -#: sequencer.c:4664 sequencer.c:4703 +#: sequencer.c:4663 sequencer.c:4702 #, c-format msgid "could not write file: '%s'" msgstr "dosya yazılamadı: '%s'" -#: sequencer.c:4719 +#: sequencer.c:4718 msgid "could not remove CHERRY_PICK_HEAD" msgstr "CHERRY_PICK_HEAD kaldırılamadı" -#: sequencer.c:4726 +#: sequencer.c:4725 msgid "could not commit staged changes." msgstr "Hazırlanmış değişiklikler işlenemedi." -#: sequencer.c:4846 +#: sequencer.c:4845 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: Bir %s seçip alınamıyor" -#: sequencer.c:4850 +#: sequencer.c:4849 #, c-format msgid "%s: bad revision" msgstr "%s hatalı revizyon" -#: sequencer.c:4885 +#: sequencer.c:4884 msgid "can't revert as initial commit" msgstr "ilk işleme geri alınamaz" -#: sequencer.c:5362 +#: sequencer.c:5361 msgid "make_script: unhandled options" msgstr "make_script: ele alınmayan seçenekler" -#: sequencer.c:5365 +#: sequencer.c:5364 msgid "make_script: error preparing revisions" msgstr "make_script: revizyonlar hazırlanırken hata" -#: sequencer.c:5615 sequencer.c:5632 +#: sequencer.c:5614 sequencer.c:5631 msgid "nothing to do" msgstr "yapılacak bir şey yok" -#: sequencer.c:5651 +#: sequencer.c:5650 msgid "could not skip unnecessary pick commands" msgstr "gerekli olmayan seçim komutları atlanamadı" -#: sequencer.c:5751 +#: sequencer.c:5750 msgid "the script was already rearranged." msgstr "betik halihazırda yeniden düzenlenmişti" @@ -8425,92 +8454,96 @@ msgstr "" msgid "unable to set up work tree using invalid config" msgstr "geçersiz yapılandırma kullanılarak çalışma ağacı kurulamıyor" -#: setup.c:423 +#: setup.c:423 builtin/rev-parse.c:895 msgid "this operation must be run in a work tree" msgstr "bu işlem bir çalışma ağacı içinde çalıştırılmalı" -#: setup.c:661 +#: setup.c:658 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Beklenen git repo sürümü <= %d, %d bulundu" -#: setup.c:669 -msgid "unknown repository extensions found:" -msgstr "bilinmeyen depo genişletmeleri bulundu:" +#: setup.c:666 +msgid "unknown repository extension found:" +msgid_plural "unknown repository extensions found:" +msgstr[0] "bilinmeyen depo genişletmesi bulundu:" +msgstr[1] "bilinmeyen depo genişletmeleri bulundu:" -#: setup.c:681 -msgid "repo version is 0, but v1-only extensions found:" -msgstr "depo sürümü 0; ancak v1'e özel genişletmeler bulundu:" +#: setup.c:680 +msgid "repo version is 0, but v1-only extension found:" +msgid_plural "repo version is 0, but v1-only extensions found:" +msgstr[0] "depo sürümü 0; ancak v1'e özel genişletme bulundu:" +msgstr[1] "depo sürümü 0; ancak v1'e özel genişletmeler bulundu:" -#: setup.c:700 +#: setup.c:701 #, c-format msgid "error opening '%s'" msgstr "'%s' açılırken hata" -#: setup.c:702 +#: setup.c:703 #, c-format msgid "too large to be a .git file: '%s'" msgstr "bir .git dosyası olabilmek için çok büyük: '%s'" -#: setup.c:704 +#: setup.c:705 #, c-format msgid "error reading %s" msgstr "%s okunurken hata" -#: setup.c:706 +#: setup.c:707 #, c-format msgid "invalid gitfile format: %s" msgstr "geçersiz gitfile biçimi: %s" -#: setup.c:708 +#: setup.c:709 #, c-format msgid "no path in gitfile: %s" msgstr "gitfile içinde yol yok: %s" -#: setup.c:710 +#: setup.c:711 #, c-format msgid "not a git repository: %s" msgstr "bir git deposu değil: %s" -#: setup.c:812 +#: setup.c:813 #, c-format msgid "'$%s' too big" msgstr "'$%s' çok büyük" -#: setup.c:826 +#: setup.c:827 #, c-format msgid "not a git repository: '%s'" msgstr "bir git deposu değil: '%s'" -#: setup.c:855 setup.c:857 setup.c:888 +#: setup.c:856 setup.c:858 setup.c:889 #, c-format msgid "cannot chdir to '%s'" msgstr "'%s' konumuna chdir yapılamıyor" -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 +#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 msgid "cannot come back to cwd" msgstr "cwd'ye geri dönülemiyor" -#: setup.c:987 +#: setup.c:988 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "'%*s%s%s' bilgileri alınamadı" -#: setup.c:1225 +#: setup.c:1231 msgid "Unable to read current working directory" msgstr "Şu anki çalışma dizini okunamıyor" -#: setup.c:1234 setup.c:1240 +#: setup.c:1240 setup.c:1246 #, c-format msgid "cannot change to '%s'" msgstr "şuraya değiştirilemiyor: '%s'" -#: setup.c:1245 +#: setup.c:1251 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "bir git deposu (veya üst dizinlerinden birisi) değil: %s" -#: setup.c:1251 +#: setup.c:1257 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -8520,7 +8553,7 @@ msgstr "" "Dosya sistemi sınırında duruluyor (GIT_DISCOVERY_ACROSS_FILESYSTEM " "ayarlanmamış)." -#: setup.c:1370 +#: setup.c:1381 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -8529,27 +8562,27 @@ msgstr "" "core.sharedRepository dosya kipi değeri ile sorun (0%.3o).\n" "Dosyaların sahibinin her zaman okuma ve yazma izni olması gerekir." -#: setup.c:1417 +#: setup.c:1430 msgid "open /dev/null or dup failed" msgstr "/dev/null açılması veya açıklayıcı çoğaltılması başarısız" -#: setup.c:1432 +#: setup.c:1445 msgid "fork failed" msgstr "çatallama başarısız" -#: setup.c:1437 t/helper/test-simple-ipc.c:285 +#: setup.c:1450 t/helper/test-simple-ipc.c:285 msgid "setsid failed" msgstr "setsid başarısız" -#: sparse-index.c:151 +#: sparse-index.c:162 msgid "attempting to use sparse-index without cone mode" msgstr "koni kipi olmadan sparse-index kullanılmaya çalışılıyor" -#: sparse-index.c:156 +#: sparse-index.c:174 msgid "unable to update cache-tree, staying full" msgstr "önbellek ağacı güncellenemiyor, dolu kalınıyor" -#: sparse-index.c:239 +#: sparse-index.c:261 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "indeks girdisi bir dizin; ancak aralıklı değil (%08x)" @@ -8606,7 +8639,7 @@ msgid_plural "%u bytes/s" msgstr[0] "%u bayt/sn" msgstr[1] "%u bayt/sn" -#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738 #: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" @@ -8677,7 +8710,7 @@ msgstr "Yol belirteci '%s' '%.*s' altmodülünde" msgid "bad --ignore-submodules argument: %s" msgstr "hatalı --ignore-submodules argümanı: %s" -#: submodule.c:818 +#: submodule.c:805 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " @@ -8686,12 +8719,12 @@ msgstr "" "%s işlemesinde '%s' yolunda bulunan altmodül, aynı adlı bir altmodülle " "çarpışıyor. Atlanıyor." -#: submodule.c:921 +#: submodule.c:908 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "altmodül girdisi '%s' (%s) bir %s, işleme değil" -#: submodule.c:1006 +#: submodule.c:993 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " @@ -8700,36 +8733,36 @@ msgstr "" "'%s' altmodülünde 'git rev-list <commits> --not --remotes -n 1' " "çalıştırılamadı" -#: submodule.c:1129 +#: submodule.c:1116 #, c-format msgid "process for submodule '%s' failed" msgstr "'%s' altmodülü için işlem başarısız oldu" -#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "HEAD geçerli bir başvuru olarak çözülemedi." -#: submodule.c:1169 +#: submodule.c:1156 #, c-format msgid "Pushing submodule '%s'\n" msgstr "'%s' altmodülü itiliyor\n" -#: submodule.c:1172 +#: submodule.c:1159 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "'%s' altmodülü itilemiyor\n" -#: submodule.c:1464 +#: submodule.c:1451 #, c-format msgid "Fetching submodule %s%s\n" msgstr "%s%s altmodülü getiriliyor\n" -#: submodule.c:1498 +#: submodule.c:1485 #, c-format msgid "Could not access submodule '%s'\n" msgstr "'%s' altmodülüne erişilemedi\n" -#: submodule.c:1653 +#: submodule.c:1640 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8738,78 +8771,78 @@ msgstr "" "Altmodül getirilirken hata:\n" "%s" -#: submodule.c:1678 +#: submodule.c:1665 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' bir git deposu olarak tanımlanamadı" -#: submodule.c:1695 +#: submodule.c:1682 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "'%s' altmodülü içinde 'git status --porcelain=2' çalıştırılamadı" -#: submodule.c:1736 +#: submodule.c:1723 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "'%s' altmodülü içinde 'git status --porcelain=2' başarısız oldu" -#: submodule.c:1811 +#: submodule.c:1798 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "'%s' altmodülü içinde 'git status' başlatılamadı" -#: submodule.c:1824 +#: submodule.c:1811 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "'%s' altmodülü içinde 'git status' çalıştırılamadı" -#: submodule.c:1839 +#: submodule.c:1826 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "'%s' altmodülü içinde core.worktree ayarı kapatılamadı" -#: submodule.c:1866 submodule.c:2176 +#: submodule.c:1853 submodule.c:2163 #, c-format msgid "could not recurse into submodule '%s'" msgstr "'%s' altmodülüne özyinelenemedi" -#: submodule.c:1887 +#: submodule.c:1874 msgid "could not reset submodule index" msgstr "altmodül indeksi sıfırlanamadı" -#: submodule.c:1929 +#: submodule.c:1916 #, c-format msgid "submodule '%s' has dirty index" msgstr "'%s' altmodülü indeksi kirli" -#: submodule.c:1981 +#: submodule.c:1968 #, c-format msgid "Submodule '%s' could not be updated." msgstr "'%s' altmodülü güncellenemedi." -#: submodule.c:2049 +#: submodule.c:2036 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "altmodül git dizini '%s', '%.*s' git dizini içinde" -#: submodule.c:2070 +#: submodule.c:2057 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" "relocate_gitdir birden çok çalışma ağaçlı '%s' altmodülü için desteklenmiyor" -#: submodule.c:2082 submodule.c:2141 +#: submodule.c:2069 submodule.c:2128 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "'%s' altmodülü adı aranamadı" -#: submodule.c:2086 +#: submodule.c:2073 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "'%s' ögesini mevcut bir git dizinine taşıma reddediliyor" -#: submodule.c:2093 +#: submodule.c:2080 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8820,11 +8853,11 @@ msgstr "" "şuradan: '%s'\n" "şuraya: '%s'\n" -#: submodule.c:2221 +#: submodule.c:2208 msgid "could not start ls-files in .." msgstr "ls-files şurada başlatılamadı .." -#: submodule.c:2261 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree beklenmedik bir biçimde %d kodu ile çıktı" @@ -8861,7 +8894,7 @@ msgstr "'%.*s' artbilgisi içinde boş artbilgi jetonu" msgid "could not read input file '%s'" msgstr "'%s' girdi dosyası okunamadı" -#: trailer.c:766 builtin/mktag.c:88 +#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577 msgid "could not read from stdin" msgstr "stdin'den okunamadı" @@ -8951,7 +8984,7 @@ msgstr "uzak servis yolu ayarlama protokol tarafından desteklenmiyor" msgid "invalid remote service path" msgstr "geçersiz uzak konum servis yolu" -#: transport-helper.c:661 transport.c:1471 +#: transport-helper.c:661 transport.c:1477 msgid "operation not supported by protocol" msgstr "işlem protokol tarafından desteklenmiyor" @@ -8960,7 +8993,7 @@ msgstr "işlem protokol tarafından desteklenmiyor" msgid "can't connect to subservice %s" msgstr "%s altservisine bağlanılamıyor" -#: transport-helper.c:693 transport.c:397 +#: transport-helper.c:693 transport.c:400 msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only protokolün ikinci sürümünü gerektiriyor" @@ -9093,46 +9126,46 @@ msgstr "'%s' üst kaynağı '%s' (kaynak: '%s') olarak ayarlanacak\n" msgid "could not read bundle '%s'" msgstr "'%s' demeti okunamadı" -#: transport.c:220 +#: transport.c:223 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: Geçersiz derinlik seçeneği '%s'" -#: transport.c:272 +#: transport.c:275 msgid "see protocol.version in 'git help config' for more details" msgstr "ayrıntılar için 'git help config' içinde protocol.version'a bakın" -#: transport.c:273 +#: transport.c:276 msgid "server options require protocol version 2 or later" msgstr "sunucu seçenekleri protokol sürüm 2 veya sonrasını gerektirir" -#: transport.c:400 +#: transport.c:403 msgid "server does not support wait-for-done" msgstr "Sunucu, wait-for-done desteklemiyor" -#: transport.c:751 +#: transport.c:755 msgid "could not parse transport.color.* config" msgstr "transport.color.* yapılandırması ayrıştırılamadı" -#: transport.c:826 +#: transport.c:830 msgid "support for protocol v2 not implemented yet" msgstr "protokol v2 desteği henüz yerine getirilmedi" -#: transport.c:960 +#: transport.c:965 #, c-format msgid "unknown value for config '%s': %s" msgstr "'%s' yapılandırması için bilinmeyen değer: %s" -#: transport.c:1026 +#: transport.c:1031 #, c-format msgid "transport '%s' not allowed" msgstr "'%s' taşıyıcısına izin verilmiyor" -#: transport.c:1079 +#: transport.c:1084 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync artık desteklenmiyor" -#: transport.c:1181 +#: transport.c:1187 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -9141,7 +9174,7 @@ msgstr "" "Aşağıdaki altmodül yolları başka hiçbir uzak konumda bulunamayan\n" "değişiklikler içeriyor:\n" -#: transport.c:1185 +#: transport.c:1191 #, c-format msgid "" "\n" @@ -9168,11 +9201,11 @@ msgstr "" "kullanın.\n" "\n" -#: transport.c:1193 +#: transport.c:1199 msgid "Aborting." msgstr "İptal ediliyor" -#: transport.c:1340 +#: transport.c:1346 msgid "failed to push all needed submodules" msgstr "gereken tüm altmodüller itilemedi" @@ -9443,11 +9476,11 @@ msgstr "" "olmayan dosya sisteminde BÜYÜK/küçük harf duyarlı yollar) ve aynı çarpışan\n" "gruptan yalnızca bir tanesi çalışma ağacında:\n" -#: unpack-trees.c:1519 +#: unpack-trees.c:1618 msgid "Updating index flags" msgstr "İndeks bayrakları güncelleniyor" -#: unpack-trees.c:2608 +#: unpack-trees.c:2707 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "çalışma ağacı ve izlenmeyen işlemenin yinelenmiş girdileri var: %s" @@ -9489,99 +9522,99 @@ msgstr "geçersiz '..' yol kesimi" msgid "Fetching objects" msgstr "Nesneler getiriliyor" -#: worktree.c:238 builtin/am.c:2151 +#: worktree.c:236 builtin/am.c:2152 #, c-format msgid "failed to read '%s'" msgstr "'%s' okunamadı" -#: worktree.c:304 +#: worktree.c:303 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "ana çalışma ağacındaki '%s' depo dizini değil" -#: worktree.c:315 +#: worktree.c:314 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "'%s' dosyası çalışma ağacı konumuna olan tam yolu içermiyor" -#: worktree.c:327 +#: worktree.c:326 #, c-format msgid "'%s' does not exist" msgstr "'%s' mevcut değil" -#: worktree.c:333 +#: worktree.c:332 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' bir .git dosyası değil, hata kodu %d" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' şuna geri işaret etmiyor: '%s'" -#: worktree.c:608 +#: worktree.c:603 msgid "not a directory" msgstr "bir dizin değil" -#: worktree.c:617 +#: worktree.c:612 msgid ".git is not a file" msgstr ".git bir dosya değil" -#: worktree.c:619 +#: worktree.c:614 msgid ".git file broken" msgstr ".git dosyası bozuk" -#: worktree.c:621 +#: worktree.c:616 msgid ".git file incorrect" msgstr ".git dosyası doğru değil" -#: worktree.c:727 +#: worktree.c:722 msgid "not a valid path" msgstr "geçerli bir yol değil" -#: worktree.c:733 +#: worktree.c:728 msgid "unable to locate repository; .git is not a file" msgstr "depo konumu bulunamıyor: .git bir dosya değil" -#: worktree.c:737 +#: worktree.c:732 msgid "unable to locate repository; .git file does not reference a repository" msgstr "depo konumu bulunamıyor: .git dosyası bir depoya başvurmuyor" -#: worktree.c:741 +#: worktree.c:736 msgid "unable to locate repository; .git file broken" msgstr "depo konumu bulunamıyor: .git dosyası bozuk" -#: worktree.c:747 +#: worktree.c:742 msgid "gitdir unreadable" msgstr "okunamayan gitdir" -#: worktree.c:751 +#: worktree.c:746 msgid "gitdir incorrect" msgstr "doğru olmayan gitdir" -#: worktree.c:776 +#: worktree.c:771 msgid "not a valid directory" msgstr "geçerli bir dizin değil" -#: worktree.c:782 +#: worktree.c:777 msgid "gitdir file does not exist" msgstr "gitdir dosyası mevcut değil" -#: worktree.c:787 worktree.c:796 +#: worktree.c:782 worktree.c:791 #, c-format msgid "unable to read gitdir file (%s)" msgstr "gitdir dosyası (%s) okunamıyor" -#: worktree.c:806 +#: worktree.c:801 #, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "az okundu (%<PRIuMAX> bayt bekleniyordu, %<PRIuMAX> okundu)" -#: worktree.c:814 +#: worktree.c:809 msgid "invalid gitdir file" msgstr "geçersiz gitdir dosyası" -#: worktree.c:822 +#: worktree.c:817 msgid "gitdir file points to non-existent location" msgstr "gitdir dosyası var olmayan bir konuma işaret ediyor" @@ -9633,11 +9666,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (hazırlığı bitirmek için \"git rm <dosya>...\" kullanın)" -#: wt-status.c:211 wt-status.c:1075 +#: wt-status.c:211 wt-status.c:1125 msgid "Changes to be committed:" msgstr "İşlenecek değişiklikler:" -#: wt-status.c:234 wt-status.c:1084 +#: wt-status.c:234 wt-status.c:1134 msgid "Changes not staged for commit:" msgstr "İşleme için hazırlanmamış değişiklikler:" @@ -9737,22 +9770,22 @@ msgstr "değiştirilen içerik, " msgid "untracked content, " msgstr "izlenmeyen içerik, " -#: wt-status.c:908 +#: wt-status.c:958 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Zulanızda şu anda %d girdi var" msgstr[1] "Zulanızda şu anda %d girdi var" -#: wt-status.c:939 +#: wt-status.c:989 msgid "Submodules changed but not updated:" msgstr "Değiştirilen; ancak güncellenmeyen altmodüller:" -#: wt-status.c:941 +#: wt-status.c:991 msgid "Submodule changes to be committed:" msgstr "İşlenecek altmodül değişiklikleri:" -#: wt-status.c:1023 +#: wt-status.c:1073 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9760,7 +9793,7 @@ msgstr "" "Yukarıdaki satırı değiştirmeyin veya kaldırmayın.\n" "Altındaki her şey yok sayılacaktır." -#: wt-status.c:1115 +#: wt-status.c:1165 #, c-format msgid "" "\n" @@ -9771,107 +9804,107 @@ msgstr "" "Dal önünde/arkasında değerlerini hesaplama %.2f saniye sürdü.\n" "Bundan kaçınmak için --no-ahead-behind kullanabilirsiniz.\n" -#: wt-status.c:1145 +#: wt-status.c:1195 msgid "You have unmerged paths." msgstr "Birleştirilmemiş yollarınız var." -#: wt-status.c:1148 +#: wt-status.c:1198 msgid " (fix conflicts and run \"git commit\")" msgstr " (çakışmaları onar ve \"git commit\" çalıştır)" -#: wt-status.c:1150 +#: wt-status.c:1200 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (birleştirmeyi iptal etmek için \"git merge --abort\" kullanın)" -#: wt-status.c:1154 +#: wt-status.c:1204 msgid "All conflicts fixed but you are still merging." msgstr "Tüm çakışmalar onarıldı; ancak siz hâlâ birleştiriyorsunuz." -#: wt-status.c:1157 +#: wt-status.c:1207 msgid " (use \"git commit\" to conclude merge)" msgstr " (birleştirmeyi sonuçlandırmak için \"git commit\" kullanın)" -#: wt-status.c:1166 +#: wt-status.c:1216 msgid "You are in the middle of an am session." msgstr "Bir 'am' oturumunun tam ortasındasınız." -#: wt-status.c:1169 +#: wt-status.c:1219 msgid "The current patch is empty." msgstr "Mevcut yama boş." -#: wt-status.c:1173 +#: wt-status.c:1223 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (çakışmaları onar ve ardından \"git am --continue\" çalıştır)" -#: wt-status.c:1175 +#: wt-status.c:1225 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (bu yamayı atlamak için \"git am --skip\" kullanın" -#: wt-status.c:1177 +#: wt-status.c:1227 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (ilk dalı eski durumuna getirmek için \"git am --abort\" kullanın)" -#: wt-status.c:1310 +#: wt-status.c:1360 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo eksik" -#: wt-status.c:1312 +#: wt-status.c:1362 msgid "No commands done." msgstr "Yerine getirilen bir komut yok." -#: wt-status.c:1315 +#: wt-status.c:1365 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Son yerine getirilen komut (toplamda %d komut):" msgstr[1] "Son yerine getirilen komutlar (toplamda %d komut):" -#: wt-status.c:1326 +#: wt-status.c:1376 #, c-format msgid " (see more in file %s)" msgstr " (ek bilgi için %s dosyasına bakın)" -#: wt-status.c:1331 +#: wt-status.c:1381 msgid "No commands remaining." msgstr "Kalan komut yok." -#: wt-status.c:1334 +#: wt-status.c:1384 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Sıradaki yerine getirilecek komut (%d kalan komut):" msgstr[1] "Sıradaki yerine getirilecek komutlar (%d kalan komut):" -#: wt-status.c:1342 +#: wt-status.c:1392 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (görüntüleme ve düzenleme için \"git rebase --edit-todo\" kullanın)" -#: wt-status.c:1354 +#: wt-status.c:1404 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Şu anda '%s' dalını '%s' üzerine yeniden temellendiriyorsunuz." -#: wt-status.c:1359 +#: wt-status.c:1409 msgid "You are currently rebasing." msgstr "Şu anda yeniden temellendirme yapmaktasınız." -#: wt-status.c:1372 +#: wt-status.c:1422 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (çakışmaları çözün ve ardından \"git rebase --continue\" çalıştır)" -#: wt-status.c:1374 +#: wt-status.c:1424 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (bu yamayı atlamak için \"git rebase --skip\" kullanın)" -#: wt-status.c:1376 +#: wt-status.c:1426 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (ilk dalı çıkış yapmak için \"git rebase --abort\" kullanın)" -#: wt-status.c:1383 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tüm çakışmalar onarıldı: \"git rebase --continue\" çalıştır)" -#: wt-status.c:1387 +#: wt-status.c:1437 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -9879,154 +9912,158 @@ msgstr "" "Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi " "parçalara bölüyorsunuz." -#: wt-status.c:1392 +#: wt-status.c:1442 msgid "You are currently splitting a commit during a rebase." msgstr "" "Şu anda yeniden temellendirme sırasında bir işlemeyi parçalara bölüyorsunuz." -#: wt-status.c:1395 +#: wt-status.c:1445 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Çalışma dizininiz temizlendiğinde \"git rebase --continue\" çalıştır)" -#: wt-status.c:1399 +#: wt-status.c:1449 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi " "düzenliyorsunuz." -#: wt-status.c:1404 +#: wt-status.c:1454 msgid "You are currently editing a commit during a rebase." msgstr "Şu anda yeniden temellendirme sırasında bir işlemeyi düzenliyorsunuz." -#: wt-status.c:1407 +#: wt-status.c:1457 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (geçerli işlemeyi değiştirmek için \"git commit --amend\" kullanın)" -#: wt-status.c:1409 +#: wt-status.c:1459 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (değişikliklerinizden memnunsanız \"git rebase --continue\" kullanın)" -#: wt-status.c:1420 +#: wt-status.c:1470 msgid "Cherry-pick currently in progress." msgstr "Seç-al şu anda sürmekte." -#: wt-status.c:1423 +#: wt-status.c:1473 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Şu anda %s işlemesini seç-al yapıyorsunuz." -#: wt-status.c:1430 +#: wt-status.c:1480 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (çakışmaları onar ve \"git cherry-pick --continue\" çalıştır)" -#: wt-status.c:1433 +#: wt-status.c:1483 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (sürdürmek için \"git cherry-pick --continue\" çalıştır)" -#: wt-status.c:1436 +#: wt-status.c:1486 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (tüm çakışmalar onarıldı: \"git cherry-pick --continue\" çalıştır)" -#: wt-status.c:1438 +#: wt-status.c:1488 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (bu yamayı atlamak için \"git cherry-pick --skip\" kullanın)" -#: wt-status.c:1440 +#: wt-status.c:1490 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (seç-al işlemini iptal için \"git cherry-pick --abort\" kullanın)" -#: wt-status.c:1450 +#: wt-status.c:1500 msgid "Revert currently in progress." msgstr "Geriye al şu anda sürmekte." -#: wt-status.c:1453 +#: wt-status.c:1503 #, c-format msgid "You are currently reverting commit %s." msgstr "Şu anda %s işlemesini geri alıyorsunuz." -#: wt-status.c:1459 +#: wt-status.c:1509 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (çakışmaları onar ve \"git revert --continue\" çalıştır)" -#: wt-status.c:1462 +#: wt-status.c:1512 msgid " (run \"git revert --continue\" to continue)" msgstr " (sürdürmek için \"git revert --continue\" çalıştır)" -#: wt-status.c:1465 +#: wt-status.c:1515 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tüm çakışmalar onarıldı: \"git revert --continue\" çalıştır)" -#: wt-status.c:1467 +#: wt-status.c:1517 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (bu yamayı atlamak için \"git revert --skip\" kullanın)" -#: wt-status.c:1469 +#: wt-status.c:1519 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (geri al işlemini iptal için \"git revert --abort\" kullanın)" -#: wt-status.c:1479 +#: wt-status.c:1529 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Şu anda ikili arama yapıyorsunuz, '%s' dalından başlandı." -#: wt-status.c:1483 +#: wt-status.c:1533 msgid "You are currently bisecting." msgstr "Şu anda ikili arama yapıyorsunuz" -#: wt-status.c:1486 +#: wt-status.c:1536 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (ilk dala dönmek için \"git bisect reset\" kullanın)" -#: wt-status.c:1497 +#: wt-status.c:1547 +msgid "You are in a sparse checkout." +msgstr "Bir aralıklı çıkış içindesiniz." + +#: wt-status.c:1550 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "İzlenen dosyaların %%%d mevcut olduğu aralıklı bir çıkıştasınız." -#: wt-status.c:1736 +#: wt-status.c:1794 msgid "On branch " msgstr "Üzerinde bulunulan dal: " -#: wt-status.c:1743 +#: wt-status.c:1801 msgid "interactive rebase in progress; onto " msgstr "şunun üzerine etkileşimli yeniden temellendirme sürmekte: " -#: wt-status.c:1745 +#: wt-status.c:1803 msgid "rebase in progress; onto " msgstr "şunun üzerine yeniden temellendirme sürmekte: " -#: wt-status.c:1750 +#: wt-status.c:1808 msgid "HEAD detached at " msgstr "HEAD şurada ayrıldı: " -#: wt-status.c:1752 +#: wt-status.c:1810 msgid "HEAD detached from " msgstr "HEAD şundan ayrıldı: " -#: wt-status.c:1755 +#: wt-status.c:1813 msgid "Not currently on any branch." msgstr "Şu anda bir dal üzerinde değil." -#: wt-status.c:1772 +#: wt-status.c:1830 msgid "Initial commit" msgstr "İlk işleme" -#: wt-status.c:1773 +#: wt-status.c:1831 msgid "No commits yet" msgstr "Henüz bir işleme yok" -#: wt-status.c:1787 +#: wt-status.c:1845 msgid "Untracked files" msgstr "İzlenmeyen dosyalar" -#: wt-status.c:1789 +#: wt-status.c:1847 msgid "Ignored files" msgstr "Yok sayılan dosyalar" -#: wt-status.c:1793 +#: wt-status.c:1851 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -10037,32 +10074,32 @@ msgstr "" "bunu hızlandırabilir; ancak yeni dosyaları eklemeyi unutmamanız\n" "konusunda dikkatli olmalısınız (ek bilgi için 'git help status')." -#: wt-status.c:1799 +#: wt-status.c:1857 #, c-format msgid "Untracked files not listed%s" msgstr "İzlenmeyen dosyalar listelenmiyor%s" -#: wt-status.c:1801 +#: wt-status.c:1859 msgid " (use -u option to show untracked files)" msgstr " (izlenmeyen dosyaları göstermek için -u seçeneğini kullanın)" -#: wt-status.c:1807 +#: wt-status.c:1865 msgid "No changes" msgstr "Değişiklik yok" -#: wt-status.c:1812 +#: wt-status.c:1870 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "İşlemeye eklenen değişiklik yok (\"git add\" ve/veya \"git commit -a\" " "kullanın)\n" -#: wt-status.c:1816 +#: wt-status.c:1874 #, c-format msgid "no changes added to commit\n" msgstr "İşlemeye eklenen değişiklik yok\n" -#: wt-status.c:1820 +#: wt-status.c:1878 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -10071,83 +10108,83 @@ msgstr "" "işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var (izlemek için\n" "\"git add\" kullanın)\n" -#: wt-status.c:1824 +#: wt-status.c:1882 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var\n" -#: wt-status.c:1828 +#: wt-status.c:1886 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "İşlenecek bir şey yok (dosyalar oluşturun/kopyalayın ve izlemek için \"git " "add\" kullanın)\n" -#: wt-status.c:1832 wt-status.c:1838 +#: wt-status.c:1890 wt-status.c:1896 #, c-format msgid "nothing to commit\n" msgstr "İşlenecek bir şey yok\n" -#: wt-status.c:1835 +#: wt-status.c:1893 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "İşlenecek bir şey yok (izlenmeyen dosyaları göstermek için -u kullanın)\n" -#: wt-status.c:1840 +#: wt-status.c:1898 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "İşlenecek bir şey yok, çalışma ağacı temiz\n" -#: wt-status.c:1945 +#: wt-status.c:2003 msgid "No commits yet on " msgstr "Şurada henüz bir işleme yok: " -#: wt-status.c:1949 +#: wt-status.c:2007 msgid "HEAD (no branch)" msgstr "HEAD (dal yok)" -#: wt-status.c:1980 +#: wt-status.c:2038 msgid "different" msgstr "değişik" -#: wt-status.c:1982 wt-status.c:1990 +#: wt-status.c:2040 wt-status.c:2048 msgid "behind " msgstr "şunun arkasında: " -#: wt-status.c:1985 wt-status.c:1988 +#: wt-status.c:2043 wt-status.c:2046 msgid "ahead " msgstr "şunun önünde: " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2511 +#: wt-status.c:2569 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "%s yapılamıyor: Hazırlanmamış değişiklikleriniz var." -#: wt-status.c:2517 +#: wt-status.c:2575 msgid "additionally, your index contains uncommitted changes." msgstr "Ek olarak, indeksiniz işlenmemiş değişiklikler içeriyor." -#: wt-status.c:2519 +#: wt-status.c:2577 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s yapılamıyor: İndeksiniz işlenmemiş değişiklikler içeriyor." -#: compat/simple-ipc/ipc-unix-socket.c:178 +#: compat/simple-ipc/ipc-unix-socket.c:182 msgid "could not send IPC command" msgstr "IPC komutu gönderilemedi" -#: compat/simple-ipc/ipc-unix-socket.c:185 +#: compat/simple-ipc/ipc-unix-socket.c:189 msgid "could not read IPC response" msgstr "IPC yanıtı okunamadı" -#: compat/simple-ipc/ipc-unix-socket.c:862 +#: compat/simple-ipc/ipc-unix-socket.c:866 #, c-format msgid "could not start accept_thread '%s'" msgstr "accept_thread '%s' başlatılamadı" -#: compat/simple-ipc/ipc-unix-socket.c:874 +#: compat/simple-ipc/ipc-unix-socket.c:878 #, c-format msgid "could not start worker[0] for '%s'" msgstr "'%s' için worker[0] başlatılamadı" @@ -10184,7 +10221,7 @@ msgstr "kaldır: '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "İndeksi yeniledikten sonra hazırlanmamış değişiklikler:" -#: builtin/add.c:307 builtin/rev-parse.c:991 +#: builtin/add.c:307 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "İndeks okunamadı" @@ -10221,8 +10258,8 @@ msgstr "" "Aşağıdaki yollar sizin .gitignore dosyalarınızın biri tarafından yok " "sayılıyor:\n" -#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550 #: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 msgid "dry run" msgstr "sınama turu" @@ -10367,12 +10404,12 @@ msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod param '%s' ya -x ya da +x olmalıdır" #: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 -#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637 +#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file yol belirteci argümanları ile uyumsuz" #: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 -#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643 +#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul, --pathspec-from-file gerektiriyor" @@ -10391,111 +10428,111 @@ msgstr "" "Bu iletiyi 'git config advice.addEmptyPathspec false'\n" "yaparak kapatabilirsiniz." -#: builtin/am.c:364 +#: builtin/am.c:365 msgid "could not parse author script" msgstr "yazar betiği ayrıştırılamadı" -#: builtin/am.c:454 +#: builtin/am.c:455 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' applypatch-msg kancası tarafından silindi" -#: builtin/am.c:496 +#: builtin/am.c:497 #, c-format msgid "Malformed input line: '%s'." msgstr "Hatalı oluşturulmuş girdi satırı: '%s'." -#: builtin/am.c:534 +#: builtin/am.c:535 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Notların '%s' konumundan '%s' konumuna kopyalanması başarısız" -#: builtin/am.c:560 +#: builtin/am.c:561 msgid "fseek failed" msgstr "fseek başarısız oldu" -#: builtin/am.c:748 +#: builtin/am.c:749 #, c-format msgid "could not parse patch '%s'" msgstr "'%s' yaması ayrıştırılamadı" -#: builtin/am.c:813 +#: builtin/am.c:814 msgid "Only one StGIT patch series can be applied at once" msgstr "Bir kerede yalnızca bir StGIT yama serisi uygulanabilir" -#: builtin/am.c:861 +#: builtin/am.c:862 msgid "invalid timestamp" msgstr "geçersiz zaman damgası" -#: builtin/am.c:866 builtin/am.c:878 +#: builtin/am.c:867 builtin/am.c:879 msgid "invalid Date line" msgstr "geçersiz tarih satırı" -#: builtin/am.c:873 +#: builtin/am.c:874 msgid "invalid timezone offset" msgstr "geçersiz zaman dilimi ofseti" -#: builtin/am.c:966 +#: builtin/am.c:967 msgid "Patch format detection failed." msgstr "Yama biçimi algılaması başarısız." -#: builtin/am.c:971 builtin/clone.c:414 +#: builtin/am.c:972 builtin/clone.c:414 #, c-format msgid "failed to create directory '%s'" msgstr "'%s' dizini oluşturulamadı" -#: builtin/am.c:976 +#: builtin/am.c:977 msgid "Failed to split patches." msgstr "Yamalar parçalanıp bölünemedi." -#: builtin/am.c:1125 +#: builtin/am.c:1126 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Bu sorunu çözdüğünüzde \"%s --continue\" çalıştırın." -#: builtin/am.c:1126 +#: builtin/am.c:1127 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Eğer bu yamayı atlamayı yeğliyorsanız \"%s --skip\" çalıştırın." -#: builtin/am.c:1127 +#: builtin/am.c:1128 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "İlk dalı eski durumuna getirip yamalamayı durdurmak için \"%s --abort\" " "çalıştır." -#: builtin/am.c:1222 +#: builtin/am.c:1223 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Yama format=flowed ile gönderildi; satır sonlarındaki boşluk kaybolmuş " "olabilir." -#: builtin/am.c:1250 +#: builtin/am.c:1251 msgid "Patch is empty." msgstr "Yama boş." -#: builtin/am.c:1315 +#: builtin/am.c:1316 #, c-format msgid "missing author line in commit %s" msgstr "%s işlemesinde yazar satırı eksik" -#: builtin/am.c:1318 +#: builtin/am.c:1319 #, c-format msgid "invalid ident line: %.*s" msgstr "geçersiz tanımlama satırı: %.*s" -#: builtin/am.c:1537 +#: builtin/am.c:1538 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Depo 3 yönlü birleştirmeye geri çekilebilme için gereken ikili nesnelere iye " "değil." -#: builtin/am.c:1539 +#: builtin/am.c:1540 msgid "Using index info to reconstruct a base tree..." msgstr "Bir temel ağacını yeniden yapmak için indeks bilgisi kullanılıyor..." -#: builtin/am.c:1558 +#: builtin/am.c:1559 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10503,24 +10540,24 @@ msgstr "" "Yamanızı elle mi düzenlediniz?\n" "Kendi indeksinde kaydı yazılan ikili nesnelere uygulanamıyor." -#: builtin/am.c:1564 +#: builtin/am.c:1565 msgid "Falling back to patching base and 3-way merge..." msgstr "Temeli yamalamaya ve 3 yönlü birleştirmeye geri çekiliniyor..." -#: builtin/am.c:1590 +#: builtin/am.c:1591 msgid "Failed to merge in the changes." msgstr "Değişiklikler birleştirilemedi." -#: builtin/am.c:1622 +#: builtin/am.c:1623 msgid "applying to an empty history" msgstr "boş bir geçmişe uygulanıyor" -#: builtin/am.c:1674 builtin/am.c:1678 +#: builtin/am.c:1675 builtin/am.c:1679 #, c-format msgid "cannot resume: %s does not exist." msgstr "sürdürülemiyor: %s yok" -#: builtin/am.c:1696 +#: builtin/am.c:1697 msgid "Commit Body is:" msgstr "İşleme gövdesi:" @@ -10528,41 +10565,41 @@ msgstr "İşleme gövdesi:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1706 +#: builtin/am.c:1707 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Uygula? [y]evet/[n]hayır/düz[e]nle/[v]yamayı görüntüle/tümünü k[a]bul et: " -#: builtin/am.c:1752 builtin/commit.c:408 +#: builtin/am.c:1753 builtin/commit.c:408 msgid "unable to write index file" msgstr "indeks dosyası yazılamıyor" -#: builtin/am.c:1756 +#: builtin/am.c:1757 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Kirli indeks: Yamalar uygulanamıyor (kirli: %s)" -#: builtin/am.c:1796 builtin/am.c:1864 +#: builtin/am.c:1797 builtin/am.c:1865 #, c-format msgid "Applying: %.*s" msgstr "Uygulanıyor: %.*s" -#: builtin/am.c:1813 +#: builtin/am.c:1814 msgid "No changes -- Patch already applied." msgstr "Değişiklik yok -- Yama halihazırda uygulandı." -#: builtin/am.c:1819 +#: builtin/am.c:1820 #, c-format msgid "Patch failed at %s %.*s" msgstr "Yama şurada başarısız oldu: %s %.*s" -#: builtin/am.c:1823 +#: builtin/am.c:1824 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" "Başarısız olan yamayı görmek için 'git am --show-current-patch=diff' kullanın" -#: builtin/am.c:1867 +#: builtin/am.c:1868 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10572,7 +10609,7 @@ msgstr "" "Hazırlanacak başka bir şey kalmadıysa büyük olasılıkla başka bir şey\n" "aynı değişiklikleri uygulamış olabilir; bu yamayı atlamak isteyebilirsiniz." -#: builtin/am.c:1874 +#: builtin/am.c:1875 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10585,17 +10622,17 @@ msgstr "" "Bir dosyanın \"onlar sildi\" olduğunu kabul etmek için dosya ile 'git rm' " "yapabilirsiniz." -#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347 +#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "'%s' nesnesi ayrıştırılamadı." -#: builtin/am.c:2033 +#: builtin/am.c:2034 msgid "failed to clean index" msgstr "indeks temizlenemedi" -#: builtin/am.c:2077 +#: builtin/am.c:2078 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10603,91 +10640,91 @@ msgstr "" "Son 'am' başarısızlığından bu yana HEAD'i hareket ettirmiş görünüyorsunuz.\n" "ORIG_HEAD'e geri sarılmıyor." -#: builtin/am.c:2184 +#: builtin/am.c:2185 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Geçersiz --patch-format değeri: %s" -#: builtin/am.c:2226 +#: builtin/am.c:2227 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "--show-current-patch için geçersiz değer: %s" -#: builtin/am.c:2230 +#: builtin/am.c:2231 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s, --show-current-patch=%s ile uyumsuz" -#: builtin/am.c:2261 +#: builtin/am.c:2262 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<seçenekler>] [(<mbox> | <posta-dizin>)...]" -#: builtin/am.c:2262 +#: builtin/am.c:2263 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<seçenekler>] (--continue | --skip | --abort)" -#: builtin/am.c:2268 +#: builtin/am.c:2269 msgid "run interactively" msgstr "etkileşimli olarak çalıştır" -#: builtin/am.c:2270 +#: builtin/am.c:2271 msgid "historical option -- no-op" msgstr "tarihi seçenek -- no-op" -#: builtin/am.c:2272 +#: builtin/am.c:2273 msgid "allow fall back on 3way merging if needed" msgstr "gerekirse 3 yönlü birleştirmeye geri çekilmeye izin ver" -#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16 -#: builtin/repack.c:472 builtin/stash.c:948 +#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:472 builtin/stash.c:945 msgid "be quiet" msgstr "sessiz ol" -#: builtin/am.c:2275 +#: builtin/am.c:2276 msgid "add a Signed-off-by trailer to the commit message" msgstr "işleme iletisine bir Signed-off-by satırı ekle" -#: builtin/am.c:2278 +#: builtin/am.c:2279 msgid "recode into utf8 (default)" msgstr "utf8 olarak yeniden kodla (öntanımlı)" -#: builtin/am.c:2280 +#: builtin/am.c:2281 msgid "pass -k flag to git-mailinfo" msgstr "'git-mailinfo'ya -k bayrağını geçir" -#: builtin/am.c:2282 +#: builtin/am.c:2283 msgid "pass -b flag to git-mailinfo" msgstr "'git-mailinfo'ya -b bayrağını geçir" -#: builtin/am.c:2284 +#: builtin/am.c:2285 msgid "pass -m flag to git-mailinfo" msgstr "'git-mailinfo'ya -m bayrağını geçir" -#: builtin/am.c:2286 +#: builtin/am.c:2287 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "'git-mailsplit'e mbox biçimi için --keep-cr bayrağını geçir" -#: builtin/am.c:2289 +#: builtin/am.c:2290 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "'git-mailsplit'e 'am.keepcr'dan bağımsız olarak --keep-cr bayrağını geçirme" -#: builtin/am.c:2292 +#: builtin/am.c:2293 msgid "strip everything before a scissors line" msgstr "bir kesim çizgisinden önceki her şeyi çıkar" -#: builtin/am.c:2294 +#: builtin/am.c:2295 msgid "pass it through git-mailinfo" msgstr "git-mailinfo içerisinden geçir" -#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 -#: builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 -#: builtin/am.c:2324 +#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307 +#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319 +#: builtin/am.c:2325 msgid "pass it through git-apply" msgstr "git-apply aracılığıyla geçir" -#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261 +#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 #: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 #: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 @@ -10696,67 +10733,67 @@ msgstr "git-apply aracılığıyla geçir" msgid "n" msgstr "n" -#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137 +#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137 #: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 #: builtin/verify-tag.c:38 msgid "format" msgstr "biçim" -#: builtin/am.c:2321 +#: builtin/am.c:2322 msgid "format the patch(es) are in" msgstr "yama biçimi" -#: builtin/am.c:2327 +#: builtin/am.c:2328 msgid "override error message when patch failure occurs" msgstr "yama başarısız olduğunda hata iletisini geçersiz kıl" -#: builtin/am.c:2329 +#: builtin/am.c:2330 msgid "continue applying patches after resolving a conflict" msgstr "bir çakışmayı çözdükten sonra yamaları uygulamayı sürdür" -#: builtin/am.c:2332 +#: builtin/am.c:2333 msgid "synonyms for --continue" msgstr "--continue eşanlamlıları" -#: builtin/am.c:2335 +#: builtin/am.c:2336 msgid "skip the current patch" msgstr "geçerli yamayı atla" -#: builtin/am.c:2338 +#: builtin/am.c:2339 msgid "restore the original branch and abort the patching operation" msgstr "orijinal dalı eski durumuna getir ve yamalama işlemini iptal et" -#: builtin/am.c:2341 +#: builtin/am.c:2342 msgid "abort the patching operation but keep HEAD where it is" msgstr "yamalama işlemini iptal et; ancak HEAD'i olduğu yerde bırak" -#: builtin/am.c:2345 +#: builtin/am.c:2346 msgid "show the patch being applied" msgstr "uygulanmakta olan yamayı göster" -#: builtin/am.c:2350 +#: builtin/am.c:2351 msgid "lie about committer date" msgstr "işleyici tarihi hakkında yalan söyle" -#: builtin/am.c:2352 +#: builtin/am.c:2353 msgid "use current timestamp for author date" msgstr "yazar tarihi için geçerli zaman damgasını kullan" -#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630 +#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640 #: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 #: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396 +#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396 msgid "GPG-sign commits" msgstr "GPG imzalı işlemeler" -#: builtin/am.c:2358 +#: builtin/am.c:2359 msgid "(internal use for git-rebase)" msgstr "(git-rebase için iç kullanım)" -#: builtin/am.c:2376 +#: builtin/am.c:2377 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." @@ -10764,17 +10801,17 @@ msgstr "" "-b/--binary seçeneği uzunca bir süredir düzgün çalışmıyordu ve\n" "yakında kaldırılacak. Lütfen artık kullanmayın." -#: builtin/am.c:2383 +#: builtin/am.c:2384 msgid "failed to read the index" msgstr "indeks okunamadı" -#: builtin/am.c:2398 +#: builtin/am.c:2399 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "Bir önceki yeniden temellendirme dizini %s hâlâ mevcut; ancak mbox verildi." -#: builtin/am.c:2422 +#: builtin/am.c:2423 #, c-format msgid "" "Stray %s directory found.\n" @@ -10783,11 +10820,11 @@ msgstr "" "Başıboş %s dizini bulundu.\n" "Kaldırmak için \"git am --abort\" kullanın." -#: builtin/am.c:2428 +#: builtin/am.c:2429 msgid "Resolve operation not in progress, we are not resuming." msgstr "İlerlemekte olan bir çözüm işlemi yok, sürdürme yapmıyoruz." -#: builtin/am.c:2438 +#: builtin/am.c:2439 msgid "interactive mode requires patches on the command line" msgstr "etkileşimli kip yamanın komut satırında olmasını gerektirir" @@ -10882,63 +10919,63 @@ msgstr "'%s' dosyası '%s' kipinde açılamıyor" msgid "could not write to file '%s'" msgstr "'%s' dosyasına yazılamadı" -#: builtin/bisect--helper.c:153 +#: builtin/bisect--helper.c:155 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' geçerli bir terim değil" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:159 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "'%s yerleşik komutu bir terim olarak kullanılamıyor" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:169 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "'%s' teriminin anlamı değiştirilemiyor" -#: builtin/bisect--helper.c:177 +#: builtin/bisect--helper.c:179 msgid "please use two different terms" msgstr "lütfen iki değişik terim kullanın" -#: builtin/bisect--helper.c:193 +#: builtin/bisect--helper.c:195 #, c-format msgid "We are not bisecting.\n" msgstr "İkili arama yapılmıyor.\n" -#: builtin/bisect--helper.c:201 +#: builtin/bisect--helper.c:203 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' geçerli bir işleme değil" -#: builtin/bisect--helper.c:210 +#: builtin/bisect--helper.c:212 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "" "Orijinal HEAD '%s' çıkışı yapılamadı. 'git bisect reset <işleme>' deneyin." -#: builtin/bisect--helper.c:254 +#: builtin/bisect--helper.c:256 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Hatalı bisect_write argümanı: %s" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:261 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "'%s' revizyonunun oid'si alınamadı" -#: builtin/bisect--helper.c:271 +#: builtin/bisect--helper.c:273 #, c-format msgid "couldn't open the file '%s'" msgstr "'%s' dosyası açılamadı" -#: builtin/bisect--helper.c:297 +#: builtin/bisect--helper.c:299 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Geçersiz komut: Şu anda bir %s/%s ikili aramasındasınız" -#: builtin/bisect--helper.c:324 +#: builtin/bisect--helper.c:326 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10947,7 +10984,7 @@ msgstr "" "Bana en azından bir %s ve %s revizyonu vermeniz gerekiyor.\n" "Bunun için \"git bisect %s\" ve \"git bisect %s\" kullanabilirsiniz." -#: builtin/bisect--helper.c:328 +#: builtin/bisect--helper.c:330 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10958,7 +10995,7 @@ msgstr "" "Bundan sonra bana en azından bir %s ve %s revizyonu vermeniz gerekiyor.\n" "Bunun için \"git bisect %s\" ve \"git bisect %s\" kullanabilirsiniz." -#: builtin/bisect--helper.c:348 +#: builtin/bisect--helper.c:350 #, c-format msgid "bisecting only with a %s commit" msgstr "yalnızca bir %s işlemesi ile ikili arama yapılıyor" @@ -10967,15 +11004,15 @@ msgstr "yalnızca bir %s işlemesi ile ikili arama yapılıyor" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:356 +#: builtin/bisect--helper.c:358 msgid "Are you sure [Y/n]? " msgstr "Emin misiniz [Y/n]? " -#: builtin/bisect--helper.c:417 +#: builtin/bisect--helper.c:419 msgid "no terms defined" msgstr "hiçbir terim tanımlanmadı" -#: builtin/bisect--helper.c:420 +#: builtin/bisect--helper.c:422 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10984,7 +11021,7 @@ msgstr "" "Mevcut terimleriniz eski durum için %s ve\n" "yeni durum için %s.\n" -#: builtin/bisect--helper.c:430 +#: builtin/bisect--helper.c:432 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10993,52 +11030,52 @@ msgstr "" "'git bisect terms' için geçersiz argüman %s.\n" "Desteklenen seçenekler: --term-good|--term-old ve --term-bad|--term-new." -#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021 +#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023 msgid "revision walk setup failed\n" msgstr "revizyonda gezinme ayarlaması başarısız oldu\n" -#: builtin/bisect--helper.c:519 +#: builtin/bisect--helper.c:521 #, c-format msgid "could not open '%s' for appending" msgstr "'%s' iliştirme için açılamadı" -#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653 msgid "'' is not a valid term" msgstr "'' geçerli bir terim değil" -#: builtin/bisect--helper.c:661 +#: builtin/bisect--helper.c:663 #, c-format msgid "unrecognized option: '%s'" msgstr "tanımlanamayan seçenek: '%s'" -#: builtin/bisect--helper.c:665 +#: builtin/bisect--helper.c:667 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' geçerli bir revizyon değil gibi görünüyor" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:698 msgid "bad HEAD - I need a HEAD" msgstr "hatalı HEAD - Bana bir HEAD gerek" -#: builtin/bisect--helper.c:711 +#: builtin/bisect--helper.c:713 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "'%s' çıkış yapımı başarısız. 'git bisect start <geçerli-dal>' deneyin." -#: builtin/bisect--helper.c:732 +#: builtin/bisect--helper.c:734 msgid "won't bisect on cg-seek'ed tree" msgstr "cg-seek yapılmış bir ağaçta ikili arama yapılmayacak" -#: builtin/bisect--helper.c:735 +#: builtin/bisect--helper.c:737 msgid "bad HEAD - strange symbolic ref" msgstr "hatalı HEAD - tuhaf sembolik başvuru" -#: builtin/bisect--helper.c:755 +#: builtin/bisect--helper.c:757 #, c-format msgid "invalid ref: '%s'" msgstr "geçersiz başvuru: '%s'" -#: builtin/bisect--helper.c:813 +#: builtin/bisect--helper.c:815 msgid "You need to start by \"git bisect start\"\n" msgstr "\"git bisect start\" ile başlamalısınız\n" @@ -11046,104 +11083,104 @@ msgstr "\"git bisect start\" ile başlamalısınız\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:824 +#: builtin/bisect--helper.c:826 msgid "Do you want me to do it for you [Y/n]? " msgstr "Bunu sizin yerinize benim yapmamı ister misiniz [Y/n]? " -#: builtin/bisect--helper.c:842 +#: builtin/bisect--helper.c:844 msgid "Please call `--bisect-state` with at least one argument" msgstr "Lütfen '--bisec-state'i en az bir argümanla çalıştırın" -#: builtin/bisect--helper.c:855 +#: builtin/bisect--helper.c:857 #, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' yalnızca bir argüman alabilir." -#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880 +#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882 #, c-format msgid "Bad rev input: %s" msgstr "Hatalı revizyon girdisi: %s" -#: builtin/bisect--helper.c:887 +#: builtin/bisect--helper.c:889 #, c-format msgid "Bad rev input (not a commit): %s" msgstr "Hatalı revizyon girdisi (bir işleme değil): %s" -#: builtin/bisect--helper.c:919 +#: builtin/bisect--helper.c:921 msgid "We are not bisecting." msgstr "İkili arama yapmıyoruz." -#: builtin/bisect--helper.c:969 +#: builtin/bisect--helper.c:971 #, c-format msgid "'%s'?? what are you talking about?" msgstr "'%s'?? ney ney?" -#: builtin/bisect--helper.c:981 +#: builtin/bisect--helper.c:983 #, c-format msgid "cannot read file '%s' for replaying" msgstr "'%s' dosyası yeniden oynatım için okunamıyor" -#: builtin/bisect--helper.c:1054 +#: builtin/bisect--helper.c:1056 msgid "reset the bisection state" msgstr "ikili arama durumunu sıfırla" -#: builtin/bisect--helper.c:1056 +#: builtin/bisect--helper.c:1058 msgid "check whether bad or good terms exist" msgstr "iyi veya kötü terimlerin olup olmadığını denetle" -#: builtin/bisect--helper.c:1058 +#: builtin/bisect--helper.c:1060 msgid "print out the bisect terms" msgstr "ikili arama terimlerini yazdır" -#: builtin/bisect--helper.c:1060 +#: builtin/bisect--helper.c:1062 msgid "start the bisect session" msgstr "ikili arama oturumunu başlat" -#: builtin/bisect--helper.c:1062 +#: builtin/bisect--helper.c:1064 msgid "find the next bisection commit" msgstr "bir sonraki ikili arama işlemesini bul" -#: builtin/bisect--helper.c:1064 +#: builtin/bisect--helper.c:1066 msgid "mark the state of ref (or refs)" msgstr "başvurunun (veya başvuruların) durumunu imle" -#: builtin/bisect--helper.c:1066 +#: builtin/bisect--helper.c:1068 msgid "list the bisection steps so far" msgstr "şu ana kadarki ikili arama durumunu listele" -#: builtin/bisect--helper.c:1068 +#: builtin/bisect--helper.c:1070 msgid "replay the bisection process from the given file" msgstr "verilen dosyadan ikili arama işlemini yeniden oynat" -#: builtin/bisect--helper.c:1070 +#: builtin/bisect--helper.c:1072 msgid "skip some commits for checkout" msgstr "çıkış için birkaç işlemeyi atla" -#: builtin/bisect--helper.c:1072 +#: builtin/bisect--helper.c:1074 msgid "no log for BISECT_WRITE" msgstr "BISECT_WRITE için günlük yok" -#: builtin/bisect--helper.c:1087 +#: builtin/bisect--helper.c:1089 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset bir argüman veya işleme gerektirmiyor" -#: builtin/bisect--helper.c:1092 +#: builtin/bisect--helper.c:1094 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check 2 veya 3 argüman gerektiriyor" -#: builtin/bisect--helper.c:1098 +#: builtin/bisect--helper.c:1100 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms 0 veya 1 argüman gerektiriyor" -#: builtin/bisect--helper.c:1107 +#: builtin/bisect--helper.c:1109 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next 0 argüman gerektiriyor" -#: builtin/bisect--helper.c:1118 +#: builtin/bisect--helper.c:1120 msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log 0 argüman gerektiriyor" -#: builtin/bisect--helper.c:1123 +#: builtin/bisect--helper.c:1125 msgid "no logfile given" msgstr "hiçbir günlük dosyası verilmedi" @@ -11197,7 +11234,7 @@ msgstr "iş maliyet istatistiklerini göster" #: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 #: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 #: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 -#: builtin/push.c:575 builtin/send-pack.c:198 +#: builtin/push.c:566 builtin/send-pack.c:198 msgid "force progress reporting" msgstr "durum belirtmeyi zorla" @@ -11245,7 +11282,7 @@ msgstr "yazar adı yerine e-postasını göster (Öntanımlı: Kapalı)" msgid "ignore whitespace differences" msgstr "boşluk ayrımlarını yok say" -#: builtin/blame.c:883 builtin/log.c:1820 +#: builtin/blame.c:883 builtin/log.c:1823 msgid "rev" msgstr "revizyon" @@ -11833,19 +11870,19 @@ msgstr "git bundle list-heads <dosya> [<başvuru-adı>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <dosya> [<başvuru-adı>...]" -#: builtin/bundle.c:67 builtin/pack-objects.c:3747 +#: builtin/bundle.c:67 builtin/pack-objects.c:3907 msgid "do not show progress meter" msgstr "ilerleme çubuğunu gösterme" -#: builtin/bundle.c:69 builtin/pack-objects.c:3749 +#: builtin/bundle.c:69 builtin/pack-objects.c:3909 msgid "show progress meter" msgstr "ilerleme çubuğunu göster" -#: builtin/bundle.c:71 builtin/pack-objects.c:3751 +#: builtin/bundle.c:71 builtin/pack-objects.c:3911 msgid "show progress meter during object writing phase" msgstr "ilerleme çubuğunu nesne yazımı aşaması sırasında göster" -#: builtin/bundle.c:74 builtin/pack-objects.c:3754 +#: builtin/bundle.c:74 builtin/pack-objects.c:3914 msgid "similar to --all-progress when progress meter is shown" msgstr "ilerleme çubuğu gösterildiğinde --all-progress'e benzer" @@ -11857,29 +11894,29 @@ msgstr "demet biçim sürümünü belirt" msgid "Need a repository to create a bundle." msgstr "Bir demet oluşturmak için bir depo gerekli." -#: builtin/bundle.c:107 +#: builtin/bundle.c:109 msgid "do not show bundle details" msgstr "demet ayrıntılarını gösterme" -#: builtin/bundle.c:122 +#: builtin/bundle.c:128 #, c-format msgid "%s is okay\n" msgstr "%s tamam\n" -#: builtin/bundle.c:163 +#: builtin/bundle.c:179 msgid "Need a repository to unbundle." msgstr "Demeti çözmek için bir depo gerekli" -#: builtin/bundle.c:171 builtin/remote.c:1700 +#: builtin/bundle.c:191 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "ayrıntılı anlat; bir altkomuttan önce yerleştirilmelidir" -#: builtin/bundle.c:193 builtin/remote.c:1731 +#: builtin/bundle.c:213 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "Bilinmeyen altkomut: %s" -#: builtin/cat-file.c:598 +#: builtin/cat-file.c:596 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -11887,7 +11924,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <tür> | --textconv | --filters) [--path=<yol>] <nesne>" -#: builtin/cat-file.c:599 +#: builtin/cat-file.c:597 msgid "" "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" "symlinks] [--textconv | --filters]" @@ -11895,72 +11932,72 @@ msgstr "" "git cat-file (--batch[=<biçim>] | --batch-check[=<biçim>]) [--follow-" "symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:620 +#: builtin/cat-file.c:618 msgid "only one batch option may be specified" msgstr "yalnızca bir toplu iş seçeneği belirtilebilir" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:636 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tür> yalnızca şunlardan biri olabilir: blob, tree, commit, tag" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:637 msgid "show object type" msgstr "nesne türünü göster" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:638 msgid "show object size" msgstr "nesne boyutunu göster" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:640 msgid "exit with zero when there's no error" msgstr "hata yoksa sıfır koduyla çık" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:641 msgid "pretty-print object's content" msgstr "nesne içeriğini okunabilir biçimde göster" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:643 msgid "for blob objects, run textconv on object's content" msgstr "ikili nesneler için nesne içeriği üzerinde textconv çalıştır" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:645 msgid "for blob objects, run filters on object's content" msgstr "ikili nesneler için nesne içeriği üzerinde süzgeçler çalıştır" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:646 msgid "blob" msgstr "ikili nesne" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:647 msgid "use a specific path for --textconv/--filters" msgstr "--textconv/--filters için belirli bir yol kullan" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:649 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "-s ve -t'nin bozuk/hasar görmüş nesnelerle çalışmasına izin ver" -#: builtin/cat-file.c:652 +#: builtin/cat-file.c:650 msgid "buffer --batch output" msgstr "--batch çıktısını arabelleğe al" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:652 msgid "show info and content of objects fed from the standard input" msgstr "standart girdi'den beslenen nesnelerin bilgisini ve içeriğini göster" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:656 msgid "show info about objects fed from the standard input" msgstr "standart girdi'den beslenen nesneler hakkında bilgi göster" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:660 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "ağaç içi sembolik bağları izle (--batch veya --batch-check ile kullanılır)" -#: builtin/cat-file.c:664 +#: builtin/cat-file.c:662 msgid "show all objects with --batch or --batch-check" msgstr "--batch veya --batch-check ile olan tüm nesneleri göster" -#: builtin/cat-file.c:666 +#: builtin/cat-file.c:664 msgid "do not order --batch-all-objects output" msgstr "--batch-all-objects çıktısını sıralama" @@ -11989,7 +12026,7 @@ msgid "terminate input and output records by a NUL character" msgstr "girdi ve çıktı kayıtlarını bir NUL karakteri ile sonlandır" #: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 -#: builtin/worktree.c:491 +#: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "ilerleme bildirimini gizle" @@ -12047,9 +12084,10 @@ msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<seçenekler>]" #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/submodule--helper.c:1825 -#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836 -#: builtin/submodule--helper.c:2334 builtin/worktree.c:719 +#: builtin/column.c:31 builtin/submodule--helper.c:1824 +#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835 +#: builtin/submodule--helper.c:2333 builtin/worktree.c:491 +#: builtin/worktree.c:728 msgid "string" msgstr "dizi" @@ -12222,7 +12260,7 @@ msgstr "'%s' için başvuru günlüğü yapılamıyor: %s\n" msgid "HEAD is now at" msgstr "HEAD konumu:" -#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "HEAD güncellenemiyor" @@ -12361,7 +12399,7 @@ msgstr "yalnızca bir başvuru bekleniyordu" msgid "only one reference expected, %d given." msgstr "yalnızca bir başvuru bekleniyordu, %d verildi" -#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438 +#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "geçersiz başvuru: %s" @@ -12468,7 +12506,7 @@ msgstr "dal veya işleme argümanı eksik" msgid "perform a 3-way merge with the new branch" msgstr "yeni dal ile bir 3 yönlü birleştirme gerçekleştir" -#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323 +#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323 msgid "style" msgstr "stil" @@ -12558,7 +12596,7 @@ msgstr "git checkout: --detach bir '%s' yol argümanı almıyor" msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file, --detach ile uyumsuz" -#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634 +#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file, --patch ile uyumsuz" @@ -12576,7 +12614,7 @@ msgstr "eski durumuna getirilecek yolları belirtmelisiniz" #: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 #: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484 #: builtin/worktree.c:486 msgid "branch" msgstr "dal" @@ -12668,7 +12706,7 @@ msgstr "%s dizini atlanacak\n" msgid "could not lstat %s\n" msgstr "%s 'lstat' yapılamadı\n" -#: builtin/clean.c:302 git-add--interactive.perl:593 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12681,7 +12719,7 @@ msgstr "" "foo - benzersiz öneke dayanarak bir öge seç\n" " - (boş) hiçbir şey seçme\n" -#: builtin/clean.c:306 git-add--interactive.perl:602 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12701,33 +12739,33 @@ msgstr "" "* - tüm ögeleri seç\n" " - (boş) seçimi bitir\n" -#: builtin/clean.c:521 git-add--interactive.perl:568 +#: builtin/clean.c:519 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Pardon (%s)?\n" -#: builtin/clean.c:661 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "Girdi için yok sayma dizgileri>> " -#: builtin/clean.c:696 +#: builtin/clean.c:693 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "UYARI: Şununla eşleşen ögeler bulunamıyor: %s" -#: builtin/clean.c:717 +#: builtin/clean.c:714 msgid "Select items to delete" msgstr "Silinecek ögeleri seçin" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:755 #, c-format msgid "Remove %s [y/N]? " msgstr "%s kaldırılsın mı [y/N]? " -#: builtin/clean.c:789 +#: builtin/clean.c:786 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12745,52 +12783,52 @@ msgstr "" "help - bu ekranı görüntüle\n" "? - istem seçimi için yardım" -#: builtin/clean.c:825 +#: builtin/clean.c:822 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Aşağıdaki öge kaldırılacak:" msgstr[1] "Aşağıdaki ögeler kaldırılacak:" -#: builtin/clean.c:841 +#: builtin/clean.c:838 msgid "No more files to clean, exiting." msgstr "Temizlenecek başka dosya yok, çıkılıyor." -#: builtin/clean.c:903 +#: builtin/clean.c:900 msgid "do not print names of files removed" msgstr "kaldırılan dosyaların adlarını yazdırma" -#: builtin/clean.c:905 +#: builtin/clean.c:902 msgid "force" msgstr "zorla" -#: builtin/clean.c:906 +#: builtin/clean.c:903 msgid "interactive cleaning" msgstr "etkileşimli temizlik" -#: builtin/clean.c:908 +#: builtin/clean.c:905 msgid "remove whole directories" msgstr "dizinleri tümüyle kaldır" -#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186 +#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186 #: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "dizgi" -#: builtin/clean.c:910 +#: builtin/clean.c:907 msgid "add <pattern> to ignore rules" msgstr "yok sayma kurallarına <dizgi> ekle" -#: builtin/clean.c:911 +#: builtin/clean.c:908 msgid "remove ignored files, too" msgstr "yok sayılan dosyalar da kaldırıldı" -#: builtin/clean.c:913 +#: builtin/clean.c:910 msgid "remove only ignored files" msgstr "yalnızca yok sayılan dosyaları kaldır" -#: builtin/clean.c:929 +#: builtin/clean.c:925 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -12798,7 +12836,7 @@ msgstr "" "clean.requireForce 'true' olarak ayarlanmış ve ne -i ne -n ne de -f " "verilmiş; temizleme reddediliyor" -#: builtin/clean.c:932 +#: builtin/clean.c:928 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -12806,7 +12844,7 @@ msgstr "" "clean.requireForce öntanımlı olarak 'true' ve ne -i ne -n ne de -f verilmiş; " "temizleme reddediliyor" -#: builtin/clean.c:944 +#: builtin/clean.c:940 msgid "-x and -X cannot be used together" msgstr "-x ve -X birlikte kullanılamaz" @@ -12822,7 +12860,7 @@ msgstr "sığ depoyu klonlama" msgid "don't create a checkout" msgstr "çıkış yapma!" -#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542 msgid "create a bare repository" msgstr "çıplak bir depo oluştur" @@ -12854,26 +12892,26 @@ msgstr "klon içerisindeki altmodülleri ilklendir" msgid "number of submodules cloned in parallel" msgstr "paralelde klonlanan altmodüllerin sayısı" -#: builtin/clone.c:116 builtin/init-db.c:538 +#: builtin/clone.c:116 builtin/init-db.c:539 msgid "template-directory" msgstr "şablon dizini" -#: builtin/clone.c:117 builtin/init-db.c:539 +#: builtin/clone.c:117 builtin/init-db.c:540 msgid "directory from which templates will be used" msgstr "şablonların kullanılacağı dizin" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832 -#: builtin/submodule--helper.c:2337 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "başvuru deposu" -#: builtin/clone.c:123 builtin/submodule--helper.c:1834 -#: builtin/submodule--helper.c:2339 +#: builtin/clone.c:123 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "--reference'ı yalnızca klonlarken kullan" -#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495 +#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495 #: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 msgid "name" msgstr "ad" @@ -12890,7 +12928,7 @@ msgstr "uzak konumun HEAD'i yerine <dal>'ı çıkış yap" msgid "path to git-upload-pack on the remote" msgstr "uzak konumdaki git-upload-pack'e olan yol" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862 #: builtin/pull.c:208 msgid "depth" msgstr "derinlik" @@ -12899,7 +12937,7 @@ msgstr "derinlik" msgid "create a shallow clone of that depth" msgstr "verilen derinlikte sığ bir depo oluştur" -#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964 #: builtin/pull.c:211 msgid "time" msgstr "zaman" @@ -12917,8 +12955,8 @@ msgstr "revizyon" msgid "deepen history of shallow clone, excluding rev" msgstr "revizyonu hariç tutarak sığ klonun geçmişini derinleştir" -#: builtin/clone.c:137 builtin/submodule--helper.c:1844 -#: builtin/submodule--helper.c:2353 +#: builtin/clone.c:137 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "yalnızca bir dal klonla, HEAD veya --branch" @@ -12930,11 +12968,11 @@ msgstr "etiket klonlama ve sonraki getirmeler de onları izlemesin" msgid "any cloned submodules will be shallow" msgstr "klonlanan altmodüller sığ olacak" -#: builtin/clone.c:142 builtin/init-db.c:547 +#: builtin/clone.c:142 builtin/init-db.c:548 msgid "gitdir" msgstr "git dizini" -#: builtin/clone.c:143 builtin/init-db.c:548 +#: builtin/clone.c:143 builtin/init-db.c:549 msgid "separate git dir from working tree" msgstr "git dizinini çalışma ağacından ayır" @@ -12947,22 +12985,22 @@ msgid "set config inside the new repository" msgstr "yapılandırmayı yeni deponun içinde ayarla" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 +#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196 msgid "server-specific" msgstr "sunucuya özel" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 +#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197 msgid "option to transmit" msgstr "iletme seçeneği" #: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 -#: builtin/push.c:585 +#: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "yalnızca IPv4 adresleri kullan" #: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 -#: builtin/push.c:587 +#: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "yalnızca IPv6 adresleri kullan" @@ -13064,7 +13102,7 @@ msgstr "temizlik için yeniden paketlenemiyor" msgid "cannot unlink temporary alternates file" msgstr "geçici alternatifler dosyasının bağlantısı kesilemiyor" -#: builtin/clone.c:1001 builtin/receive-pack.c:2491 +#: builtin/clone.c:1001 builtin/receive-pack.c:2490 msgid "Too many arguments." msgstr "Çok fazla argüman." @@ -13086,7 +13124,7 @@ msgstr "--bare ve --separate-git-dir birbiriyle uyumsuz." msgid "repository '%s' does not exist" msgstr "'%s' deposu mevcut değil" -#: builtin/clone.c:1039 builtin/fetch.c:2011 +#: builtin/clone.c:1039 builtin/fetch.c:2014 #, c-format msgid "depth %s is not a positive number" msgstr "%s derinliği pozitif bir sayı değil" @@ -13107,7 +13145,7 @@ msgid "working tree '%s' already exists." msgstr "Çalışma ağacı '%s' halihazırda mevcut." #: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 -#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312 #, c-format msgid "could not create leading directories of '%s'" msgstr "şunun öncü dizinleri oluşturulamadı: '%s'" @@ -13164,12 +13202,16 @@ msgstr "kaynak depo sığ, --local yok sayılıyor" msgid "--local is ignored" msgstr "--local yok sayıldı" -#: builtin/clone.c:1337 builtin/clone.c:1345 +#: builtin/clone.c:1324 builtin/clone.c:1383 +msgid "remote transport reported error" +msgstr "uzak konum taşıması hata bildirdi" + +#: builtin/clone.c:1336 builtin/clone.c:1344 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "%s uzak dalı %s üstkaynağında bulunamadı" -#: builtin/clone.c:1348 +#: builtin/clone.c:1347 msgid "You appear to have cloned an empty repository." msgstr "Boş bir depoyu klonlamış görünüyorsunuz." @@ -13227,7 +13269,7 @@ msgid "could not find object directory matching %s" msgstr "'%s' ile eşleşen nesne dizini bulunamadı" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776 +#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779 msgid "dir" msgstr "dizin" @@ -13325,7 +13367,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "yinelenmiş üst öge %s yok sayıldı" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562 #, c-format msgid "not a valid object name %s" msgstr "%s geçerli bir nesne adı değil" @@ -13353,13 +13395,13 @@ msgstr "üst öge" msgid "id of a parent commit object" msgstr "bir üst işleme ögesinin no'su" -#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605 +#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601 #: builtin/tag.c:456 msgid "message" msgstr "ileti" -#: builtin/commit-tree.c:115 builtin/commit.c:1614 +#: builtin/commit-tree.c:115 builtin/commit.c:1624 msgid "commit message" msgstr "işleme iletisi" @@ -13367,7 +13409,7 @@ msgstr "işleme iletisi" msgid "read commit log message from file" msgstr "işleme günlük iletisini dosyadan oku" -#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299 +#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "işlemeyi GPG ile imzala" @@ -13472,7 +13514,7 @@ msgstr "Ana önbellek ağacı güncellenemedi" #: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508 msgid "unable to write new_index file" -msgstr "new_index_file yazılamıyor" +msgstr "new_index dosyası yazılamıyor" #: builtin/commit.c:489 msgid "cannot do a partial commit during a merge." @@ -13516,7 +13558,7 @@ msgstr "" "mevcut işleme iletisinde kullanılmayan bir yorum\n" "karakteri seçilemiyor" -#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158 +#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165 #, c-format msgid "could not lookup commit %s" msgstr "%s işlemesi aranamadı" @@ -13552,7 +13594,45 @@ msgstr "MERGE_MSG okunamadı" msgid "could not write commit template" msgstr "işleme şablonu yazılamadı" -#: builtin/commit.c:900 +#: builtin/commit.c:893 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored.\n" +msgstr "" +"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n" +"satırlar yok sayılacaktır.\n" + +#: builtin/commit.c:895 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n" +"satırlar yok sayılacaktır. Boş bir ileti işlemeyi iptal eder.\n" + +#: builtin/commit.c:899 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +msgstr "" +"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n" +"satırlar tutulacaktır; isterseniz onları kaldırabilirsiniz.\n" + +#: builtin/commit.c:903 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n" +"satırlar tutulacaktır; isterseniz onları kaldırabilirsiniz.\n" +"Boş bir ileti işlemeyi iptal eder.\n" + +#: builtin/commit.c:915 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -13566,7 +13646,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "ve yeniden deneyin.\n" -#: builtin/commit.c:905 +#: builtin/commit.c:920 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13580,201 +13660,181 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "ve yeniden deneyin.\n" -#: builtin/commit.c:915 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be ignored, and an empty message aborts the commit.\n" -msgstr "" -"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n" -"satırlar yok sayılacaktır. Boş bir ileti işlemeyi iptal eder.\n" - -#: builtin/commit.c:923 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be kept; you may remove them yourself if you want to.\n" -"An empty message aborts the commit.\n" -msgstr "" -"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n" -"satırlar tutulacaktır; isterseniz onları kaldırabilirsiniz.\n" -"Boş bir ileti işlemeyi iptal eder.\n" - -#: builtin/commit.c:940 +#: builtin/commit.c:947 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sYazar: %.*s <%.*s>" -#: builtin/commit.c:948 +#: builtin/commit.c:955 #, c-format msgid "%sDate: %s" msgstr "%sTarih: %s" -#: builtin/commit.c:955 +#: builtin/commit.c:962 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sİşleyici: %.*s <%.*s>" -#: builtin/commit.c:973 +#: builtin/commit.c:980 msgid "Cannot read index" msgstr "İndeks okunamıyor" -#: builtin/commit.c:1018 +#: builtin/commit.c:1025 msgid "unable to pass trailers to --trailers" msgstr "--trailers'a artbilgiler geçirilemiyor" -#: builtin/commit.c:1058 +#: builtin/commit.c:1065 msgid "Error building trees" msgstr "Ağaçlar yapılırken hata" -#: builtin/commit.c:1072 builtin/tag.c:319 +#: builtin/commit.c:1079 builtin/tag.c:319 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Lütfen iletiyi -m veya -F seçeneğini kullanarak destekleyin.\n" -#: builtin/commit.c:1116 +#: builtin/commit.c:1123 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s', 'Ad <e-posta>' biçiminde değil ve mevcut bir yazarla " "eşleşmiyor" -#: builtin/commit.c:1130 +#: builtin/commit.c:1137 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Geçersiz yok sayılanları göster kipi '%s'" -#: builtin/commit.c:1148 builtin/commit.c:1441 +#: builtin/commit.c:1155 builtin/commit.c:1448 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Geçersiz izlenmeyen dosyaları göster kipi '%s'" -#: builtin/commit.c:1188 +#: builtin/commit.c:1195 msgid "--long and -z are incompatible" msgstr "--long ve -z birbiriyle uyumsuz" -#: builtin/commit.c:1219 +#: builtin/commit.c:1226 msgid "You are in the middle of a merge -- cannot reword." msgstr "Bir birleştirmenin tam ortasındasınız -- ileti değiştirilemiyor." -#: builtin/commit.c:1221 +#: builtin/commit.c:1228 msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "Bir seç-al'ın tam ortasındasınız -- ileti değiştirilemiyor." -#: builtin/commit.c:1224 +#: builtin/commit.c:1231 #, c-format msgid "cannot combine reword option of --fixup with path '%s'" msgstr "" "--fixup'ın ileti değiştirme seçeneği '%s' yolu ile birlikte kullanılamıyor" -#: builtin/commit.c:1226 +#: builtin/commit.c:1233 msgid "" "reword option of --fixup is mutually exclusive with --patch/--interactive/--" "all/--include/--only" msgstr "" -"--fixup'ın ileti değiştirme seçeneği --patch/--interactive/--all/--include/" -"--only ile birlikte kullanılamaz" +"--fixup'ın ileti değiştirme seçeneği --patch/--interactive/--all/--include/--" +"only ile birlikte kullanılamaz" -#: builtin/commit.c:1245 +#: builtin/commit.c:1252 msgid "Using both --reset-author and --author does not make sense" msgstr "Hem --reset-author ve hem --author birlikte bir anlam ifade etmiyor" -#: builtin/commit.c:1254 +#: builtin/commit.c:1261 msgid "You have nothing to amend." msgstr "Değiştirecek bir şeyiniz yok." -#: builtin/commit.c:1257 +#: builtin/commit.c:1264 msgid "You are in the middle of a merge -- cannot amend." msgstr "Bir birleştirmenin tam ortasındasınız -- değiştirme yapılamıyor." -#: builtin/commit.c:1259 +#: builtin/commit.c:1266 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Bir seç-al'ın tam ortasındasınız -- değiştirme yapılamıyor." -#: builtin/commit.c:1261 +#: builtin/commit.c:1268 msgid "You are in the middle of a rebase -- cannot amend." msgstr "" "Bir yeniden temellendirmenin tam ortasındasınız -- değiştirme yapılamıyor." -#: builtin/commit.c:1264 +#: builtin/commit.c:1271 msgid "Options --squash and --fixup cannot be used together" msgstr "--squash ve --fixup seçenekleri birlikte kullanılamaz" -#: builtin/commit.c:1274 +#: builtin/commit.c:1281 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "-c/-C/-F/--fixup arasından yalnızca bir tanesi kullanılabilir." -#: builtin/commit.c:1276 +#: builtin/commit.c:1283 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "-m seçeneği -c/-C/-F ile birlikte kullanılamaz." -#: builtin/commit.c:1285 +#: builtin/commit.c:1292 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "--reset-author yalnızca -C, -c veya --amend ile birlikte kullanılabilir." -#: builtin/commit.c:1303 +#: builtin/commit.c:1310 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "--include/--only/--all/--interactive/--patch arasından yalnızca bir tanesi " "kullanılabilir." -#: builtin/commit.c:1331 +#: builtin/commit.c:1338 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "bilinmeyen seçenek: --fixup=%s:%s" -#: builtin/commit.c:1345 +#: builtin/commit.c:1352 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "'%s ...' yolları -a ile bir anlam ifade etmiyor" -#: builtin/commit.c:1476 builtin/commit.c:1642 +#: builtin/commit.c:1483 builtin/commit.c:1652 msgid "show status concisely" msgstr "durumu kısaca göster" -#: builtin/commit.c:1478 builtin/commit.c:1644 +#: builtin/commit.c:1485 builtin/commit.c:1654 msgid "show branch information" msgstr "dal bilgisini göster" -#: builtin/commit.c:1480 +#: builtin/commit.c:1487 msgid "show stash information" msgstr "zula bilgisini göster" -#: builtin/commit.c:1482 builtin/commit.c:1646 +#: builtin/commit.c:1489 builtin/commit.c:1656 msgid "compute full ahead/behind values" msgstr "tam önünde/arkasında değerlerini hesapla" -#: builtin/commit.c:1484 +#: builtin/commit.c:1491 msgid "version" msgstr "sürüm" -#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560 -#: builtin/worktree.c:681 +#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551 +#: builtin/worktree.c:690 msgid "machine-readable output" msgstr "makine tarafından okunabilir çıktı" -#: builtin/commit.c:1487 builtin/commit.c:1650 +#: builtin/commit.c:1494 builtin/commit.c:1660 msgid "show status in long format (default)" msgstr "durumu uzun biçimde göster (öntanımlı)" -#: builtin/commit.c:1490 builtin/commit.c:1653 +#: builtin/commit.c:1497 builtin/commit.c:1663 msgid "terminate entries with NUL" msgstr "girdileri NUL ile sonlandır" -#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656 +#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666 #: builtin/fast-export.c:1198 builtin/fast-export.c:1201 #: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 msgid "mode" msgstr "kip" -#: builtin/commit.c:1493 builtin/commit.c:1656 +#: builtin/commit.c:1500 builtin/commit.c:1666 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "izlenmeyen dosyaları göster, ist. bağlı kipler: all, normal, no (Öntanım.: " "all)" -#: builtin/commit.c:1497 +#: builtin/commit.c:1504 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13782,11 +13842,11 @@ msgstr "" "yok sayılan dosyaları göster, isteğe bağlı kipler: traditional (geleneksel) " "matching (eşleşen), no (hayır) (Öntanımlı: traditional)." -#: builtin/commit.c:1499 parse-options.h:193 +#: builtin/commit.c:1506 parse-options.h:193 msgid "when" msgstr "ne zaman" -#: builtin/commit.c:1500 +#: builtin/commit.c:1507 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -13794,198 +13854,198 @@ msgstr "" "altmodüllere olan değişiklikleri yok say, isteğe bağlı ne zaman: all " "(hepsi), dirty (kirli), untracked (izlenmeyen) (Öntanımlı: all)." -#: builtin/commit.c:1502 +#: builtin/commit.c:1509 msgid "list untracked files in columns" msgstr "izlenmeyen dosyaları sütunlarla göster" -#: builtin/commit.c:1503 +#: builtin/commit.c:1510 msgid "do not detect renames" msgstr "yeniden adlandırmaları algılama" -#: builtin/commit.c:1505 +#: builtin/commit.c:1512 msgid "detect renames, optionally set similarity index" msgstr "" "yeniden adlandırmaları algıla, isteğe bağlı olarak benzerlik indeksi ayarla" -#: builtin/commit.c:1525 +#: builtin/commit.c:1535 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Yok sayılan ve izlenmeyen dosyalar argümanlarının desteklenmeyen birlikte " "kullanımı" -#: builtin/commit.c:1607 +#: builtin/commit.c:1617 msgid "suppress summary after successful commit" msgstr "başarılı işlemenin ardından özeti gizle" -#: builtin/commit.c:1608 +#: builtin/commit.c:1618 msgid "show diff in commit message template" msgstr "diff'i işleme iletisi şablonunda göster" -#: builtin/commit.c:1610 +#: builtin/commit.c:1620 msgid "Commit message options" msgstr "İşleme iletisi seçenekleri" -#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458 +#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458 msgid "read message from file" msgstr "iletiyi dosyadan oku" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "author" msgstr "yazar" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "override author for commit" msgstr "işleme yazarını geçersiz kıl" -#: builtin/commit.c:1613 builtin/gc.c:550 +#: builtin/commit.c:1623 builtin/gc.c:550 msgid "date" msgstr "tarih" -#: builtin/commit.c:1613 +#: builtin/commit.c:1623 msgid "override date for commit" msgstr "işleme tarihini geçersiz kıl" -#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622 +#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632 #: parse-options.h:329 ref-filter.h:90 msgid "commit" msgstr "işleme" -#: builtin/commit.c:1615 +#: builtin/commit.c:1625 msgid "reuse and edit message from specified commit" msgstr "belirtilen işlemenin iletisini düzenle ve yeniden kullan" -#: builtin/commit.c:1616 +#: builtin/commit.c:1626 msgid "reuse message from specified commit" msgstr "belirtilen işlemenin iletisini yeniden kullan" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c:1621 +#: builtin/commit.c:1631 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]işleme" -#: builtin/commit.c:1621 +#: builtin/commit.c:1631 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" "belirtilen işlemeyi değiştirmek/iletiyi yeniden yazmak için kendiliğinden " "tıkıştırma tarafından biçimlendirilen iletiyi kullan" -#: builtin/commit.c:1622 +#: builtin/commit.c:1632 msgid "use autosquash formatted message to squash specified commit" msgstr "" "belirtilen işlemeyi tıkıştırmak için kendiliğinden tıkıştırma tarafından " "biçimlendirilen iletiyi kullan" -#: builtin/commit.c:1623 +#: builtin/commit.c:1633 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "işlemenin yazarı şu andan itibaren benim (-C/-c/--amend ile kullanıldı)" -#: builtin/commit.c:1624 builtin/interpret-trailers.c:111 +#: builtin/commit.c:1634 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "artbilgi" -#: builtin/commit.c:1624 +#: builtin/commit.c:1634 msgid "add custom trailer(s)" msgstr "özel artbilgiler ekle" -#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302 +#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "bir Signed-off-by artbilgisi ekle" -#: builtin/commit.c:1626 +#: builtin/commit.c:1636 msgid "use specified template file" msgstr "belirtilen şablon dosyasını kullan" -#: builtin/commit.c:1627 +#: builtin/commit.c:1637 msgid "force edit of commit" msgstr "işlemeyi zorla düzenle" -#: builtin/commit.c:1629 +#: builtin/commit.c:1639 msgid "include status in commit message template" msgstr "işleme iletisi şablonunda durumu içer" -#: builtin/commit.c:1634 +#: builtin/commit.c:1644 msgid "Commit contents options" msgstr "İşleme içeriği seçenekleri" -#: builtin/commit.c:1635 +#: builtin/commit.c:1645 msgid "commit all changed files" msgstr "değiştirilen tüm dosyaları gönder" -#: builtin/commit.c:1636 +#: builtin/commit.c:1646 msgid "add specified files to index for commit" msgstr "belirtilen dosyaları işleme için indekse ekle" -#: builtin/commit.c:1637 +#: builtin/commit.c:1647 msgid "interactively add files" msgstr "dosyaları etkileşimli olarak ekle" -#: builtin/commit.c:1638 +#: builtin/commit.c:1648 msgid "interactively add changes" msgstr "değişiklikleri etkileşimli olarak ekle" -#: builtin/commit.c:1639 +#: builtin/commit.c:1649 msgid "commit only specified files" msgstr "yalnızca belirtilen dosyaları gönder" -#: builtin/commit.c:1640 +#: builtin/commit.c:1650 msgid "bypass pre-commit and commit-msg hooks" msgstr "pre-commit ve commit-msg kancalarını atla" -#: builtin/commit.c:1641 +#: builtin/commit.c:1651 msgid "show what would be committed" msgstr "neyin işleneceğini göster" -#: builtin/commit.c:1654 +#: builtin/commit.c:1664 msgid "amend previous commit" msgstr "önceki işlemeyi değiştir" -#: builtin/commit.c:1655 +#: builtin/commit.c:1665 msgid "bypass post-rewrite hook" msgstr "post-rewrite kancasını atla" -#: builtin/commit.c:1662 +#: builtin/commit.c:1672 msgid "ok to record an empty change" msgstr "boş bir değişikliğin kaydı yazılabilir" -#: builtin/commit.c:1664 +#: builtin/commit.c:1674 msgid "ok to record a change with an empty message" msgstr "boş iletili bir değişikliğin kaydı yazılabilir" -#: builtin/commit.c:1737 +#: builtin/commit.c:1747 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Hasar görmüş MERGE_HEAD dosyası (%s)" -#: builtin/commit.c:1744 +#: builtin/commit.c:1754 msgid "could not read MERGE_MODE" msgstr "MERGE_MODE okunamadı" -#: builtin/commit.c:1765 +#: builtin/commit.c:1775 #, c-format msgid "could not read commit message: %s" msgstr "işleme iletisi okunamadı: %s" -#: builtin/commit.c:1772 +#: builtin/commit.c:1782 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "İşleme iletisinin boş olmasından dolayı iptal ediliyor.\n" -#: builtin/commit.c:1777 +#: builtin/commit.c:1787 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "İşleme iptal ediliyor; iletiyi düzenlenmedi.\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1798 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "İşleme iletisi gövdesinin boş olmasından dolayı iptal ediliyor.\n" -#: builtin/commit.c:1824 +#: builtin/commit.c:1834 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -14622,35 +14682,35 @@ msgstr "'%s' konumunda geçici dosyalar var." msgid "you may want to cleanup or recover these." msgstr "Bunları temizlemek veya kurtarmak isteyebilirsiniz." -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "'diff.tool' yerine 'diff.guitool' kullan" -#: builtin/difftool.c:702 +#: builtin/difftool.c:701 msgid "perform a full-directory diff" msgstr "bir tam dizin diff'i gerçekleştir" -#: builtin/difftool.c:704 +#: builtin/difftool.c:703 msgid "do not prompt before launching a diff tool" msgstr "bir diff aracı çalıştırmadan önce sorma" -#: builtin/difftool.c:709 +#: builtin/difftool.c:708 msgid "use symlinks in dir-diff mode" msgstr "dir-diff kipinde sembolik bağlar kullan" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "tool" msgstr "araç" -#: builtin/difftool.c:711 +#: builtin/difftool.c:710 msgid "use the specified diff tool" msgstr "belirtilen diff aracını kullan" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "print a list of diff tools that may be used with `--tool`" msgstr "'-tool' ile birlikte kullanılabilecek diff araçlarının listesini çıkar" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -14658,31 +14718,31 @@ msgstr "" "çalıştırılan bir diff aracı sıfır olmayan bir çıkış kodu döndürdüğünde 'git-" "difftool'un çıkış yapmasını sağla" -#: builtin/difftool.c:719 +#: builtin/difftool.c:718 msgid "specify a custom command for viewing diffs" msgstr "diff'leri görüntülemek için özel bir komut belirle" -#: builtin/difftool.c:720 +#: builtin/difftool.c:719 msgid "passed to `diff`" msgstr "'diff'e aktarıldı" -#: builtin/difftool.c:735 +#: builtin/difftool.c:734 msgid "difftool requires worktree or --no-index" msgstr "difftool, çalışma ağacı veya --no-index gerektiriyor" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 msgid "--dir-diff is incompatible with --no-index" msgstr "-dir-diff, --no-index ile uyumsuz" -#: builtin/difftool.c:745 +#: builtin/difftool.c:744 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool ve --extcmd birlikte kullanılamaz" -#: builtin/difftool.c:753 +#: builtin/difftool.c:752 msgid "no <tool> given for --tool=<tool>" msgstr "--tool=<araç> için bir <araç> verilmedi" -#: builtin/difftool.c:760 +#: builtin/difftool.c:759 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "--extcmd=<komut> için bir <komut> verilmedi" @@ -14777,7 +14837,7 @@ msgstr "akışı sonlandırmak için 'done' özelliğini kullan" msgid "skip output of blob data" msgstr "ikili nesne verisi çıktısını atla" -#: builtin/fast-export.c:1222 builtin/log.c:1823 +#: builtin/fast-export.c:1222 builtin/log.c:1826 msgid "refspec" msgstr "başvuru belirteci" @@ -14913,8 +14973,9 @@ msgstr "paralelde getirilen altmodüllerin sayısı" #: builtin/fetch.c:164 msgid "modify the refspec to place all refs within refs/prefetch/" -msgstr "başvuru belirtecini tüm başvuruları refs/prefetch/'e yerleştirecek " -"biçimde değiştir" +msgstr "" +"başvuru belirtecini tüm başvuruları refs/prefetch/'e yerleştirecek biçimde " +"değiştir" #: builtin/fetch.c:166 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" @@ -14989,8 +15050,9 @@ msgstr "yalnızca bu nesneden ulaşılabilir nesnelerimiz olduğunu bildir" #: builtin/fetch.c:210 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" -msgstr "bir paket dosyasını getirme; bunun yerine pazarlık ipuçlarının " -"atalarını yazdır" +msgstr "" +"bir paket dosyasını getirme; bunun yerine pazarlık ipuçlarının atalarını " +"yazdır" #: builtin/fetch.c:213 builtin/fetch.c:215 msgid "run 'maintenance --auto' after fetching" @@ -15096,8 +15158,8 @@ msgstr "%s tüm gerekli nesneleri göndermedi\n" #: builtin/fetch.c:1129 #, c-format -msgid "reject %s because shallow roots are not allowed to be updated" -msgstr "%s reddedilmeli; çünkü sığ köklerin güncellenmesine izin verilmiyor" +msgid "rejected %s because shallow roots are not allowed to be updated" +msgstr "%s reddedildi; çünkü sığ köklerin güncellenmesine izin verilmiyor" #: builtin/fetch.c:1206 builtin/fetch.c:1357 #, c-format @@ -15197,49 +15259,54 @@ msgstr "" msgid "You need to specify a tag name." msgstr "Bir etiket adı belirtmeniz gerekiyor." -#: builtin/fetch.c:1995 +#: builtin/fetch.c:1994 +msgid "--negotiate-only needs one or more --negotiate-tip=*" +msgstr "--negotiate-only'nin bir veya daha çok --negotiate-tip=* gereksinimi " +"var" + +#: builtin/fetch.c:1998 msgid "Negative depth in --deepen is not supported" msgstr "--deepen için negatif derinlik desteklenmiyor" -#: builtin/fetch.c:1997 +#: builtin/fetch.c:2000 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen ve --depth birlikte kullanılamaz" -#: builtin/fetch.c:2002 +#: builtin/fetch.c:2005 msgid "--depth and --unshallow cannot be used together" msgstr "--depth ve --unshallow birlikte kullanılamaz" -#: builtin/fetch.c:2004 +#: builtin/fetch.c:2007 msgid "--unshallow on a complete repository does not make sense" msgstr "tam bir depo üzerinde --unshallow bir anlam ifade etmiyor" -#: builtin/fetch.c:2021 +#: builtin/fetch.c:2024 msgid "fetch --all does not take a repository argument" msgstr "fetch --all bir depo argümanı almıyor" -#: builtin/fetch.c:2023 +#: builtin/fetch.c:2026 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all başvuru belirteçleri ile birlikte bir anlam ifade etmiyor" -#: builtin/fetch.c:2032 +#: builtin/fetch.c:2035 #, c-format msgid "No such remote or remote group: %s" msgstr "Böyle bir uzak konum veya uzak konum grubu yok: %s" -#: builtin/fetch.c:2039 +#: builtin/fetch.c:2042 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "Bir grubu getirme ve başvuru belirteçleri tanımlama bir anlam ifade etmiyor" -#: builtin/fetch.c:2055 +#: builtin/fetch.c:2058 msgid "must supply remote when using --negotiate-only" msgstr "--negotiate-only kullanırken uzak konum sağlanmalıdır" -#: builtin/fetch.c:2060 +#: builtin/fetch.c:2063 msgid "Protocol does not support --negotiate-only, exiting." msgstr "Protokol, --negotiate-only desteklemiyor, çıkılıyor." -#: builtin/fetch.c:2079 +#: builtin/fetch.c:2082 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -15247,11 +15314,11 @@ msgstr "" "--filter yalnızca extensions.partialclone içinde yapılandırılmış uzak konum " "ile kullanılabilir." -#: builtin/fetch.c:2083 +#: builtin/fetch.c:2086 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic yalnızca bir uzak konumdan getirirken kullanılabilir" -#: builtin/fetch.c:2087 +#: builtin/fetch.c:2090 msgid "--stdin can only be used when fetching from one remote" msgstr "" "--stdin seçeneği yalnızca bir uzak konumdan getirilirken kullanılabilir" @@ -15358,7 +15425,7 @@ msgstr "bir depo yolları listesi tutan yapılandırma anahtarı" msgid "missing --config=<config>" msgstr "--config=<yapılandırma> eksik" -#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128 +#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129 msgid "unknown" msgstr "bilinmeyen" @@ -15374,16 +15441,16 @@ msgstr "%s %s içinde hata: %s" msgid "warning in %s %s: %s" msgstr "%s %s içinde uyarı: %s" -#: builtin/fsck.c:123 builtin/fsck.c:126 +#: builtin/fsck.c:124 builtin/fsck.c:127 #, c-format msgid "broken link from %7s %s" msgstr "şuradan kırık bağ: %7s %s" -#: builtin/fsck.c:135 +#: builtin/fsck.c:136 msgid "wrong object type in link" msgstr "bağda yanlış nesne türü" -#: builtin/fsck.c:151 +#: builtin/fsck.c:152 #, c-format msgid "" "broken link from %7s %s\n" @@ -15392,211 +15459,211 @@ msgstr "" "şuradan kırık bağ: %7s %s\n" " şuraya: %7s %s" -#: builtin/fsck.c:263 +#: builtin/fsck.c:264 #, c-format msgid "missing %s %s" msgstr "eksik %s %s" -#: builtin/fsck.c:290 +#: builtin/fsck.c:291 #, c-format msgid "unreachable %s %s" msgstr "ulaşılamayan %s %s" -#: builtin/fsck.c:310 +#: builtin/fsck.c:311 #, c-format msgid "dangling %s %s" msgstr "sarkan %s %s" -#: builtin/fsck.c:320 +#: builtin/fsck.c:321 msgid "could not create lost-found" msgstr "lost-found oluşturulamadı" -#: builtin/fsck.c:331 +#: builtin/fsck.c:332 #, c-format msgid "could not finish '%s'" msgstr "'%s' bitirilemedi" -#: builtin/fsck.c:348 +#: builtin/fsck.c:349 #, c-format msgid "Checking %s" msgstr "%s denetleniyor" -#: builtin/fsck.c:386 +#: builtin/fsck.c:387 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Bağlanabilirlik denetleniyor (%d nesne)" -#: builtin/fsck.c:405 +#: builtin/fsck.c:406 #, c-format msgid "Checking %s %s" msgstr "%s %s denetleniyor" -#: builtin/fsck.c:410 +#: builtin/fsck.c:411 msgid "broken links" msgstr "kırık bağlar" -#: builtin/fsck.c:419 +#: builtin/fsck.c:420 #, c-format msgid "root %s" msgstr "kök %s" -#: builtin/fsck.c:427 +#: builtin/fsck.c:428 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "%s %s (%s) şurada etiketlendi: %s" -#: builtin/fsck.c:456 +#: builtin/fsck.c:457 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: nesne hasar görmüş veya kayıp" -#: builtin/fsck.c:481 +#: builtin/fsck.c:482 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: geçersiz başvuru günlüğü girdisi %s" -#: builtin/fsck.c:495 +#: builtin/fsck.c:496 #, c-format msgid "Checking reflog %s->%s" msgstr "Başvuru günlüğü denetleniyor: %s->%s" -#: builtin/fsck.c:529 +#: builtin/fsck.c:530 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: geçersiz sha1 işaretçisi %s" -#: builtin/fsck.c:536 +#: builtin/fsck.c:537 #, c-format msgid "%s: not a commit" msgstr "%s: bir işleme değil" -#: builtin/fsck.c:590 +#: builtin/fsck.c:591 msgid "notice: No default references" msgstr "Uyarı: Öntanımlı başvurular yok" -#: builtin/fsck.c:605 +#: builtin/fsck.c:606 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: nesne hasar görmüş veya kayıp: %s" -#: builtin/fsck.c:618 +#: builtin/fsck.c:619 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: nesne ayrıştırılamadı: %s" -#: builtin/fsck.c:638 +#: builtin/fsck.c:639 #, c-format msgid "bad sha1 file: %s" msgstr "hatalı sha1 dosyası: %s" -#: builtin/fsck.c:653 +#: builtin/fsck.c:654 msgid "Checking object directory" msgstr "Nesne dizini denetleniyor" -#: builtin/fsck.c:656 +#: builtin/fsck.c:657 msgid "Checking object directories" msgstr "Nesne dizinleri denetleniyor" -#: builtin/fsck.c:671 +#: builtin/fsck.c:672 #, c-format msgid "Checking %s link" msgstr "%s bağ denetleniyor" -#: builtin/fsck.c:676 builtin/index-pack.c:866 +#: builtin/fsck.c:677 builtin/index-pack.c:864 #, c-format msgid "invalid %s" msgstr "geçersiz %s" -#: builtin/fsck.c:683 +#: builtin/fsck.c:684 #, c-format msgid "%s points to something strange (%s)" msgstr "%s garip bir şeye işaret ediyor (%s)" -#: builtin/fsck.c:689 +#: builtin/fsck.c:690 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: ayrık HEAD bir şeye işaret etmiyor" -#: builtin/fsck.c:693 +#: builtin/fsck.c:694 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "Uyarı: %s henüz doğmamış bir dala işaret ediyor (%s)" -#: builtin/fsck.c:705 +#: builtin/fsck.c:706 msgid "Checking cache tree" msgstr "Önbellek ağacı denetleniyor" -#: builtin/fsck.c:710 +#: builtin/fsck.c:711 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: cache-tree içinde geçersiz sha1 işaretçisi" -#: builtin/fsck.c:719 +#: builtin/fsck.c:720 msgid "non-tree in cache-tree" msgstr "cache-tree içinde ağaç olmayan öge" -#: builtin/fsck.c:750 +#: builtin/fsck.c:751 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<seçenekler>] [<nesne>...]" -#: builtin/fsck.c:756 +#: builtin/fsck.c:757 msgid "show unreachable objects" msgstr "ulaşılamayan nesneleri göster" -#: builtin/fsck.c:757 +#: builtin/fsck.c:758 msgid "show dangling objects" msgstr "sarkan nesneleri göster" -#: builtin/fsck.c:758 +#: builtin/fsck.c:759 msgid "report tags" msgstr "etiketleri bildir" -#: builtin/fsck.c:759 +#: builtin/fsck.c:760 msgid "report root nodes" msgstr "kök düğümleri bildir" -#: builtin/fsck.c:760 +#: builtin/fsck.c:761 msgid "make index objects head nodes" msgstr "indeks nesnelerini dal ucu düğümü yap" -#: builtin/fsck.c:761 +#: builtin/fsck.c:762 msgid "make reflogs head nodes (default)" msgstr "başvuru günlüklerini dal ucu düğümü yap (öntanımlı)" -#: builtin/fsck.c:762 +#: builtin/fsck.c:763 msgid "also consider packs and alternate objects" msgstr "ek olarak paketleri ve alternatif nesneleri de dikkate al" -#: builtin/fsck.c:763 +#: builtin/fsck.c:764 msgid "check only connectivity" msgstr "yalnızca bağlanabilirliği denetle" -#: builtin/fsck.c:764 builtin/mktag.c:75 +#: builtin/fsck.c:765 builtin/mktag.c:75 msgid "enable more strict checking" msgstr "daha kesin denetlemeyi etkinleştir" -#: builtin/fsck.c:766 +#: builtin/fsck.c:767 msgid "write dangling objects in .git/lost-found" msgstr "sarkan nesneleri .git/lost-found'a yaz" -#: builtin/fsck.c:767 builtin/prune.c:134 +#: builtin/fsck.c:768 builtin/prune.c:134 msgid "show progress" msgstr "ilerlemeyi göster" -#: builtin/fsck.c:768 +#: builtin/fsck.c:769 msgid "show verbose names for reachable objects" msgstr "ulaşılabilir nesneler için ayrıntılı adları göster" -#: builtin/fsck.c:827 builtin/index-pack.c:262 +#: builtin/fsck.c:828 builtin/index-pack.c:262 msgid "Checking objects" msgstr "Nesneler denetleniyor" -#: builtin/fsck.c:855 +#: builtin/fsck.c:856 #, c-format msgid "%s: object missing" msgstr "%s: nesne kayıp" -#: builtin/fsck.c:866 +#: builtin/fsck.c:867 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "geçersiz parametre: sha1 bekleniyordu, '%s' alındı" @@ -15878,8 +15945,8 @@ msgstr "geçersiz belirtilen iş parçacığı sayısı (%d), %s için" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793 -#: builtin/pack-objects.c:2969 +#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791 +#: builtin/pack-objects.c:3129 #, c-format msgid "no threads support, ignoring %s" msgstr "iş parçacığı desteği yok, %s yok sayılıyor" @@ -15894,243 +15961,243 @@ msgstr "ağaç okunamıyor (%s)" msgid "unable to grep from object of type %s" msgstr "%s türündeki bir nesneden grep yapılamıyor" -#: builtin/grep.c:739 +#: builtin/grep.c:738 #, c-format msgid "switch `%c' expects a numerical value" msgstr "'%c' anahtarı sayısal bir değer bekliyor" -#: builtin/grep.c:838 +#: builtin/grep.c:837 msgid "search in index instead of in the work tree" msgstr "çalışma ağacı yerine indekste ara" -#: builtin/grep.c:840 +#: builtin/grep.c:839 msgid "find in contents not managed by git" msgstr "git tarafından yönetilmeyen içerikte bul" -#: builtin/grep.c:842 +#: builtin/grep.c:841 msgid "search in both tracked and untracked files" msgstr "hem izlenen hem izlenmeyen dosyalar içinde ara" -#: builtin/grep.c:844 +#: builtin/grep.c:843 msgid "ignore files specified via '.gitignore'" msgstr "'.gitignore'da belirtilen dosyaları yok say" -#: builtin/grep.c:846 +#: builtin/grep.c:845 msgid "recursively search in each submodule" msgstr "her altmodülde özyineli olarak ara" -#: builtin/grep.c:849 +#: builtin/grep.c:848 msgid "show non-matching lines" msgstr "eşleşmeyen satırları göster" -#: builtin/grep.c:851 +#: builtin/grep.c:850 msgid "case insensitive matching" msgstr "BÜYÜK/küçük harf duyarsız eşleşme" -#: builtin/grep.c:853 +#: builtin/grep.c:852 msgid "match patterns only at word boundaries" msgstr "yalnızca sözcük sınırlarındaki dizgileri eşleştir" -#: builtin/grep.c:855 +#: builtin/grep.c:854 msgid "process binary files as text" msgstr "ikili dosyaları metin olarak işle" -#: builtin/grep.c:857 +#: builtin/grep.c:856 msgid "don't match patterns in binary files" msgstr "ikili dosyalardaki dizgileri eşleştirme" -#: builtin/grep.c:860 +#: builtin/grep.c:859 msgid "process binary files with textconv filters" msgstr "ikili dosyaları textconv süzgeçleri ile işle" -#: builtin/grep.c:862 +#: builtin/grep.c:861 msgid "search in subdirectories (default)" msgstr "altdizinlerde ara (öntanımlı)" -#: builtin/grep.c:864 +#: builtin/grep.c:863 msgid "descend at most <depth> levels" msgstr "en çok <derinlik> düzey in" -#: builtin/grep.c:868 +#: builtin/grep.c:867 msgid "use extended POSIX regular expressions" msgstr "genişletilmiş POSIX düzenli ifadelerini kullan" -#: builtin/grep.c:871 +#: builtin/grep.c:870 msgid "use basic POSIX regular expressions (default)" msgstr "temel POSIX düzenli ifadelerini kullan (öntanımlı)" -#: builtin/grep.c:874 +#: builtin/grep.c:873 msgid "interpret patterns as fixed strings" msgstr "dizgileri sabit diziler olarak yorumla" -#: builtin/grep.c:877 +#: builtin/grep.c:876 msgid "use Perl-compatible regular expressions" msgstr "Perl uyumlu düzenli ifadeler kullan" -#: builtin/grep.c:880 +#: builtin/grep.c:879 msgid "show line numbers" msgstr "satır numaralarını göster" -#: builtin/grep.c:881 +#: builtin/grep.c:880 msgid "show column number of first match" msgstr "ilk eşleşmenin sütun numarasını göster" -#: builtin/grep.c:882 +#: builtin/grep.c:881 msgid "don't show filenames" msgstr "dosya adlarını gösterme" -#: builtin/grep.c:883 +#: builtin/grep.c:882 msgid "show filenames" msgstr "dosya adlarını göster" -#: builtin/grep.c:885 +#: builtin/grep.c:884 msgid "show filenames relative to top directory" msgstr "dosya adlarını en üst dizine göreceli olarak göster" -#: builtin/grep.c:887 +#: builtin/grep.c:886 msgid "show only filenames instead of matching lines" msgstr "eşleşen satırlar yerine yalnızca dosya adlarını göster" -#: builtin/grep.c:889 +#: builtin/grep.c:888 msgid "synonym for --files-with-matches" msgstr "--files-with-matches eşanlamlısı" -#: builtin/grep.c:892 +#: builtin/grep.c:891 msgid "show only the names of files without match" msgstr "eşleşme olmadan yalnızca dosya adlarını göster" -#: builtin/grep.c:894 +#: builtin/grep.c:893 msgid "print NUL after filenames" msgstr "dosya adlarından sonra NUL yazdır" -#: builtin/grep.c:897 +#: builtin/grep.c:896 msgid "show only matching parts of a line" msgstr "yalnızca bir satırın eşleşen kısımlarını göster" -#: builtin/grep.c:899 +#: builtin/grep.c:898 msgid "show the number of matches instead of matching lines" msgstr "eşleşen satırlar yerine eşleşme sayısını göster" -#: builtin/grep.c:900 +#: builtin/grep.c:899 msgid "highlight matches" msgstr "eşleşmeleri vurgula" -#: builtin/grep.c:902 +#: builtin/grep.c:901 msgid "print empty line between matches from different files" msgstr "başka dosyalardan olan eşleşmelerin arasına boş satır yazdır" -#: builtin/grep.c:904 +#: builtin/grep.c:903 msgid "show filename only once above matches from same file" msgstr "" "aynı dosyadan olan eşleşmelerin üzerinde dosya adını yalnızca bir kez göster" -#: builtin/grep.c:907 +#: builtin/grep.c:906 msgid "show <n> context lines before and after matches" msgstr "eşleşmelerden önce ve sonra <n> satır bağlam göster" -#: builtin/grep.c:910 +#: builtin/grep.c:909 msgid "show <n> context lines before matches" msgstr "eşleşmelerden önce <n> satır bağlam göster" -#: builtin/grep.c:912 +#: builtin/grep.c:911 msgid "show <n> context lines after matches" msgstr "eşleşmelerden sonra <n> satır bağlam göster" -#: builtin/grep.c:914 +#: builtin/grep.c:913 msgid "use <n> worker threads" msgstr "<n> iş parçacığı kullan" -#: builtin/grep.c:915 +#: builtin/grep.c:914 msgid "shortcut for -C NUM" msgstr "-C NUM için kısayol" -#: builtin/grep.c:918 +#: builtin/grep.c:917 msgid "show a line with the function name before matches" msgstr "eşleşmelerden önce işlev adının olduğu bir satır göster" -#: builtin/grep.c:920 +#: builtin/grep.c:919 msgid "show the surrounding function" msgstr "çevresindeki işlevi göster" -#: builtin/grep.c:923 +#: builtin/grep.c:922 msgid "read patterns from file" msgstr "dizgileri dosyadan oku" -#: builtin/grep.c:925 +#: builtin/grep.c:924 msgid "match <pattern>" msgstr "<dizgi> ile eşleş" -#: builtin/grep.c:927 +#: builtin/grep.c:926 msgid "combine patterns specified with -e" msgstr "-e ile belirtilen dizgileri birleştir" -#: builtin/grep.c:939 +#: builtin/grep.c:938 msgid "indicate hit with exit status without output" msgstr "çıkış durumu ile olan eşleşmelerde çıktı verme" -#: builtin/grep.c:941 +#: builtin/grep.c:940 msgid "show only matches from files that match all patterns" msgstr "yalnızca tüm dizgilerle eşleşen dosyalardan eşleşmeleri göster" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "pager" msgstr "sayfalayıcı" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "show matching files in the pager" msgstr "sayfalayıcıda eşleşen dosyaları göster" -#: builtin/grep.c:948 +#: builtin/grep.c:947 msgid "allow calling of grep(1) (ignored by this build)" msgstr "grep(1)'in çağrılmasına izin ver (bu yapım tarafından yok sayıldı)" -#: builtin/grep.c:1014 +#: builtin/grep.c:1013 msgid "no pattern given" msgstr "bir dizgi verilmedi" -#: builtin/grep.c:1050 +#: builtin/grep.c:1049 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index veya --untracked revizyonlarla birlikte kullanılamaz" -#: builtin/grep.c:1058 +#: builtin/grep.c:1057 #, c-format msgid "unable to resolve revision: %s" msgstr "revizyon çözülemiyor: %s" -#: builtin/grep.c:1088 +#: builtin/grep.c:1087 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked, --recurse-submodules ile desteklenmiyor" -#: builtin/grep.c:1092 +#: builtin/grep.c:1091 msgid "invalid option combination, ignoring --threads" msgstr "geçersiz seçenek birleştirmesi, --threads yok sayılıyor" -#: builtin/grep.c:1095 builtin/pack-objects.c:3930 +#: builtin/grep.c:1094 builtin/pack-objects.c:4090 msgid "no threads support, ignoring --threads" msgstr "iş parçacığı desteği yok, --threads yok sayılıyor" -#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966 +#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126 #, c-format msgid "invalid number of threads specified (%d)" msgstr "geçersiz belirtilen iş parçacığı sayısı (%d)" -#: builtin/grep.c:1132 +#: builtin/grep.c:1131 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager yalnızca çalışma ağacında çalışır" -#: builtin/grep.c:1158 +#: builtin/grep.c:1157 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached veya --untracked, --no-index ile birlikte kullanılamıyor" -#: builtin/grep.c:1161 +#: builtin/grep.c:1160 msgid "--untracked cannot be used with --cached" msgstr "--untracked, --cached ile birlikte kullanılamıyor" -#: builtin/grep.c:1167 +#: builtin/grep.c:1166 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard, izlenen içerik için kullanılamıyor" -#: builtin/grep.c:1175 +#: builtin/grep.c:1174 msgid "both --cached and trees are given" msgstr "hem --cached hem ağaçlar verilmiş" @@ -16255,30 +16322,30 @@ msgstr "" msgid "'%s': unknown man viewer." msgstr "'%s': Bilinmeyen man görüntüleyicisi." -#: builtin/help.c:453 +#: builtin/help.c:452 msgid "no man viewer handled the request" msgstr "isteğe hiçbir man görüntüleyicisi ele almadı" -#: builtin/help.c:461 +#: builtin/help.c:459 msgid "no info viewer handled the request" msgstr "isteğe hiçbir bilgi görüntüleyicisi ele almadı" -#: builtin/help.c:520 builtin/help.c:531 git.c:348 +#: builtin/help.c:517 builtin/help.c:528 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s', '%s' olarak armalanmış" -#: builtin/help.c:534 git.c:380 +#: builtin/help.c:531 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "hatalı alias.%s dizisi: %s" -#: builtin/help.c:563 builtin/help.c:593 +#: builtin/help.c:561 builtin/help.c:591 #, c-format msgid "usage: %s%s" msgstr "kullanım: %s%s" -#: builtin/help.c:577 +#: builtin/help.c:575 msgid "'git help config' for more information" msgstr "ek bilgi için: 'git help config'" @@ -16316,7 +16383,7 @@ msgstr "girdide okuma hatası" msgid "used more bytes than were available" msgstr "kullanılabilir olandan daha çok bayt kullanıldı" -#: builtin/index-pack.c:325 builtin/pack-objects.c:624 +#: builtin/index-pack.c:325 builtin/pack-objects.c:756 msgid "pack too large for current definition of off_t" msgstr "paket off_t'nin geçerli tanımı için çok büyük" @@ -16343,238 +16410,238 @@ msgstr "paket imzası uyuşmazlığı" msgid "pack version %<PRIu32> unsupported" msgstr "paket sürümü %<PRIu32> desteklenmiyor" -#: builtin/index-pack.c:383 +#: builtin/index-pack.c:381 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paketin %<PRIuMAX> ofsetinde hatalı nesne var: %s" -#: builtin/index-pack.c:489 +#: builtin/index-pack.c:487 #, c-format msgid "inflate returned %d" msgstr "şişirme programı %d döndürdü" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:536 msgid "offset value overflow for delta base object" msgstr "delta tabanı nesnesi için ofset değeri taşımı" -#: builtin/index-pack.c:546 +#: builtin/index-pack.c:544 msgid "delta base offset is out of bound" msgstr "delta tabanı ofseti sınırlar dışında" -#: builtin/index-pack.c:554 +#: builtin/index-pack.c:552 #, c-format msgid "unknown object type %d" msgstr "bilinmeyen nesne türü %d" -#: builtin/index-pack.c:585 +#: builtin/index-pack.c:583 msgid "cannot pread pack file" msgstr "paket dosyası 'pread' yapılamıyor" -#: builtin/index-pack.c:587 +#: builtin/index-pack.c:585 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "zamansız paket dosyası sonu, %<PRIuMAX> bayt eksik" msgstr[1] "zamansız paket dosyası sonu, %<PRIuMAX> bayt eksik" -#: builtin/index-pack.c:613 +#: builtin/index-pack.c:611 msgid "serious inflate inconsistency" msgstr "ciddi şişirme programı tutarsızlığı" -#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788 -#: builtin/index-pack.c:827 builtin/index-pack.c:836 +#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786 +#: builtin/index-pack.c:825 builtin/index-pack.c:834 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "%s İLE SHA1 ÇARPIŞMASI BULUNDU!" -#: builtin/index-pack.c:761 builtin/pack-objects.c:171 -#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 +#: builtin/index-pack.c:759 builtin/pack-objects.c:292 +#: builtin/pack-objects.c:352 builtin/pack-objects.c:458 #, c-format msgid "unable to read %s" msgstr "%s okunamıyor" -#: builtin/index-pack.c:825 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object info %s" msgstr "mevcut %s nesne bilgisi okunamıyor" -#: builtin/index-pack.c:833 +#: builtin/index-pack.c:831 #, c-format msgid "cannot read existing object %s" msgstr "mevcut %s nesnesi okunamıyor" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:845 #, c-format msgid "invalid blob object %s" msgstr "geçersiz %s ikili nesnesi" -#: builtin/index-pack.c:850 builtin/index-pack.c:869 +#: builtin/index-pack.c:848 builtin/index-pack.c:867 msgid "fsck error in packed object" msgstr "paketlenmiş nesne içinde fsck hatası" -#: builtin/index-pack.c:871 +#: builtin/index-pack.c:869 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s ögesinin tüm alt ögeleri ulaşılabilir değil" -#: builtin/index-pack.c:932 builtin/index-pack.c:979 +#: builtin/index-pack.c:930 builtin/index-pack.c:977 msgid "failed to apply delta" msgstr "delta uygulanamadı" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Receiving objects" msgstr "Nesneler alınıyor" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Indexing objects" msgstr "Nesneler indeksleniyor" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1194 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paket hasar görmüş (SHA1 uyumsuzluğu)" -#: builtin/index-pack.c:1201 +#: builtin/index-pack.c:1199 msgid "cannot fstat packfile" msgstr "paket dosyası fstat yapılamıyor" -#: builtin/index-pack.c:1204 +#: builtin/index-pack.c:1202 msgid "pack has junk at the end" msgstr "paket sonunda döküntüler var" -#: builtin/index-pack.c:1216 +#: builtin/index-pack.c:1214 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() içindeki karmaşa akıl almaz düzeyde" -#: builtin/index-pack.c:1239 +#: builtin/index-pack.c:1237 msgid "Resolving deltas" msgstr "Deltalar çözülüyor" -#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732 +#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892 #, c-format msgid "unable to create thread: %s" msgstr "iş parçacığı oluşturulamadı: %s" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1281 msgid "confusion beyond insanity" msgstr "karmaşa akıl almaz düzeyde" -#: builtin/index-pack.c:1289 +#: builtin/index-pack.c:1287 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "%d yerel nesneyle tamamlandı" msgstr[1] "%d yerel nesneyle tamamlandı" -#: builtin/index-pack.c:1301 +#: builtin/index-pack.c:1299 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "%s için beklenmedik kuyruk sağlaması (disk hasarı?)" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1303 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paketin %d çözülmemiş deltası var" msgstr[1] "paketin %d çözülmemiş deltası var" -#: builtin/index-pack.c:1329 +#: builtin/index-pack.c:1327 #, c-format msgid "unable to deflate appended object (%d)" msgstr "iliştirilen nesne söndürülemedi (%d)" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1423 #, c-format msgid "local object %s is corrupt" msgstr "yerel nesne %s hasarlı" -#: builtin/index-pack.c:1446 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "paket dosyası adı '%s', '.%s' ile bitmiyor" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1468 #, c-format msgid "cannot write %s file '%s'" msgstr "%s dosyası '%s' yazılamıyor" -#: builtin/index-pack.c:1478 +#: builtin/index-pack.c:1476 #, c-format msgid "cannot close written %s file '%s'" msgstr "yazılmış %s dosyası '%s' kapatılamıyor" -#: builtin/index-pack.c:1504 +#: builtin/index-pack.c:1502 msgid "error while closing pack file" msgstr "paket dosyası kapatılırken hata" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1516 msgid "cannot store pack file" msgstr "paket dosyası depolanamıyor" -#: builtin/index-pack.c:1526 +#: builtin/index-pack.c:1524 msgid "cannot store index file" msgstr "indeks dosyası depolanamıyor" -#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977 +#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "hatalı pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1651 +#: builtin/index-pack.c:1649 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Mevcut paket dosyası '%s' açılamıyor" -#: builtin/index-pack.c:1653 +#: builtin/index-pack.c:1651 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "'%s' için mevcut paket idx dosyası açılamıyor" -#: builtin/index-pack.c:1701 +#: builtin/index-pack.c:1699 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "delta değil: %d nesne" msgstr[1] "delta değil: %d nesne" -#: builtin/index-pack.c:1708 +#: builtin/index-pack.c:1706 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "zincir uzunluğu = %d: %lu nesne" msgstr[1] "zincir uzunluğu = %d: %lu nesne" -#: builtin/index-pack.c:1750 +#: builtin/index-pack.c:1748 msgid "Cannot come back to cwd" msgstr "Şu anki çalışma dizinine geri gelinemiyor" -#: builtin/index-pack.c:1804 builtin/index-pack.c:1807 -#: builtin/index-pack.c:1823 builtin/index-pack.c:1827 +#: builtin/index-pack.c:1802 builtin/index-pack.c:1805 +#: builtin/index-pack.c:1821 builtin/index-pack.c:1825 #, c-format msgid "bad %s" msgstr "hatalı %s" -#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613 +#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614 #, c-format msgid "unknown hash algorithm '%s'" msgstr "bilinmeyen sağlama algoritması '%s'" -#: builtin/index-pack.c:1852 +#: builtin/index-pack.c:1850 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin, --stdin olmadan kullanılamaz" -#: builtin/index-pack.c:1854 +#: builtin/index-pack.c:1852 msgid "--stdin requires a git repository" msgstr "--stdin bir git dizini gerektirir" -#: builtin/index-pack.c:1856 +#: builtin/index-pack.c:1854 msgid "--object-format cannot be used with --stdin" msgstr "--object-format, --stdin olmadan kullanılamaz" -#: builtin/index-pack.c:1871 +#: builtin/index-pack.c:1869 msgid "--verify with no packfile name given" msgstr "--verify ile bir paket dosyası adı verilmedi" -#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584 +#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "paket nesnelerinde fsck hatası" @@ -16618,56 +16685,56 @@ msgstr "şablonlar %s içinde bulunamadı" msgid "not copying templates from '%s': %s" msgstr "şablonlar '%s' konumundan kopyalanmıyor: %s" -#: builtin/init-db.c:262 +#: builtin/init-db.c:263 #, c-format msgid "invalid initial branch name: '%s'" msgstr "geçersiz başlangıç dalı adı: '%s'" -#: builtin/init-db.c:353 +#: builtin/init-db.c:354 #, c-format msgid "unable to handle file type %d" msgstr "%d dosya türü ele alınamıyor" -#: builtin/init-db.c:356 +#: builtin/init-db.c:357 #, c-format msgid "unable to move %s to %s" msgstr "%s şuraya taşınamıyor: %s" -#: builtin/init-db.c:372 +#: builtin/init-db.c:373 msgid "attempt to reinitialize repository with different hash" msgstr "depoyu başka bir sağlama ile yeniden ilklendirme deneniyor" -#: builtin/init-db.c:396 builtin/init-db.c:399 +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "%s halihazırda var" -#: builtin/init-db.c:431 +#: builtin/init-db.c:432 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: --initial-branch=%s yok sayıldı" -#: builtin/init-db.c:462 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "%s%s içindeki mevcut paylaşılan Git deposu yeniden ilklendirildi\n" -#: builtin/init-db.c:463 +#: builtin/init-db.c:464 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "%s%s içindeki mevcut Git deposu yeniden ilklendirildi\n" -#: builtin/init-db.c:467 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "%s%s içinde paylaşılan boş Git deposu ilklendirildi\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:469 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "%s%s içinde boş Git deposu ilklendirildi\n" -#: builtin/init-db.c:517 +#: builtin/init-db.c:518 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -16675,41 +16742,41 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<şablon-dizini>] [--" "shared[=<izinler>]] [<dizin>]" -#: builtin/init-db.c:543 +#: builtin/init-db.c:544 msgid "permissions" msgstr "izinler" -#: builtin/init-db.c:544 +#: builtin/init-db.c:545 msgid "specify that the git repository is to be shared amongst several users" msgstr "git deposunun kullanıcılar arasında paylaşıp paylaşılmayacağını belirt" -#: builtin/init-db.c:550 +#: builtin/init-db.c:551 msgid "override the name of the initial branch" msgstr "başlangıç dalının adını geçersiz kıl" -#: builtin/init-db.c:551 builtin/verify-pack.c:74 +#: builtin/init-db.c:552 builtin/verify-pack.c:74 msgid "hash" msgstr "sağlama" -#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "kullanılacak sağlama algoritmasını belirle" -#: builtin/init-db.c:559 +#: builtin/init-db.c:560 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "--separate-git-dir ve --bare birlikte kullanılamaz" -#: builtin/init-db.c:590 builtin/init-db.c:595 +#: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" msgstr "%s mkdir yapılamıyor" -#: builtin/init-db.c:599 builtin/init-db.c:654 +#: builtin/init-db.c:600 builtin/init-db.c:655 #, c-format msgid "cannot chdir to %s" msgstr "%s ögesine chdir yapılamıyor" -#: builtin/init-db.c:626 +#: builtin/init-db.c:627 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -16718,12 +16785,12 @@ msgstr "" "%s (veya --work-tree=<dizin>), %s (veya --git-dir=<dizin>) belirlenmeden " "izin verilmiyor" -#: builtin/init-db.c:678 +#: builtin/init-db.c:679 #, c-format msgid "Cannot access work tree '%s'" msgstr "'%s' çalışma ağacı erişilemiyor" -#: builtin/init-db.c:683 +#: builtin/init-db.c:684 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir, çıplak depo ile uyumsuz" @@ -16832,85 +16899,85 @@ msgstr "" msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<erim>:<dosya>, yol belirteci ile kullanılamıyor" -#: builtin/log.c:303 +#: builtin/log.c:306 #, c-format msgid "Final output: %d %s\n" msgstr "Son çıktı: %d %s\n" -#: builtin/log.c:568 +#: builtin/log.c:571 #, c-format msgid "git show %s: bad file" msgstr "git show %s: hatalı dosya" -#: builtin/log.c:583 builtin/log.c:673 +#: builtin/log.c:586 builtin/log.c:676 #, c-format msgid "could not read object %s" msgstr "%s nesnesi okunamadı" -#: builtin/log.c:698 +#: builtin/log.c:701 #, c-format msgid "unknown type: %d" msgstr "bilinmeyen tür: %d" -#: builtin/log.c:843 +#: builtin/log.c:846 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: açıklama kipinden geçersiz kapak sayfası" -#: builtin/log.c:850 +#: builtin/log.c:853 msgid "format.headers without value" msgstr "format.headers değere iye değil" -#: builtin/log.c:979 +#: builtin/log.c:982 #, c-format msgid "cannot open patch file %s" msgstr "%s yama dosyası okunamıyor" -#: builtin/log.c:996 +#: builtin/log.c:999 msgid "need exactly one range" msgstr "bir tam erim gerekiyor" -#: builtin/log.c:1006 +#: builtin/log.c:1009 msgid "not a range" msgstr "bir erim değil" -#: builtin/log.c:1170 +#: builtin/log.c:1173 msgid "cover letter needs email format" msgstr "ön yazı için e-posta biçimi gerekli" -#: builtin/log.c:1176 +#: builtin/log.c:1179 msgid "failed to create cover-letter file" msgstr "cover-letter dosyası oluşturulamadı" -#: builtin/log.c:1263 +#: builtin/log.c:1266 #, c-format msgid "insane in-reply-to: %s" msgstr "akıl almaz in-reply-to: %s" -#: builtin/log.c:1290 +#: builtin/log.c:1293 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<seçenekler>] [<-beri> | <revizyon-erimi>]" -#: builtin/log.c:1348 +#: builtin/log.c:1351 msgid "two output directories?" msgstr "iki çıktı dizini?" -#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340 +#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 #, c-format msgid "unknown commit %s" msgstr "bilinmeyen işleme %s" -#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "'%s' geçerli bir başvuru olarak çözülemedi" -#: builtin/log.c:1519 +#: builtin/log.c:1522 msgid "could not find exact merge base" msgstr "kesin birleştirme temeli bulunamadı" -#: builtin/log.c:1529 +#: builtin/log.c:1532 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" @@ -16921,290 +16988,290 @@ msgstr "" "izleyin. Bunun dışında taban işlemesini kendiniz --base=<taban-işlemesi-no>\n" "kullanarak el ile belirtebilirsiniz." -#: builtin/log.c:1552 +#: builtin/log.c:1555 msgid "failed to find exact merge base" msgstr "kesin birleştirme temeli bulunamadı" -#: builtin/log.c:1569 +#: builtin/log.c:1572 msgid "base commit should be the ancestor of revision list" msgstr "taban işlemesi revizyon listesinin atası olmalı" -#: builtin/log.c:1579 +#: builtin/log.c:1582 msgid "base commit shouldn't be in revision list" msgstr "taban işlemesi revizyon listesinde olmamalı" -#: builtin/log.c:1637 +#: builtin/log.c:1640 msgid "cannot get patch id" msgstr "yama numarası alınamıyor" -#: builtin/log.c:1700 +#: builtin/log.c:1703 msgid "failed to infer range-diff origin of current series" msgstr "geçerli dizinin range-diff kökeninden bir anlam çıkartılamadı" -#: builtin/log.c:1702 +#: builtin/log.c:1705 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "geçerli dizinin range-diff kökeni olarak '%s' kullanılıyor" -#: builtin/log.c:1746 +#: builtin/log.c:1749 msgid "use [PATCH n/m] even with a single patch" msgstr "bir yamayla bile olsa [PATCH n/m] kullan" -#: builtin/log.c:1749 +#: builtin/log.c:1752 msgid "use [PATCH] even with multiple patches" msgstr "birden çok yama bile olsa [PATCH] kullan" -#: builtin/log.c:1753 +#: builtin/log.c:1756 msgid "print patches to standard out" msgstr "yamaları standart çıktıya yazdır" -#: builtin/log.c:1755 +#: builtin/log.c:1758 msgid "generate a cover letter" msgstr "bir ön yazı oluştur" -#: builtin/log.c:1757 +#: builtin/log.c:1760 msgid "use simple number sequence for output file names" msgstr "çıktı dosya adları için yalın sayı dizisi oluştur" -#: builtin/log.c:1758 +#: builtin/log.c:1761 msgid "sfx" msgstr "sonek" -#: builtin/log.c:1759 +#: builtin/log.c:1762 msgid "use <sfx> instead of '.patch'" msgstr "'.patch' yerine <sonek> kullan" -#: builtin/log.c:1761 +#: builtin/log.c:1764 msgid "start numbering patches at <n> instead of 1" msgstr "yamaları 1 yerine <n>'de numaralandırmaya başla" -#: builtin/log.c:1762 +#: builtin/log.c:1765 msgid "reroll-count" msgstr "reroll-count" -#: builtin/log.c:1763 +#: builtin/log.c:1766 msgid "mark the series as Nth re-roll" msgstr "diziyi n. deneme olarak imle" -#: builtin/log.c:1765 +#: builtin/log.c:1768 msgid "max length of output filename" msgstr "çıktı dosya adının olabilecek en çok uzunluğu" -#: builtin/log.c:1767 +#: builtin/log.c:1770 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "[PATCH] yerine [RFC PATCH] kullan" -#: builtin/log.c:1770 +#: builtin/log.c:1773 msgid "cover-from-description-mode" msgstr "açıklama kipinden kapak sayfası kipi" -#: builtin/log.c:1771 +#: builtin/log.c:1774 msgid "generate parts of a cover letter based on a branch's description" msgstr "ön yazının bazı kısımlarını dalın açıklamasından oluştur" -#: builtin/log.c:1773 +#: builtin/log.c:1776 msgid "use [<prefix>] instead of [PATCH]" msgstr "[PATCH] yerine [<önek>] kullan" -#: builtin/log.c:1776 +#: builtin/log.c:1779 msgid "store resulting files in <dir>" msgstr "ortaya çıkan dosyaları <dizin>'de depola" -#: builtin/log.c:1779 +#: builtin/log.c:1782 msgid "don't strip/add [PATCH]" msgstr "[PATCH]'i soyma/ekleme" -#: builtin/log.c:1782 +#: builtin/log.c:1785 msgid "don't output binary diffs" msgstr "ikili diff'leri çıktı verme" -#: builtin/log.c:1784 +#: builtin/log.c:1787 msgid "output all-zero hash in From header" msgstr "From başlığında tümü sıfırdan oluşan sağlama çıktısı ver" -#: builtin/log.c:1786 +#: builtin/log.c:1789 msgid "don't include a patch matching a commit upstream" msgstr "üstkaynaktaki bir işleme ile eşleşen bir yamayı içerme" -#: builtin/log.c:1788 +#: builtin/log.c:1791 msgid "show patch format instead of default (patch + stat)" msgstr "öntanımlı yerine yama biçimini göster (patch + stat)" -#: builtin/log.c:1790 +#: builtin/log.c:1793 msgid "Messaging" msgstr "İletileşme" -#: builtin/log.c:1791 +#: builtin/log.c:1794 msgid "header" msgstr "üstbilgi" -#: builtin/log.c:1792 +#: builtin/log.c:1795 msgid "add email header" msgstr "e-posta üstbilgisi ekle" -#: builtin/log.c:1793 builtin/log.c:1794 +#: builtin/log.c:1796 builtin/log.c:1797 msgid "email" msgstr "e-posta" -#: builtin/log.c:1793 +#: builtin/log.c:1796 msgid "add To: header" msgstr "To: üstbilgisi ekle" -#: builtin/log.c:1794 +#: builtin/log.c:1797 msgid "add Cc: header" msgstr "Cc: üstbilgisi ekle" -#: builtin/log.c:1795 +#: builtin/log.c:1798 msgid "ident" msgstr "tanımlayıcı" -#: builtin/log.c:1796 +#: builtin/log.c:1799 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "From adresini <tanımlayıcı> olarak ayarla (veya yoksa işleyici tanımlayıcısı)" -#: builtin/log.c:1798 +#: builtin/log.c:1801 msgid "message-id" msgstr "ileti no" -#: builtin/log.c:1799 +#: builtin/log.c:1802 msgid "make first mail a reply to <message-id>" msgstr "ilk postayı <ileti no>'ya bir yanıt yap" -#: builtin/log.c:1800 builtin/log.c:1803 +#: builtin/log.c:1803 builtin/log.c:1806 msgid "boundary" msgstr "sınır" -#: builtin/log.c:1801 +#: builtin/log.c:1804 msgid "attach the patch" msgstr "yamayı ekle" -#: builtin/log.c:1804 +#: builtin/log.c:1807 msgid "inline the patch" msgstr "yamayı iletiye koy" -#: builtin/log.c:1808 +#: builtin/log.c:1811 msgid "enable message threading, styles: shallow, deep" msgstr "iletileri kataloglamayı etkinleştir, stiller: shallow, deep" -#: builtin/log.c:1810 +#: builtin/log.c:1813 msgid "signature" msgstr "imza" -#: builtin/log.c:1811 +#: builtin/log.c:1814 msgid "add a signature" msgstr "imza ekle" -#: builtin/log.c:1812 +#: builtin/log.c:1815 msgid "base-commit" msgstr "taban işleme" -#: builtin/log.c:1813 +#: builtin/log.c:1816 msgid "add prerequisite tree info to the patch series" msgstr "yama dizisine önkoşul ağaç bilgisini ekle" -#: builtin/log.c:1816 +#: builtin/log.c:1819 msgid "add a signature from a file" msgstr "dosyadan bir imza ekle" -#: builtin/log.c:1817 +#: builtin/log.c:1820 msgid "don't print the patch filenames" msgstr "yama dosya adlarını yazdırma" -#: builtin/log.c:1819 +#: builtin/log.c:1822 msgid "show progress while generating patches" msgstr "yamalar oluşturulurken ilerlemeyi göster" -#: builtin/log.c:1821 +#: builtin/log.c:1824 msgid "show changes against <rev> in cover letter or single patch" msgstr "<rev> karşısındaki değişiklikleri ön yazıda veya tek bir yamada göster" -#: builtin/log.c:1824 +#: builtin/log.c:1827 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "<bşvr-blrtç> karşısındaki değişiklikleri ön yazıda veya tek bir yamada göster" -#: builtin/log.c:1826 builtin/range-diff.c:28 +#: builtin/log.c:1829 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "oluşumun tartıldığı yüzde" -#: builtin/log.c:1913 +#: builtin/log.c:1916 #, c-format msgid "invalid ident line: %s" msgstr "geçersiz tanımlayıcı satırı: %s" -#: builtin/log.c:1928 +#: builtin/log.c:1931 msgid "-n and -k are mutually exclusive" msgstr "-n ve -k birlikte kullanılamaz" -#: builtin/log.c:1930 +#: builtin/log.c:1933 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc ve -k birlikte kullanılamaz" -#: builtin/log.c:1938 +#: builtin/log.c:1941 msgid "--name-only does not make sense" msgstr "--name-only bir anlam ifade etmiyor" -#: builtin/log.c:1940 +#: builtin/log.c:1943 msgid "--name-status does not make sense" msgstr "--name-status bir anlam ifade etmiyor" -#: builtin/log.c:1942 +#: builtin/log.c:1945 msgid "--check does not make sense" msgstr "--check bir anlam ifade etmiyor" -#: builtin/log.c:1964 +#: builtin/log.c:1967 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "--stdout, --output ve --output-directory birlikte kullanılamaz" -#: builtin/log.c:2087 +#: builtin/log.c:2089 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff, --cover-letter veya tek yama gerektiriyor" -#: builtin/log.c:2091 +#: builtin/log.c:2093 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:2092 +#: builtin/log.c:2094 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff v%d karşısında:" -#: builtin/log.c:2098 +#: builtin/log.c:2100 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor, --range-diff gerektiriyor" -#: builtin/log.c:2102 +#: builtin/log.c:2104 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff, --cover-letter veya tek yama gerektiriyor" -#: builtin/log.c:2110 +#: builtin/log.c:2112 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:2111 +#: builtin/log.c:2113 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff v%d karşısında:" -#: builtin/log.c:2122 +#: builtin/log.c:2124 #, c-format msgid "unable to read signature file '%s'" msgstr "'%s' imza dosyası okunamıyor" -#: builtin/log.c:2158 +#: builtin/log.c:2160 msgid "Generating patches" msgstr "Yamalar oluşturuluyor" -#: builtin/log.c:2202 +#: builtin/log.c:2204 msgid "failed to create output files" msgstr "çıktı dosyaları oluşturulamadı" -#: builtin/log.c:2261 +#: builtin/log.c:2263 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<üstkaynak> [<dal-ucu> [<sınır>]]]" -#: builtin/log.c:2315 +#: builtin/log.c:2317 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -17569,14 +17636,6 @@ msgstr "%s, %s ile birleştiriliyor\n" msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<seçenekler>] [<işleme>...]" -#: builtin/merge.c:59 -msgid "git merge --abort" -msgstr "git merge --abort" - -#: builtin/merge.c:60 -msgid "git merge --continue" -msgstr "git merge --continue" - #: builtin/merge.c:123 msgid "switch `m' requires a value" msgstr "'m' anahtarı bir değer gerektiriyor" @@ -17734,7 +17793,7 @@ msgstr "İki uç işlemenin birleştirilmesi dışında bir şey yapılmıyor." msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive için geçersiz seçenek: -X%s" -#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "%s yazılamıyor" @@ -18034,7 +18093,7 @@ msgstr "" "yeniden paketleme sırasında daha küçük boyutlu paket dosyalarını bu boyuttan " "daha büyük bir toplu iş olarak toplayın" -#: builtin/multi-pack-index.c:180 +#: builtin/multi-pack-index.c:179 #, c-format msgid "unrecognized subcommand: %s" msgstr "tanımlanamayan altkomut: %s" @@ -18573,7 +18632,7 @@ msgstr "var olmayan notu kaldırma denemesi bir hata değil" msgid "read object names from the standard input" msgstr "nesne adlarını standart girdi'den oku" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146 msgid "do not remove, show only" msgstr "kaldırma, yalnızca göster" @@ -18589,25 +18648,25 @@ msgstr "not başvurusu" msgid "use notes from <notes-ref>" msgstr "notları <not-bşvr>'ndan kullan" -#: builtin/notes.c:1034 builtin/stash.c:1739 +#: builtin/notes.c:1034 builtin/stash.c:1735 #, c-format msgid "unknown subcommand: %s" msgstr "bilinmeyen altkomut: %s" -#: builtin/pack-objects.c:54 +#: builtin/pack-objects.c:182 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<seçenekler>...] [< <bşvr-liste> | < <nesne-" "liste>]" -#: builtin/pack-objects.c:55 +#: builtin/pack-objects.c:183 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<sçnklr>...] <base-name> [< <bşvr-liste> | < <nesne-liste>]" -#: builtin/pack-objects.c:440 +#: builtin/pack-objects.c:572 #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " @@ -18616,108 +18675,108 @@ msgstr "" "write_reuse_object: %s bulunamıyor, %<PRIuMAX> ofsetinde bekleniyordu (%s " "paketinde)" -#: builtin/pack-objects.c:448 +#: builtin/pack-objects.c:580 #, c-format msgid "bad packed object CRC for %s" msgstr "%s için hatalı paketlenmiş nesne CRC'si" -#: builtin/pack-objects.c:459 +#: builtin/pack-objects.c:591 #, c-format msgid "corrupt packed object for %s" msgstr "%s için hasar görmüş paketlenmiş nesne" -#: builtin/pack-objects.c:590 +#: builtin/pack-objects.c:722 #, c-format msgid "recursive delta detected for object %s" msgstr "%s nesnesi için özyineli delta algılandı" -#: builtin/pack-objects.c:801 +#: builtin/pack-objects.c:941 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u nesne sipariş verildi, %<PRIu32> bekleniyordu" -#: builtin/pack-objects.c:896 +#: builtin/pack-objects.c:1036 #, c-format msgid "expected object at offset %<PRIuMAX> in pack %s" msgstr "şu paketin %<PRIuMAX> ofsetinde nesne bekleniyordu: %s" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1155 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "biteşlem yazımı kapatılıyor, paketler pack.packSizeLimit dolayısıyla " "parçalara ayrılmış" -#: builtin/pack-objects.c:1028 +#: builtin/pack-objects.c:1168 msgid "Writing objects" msgstr "Nesneler yazılıyor" -#: builtin/pack-objects.c:1089 builtin/update-index.c:90 +#: builtin/pack-objects.c:1229 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "%s bilgileri alınamıyor" -#: builtin/pack-objects.c:1141 +#: builtin/pack-objects.c:1281 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> nesne yazıldı (%<PRIu32> bekleniyordu)" -#: builtin/pack-objects.c:1383 +#: builtin/pack-objects.c:1523 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "bazı nesneler paketlenmediğinden dolayı biteşlem yazımı kapatılıyor" -#: builtin/pack-objects.c:1831 +#: builtin/pack-objects.c:1971 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s için paket içinde delta taban ofset taşımı" -#: builtin/pack-objects.c:1840 +#: builtin/pack-objects.c:1980 #, c-format msgid "delta base offset out of bound for %s" msgstr "%s için delta taban ofseti sınırların dışında" -#: builtin/pack-objects.c:2121 +#: builtin/pack-objects.c:2261 msgid "Counting objects" msgstr "Nesneler sayılıyor" -#: builtin/pack-objects.c:2266 +#: builtin/pack-objects.c:2426 #, c-format msgid "unable to parse object header of %s" msgstr "%s nesne üstbilgisi ayrıştırılamıyor" -#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352 -#: builtin/pack-objects.c:2362 +#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512 +#: builtin/pack-objects.c:2522 #, c-format msgid "object %s cannot be read" msgstr "%s nesnesi okunamıyor" -#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366 +#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "%s nesnesi için tutarsız nesne uzunluğu (%<PRIuMAX> / %<PRIuMAX>)" -#: builtin/pack-objects.c:2376 +#: builtin/pack-objects.c:2536 msgid "suboptimal pack - out of memory" msgstr "standart altı paket - bellek yetersiz" -#: builtin/pack-objects.c:2691 +#: builtin/pack-objects.c:2851 #, c-format msgid "Delta compression using up to %d threads" msgstr "Delta sıkıştırması %d iş parçacığı kullanıyor" -#: builtin/pack-objects.c:2830 +#: builtin/pack-objects.c:2990 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "%s etiketinden ulaşılabilir nesneler paketlenemiyor" -#: builtin/pack-objects.c:2916 +#: builtin/pack-objects.c:3076 msgid "Compressing objects" msgstr "Nesneler sıkıştırılıyor" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:3082 msgid "inconsistency with delta count" msgstr "delta sayımında tutarsızlık" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3161 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -18726,7 +18785,7 @@ msgstr "" "uploadpack.blobpackfileuri değeri '<nesne-sağlaması> <paket-sağlaması> <uri> " "biçiminde olmalıdır ('%s' alındı)" -#: builtin/pack-objects.c:3004 +#: builtin/pack-objects.c:3164 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" @@ -18734,17 +18793,17 @@ msgstr "" "nesne halihazırda başka bir uploadpack.blobpackfileuri içinde yapılandırıldı " "('%s' alındı)" -#: builtin/pack-objects.c:3039 +#: builtin/pack-objects.c:3199 #, c-format msgid "could not get type of object %s in pack %s" msgstr "%s nesnesinin türü alınamıyor (%s paketinde)" -#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175 +#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335 #, c-format msgid "could not find pack '%s'" msgstr "'%s' paketi bulunamadı" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3378 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18753,7 +18812,7 @@ msgstr "" "sınır nesnesi numarası bekleniyordu, anlamsız veri alındı:\n" " %s" -#: builtin/pack-objects.c:3224 +#: builtin/pack-objects.c:3384 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18762,249 +18821,249 @@ msgstr "" "nesne numarası bekleniyordu, anlamsız veri alındı:\n" "%s" -#: builtin/pack-objects.c:3322 +#: builtin/pack-objects.c:3482 msgid "invalid value for --missing" msgstr "--missing için geçersiz değer" -#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490 +#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650 msgid "cannot open pack index" msgstr "paket indeksi açılamıyor" -#: builtin/pack-objects.c:3412 +#: builtin/pack-objects.c:3572 #, c-format msgid "loose object at %s could not be examined" msgstr "%s konumundaki gevşek nesne incelenemedi" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3658 msgid "unable to force loose object" msgstr "gevşek nesne zorlanamıyor" -#: builtin/pack-objects.c:3628 +#: builtin/pack-objects.c:3788 #, c-format msgid "not a rev '%s'" msgstr "bir revizyon değil: '%s'" -#: builtin/pack-objects.c:3631 +#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061 #, c-format msgid "bad revision '%s'" msgstr "hatalı revizyon: '%s'" -#: builtin/pack-objects.c:3659 +#: builtin/pack-objects.c:3819 msgid "unable to add recent objects" msgstr "en son nesneler eklenemiyor" -#: builtin/pack-objects.c:3712 +#: builtin/pack-objects.c:3872 #, c-format msgid "unsupported index version %s" msgstr "desteklenmeyen indeks sürümü %s" -#: builtin/pack-objects.c:3716 +#: builtin/pack-objects.c:3876 #, c-format msgid "bad index version '%s'" msgstr "hatalı indeks sürümü '%s'" -#: builtin/pack-objects.c:3755 +#: builtin/pack-objects.c:3915 msgid "<version>[,<offset>]" msgstr "<sürüm>[,<ofset>]" -#: builtin/pack-objects.c:3756 +#: builtin/pack-objects.c:3916 msgid "write the pack index file in the specified idx format version" msgstr "paket indeks dosyasını belirtilen idx biçiminde yaz" -#: builtin/pack-objects.c:3759 +#: builtin/pack-objects.c:3919 msgid "maximum size of each output pack file" msgstr "her çıktı paketi dosyasının olabilecek en büyük boyutu" -#: builtin/pack-objects.c:3761 +#: builtin/pack-objects.c:3921 msgid "ignore borrowed objects from alternate object store" msgstr "alternatif nesne mağazasından ödünç alınan nesneleri yok say" -#: builtin/pack-objects.c:3763 +#: builtin/pack-objects.c:3923 msgid "ignore packed objects" msgstr "paketlenmiş nesneleri yok say" -#: builtin/pack-objects.c:3765 +#: builtin/pack-objects.c:3925 msgid "limit pack window by objects" msgstr "paket penceresini nesnelerle sınırla" -#: builtin/pack-objects.c:3767 +#: builtin/pack-objects.c:3927 msgid "limit pack window by memory in addition to object limit" msgstr "paket penceresini nesne limitine ek olarak bellek ile kısıtla" -#: builtin/pack-objects.c:3769 +#: builtin/pack-objects.c:3929 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "ortaya çıkan pakette olabilecek en büyük delta zincirinin uzunluğu" -#: builtin/pack-objects.c:3771 +#: builtin/pack-objects.c:3931 msgid "reuse existing deltas" msgstr "var olan deltaları yeniden kullan" -#: builtin/pack-objects.c:3773 +#: builtin/pack-objects.c:3933 msgid "reuse existing objects" msgstr "var olan nesneleri yeniden kullan" -#: builtin/pack-objects.c:3775 +#: builtin/pack-objects.c:3935 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA nesneleri kullan" -#: builtin/pack-objects.c:3777 +#: builtin/pack-objects.c:3937 msgid "use threads when searching for best delta matches" msgstr "en iyi delta eşleşmelerini ararken iş parçacıklarını kullan" -#: builtin/pack-objects.c:3779 +#: builtin/pack-objects.c:3939 msgid "do not create an empty pack output" msgstr "boş bir paket çıktısı oluşturma" -#: builtin/pack-objects.c:3781 +#: builtin/pack-objects.c:3941 msgid "read revision arguments from standard input" msgstr "revizyon argümanlarını standart girdi'den oku" -#: builtin/pack-objects.c:3783 +#: builtin/pack-objects.c:3943 msgid "limit the objects to those that are not yet packed" msgstr "nesneleri henüz paketlenmeyenlere kısıtla" -#: builtin/pack-objects.c:3786 +#: builtin/pack-objects.c:3946 msgid "include objects reachable from any reference" msgstr "herhangi bir başvurudan ulaşılabilir olan nesneleri içer" -#: builtin/pack-objects.c:3789 +#: builtin/pack-objects.c:3949 msgid "include objects referred by reflog entries" msgstr "başvuru günlüğü tarafından başvurulan nesneleri içer" -#: builtin/pack-objects.c:3792 +#: builtin/pack-objects.c:3952 msgid "include objects referred to by the index" msgstr "indeks tarafından başvurulan nesneleri içer" -#: builtin/pack-objects.c:3795 +#: builtin/pack-objects.c:3955 msgid "read packs from stdin" msgstr "paketleri stdin'den oku" -#: builtin/pack-objects.c:3797 +#: builtin/pack-objects.c:3957 msgid "output pack to stdout" msgstr "paketi stdout'a çıktı ver" -#: builtin/pack-objects.c:3799 +#: builtin/pack-objects.c:3959 msgid "include tag objects that refer to objects to be packed" msgstr "paketlenecek nesnelere başvuran etiket nesnelerini içer" -#: builtin/pack-objects.c:3801 +#: builtin/pack-objects.c:3961 msgid "keep unreachable objects" msgstr "ulaşılamayan nesneleri tut" -#: builtin/pack-objects.c:3803 +#: builtin/pack-objects.c:3963 msgid "pack loose unreachable objects" msgstr "ulaşılamayan gevşek nesneleri paketle" -#: builtin/pack-objects.c:3805 +#: builtin/pack-objects.c:3965 msgid "unpack unreachable objects newer than <time>" msgstr "<zaman>'dan daha yeni ulaşılamayan nesneleri aç" -#: builtin/pack-objects.c:3808 +#: builtin/pack-objects.c:3968 msgid "use the sparse reachability algorithm" msgstr "aralıklı ulaşılabilirlik algoritmasını kullan" -#: builtin/pack-objects.c:3810 +#: builtin/pack-objects.c:3970 msgid "create thin packs" msgstr "ince paketler oluştur" -#: builtin/pack-objects.c:3812 +#: builtin/pack-objects.c:3972 msgid "create packs suitable for shallow fetches" msgstr "sığ getirmelere uygun paketler oluştur" -#: builtin/pack-objects.c:3814 +#: builtin/pack-objects.c:3974 msgid "ignore packs that have companion .keep file" msgstr "eşlik eden .keep dosyasına iye paketleri yok say" -#: builtin/pack-objects.c:3816 +#: builtin/pack-objects.c:3976 msgid "ignore this pack" msgstr "bu paketi yok say" -#: builtin/pack-objects.c:3818 +#: builtin/pack-objects.c:3978 msgid "pack compression level" msgstr "paket sıkıştırma düzeyi" -#: builtin/pack-objects.c:3820 +#: builtin/pack-objects.c:3980 msgid "do not hide commits by grafts" msgstr "aşılarla gelen işlemeleri gizleme" -#: builtin/pack-objects.c:3822 +#: builtin/pack-objects.c:3982 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "nesnelerin sayımını hızlandırmak için eğer varsa bir biteşlem indeksi kullan" -#: builtin/pack-objects.c:3824 +#: builtin/pack-objects.c:3984 msgid "write a bitmap index together with the pack index" msgstr "paket indeksiyle birlikte bir biteşlem indeksi de yaz" -#: builtin/pack-objects.c:3828 +#: builtin/pack-objects.c:3988 msgid "write a bitmap index if possible" msgstr "eğer olanaklıysa bir biteşlem indeksi yaz" -#: builtin/pack-objects.c:3832 +#: builtin/pack-objects.c:3992 msgid "handling for missing objects" msgstr "eksik nesneler için işlem" -#: builtin/pack-objects.c:3835 +#: builtin/pack-objects.c:3995 msgid "do not pack objects in promisor packfiles" msgstr "nesneleri vaatçi paket dosyalarıyla paketleme" -#: builtin/pack-objects.c:3837 +#: builtin/pack-objects.c:3997 msgid "respect islands during delta compression" msgstr "delta sıkıştırması sırasında adalara uy" -#: builtin/pack-objects.c:3839 +#: builtin/pack-objects.c:3999 msgid "protocol" msgstr "protokol" -#: builtin/pack-objects.c:3840 +#: builtin/pack-objects.c:4000 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" "bu protokol ile herhangi bir yapılandırılmış uploadpack.blobpackfileuri " "ögesini hariç tut" -#: builtin/pack-objects.c:3873 +#: builtin/pack-objects.c:4033 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "delta zincir derinliği %d çok derin, %d zorlanıyor" -#: builtin/pack-objects.c:3878 +#: builtin/pack-objects.c:4038 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit çok yüksek, %d zorlanıyor" -#: builtin/pack-objects.c:3934 +#: builtin/pack-objects.c:4094 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "--max-pack-size, aktarım için bir paket yapımında kullanılamaz" -#: builtin/pack-objects.c:3936 +#: builtin/pack-objects.c:4096 msgid "minimum pack size limit is 1 MiB" msgstr "olabilecek en küçük paket boyutu limiti 1 MiB'dır" -#: builtin/pack-objects.c:3941 +#: builtin/pack-objects.c:4101 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin bir indekslenebilir paket yapımında kullanılamaz" -#: builtin/pack-objects.c:3944 +#: builtin/pack-objects.c:4104 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable ve --unpack-unreachable birbiriyle uyumsuz" -#: builtin/pack-objects.c:3950 +#: builtin/pack-objects.c:4110 msgid "cannot use --filter without --stdout" msgstr "--filter, --stdout olmadan kullanılamaz" -#: builtin/pack-objects.c:3952 +#: builtin/pack-objects.c:4112 msgid "cannot use --filter with --stdin-packs" msgstr "--filter, --stdin-packs ile birlikte kullanılamıyor" -#: builtin/pack-objects.c:3956 +#: builtin/pack-objects.c:4116 msgid "cannot use internal rev list with --stdin-packs" msgstr "iç revizyon listeleri, --stdin-packs ile birlikte kullanılamıyor" -#: builtin/pack-objects.c:4015 +#: builtin/pack-objects.c:4175 msgid "Enumerating objects" msgstr "Nesneler ortaya dökülüyor" -#: builtin/pack-objects.c:4052 +#: builtin/pack-objects.c:4212 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -19224,19 +19283,19 @@ msgstr "" "değiştirin. Öntanımlı yapılandırmayı yürütme sırasında --rebase,\n" "--no-rebase veya --ff-only ile geçersiz kılabilirsiniz.\n" -#: builtin/pull.c:991 +#: builtin/pull.c:990 msgid "Updating an unborn branch with changes added to the index." msgstr "İndekse eklenen değişikliklerle henüz doğmamış bir dal güncelleniyor." -#: builtin/pull.c:995 +#: builtin/pull.c:994 msgid "pull with rebase" msgstr "yeniden temellendirme ile çekim" -#: builtin/pull.c:996 +#: builtin/pull.c:995 msgid "please commit or stash them." msgstr "Lütfen onları işleyin veya zulalayın." -#: builtin/pull.c:1021 +#: builtin/pull.c:1020 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -19247,7 +19306,7 @@ msgstr "" "Çalışma ağacınız %s işlemesinden\n" "ileri sarılıyor." -#: builtin/pull.c:1027 +#: builtin/pull.c:1026 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -19264,15 +19323,15 @@ msgstr "" "$ git reset --hard\n" "komutunu çalıştırın." -#: builtin/pull.c:1042 +#: builtin/pull.c:1041 msgid "Cannot merge multiple branches into empty head." msgstr "Boş dal ucuna birden çok dal birleştirilemez." -#: builtin/pull.c:1046 +#: builtin/pull.c:1045 msgid "Cannot rebase onto multiple branches." msgstr "Birden çok dala yeniden temellendirme yapılamaz." -#: builtin/pull.c:1067 +#: builtin/pull.c:1065 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "yerelde kaydı yazılmış altmodül değişiklikleriyle yeniden temellendirme " @@ -19338,7 +19397,7 @@ msgstr "" "\n" "\tgit push %s HEAD:<uzak-konum-dalının-adı>\n" -#: builtin/push.c:194 +#: builtin/push.c:191 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -19352,12 +19411,18 @@ msgstr "" "\n" "\tgit push --set-upstream %s %s\n" -#: builtin/push.c:202 +#: builtin/push.c:199 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "Geçerli %s dalının birden çok üstkaynağı var, itme reddediliyor." -#: builtin/push.c:205 +#: builtin/push.c:217 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" +"İtmek için bir başvuru belirteci belirtmediniz ve push.default \"nothing\"." + +#: builtin/push.c:243 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -19368,13 +19433,7 @@ msgstr "" "itileceğini belirtmeden itiyorsunuz; ancak o geçerli '%s'\n" "dalınızın üstkaynağı değil." -#: builtin/push.c:260 -msgid "" -"You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "" -"İtmek için bir başvuru belirteci belirtmediniz ve push.default \"nothing\"." - -#: builtin/push.c:267 +#: builtin/push.c:258 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -19386,7 +19445,7 @@ msgstr "" "değişiklikleri entegre edin (örn. 'git pull ...').\n" "Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a bakın." -#: builtin/push.c:273 +#: builtin/push.c:264 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -19398,7 +19457,7 @@ msgstr "" "yapın ve uzak konumdaki değişiklikleri entegre edin (örn. 'git pull ...').\n" "Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a bakın." -#: builtin/push.c:279 +#: builtin/push.c:270 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -19412,11 +19471,11 @@ msgstr "" "etmek isteyebilirsiniz (örn. 'git pull ...').\n" "Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a bakın." -#: builtin/push.c:286 +#: builtin/push.c:277 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Güncellemeler reddedildi; çünkü etiket uzak konumda halihazırda var." -#: builtin/push.c:289 +#: builtin/push.c:280 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -19426,7 +19485,7 @@ msgstr "" "veya --force seçeneğini kullanmadan bir uzak başvuruyu işlemesi\n" "olmayan bir nesneye işaret etmesini sağlaması için güncelleyemezsiniz.\n" -#: builtin/push.c:294 +#: builtin/push.c:285 msgid "" "Updates were rejected because the tip of the remote-tracking\n" "branch has been updated since the last checkout. You may want\n" @@ -19437,103 +19496,103 @@ msgstr "" "yana güncellenmiş. Bir güncellemeyi zorlamadan önce bu değişiklikleri yerel\n" "olarak entegre etmek isteyebilirsiniz (örn. 'git pull ...'\n" -#: builtin/push.c:364 +#: builtin/push.c:355 #, c-format msgid "Pushing to %s\n" msgstr "İtme konumu: %s\n" -#: builtin/push.c:371 +#: builtin/push.c:362 #, c-format msgid "failed to push some refs to '%s'" msgstr "bazı başvurular '%s' konumuna itilemedi" -#: builtin/push.c:553 +#: builtin/push.c:544 msgid "repository" msgstr "depo" -#: builtin/push.c:554 builtin/send-pack.c:189 +#: builtin/push.c:545 builtin/send-pack.c:189 msgid "push all refs" msgstr "tüm başvuruları it" -#: builtin/push.c:555 builtin/send-pack.c:191 +#: builtin/push.c:546 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "tüm başvuruları yansıla" -#: builtin/push.c:557 +#: builtin/push.c:548 msgid "delete refs" msgstr "başvuruları sil" -#: builtin/push.c:558 +#: builtin/push.c:549 msgid "push tags (can't be used with --all or --mirror)" msgstr "etiketleri it (--all veya --mirror ile kullanılamaz)" -#: builtin/push.c:561 builtin/send-pack.c:192 +#: builtin/push.c:552 builtin/send-pack.c:192 msgid "force updates" msgstr "zorla güncelle" -#: builtin/push.c:562 builtin/send-pack.c:204 +#: builtin/push.c:553 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "<başvuruadı>:<bekle>" -#: builtin/push.c:563 builtin/send-pack.c:205 +#: builtin/push.c:554 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "başvurunun eski değerinin bu değerde olmasını gerektir" -#: builtin/push.c:566 builtin/send-pack.c:208 +#: builtin/push.c:557 builtin/send-pack.c:208 msgid "require remote updates to be integrated locally" msgstr "uzak güncellemelerin yerele entegre edilmesini gerektir" -#: builtin/push.c:569 +#: builtin/push.c:560 msgid "control recursive pushing of submodules" msgstr "altmodüllerin özyineli itilmesini denetle" -#: builtin/push.c:570 builtin/send-pack.c:199 +#: builtin/push.c:561 builtin/send-pack.c:199 msgid "use thin pack" msgstr "ince paket kullan" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186 #: builtin/send-pack.c:187 msgid "receive pack program" msgstr "paket programını al" -#: builtin/push.c:573 +#: builtin/push.c:564 msgid "set upstream for git pull/status" msgstr "git pull/status için üstkaynak ayarla" -#: builtin/push.c:576 +#: builtin/push.c:567 msgid "prune locally removed refs" msgstr "yerelde kaldırılan başvuruları buda" -#: builtin/push.c:578 +#: builtin/push.c:569 msgid "bypass pre-push hook" msgstr "pre-push kancasını atla" -#: builtin/push.c:579 +#: builtin/push.c:570 msgid "push missing but relevant tags" msgstr "eksik; ancak ilgili etiketleri it" -#: builtin/push.c:581 builtin/send-pack.c:193 +#: builtin/push.c:572 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "itmeyi GPG ile imzala" -#: builtin/push.c:583 builtin/send-pack.c:200 +#: builtin/push.c:574 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "uzak tarafta atomsal işlem iste" -#: builtin/push.c:601 +#: builtin/push.c:592 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete; --all, --mirror ve --tags ile uyumsuz" -#: builtin/push.c:603 +#: builtin/push.c:594 msgid "--delete doesn't make sense without any refs" msgstr "--delete bir başvuru olmadan anlam ifade etmiyor" -#: builtin/push.c:623 +#: builtin/push.c:614 #, c-format msgid "bad repository '%s'" msgstr "hatalı depo '%s'" -#: builtin/push.c:624 +#: builtin/push.c:615 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -19555,27 +19614,27 @@ msgstr "" "\n" "\tgit push <ad>\n" -#: builtin/push.c:639 +#: builtin/push.c:630 msgid "--all and --tags are incompatible" msgstr "--all ve --tags birbiriyle uyumsuz" -#: builtin/push.c:641 +#: builtin/push.c:632 msgid "--all can't be combined with refspecs" msgstr "--all başvuru belirteçleriyle birleştirilemez" -#: builtin/push.c:645 +#: builtin/push.c:636 msgid "--mirror and --tags are incompatible" msgstr "--mirror ve --tags birbiriyle uyumsuz" -#: builtin/push.c:647 +#: builtin/push.c:638 msgid "--mirror can't be combined with refspecs" msgstr "--mirror başvuru belirteçleriyle birleştirilemez" -#: builtin/push.c:650 +#: builtin/push.c:641 msgid "--all and --mirror are incompatible" msgstr "--all ve --mirror birbiriyle uyumsuz" -#: builtin/push.c:657 +#: builtin/push.c:648 msgid "push options must not have new line characters" msgstr "itme seçeneklerinde yeni satır karakterleri olmamalı" @@ -20162,7 +20221,7 @@ msgstr "" "--edit-todo seçeneği yalnızca etkileşimli yeniden temellendirme sırasında " "kullanılabilir." -#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122 msgid "Cannot read HEAD" msgstr "HEAD okunamıyor" @@ -20269,8 +20328,8 @@ msgstr "'%s' geçerli bir işlemeye işaret etmiyor" msgid "fatal: no such branch/commit '%s'" msgstr "onulmaz: böyle bir dal/işleme yok: '%s'" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:2415 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:39 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Böyle bir başvuru yok: %s" @@ -20340,7 +20399,7 @@ msgstr "%s, %s konumuna ileri sarıldı.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dizini>" -#: builtin/receive-pack.c:1276 +#: builtin/receive-pack.c:1275 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" @@ -20369,7 +20428,7 @@ msgstr "" "denyCurrentBranch'\n" "yapılandırma değişkenini 'refuse' olarak ayarlayın." -#: builtin/receive-pack.c:1296 +#: builtin/receive-pack.c:1295 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" @@ -20389,11 +20448,11 @@ msgstr "" "değişkenini 'warn' veya 'ignore' olarak ayarlayabilirsiniz.\n" "Bu iletiyi susturmak için onu 'refuse' olarak ayarlayın." -#: builtin/receive-pack.c:2479 +#: builtin/receive-pack.c:2478 msgid "quiet" msgstr "sessiz" -#: builtin/receive-pack.c:2493 +#: builtin/receive-pack.c:2492 msgid "You must specify a directory." msgstr "Bir dizin belirtmelisiniz." @@ -21374,15 +21433,15 @@ msgstr "-l ile yalnızca bir dizgi verilebilir" msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <yol>... | status | remaining | diff | gc]" -#: builtin/rerere.c:60 +#: builtin/rerere.c:58 msgid "register clean resolutions in index" msgstr "indeksteki temiz çözümlerin kaydını yap" -#: builtin/rerere.c:79 +#: builtin/rerere.c:77 msgid "'git rerere forget' without paths is deprecated" msgstr "yol olmadan 'git rerere forget' kullanım dışı" -#: builtin/rerere.c:113 +#: builtin/rerere.c:111 #, c-format msgid "unable to generate diff for '%s'" msgstr "'%s' için diff oluşturulamıyor" @@ -21536,19 +21595,19 @@ msgstr "İndeks dosyası '%s' revizyonuna sıfırlanamadı." msgid "Could not write new index file." msgstr "Yeni indeks dosyası yazılamadı." -#: builtin/rev-list.c:538 +#: builtin/rev-list.c:541 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "--exclude-promisor-objects ve --missing birlikte kullanılamıyor" -#: builtin/rev-list.c:599 +#: builtin/rev-list.c:602 msgid "object filtering requires --objects" msgstr "nesne süzme --objects gerektiriyor" -#: builtin/rev-list.c:659 +#: builtin/rev-list.c:674 msgid "rev-list does not support display of notes" msgstr "rev-list not görüntülemesini desteklemiyor" -#: builtin/rev-list.c:664 +#: builtin/rev-list.c:679 msgid "marked counting is incompatible with --objects" msgstr "imlenmiş sayım, --objects ile uyumsuz" @@ -21568,6 +21627,18 @@ msgstr "seçenek olmayan ilk argümandan sonra ayrıştırmayı durdur" msgid "output in stuck long form" msgstr "uzun biçimde çıktı ver" +#: builtin/rev-parse.c:438 +msgid "premature end of input" +msgstr "zamansız girdi sonu" + +#: builtin/rev-parse.c:442 +msgid "no usage string given before the `--' separator" +msgstr "'--' ayırıcısı öncesinde bir kullanım dizisi verilmedi" + +#: builtin/rev-parse.c:548 +msgid "Needed a single revision" +msgstr "Tek bir revizyon gerekiyordu" + #: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" @@ -21582,6 +21653,50 @@ msgstr "" "\n" "İlki hakkında ek bilgi için \"git rev-parse --parseopt -h\" çalıştırın." +#: builtin/rev-parse.c:712 +msgid "--resolve-git-dir requires an argument" +msgstr "--resolve-git-dir bir argüman gerektiriyor" + +#: builtin/rev-parse.c:715 +#, c-format +msgid "not a gitdir '%s'" +msgstr "bir git dizini değil: '%s'" + +#: builtin/rev-parse.c:739 +msgid "--git-path requires an argument" +msgstr "--git-path bir argüman gerektiriyor" + +#: builtin/rev-parse.c:749 +msgid "-n requires an argument" +msgstr "-n bir argüman gerektiriyor" + +#: builtin/rev-parse.c:763 +msgid "--path-format requires an argument" +msgstr "--path-format bir argüman gerektiriyor" + +#: builtin/rev-parse.c:769 +#, c-format +msgid "unknown argument to --path-format: %s" +msgstr "--path-format için bilinmeyen bir argüman: %s" + +#: builtin/rev-parse.c:776 +msgid "--default requires an argument" +msgstr "--default bir argüman gerektiriyor" + +#: builtin/rev-parse.c:782 +msgid "--prefix requires an argument" +msgstr "--prefix bir argüman gerektiriyor" + +#: builtin/rev-parse.c:851 +#, c-format +msgid "unknown mode for --abbrev-ref: %s" +msgstr "--abbrev-ref için bilinmeyen kip: %s" + +#: builtin/rev-parse.c:1023 +#, c-format +msgid "unknown mode for --show-object-format: %s" +msgstr "--show-object-format için bilinmeyen kip: %s" + #: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<seçenekler>] <işlememsi>..." @@ -22126,10 +22241,6 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<zula>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <dal-adı> [<zula>]" -#: builtin/stash.c:29 builtin/stash.c:70 -msgid "git stash clear" -msgstr "git stash clear" - #: builtin/stash.c:30 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" @@ -22280,93 +22391,93 @@ msgstr "zulada izlenmeyen dosyaları içer" msgid "only show untracked files in the stash" msgstr "zulada yalnızca izlenmeyen dosyaları göster" -#: builtin/stash.c:932 builtin/stash.c:969 +#: builtin/stash.c:929 builtin/stash.c:966 #, c-format msgid "Cannot update %s with %s" msgstr "%s, %s ile güncellenemiyor" -#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671 +#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667 msgid "stash message" msgstr "zula iletisi" -#: builtin/stash.c:960 +#: builtin/stash.c:957 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" bir <işleme> argümanı gerektirir" -#: builtin/stash.c:1175 +#: builtin/stash.c:1171 msgid "No changes selected" msgstr "Değişiklik seçilmedi" -#: builtin/stash.c:1275 +#: builtin/stash.c:1271 msgid "You do not have the initial commit yet" msgstr "Henüz ilk işleme yapılmamış" -#: builtin/stash.c:1302 +#: builtin/stash.c:1298 msgid "Cannot save the current index state" msgstr "Geçerli indeks durumu kaydedilemiyor" -#: builtin/stash.c:1311 +#: builtin/stash.c:1307 msgid "Cannot save the untracked files" msgstr "İzlenmeyen dosyalar kaydedilemiyor" -#: builtin/stash.c:1322 builtin/stash.c:1331 +#: builtin/stash.c:1318 builtin/stash.c:1327 msgid "Cannot save the current worktree state" msgstr "Geçerli çalışma ağacı durumu kaydedilemiyor" -#: builtin/stash.c:1359 +#: builtin/stash.c:1355 msgid "Cannot record working tree state" msgstr "Çalışma ağacı durumu kaydı yazılamıyor" -#: builtin/stash.c:1408 +#: builtin/stash.c:1404 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "--patch, --include-untracked veya --all hepsi bir anda kullanılamıyor" -#: builtin/stash.c:1426 +#: builtin/stash.c:1422 msgid "Did you forget to 'git add'?" msgstr "'git add' yapmayı mı unuttunuz?" -#: builtin/stash.c:1441 +#: builtin/stash.c:1437 msgid "No local changes to save" msgstr "Kaydedilecek yerel değişiklik yok" -#: builtin/stash.c:1448 +#: builtin/stash.c:1444 msgid "Cannot initialize stash" msgstr "Zula ilklendirilemiyor" -#: builtin/stash.c:1463 +#: builtin/stash.c:1459 msgid "Cannot save the current status" msgstr "Geçerli durum kaydedilemiyor" -#: builtin/stash.c:1468 +#: builtin/stash.c:1464 #, c-format msgid "Saved working directory and index state %s" msgstr "Çalışma dizini ve indeks durumu %s kaydedildi" -#: builtin/stash.c:1558 +#: builtin/stash.c:1554 msgid "Cannot remove worktree changes" msgstr "Çalışma ağacı değişiklikleri kaldırılamıyor" -#: builtin/stash.c:1597 builtin/stash.c:1662 +#: builtin/stash.c:1593 builtin/stash.c:1658 msgid "keep index" msgstr "indeksi tut" -#: builtin/stash.c:1599 builtin/stash.c:1664 +#: builtin/stash.c:1595 builtin/stash.c:1660 msgid "stash in patch mode" msgstr "yama kipinde zula" -#: builtin/stash.c:1600 builtin/stash.c:1665 +#: builtin/stash.c:1596 builtin/stash.c:1661 msgid "quiet mode" msgstr "sessiz kip" -#: builtin/stash.c:1602 builtin/stash.c:1667 +#: builtin/stash.c:1598 builtin/stash.c:1663 msgid "include untracked files in stash" msgstr "zulada izlenmeyen dosyaları içer" -#: builtin/stash.c:1604 builtin/stash.c:1669 +#: builtin/stash.c:1600 builtin/stash.c:1665 msgid "include ignore files" msgstr "yok sayma dosyalarını içer" -#: builtin/stash.c:1704 +#: builtin/stash.c:1700 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -22390,40 +22501,40 @@ msgstr "yorum karakteri ile başlayan tüm satırları atla ve kaldır" msgid "prepend comment character and space to each line" msgstr "her satırın başına yorum karakteri ve boşluk koy" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Tam bir başvuru adı bekleniyordu, %s alındı" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:63 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote argümanı almaz" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:101 #, c-format msgid "cannot strip one component off url '%s'" msgstr "'%s' url'sinden bir bileşen çıkarılamıyor" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "göreceli yollar için alternatif tutturucu" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:414 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<yol>] [<yol>...]" -#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr ".gitmodules içinde '%s' altmodül yolu için url bulunamadı" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "Giriliyor: '%s'\n" -#: builtin/submodule--helper.c:528 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22432,7 +22543,7 @@ msgstr "" "run_command, %s için sıfır olmayan durum döndürdü\n" "." -#: builtin/submodule--helper.c:550 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22442,20 +22553,20 @@ msgstr "" "run_command, %s ögesinin iç içe geçmiş altmodülleri içinde özyinelerken " "sıfır olmayan durum döndürdü" -#: builtin/submodule--helper.c:566 +#: builtin/submodule--helper.c:565 msgid "suppress output of entering each submodule command" msgstr "her bir altmodül komutu girişinin çıktısını gizle" -#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889 -#: builtin/submodule--helper.c:1488 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:1487 msgid "recurse into nested submodules" msgstr "iç içe geçmiş altmodüle özyinele" -#: builtin/submodule--helper.c:573 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <komut>" -#: builtin/submodule--helper.c:600 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -22464,54 +22575,54 @@ msgstr "" "'%s' yapılandırması aranamadı. Bu deponun kendi yetkili üstkaynağı olduğu " "varsayılıyor." -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:666 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Altmodül yolu url'si '%s' kaydı yapılamadı" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:670 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "'%s' altmodülü (%s), '%s' yoluna kaydı yapıldı\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:680 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "uyarı: '%s' altmodülü için komut güncellemesi önerilmiyor\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:687 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "'%s' altmodülü yolu için güncelleme kipi kaydı yapılamadı" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:709 msgid "suppress output for initializing a submodule" msgstr "bir altmodül ilklendirmesi çıktısını gizle" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<seçenekler>] [<yol>]" -#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "'%s' yolu için .gitmodules içinde altmodül eşlemi bulunmadı" -#: builtin/submodule--helper.c:836 +#: builtin/submodule--helper.c:835 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "'%s' altmodülü içinde HEAD başvurusu çözülemedi" -#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "'%s' altmodülüne özyinelenemedi" -#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "suppress submodule status output" msgstr "altmodül durum çıktısını gizle" -#: builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:887 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -22519,96 +22630,96 @@ msgstr "" "altmodül HEAD'i içinde depolanan işleme yerine indekste depolanan işlemeyi " "kullan" -#: builtin/submodule--helper.c:894 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<yol>...]" -#: builtin/submodule--helper.c:918 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <yol>" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:989 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(ikili nesne)->%s(altmodül)" -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:992 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(altmodül)->%s(ikili nesne)" -#: builtin/submodule--helper.c:1006 +#: builtin/submodule--helper.c:1005 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1056 +#: builtin/submodule--helper.c:1055 #, c-format msgid "couldn't hash object from '%s'" msgstr "'%s' üzerinden nesne sağlaması yapılamadı" -#: builtin/submodule--helper.c:1060 +#: builtin/submodule--helper.c:1059 #, c-format msgid "unexpected mode %o\n" msgstr "beklenmedik kip %o\n" -#: builtin/submodule--helper.c:1301 +#: builtin/submodule--helper.c:1300 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "altmodül HEAD'i içindeki işleme ile indekstekini karşılaştırmak için" -#: builtin/submodule--helper.c:1303 -msgid "to compare the commit in the index with that in the submodule HEAD" -msgstr "altmodül HEAD'i yerine indekste depolanan işlemeyi kullan" +#: builtin/submodule--helper.c:1302 +msgid "compare the commit in the index with that in the submodule HEAD" +msgstr "indeksteki işlemeyi altmodül HEAD'inde olan ile karşılaştır" -#: builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1304 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "'ignore_config' değeri 'all' olan altmodülleri atla" -#: builtin/submodule--helper.c:1307 +#: builtin/submodule--helper.c:1306 msgid "limit the summary size" msgstr "özet boyutunu sınırla" -#: builtin/submodule--helper.c:1312 +#: builtin/submodule--helper.c:1311 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "git submodule--helper summary [<seçenekler>] [<işleme>] [--] [<yol>]" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1335 msgid "could not fetch a revision for HEAD" msgstr "HEAD için bir revizyon getirilemedi" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1340 msgid "--cached and --files are mutually exclusive" msgstr "--cached ve --files birlikte kullanılamaz" -#: builtin/submodule--helper.c:1408 +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "'%s' için altmodül url'si eşitleniyor\n" -#: builtin/submodule--helper.c:1414 +#: builtin/submodule--helper.c:1413 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "'%s' altmodülü yolu için url kaydı yapılamadı" -#: builtin/submodule--helper.c:1428 +#: builtin/submodule--helper.c:1427 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "'%s' altmodülü için öntanımlı uzak konum alınamadı" -#: builtin/submodule--helper.c:1439 +#: builtin/submodule--helper.c:1438 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "'%s' altmodülü için uzak konum güncellenemedi" -#: builtin/submodule--helper.c:1486 +#: builtin/submodule--helper.c:1485 msgid "suppress output of synchronizing submodule url" msgstr "altmodül url'si eşitleme çıktısını gizle" -#: builtin/submodule--helper.c:1493 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<yol>]" -#: builtin/submodule--helper.c:1547 +#: builtin/submodule--helper.c:1546 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -22617,7 +22728,7 @@ msgstr "" "Altmodül çalışma ağacı '%s' bir .git dizini içeriyor (tüm geçmişi dahil " "olacak biçimde kaldırmak istiyorsanız 'rm -rf' kullanın)" -#: builtin/submodule--helper.c:1559 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -22626,47 +22737,47 @@ msgstr "" "Altmodül çalışma ağacı '%s' yerel değişiklikler içeriyor; onları atmak için " "'-f' kullanın" -#: builtin/submodule--helper.c:1567 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "'%s' dizini temizlendi\n" -#: builtin/submodule--helper.c:1569 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "'%s' altmodül çalışma ağacı kaldırılamadı\n" -#: builtin/submodule--helper.c:1580 +#: builtin/submodule--helper.c:1579 #, c-format msgid "could not create empty submodule directory %s" msgstr "boş altmodül dizini %s oluşturulamadı" -#: builtin/submodule--helper.c:1596 +#: builtin/submodule--helper.c:1595 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "'%s' altmodülü (%s), '%s' yoluna kaydı yapılmamış\n" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1624 msgid "remove submodule working trees even if they contain local changes" msgstr "altmodül çalışma ağaçlarını yerel değişiklikler içerseler bile kaldır" -#: builtin/submodule--helper.c:1626 +#: builtin/submodule--helper.c:1625 msgid "unregister all submodules" msgstr "tüm altmodüllerin kaydını kaldır" -#: builtin/submodule--helper.c:1631 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<yol>...]]" -#: builtin/submodule--helper.c:1645 +#: builtin/submodule--helper.c:1644 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Tüm altmodüllerin ilklendirmesini gerçekten geri almak istiyorsanız '-all' " "kullanın" -#: builtin/submodule--helper.c:1714 +#: builtin/submodule--helper.c:1713 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -22678,46 +22789,46 @@ msgstr "" "submodule.alternateErrorStrategy ayarını 'info'ya ayarlayın veya\n" "--reference yerine --reference-if-able kullanarak klonlayın." -#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756 +#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "'%s' altmodülü alternatif ekleyemiyor: %s" -#: builtin/submodule--helper.c:1792 +#: builtin/submodule--helper.c:1791 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "'%s' submodule.alternateErrorStrategy değeri tanımlanamadı" -#: builtin/submodule--helper.c:1799 +#: builtin/submodule--helper.c:1798 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "'%s' submodule.alternateLocation değeri tanımlanamadı" -#: builtin/submodule--helper.c:1823 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "yeni altmodülün nereye klonlanacağı" -#: builtin/submodule--helper.c:1826 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "yeni altmodülün adı" -#: builtin/submodule--helper.c:1829 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "altmodülün klonlanacağı url konumu" -#: builtin/submodule--helper.c:1837 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "sığ klonların derinliği" -#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "zorla klonla" -#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 msgid "disallow cloning into non-empty directory" msgstr "boş olmayan dizine klonlamaya izin verme" -#: builtin/submodule--helper.c:1849 +#: builtin/submodule--helper.c:1848 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22726,103 +22837,103 @@ msgstr "" "git submodule--helper clone [--prefix=<yol>] [--quiet] [--reference <depo>] " "[--name <ad>] [--depth <derinlik>] [--single-branch] --url <url> --path <yol>" -#: builtin/submodule--helper.c:1874 +#: builtin/submodule--helper.c:1873 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "" "başka bir altmodülün git dizininde '%s' oluşturma/kullanma reddediliyor" -#: builtin/submodule--helper.c:1885 +#: builtin/submodule--helper.c:1884 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "'%s' ögesinin '%s' altmodül yoluna klonlanması başarısız" -#: builtin/submodule--helper.c:1889 +#: builtin/submodule--helper.c:1888 #, c-format msgid "directory not empty: '%s'" msgstr "dizin boş değil: '%s'" -#: builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" msgstr "'%s' için altmodül dizini alınamadı" -#: builtin/submodule--helper.c:1937 +#: builtin/submodule--helper.c:1936 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için" -#: builtin/submodule--helper.c:1941 +#: builtin/submodule--helper.c:1940 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için yapılandırılmış" -#: builtin/submodule--helper.c:2042 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Altmodül yolu '%s' ilklendirilmedi" -#: builtin/submodule--helper.c:2046 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "'update --init' mi kullanmak istersiniz?" -#: builtin/submodule--helper.c:2076 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Birleştirilmemiş altmodül %s atlanıyor" -#: builtin/submodule--helper.c:2105 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "'%s' altmodülü atlanıyor" -#: builtin/submodule--helper.c:2255 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "'%s' klonlanamadı. Yeniden deneme zamanlandı." -#: builtin/submodule--helper.c:2266 +#: builtin/submodule--helper.c:2265 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "'%s' ikinci bir kez klonlanamadı, iptal ediliyor" -#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "çalışma ağacına giden yol" -#: builtin/submodule--helper.c:2331 +#: builtin/submodule--helper.c:2330 msgid "path into the working tree, across nested submodule boundaries" msgstr "iç içe geçmiş altmodül sınırları üzerinden çalışma ağacına giden yol" -#: builtin/submodule--helper.c:2335 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout veya none" -#: builtin/submodule--helper.c:2341 +#: builtin/submodule--helper.c:2340 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "belirli bir revizyon sayısına kısaltılmış sığ klon oluştur" -#: builtin/submodule--helper.c:2344 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "paralel işler" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2345 msgid "whether the initial clone should follow the shallow recommendation" msgstr "ilk klonun sığlık üzerine olan tavsiyeyi izleyip izlemeyeceği" -#: builtin/submodule--helper.c:2347 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "klonlama işlemini yazdırma" -#: builtin/submodule--helper.c:2358 +#: builtin/submodule--helper.c:2357 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<yol>] [<yol>...]" -#: builtin/submodule--helper.c:2371 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "güncelleme parametresi için hatalı değer" -#: builtin/submodule--helper.c:2419 +#: builtin/submodule--helper.c:2418 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -22831,84 +22942,84 @@ msgstr "" "Altmodül (%s) dalı süperproje dalından devralmak üzere yapılandırıldı; ancak " "süperproje herhangi bir dalda değil" -#: builtin/submodule--helper.c:2542 +#: builtin/submodule--helper.c:2541 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "'%s' altmodülü için depo tutacağı alınamadı" -#: builtin/submodule--helper.c:2575 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "altmodüllere özyinele" -#: builtin/submodule--helper.c:2581 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<seçenekler>] [<yol>...]" -#: builtin/submodule--helper.c:2637 +#: builtin/submodule--helper.c:2636 msgid "check if it is safe to write to the .gitmodules file" msgstr ".gitmodules dosyasına yazım güvenli mi değil mi denetle" -#: builtin/submodule--helper.c:2640 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr ".gitmodules dosyasındaki yapılandırmayı kaldır" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <ad> [<değer>]" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <ad>" -#: builtin/submodule--helper.c:2647 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2666 git-submodule.sh:150 +#: builtin/submodule--helper.c:2665 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr ".gitmodules dosyasının çalışma ağacında olduğundan lütfen emin ol" -#: builtin/submodule--helper.c:2682 +#: builtin/submodule--helper.c:2681 msgid "suppress output for setting url of a submodule" msgstr "bir altmodül url ayarlanması çıktısını gizle" -#: builtin/submodule--helper.c:2686 +#: builtin/submodule--helper.c:2685 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <yol> <yeniurl>" -#: builtin/submodule--helper.c:2719 +#: builtin/submodule--helper.c:2718 msgid "set the default tracking branch to master" msgstr "öntanımlı izleme dalını master olarak ayarla" -#: builtin/submodule--helper.c:2721 +#: builtin/submodule--helper.c:2720 msgid "set the default tracking branch" msgstr "öntanımlı izleme dalını ayarla" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2724 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <yol>" -#: builtin/submodule--helper.c:2726 +#: builtin/submodule--helper.c:2725 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <dal> <yol>" -#: builtin/submodule--helper.c:2733 +#: builtin/submodule--helper.c:2732 msgid "--branch or --default required" msgstr "--branch veya --default gerekli" -#: builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2735 msgid "--branch and --default are mutually exclusive" msgstr "--branch ve --default birlikte kullanılamaz" -#: builtin/submodule--helper.c:2793 git.c:449 git.c:724 +#: builtin/submodule--helper.c:2792 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s, --super-prefix desteklemiyor" -#: builtin/submodule--helper.c:2799 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' geçerli bir submodule--helper altkomutu değil" @@ -23533,7 +23644,7 @@ msgstr "git worktree remove [<seçenekler>] <ç-ağacı>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <yol>" -#: builtin/worktree.c:61 builtin/worktree.c:935 +#: builtin/worktree.c:61 builtin/worktree.c:944 #, c-format msgid "failed to delete '%s'" msgstr "'%s' silinemedi" @@ -23543,25 +23654,25 @@ msgstr "'%s' silinemedi" msgid "Removing %s/%s: %s" msgstr "%s/%s kaldırılıyor: %s" -#: builtin/worktree.c:149 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "budanan çalışma ağaçlarını bildir" -#: builtin/worktree.c:151 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" msgstr "<zaman>'dan eski çalışma ağaçlarının hükmünü kaldır" -#: builtin/worktree.c:221 +#: builtin/worktree.c:219 #, c-format msgid "'%s' already exists" msgstr "'%s' halihazırda var" -#: builtin/worktree.c:230 +#: builtin/worktree.c:228 #, c-format msgid "unusable worktree destination '%s'" msgstr "kullanılamayan çalışma ağacı konumu '%s'" -#: builtin/worktree.c:235 +#: builtin/worktree.c:233 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -23571,7 +23682,7 @@ msgstr "" "geçersiz kılmak için '%s -f -f', temizlemek için 'unlock', 'prune' veya " "'remove' kullanın" -#: builtin/worktree.c:237 +#: builtin/worktree.c:235 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -23580,27 +23691,31 @@ msgstr "" "'%s' eksik; ancak halihazırda kaydı yapılmış bir çalışma ağacı;\n" "geçersiz kılmak için '%s -f', temizlemek için 'prune' veya 'remove' kullanın" -#: builtin/worktree.c:288 +#: builtin/worktree.c:286 #, c-format msgid "could not create directory of '%s'" msgstr "'%s' dizini oluşturulamadı" -#: builtin/worktree.c:422 builtin/worktree.c:428 +#: builtin/worktree.c:308 +msgid "initializing" +msgstr "ilklendiriliyor" + +#: builtin/worktree.c:420 builtin/worktree.c:426 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Çalışma ağacı hazırlanıyor (yeni dal '%s')" -#: builtin/worktree.c:424 +#: builtin/worktree.c:422 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Çalışma ağacı hazırlanıyor ('%s' dalı sıfırlanıyor; %s konumundaydı)" -#: builtin/worktree.c:433 +#: builtin/worktree.c:431 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Çalışma ağacı hazırlanıyor ('%s' çıkış yapılıyor)" -#: builtin/worktree.c:439 +#: builtin/worktree.c:437 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Çalışma ağacı hazırlanıyor (ayrık HEAD %s)" @@ -23625,82 +23740,90 @@ msgstr "yeni çalışma ağacını doldur" msgid "keep the new working tree locked" msgstr "yeni çalışma ağacını kilitli tut" -#: builtin/worktree.c:493 +#: builtin/worktree.c:492 builtin/worktree.c:729 +msgid "reason for locking" +msgstr "kilitleme nedeni" + +#: builtin/worktree.c:495 msgid "set up tracking mode (see git-branch(1))" msgstr "izleme kipini ayarla (bkz: git-branch(1))" -#: builtin/worktree.c:496 +#: builtin/worktree.c:498 msgid "try to match the new branch name with a remote-tracking branch" msgstr "yeni dalın adını bir uzak izleme dalıyla eşleştirmeyi dene" -#: builtin/worktree.c:504 +#: builtin/worktree.c:506 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B ve --detach birlikte kullanılamaz" -#: builtin/worktree.c:565 +#: builtin/worktree.c:508 +msgid "--reason requires --lock" +msgstr "--reason, --lock gerektiriyor" + +#: builtin/worktree.c:512 +msgid "added with --lock" +msgstr "--lock ile eklendi" + +#: builtin/worktree.c:574 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track yalnızca yeni bir dal oluşturulmuşsa kullanılabilir" -#: builtin/worktree.c:682 +#: builtin/worktree.c:691 msgid "show extended annotations and reasons, if available" msgstr "varsa genişletilmiş açıklamaları ve nedenleri göster" -#: builtin/worktree.c:684 +#: builtin/worktree.c:693 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "<zaman>'dan eski çalışma ağaçlarına 'budanabilir' açıklama ekle" -#: builtin/worktree.c:693 +#: builtin/worktree.c:702 msgid "--verbose and --porcelain are mutually exclusive" msgstr "--verbose ve --porcelain birlikte kullanılamaz" -#: builtin/worktree.c:720 -msgid "reason for locking" -msgstr "kilitleme nedeni" - -#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839 -#: builtin/worktree.c:963 +#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 +#: builtin/worktree.c:972 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' bir çalışma ağacı değil" -#: builtin/worktree.c:734 builtin/worktree.c:767 +#: builtin/worktree.c:743 builtin/worktree.c:776 msgid "The main working tree cannot be locked or unlocked" msgstr "Ana çalışma ağacı kilitlenemez veya kilidi açılamaz" -#: builtin/worktree.c:739 +#: builtin/worktree.c:748 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' halihazırda kilitli, nedeni: %s" -#: builtin/worktree.c:741 +#: builtin/worktree.c:750 #, c-format msgid "'%s' is already locked" msgstr "'%s' halihazırda kilitli" -#: builtin/worktree.c:769 +#: builtin/worktree.c:778 #, c-format msgid "'%s' is not locked" msgstr "'%s' kilitli değil" -#: builtin/worktree.c:810 +#: builtin/worktree.c:819 msgid "working trees containing submodules cannot be moved or removed" msgstr "altmodül içeren çalışma ağaçları taşınamaz veya kaldırılamaz" -#: builtin/worktree.c:818 +#: builtin/worktree.c:827 msgid "force move even if worktree is dirty or locked" msgstr "çalışma ağacı kirli veya kilitli olsa bile zorla taşı" -#: builtin/worktree.c:841 builtin/worktree.c:965 +#: builtin/worktree.c:850 builtin/worktree.c:974 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' bir ana çalışma ağacı" -#: builtin/worktree.c:846 +#: builtin/worktree.c:855 #, c-format msgid "could not figure out destination name from '%s'" msgstr "hedef adı şuradan anlaşılamadı: '%s'" -#: builtin/worktree.c:859 +#: builtin/worktree.c:868 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23709,7 +23832,7 @@ msgstr "" "kilitli bir çalışma ağacı taşınamıyor, kilit nedeni: %s\n" "geçersiz kılmak için 'move -f -f' kullanın veya önce kilidini açın" -#: builtin/worktree.c:861 +#: builtin/worktree.c:870 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23717,38 +23840,38 @@ msgstr "" "kilitli bir çalışma ağacı taşınamıyor;\n" "geçersiz kılmak için 'move -f -f' kullanın veya önce kilidini açın" -#: builtin/worktree.c:864 +#: builtin/worktree.c:873 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "doğrulama başarısız, çalışma ağacı taşınamıyor: %s" -#: builtin/worktree.c:869 +#: builtin/worktree.c:878 #, c-format msgid "failed to move '%s' to '%s'" msgstr "'%s' -> '%s' taşıması başarısız" -#: builtin/worktree.c:915 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "'%s' üzerinde 'git status' çalıştırılamadı" -#: builtin/worktree.c:919 +#: builtin/worktree.c:928 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" "'%s' değiştirilmiş veya izlenmeyen dosyalar içeriyor, silmek için --force " "kullanın" -#: builtin/worktree.c:924 +#: builtin/worktree.c:933 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "'%s' üzerinde 'git status' çalıştırılamadı, kod %d" -#: builtin/worktree.c:947 +#: builtin/worktree.c:956 msgid "force removal even if worktree is dirty or locked" msgstr "çalışma ağacı kirli veya kilitli olsa bile zorla kaldır" -#: builtin/worktree.c:970 +#: builtin/worktree.c:979 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23757,7 +23880,7 @@ msgstr "" "kilitli bir çalışma ağacı kaldırılamıyor, kilit nedeni: %s\n" "geçersiz kılmak için 'remove -f -f' kullanın veya önce kilidini açın" -#: builtin/worktree.c:972 +#: builtin/worktree.c:981 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23765,17 +23888,17 @@ msgstr "" "kilitli bir çalışma ağacı kaldırılamıyor;\n" "geçersiz kılmak için 'remove -f -f' kullanın veya önce kilidini açın" -#: builtin/worktree.c:975 +#: builtin/worktree.c:984 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "doğrulama başarısız, çalışma ağacı kaldırılamıyor: %s" -#: builtin/worktree.c:999 +#: builtin/worktree.c:1008 #, c-format msgid "repair: %s: %s" msgstr "şunu onar %s: %s" -#: builtin/worktree.c:1002 +#: builtin/worktree.c:1011 #, c-format msgid "error: %s: %s" msgstr "hata: %s: %s" @@ -24118,7 +24241,7 @@ msgstr "" msgid "Could not set SSL backend to '%s': already set" msgstr "SSL arka ucu '%s' olarak ayarlanamadı: Halihazırda ayarlanmış" -#: http.c:2035 +#: http.c:2034 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -24168,96 +24291,96 @@ msgstr "'%s' erişilemiyor: %s" msgid "redirecting to %s" msgstr "şuraya yeniden yönlendiriliyor: %s" -#: remote-curl.c:642 +#: remote-curl.c:644 msgid "shouldn't have EOF when not gentle on EOF" msgstr "dosya sonuna dikkat edilmiyorsa dosya sonu olmamalıdır" -#: remote-curl.c:654 -msgid "remote server sent stateless separator" -msgstr "uzak sunucu durumsuz ayırıcı gönderdi" +#: remote-curl.c:656 +msgid "remote server sent unexpected response end packet" +msgstr "uzak sunucu beklenmedik yanıt sonu paketi gönderdi" -#: remote-curl.c:724 +#: remote-curl.c:726 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" "rpc sonrası verisi geri sarılamıyor - http.postBuffer'ı artırmayı deneyin" -#: remote-curl.c:754 +#: remote-curl.c:756 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "remote-curl: hatalı satır uzunluğu karakteri: %.4s" -#: remote-curl.c:756 +#: remote-curl.c:758 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl: beklenmedik yanıt sonu paketi" -#: remote-curl.c:832 +#: remote-curl.c:834 #, c-format msgid "RPC failed; %s" msgstr "RPC başarısız oldu; %s" -#: remote-curl.c:872 +#: remote-curl.c:874 msgid "cannot handle pushes this big" msgstr "bu kadar büyük itmeler ele alınamıyor" -#: remote-curl.c:987 +#: remote-curl.c:989 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "istek söndürülemiyor; 'zlib deflate' hatası %d" -#: remote-curl.c:991 +#: remote-curl.c:993 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "istek söndürülemiyor; 'zlib end' hatası %d" -#: remote-curl.c:1041 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of length header were received" msgstr "üstbilginin %d baytı alındı" -#: remote-curl.c:1043 +#: remote-curl.c:1045 #, c-format msgid "%d bytes of body are still expected" msgstr "gövdenin %d baytı hâlâ bekleniyor" -#: remote-curl.c:1132 +#: remote-curl.c:1134 msgid "dumb http transport does not support shallow capabilities" msgstr "programlanamayan http taşıyıcısı sığ işlevleri desteklemiyor" -#: remote-curl.c:1147 +#: remote-curl.c:1149 msgid "fetch failed." msgstr "getirme başarısız." -#: remote-curl.c:1193 +#: remote-curl.c:1195 msgid "cannot fetch by sha1 over smart http" msgstr "akıllı http üzerinden sha1 ile getirme yapılamıyor" -#: remote-curl.c:1237 remote-curl.c:1243 +#: remote-curl.c:1239 remote-curl.c:1245 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "protokol hatası: sha/ref bekleniyordu, '%s' alındı" -#: remote-curl.c:1255 remote-curl.c:1373 +#: remote-curl.c:1257 remote-curl.c:1375 #, c-format msgid "http transport does not support %s" msgstr "http taşıyıcısı %s desteklemiyor" -#: remote-curl.c:1291 +#: remote-curl.c:1293 msgid "git-http-push failed" msgstr "git-http-push başarısız" -#: remote-curl.c:1479 +#: remote-curl.c:1481 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: kullanım: git remote-curl <uzak-konum> [<url>]" -#: remote-curl.c:1511 +#: remote-curl.c:1513 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: git'ten komut akışı okunurken hata" -#: remote-curl.c:1518 +#: remote-curl.c:1520 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: yerel bir depo olmadan getirme yapılmaya çalışıldı" -#: remote-curl.c:1559 +#: remote-curl.c:1561 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: git'ten bilinmeyen komut '%s'" @@ -25955,39 +26078,39 @@ msgstr "bilinmeyen --patch kipi: %s" msgid "invalid argument %s, expecting --" msgstr "geçersiz argüman %s, -- bekleniyor" -#: git-send-email.perl:138 +#: git-send-email.perl:129 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "yerel dilim GMT'den bir dakikadan az bir aralıkla ayrımlı\n" -#: git-send-email.perl:145 git-send-email.perl:151 +#: git-send-email.perl:136 git-send-email.perl:142 msgid "local time offset greater than or equal to 24 hours\n" msgstr "yerel saat ofseti 24 saate eşit veya daha büyük\n" -#: git-send-email.perl:222 +#: git-send-email.perl:214 #, perl-format msgid "fatal: command '%s' died with exit code %d" msgstr "onulmaz: '%s' komutu %d çıkış koduyla sonlandı" -#: git-send-email.perl:235 +#: git-send-email.perl:227 msgid "the editor exited uncleanly, aborting everything" msgstr "düzenleyici düzgünce çıkmadı, her şey iptal ediliyor" -#: git-send-email.perl:321 +#: git-send-email.perl:316 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' yazmakta olduğunuz e-postanın orta düzey bir sürümünü içeriyor.\n" -#: git-send-email.perl:326 +#: git-send-email.perl:321 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' yazılan e-postayı içeriyor.\n" -#: git-send-email.perl:419 +#: git-send-email.perl:450 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases diğer seçeneklerle uyumsuz\n" -#: git-send-email.perl:493 +#: git-send-email.perl:525 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -25998,11 +26121,11 @@ msgstr "" "'e'ye dikkat edin. sendemail.forbidSendmailVariables seçeneğini 'false'\n" "yaparak bu denetimi devre dışı bırakabilirsiniz.\n" -#: git-send-email.perl:498 git-send-email.perl:700 +#: git-send-email.perl:530 git-send-email.perl:746 msgid "Cannot run git format-patch from outside a repository\n" msgstr "'git format-patch' bir deponun dışından çalıştırılamıyor\n" -#: git-send-email.perl:501 +#: git-send-email.perl:533 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -26010,37 +26133,37 @@ msgstr "" "'batch-size' ve 'relogin' birlikte belirtilmeli (komut satırı veya " "yapılandırma seçeneklerinden)\n" -#: git-send-email.perl:514 +#: git-send-email.perl:546 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Bilinmeyen --suppress-cc alanı: '%s'\n" -#: git-send-email.perl:545 +#: git-send-email.perl:577 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Bilinmeyen --confirm ayarı: '%s'\n" -#: git-send-email.perl:573 +#: git-send-email.perl:617 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "uyarı: tırnak içine alınmış sendmail arması desteklenmiyor: %s\n" -#: git-send-email.perl:575 +#: git-send-email.perl:619 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "uyarı: ':include:' desteklenmiyor: %s\n" -#: git-send-email.perl:577 +#: git-send-email.perl:621 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "uyarı: '/file' veya '|pipe' yeniden yönlendirmesi desteklenmiyor: %s\n" -#: git-send-email.perl:582 +#: git-send-email.perl:626 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "uyarı: sendmail satırı tanımlanamadı: %s\n" -#: git-send-email.perl:666 +#: git-send-email.perl:711 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -26055,12 +26178,12 @@ msgstr "" "\t* Bir dosya demek istiyorsanız \"./%s\" diyerek veya\n" "\t* Bir erim demek istiyorsanız --format-patch seçeneğini vererek\n" -#: git-send-email.perl:687 +#: git-send-email.perl:732 #, perl-format msgid "Failed to opendir %s: %s" msgstr "%s opendir yapılamadı: %s" -#: git-send-email.perl:720 +#: git-send-email.perl:767 msgid "" "\n" "No patch files specified!\n" @@ -26070,17 +26193,17 @@ msgstr "" "Hiçbir yama dosyası belirtilmedi!\n" "\n" -#: git-send-email.perl:733 +#: git-send-email.perl:780 #, perl-format msgid "No subject line in %s?" msgstr "%s içinde konu satırı yok mu?" -#: git-send-email.perl:743 +#: git-send-email.perl:791 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "%s yazma için açılamadı: %s" -#: git-send-email.perl:754 +#: git-send-email.perl:802 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -26094,38 +26217,38 @@ msgstr "" "\n" "Bir özet göndermek istemiyorsanız gövde kısmını temizleyin.\n" -#: git-send-email.perl:778 +#: git-send-email.perl:826 #, perl-format msgid "Failed to open %s: %s" msgstr "%s açılamadı: %s" -#: git-send-email.perl:795 +#: git-send-email.perl:843 #, perl-format msgid "Failed to open %s.final: %s" msgstr "%s.final açılamadı: %s" -#: git-send-email.perl:838 +#: git-send-email.perl:886 msgid "Summary email is empty, skipping it\n" msgstr "Özet e-postası boş, atlanıyor\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:873 +#: git-send-email.perl:935 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "<%s> kullanmak istediğinizden emin misiniz [y/N]? " -#: git-send-email.perl:928 +#: git-send-email.perl:990 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" "Aşağıdaki dosyalar 8 bit; ancak Content-Transfer-Encoding desteklemiyorlar.\n" -#: git-send-email.perl:933 +#: git-send-email.perl:995 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Hangi 8 bit kodlamayı beyan etmeliyim [UTF-8]? " -#: git-send-email.perl:941 +#: git-send-email.perl:1003 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -26138,22 +26261,22 @@ msgstr "" "içinde '*** SUBJECT HERE ***' konu şablonu var. Yine de göndermek " "istiyorsanız --force kullanın.\n" -#: git-send-email.perl:960 +#: git-send-email.perl:1022 msgid "To whom should the emails be sent (if anyone)?" msgstr "E-postalar kime gönderilmeli (eğer gerekliyse)?" -#: git-send-email.perl:978 +#: git-send-email.perl:1040 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "onulmaz: '%s' arması kendisine genişliyor\n" -#: git-send-email.perl:990 +#: git-send-email.perl:1052 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "İlk e-posta için Message-ID, In-Reply-To olarak kullanılsın mı (eğer " "gerekliyse)?" -#: git-send-email.perl:1048 git-send-email.perl:1056 +#: git-send-email.perl:1114 git-send-email.perl:1122 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "hata: şuradan geçerli bir adres çıkartılamadı: %s\n" @@ -26161,16 +26284,16 @@ msgstr "hata: şuradan geçerli bir adres çıkartılamadı: %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1060 +#: git-send-email.perl:1126 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Bu adresle ne yapılsın? ([q] çık|[d] bırak|düz[e]nle): " -#: git-send-email.perl:1377 +#: git-send-email.perl:1446 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA yolu \"%s\" mevcut değil" -#: git-send-email.perl:1460 +#: git-send-email.perl:1529 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -26196,115 +26319,115 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1475 +#: git-send-email.perl:1544 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "" "Bu e-posta gönderilsin mi? ([y] evet|[n] hayır|düz[e]nle|[q] çık|[a] tümü): " -#: git-send-email.perl:1478 +#: git-send-email.perl:1547 msgid "Send this email reply required" msgstr "Bu e-postayı yanıt gerektirme seçeneğiyle gönder" -#: git-send-email.perl:1506 +#: git-send-email.perl:1581 msgid "The required SMTP server is not properly defined." msgstr "Gerekli SMTP sunucusu düzgünce tanımlanmamış." -#: git-send-email.perl:1553 +#: git-send-email.perl:1628 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Sunucu STARTTLS desteklemiyor! %s" -#: git-send-email.perl:1558 git-send-email.perl:1562 +#: git-send-email.perl:1633 git-send-email.perl:1637 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS başarısız oldu! %s" -#: git-send-email.perl:1571 +#: git-send-email.perl:1646 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "SMTP düzgünce başlatılamıyor. Yapılandırmayı denetleyin ve --smtp-debug " "yapın." -#: git-send-email.perl:1589 +#: git-send-email.perl:1664 #, perl-format msgid "Failed to send %s\n" msgstr "%s gönderilemedi\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Dry-Sent %s\n" msgstr "%s gönderilir gibi yapıldı\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Sent %s\n" msgstr "%s gönderildi\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "Dry-OK. Log says:\n" msgstr "Sınama tamam. Günlük çıktısı:\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "OK. Log says:\n" msgstr "Tamam. Günlük çıktısı:\n" -#: git-send-email.perl:1606 +#: git-send-email.perl:1688 msgid "Result: " msgstr "Sonuç: " -#: git-send-email.perl:1609 +#: git-send-email.perl:1691 msgid "Result: OK\n" msgstr "Sonuç: Tamam\n" -#: git-send-email.perl:1627 +#: git-send-email.perl:1709 #, perl-format msgid "can't open file %s" msgstr "%s dosyası açılamıyor" -#: git-send-email.perl:1674 git-send-email.perl:1694 +#: git-send-email.perl:1756 git-send-email.perl:1776 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Cc: %s, '%s' satırından ekleniyor\n" -#: git-send-email.perl:1680 +#: git-send-email.perl:1762 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) To: %s, '%s' satırından ekleniyor\n" -#: git-send-email.perl:1737 +#: git-send-email.perl:1819 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Cc: %s, '%s' satırından ekleniyor\n" -#: git-send-email.perl:1772 +#: git-send-email.perl:1854 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Cc: %s, '%s' satırından ekleniyor\n" -#: git-send-email.perl:1883 +#: git-send-email.perl:1965 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) '%s' çalıştırılamadı" -#: git-send-email.perl:1890 +#: git-send-email.perl:1972 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) %s: %s, '%s' konumundan ekleniyor\n" -#: git-send-email.perl:1894 +#: git-send-email.perl:1976 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) şuraya olan veri yolu kapatılamadı: '%s'" -#: git-send-email.perl:1924 +#: git-send-email.perl:2006 msgid "cannot send message as 7bit" msgstr "ileti 7 bit olarak gönderilemiyor" -#: git-send-email.perl:1932 +#: git-send-email.perl:2014 msgid "invalid transfer encoding" msgstr "geçersiz aktarım kodlaması" -#: git-send-email.perl:1966 +#: git-send-email.perl:2051 #, perl-format msgid "" "fatal: %s: rejected by sendemail-validate hook\n" @@ -26315,12 +26438,12 @@ msgstr "" "%s\n" "uyarı: hiçbir yama gönderilmedi\n" -#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039 +#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124 #, perl-format msgid "unable to open %s: %s\n" msgstr "%s açılamıyor: %s\n" -#: git-send-email.perl:1979 +#: git-send-email.perl:2064 #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" @@ -26329,13 +26452,28 @@ msgstr "" "onulmaz: %s:%d, 998 karakterden uzun\n" "uyarı: hiçbir yama gönderilmedi\n" -#: git-send-email.perl:1997 +#: git-send-email.perl:2082 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "%s, yedek sonek '%s' ile atlanıyor.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:2001 +#: git-send-email.perl:2086 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "%s ögesini gerçekten göndermek istiyor musunuz? [y|N]: " + +#~ msgid "unable to write stateless separator packet" +#~ msgstr "durumsuz ayırıcı paketi yazılamıyor" + +#~ msgid "git merge --abort" +#~ msgstr "git merge --abort" + +#~ msgid "git merge --continue" +#~ msgstr "git merge --continue" + +#~ msgid "git stash clear" +#~ msgstr "git stash clear" + +#~ msgid "remote server sent stateless separator" +#~ msgstr "uzak sunucu durumsuz ayırıcı gönderdi" @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git v2.32.0-rc0\n" +"Project-Id-Version: git 2.33.0-rc0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-05-17 16:02+0800\n" -"PO-Revision-Date: 2021-05-24 13:49+0700\n" +"POT-Creation-Date: 2021-08-03 17:06+0800\n" +"PO-Revision-Date: 2021-08-09 07:58+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" @@ -27,7 +27,7 @@ msgid "Huh (%s)?" msgstr "Hả (%s)?" #: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 -#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 +#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 #: builtin/rebase.c:1953 msgid "could not read index" msgstr "không thể đọc bảng mục lục" @@ -56,7 +56,7 @@ msgstr "Cập nhật" msgid "could not stage '%s'" msgstr "không thể đưa “%s” lên bệ phóng" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707 msgid "could not write index" msgstr "không thể ghi bảng mục lục" @@ -111,12 +111,12 @@ msgstr[0] "đã thêm %d đường dẫn\n" msgid "ignoring unmerged: %s" msgstr "bỏ qua những thứ chưa hòa trộn: %s" -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 +#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "Chỉ có các tập tin nhị phân là thay đổi.\n" -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 +#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "Không có thay đổi nào.\n" @@ -199,11 +199,11 @@ msgstr "tùy chọn mục bằng số" msgid "(empty) select nothing" msgstr "(để trống) không chọn gì" -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 +#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** Lệnh ***" -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 +#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893 msgid "What now" msgstr "Giờ thì sao" @@ -215,12 +215,12 @@ msgstr "đã đưa lên bệ phóng" msgid "unstaged" msgstr "chưa đưa lên bệ phóng" -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 -#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309 +#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 -#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327 -#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 #: git-add--interactive.perl:213 msgid "path" msgstr "đường-dẫn" @@ -229,7 +229,7 @@ msgstr "đường-dẫn" msgid "could not refresh index" msgstr "không thể đọc lại bảng mục lục" -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 +#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "Tạm biệt.\n" @@ -533,34 +533,34 @@ msgstr "" "a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n" "d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin\n" -#: add-patch.c:342 +#: add-patch.c:343 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "không thể phân tích cú pháp phần đầu của khúc “%.*s”" -#: add-patch.c:361 add-patch.c:365 +#: add-patch.c:362 add-patch.c:366 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "không thể phân tích cú pháp phần đầu khúc đã tô màu “%.*s”" -#: add-patch.c:419 +#: add-patch.c:420 msgid "could not parse diff" msgstr "không thể phân tích cú pháp khác biệt" -#: add-patch.c:438 +#: add-patch.c:439 msgid "could not parse colored diff" msgstr "không thể phân tích khác biệt được tô màu" -#: add-patch.c:452 +#: add-patch.c:453 #, c-format msgid "failed to run '%s'" msgstr "gặp lỗi khi chạy “%s”" -#: add-patch.c:611 +#: add-patch.c:612 msgid "mismatched output from interactive.diffFilter" msgstr "đầu ra không khớp từ interactive.diffFilter" -#: add-patch.c:612 +#: add-patch.c:613 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -568,7 +568,7 @@ msgstr "" "Bộ lọc của bạn phải duy trì một quan hệ một-đến-một\n" "giữa các dòng đầu vào và đầu ra của nó." -#: add-patch.c:790 +#: add-patch.c:791 #, c-format msgid "" "expected context line #%d in\n" @@ -577,7 +577,7 @@ msgstr "" "cần dòng ngữ cảnh #%d trong\n" "%.*s" -#: add-patch.c:805 +#: add-patch.c:806 #, c-format msgid "" "hunks do not overlap:\n" @@ -590,11 +590,11 @@ msgstr "" "\tkhông được kết thúc bằng:\n" "%.*s" -#: add-patch.c:1081 git-add--interactive.perl:1115 +#: add-patch.c:1082 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Chế độ sửa khúc bằng tay -- xem ở đáy để có hướng dẫn sử dụng nhanh.\n" -#: add-patch.c:1085 +#: add-patch.c:1086 #, c-format msgid "" "---\n" @@ -608,7 +608,7 @@ msgstr "" "Những dòng bắt đầu bằng %c sẽ bị loại bỏ.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1099 git-add--interactive.perl:1129 +#: add-patch.c:1100 git-add--interactive.perl:1129 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" @@ -618,11 +618,11 @@ msgstr "" "để sửa lần nữa. Nếu mọi dòng của khúc bị xóa bỏ, thế thì những\n" "sửa dổi sẽ bị loại bỏ, và khúc vẫn giữ nguyên.\n" -#: add-patch.c:1132 +#: add-patch.c:1133 msgid "could not parse hunk header" msgstr "không thể phân tích cú pháp phần đầu khúc" -#: add-patch.c:1177 +#: add-patch.c:1178 msgid "'git apply --cached' failed" msgstr "“git apply --cached” gặp lỗi" @@ -638,26 +638,26 @@ msgstr "“git apply --cached” gặp lỗi" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1246 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Hunk đã sửa của bạn không được áp dụng. Sửa lại lần nữa (nói \"n\" để loại " "bỏ!) [y/n]? " -#: add-patch.c:1289 +#: add-patch.c:1290 msgid "The selected hunks do not apply to the index!" msgstr "Các khúc đã chọn không được áp dụng vào bảng mục lục!" -#: add-patch.c:1290 git-add--interactive.perl:1346 +#: add-patch.c:1291 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "Vẫn áp dụng chúng cho cây làm việc? " -#: add-patch.c:1297 git-add--interactive.perl:1349 +#: add-patch.c:1298 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "Đã không áp dụng gì cả.\n" -#: add-patch.c:1354 +#: add-patch.c:1355 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -679,68 +679,68 @@ msgstr "" "e - sửa bằng tay khúc hiện hành\n" "? - hiển thị trợ giúp\n" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1517 add-patch.c:1527 msgid "No previous hunk" msgstr "Không có khúc kế trước" -#: add-patch.c:1521 add-patch.c:1531 +#: add-patch.c:1522 add-patch.c:1532 msgid "No next hunk" msgstr "Không có khúc kế tiếp" -#: add-patch.c:1537 +#: add-patch.c:1538 msgid "No other hunks to goto" msgstr "Không còn khúc nào để mà nhảy đến" -#: add-patch.c:1548 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " msgstr "nhảy đến khúc nào (<ret> để xem thêm)? " -#: add-patch.c:1549 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "nhảy đến khúc nào? " -#: add-patch.c:1560 +#: add-patch.c:1561 #, c-format msgid "Invalid number: '%s'" msgstr "Số không hợp lệ: “%s”" -#: add-patch.c:1565 +#: add-patch.c:1566 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "Rất tiếc, chỉ có sẵn %d khúc." -#: add-patch.c:1574 +#: add-patch.c:1575 msgid "No other hunks to search" msgstr "Không còn khúc nào để mà tìm kiếm" -#: add-patch.c:1580 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "tìm kiếm cho biểu thức chính quy? " -#: add-patch.c:1595 +#: add-patch.c:1596 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Định dạng tìm kiếm của biểu thức chính quy không đúng %s: %s" -#: add-patch.c:1612 +#: add-patch.c:1613 msgid "No hunk matches the given pattern" msgstr "Không thấy khúc nào khớp mẫu đã cho" -#: add-patch.c:1619 +#: add-patch.c:1620 msgid "Sorry, cannot split this hunk" msgstr "Rất tiếc, không thể chia nhỏ khúc này" -#: add-patch.c:1623 +#: add-patch.c:1624 #, c-format msgid "Split into %d hunks." msgstr "Chi nhỏ thành %d khúc." -#: add-patch.c:1627 +#: add-patch.c:1628 msgid "Sorry, cannot edit this hunk" msgstr "Rất tiếc, không thể sửa khúc này" -#: add-patch.c:1679 +#: add-patch.c:1680 msgid "'git apply' failed" msgstr "“git apply” gặp lỗi" @@ -1194,8 +1194,8 @@ msgstr "%s: sai kiểu" msgid "%s has type %o, expected %o" msgstr "%s có kiểu %o, cần %o" -#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 -#: read-cache.c:1351 +#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892 +#: read-cache.c:1353 #, c-format msgid "invalid path '%s'" msgstr "đường dẫn không hợp lệ “%s”" @@ -1285,7 +1285,7 @@ msgstr "không thể tạo “kho lưu đằng sau” cho tập tin được t msgid "unable to add cache entry for %s" msgstr "không thể thêm mục nhớ đệm cho %s" -#: apply.c:4376 builtin/bisect--helper.c:523 +#: apply.c:4376 builtin/bisect--helper.c:525 #, c-format msgid "failed to write to '%s'" msgstr "gặp lỗi khi ghi vào “%s”" @@ -1371,7 +1371,7 @@ msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d dòng được áp dụng sau khi sửa các lỗi khoảng trắng." -#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "Không thể ghi tập tin lưu bảng mục lục mới" @@ -1383,7 +1383,7 @@ msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho msgid "apply changes matching the given path" msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho" -#: apply.c:5000 builtin/am.c:2317 +#: apply.c:5000 builtin/am.c:2318 msgid "num" msgstr "số" @@ -1453,9 +1453,9 @@ msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL" msgid "ensure at least <n> lines of context match" msgstr "đảm bảo rằng có ít nhất <n> dòng ngữ cảnh khớp" -#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 +#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991 #: builtin/rebase.c:1347 msgid "action" msgstr "hành động" @@ -1485,8 +1485,8 @@ msgid "allow overlapping hunks" msgstr "cho phép chồng khối nhớ" #: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 -#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 -#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "chi tiết" @@ -1499,7 +1499,7 @@ msgstr "" msgid "do not trust the line counts in the hunk headers" msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu" -#: apply.c:5059 builtin/am.c:2305 +#: apply.c:5059 builtin/am.c:2306 msgid "root" msgstr "gốc" @@ -1541,7 +1541,7 @@ msgstr "đường dẫn không hợp lệ UTF-8: %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "đường dẫn quá dài (%d ký tự, SHA1: %s): %s" -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 #, c-format msgid "deflate error (%d)" msgstr "lỗi giải nén (%d)" @@ -1576,13 +1576,13 @@ msgid "cannot read %s" msgstr "không thể đọc %s" #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 -#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 +#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833 #: builtin/merge.c:1143 #, c-format msgid "could not read '%s'" msgstr "không thể đọc “%s”" -#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 +#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào" @@ -1624,7 +1624,7 @@ msgstr "định_dạng" msgid "archive format" msgstr "định dạng lưu trữ" -#: archive.c:553 builtin/log.c:1772 +#: archive.c:553 builtin/log.c:1775 msgid "prefix" msgstr "tiền_tố" @@ -1635,7 +1635,7 @@ msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho #: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105 +#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105 #: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" @@ -1666,7 +1666,7 @@ msgid "list supported archive formats" msgstr "liệt kê các kiểu nén được hỗ trợ" #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "kho" @@ -1674,7 +1674,7 @@ msgstr "kho" msgid "retrieve the archive from remote repository <repo>" msgstr "nhận kho nén từ kho chứa <kho> trên máy chủ" -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717 #: builtin/notes.c:498 msgid "command" msgstr "lệnh" @@ -1858,11 +1858,11 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "cùng sử dụng --reverse và --first-parent cần chỉ định lần chuyển giao cuối" -#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 -#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 -#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 -#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 -#: builtin/pack-objects.c:3661 builtin/shortlog.c:255 +#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333 +#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414 +#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346 +#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806 +#: builtin/pack-objects.c:3821 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi" @@ -2024,116 +2024,116 @@ msgstr "“%s” đã được lấy ra tại “%s” rồi" msgid "HEAD of working tree %s is not updated" msgstr "HEAD của cây làm việc %s chưa được cập nhật" -#: bundle.c:41 +#: bundle.c:44 #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "không hiểu thuật toán băm dữ liệu bundle: %s" -#: bundle.c:45 +#: bundle.c:48 #, c-format msgid "unknown capability '%s'" msgstr "không hiểu dung lượng “%s”" -#: bundle.c:71 +#: bundle.c:74 #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "“%s” không giống như tập tin v2 hay v3 bundle (định dạng dump của git)" -#: bundle.c:110 +#: bundle.c:113 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "phần đầu không được thừa nhận: %s%s (%d)" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 #: builtin/commit.c:861 #, c-format msgid "could not open '%s'" msgstr "không thể mở “%s”" -#: bundle.c:189 +#: bundle.c:198 msgid "Repository lacks these prerequisite commits:" msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết này:" -#: bundle.c:192 +#: bundle.c:201 msgid "need a repository to verify a bundle" msgstr "cần một kho chứa để thẩm tra một bundle" -#: bundle.c:243 +#: bundle.c:257 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Bó dữ liệu chứa %d tham chiếu:" -#: bundle.c:250 +#: bundle.c:264 msgid "The bundle records a complete history." msgstr "Lệnh bundle ghi lại toàn bộ lịch sử." -#: bundle.c:252 +#: bundle.c:266 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Lệnh bundle yêu cầu %d tham chiếu này:" -#: bundle.c:319 +#: bundle.c:333 msgid "unable to dup bundle descriptor" msgstr "không thể nhân đôi bộ mô tả bundle" -#: bundle.c:326 +#: bundle.c:340 msgid "Could not spawn pack-objects" msgstr "Không thể sản sinh đối tượng gói" -#: bundle.c:337 +#: bundle.c:351 msgid "pack-objects died" msgstr "đối tượng gói đã chết" -#: bundle.c:386 +#: bundle.c:400 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "th.chiếu “%s” bị loại trừ bởi các tùy chọn rev-list" -#: bundle.c:490 +#: bundle.c:504 #, c-format msgid "unsupported bundle version %d" msgstr "phiên bản bundle %d không được hỗ trợ" -#: bundle.c:492 +#: bundle.c:506 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "không thể ghi phiên bản bundle %d với thuật toán %s" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "đối số không được thừa nhận: %s" -#: bundle.c:539 +#: bundle.c:553 msgid "Refusing to create empty bundle." msgstr "Từ chối tạo một bó dữ liệu trống rỗng." -#: bundle.c:549 +#: bundle.c:563 #, c-format msgid "cannot create '%s'" msgstr "không thể tạo “%s”" -#: bundle.c:574 +#: bundle.c:588 msgid "index-pack died" msgstr "mục lục gói đã chết" -#: chunk-format.c:113 +#: chunk-format.c:117 msgid "terminating chunk id appears earlier than expected" msgstr "mã mảnh kết thúc sớm hơn bình thường" -#: chunk-format.c:122 +#: chunk-format.c:126 #, c-format msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" msgstr "bù mảnh không đúng cách %<PRIx64> và %<PRIx64>" -#: chunk-format.c:129 +#: chunk-format.c:133 #, c-format msgid "duplicate chunk ID %<PRIx32> found" msgstr "tìm thấy ID của mảnh bị trùng lặp %<PRIx32>" -#: chunk-format.c:143 +#: chunk-format.c:147 #, c-format msgid "final chunk has non-zero id %<PRIx32>" msgstr "mảnh cuối cùng có id không bằng không %<PRIx32>" @@ -2205,12 +2205,12 @@ msgstr "không thể tìm thấy lần chuyển giao %s" msgid "commit-graph requires overflow generation data but has none" msgstr "commit-graph yêu cầu dữ liệu tạo tràn nhưng không có" -#: commit-graph.c:1075 builtin/am.c:1340 +#: commit-graph.c:1075 builtin/am.c:1341 #, c-format msgid "unable to parse commit %s" msgstr "không thể phân tích lần chuyển giao “%s”" -#: commit-graph.c:1337 builtin/pack-objects.c:2897 +#: commit-graph.c:1337 builtin/pack-objects.c:3057 #, c-format msgid "unable to get type of object %s" msgstr "không thể lấy kiểu của đối tượng “%s”" @@ -2276,7 +2276,7 @@ msgstr "Đang tìm các cạnh mở tộng trong đồ thị lần chuyển giao msgid "failed to write correct number of base graph ids" msgstr "gặp lỗi khi ghi số đúng của mã đồ họa cơ sở" -#: commit-graph.c:1812 midx.c:906 +#: commit-graph.c:1812 midx.c:911 #, c-format msgid "unable to create leading directories of %s" msgstr "không thể tạo các thư mục dẫn đầu của “%s”" @@ -2326,66 +2326,66 @@ msgstr "" msgid "too many commits to write graph" msgstr "có quá nhiều lần chuyển giao để ghi đồ thị" -#: commit-graph.c:2450 +#: commit-graph.c:2449 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "tập tin đồ-thị-các-lần-chuyển-giao có tổng kiểm không đúng và có vẻ như là " "đã hỏng" -#: commit-graph.c:2460 +#: commit-graph.c:2459 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "đồ-thị-các-lần-chuyển-giao có thứ tự OID không đúng: %s sau %s" -#: commit-graph.c:2470 commit-graph.c:2485 +#: commit-graph.c:2469 commit-graph.c:2484 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "đồ-thị-các-lần-chuyển-giao có giá trị fanout không đúng: fanout[%d] = %u != " "%u" -#: commit-graph.c:2477 +#: commit-graph.c:2476 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "gặp lỗi khi phân tích lần chuyển giao từ %s đồ-thị-các-lần-chuyển-giao" -#: commit-graph.c:2495 +#: commit-graph.c:2494 msgid "Verifying commits in commit graph" msgstr "Đang thẩm tra các lần chuyển giao trong đồ thị lần chuyển giao" -#: commit-graph.c:2510 +#: commit-graph.c:2509 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "gặp lỗi khi phân tích lần chuyển giao %s từ cơ sở dữ liệu đối tượng cho đồ " "thị lần chuyển giao" -#: commit-graph.c:2517 +#: commit-graph.c:2516 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "OID cây gốc cho lần chuyển giao %s trong đồ-thị-các-lần-chuyển-giao là %s != " "%s" -#: commit-graph.c:2527 +#: commit-graph.c:2526 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" "danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là quá dài" -#: commit-graph.c:2536 +#: commit-graph.c:2535 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "cha mẹ đồ-thị-các-lần-chuyển-giao cho %s là %s != %s" -#: commit-graph.c:2550 +#: commit-graph.c:2549 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s bị chấm " "dứt quá sớm" -#: commit-graph.c:2555 +#: commit-graph.c:2554 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2393,7 +2393,7 @@ msgstr "" "đồ-thị-các-lần-chuyển-giao có con số không lần tạo cho lần chuyển giao %s, " "nhưng không phải số không ở chỗ khác" -#: commit-graph.c:2559 +#: commit-graph.c:2558 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2401,22 +2401,22 @@ msgstr "" "đồ-thị-các-lần-chuyển-giao có con số không phải không lần tạo cho lần chuyển " "giao %s, nhưng số không ở chỗ khác" -#: commit-graph.c:2576 +#: commit-graph.c:2575 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "" "tạo đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là %<PRIuMAX> < " "%<PRIuMAX>" -#: commit-graph.c:2582 +#: commit-graph.c:2581 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "ngày chuyển giao cho lần chuyển giao %s trong đồ-thị-các-lần-chuyển-giao là " "%<PRIuMAX> != %<PRIuMAX>" -#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416 -#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457 +#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417 +#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "không thể phân tích cú pháp %s" @@ -2701,7 +2701,7 @@ msgstr "giá trị cho %s sai dạng: %s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "phải là một trong số nothing, matching, simple, upstream hay current" -#: config.c:1687 builtin/pack-objects.c:3924 +#: config.c:1687 builtin/pack-objects.c:4084 #, c-format msgid "bad pack compression level %d" msgstr "mức nén gói %d không hợp lệ" @@ -2721,110 +2721,110 @@ msgstr "tham chiếu “%s” không chỉ đến một blob nào cả" msgid "unable to resolve config blob '%s'" msgstr "không thể phân giải điểm xét duyệt “%s”" -#: config.c:1873 +#: config.c:1874 #, c-format msgid "failed to parse %s" msgstr "gặp lỗi khi phân tích cú pháp %s" -#: config.c:1929 +#: config.c:1930 msgid "unable to parse command-line config" msgstr "không thể phân tích cấu hình dòng lệnh" -#: config.c:2293 +#: config.c:2294 msgid "unknown error occurred while reading the configuration files" msgstr "đã có lỗi chưa biết xảy ra trong khi đọc các tập tin cấu hình" -#: config.c:2467 +#: config.c:2468 #, c-format msgid "Invalid %s: '%s'" msgstr "%s không hợp lệ: “%s”" -#: config.c:2512 +#: config.c:2513 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "giá trị splitIndex.maxPercentChange “%d” phải nằm giữa 0 và 100" -#: config.c:2558 +#: config.c:2559 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "không thể phân tích “%s” từ cấu hình dòng lệnh" -#: config.c:2560 +#: config.c:2561 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "sai biến cấu hình “%s” trong tập tin “%s” tại dòng %d" -#: config.c:2644 +#: config.c:2645 #, c-format msgid "invalid section name '%s'" msgstr "tên của phần không hợp lệ “%s”" -#: config.c:2676 +#: config.c:2677 #, c-format msgid "%s has multiple values" msgstr "%s có đa giá trị" -#: config.c:2705 +#: config.c:2706 #, c-format msgid "failed to write new configuration file %s" msgstr "gặp lỗi khi ghi tập tin cấu hình “%s”" -#: config.c:2957 config.c:3283 +#: config.c:2958 config.c:3285 #, c-format msgid "could not lock config file %s" msgstr "không thể khóa tập tin cấu hình %s" -#: config.c:2968 +#: config.c:2969 #, c-format msgid "opening %s" msgstr "đang mở “%s”" -#: config.c:3005 builtin/config.c:361 +#: config.c:3006 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "mẫu không hợp lệ: %s" -#: config.c:3030 +#: config.c:3031 #, c-format msgid "invalid config file %s" msgstr "tập tin cấu hình “%s” không hợp lệ" -#: config.c:3043 config.c:3296 +#: config.c:3044 config.c:3298 #, c-format msgid "fstat on %s failed" msgstr "fstat trên %s gặp lỗi" -#: config.c:3054 +#: config.c:3055 #, c-format -msgid "unable to mmap '%s'" -msgstr "không thể mmap “%s”" +msgid "unable to mmap '%s'%s" +msgstr "không thể mmap “%s”%s" -#: config.c:3063 config.c:3301 +#: config.c:3065 config.c:3303 #, c-format msgid "chmod on %s failed" msgstr "chmod trên %s gặp lỗi" -#: config.c:3148 config.c:3398 +#: config.c:3150 config.c:3400 #, c-format msgid "could not write config file %s" msgstr "không thể ghi tập tin cấu hình “%s”" -#: config.c:3182 +#: config.c:3184 #, c-format msgid "could not set '%s' to '%s'" msgstr "không thể đặt “%s” thành “%s”" -#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "không thể thôi đặt “%s”" -#: config.c:3274 +#: config.c:3276 #, c-format msgid "invalid section name: %s" msgstr "tên của phần không hợp lệ: %s" -#: config.c:3441 +#: config.c:3443 #, c-format msgid "missing value for '%s'" msgstr "thiếu giá trị cho cho “%s”" @@ -3001,7 +3001,7 @@ msgstr "đã khóa tên đường dẫn lạ “%s”" msgid "unable to fork" msgstr "không thể rẽ nhánh tiến trình con" -#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Đang kiểm tra kết nối" @@ -3256,36 +3256,36 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "Đã đánh dấu %d island, xong.\n" -#: diff-merges.c:80 +#: diff-merges.c:70 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "không hiểu giá trị cho --diff-merges: %s" -#: diff-lib.c:538 +#: diff-lib.c:557 msgid "--merge-base does not work with ranges" msgstr "--merge-base không hoạt động với phạm vi" -#: diff-lib.c:540 +#: diff-lib.c:559 msgid "--merge-base only works with commits" msgstr "--merge-base chỉ hoạt động với các lần chuyển giao" -#: diff-lib.c:557 +#: diff-lib.c:576 msgid "unable to get HEAD" msgstr "không thể lấy HEAD" -#: diff-lib.c:564 +#: diff-lib.c:583 msgid "no merge base found" msgstr "không tìm thấy cơ sở để hòa trộn" -#: diff-lib.c:566 +#: diff-lib.c:585 msgid "multiple merge bases found" msgstr "có nhiều cơ sở để hòa trộn" -#: diff-no-index.c:238 +#: diff-no-index.c:237 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<các tùy chọn>] </đường/dẫn> </đường/dẫn>" -#: diff-no-index.c:263 +#: diff-no-index.c:262 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" @@ -3343,35 +3343,49 @@ msgstr "" "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n" "%s" -#: diff.c:4278 +#: diff.c:4282 #, c-format msgid "external diff died, stopping at %s" msgstr "phần mềm diff ở bên ngoài đã chết, dừng tại %s" -#: diff.c:4630 +#: diff.c:4634 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check và -s loại từ lẫn nhau" -#: diff.c:4633 +#: diff.c:4637 msgid "-G, -S and --find-object are mutually exclusive" msgstr "Các tùy chọn -G, -S, và --find-object loại từ lẫn nhau" -#: diff.c:4712 +#: diff.c:4640 +msgid "" +"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" +msgstr "" +"-G và --pickaxe-regex là loại trừ lẫn nhau, dùng --pickaxe-regex với -S" + +#: diff.c:4643 +msgid "" +"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +"with -G and -S" +msgstr "" +"tùy chọn ---pickaxe-all và --find-object loại từ lẫn nhau, hãy dùng ---" +"pickaxe-all với -G và -S" + +#: diff.c:4722 msgid "--follow requires exactly one pathspec" msgstr "--follow cần chính xác một đặc tả đường dẫn" -#: diff.c:4760 +#: diff.c:4770 #, c-format msgid "invalid --stat value: %s" msgstr "giá trị --stat không hợp lệ: “%s”" -#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 +#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "tùy chọn “%s” cần một giá trị bằng số" -#: diff.c:4797 +#: diff.c:4807 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3380,42 +3394,42 @@ msgstr "" "Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n" "%s" -#: diff.c:4882 +#: diff.c:4892 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "không hiểu lớp thay đổi “%c” trong --diff-filter=%s" -#: diff.c:4906 +#: diff.c:4916 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "không hiểu giá trị sau ws-error-highlight=%.*s" -#: diff.c:4920 +#: diff.c:4930 #, c-format msgid "unable to resolve '%s'" msgstr "không thể phân giải “%s”" -#: diff.c:4970 diff.c:4976 +#: diff.c:4980 diff.c:4986 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s cần dạng <n>/<m>" -#: diff.c:4988 +#: diff.c:4998 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s cần một ký tự, nhưng lại nhận được “%s”" -#: diff.c:5009 +#: diff.c:5019 #, c-format msgid "bad --color-moved argument: %s" msgstr "đối số --color-moved sai: %s" -#: diff.c:5028 +#: diff.c:5038 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "chế độ “%s” không hợp lệ trong --color-moved-ws" -#: diff.c:5068 +#: diff.c:5078 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3423,155 +3437,155 @@ msgstr "" "tùy chọn diff-algorithm chấp nhận \"myers\", \"minimal\", \"patience\" và " "\"histogram\"" -#: diff.c:5104 diff.c:5124 +#: diff.c:5114 diff.c:5134 #, c-format msgid "invalid argument to %s" msgstr "tham số cho %s không hợp lệ" -#: diff.c:5228 +#: diff.c:5238 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "đưa cho -I biểu thức chính quy không hợp lệ: “%s”" -#: diff.c:5277 +#: diff.c:5287 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "gặp lỗi khi phân tích đối số tùy chọn --submodule: “%s”" -#: diff.c:5333 +#: diff.c:5343 #, c-format msgid "bad --word-diff argument: %s" msgstr "đối số --word-diff sai: %s" -#: diff.c:5369 +#: diff.c:5379 msgid "Diff output format options" msgstr "Các tùy chọn định dạng khi xuất các khác biệt" -#: diff.c:5371 diff.c:5377 +#: diff.c:5381 diff.c:5387 msgid "generate patch" msgstr "tạo miếng vá" -#: diff.c:5374 builtin/log.c:179 +#: diff.c:5384 builtin/log.c:179 msgid "suppress diff output" msgstr "chặn mọi kết xuất từ diff" -#: diff.c:5379 diff.c:5493 diff.c:5500 +#: diff.c:5389 diff.c:5503 diff.c:5510 msgid "<n>" msgstr "<n>" -#: diff.c:5380 diff.c:5383 +#: diff.c:5390 diff.c:5393 msgid "generate diffs with <n> lines context" msgstr "tạo khác biệt với <n> dòng ngữ cảnh" -#: diff.c:5385 +#: diff.c:5395 msgid "generate the diff in raw format" msgstr "tạo khác biệt ở định dạng thô" -#: diff.c:5388 +#: diff.c:5398 msgid "synonym for '-p --raw'" msgstr "đồng nghĩa với “-p --raw”" -#: diff.c:5392 +#: diff.c:5402 msgid "synonym for '-p --stat'" msgstr "đồng nghĩa với “-p --stat”" -#: diff.c:5396 +#: diff.c:5406 msgid "machine friendly --stat" msgstr "--stat thuận tiện cho máy đọc" -#: diff.c:5399 +#: diff.c:5409 msgid "output only the last line of --stat" msgstr "chỉ xuất những dòng cuối của --stat" -#: diff.c:5401 diff.c:5409 +#: diff.c:5411 diff.c:5419 msgid "<param1,param2>..." msgstr "<tham_số_1,tham_số_2>…" -#: diff.c:5402 +#: diff.c:5412 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "đầu ra phân phối của số lượng thay đổi tương đối cho mỗi thư mục con" -#: diff.c:5406 +#: diff.c:5416 msgid "synonym for --dirstat=cumulative" msgstr "đồng nghĩa với --dirstat=cumulative" -#: diff.c:5410 +#: diff.c:5420 msgid "synonym for --dirstat=files,param1,param2..." msgstr "đồng nghĩa với --dirstat=files,param1,param2…" -#: diff.c:5414 +#: diff.c:5424 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "cảnh báo nếu các thay đổi đưa ra các bộ tạo xung đột hay lỗi khoảng trắng" -#: diff.c:5417 +#: diff.c:5427 msgid "condensed summary such as creations, renames and mode changes" msgstr "tổng hợp dạng xúc tích như là tạo, đổi tên và các thay đổi chế độ" -#: diff.c:5420 +#: diff.c:5430 msgid "show only names of changed files" msgstr "chỉ hiển thị tên của các tập tin đổi" -#: diff.c:5423 +#: diff.c:5433 msgid "show only names and status of changed files" msgstr "chỉ hiển thị tên tập tin và tình trạng của các tập tin bị thay đổi" -#: diff.c:5425 +#: diff.c:5435 msgid "<width>[,<name-width>[,<count>]]" msgstr "<rộng>[,<name-width>[,<số-lượng>]]" -#: diff.c:5426 +#: diff.c:5436 msgid "generate diffstat" msgstr "tạo diffstat" -#: diff.c:5428 diff.c:5431 diff.c:5434 +#: diff.c:5438 diff.c:5441 diff.c:5444 msgid "<width>" msgstr "<rộng>" -#: diff.c:5429 +#: diff.c:5439 msgid "generate diffstat with a given width" msgstr "tạo diffstat với độ rộng đã cho" -#: diff.c:5432 +#: diff.c:5442 msgid "generate diffstat with a given name width" msgstr "tạo diffstat với tên độ rộng đã cho" -#: diff.c:5435 +#: diff.c:5445 msgid "generate diffstat with a given graph width" msgstr "tạo diffstat với độ rộng đồ thị đã cho" -#: diff.c:5437 +#: diff.c:5447 msgid "<count>" msgstr "<số_lượng>" -#: diff.c:5438 +#: diff.c:5448 msgid "generate diffstat with limited lines" msgstr "tạo diffstat với các dòng bị giới hạn" -#: diff.c:5441 +#: diff.c:5451 msgid "generate compact summary in diffstat" msgstr "tạo tổng hợp xúc tích trong diffstat" -#: diff.c:5444 +#: diff.c:5454 msgid "output a binary diff that can be applied" msgstr "xuất ra một khác biệt dạng nhị phân cái mà có thể được áp dụng" -#: diff.c:5447 +#: diff.c:5457 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "hiển thị đầy đủ các tên đối tượng pre- và post-image trên các dòng \"mục lục" "\"" -#: diff.c:5449 +#: diff.c:5459 msgid "show colored diff" msgstr "hiển thị thay đổi được tô màu" -#: diff.c:5450 +#: diff.c:5460 msgid "<kind>" msgstr "<kiểu>" -#: diff.c:5451 +#: diff.c:5461 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3579,7 +3593,7 @@ msgstr "" "tô sáng các lỗi về khoảng trắng trong các dòng “context”, “old” và “new” " "trong khác biệt" -#: diff.c:5454 +#: diff.c:5464 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3587,89 +3601,89 @@ msgstr "" "không munge tên đường dẫn và sử dụng NUL làm bộ phân tách trường đầu ra " "trong --raw hay --numstat" -#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572 +#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582 msgid "<prefix>" msgstr "<tiền_tố>" -#: diff.c:5458 +#: diff.c:5468 msgid "show the given source prefix instead of \"a/\"" msgstr "hiển thị tiền tố nguồn đã cho thay cho \"a/\"" -#: diff.c:5461 +#: diff.c:5471 msgid "show the given destination prefix instead of \"b/\"" msgstr "hiển thị tiền tố đích đã cho thay cho \"b/\"" -#: diff.c:5464 +#: diff.c:5474 msgid "prepend an additional prefix to every line of output" msgstr "treo vào trước một tiền tố bổ sung cho mỗi dòng kết xuất" -#: diff.c:5467 +#: diff.c:5477 msgid "do not show any source or destination prefix" msgstr "đừng hiển thị bất kỳ tiền tố nguồn hay đích" -#: diff.c:5470 +#: diff.c:5480 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "hiển thị ngữ cảnh giữa các khúc khác biệt khi đạt đến số lượng dòng đã chỉ " "định" -#: diff.c:5474 diff.c:5479 diff.c:5484 +#: diff.c:5484 diff.c:5489 diff.c:5494 msgid "<char>" msgstr "<ký_tự>" -#: diff.c:5475 +#: diff.c:5485 msgid "specify the character to indicate a new line instead of '+'" msgstr "chỉ định một ký tự để biểu thị một dòng được thêm mới thay cho “+”" -#: diff.c:5480 +#: diff.c:5490 msgid "specify the character to indicate an old line instead of '-'" msgstr "chỉ định một ký tự để biểu thị một dòng đã cũ thay cho “-”" -#: diff.c:5485 +#: diff.c:5495 msgid "specify the character to indicate a context instead of ' '" msgstr "chỉ định một ký tự để biểu thị một ngữ cảnh thay cho “”" -#: diff.c:5488 +#: diff.c:5498 msgid "Diff rename options" msgstr "Tùy chọn khác biệt đổi tên" -#: diff.c:5489 +#: diff.c:5499 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5490 +#: diff.c:5500 msgid "break complete rewrite changes into pairs of delete and create" msgstr "ngắt các thay đổi ghi lại hoàn thiện thành cặp của xóa và tạo" -#: diff.c:5494 +#: diff.c:5504 msgid "detect renames" msgstr "dò tìm các tên thay đổi" -#: diff.c:5498 +#: diff.c:5508 msgid "omit the preimage for deletes" msgstr "bỏ qua preimage (tiền ảnh??) cho các việc xóa" -#: diff.c:5501 +#: diff.c:5511 msgid "detect copies" msgstr "dò bản sao" -#: diff.c:5505 +#: diff.c:5515 msgid "use unmodified files as source to find copies" msgstr "dùng các tập tin không bị chỉnh sửa như là nguồn để tìm các bản sao" -#: diff.c:5507 +#: diff.c:5517 msgid "disable rename detection" msgstr "tắt dò tìm đổi tên" -#: diff.c:5510 +#: diff.c:5520 msgid "use empty blobs as rename source" msgstr "dùng các blob trống rống như là nguồn đổi tên" -#: diff.c:5512 +#: diff.c:5522 msgid "continue listing the history of a file beyond renames" msgstr "tiếp tục liệt kê lịch sử của một tập tin ngoài đổi tên" -#: diff.c:5515 +#: diff.c:5525 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3677,160 +3691,160 @@ msgstr "" "ngăn cản dò tìm đổi tên/bản sao nếu số lượng của đích đổi tên/bản sao vượt " "quá giới hạn đưa ra" -#: diff.c:5517 +#: diff.c:5527 msgid "Diff algorithm options" msgstr "Tùy chọn thuật toán khác biệt" -#: diff.c:5519 +#: diff.c:5529 msgid "produce the smallest possible diff" msgstr "sản sinh khác biệt ít nhất có thể" -#: diff.c:5522 +#: diff.c:5532 msgid "ignore whitespace when comparing lines" msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi so sánh các dòng" -#: diff.c:5525 +#: diff.c:5535 msgid "ignore changes in amount of whitespace" msgstr "lờ đi sự thay đổi do số lượng khoảng trắng gây ra" -#: diff.c:5528 +#: diff.c:5538 msgid "ignore changes in whitespace at EOL" msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi ở cuối dòng EOL" -#: diff.c:5531 +#: diff.c:5541 msgid "ignore carrier-return at the end of line" msgstr "bỏ qua ký tự về đầu dòng tại cuối dòng" -#: diff.c:5534 +#: diff.c:5544 msgid "ignore changes whose lines are all blank" msgstr "bỏ qua các thay đổi cho toàn bộ các dòng là trống" -#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606 +#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616 msgid "<regex>" msgstr "<regex>" -#: diff.c:5537 +#: diff.c:5547 msgid "ignore changes whose all lines match <regex>" msgstr "bỏ qua các thay đổi có tất cả các dòng khớp <regex>" -#: diff.c:5540 +#: diff.c:5550 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "heuristic để dịch hạn biên của khối khác biệt cho dễ đọc" -#: diff.c:5543 +#: diff.c:5553 msgid "generate diff using the \"patience diff\" algorithm" msgstr "tạo khác biệt sử dung thuật toán \"patience diff\"" -#: diff.c:5547 +#: diff.c:5557 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "tạo khác biệt sử dung thuật toán \"histogram diff\"" -#: diff.c:5549 +#: diff.c:5559 msgid "<algorithm>" msgstr "<thuật toán>" -#: diff.c:5550 +#: diff.c:5560 msgid "choose a diff algorithm" msgstr "chọn một thuật toán khác biệt" -#: diff.c:5552 +#: diff.c:5562 msgid "<text>" msgstr "<văn bản>" -#: diff.c:5553 +#: diff.c:5563 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "tạo khác biệt sử dung thuật toán \"anchored diff\"" -#: diff.c:5555 diff.c:5564 diff.c:5567 +#: diff.c:5565 diff.c:5574 diff.c:5577 msgid "<mode>" msgstr "<chế độ>" -#: diff.c:5556 +#: diff.c:5566 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "hiển thị khác biệt từ, sử dụng <chế độ> để bỏ giới hạn các từ bị thay đổi" -#: diff.c:5559 +#: diff.c:5569 msgid "use <regex> to decide what a word is" msgstr "dùng <regex> để quyết định từ là cái gì" -#: diff.c:5562 +#: diff.c:5572 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "tương đương với --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5565 +#: diff.c:5575 msgid "moved lines of code are colored differently" msgstr "các dòng di chuyển của mã mà được tô màu khác nhau" -#: diff.c:5568 +#: diff.c:5578 msgid "how white spaces are ignored in --color-moved" msgstr "cách bỏ qua khoảng trắng trong --color-moved" -#: diff.c:5571 +#: diff.c:5581 msgid "Other diff options" msgstr "Các tùy chọn khác biệt khác" -#: diff.c:5573 +#: diff.c:5583 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "khi chạy từ thư mục con, thực thi các thay đổi bên ngoài và hiển thị các " "đường dẫn liên quan" -#: diff.c:5577 +#: diff.c:5587 msgid "treat all files as text" msgstr "coi mọi tập tin là dạng văn bản thường" -#: diff.c:5579 +#: diff.c:5589 msgid "swap two inputs, reverse the diff" msgstr "tráo đổi hai đầu vào, đảo ngược khác biệt" -#: diff.c:5581 +#: diff.c:5591 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "thoát với mã 1 nếu không có khác biệt gì, 0 nếu ngược lại" -#: diff.c:5583 +#: diff.c:5593 msgid "disable all output of the program" msgstr "tắt mọi kết xuất của chương trình" -#: diff.c:5585 +#: diff.c:5595 msgid "allow an external diff helper to be executed" msgstr "cho phép mộ bộ hỗ trợ xuất khác biệt ở bên ngoài được phép thực thi" -#: diff.c:5587 +#: diff.c:5597 msgid "run external text conversion filters when comparing binary files" msgstr "" "chạy các bộ lọc văn bản thông thường bên ngoài khi so sánh các tập tin nhị " "phân" -#: diff.c:5589 +#: diff.c:5599 msgid "<when>" msgstr "<khi>" -#: diff.c:5590 +#: diff.c:5600 msgid "ignore changes to submodules in the diff generation" msgstr "bỏ qua các thay đổi trong mô-đun-con trong khi tạo khác biệt" -#: diff.c:5593 +#: diff.c:5603 msgid "<format>" msgstr "<định dạng>" -#: diff.c:5594 +#: diff.c:5604 msgid "specify how differences in submodules are shown" msgstr "chi định khác biệt bao nhiêu trong các mô đun con được hiển thị" -#: diff.c:5598 +#: diff.c:5608 msgid "hide 'git add -N' entries from the index" msgstr "ẩn các mục “git add -N” từ bảng mục lục" -#: diff.c:5601 +#: diff.c:5611 msgid "treat 'git add -N' entries as real in the index" msgstr "coi các mục “git add -N” như là có thật trong bảng mục lục" -#: diff.c:5603 +#: diff.c:5613 msgid "<string>" msgstr "<chuỗi>" -#: diff.c:5604 +#: diff.c:5614 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3838,7 +3852,7 @@ msgstr "" "tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của " "chuỗi được chỉ ra" -#: diff.c:5607 +#: diff.c:5617 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3846,35 +3860,35 @@ msgstr "" "tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của biểu " "thức chính quy được chỉ ra" -#: diff.c:5610 +#: diff.c:5620 msgid "show all changes in the changeset with -S or -G" msgstr "hiển thị tất cả các thay đổi trong một bộ các thay đổi với -S hay -G" -#: diff.c:5613 +#: diff.c:5623 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "coi <chuỗi> trong -S như là biểu thức chính qui POSIX có mở rộng" -#: diff.c:5616 +#: diff.c:5626 msgid "control the order in which files appear in the output" msgstr "điều khiển thứ tự xuát hiện các tập tin trong kết xuất" -#: diff.c:5617 diff.c:5620 +#: diff.c:5627 diff.c:5630 msgid "<path>" msgstr "<đường-dẫn>" -#: diff.c:5618 +#: diff.c:5628 msgid "show the change in the specified path first" msgstr "hiển thị các thay đổi trong đường dẫn đã cho đầu tiên" -#: diff.c:5621 +#: diff.c:5631 msgid "skip the output to the specified path" msgstr "bỏ qua đầu ra đến đường dẫn đã cho" -#: diff.c:5623 +#: diff.c:5633 msgid "<object-id>" msgstr "<mã-số-đối-tượng>" -#: diff.c:5624 +#: diff.c:5634 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3882,33 +3896,32 @@ msgstr "" "tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của đối " "tượng được chỉ ra" -#: diff.c:5626 +#: diff.c:5636 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]" -#: diff.c:5627 +#: diff.c:5637 msgid "select files by diff type" msgstr "chọn các tập tin theo kiểu khác biệt" -#: diff.c:5629 +#: diff.c:5639 msgid "<file>" msgstr "<tập_tin>" -#: diff.c:5630 +#: diff.c:5640 msgid "Output to a specific file" msgstr "Xuất ra một tập tin cụ thể" -#: diff.c:6287 -msgid "inexact rename detection was skipped due to too many files." -msgstr "" -"nhận thấy đổi tên không chính xác đã bị bỏ qua bởi có quá nhiều tập tin." +#: diff.c:6298 +msgid "exhaustive rename detection was skipped due to too many files." +msgstr "nhận thấy đổi tên toàn diện đã bị bỏ qua bởi có quá nhiều tập tin." -#: diff.c:6290 +#: diff.c:6301 msgid "only found copies from modified paths due to too many files." msgstr "" "chỉ tìm thấy các bản sao từ đường dẫn đã sửa đổi bởi vì có quá nhiều tập tin." -#: diff.c:6293 +#: diff.c:6304 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3921,7 +3934,7 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”" -#: diffcore-rename.c:1418 +#: diffcore-rename.c:1510 msgid "Performing inexact rename detection" msgstr "Đang thực hiện dò tìm đổi tên không chính xác" @@ -3930,59 +3943,59 @@ msgstr "Đang thực hiện dò tìm đổi tên không chính xác" msgid "No such path '%s' in the diff" msgstr "Không có đường dẫn %s trong diff" -#: dir.c:578 +#: dir.c:593 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào mà git biết" -#: dir.c:718 dir.c:747 dir.c:760 +#: dir.c:733 dir.c:762 dir.c:775 #, c-format msgid "unrecognized pattern: '%s'" msgstr "mẫu không được thừa nhận: “%s”" -#: dir.c:777 dir.c:791 +#: dir.c:792 dir.c:806 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "mẫu âm không được thừa nhận: “%s”" -#: dir.c:809 +#: dir.c:824 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "tập tin sparse-checkout của bạn có lẽ gặp lỗi: mẫu “%s” đã bị lặp lại" -#: dir.c:819 +#: dir.c:834 msgid "disabling cone pattern matching" msgstr "vô hiệu khớp mẫu nón" -#: dir.c:1206 +#: dir.c:1221 #, c-format msgid "cannot use %s as an exclude file" msgstr "không thể dùng %s như là một tập tin loại trừ" -#: dir.c:2314 +#: dir.c:2358 #, c-format msgid "could not open directory '%s'" msgstr "không thể mở thư mục “%s”" -#: dir.c:2614 +#: dir.c:2660 msgid "failed to get kernel name and information" msgstr "gặp lỗi khi lấy tên và thông tin của nhân" -#: dir.c:2738 +#: dir.c:2784 msgid "untracked cache is disabled on this system or location" msgstr "bộ nhớ tạm không theo vết bị tắt trên hệ thống hay vị trí này" -#: dir.c:3543 +#: dir.c:3617 #, c-format msgid "index file corrupt in repo %s" msgstr "tập tin ghi bảng mục lục bị hỏng trong kho %s" -#: dir.c:3590 dir.c:3595 +#: dir.c:3664 dir.c:3669 #, c-format msgid "could not create directories for %s" msgstr "không thể tạo thư mục cho %s" -#: dir.c:3624 +#: dir.c:3698 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "không thể di dời thư mục git từ “%s” sang “%s”" @@ -3992,11 +4005,11 @@ msgstr "không thể di dời thư mục git từ “%s” sang “%s”" msgid "hint: Waiting for your editor to close the file...%c" msgstr "gợi ý: Chờ trình biên soạn của bạn đóng tập tin…%c" -#: entry.c:179 +#: entry.c:176 msgid "Filtering content" msgstr "Nội dung lọc" -#: entry.c:500 +#: entry.c:497 #, c-format msgid "could not stat file '%s'" msgstr "không thể lấy thống kê tập tin “%s”" @@ -4171,7 +4184,7 @@ msgstr "không có lần chuyển giao chung nào" msgid "source repository is shallow, reject to clone." msgstr "kho nguồn là nông, nên bỏ từ chối nhân bản." -#: fetch-pack.c:1128 fetch-pack.c:1651 +#: fetch-pack.c:1128 fetch-pack.c:1660 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: fetch gặp lỗi." @@ -4193,7 +4206,7 @@ msgstr "Máy chủ không hỗ trợ yêu cầu shallow" msgid "Server supports filter" msgstr "Máy chủ hỗ trợ bộ lọc" -#: fetch-pack.c:1329 fetch-pack.c:2034 +#: fetch-pack.c:1329 fetch-pack.c:2043 msgid "unable to write request to remote" msgstr "không thể ghi các yêu cầu lên máy phục vụ" @@ -4249,24 +4262,24 @@ msgstr "lỗi khi xử lý wanted refs: %d" msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: cần nhận được trả lời là kết thúc gói" -#: fetch-pack.c:1930 +#: fetch-pack.c:1939 msgid "no matching remote head" msgstr "không khớp phần đầu máy chủ" -#: fetch-pack.c:1953 builtin/clone.c:697 +#: fetch-pack.c:1962 builtin/clone.c:697 msgid "remote did not send all necessary objects" msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết" -#: fetch-pack.c:2056 +#: fetch-pack.c:2065 msgid "unexpected 'ready' from remote" msgstr "gặp 'ready' đột xuất từ máy chủ" -#: fetch-pack.c:2079 +#: fetch-pack.c:2088 #, c-format msgid "no such remote ref %s" msgstr "không có máy chủ tham chiếu nào như %s" -#: fetch-pack.c:2082 +#: fetch-pack.c:2091 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" @@ -4287,7 +4300,7 @@ msgstr "gpg gặp lỗi khi ký dữ liệu" #: graph.c:98 #, c-format -msgid "ignore invalid color '%.*s' in log.graphColors" +msgid "ignored invalid color '%.*s' in log.graphColors" msgstr "bỏ qua màu không hợp lệ “%.*s” trong log.graphColors" #: grep.c:531 @@ -4298,18 +4311,18 @@ msgstr "" "mẫu đã cho có chứa NULL byte (qua -f <file>). Điều này chỉ được hỗ trợ với -" "P dưới PCRE v2" -#: grep.c:1893 +#: grep.c:1895 #, c-format msgid "'%s': unable to read %s" msgstr "“%s”: không thể đọc %s" -#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 +#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 #: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "gặp lỗi khi lấy thống kê về “%s”" -#: grep.c:1921 +#: grep.c:1923 #, c-format msgid "'%s': short read" msgstr "“%s”: đọc ngắn" @@ -4541,7 +4554,7 @@ msgstr "việc hỗ trợ bộ lọc sparse:đường/dẫn đã bị bỏ" #: list-objects-filter-options.c:105 #, c-format -msgid "'%s' for 'object:type=<type>' isnot a valid object type" +msgid "'%s' for 'object:type=<type>' is not a valid object type" msgstr "“%s” dành cho “object:type=<type>” không phải là kiểu đối tượng hợp lệ" #: list-objects-filter-options.c:124 @@ -4586,7 +4599,7 @@ msgstr "mục “%s” trong cây %s có nút cây, nhưng không phải là m msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "mục “%s” trong cây %s có nút blob, nhưng không phải là một blob" -#: list-objects.c:395 +#: list-objects.c:398 #, c-format msgid "unable to load root tree for commit %s" msgstr "không thể tải cây gốc cho lần chuyển giao “%s”" @@ -4633,34 +4646,34 @@ msgstr "phát hiện CRLF được trích dẫn" msgid "bad action '%s' for '%s'" msgstr "thao tác sai “%s” cho “%s”" -#: merge-ort.c:1116 merge-recursive.c:1205 +#: merge-ort.c:1228 merge-recursive.c:1206 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không lấy ra được)" -#: merge-ort.c:1125 merge-recursive.c:1212 +#: merge-ort.c:1237 merge-recursive.c:1213 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (lần chuyển giao không hiện diện)" -#: merge-ort.c:1134 merge-recursive.c:1219 +#: merge-ort.c:1246 merge-recursive.c:1220 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Gặp lỗi khi hòa trộn mô-đun-con “%s” (lần chuyển giao không theo sau nền-hòa-" "trộn)" -#: merge-ort.c:1144 merge-ort.c:1151 +#: merge-ort.c:1256 merge-ort.c:1263 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "Chú ý: Chuyển-tiếp-nhanh mô-đun-con “%s” sang “%s”" -#: merge-ort.c:1172 +#: merge-ort.c:1284 #, c-format msgid "Failed to merge submodule %s" msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s”" -#: merge-ort.c:1179 +#: merge-ort.c:1291 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4669,7 +4682,7 @@ msgstr "" "Gặp lỗi khi hòa trộn mô-đun-con “%s”, nhưng có cách giải quyết:\n" "%s\n" -#: merge-ort.c:1183 merge-recursive.c:1273 +#: merge-ort.c:1295 merge-recursive.c:1274 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4686,7 +4699,7 @@ msgstr "" "\n" "cái mà sẽ chấp nhận gợi ý này.\n" -#: merge-ort.c:1196 +#: merge-ort.c:1308 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4695,21 +4708,21 @@ msgstr "" "Gặp lỗi khi hòa trộn mô-đun-con “%s”, nhưng có nhiều cách giải quyết:\n" "%s" -#: merge-ort.c:1415 merge-recursive.c:1362 +#: merge-ort.c:1527 merge-recursive.c:1363 msgid "Failed to execute internal merge" msgstr "Gặp lỗi khi thực hiện trộn nội bộ" -#: merge-ort.c:1420 merge-recursive.c:1367 +#: merge-ort.c:1532 merge-recursive.c:1368 #, c-format msgid "Unable to add %s to database" msgstr "Không thể thêm %s vào cơ sở dữ liệu" -#: merge-ort.c:1427 merge-recursive.c:1400 +#: merge-ort.c:1539 merge-recursive.c:1401 #, c-format msgid "Auto-merging %s" msgstr "Tự-động-hòa-trộn %s" -#: merge-ort.c:1566 merge-recursive.c:2122 +#: merge-ort.c:1678 merge-recursive.c:2123 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4718,7 +4731,7 @@ msgstr "" "XUNG ĐỘT: (ngầm đổi tên thư mục): Tập tin/thư mục đã sẵn có tại %s theo cách " "của các đổi tên thư mục ngầm đặt (các) đường dẫn sau ở đây: %s." -#: merge-ort.c:1576 merge-recursive.c:2132 +#: merge-ort.c:1688 merge-recursive.c:2133 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4727,7 +4740,7 @@ msgstr "" "XUNG ĐỘT: (ngầm đổi tên thư mục): Không thể ánh xạ một đường dẫn thành %s; " "các đổi tên thư mục ngầm cố đặt các đường dẫn ở đây: %s" -#: merge-ort.c:1634 +#: merge-ort.c:1746 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4738,7 +4751,7 @@ msgstr "" "thành; nó đã bị đổi tên thành nhiều thư mục khác, với không đích đến nhận " "một phần nhiều của các tập tin." -#: merge-ort.c:1788 merge-recursive.c:2468 +#: merge-ort.c:1900 merge-recursive.c:2469 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4747,7 +4760,7 @@ msgstr "" "CẢNH BÁO: tránh áp dụng %s -> %s đổi thên thành %s, bởi vì bản thân %s cũng " "bị đổi tên." -#: merge-ort.c:1932 merge-recursive.c:3244 +#: merge-ort.c:2044 merge-recursive.c:3252 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4756,7 +4769,7 @@ msgstr "" "Đường dẫn đã được cập nhật: %s được thêm vào trong %s bên trong một thư mục " "đã được đổi tên trong %s; di chuyển nó đến %s." -#: merge-ort.c:1939 merge-recursive.c:3251 +#: merge-ort.c:2051 merge-recursive.c:3259 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4765,7 +4778,7 @@ msgstr "" "Đường dẫn đã được cập nhật: %s được đổi tên thành %s trong %s, bên trong một " "thư mục đã được đổi tên trong %s; di chuyển nó đến %s." -#: merge-ort.c:1952 merge-recursive.c:3247 +#: merge-ort.c:2064 merge-recursive.c:3255 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4774,7 +4787,7 @@ msgstr "" "XUNG ĐỘT (vị trí tệp): %s được thêm vào trong %s trong một thư mục đã được " "đổi tên thành %s, đoán là nó nên được di chuyển đến %s." -#: merge-ort.c:1960 merge-recursive.c:3254 +#: merge-ort.c:2072 merge-recursive.c:3262 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4783,13 +4796,13 @@ msgstr "" "XUNG ĐỘT (vị trí tệp): %s được đổi tên thành %s trong %s, bên trong một thư " "mục đã được đổi tên thành %s, đoán là nó nên được di chuyển đến %s." -#: merge-ort.c:2103 +#: merge-ort.c:2228 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s và thành %s trong %s." -#: merge-ort.c:2198 +#: merge-ort.c:2323 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4800,23 +4813,23 @@ msgstr "" "VÀ va chạm với một đường dẫn khác; điều này có thể dẫn đến tạo ra các xung " "đột lồng nhau." -#: merge-ort.c:2217 merge-ort.c:2241 +#: merge-ort.c:2342 merge-ort.c:2366 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" "XUNG ĐỘT (đổi-tên/xóa): Đổi tên %s->%s trong %s, nhưng lại bị xóa trong %s." -#: merge-ort.c:2550 merge-recursive.c:3002 +#: merge-ort.c:2819 merge-recursive.c:3013 #, c-format msgid "cannot read object %s" msgstr "không thể đọc đối tượng %s" -#: merge-ort.c:2553 merge-recursive.c:3005 +#: merge-ort.c:2822 merge-recursive.c:3016 #, c-format msgid "object %s is not a blob" msgstr "đối tượng %s không phải là một blob" -#: merge-ort.c:2981 +#: merge-ort.c:3250 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " @@ -4825,7 +4838,7 @@ msgstr "" "XUNG ĐỘT (tập tin/thư mục): thư mục theo cách của %s từ %s; thay vào đó, di " "chuyển nó đến %s." -#: merge-ort.c:3055 +#: merge-ort.c:3326 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " @@ -4834,7 +4847,7 @@ msgstr "" "XUNG ĐỘT (các kiểu riêng biệt): %s có các kiểu khác nhau ở mỗi bên; đã đổi " "tên cả hai trong số chúng để mỗi cái có thể được ghi lại ở đâu đó." -#: merge-ort.c:3062 +#: merge-ort.c:3333 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " @@ -4843,24 +4856,24 @@ msgstr "" "XUNG ĐỘT (các kiểu riêng biệt): %s có các loại khác nhau ở mỗi bên; đã đổi " "tên một trong số chúng để mỗi cái có thể được ghi lại ở đâu đó." -#: merge-ort.c:3162 merge-recursive.c:3081 +#: merge-ort.c:3433 merge-recursive.c:3092 msgid "content" msgstr "nội dung" -#: merge-ort.c:3164 merge-recursive.c:3085 +#: merge-ort.c:3435 merge-recursive.c:3096 msgid "add/add" msgstr "thêm/thêm" -#: merge-ort.c:3166 merge-recursive.c:3130 +#: merge-ort.c:3437 merge-recursive.c:3141 msgid "submodule" msgstr "mô-đun-con" -#: merge-ort.c:3168 merge-recursive.c:3131 +#: merge-ort.c:3439 merge-recursive.c:3142 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s" -#: merge-ort.c:3198 +#: merge-ort.c:3470 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4869,7 +4882,7 @@ msgstr "" "XUNG ĐỘT (sửa/xóa): %s bị xóa trong %s và sửa trong %s. Phiên bản %s của %s " "còn lại trong cây (tree)." -#: merge-ort.c:3433 +#: merge-ort.c:3757 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -4881,12 +4894,12 @@ msgstr "" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:3730 +#: merge-ort.c:4116 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "thu thập thông tin hòa trộn gặp lỗi cho cây %s, %s, %s" -#: merge-ort-wrappers.c:13 merge-recursive.c:3699 +#: merge-ort-wrappers.c:13 merge-recursive.c:3707 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4896,109 +4909,109 @@ msgstr "" "hòa trộn:\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402 +#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402 msgid "Already up to date." msgstr "Đã cập nhật rồi." -#: merge-recursive.c:356 +#: merge-recursive.c:357 msgid "(bad commit)\n" msgstr "(commit sai)\n" -#: merge-recursive.c:379 +#: merge-recursive.c:380 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo gặp lỗi đối với đường dẫn “%s”; việc hòa trộn bị bãi bỏ." -#: merge-recursive.c:388 +#: merge-recursive.c:389 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "add_cacheinfo gặp lỗi khi làm mới đối với đường dẫn “%s”; việc hòa trộn bị " "bãi bỏ." -#: merge-recursive.c:876 +#: merge-recursive.c:877 #, c-format msgid "failed to create path '%s'%s" msgstr "gặp lỗi khi tạo đường dẫn “%s”%s" -#: merge-recursive.c:887 +#: merge-recursive.c:888 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Gỡ bỏ %s để tạo chỗ (room) cho thư mục con\n" -#: merge-recursive.c:901 merge-recursive.c:920 +#: merge-recursive.c:902 merge-recursive.c:921 msgid ": perhaps a D/F conflict?" msgstr ": có lẽ là một xung đột D/F?" -#: merge-recursive.c:910 +#: merge-recursive.c:911 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "từ chối đóng tập tin không được theo dõi tại “%s”" -#: merge-recursive.c:951 builtin/cat-file.c:41 +#: merge-recursive.c:952 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "không thể đọc đối tượng %s “%s”" -#: merge-recursive.c:956 +#: merge-recursive.c:957 #, c-format msgid "blob expected for %s '%s'" msgstr "mong đợi đối tượng blob cho %s “%s”" -#: merge-recursive.c:981 +#: merge-recursive.c:982 #, c-format msgid "failed to open '%s': %s" msgstr "gặp lỗi khi mở “%s”: %s" -#: merge-recursive.c:992 +#: merge-recursive.c:993 #, c-format msgid "failed to symlink '%s': %s" msgstr "gặp lỗi khi tạo liên kết mềm (symlink) “%s”: %s" -#: merge-recursive.c:997 +#: merge-recursive.c:998 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "không hiểu phải làm gì với %06o %s “%s”" -#: merge-recursive.c:1227 merge-recursive.c:1239 +#: merge-recursive.c:1228 merge-recursive.c:1240 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s” đến lần chuyển giao sau đây:" -#: merge-recursive.c:1230 merge-recursive.c:1242 +#: merge-recursive.c:1231 merge-recursive.c:1243 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s”" -#: merge-recursive.c:1265 +#: merge-recursive.c:1266 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không tìm thấy các lần chuyển giao " "theo sau hòa trộn)" -#: merge-recursive.c:1269 +#: merge-recursive.c:1270 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không chuyển tiếp nhanh được)" -#: merge-recursive.c:1270 +#: merge-recursive.c:1271 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Tìm thấy một giải pháp hòa trộn có thể cho mô-đun-con:\n" -#: merge-recursive.c:1282 +#: merge-recursive.c:1283 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (thấy nhiều hòa trộn đa trùng)" -#: merge-recursive.c:1424 +#: merge-recursive.c:1425 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Lỗi: từ chối đóng tập tin không được theo dõi tại “%s”; thay vào đó ghi vào " "%s." -#: merge-recursive.c:1496 +#: merge-recursive.c:1497 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5007,7 +5020,7 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s " "còn lại trong cây (tree)." -#: merge-recursive.c:1501 +#: merge-recursive.c:1502 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5016,7 +5029,7 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s " "của %s còn lại trong cây (tree)." -#: merge-recursive.c:1508 +#: merge-recursive.c:1509 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5025,7 +5038,7 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s " "còn lại trong cây (tree) tại %s." -#: merge-recursive.c:1513 +#: merge-recursive.c:1514 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5034,45 +5047,45 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s " "của %s còn lại trong cây (tree) tại %s." -#: merge-recursive.c:1548 +#: merge-recursive.c:1549 msgid "rename" msgstr "đổi tên" -#: merge-recursive.c:1548 +#: merge-recursive.c:1549 msgid "renamed" msgstr "đã đổi tên" -#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158 +#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Từ chối đóng tập tin không được theo dõi tại “%s”" -#: merge-recursive.c:1609 +#: merge-recursive.c:1610 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Từ chối đóng tập tin không được theo dõi tại “%s”, ngay cả khi nó ở trên " "đường." -#: merge-recursive.c:1667 +#: merge-recursive.c:1668 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm trong %s" -#: merge-recursive.c:1698 +#: merge-recursive.c:1699 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s là một thư mục trong %s thay vào đó thêm vào như là %s" -#: merge-recursive.c:1703 +#: merge-recursive.c:1704 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "Từ chối đóng tập tin không được theo dõi tại “%s”; thay vào đó đang thêm " "thành %s" -#: merge-recursive.c:1730 +#: merge-recursive.c:1731 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5081,17 +5094,17 @@ msgstr "" "XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi " "tên \"%s\"->\"%s\" trong \"%s\"%s" -#: merge-recursive.c:1735 +#: merge-recursive.c:1736 msgid " (left unresolved)" msgstr " (cần giải quyết)" -#: merge-recursive.c:1827 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s. Đổi tên %s->%s trong %s" -#: merge-recursive.c:2090 +#: merge-recursive.c:2091 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5102,7 +5115,7 @@ msgstr "" "vì thư mục %s đã bị đổi tên thành nhiều thư mục khác, với không đích đến " "nhận một phần nhiều của các tập tin." -#: merge-recursive.c:2224 +#: merge-recursive.c:2225 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5111,79 +5124,79 @@ msgstr "" "XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên thư mục %s->%s trong %s. Đổi tên thư mục " "%s->%s trong %s" -#: merge-recursive.c:3069 +#: merge-recursive.c:3080 msgid "modify" msgstr "sửa đổi" -#: merge-recursive.c:3069 +#: merge-recursive.c:3080 msgid "modified" msgstr "đã sửa" -#: merge-recursive.c:3108 +#: merge-recursive.c:3119 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)" -#: merge-recursive.c:3161 +#: merge-recursive.c:3172 #, c-format msgid "Adding as %s instead" msgstr "Thay vào đó thêm vào %s" -#: merge-recursive.c:3368 +#: merge-recursive.c:3376 #, c-format msgid "Removing %s" msgstr "Đang xóa %s" -#: merge-recursive.c:3391 +#: merge-recursive.c:3399 msgid "file/directory" msgstr "tập-tin/thư-mục" -#: merge-recursive.c:3396 +#: merge-recursive.c:3404 msgid "directory/file" msgstr "thư-mục/tập-tin" -#: merge-recursive.c:3403 +#: merge-recursive.c:3411 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "XUNG ĐỘT (%s): Ở đây không có thư mục nào có tên %s trong %s. Thêm %s như là " "%s" -#: merge-recursive.c:3412 +#: merge-recursive.c:3420 #, c-format msgid "Adding %s" msgstr "Thêm \"%s\"" -#: merge-recursive.c:3421 +#: merge-recursive.c:3429 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "XUNG ĐỘT (thêm/thêm): Xung đột hòa trộn trong %s" -#: merge-recursive.c:3474 +#: merge-recursive.c:3482 #, c-format msgid "merging of trees %s and %s failed" msgstr "hòa trộn các cây %s và %s gặp lỗi" -#: merge-recursive.c:3568 +#: merge-recursive.c:3576 msgid "Merging:" msgstr "Đang trộn:" -#: merge-recursive.c:3581 +#: merge-recursive.c:3589 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "tìm thấy %u tổ tiên chung:" -#: merge-recursive.c:3631 +#: merge-recursive.c:3639 msgid "merge returned no commit" msgstr "hòa trộn không trả về lần chuyển giao nào" -#: merge-recursive.c:3796 +#: merge-recursive.c:3804 #, c-format msgid "Could not parse object '%s'" msgstr "Không thể phân tích đối tượng “%s”" -#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900 +#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900 #: builtin/stash.c:473 msgid "Unable to write index." msgstr "Không thể ghi bảng mục lục." @@ -5192,7 +5205,7 @@ msgstr "Không thể ghi bảng mục lục." msgid "failed to read the cache" msgstr "gặp lỗi khi đọc bộ nhớ đệm" -#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965 +#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966 #: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 #: builtin/stash.c:267 msgid "unable to write new index file" @@ -5267,107 +5280,115 @@ msgstr "gặp lỗi khi mở pack-index “%s”" msgid "failed to locate object %d in packfile" msgstr "gặp lỗi khi phân bổ đối tượng “%d” trong tập tin gói" -#: midx.c:880 builtin/index-pack.c:1535 +#: midx.c:880 builtin/index-pack.c:1533 msgid "cannot store reverse index file" msgstr "không thể lưu trữ tập tin ghi mục lục đảo ngược" -#: midx.c:933 +#: midx.c:920 +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "bỏ qua multi-pack-index sẵn có; tổng kiểm không khớp" + +#: midx.c:943 msgid "Adding packfiles to multi-pack-index" msgstr "Đang thêm tập tin gói từ multi-pack-index" -#: midx.c:979 +#: midx.c:989 #, c-format msgid "did not see pack-file %s to drop" msgstr "đã không thấy tập tin gói %s để mà xóa" -#: midx.c:1024 +#: midx.c:1034 #, c-format msgid "unknown preferred pack: '%s'" msgstr "không hiểu \"preferred pack\": %s" -#: midx.c:1029 +#: midx.c:1039 #, c-format msgid "preferred pack '%s' is expired" msgstr "\"preferred pack\" “%s” đã hết hạn" -#: midx.c:1045 +#: midx.c:1055 msgid "no pack files to index." msgstr "không có tập tin gói để đánh mục lục." -#: midx.c:1125 builtin/clean.c:37 +#: midx.c:1135 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "gặp lỗi khi gỡ bỏ %s" -#: midx.c:1156 +#: midx.c:1166 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "gặp lỗi khi xóa multi-pack-index tại %s" -#: midx.c:1214 +#: midx.c:1225 msgid "multi-pack-index file exists, but failed to parse" msgstr "đã có tập tin multi-pack-index, nhưng gặp lỗi khi phân tích cú pháp" -#: midx.c:1222 +#: midx.c:1233 +msgid "incorrect checksum" +msgstr "tổng kiểm không đúng" + +#: midx.c:1236 msgid "Looking for referenced packfiles" msgstr "Đang khóa cho các gói bị tham chiếu" -#: midx.c:1237 +#: midx.c:1251 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "fanout cũ sai thứ tự: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1242 +#: midx.c:1256 msgid "the midx contains no oid" msgstr "midx chẳng chứa oid nào" -#: midx.c:1251 +#: midx.c:1265 msgid "Verifying OID order in multi-pack-index" msgstr "Thẩm tra thứ tự OID trong multi-pack-index" -#: midx.c:1260 +#: midx.c:1274 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "lookup cũ sai thứ tự: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1280 +#: midx.c:1294 msgid "Sorting objects by packfile" msgstr "Đang sắp xếp các đối tượng theo tập tin gói" -#: midx.c:1287 +#: midx.c:1301 msgid "Verifying object offsets" msgstr "Đang thẩm tra các khoảng bù đối tượng" -#: midx.c:1303 +#: midx.c:1317 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "gặp lỗi khi tải mục gói cho oid[%d] = %s" -#: midx.c:1309 +#: midx.c:1323 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "gặp lỗi khi tải pack-index cho tập tin gói %s" -#: midx.c:1318 +#: midx.c:1332 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" "khoảng bù đối tượng không đúng cho oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1343 +#: midx.c:1357 msgid "Counting referenced objects" msgstr "Đang đếm các đối tượng được tham chiếu" -#: midx.c:1353 +#: midx.c:1367 msgid "Finding and deleting unreferenced packfiles" msgstr "Đang tìm và xóa các gói không được tham chiếu" -#: midx.c:1544 +#: midx.c:1558 msgid "could not start pack-objects" msgstr "không thể lấy thông tin thống kê về các đối tượng gói" -#: midx.c:1564 +#: midx.c:1578 msgid "could not finish pack-objects" msgstr "không thể hoàn thiện các đối tượng gói" @@ -5434,266 +5455,267 @@ msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "thư mục đối tượng %s không tồn tại; kiểm tra .git/objects/info/alternates" -#: object-file.c:577 +#: object-file.c:584 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "không thể thường hóa đường dẫn đối tượng thay thế: “%s”" -#: object-file.c:649 +#: object-file.c:658 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: đang bỏ qua kho đối tượng thay thế, lồng nhau quá sâu" -#: object-file.c:656 +#: object-file.c:665 #, c-format msgid "unable to normalize object directory: %s" msgstr "không thể chuẩn hóa thư mục đối tượng: “%s”" -#: object-file.c:699 +#: object-file.c:708 msgid "unable to fdopen alternates lockfile" msgstr "không thể fdopen tập tin khóa thay thế" -#: object-file.c:717 +#: object-file.c:726 msgid "unable to read alternates file" msgstr "không thể đọc tập tin thay thế" -#: object-file.c:724 +#: object-file.c:733 msgid "unable to move new alternates file into place" msgstr "không thể di chuyển tập tin thay thế vào chỗ" -#: object-file.c:759 +#: object-file.c:768 #, c-format msgid "path '%s' does not exist" msgstr "đường dẫn “%s” không tồn tại" -#: object-file.c:780 +#: object-file.c:789 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "kho tham chiếu “%s” như là lấy ra liên kết vẫn chưa được hỗ trợ." -#: object-file.c:786 +#: object-file.c:795 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "kho tham chiếu “%s” không phải là một kho nội bộ." -#: object-file.c:792 +#: object-file.c:801 #, c-format msgid "reference repository '%s' is shallow" msgstr "kho tham chiếu “%s” là nông" -#: object-file.c:800 +#: object-file.c:809 #, c-format msgid "reference repository '%s' is grafted" msgstr "kho tham chiếu “%s” bị cấy ghép" -#: object-file.c:860 +#: object-file.c:869 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "dòng không hợp lệ trong khi phân tích các tham chiếu thay thế: %s" -#: object-file.c:1010 +#: object-file.c:1019 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "đang cố để mmap %<PRIuMAX> vượt quá giới hạn %<PRIuMAX>" -#: object-file.c:1031 -msgid "mmap failed" -msgstr "mmap gặp lỗi" +#: object-file.c:1054 +#, c-format +msgid "mmap failed%s" +msgstr "mmap gặp lỗi%s" -#: object-file.c:1195 +#: object-file.c:1218 #, c-format msgid "object file %s is empty" msgstr "tập tin đối tượng %s trống rỗng" -#: object-file.c:1330 object-file.c:2524 +#: object-file.c:1353 object-file.c:2548 #, c-format msgid "corrupt loose object '%s'" msgstr "đối tượng mất hỏng “%s”" -#: object-file.c:1332 object-file.c:2528 +#: object-file.c:1355 object-file.c:2552 #, c-format msgid "garbage at end of loose object '%s'" msgstr "gặp rác tại cuối của đối tượng bị mất “%s”" -#: object-file.c:1374 +#: object-file.c:1397 msgid "invalid object type" msgstr "kiểu đối tượng không hợp lệ" -#: object-file.c:1458 +#: object-file.c:1481 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "không thể giải nén phần đầu gói %s với --allow-unknown-type" -#: object-file.c:1461 +#: object-file.c:1484 #, c-format msgid "unable to unpack %s header" msgstr "không thể giải gói phần đầu %s" -#: object-file.c:1467 +#: object-file.c:1490 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "không thể phân tích phần đầu gói %s với --allow-unknown-type" -#: object-file.c:1470 +#: object-file.c:1493 #, c-format msgid "unable to parse %s header" msgstr "không thể phân tích phần đầu của “%s”" -#: object-file.c:1697 +#: object-file.c:1717 #, c-format msgid "failed to read object %s" msgstr "gặp lỗi khi đọc đối tượng “%s”" -#: object-file.c:1701 +#: object-file.c:1721 #, c-format msgid "replacement %s not found for %s" msgstr "c%s thay thế không được tìm thấy cho %s" -#: object-file.c:1705 +#: object-file.c:1725 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "đối tượng mất %s (được lưu trong %s) bị hỏng" -#: object-file.c:1709 +#: object-file.c:1729 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "đối tượng đã đóng gói %s (được lưu trong %s) bị hỏng" -#: object-file.c:1814 +#: object-file.c:1834 #, c-format msgid "unable to write file %s" msgstr "không thể ghi tập tin %s" -#: object-file.c:1821 +#: object-file.c:1841 #, c-format msgid "unable to set permission to '%s'" msgstr "không thể đặt quyền thành “%s”" -#: object-file.c:1828 +#: object-file.c:1848 msgid "file write error" msgstr "lỗi ghi tập tin" -#: object-file.c:1848 +#: object-file.c:1868 msgid "error when closing loose object file" msgstr "gặp lỗi trong khi đóng tập tin đối tượng" -#: object-file.c:1913 +#: object-file.c:1933 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "không đủ thẩm quyền để thêm một đối tượng vào cơ sở dữ liệu kho chứa %s" -#: object-file.c:1915 +#: object-file.c:1935 msgid "unable to create temporary file" msgstr "không thể tạo tập tin tạm thời" -#: object-file.c:1939 +#: object-file.c:1959 msgid "unable to write loose object file" msgstr "không thể ghi tập tin đối tượng đã mất" -#: object-file.c:1945 +#: object-file.c:1965 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "không thể xả nén đối tượng mới %s (%d)" -#: object-file.c:1949 +#: object-file.c:1969 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd trên đối tượng %s gặp lỗi (%d)" -#: object-file.c:1953 +#: object-file.c:1973 #, c-format msgid "confused by unstable object source data for %s" msgstr "chưa rõ ràng baowir dữ liệu nguồn đối tượng không ổn định cho %s" -#: object-file.c:1963 builtin/pack-objects.c:1097 +#: object-file.c:1983 builtin/pack-objects.c:1237 #, c-format msgid "failed utime() on %s" msgstr "gặp lỗi utime() trên “%s”" -#: object-file.c:2040 +#: object-file.c:2060 #, c-format msgid "cannot read object for %s" msgstr "không thể đọc đối tượng cho %s" -#: object-file.c:2091 +#: object-file.c:2111 msgid "corrupt commit" msgstr "lần chuyển giao sai hỏng" -#: object-file.c:2099 +#: object-file.c:2119 msgid "corrupt tag" msgstr "thẻ sai hỏng" -#: object-file.c:2199 +#: object-file.c:2219 #, c-format msgid "read error while indexing %s" msgstr "gặp lỗi đọc khi đánh mục lục %s" -#: object-file.c:2202 +#: object-file.c:2222 #, c-format msgid "short read while indexing %s" msgstr "không đọc ngắn khi đánh mục lục %s" -#: object-file.c:2275 object-file.c:2285 +#: object-file.c:2295 object-file.c:2305 #, c-format msgid "%s: failed to insert into database" msgstr "%s: gặp lỗi khi thêm vào cơ sở dữ liệu" -#: object-file.c:2291 +#: object-file.c:2311 #, c-format msgid "%s: unsupported file type" msgstr "%s: kiểu tập tin không được hỗ trợ" -#: object-file.c:2315 +#: object-file.c:2335 #, c-format msgid "%s is not a valid object" msgstr "%s không phải là một đối tượng hợp lệ" -#: object-file.c:2317 +#: object-file.c:2337 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s không phải là một đối tượng “%s” hợp lệ" -#: object-file.c:2344 builtin/index-pack.c:192 +#: object-file.c:2364 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "không thể mở %s" -#: object-file.c:2535 object-file.c:2588 +#: object-file.c:2559 object-file.c:2612 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "mã băm không khớp cho %s (cần %s)" -#: object-file.c:2559 +#: object-file.c:2583 #, c-format msgid "unable to mmap %s" msgstr "không thể mmap %s" -#: object-file.c:2564 +#: object-file.c:2588 #, c-format msgid "unable to unpack header of %s" msgstr "không thể giải gói phần đầu của “%s”" -#: object-file.c:2570 +#: object-file.c:2594 #, c-format msgid "unable to parse header of %s" msgstr "không thể phân tích phần đầu của “%s”" -#: object-file.c:2581 +#: object-file.c:2605 #, c-format msgid "unable to unpack contents of %s" msgstr "không thể giải gói nội dung của “%s”" -#: object-name.c:486 +#: object-name.c:480 #, c-format msgid "short object ID %s is ambiguous" msgstr "mã đối tượng dạng rút gọn %s chưa rõ ràng" -#: object-name.c:497 +#: object-name.c:491 msgid "The candidates are:" msgstr "Các ứng cử là:" -#: object-name.c:796 +#: object-name.c:790 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -5717,22 +5739,22 @@ msgstr "" "này\n" "bằng cách chạy lệnh \"git config advice.objectNameWarning false\"" -#: object-name.c:916 +#: object-name.c:910 #, c-format msgid "log for '%.*s' only goes back to %s" msgstr "nhật ký cho “%.*s” chỉ trở lại đến %s" -#: object-name.c:924 +#: object-name.c:918 #, c-format msgid "log for '%.*s' only has %d entries" msgstr "nhật ký cho “%.*s” chỉ có %d mục" -#: object-name.c:1702 +#: object-name.c:1696 #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "đường dẫn “%s” có ở trên đĩa, nhưng không trong “%.*s”" -#: object-name.c:1708 +#: object-name.c:1702 #, c-format msgid "" "path '%s' exists, but not '%s'\n" @@ -5741,12 +5763,12 @@ msgstr "" "đường dẫn “%s” tồn tại, nhưng không phải “%s”\n" "gợi ý: Có phải ý bạn là “%.*s:%s” aka “%.*s:./%s”?" -#: object-name.c:1717 +#: object-name.c:1711 #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "đường dẫn “%s” không tồn tại trong “%.*s”" -#: object-name.c:1745 +#: object-name.c:1739 #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" @@ -5755,7 +5777,7 @@ msgstr "" "đường dẫn “%s” nằm trong chỉ mục, nhưng không phải ở giai đoạn %d\n" "gợi ý: Có phải ý bạn là “:%d:%s”?" -#: object-name.c:1761 +#: object-name.c:1755 #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" @@ -5764,21 +5786,21 @@ msgstr "" "đường dẫn “%s” nằm trong chỉ mục, nhưng không phải “%s”\n" "gợi ý: Có phải ý bạn là “:% d:%s “ aka “:%d:./%s”?" -#: object-name.c:1769 +#: object-name.c:1763 #, c-format msgid "path '%s' exists on disk, but not in the index" msgstr "đường dẫn “%s” tồn tại trên đĩa, nhưng không có trong chỉ mục" -#: object-name.c:1771 +#: object-name.c:1765 #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "đường dẫn “%s” không tồn tại (không trên đĩa cũng không trong mục lục)" -#: object-name.c:1784 +#: object-name.c:1778 msgid "relative path syntax can't be used outside working tree" msgstr "cú pháp đường dẫn tương đối không thể thể dùng ngoài cây làm việc" -#: object-name.c:1922 +#: object-name.c:1916 #, c-format msgid "invalid object name '%.*s'." msgstr "“%.*s” không phải là tên đối tượng hợp lệ." @@ -5793,27 +5815,27 @@ msgstr "kiểu đối tượng \"%s\" không hợp lệ" msgid "object %s is a %s, not a %s" msgstr "đối tượng %s là một %s, không phải là một %s" -#: object.c:232 +#: object.c:250 #, c-format msgid "object %s has unknown type id %d" msgstr "đối tượng %s có mã kiểu %d chưa biết" -#: object.c:245 +#: object.c:263 #, c-format msgid "unable to parse object: %s" msgstr "không thể phân tích đối tượng: “%s”" -#: object.c:265 object.c:277 +#: object.c:283 object.c:295 #, c-format msgid "hash mismatch %s" msgstr "mã băm không khớp %s" -#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251 +#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411 #, c-format msgid "unable to get size of %s" msgstr "không thể lấy kích cỡ của %s" -#: pack-bitmap.c:1547 builtin/rev-list.c:92 +#: pack-bitmap.c:1571 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "không thể dung lượng đĩa đã dùng của %s" @@ -5866,12 +5888,17 @@ msgstr "không thể ghi tập tin promisor “%s”" msgid "offset before end of packfile (broken .idx?)" msgstr "vị trí tương đối trước điểm kết thúc của tập tin gói (.idx hỏng à?)" -#: packfile.c:1937 +#: packfile.c:655 +#, c-format +msgid "packfile %s cannot be mapped%s" +msgstr "tập tin gói %s không thể được ánh xạ %s" + +#: packfile.c:1934 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "vị trí tương đối nằm trước chỉ mục gói cho %s (mục lục bị hỏng à?)" -#: packfile.c:1941 +#: packfile.c:1938 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -6077,8 +6104,8 @@ msgid "unable to write delim packet" msgstr "không thể ghi gói delim" #: pkt-line.c:106 -msgid "unable to write stateless separator packet" -msgstr "không thể ghi gói phân tách không trạng thái" +msgid "unable to write response end packet" +msgstr "không thể ghi gói cuối trả về" #: pkt-line.c:113 msgid "flush packet write failed" @@ -6137,20 +6164,20 @@ msgstr "không thể tạo tuyến trình lstat: %s" msgid "unable to parse --pretty format" msgstr "không thể phân tích định dạng --pretty" -#: promisor-remote.c:30 +#: promisor-remote.c:31 msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "promisor-remote: không thể rẽ nhánh tuyến trình con fetch" -#: promisor-remote.c:35 promisor-remote.c:37 +#: promisor-remote.c:38 promisor-remote.c:40 msgid "promisor-remote: could not write to fetch subprocess" msgstr "promisor-remote: không thể ghi tiến trình con fetch" -#: promisor-remote.c:41 +#: promisor-remote.c:44 msgid "promisor-remote: could not close stdin to fetch subprocess" msgstr "" "promisor-remote: không thể đóng đầu vào tiêu chuẩn tiến trình con fetch" -#: promisor-remote.c:53 +#: promisor-remote.c:54 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "tên máy chủ hứa hẹn không thể bắt đầu bằng “/”: %s" @@ -6171,7 +6198,7 @@ msgstr "không thể lấy thông tin thống kê về “log“" msgid "could not read `log` output" msgstr "không thể đọc kết xuất “log”" -#: range-diff.c:101 sequencer.c:5551 +#: range-diff.c:101 sequencer.c:5550 #, c-format msgid "could not parse commit '%s'" msgstr "không thể phân tích lần chuyển giao “%s”" @@ -6190,65 +6217,65 @@ msgstr "" msgid "could not parse git header '%.*s'" msgstr "không thể phân tích cú pháp phần đầu git “%.*s”" -#: range-diff.c:306 +#: range-diff.c:307 msgid "failed to generate diff" msgstr "gặp lỗi khi tạo khác biệt" -#: range-diff.c:558 +#: range-diff.c:559 msgid "--left-only and --right-only are mutually exclusive" msgstr "--left-only và --right-only loại từ lẫn nhau" -#: range-diff.c:561 range-diff.c:563 +#: range-diff.c:562 range-diff.c:564 #, c-format msgid "could not parse log for '%s'" msgstr "không thể phân tích nhật ký cho “%s”" -#: read-cache.c:708 +#: read-cache.c:710 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" "sẽ không thêm các bí danh “%s” (“%s” đã có từ trước trong bảng mục lục)" -#: read-cache.c:724 +#: read-cache.c:726 msgid "cannot create an empty blob in the object database" msgstr "không thể tạo một blob rỗng trong cơ sở dữ liệu đối tượng" -#: read-cache.c:746 +#: read-cache.c:748 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%s: chỉ có thể thêm tập tin thông thường, liên kết mềm hoặc git-directories" -#: read-cache.c:751 +#: read-cache.c:753 #, c-format msgid "'%s' does not have a commit checked out" msgstr "“%s” không có một lần chuyển giao nào được lấy ra" -#: read-cache.c:803 +#: read-cache.c:805 #, c-format msgid "unable to index file '%s'" msgstr "không thể đánh mục lục tập tin “%s”" -#: read-cache.c:822 +#: read-cache.c:824 #, c-format msgid "unable to add '%s' to index" msgstr "không thể thêm %s vào bảng mục lục" -#: read-cache.c:833 +#: read-cache.c:835 #, c-format msgid "unable to stat '%s'" msgstr "không thể lấy thống kê “%s”" -#: read-cache.c:1356 +#: read-cache.c:1358 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "%s có vẻ không phải là tập tin và cũng chẳng phải là một thư mục" -#: read-cache.c:1571 +#: read-cache.c:1573 msgid "Refresh index" msgstr "Làm tươi mới bảng mục lục" -#: read-cache.c:1700 +#: read-cache.c:1705 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6257,7 +6284,7 @@ msgstr "" "index.version được đặt, nhưng giá trị của nó lại không hợp lệ.\n" "Dùng phiên bản %i" -#: read-cache.c:1710 +#: read-cache.c:1715 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6266,143 +6293,143 @@ msgstr "" "GIT_INDEX_VERSION được đặt, nhưng giá trị của nó lại không hợp lệ.\n" "Dùng phiên bản %i" -#: read-cache.c:1766 +#: read-cache.c:1771 #, c-format msgid "bad signature 0x%08x" msgstr "chữ ký sai 0x%08x" -#: read-cache.c:1769 +#: read-cache.c:1774 #, c-format msgid "bad index version %d" msgstr "phiên bản mục lục sai %d" -#: read-cache.c:1778 +#: read-cache.c:1783 msgid "bad index file sha1 signature" msgstr "chữ ký dạng sha1 cho tập tin mục lục không đúng" -#: read-cache.c:1812 +#: read-cache.c:1817 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "mục lục dùng phần mở rộng %.4s, cái mà chúng tôi không hiểu được" -#: read-cache.c:1814 +#: read-cache.c:1819 #, c-format msgid "ignoring %.4s extension" msgstr "đang lờ đi phần mở rộng %.4s" -#: read-cache.c:1851 +#: read-cache.c:1856 #, c-format msgid "unknown index entry format 0x%08x" msgstr "không hiểu định dạng mục lục 0x%08x" -#: read-cache.c:1867 +#: read-cache.c:1872 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "trường tên sai sạng trong mục lục, gần đường dẫn “%s”" -#: read-cache.c:1924 +#: read-cache.c:1929 msgid "unordered stage entries in index" msgstr "các mục tin stage không đúng thứ tự trong mục lục" -#: read-cache.c:1927 +#: read-cache.c:1932 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "nhiều mục stage cho tập tin hòa trộn “%s”" -#: read-cache.c:1930 +#: read-cache.c:1935 #, c-format msgid "unordered stage entries for '%s'" msgstr "các mục tin stage không đúng thứ tự cho “%s”" -#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991 +#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 -#: builtin/submodule--helper.c:332 +#: builtin/submodule--helper.c:331 msgid "index file corrupt" msgstr "tập tin ghi bảng mục lục bị hỏng" -#: read-cache.c:2180 +#: read-cache.c:2185 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "không thể tạo tuyến load_cache_entries: %s" -#: read-cache.c:2193 +#: read-cache.c:2198 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "không thể gia nhập tuyến load_cache_entries: %s" -#: read-cache.c:2226 +#: read-cache.c:2231 #, c-format msgid "%s: index file open failed" msgstr "%s: mở tập tin mục lục gặp lỗi" -#: read-cache.c:2230 +#: read-cache.c:2235 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: không thể lấy thống kê bảng mục lục đã mở" -#: read-cache.c:2234 +#: read-cache.c:2239 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: tập tin mục lục nhỏ hơn mong đợi" -#: read-cache.c:2238 +#: read-cache.c:2243 #, c-format -msgid "%s: unable to map index file" -msgstr "%s: không thể ánh xạ tập tin mục lục" +msgid "%s: unable to map index file%s" +msgstr "%s: không thể ánh xạ tập tin mục lục%s" -#: read-cache.c:2280 +#: read-cache.c:2286 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "không thể tạo tuyến load_index_extensions: %s" -#: read-cache.c:2307 +#: read-cache.c:2313 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "không thể gia nhập tuyến load_index_extensions: %s" -#: read-cache.c:2345 +#: read-cache.c:2351 #, c-format msgid "could not freshen shared index '%s'" msgstr "không thể làm tươi mới mục lục đã chia sẻ “%s”" -#: read-cache.c:2392 +#: read-cache.c:2398 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "mục lục bị hỏng, cần %s trong %s, nhưng lại nhận được %s" -#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 +#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 #, c-format msgid "could not close '%s'" msgstr "không thể đóng “%s”" -#: read-cache.c:3138 +#: read-cache.c:3074 msgid "failed to convert to a sparse-index" msgstr "gặp lỗi khi chuyển đổi sang \"sparse-index\"" -#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441 +#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440 #, c-format msgid "could not stat '%s'" msgstr "không thể lấy thông tin thống kê về “%s”" -#: read-cache.c:3222 +#: read-cache.c:3158 #, c-format msgid "unable to open git dir: %s" msgstr "không thể mở thư mục git: %s" -#: read-cache.c:3234 +#: read-cache.c:3170 #, c-format msgid "unable to unlink: %s" msgstr "không thể bỏ liên kết (unlink): “%s”" -#: read-cache.c:3263 +#: read-cache.c:3199 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "không thể sửa các bít phân quyền trên “%s”" -#: read-cache.c:3412 +#: read-cache.c:3348 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: không thể xóa bỏ stage #0" @@ -6525,8 +6552,8 @@ msgstr "" "Tuy nhiên, nếu bạn xóa bỏ mọi thứ, việc cải tổ sẽ bị bãi bỏ.\n" "\n" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816 -#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836 +#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271 #, c-format msgid "could not write '%s'" msgstr "không thể ghi “%s”" @@ -6571,7 +6598,7 @@ msgstr "" msgid "could not read '%s'." msgstr "không thể đọc “%s”." -#: ref-filter.c:42 wt-status.c:1978 +#: ref-filter.c:42 wt-status.c:2036 msgid "gone" msgstr "đã ra đi" @@ -6590,132 +6617,132 @@ msgstr "đằng sau %d" msgid "ahead %d, behind %d" msgstr "trước %d, sau %d" -#: ref-filter.c:175 +#: ref-filter.c:230 #, c-format msgid "expected format: %%(color:<color>)" msgstr "cần định dạng: %%(color:<color>)" -#: ref-filter.c:177 +#: ref-filter.c:232 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "không nhận ra màu: %%(màu:%s)" -#: ref-filter.c:199 +#: ref-filter.c:254 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Giá trị nguyên cần tên tham chiếu:lstrip=%s" -#: ref-filter.c:203 +#: ref-filter.c:258 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Giá trị nguyên cần tên tham chiếu:rstrip=%s" -#: ref-filter.c:205 +#: ref-filter.c:260 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "đối số không được thừa nhận %%(%s): %s" -#: ref-filter.c:260 +#: ref-filter.c:315 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) không nhận các đối số" -#: ref-filter.c:282 +#: ref-filter.c:339 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "tham số không được thừa nhận %%(objectname): %s" -#: ref-filter.c:290 +#: ref-filter.c:347 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) không nhận các đối số" -#: ref-filter.c:302 +#: ref-filter.c:359 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) không nhận các đối số" -#: ref-filter.c:315 +#: ref-filter.c:372 #, c-format msgid "unrecognized %%(subject) argument: %s" msgstr "tham số không được thừa nhận %%(subject): %s" -#: ref-filter.c:334 +#: ref-filter.c:391 #, c-format msgid "expected %%(trailers:key=<value>)" msgstr "cần %%(trailers:key=<giá trị>)" -#: ref-filter.c:336 +#: ref-filter.c:393 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "không hiểu tham số %%(trailers): %s" -#: ref-filter.c:367 +#: ref-filter.c:424 #, c-format msgid "positive value expected contents:lines=%s" msgstr "cần nội dung mang giá trị dương:lines=%s" -#: ref-filter.c:369 +#: ref-filter.c:426 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "đối số không được thừa nhận %%(contents): %s" -#: ref-filter.c:384 +#: ref-filter.c:441 #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "cần giá trị dương “%s” trong %%(%s)" -#: ref-filter.c:388 +#: ref-filter.c:445 #, c-format msgid "unrecognized argument '%s' in %%(%s)" msgstr "đối số “%s” không được thừa nhận trong %%(%s)" -#: ref-filter.c:402 +#: ref-filter.c:459 #, c-format msgid "unrecognized email option: %s" msgstr "không nhận ra tùy chọn thư điện tử: “%s”" -#: ref-filter.c:432 +#: ref-filter.c:489 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "cần định dạng: %%(align:<width>,<position>)" -#: ref-filter.c:444 +#: ref-filter.c:501 #, c-format msgid "unrecognized position:%s" msgstr "vị trí không được thừa nhận:%s" -#: ref-filter.c:451 +#: ref-filter.c:508 #, c-format msgid "unrecognized width:%s" msgstr "chiều rộng không được thừa nhận:%s" -#: ref-filter.c:460 +#: ref-filter.c:517 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "đối số không được thừa nhận %%(align): %s" -#: ref-filter.c:468 +#: ref-filter.c:525 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "cần giá trị độ rộng dương với nguyên tử %%(align)" -#: ref-filter.c:486 +#: ref-filter.c:543 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "đối số không được thừa nhận %%(if): %s" -#: ref-filter.c:588 +#: ref-filter.c:645 #, c-format msgid "malformed field name: %.*s" msgstr "tên trường dị hình: %.*s" -#: ref-filter.c:615 +#: ref-filter.c:672 #, c-format msgid "unknown field name: %.*s" msgstr "không hiểu tên trường: %.*s" -#: ref-filter.c:619 +#: ref-filter.c:676 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" @@ -6723,116 +6750,116 @@ msgstr "" "không phải là một kho git, nhưng trường “%.*s” yêu cầu truy cập vào dữ liệu " "đối tượng" -#: ref-filter.c:743 +#: ref-filter.c:801 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "định dạng: nguyên tử %%(if) được dùng mà không có nguyên tử %%(then)" -#: ref-filter.c:807 +#: ref-filter.c:865 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "định dạng: nguyên tử %%(then) được dùng mà không có nguyên tử %%(if)" -#: ref-filter.c:809 +#: ref-filter.c:867 #, c-format msgid "format: %%(then) atom used more than once" msgstr "định dạng: nguyên tử %%(then) được dùng nhiều hơn một lần" -#: ref-filter.c:811 +#: ref-filter.c:869 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "định dạng: nguyên tử %%(then) được dùng sau %%(else)" -#: ref-filter.c:839 +#: ref-filter.c:897 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(if)" -#: ref-filter.c:841 +#: ref-filter.c:899 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(then)" -#: ref-filter.c:843 +#: ref-filter.c:901 #, c-format msgid "format: %%(else) atom used more than once" msgstr "định dạng: nguyên tử %%(else) được dùng nhiều hơn một lần" -#: ref-filter.c:858 +#: ref-filter.c:916 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "định dạng: nguyên tử %%(end) được dùng mà không có nguyên tử tương ứng" -#: ref-filter.c:915 +#: ref-filter.c:973 #, c-format msgid "malformed format string %s" msgstr "chuỗi định dạng dị hình %s" -#: ref-filter.c:1556 +#: ref-filter.c:1621 #, c-format msgid "(no branch, rebasing %s)" msgstr "(không nhánh, đang cải tổ %s)" -#: ref-filter.c:1559 +#: ref-filter.c:1624 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(không nhánh, đang cải tổ HEAD %s đã tách rời)" -#: ref-filter.c:1562 +#: ref-filter.c:1627 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s)" -#: ref-filter.c:1566 +#: ref-filter.c:1631 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD được tách rời tại %s)" -#: ref-filter.c:1569 +#: ref-filter.c:1634 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD được tách rời từ %s)" -#: ref-filter.c:1572 +#: ref-filter.c:1637 msgid "(no branch)" msgstr "(không nhánh)" -#: ref-filter.c:1604 ref-filter.c:1813 +#: ref-filter.c:1669 ref-filter.c:1880 #, c-format msgid "missing object %s for %s" msgstr "thiếu đối tượng %s cho %s" -#: ref-filter.c:1614 +#: ref-filter.c:1679 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer gặp lỗi trên %s cho %s" -#: ref-filter.c:1997 +#: ref-filter.c:2064 #, c-format msgid "malformed object at '%s'" msgstr "đối tượng dị hình tại “%s”" -#: ref-filter.c:2086 +#: ref-filter.c:2153 #, c-format msgid "ignoring ref with broken name %s" msgstr "đang lờ đi tham chiếu với tên hỏng %s" -#: ref-filter.c:2091 refs.c:676 +#: ref-filter.c:2158 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "đang lờ đi tham chiếu hỏng %s" -#: ref-filter.c:2431 +#: ref-filter.c:2498 #, c-format msgid "format: %%(end) atom missing" msgstr "định dạng: thiếu nguyên tử %%(end)" -#: ref-filter.c:2525 +#: ref-filter.c:2592 #, c-format msgid "malformed object name %s" msgstr "tên đối tượng dị hình %s" -#: ref-filter.c:2530 +#: ref-filter.c:2597 #, c-format msgid "option `%s' must point to a commit" msgstr "tùy chọn “%s” phải chỉ đến một lần chuyển giao" @@ -7290,8 +7317,8 @@ msgstr "không thể unlink stray “%s”" msgid "Recorded preimage for '%s'" msgstr "Preimage đã được ghi lại cho “%s”" -#: rerere.c:865 submodule.c:2089 builtin/log.c:2000 -#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891 +#: rerere.c:865 submodule.c:2076 builtin/log.c:2002 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "không thể tạo thư mục “%s”" @@ -7329,38 +7356,38 @@ msgstr "không thể mở thư mục rr-cache" msgid "could not determine HEAD revision" msgstr "không thể dò tìm điểm xét duyệt HEAD" -#: reset.c:70 reset.c:76 sequencer.c:3669 +#: reset.c:70 reset.c:76 sequencer.c:3689 #, c-format msgid "failed to find tree of %s" msgstr "gặp lỗi khi tìm cây của %s" -#: revision.c:2343 +#: revision.c:2344 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<packfile> không còn được hỗ trợ nữa" -#: revision.c:2683 +#: revision.c:2684 msgid "your current branch appears to be broken" msgstr "nhánh hiện tại của bạn có vẻ như bị hỏng" -#: revision.c:2686 +#: revision.c:2687 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "nhánh hiện tại của bạn “%s” không có một lần chuyển giao nào cả" -#: revision.c:2892 +#: revision.c:2893 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L vẫn chưa hỗ trợ định dạng khác biệt nào ngoài -p và -s" -#: run-command.c:767 +#: run-command.c:766 msgid "open /dev/null failed" msgstr "gặp lỗi khi mở “/dev/null”" -#: run-command.c:1275 +#: run-command.c:1274 #, c-format msgid "cannot create async thread: %s" msgstr "không thể tạo tuyến async: %s" -#: run-command.c:1345 +#: run-command.c:1344 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -7396,15 +7423,15 @@ msgstr "send-pack: không thể rẽ nhánh tuyến trình con fetch" msgid "push negotiation failed; proceeding anyway with push" msgstr "đẩy đàm phán thất bại; vẫn tiếp tục xử lý bằng lệnh đẩy" -#: send-pack.c:520 +#: send-pack.c:526 msgid "the receiving end does not support this repository's hash algorithm" msgstr "kết thúc nhận không hỗ trợ các tùy chọn của lệnh push" -#: send-pack.c:529 +#: send-pack.c:535 msgid "the receiving end does not support --signed push" msgstr "kết thúc nhận không hỗ trợ đẩy --signed" -#: send-pack.c:531 +#: send-pack.c:537 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -7412,11 +7439,11 @@ msgstr "" "đừng gửi giấy chứng nhận đẩy trước khi kết thúc nhận không hỗ trợ đẩy --" "signed" -#: send-pack.c:543 +#: send-pack.c:544 msgid "the receiving end does not support --atomic push" msgstr "kết thúc nhận không hỗ trợ đẩy --atomic" -#: send-pack.c:548 +#: send-pack.c:549 msgid "the receiving end does not support push options" msgstr "kết thúc nhận không hỗ trợ các tùy chọn của lệnh push" @@ -7476,7 +7503,7 @@ msgid "could not lock '%s'" msgstr "không thể khóa “%s”" #: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 -#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631 +#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "không thể ghi vào “%s”" @@ -7487,7 +7514,7 @@ msgid "could not write eol to '%s'" msgstr "không thể ghi eol vào “%s”" #: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 -#: sequencer.c:3554 +#: sequencer.c:3555 #, c-format msgid "failed to finalize '%s'" msgstr "gặp lỗi khi hoàn thành “%s”" @@ -7537,8 +7564,8 @@ msgstr "không có khóa hiện diện trong “%.*s”" msgid "unable to dequote value of '%s'" msgstr "không thể giải trích dẫn giá trị của “%s”" -#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728 -#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729 +#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "không thể mở “%s” để đọc" @@ -7694,7 +7721,7 @@ msgstr "không thể phân tích HEAD" msgid "HEAD %s is not a commit!" msgstr "HEAD %s không phải là một lần chuyển giao!" -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702 msgid "could not parse HEAD commit" msgstr "không thể phân tích commit (lần chuyển giao) HEAD" @@ -7702,7 +7729,7 @@ msgstr "không thể phân tích commit (lần chuyển giao) HEAD" msgid "unable to parse commit author" msgstr "không thể phân tích tác giả của lần chuyển giao" -#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706 msgid "git write-tree failed to write a tree" msgstr "lệnh git write-tree gặp lỗi khi ghi một cây" @@ -7720,12 +7747,13 @@ msgstr "định danh tác giả không hợp lệ “%s”" msgid "corrupt author: missing date information" msgstr "tác giả sai hỏng: thiếu thông tin này tháng" -#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909 #: builtin/merge.c:934 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "gặp lỗi khi ghi đối tượng chuyển giao" -#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199 +#: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "không thể cập nhật %s" @@ -7777,7 +7805,7 @@ msgstr "không thể ghi “%s”" msgid "need a HEAD to fixup" msgstr "cần một HEAD để sửa" -#: sequencer.c:1936 sequencer.c:3581 +#: sequencer.c:1936 sequencer.c:3582 msgid "could not read HEAD" msgstr "không thể đọc HEAD" @@ -7918,7 +7946,7 @@ msgstr "squash-onto không dùng được" msgid "malformed options sheet: '%s'" msgstr "bảng tùy chọn dị hình: “%s”" -#: sequencer.c:3012 sequencer.c:4869 +#: sequencer.c:3012 sequencer.c:4868 msgid "empty commit set passed" msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách" @@ -7949,7 +7977,7 @@ msgstr "không thể tạo thư mục xếp dãy “%s”" msgid "could not lock HEAD" msgstr "không thể khóa HEAD" -#: sequencer.c:3125 sequencer.c:4582 +#: sequencer.c:3125 sequencer.c:4581 msgid "no cherry-pick or revert in progress" msgstr "không cherry-pick hay hoàn nguyên trong tiến trình" @@ -7961,7 +7989,7 @@ msgstr "không thể phân giải HEAD" msgid "cannot abort from a branch yet to be born" msgstr "không thể hủy bỏ từ một nhánh mà nó còn chưa được tạo ra" -#: sequencer.c:3159 builtin/grep.c:759 +#: sequencer.c:3159 builtin/grep.c:758 #, c-format msgid "cannot open '%s'" msgstr "không mở được “%s”" @@ -8011,7 +8039,7 @@ msgstr "" "bạn đã sẵn sàng chuyển giao chưa?\n" "thử \"git %s --continue\"" -#: sequencer.c:3411 sequencer.c:4473 +#: sequencer.c:3411 sequencer.c:4472 msgid "cannot read HEAD" msgstr "không thể đọc HEAD" @@ -8095,90 +8123,90 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3571 +#: sequencer.c:3572 #, c-format msgid "illegal label name: '%.*s'" msgstr "tên nhãn dị hình: “%.*s”" -#: sequencer.c:3625 +#: sequencer.c:3645 msgid "writing fake root commit" msgstr "ghi lần chuyển giao gốc giả" -#: sequencer.c:3630 +#: sequencer.c:3650 msgid "writing squash-onto" msgstr "đang ghi squash-onto" -#: sequencer.c:3714 +#: sequencer.c:3734 #, c-format msgid "could not resolve '%s'" msgstr "không thể phân giải “%s”" -#: sequencer.c:3747 +#: sequencer.c:3767 msgid "cannot merge without a current revision" msgstr "không thể hòa trộn mà không có một điểm xét duyệt hiện tại" -#: sequencer.c:3769 +#: sequencer.c:3789 #, c-format msgid "unable to parse '%.*s'" msgstr "không thể phân tích “%.*s”" -#: sequencer.c:3778 +#: sequencer.c:3798 #, c-format msgid "nothing to merge: '%.*s'" msgstr "chẳng có gì để hòa trộn: “%.*s”" -#: sequencer.c:3790 +#: sequencer.c:3810 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "hòa trộn octopus không thể được thực thi trên đỉnh của một [new root]" -#: sequencer.c:3806 +#: sequencer.c:3826 #, c-format msgid "could not get commit message of '%s'" msgstr "không thể lấy chú thích của lần chuyển giao của “%s”" -#: sequencer.c:3989 +#: sequencer.c:4009 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "không thể ngay cả khi thử hòa trộn “%.*s”" -#: sequencer.c:4005 +#: sequencer.c:4025 msgid "merge: Unable to write new index file" msgstr "merge: Không thể ghi tập tin lưu bảng mục lục mới" -#: sequencer.c:4079 +#: sequencer.c:4099 msgid "Cannot autostash" msgstr "Không thể autostash" -#: sequencer.c:4082 +#: sequencer.c:4102 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Gặp đáp ứng stash không cần: “%s”" -#: sequencer.c:4088 +#: sequencer.c:4108 #, c-format msgid "Could not create directory for '%s'" msgstr "Không thể tạo thư mục cho “%s”" -#: sequencer.c:4091 +#: sequencer.c:4111 #, c-format msgid "Created autostash: %s\n" msgstr "Đã tạo autostash: %s\n" -#: sequencer.c:4095 +#: sequencer.c:4115 msgid "could not reset --hard" msgstr "không thể reset --hard" -#: sequencer.c:4120 +#: sequencer.c:4140 #, c-format msgid "Applied autostash.\n" msgstr "Đã áp dụng autostash.\n" -#: sequencer.c:4132 +#: sequencer.c:4152 #, c-format msgid "cannot store %s" msgstr "không thử lưu “%s”" -#: sequencer.c:4135 +#: sequencer.c:4155 #, c-format msgid "" "%s\n" @@ -8190,29 +8218,29 @@ msgstr "" "Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc " "nào.\n" -#: sequencer.c:4140 +#: sequencer.c:4160 msgid "Applying autostash resulted in conflicts." msgstr "Áp dụng autostash có hiệu quả trong các xung đột." -#: sequencer.c:4141 +#: sequencer.c:4161 msgid "Autostash exists; creating a new stash entry." msgstr "Autostash đã sẵn có; nên tạo một mục stash mới." -#: sequencer.c:4234 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4233 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "không thể tách rời HEAD" -#: sequencer.c:4249 +#: sequencer.c:4248 #, c-format msgid "Stopped at HEAD\n" msgstr "Dừng lại ở HEAD\n" -#: sequencer.c:4251 +#: sequencer.c:4250 #, c-format msgid "Stopped at %s\n" msgstr "Dừng lại ở %s\n" -#: sequencer.c:4259 +#: sequencer.c:4258 #, c-format msgid "" "Could not execute the todo command\n" @@ -8233,58 +8261,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4305 +#: sequencer.c:4304 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Đang cải tổ (%d/%d)%s" -#: sequencer.c:4351 +#: sequencer.c:4350 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Dừng lại ở %s… %.*s\n" -#: sequencer.c:4422 +#: sequencer.c:4421 #, c-format msgid "unknown command %d" msgstr "không hiểu câu lệnh %d" -#: sequencer.c:4481 +#: sequencer.c:4480 msgid "could not read orig-head" msgstr "không thể đọc orig-head" -#: sequencer.c:4486 +#: sequencer.c:4485 msgid "could not read 'onto'" msgstr "không thể đọc “onto”." -#: sequencer.c:4500 +#: sequencer.c:4499 #, c-format msgid "could not update HEAD to %s" msgstr "không thể cập nhật HEAD thành %s" -#: sequencer.c:4560 +#: sequencer.c:4559 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Cài tổ và cập nhật %s một cách thành công.\n" -#: sequencer.c:4612 +#: sequencer.c:4611 msgid "cannot rebase: You have unstaged changes." msgstr "không thể cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng." -#: sequencer.c:4621 +#: sequencer.c:4620 msgid "cannot amend non-existing commit" msgstr "không thể tu bỏ một lần chuyển giao không tồn tại" -#: sequencer.c:4623 +#: sequencer.c:4622 #, c-format msgid "invalid file: '%s'" msgstr "tập tin không hợp lệ: “%s”" -#: sequencer.c:4625 +#: sequencer.c:4624 #, c-format msgid "invalid contents: '%s'" msgstr "nội dung không hợp lệ: “%s”" -#: sequencer.c:4628 +#: sequencer.c:4627 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8294,50 +8322,50 @@ msgstr "" "Bạn có các thay đổi chưa chuyển giao trong thư mục làm việc. Vui lòng\n" "chuyển giao chúng trước và sau đó chạy lệnh “git rebase --continue” lần nữa." -#: sequencer.c:4664 sequencer.c:4703 +#: sequencer.c:4663 sequencer.c:4702 #, c-format msgid "could not write file: '%s'" msgstr "không thể ghi tập tin: “%s”" -#: sequencer.c:4719 +#: sequencer.c:4718 msgid "could not remove CHERRY_PICK_HEAD" msgstr "không thể xóa bỏ CHERRY_PICK_HEAD" -#: sequencer.c:4726 +#: sequencer.c:4725 msgid "could not commit staged changes." msgstr "không thể chuyển giao các thay đổi đã đưa lên bệ phóng." -#: sequencer.c:4846 +#: sequencer.c:4845 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: không thể cherry-pick một %s" -#: sequencer.c:4850 +#: sequencer.c:4849 #, c-format msgid "%s: bad revision" msgstr "%s: điểm xét duyệt sai" -#: sequencer.c:4885 +#: sequencer.c:4884 msgid "can't revert as initial commit" msgstr "không thể hoàn nguyên một lần chuyển giao khởi tạo" -#: sequencer.c:5362 +#: sequencer.c:5361 msgid "make_script: unhandled options" msgstr "make_script: các tùy chọn được không xử lý" -#: sequencer.c:5365 +#: sequencer.c:5364 msgid "make_script: error preparing revisions" msgstr "make_script: lỗi chuẩn bị điểm hiệu chỉnh" -#: sequencer.c:5615 sequencer.c:5632 +#: sequencer.c:5614 sequencer.c:5631 msgid "nothing to do" msgstr "không có gì để làm" -#: sequencer.c:5651 +#: sequencer.c:5650 msgid "could not skip unnecessary pick commands" msgstr "không thể bỏ qua các lệnh cậy (pick) không cần thiết" -#: sequencer.c:5751 +#: sequencer.c:5750 msgid "the script was already rearranged." msgstr "văn lệnh đã sẵn được sắp đặt rồi." @@ -8388,92 +8416,94 @@ msgstr "" msgid "unable to set up work tree using invalid config" msgstr "không thể cài đặt thư mục làm việc sử dụng cấu hình không hợp lệ" -#: setup.c:423 +#: setup.c:423 builtin/rev-parse.c:895 msgid "this operation must be run in a work tree" msgstr "thao tác này phải được thực hiện trong thư mục làm việc" -#: setup.c:661 +#: setup.c:658 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Cần phiên bản kho git <= %d, nhưng lại nhận được %d" -#: setup.c:669 -msgid "unknown repository extensions found:" -msgstr "tìm thấy phần mở rộng kho chưa biết:" +#: setup.c:666 +msgid "unknown repository extension found:" +msgid_plural "unknown repository extensions found:" +msgstr[0] "tìm thấy phần mở rộng kho chưa biết:" -#: setup.c:681 -msgid "repo version is 0, but v1-only extensions found:" -msgstr "phiên bản kho là 0, nhưng lại tìm thấy phần mở rộng chỉ v1:" +#: setup.c:680 +msgid "repo version is 0, but v1-only extension found:" +msgid_plural "repo version is 0, but v1-only extensions found:" +msgstr[0] "phiên bản kho là 0, nhưng lại tìm thấy phần mở rộng chỉ v1:" -#: setup.c:700 +#: setup.c:701 #, c-format msgid "error opening '%s'" msgstr "gặp lỗi khi mở “%s”" -#: setup.c:702 +#: setup.c:703 #, c-format msgid "too large to be a .git file: '%s'" msgstr "tập tin .git là quá lớn: “%s”" -#: setup.c:704 +#: setup.c:705 #, c-format msgid "error reading %s" msgstr "gặp lỗi khi đọc %s" -#: setup.c:706 +#: setup.c:707 #, c-format msgid "invalid gitfile format: %s" msgstr "định dạng tập tin git không hợp lệ: %s" -#: setup.c:708 +#: setup.c:709 #, c-format msgid "no path in gitfile: %s" msgstr "không có đường dẫn trong tập tin git: %s" -#: setup.c:710 +#: setup.c:711 #, c-format msgid "not a git repository: %s" msgstr "không phải là kho git: %s" -#: setup.c:812 +#: setup.c:813 #, c-format msgid "'$%s' too big" msgstr "“$%s” quá lớn" -#: setup.c:826 +#: setup.c:827 #, c-format msgid "not a git repository: '%s'" msgstr "không phải là kho git: “%s”" -#: setup.c:855 setup.c:857 setup.c:888 +#: setup.c:856 setup.c:858 setup.c:889 #, c-format msgid "cannot chdir to '%s'" msgstr "không thể chdir (chuyển đổi thư mục) sang “%s”" -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 +#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 msgid "cannot come back to cwd" msgstr "không thể quay lại cwd" -#: setup.c:987 +#: setup.c:988 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "gặp lỗi khi lấy thống kê về “%*s%s%s”" -#: setup.c:1225 +#: setup.c:1231 msgid "Unable to read current working directory" msgstr "Không thể đọc thư mục làm việc hiện hành" -#: setup.c:1234 setup.c:1240 +#: setup.c:1240 setup.c:1246 #, c-format msgid "cannot change to '%s'" msgstr "không thể chuyển sang “%s”" -#: setup.c:1245 +#: setup.c:1251 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "không phải là kho git (hoặc bất kỳ thư mục cha mẹ nào): %s" -#: setup.c:1251 +#: setup.c:1257 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -8483,7 +8513,7 @@ msgstr "" "Dừng tại biên của hệ thống tập tin (GIT_DISCOVERY_ACROSS_FILESYSTEM chưa " "đặt)." -#: setup.c:1370 +#: setup.c:1381 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -8492,27 +8522,27 @@ msgstr "" "gặp vấn đề với giá trị chế độ tập tin core.sharedRepository (0%.3o).\n" "người sở hữu tập tin phải luôn có quyền đọc và ghi." -#: setup.c:1417 +#: setup.c:1430 msgid "open /dev/null or dup failed" msgstr "gặp lỗi khi mở “/dev/null” hay dup" -#: setup.c:1432 +#: setup.c:1445 msgid "fork failed" msgstr "gặp lỗi khi rẽ nhánh tiến trình" -#: setup.c:1437 t/helper/test-simple-ipc.c:285 +#: setup.c:1450 t/helper/test-simple-ipc.c:285 msgid "setsid failed" msgstr "setsid gặp lỗi" -#: sparse-index.c:151 +#: sparse-index.c:162 msgid "attempting to use sparse-index without cone mode" msgstr "cố gắng sử dụng chỉ mục thưa thớt mà không có chế độ hình nón" -#: sparse-index.c:156 +#: sparse-index.c:174 msgid "unable to update cache-tree, staying full" msgstr "không thể cập nhật cây bộ nhớ đệm, chỗ chứa bị đầy" -#: sparse-index.c:239 +#: sparse-index.c:261 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "mục tin mục lục là một thư mục, nhưng không \"sparse\" (%08x)" @@ -8567,7 +8597,7 @@ msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u byte/giây" -#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738 #: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" @@ -8639,7 +8669,7 @@ msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s msgid "bad --ignore-submodules argument: %s" msgstr "đối số --ignore-submodules sai: %s" -#: submodule.c:818 +#: submodule.c:805 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " @@ -8648,13 +8678,13 @@ msgstr "" "Mô-đun-con trong lần chuyển giao %s tại đường dẫn: “%s” va chạm với mô-đun-" "con cùng tên. Nên bỏ qua nó." -#: submodule.c:921 +#: submodule.c:908 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" "mục tin mô-đun-con “%s” (%s) là một %s, không phải là một lần chuyển giao" -#: submodule.c:1006 +#: submodule.c:993 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " @@ -8663,36 +8693,36 @@ msgstr "" "Không thể chạy lệnh “git rev-list <các lần chuyển giao> --not --remotes -n " "1” trong mô-đun-con “%s”" -#: submodule.c:1129 +#: submodule.c:1116 #, c-format msgid "process for submodule '%s' failed" msgstr "xử lý cho mô-đun-con “%s” gặp lỗi" -#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu hợp lệ." -#: submodule.c:1169 +#: submodule.c:1156 #, c-format msgid "Pushing submodule '%s'\n" msgstr "Đẩy lên mô-đun-con “%s”\n" -#: submodule.c:1172 +#: submodule.c:1159 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "Không thể đẩy lên mô-đun-con “%s”\n" -#: submodule.c:1464 +#: submodule.c:1451 #, c-format msgid "Fetching submodule %s%s\n" msgstr "Đang lấy về mô-đun-con %s%s\n" -#: submodule.c:1498 +#: submodule.c:1485 #, c-format msgid "Could not access submodule '%s'\n" msgstr "Không thể truy cập mô-đun-con “%s”\n" -#: submodule.c:1653 +#: submodule.c:1640 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8701,61 +8731,61 @@ msgstr "" "Có lỗi khi lấy về mô-đun-con:\n" " “%s”" -#: submodule.c:1678 +#: submodule.c:1665 #, c-format msgid "'%s' not recognized as a git repository" msgstr "không nhận ra “%s” là một kho git" -#: submodule.c:1695 +#: submodule.c:1682 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "Không thể chạy “git status --porcelain=2” trong mô-đun-con “%s”" -#: submodule.c:1736 +#: submodule.c:1723 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "“git status --porcelain=2” gặp lỗi trong mô-đun-con “%s”" -#: submodule.c:1811 +#: submodule.c:1798 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "không thể lấy thống kê “git status” trong mô-đun-con “%s”" -#: submodule.c:1824 +#: submodule.c:1811 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "không thể chạy “git status” trong mô-đun-con “%s”" -#: submodule.c:1839 +#: submodule.c:1826 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Không thể đặt core.worktree trong mô-đun-con “%s”" -#: submodule.c:1866 submodule.c:2176 +#: submodule.c:1853 submodule.c:2163 #, c-format msgid "could not recurse into submodule '%s'" msgstr "không thể đệ quy vào trong mô-đun-con “%s”" -#: submodule.c:1887 +#: submodule.c:1874 msgid "could not reset submodule index" msgstr "không thể đặt lại mục lục của mô-đun-con" -#: submodule.c:1929 +#: submodule.c:1916 #, c-format msgid "submodule '%s' has dirty index" msgstr "mô-đun-con “%s” có mục lục còn bẩn" -#: submodule.c:1981 +#: submodule.c:1968 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Mô-đun-con “%s” không thể được cập nhật." -#: submodule.c:2049 +#: submodule.c:2036 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "thư mục git mô đun con “%s” là bên trong git DIR “%.*s”" -#: submodule.c:2070 +#: submodule.c:2057 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8763,17 +8793,17 @@ msgstr "" "relocate_gitdir cho mô-đun-con “%s” với nhiều hơn một cây làm việc là chưa " "được hỗ trợ" -#: submodule.c:2082 submodule.c:2141 +#: submodule.c:2069 submodule.c:2128 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "không thể tìm kiếm tên cho mô-đun-con “%s”" -#: submodule.c:2086 +#: submodule.c:2073 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "từ chối di chuyển “%s” vào trong một thư mục git sẵn có" -#: submodule.c:2093 +#: submodule.c:2080 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8784,11 +8814,11 @@ msgstr "" "“%s” sang\n" "“%s”\n" -#: submodule.c:2221 +#: submodule.c:2208 msgid "could not start ls-files in .." msgstr "không thể lấy thông tin thống kê về ls-files trong .." -#: submodule.c:2261 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree trả về mã không như mong đợi %d" @@ -8825,7 +8855,7 @@ msgstr "thẻ thừa trống rỗng trong phần thừa “%.*s”" msgid "could not read input file '%s'" msgstr "không đọc được tập tin đầu vào “%s”" -#: trailer.c:766 builtin/mktag.c:88 +#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577 msgid "could not read from stdin" msgstr "không thể đọc từ đầu vào tiêu chuẩn" @@ -8915,7 +8945,7 @@ msgstr "giao thức này không hỗ trợ cài đặt đường dẫn dịch v msgid "invalid remote service path" msgstr "đường dẫn dịch vụ máy chủ không hợp lệ" -#: transport-helper.c:661 transport.c:1471 +#: transport-helper.c:661 transport.c:1477 msgid "operation not supported by protocol" msgstr "thao tác không được gia thức hỗ trợ" @@ -8924,7 +8954,7 @@ msgstr "thao tác không được gia thức hỗ trợ" msgid "can't connect to subservice %s" msgstr "không thể kết nối đến dịch vụ phụ %s" -#: transport-helper.c:693 transport.c:397 +#: transport-helper.c:693 transport.c:400 msgid "--negotiate-only requires protocol v2" msgstr "--negotiate-only cần giao thức v2" @@ -9058,46 +9088,46 @@ msgstr "Không thể đặt thượng nguồn của “%s” thành “%s” c msgid "could not read bundle '%s'" msgstr "không thể đọc bó “%s”" -#: transport.c:220 +#: transport.c:223 #, c-format msgid "transport: invalid depth option '%s'" msgstr "vận chuyển: tùy chọn độ sâu “%s” không hợp lệ" -#: transport.c:272 +#: transport.c:275 msgid "see protocol.version in 'git help config' for more details" msgstr "xem protocol.version trong “git help config” để có thêm thông tin" -#: transport.c:273 +#: transport.c:276 msgid "server options require protocol version 2 or later" msgstr "các tùy chọn máy chủ yêu cầu giao thức phiên bản 2 hoặc mới hơn" -#: transport.c:400 +#: transport.c:403 msgid "server does not support wait-for-done" msgstr "Máy chủ không hỗ trợ wait-for-done" -#: transport.c:751 +#: transport.c:755 msgid "could not parse transport.color.* config" msgstr "không thể phân tích cú pháp cấu hình transport.color.*" -#: transport.c:826 +#: transport.c:830 msgid "support for protocol v2 not implemented yet" msgstr "việc hỗ trợ giao thức v2 chưa được thực hiện" -#: transport.c:960 +#: transport.c:965 #, c-format msgid "unknown value for config '%s': %s" msgstr "không hiểu giá trị cho cho cấu hình “%s”: %s" -#: transport.c:1026 +#: transport.c:1031 #, c-format msgid "transport '%s' not allowed" msgstr "không cho phép phương thức vận chuyển “%s”" -#: transport.c:1079 +#: transport.c:1084 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync không còn được hỗ trợ nữa" -#: transport.c:1181 +#: transport.c:1187 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -9106,7 +9136,7 @@ msgstr "" "Các đường dẫn mô-đun-con sau đây có chứa các thay đổi cái mà\n" "có thể được tìm thấy trên mọi máy phục vụ:\n" -#: transport.c:1185 +#: transport.c:1191 #, c-format msgid "" "\n" @@ -9133,11 +9163,11 @@ msgstr "" "để đẩy chúng lên máy phục vụ.\n" "\n" -#: transport.c:1193 +#: transport.c:1199 msgid "Aborting." msgstr "Bãi bỏ." -#: transport.c:1340 +#: transport.c:1346 msgid "failed to push all needed submodules" msgstr "gặp lỗi khi đẩy dữ liệu của tất cả các mô-đun-con cần thiết" @@ -9423,11 +9453,11 @@ msgstr "" "HOA/thường trên một hệ thống tập tin không phân biệt HOA/thường)\n" "và chỉ một từ cùng một nhóm xung đột là trong cây làm việc hiện tại:\n" -#: unpack-trees.c:1519 +#: unpack-trees.c:1618 msgid "Updating index flags" msgstr "Đang cập nhật các cờ mục lục" -#: unpack-trees.c:2608 +#: unpack-trees.c:2707 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "" @@ -9470,100 +9500,100 @@ msgstr "đoạn đường dẫn “..” không hợp lệ" msgid "Fetching objects" msgstr "Đang lấy về các đối tượng" -#: worktree.c:238 builtin/am.c:2151 +#: worktree.c:236 builtin/am.c:2152 #, c-format msgid "failed to read '%s'" msgstr "gặp lỗi khi đọc “%s”" -#: worktree.c:304 +#: worktree.c:303 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "“%s” tại cây làm việc chình không phải là thư mục kho" -#: worktree.c:315 +#: worktree.c:314 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "tập tin “%s” không chứa đường dẫn tuyệt đối đến vị trí cây làm việc hiện" -#: worktree.c:327 +#: worktree.c:326 #, c-format msgid "'%s' does not exist" msgstr "\"%s\" không tồn tại" -#: worktree.c:333 +#: worktree.c:332 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "“%s” không phải là tập tin .git, mã lỗi %d" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "“%s” không chỉ ngược đến “%s”" -#: worktree.c:608 +#: worktree.c:603 msgid "not a directory" msgstr "không phải thư mục" -#: worktree.c:617 +#: worktree.c:612 msgid ".git is not a file" msgstr ".git không phải là một tập tin" -#: worktree.c:619 +#: worktree.c:614 msgid ".git file broken" msgstr "tệp .git bị hỏng" -#: worktree.c:621 +#: worktree.c:616 msgid ".git file incorrect" msgstr "tập tin .git không chính xác" -#: worktree.c:727 +#: worktree.c:722 msgid "not a valid path" msgstr "không phải là một đường dẫn hợp lệ" -#: worktree.c:733 +#: worktree.c:728 msgid "unable to locate repository; .git is not a file" msgstr "không thể phân bổ kho chứa; .git không phải là một tập tin" -#: worktree.c:737 +#: worktree.c:732 msgid "unable to locate repository; .git file does not reference a repository" msgstr "không thể phân bổ kho chứa; tập tin .git tham chiếu đến một kho" -#: worktree.c:741 +#: worktree.c:736 msgid "unable to locate repository; .git file broken" msgstr "không thể phân bổ kho chứa; tập tin .git bị hỏng" -#: worktree.c:747 +#: worktree.c:742 msgid "gitdir unreadable" msgstr "gitdir không thể đọc được" -#: worktree.c:751 +#: worktree.c:746 msgid "gitdir incorrect" msgstr "gitdir không chính xác" -#: worktree.c:776 +#: worktree.c:771 msgid "not a valid directory" msgstr "không phải thư mục hợp lệ" -#: worktree.c:782 +#: worktree.c:777 msgid "gitdir file does not exist" msgstr "tập tin gitdir không tồn tại" -#: worktree.c:787 worktree.c:796 +#: worktree.c:782 worktree.c:791 #, c-format msgid "unable to read gitdir file (%s)" msgstr "không thể đọc tập tin gitdir (%s)" -#: worktree.c:806 +#: worktree.c:801 #, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "đọc ngắn (cần %<PRIuMAX> byte, đọc %<PRIuMAX>)" -#: worktree.c:814 +#: worktree.c:809 msgid "invalid gitdir file" msgstr "tập tin gitdir (thư mục git) không hợp lệ" -#: worktree.c:822 +#: worktree.c:817 msgid "gitdir file points to non-existent location" msgstr "tập tin gitdir chỉ đến vị trí không tồn tại" @@ -9614,11 +9644,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (dùng \"git rm <tập-tin>…\" để đánh dấu là cần giải quyết)" -#: wt-status.c:211 wt-status.c:1075 +#: wt-status.c:211 wt-status.c:1125 msgid "Changes to be committed:" msgstr "Những thay đổi sẽ được chuyển giao:" -#: wt-status.c:234 wt-status.c:1084 +#: wt-status.c:234 wt-status.c:1134 msgid "Changes not staged for commit:" msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:" @@ -9722,21 +9752,21 @@ msgstr "nội dung bị sửa đổi, " msgid "untracked content, " msgstr "nội dung chưa được theo dõi, " -#: wt-status.c:908 +#: wt-status.c:958 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Bạn hiện nay ở trong phần cất đi đang có %d mục" -#: wt-status.c:939 +#: wt-status.c:989 msgid "Submodules changed but not updated:" msgstr "Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:" -#: wt-status.c:941 +#: wt-status.c:991 msgid "Submodule changes to be committed:" msgstr "Những mô-đun-con thay đổi đã được chuyển giao:" -#: wt-status.c:1023 +#: wt-status.c:1073 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9744,7 +9774,7 @@ msgstr "" "Không sửa hay xóa bỏ đường ở trên.\n" "Mọi thứ phía dưới sẽ được xóa bỏ." -#: wt-status.c:1115 +#: wt-status.c:1165 #, c-format msgid "" "\n" @@ -9755,109 +9785,109 @@ msgstr "" "Nó cần %.2f giây để tính toán giá trị của trước/sau của nhánh.\n" "Bạn có thể dùng “--no-ahead-behind” tránh phải điều này.\n" -#: wt-status.c:1145 +#: wt-status.c:1195 msgid "You have unmerged paths." msgstr "Bạn có những đường dẫn chưa được hòa trộn." -#: wt-status.c:1148 +#: wt-status.c:1198 msgid " (fix conflicts and run \"git commit\")" msgstr " (sửa các xung đột rồi chạy \"git commit\")" -#: wt-status.c:1150 +#: wt-status.c:1200 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (dùng \"git merge --abort\" để bãi bỏ việc hòa trộn)" -#: wt-status.c:1154 +#: wt-status.c:1204 msgid "All conflicts fixed but you are still merging." msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn." -#: wt-status.c:1157 +#: wt-status.c:1207 msgid " (use \"git commit\" to conclude merge)" msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)" -#: wt-status.c:1166 +#: wt-status.c:1216 msgid "You are in the middle of an am session." msgstr "Bạn đang ở giữa của một phiên “am”." -#: wt-status.c:1169 +#: wt-status.c:1219 msgid "The current patch is empty." msgstr "Miếng vá hiện tại bị trống rỗng." -#: wt-status.c:1173 +#: wt-status.c:1223 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --continue\")" -#: wt-status.c:1175 +#: wt-status.c:1225 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (dùng \"git am --skip\" để bỏ qua miếng vá này)" -#: wt-status.c:1177 +#: wt-status.c:1227 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)" -#: wt-status.c:1310 +#: wt-status.c:1360 msgid "git-rebase-todo is missing." msgstr "thiếu git-rebase-todo." -#: wt-status.c:1312 +#: wt-status.c:1362 msgid "No commands done." msgstr "Không thực hiện lệnh nào." -#: wt-status.c:1315 +#: wt-status.c:1365 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Lệnh thực hiện cuối (%d lệnh được thực thi):" -#: wt-status.c:1326 +#: wt-status.c:1376 #, c-format msgid " (see more in file %s)" msgstr " (xem thêm trong %s)" -#: wt-status.c:1331 +#: wt-status.c:1381 msgid "No commands remaining." msgstr "Không có lệnh nào còn lại." -#: wt-status.c:1334 +#: wt-status.c:1384 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Lệnh cần làm kế tiếp (%d lệnh còn lại):" -#: wt-status.c:1342 +#: wt-status.c:1392 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (dùng lệnh \"git rebase --edit-todo\" để xem và sửa)" -#: wt-status.c:1354 +#: wt-status.c:1404 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Bạn hiện nay đang thực hiện việc “rebase” nhánh “%s” trên “%s”." -#: wt-status.c:1359 +#: wt-status.c:1409 msgid "You are currently rebasing." msgstr "Bạn hiện nay đang thực hiện việc “rebase” (cải tổ)." -#: wt-status.c:1372 +#: wt-status.c:1422 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (sửa các xung đột và sau đó chạy lệnh “cải tổ” \"git rebase --continue\")" -#: wt-status.c:1374 +#: wt-status.c:1424 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (dùng lệnh “cải tổ” \"git rebase --skip\" để bỏ qua lần vá này)" -#: wt-status.c:1376 +#: wt-status.c:1426 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (dùng lệnh “cải tổ” \"git rebase --abort\" để check-out nhánh nguyên thủy)" -#: wt-status.c:1383 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh “cải tổ” \"git rebase --" "continue\")" -#: wt-status.c:1387 +#: wt-status.c:1437 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -9865,165 +9895,169 @@ msgstr "" "Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao trong khi " "đang “rebase” nhánh “%s” trên “%s”." -#: wt-status.c:1392 +#: wt-status.c:1442 msgid "You are currently splitting a commit during a rebase." msgstr "" "Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc " "rebase." -#: wt-status.c:1395 +#: wt-status.c:1445 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Một khi thư mục làm việc của bạn đã gọn gàng, chạy lệnh “cải tổ” \"git " "rebase --continue\")" -#: wt-status.c:1399 +#: wt-status.c:1449 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao trong khi đang " "rebase nhánh “%s” trên “%s”." -#: wt-status.c:1404 +#: wt-status.c:1454 msgid "You are currently editing a commit during a rebase." msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase." -#: wt-status.c:1407 +#: wt-status.c:1457 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (dùng \"git commit --amend\" để “tu bổ” lần chuyển giao hiện tại)" -#: wt-status.c:1409 +#: wt-status.c:1459 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (chạy lệnh “cải tổ” \"git rebase --continue\" một khi bạn cảm thấy hài " "lòng về những thay đổi của mình)" -#: wt-status.c:1420 +#: wt-status.c:1470 msgid "Cherry-pick currently in progress." msgstr "Cherry-pick hiện tại đang được thực hiện." -#: wt-status.c:1423 +#: wt-status.c:1473 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Bạn hiện nay đang thực hiện việc cherry-pick lần chuyển giao %s." -#: wt-status.c:1430 +#: wt-status.c:1480 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" " (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")" -#: wt-status.c:1433 +#: wt-status.c:1483 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (chạy lệnh \"git cherry-pick --continue\" để tiếp tục)" -#: wt-status.c:1436 +#: wt-status.c:1486 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git cherry-pick --" "continue\")" -#: wt-status.c:1438 +#: wt-status.c:1488 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (dùng \"git cherry-pick --skip\" để bỏ qua miếng vá này)" -#: wt-status.c:1440 +#: wt-status.c:1490 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (dùng \"git cherry-pick --abort\" để hủy bỏ thao tác cherry-pick)" -#: wt-status.c:1450 +#: wt-status.c:1500 msgid "Revert currently in progress." msgstr "Hoàn nguyên hiện tại đang thực hiện." -#: wt-status.c:1453 +#: wt-status.c:1503 #, c-format msgid "You are currently reverting commit %s." msgstr "Bạn hiện nay đang thực hiện thao tác hoàn nguyên lần chuyển giao “%s”." -#: wt-status.c:1459 +#: wt-status.c:1509 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")" -#: wt-status.c:1462 +#: wt-status.c:1512 msgid " (run \"git revert --continue\" to continue)" msgstr " (chạy lệnh \"git revert --continue\" để tiếp tục)" -#: wt-status.c:1465 +#: wt-status.c:1515 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")" -#: wt-status.c:1467 +#: wt-status.c:1517 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (dùng lệnh \"git revert --skip\" để bỏ qua lần vá này)" -#: wt-status.c:1469 +#: wt-status.c:1519 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (dùng \"git revert --abort\" để hủy bỏ thao tác hoàn nguyên)" -#: wt-status.c:1479 +#: wt-status.c:1529 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" "Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ " "nhánh “%s”." -#: wt-status.c:1483 +#: wt-status.c:1533 msgid "You are currently bisecting." msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa bước)." -#: wt-status.c:1486 +#: wt-status.c:1536 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)" -#: wt-status.c:1497 +#: wt-status.c:1547 +msgid "You are in a sparse checkout." +msgstr "Bạn đang trong lần lấy ra sparse." + +#: wt-status.c:1550 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "" "Bạn đang ở trong lần lấy ra sparser %d%% của các tập tin được theo dõi hiện " "tại." -#: wt-status.c:1736 +#: wt-status.c:1794 msgid "On branch " msgstr "Trên nhánh " -#: wt-status.c:1743 +#: wt-status.c:1801 msgid "interactive rebase in progress; onto " msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên " -#: wt-status.c:1745 +#: wt-status.c:1803 msgid "rebase in progress; onto " msgstr "rebase đang được thực hiện: lên trên " -#: wt-status.c:1750 +#: wt-status.c:1808 msgid "HEAD detached at " msgstr "HEAD được tách rời tại " -#: wt-status.c:1752 +#: wt-status.c:1810 msgid "HEAD detached from " msgstr "HEAD được tách rời từ " -#: wt-status.c:1755 +#: wt-status.c:1813 msgid "Not currently on any branch." msgstr "Hiện tại chẳng ở nhánh nào cả." -#: wt-status.c:1772 +#: wt-status.c:1830 msgid "Initial commit" msgstr "Lần chuyển giao khởi tạo" -#: wt-status.c:1773 +#: wt-status.c:1831 msgid "No commits yet" msgstr "Vẫn chưa chuyển giao" -#: wt-status.c:1787 +#: wt-status.c:1845 msgid "Untracked files" msgstr "Những tập tin chưa được theo dõi" -#: wt-status.c:1789 +#: wt-status.c:1847 msgid "Ignored files" msgstr "Những tập tin bị lờ đi" -#: wt-status.c:1793 +#: wt-status.c:1851 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -10035,32 +10069,32 @@ msgstr "" "có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n" "tự thêm các tập tin mới (xem “git help status”.." -#: wt-status.c:1799 +#: wt-status.c:1857 #, c-format msgid "Untracked files not listed%s" msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s" -#: wt-status.c:1801 +#: wt-status.c:1859 msgid " (use -u option to show untracked files)" msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)" -#: wt-status.c:1807 +#: wt-status.c:1865 msgid "No changes" msgstr "Không có thay đổi nào" -#: wt-status.c:1812 +#: wt-status.c:1870 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "không có thay đổi nào được thêm vào để chuyển giao (dùng \"git add\" và/hoặc " "\"git commit -a\")\n" -#: wt-status.c:1816 +#: wt-status.c:1874 #, c-format msgid "no changes added to commit\n" msgstr "không có thay đổi nào được thêm vào để chuyển giao\n" -#: wt-status.c:1820 +#: wt-status.c:1878 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -10069,87 +10103,87 @@ msgstr "" "không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được " "theo dõi hiện diện (dùng \"git add\" để đưa vào theo dõi)\n" -#: wt-status.c:1824 +#: wt-status.c:1882 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được " "theo dõi hiện diện\n" -#: wt-status.c:1828 +#: wt-status.c:1886 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "không có gì để chuyển giao (tạo/sao-chép các tập tin và dùng \"git add\" để " "đưa vào theo dõi)\n" -#: wt-status.c:1832 wt-status.c:1838 +#: wt-status.c:1890 wt-status.c:1896 #, c-format msgid "nothing to commit\n" msgstr "không có gì để chuyển giao\n" -#: wt-status.c:1835 +#: wt-status.c:1893 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "không có gì để chuyển giao (dùng -u xem các tập tin chưa được theo dõi)\n" -#: wt-status.c:1840 +#: wt-status.c:1898 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n" -#: wt-status.c:1945 +#: wt-status.c:2003 msgid "No commits yet on " msgstr "Vẫn không thực hiện lệnh chuyển giao nào " -#: wt-status.c:1949 +#: wt-status.c:2007 msgid "HEAD (no branch)" msgstr "HEAD (không nhánh)" -#: wt-status.c:1980 +#: wt-status.c:2038 msgid "different" msgstr "khác" -#: wt-status.c:1982 wt-status.c:1990 +#: wt-status.c:2040 wt-status.c:2048 msgid "behind " msgstr "đằng sau " -#: wt-status.c:1985 wt-status.c:1988 +#: wt-status.c:2043 wt-status.c:2046 msgid "ahead " msgstr "phía trước " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2511 +#: wt-status.c:2569 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "không thể %s: Bạn có các thay đổi chưa được đưa lên bệ phóng." -#: wt-status.c:2517 +#: wt-status.c:2575 msgid "additionally, your index contains uncommitted changes." msgstr "" "thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao." -#: wt-status.c:2519 +#: wt-status.c:2577 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" "không thể %s: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao." -#: compat/simple-ipc/ipc-unix-socket.c:178 +#: compat/simple-ipc/ipc-unix-socket.c:182 msgid "could not send IPC command" msgstr "không thể gửi lệnh IPC" -#: compat/simple-ipc/ipc-unix-socket.c:185 +#: compat/simple-ipc/ipc-unix-socket.c:189 msgid "could not read IPC response" msgstr "không thể đọc đáp ứng IPC" -#: compat/simple-ipc/ipc-unix-socket.c:862 +#: compat/simple-ipc/ipc-unix-socket.c:866 #, c-format msgid "could not start accept_thread '%s'" msgstr "không thể khởi chạy accept_thread “%s”" -#: compat/simple-ipc/ipc-unix-socket.c:874 +#: compat/simple-ipc/ipc-unix-socket.c:878 #, c-format msgid "could not start worker[0] for '%s'" msgstr "không thể khởi chạy bộ làm việc worker[0] cho “%s”" @@ -10187,7 +10221,7 @@ msgid "Unstaged changes after refreshing the index:" msgstr "" "Đưa ra khỏi bệ phóng các thay đổi sau khi làm tươi mới lại bảng mục lục:" -#: builtin/add.c:307 builtin/rev-parse.c:991 +#: builtin/add.c:307 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "Không thể đọc bảng mục lục" @@ -10224,8 +10258,8 @@ msgstr "" "Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore " "của bạn:\n" -#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550 #: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 msgid "dry run" msgstr "chạy thử" @@ -10370,12 +10404,12 @@ msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod tham số “%s” phải hoặc là -x hay +x" #: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 -#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637 +#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file xung khắc với các tham số đặc tả đường dẫn" #: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 -#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643 +#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul cần --pathspec-from-file" @@ -10394,109 +10428,109 @@ msgstr "" "Tắt thông báo này bằng cách chạy lệnh\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:364 +#: builtin/am.c:365 msgid "could not parse author script" msgstr "không thể phân tích cú pháp văn lệnh tác giả" -#: builtin/am.c:454 +#: builtin/am.c:455 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "“%s” bị xóa bởi móc applypatch-msg" -#: builtin/am.c:496 +#: builtin/am.c:497 #, c-format msgid "Malformed input line: '%s'." msgstr "Dòng đầu vào dị hình: “%s”." -#: builtin/am.c:534 +#: builtin/am.c:535 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Gặp lỗi khi sao chép ghi chú (note) từ “%s” tới “%s”" -#: builtin/am.c:560 +#: builtin/am.c:561 msgid "fseek failed" msgstr "fseek gặp lỗi" -#: builtin/am.c:748 +#: builtin/am.c:749 #, c-format msgid "could not parse patch '%s'" msgstr "không thể phân tích cú pháp “%s”" -#: builtin/am.c:813 +#: builtin/am.c:814 msgid "Only one StGIT patch series can be applied at once" msgstr "Chỉ có một sê-ri miếng vá StGIT được áp dụng một lúc" -#: builtin/am.c:861 +#: builtin/am.c:862 msgid "invalid timestamp" msgstr "dấu thời gian không hợp lệ" -#: builtin/am.c:866 builtin/am.c:878 +#: builtin/am.c:867 builtin/am.c:879 msgid "invalid Date line" msgstr "dòng Ngày tháng không hợp lệ" -#: builtin/am.c:873 +#: builtin/am.c:874 msgid "invalid timezone offset" msgstr "độ lệch múi giờ không hợp lệ" -#: builtin/am.c:966 +#: builtin/am.c:967 msgid "Patch format detection failed." msgstr "Dò tìm định dạng miếng vá gặp lỗi." -#: builtin/am.c:971 builtin/clone.c:414 +#: builtin/am.c:972 builtin/clone.c:414 #, c-format msgid "failed to create directory '%s'" msgstr "tạo thư mục \"%s\" gặp lỗi" -#: builtin/am.c:976 +#: builtin/am.c:977 msgid "Failed to split patches." msgstr "Gặp lỗi khi chia nhỏ các miếng vá." -#: builtin/am.c:1125 +#: builtin/am.c:1126 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Khi bạn đã giải quyết xong trục trặc này, hãy chạy \"%s --continue\"." -#: builtin/am.c:1126 +#: builtin/am.c:1127 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "Nếu bạn muốn bỏ qua miếng vá này, hãy chạy lệnh \"%s --skip\" để thay thế." -#: builtin/am.c:1127 +#: builtin/am.c:1128 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "Để phục hồi lại nhánh gốc và dừng vá, hãy chạy \"%s --abort\"." -#: builtin/am.c:1222 +#: builtin/am.c:1223 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Miếng vá được gửi với format=flowed; khoảng trống ở cuối của các dòng có thể " "bị mất." -#: builtin/am.c:1250 +#: builtin/am.c:1251 msgid "Patch is empty." msgstr "Miếng vá trống rỗng." -#: builtin/am.c:1315 +#: builtin/am.c:1316 #, c-format msgid "missing author line in commit %s" msgstr "thiếu dòng tác giả trong lần chuyển gia %s" -#: builtin/am.c:1318 +#: builtin/am.c:1319 #, c-format msgid "invalid ident line: %.*s" msgstr "dòng định danh không hợp lệ: %.*s" -#: builtin/am.c:1537 +#: builtin/am.c:1538 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "Kho thiếu đối tượng blob cần thiết để thực hiện “3-way merge”." -#: builtin/am.c:1539 +#: builtin/am.c:1540 msgid "Using index info to reconstruct a base tree..." msgstr "" "Sử dụng thông tin trong bảng mục lục để cấu trúc lại một cây (tree) cơ sở…" -#: builtin/am.c:1558 +#: builtin/am.c:1559 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10504,24 +10538,24 @@ msgstr "" "Bạn đã sửa miếng vá của mình bằng cách thủ công à?\n" "Nó không thể áp dụng các blob đã được ghi lại trong bảng mục lục của nó." -#: builtin/am.c:1564 +#: builtin/am.c:1565 msgid "Falling back to patching base and 3-way merge..." msgstr "Đang dùng phương án dự phòng: vá bản cơ sở và “hòa trộn 3-đường”…" -#: builtin/am.c:1590 +#: builtin/am.c:1591 msgid "Failed to merge in the changes." msgstr "Gặp lỗi khi trộn vào các thay đổi." -#: builtin/am.c:1622 +#: builtin/am.c:1623 msgid "applying to an empty history" msgstr "áp dụng vào một lịch sử trống rỗng" -#: builtin/am.c:1674 builtin/am.c:1678 +#: builtin/am.c:1675 builtin/am.c:1679 #, c-format msgid "cannot resume: %s does not exist." msgstr "không thể phục hồi: %s không tồn tại." -#: builtin/am.c:1696 +#: builtin/am.c:1697 msgid "Commit Body is:" msgstr "Thân của lần chuyển giao là:" @@ -10529,41 +10563,41 @@ msgstr "Thân của lần chuyển giao là:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1706 +#: builtin/am.c:1707 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Áp dụng? đồng ý [y]/khô[n]g/chỉnh sửa [e]/hiển thị miếng [v]á/chấp nhận tất " "cả [a]: " -#: builtin/am.c:1752 builtin/commit.c:408 +#: builtin/am.c:1753 builtin/commit.c:408 msgid "unable to write index file" msgstr "không thể ghi tập tin lưu mục lục" -#: builtin/am.c:1756 +#: builtin/am.c:1757 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Bảng mục lục bẩn: không thể áp dụng các miếng vá (bẩn: %s)" -#: builtin/am.c:1796 builtin/am.c:1864 +#: builtin/am.c:1797 builtin/am.c:1865 #, c-format msgid "Applying: %.*s" msgstr "Áp dụng: %.*s" -#: builtin/am.c:1813 +#: builtin/am.c:1814 msgid "No changes -- Patch already applied." msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi." -#: builtin/am.c:1819 +#: builtin/am.c:1820 #, c-format msgid "Patch failed at %s %.*s" msgstr "Gặp lỗi khi vá tại %s %.*s" -#: builtin/am.c:1823 +#: builtin/am.c:1824 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "Dùng “git am --show-current-patch=diff” để xem miếng vá bị lỗi" -#: builtin/am.c:1867 +#: builtin/am.c:1868 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10574,7 +10608,7 @@ msgstr "" "đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỏ qua miếng " "vá này." -#: builtin/am.c:1874 +#: builtin/am.c:1875 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10587,17 +10621,17 @@ msgstr "" "Bạn có lẽ muốn chạy “git rm“ trên một tập tin để chấp nhận \"được xóa bởi họ" "\" cho nó." -#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347 +#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Không thể phân tích đối tượng “%s”." -#: builtin/am.c:2033 +#: builtin/am.c:2034 msgid "failed to clean index" msgstr "gặp lỗi khi dọn bảng mục lục" -#: builtin/am.c:2077 +#: builtin/am.c:2078 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10605,91 +10639,91 @@ msgstr "" "Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần “am” thất bại cuối cùng.\n" "Không thể chuyển tới ORIG_HEAD" -#: builtin/am.c:2184 +#: builtin/am.c:2185 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Giá trị không hợp lệ cho --patch-format: %s" -#: builtin/am.c:2226 +#: builtin/am.c:2227 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Giá trị không hợp lệ cho --show-current-patch: %s" -#: builtin/am.c:2230 +#: builtin/am.c:2231 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s xung khắc với --show-current-patch=%s" -#: builtin/am.c:2261 +#: builtin/am.c:2262 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<các tùy chọn>] [(<mbox>|<Maildir>)…]" -#: builtin/am.c:2262 +#: builtin/am.c:2263 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<các tùy chọn>] (--continue | --skip | --abort)" -#: builtin/am.c:2268 +#: builtin/am.c:2269 msgid "run interactively" msgstr "chạy kiểu tương tác" -#: builtin/am.c:2270 +#: builtin/am.c:2271 msgid "historical option -- no-op" msgstr "tùy chọn lịch sử -- không-toán-tử" -#: builtin/am.c:2272 +#: builtin/am.c:2273 msgid "allow fall back on 3way merging if needed" msgstr "cho phép quay trở lại để hòa trộn kiểu “3way” nếu cần" -#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16 -#: builtin/repack.c:472 builtin/stash.c:948 +#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:472 builtin/stash.c:945 msgid "be quiet" msgstr "im lặng" -#: builtin/am.c:2275 +#: builtin/am.c:2276 msgid "add a Signed-off-by trailer to the commit message" msgstr "thêm dòng Signed-off-by vào cuối ghi chú của lần chuyển giao" -#: builtin/am.c:2278 +#: builtin/am.c:2279 msgid "recode into utf8 (default)" msgstr "chuyển mã thành utf8 (mặc định)" -#: builtin/am.c:2280 +#: builtin/am.c:2281 msgid "pass -k flag to git-mailinfo" msgstr "chuyển cờ -k cho git-mailinfo" -#: builtin/am.c:2282 +#: builtin/am.c:2283 msgid "pass -b flag to git-mailinfo" msgstr "chuyển cờ -b cho git-mailinfo" -#: builtin/am.c:2284 +#: builtin/am.c:2285 msgid "pass -m flag to git-mailinfo" msgstr "chuyển cờ -m cho git-mailinfo" -#: builtin/am.c:2286 +#: builtin/am.c:2287 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "chuyển cờ --keep-cr cho git-mailsplit với định dạng mbox" -#: builtin/am.c:2289 +#: builtin/am.c:2290 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "đừng chuyển cờ --keep-cr cho git-mailsplit không phụ thuộc vào am.keepcr" -#: builtin/am.c:2292 +#: builtin/am.c:2293 msgid "strip everything before a scissors line" msgstr "cắt mọi thứ trước dòng scissors" -#: builtin/am.c:2294 +#: builtin/am.c:2295 msgid "pass it through git-mailinfo" msgstr "chuyển nó qua git-mailinfo" -#: builtin/am.c:2297 builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 -#: builtin/am.c:2309 builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 -#: builtin/am.c:2324 +#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307 +#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319 +#: builtin/am.c:2325 msgid "pass it through git-apply" msgstr "chuyển nó qua git-apply" -#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261 +#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 #: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 #: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 @@ -10698,67 +10732,67 @@ msgstr "chuyển nó qua git-apply" msgid "n" msgstr "n" -#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137 +#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137 #: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 #: builtin/verify-tag.c:38 msgid "format" msgstr "định dạng" -#: builtin/am.c:2321 +#: builtin/am.c:2322 msgid "format the patch(es) are in" msgstr "định dạng (các) miếng vá theo" -#: builtin/am.c:2327 +#: builtin/am.c:2328 msgid "override error message when patch failure occurs" msgstr "đè lên các lời nhắn lỗi khi xảy ra lỗi vá nghiêm trọng" -#: builtin/am.c:2329 +#: builtin/am.c:2330 msgid "continue applying patches after resolving a conflict" msgstr "tiếp tục áp dụng các miếng vá sau khi giải quyết xung đột" -#: builtin/am.c:2332 +#: builtin/am.c:2333 msgid "synonyms for --continue" msgstr "đồng nghĩa với --continue" -#: builtin/am.c:2335 +#: builtin/am.c:2336 msgid "skip the current patch" msgstr "bỏ qua miếng vá hiện hành" -#: builtin/am.c:2338 +#: builtin/am.c:2339 msgid "restore the original branch and abort the patching operation" msgstr "phục hồi lại nhánh gốc và loại bỏ thao tác vá" -#: builtin/am.c:2341 +#: builtin/am.c:2342 msgid "abort the patching operation but keep HEAD where it is" msgstr "bỏ qua thao tác vá nhưng vẫn giữ HEAD nơi nó chỉ đến" -#: builtin/am.c:2345 +#: builtin/am.c:2346 msgid "show the patch being applied" msgstr "hiển thị miếng vá đã được áp dụng rồi" -#: builtin/am.c:2350 +#: builtin/am.c:2351 msgid "lie about committer date" msgstr "nói dối về ngày chuyển giao" -#: builtin/am.c:2352 +#: builtin/am.c:2353 msgid "use current timestamp for author date" msgstr "dùng dấu thời gian hiện tại cho ngày tác giả" -#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630 +#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640 #: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 #: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 msgid "key-id" msgstr "mã-số-khóa" -#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396 +#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396 msgid "GPG-sign commits" msgstr "Các lần chuyển giao ký-GPG" -#: builtin/am.c:2358 +#: builtin/am.c:2359 msgid "(internal use for git-rebase)" msgstr "(dùng nội bộ cho git-rebase)" -#: builtin/am.c:2376 +#: builtin/am.c:2377 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." @@ -10766,16 +10800,16 @@ msgstr "" "Tùy chọn -b/--binary đã không dùng từ lâu rồi, và\n" "nó sẽ được bỏ đi. Xin đừng sử dụng nó thêm nữa." -#: builtin/am.c:2383 +#: builtin/am.c:2384 msgid "failed to read the index" msgstr "gặp lỗi đọc bảng mục lục" -#: builtin/am.c:2398 +#: builtin/am.c:2399 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "thư mục rebase trước %s không sẵn có nhưng mbox lại đưa ra." -#: builtin/am.c:2422 +#: builtin/am.c:2423 #, c-format msgid "" "Stray %s directory found.\n" @@ -10784,11 +10818,11 @@ msgstr "" "Tìm thấy thư mục lạc %s.\n" "Dùng \"git am --abort\" để loại bỏ nó đi." -#: builtin/am.c:2428 +#: builtin/am.c:2429 msgid "Resolve operation not in progress, we are not resuming." msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại." -#: builtin/am.c:2438 +#: builtin/am.c:2439 msgid "interactive mode requires patches on the command line" msgstr "chế độ tương tác yêu cầu có các miếng vá trên dòng lệnh" @@ -10882,36 +10916,36 @@ msgstr "không thể mở tập tin “%s” ở chế độ “%s”" msgid "could not write to file '%s'" msgstr "không thể ghi vào tập tin “%s”" -#: builtin/bisect--helper.c:153 +#: builtin/bisect--helper.c:155 #, c-format msgid "'%s' is not a valid term" msgstr "“%s” không phải một thời hạn hợp lệ" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:159 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "không thể dùng lệnh tích hợp “%s” như là một thời kỳ" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:169 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "không thể thay đổi nghĩa của thời kỳ “%s”" -#: builtin/bisect--helper.c:177 +#: builtin/bisect--helper.c:179 msgid "please use two different terms" msgstr "vui lòng dùng hai thời kỳ khác nhau" -#: builtin/bisect--helper.c:193 +#: builtin/bisect--helper.c:195 #, c-format msgid "We are not bisecting.\n" msgstr "Chúng tôi đang không bisect.\n" -#: builtin/bisect--helper.c:201 +#: builtin/bisect--helper.c:203 #, c-format msgid "'%s' is not a valid commit" msgstr "“%s” không phải một lần chuyển giao hợp lệ" -#: builtin/bisect--helper.c:210 +#: builtin/bisect--helper.c:212 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10919,27 +10953,27 @@ msgstr "" "không thể lấy ra HEAD nguyên thủy của “%s”. Hãy thử “git bisect reset <lần-" "chuyển-giao>”." -#: builtin/bisect--helper.c:254 +#: builtin/bisect--helper.c:256 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Đối số bisect_write sai: %s" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:261 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "không thể lấy oid của điểm xét duyệt “%s”" -#: builtin/bisect--helper.c:271 +#: builtin/bisect--helper.c:273 #, c-format msgid "couldn't open the file '%s'" msgstr "không thể mở tập tin “%s”" -#: builtin/bisect--helper.c:297 +#: builtin/bisect--helper.c:299 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Lệnh không hợp lệ: bạn hiện đang ở một bisect %s/%s" -#: builtin/bisect--helper.c:324 +#: builtin/bisect--helper.c:326 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10948,7 +10982,7 @@ msgstr "" "Bạn phải chỉ cho tôi ít nhất một điểm %s và một %s.\n" "Bạn có thể sử dụng \"git bisect %s\" và \"git bisect %s\" cho cái đó." -#: builtin/bisect--helper.c:328 +#: builtin/bisect--helper.c:330 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10959,7 +10993,7 @@ msgstr "" "Bạn sau đó cần phải chỉ cho tôi ít nhất một điểm xét duyệt %s và một %s.\n" "Bạn có thể sử dụng \"git bisect %s\" và \"git bisect %s\" cho chúng." -#: builtin/bisect--helper.c:348 +#: builtin/bisect--helper.c:350 #, c-format msgid "bisecting only with a %s commit" msgstr "chỉ thực hiện việc bisect với một lần chuyển giao %s" @@ -10968,15 +11002,15 @@ msgstr "chỉ thực hiện việc bisect với một lần chuyển giao %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:356 +#: builtin/bisect--helper.c:358 msgid "Are you sure [Y/n]? " msgstr "Bạn có chắc chắn chưa [Y/n]? " -#: builtin/bisect--helper.c:417 +#: builtin/bisect--helper.c:419 msgid "no terms defined" msgstr "chưa định nghĩa thời kỳ nào" -#: builtin/bisect--helper.c:420 +#: builtin/bisect--helper.c:422 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10985,7 +11019,7 @@ msgstr "" "Bạn hiện tại đang ở thời kỳ %s cho tình trạng cũ\n" "và %s cho tình trạng mới.\n" -#: builtin/bisect--helper.c:430 +#: builtin/bisect--helper.c:432 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10994,52 +11028,52 @@ msgstr "" "tham số không hợp lệ %s cho “git bisect terms”.\n" "Các tùy chọn hỗ trợ là: --term-good|--term-old và --term-bad|--term-new." -#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021 +#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023 msgid "revision walk setup failed\n" msgstr "gặp lỗi cài đặt việc di chuyển qua các điểm xét duyệt\n" -#: builtin/bisect--helper.c:519 +#: builtin/bisect--helper.c:521 #, c-format msgid "could not open '%s' for appending" msgstr "không thể mở “%s” để nối thêm" -#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653 msgid "'' is not a valid term" msgstr "” không phải một thời hạn hợp lệ" -#: builtin/bisect--helper.c:661 +#: builtin/bisect--helper.c:663 #, c-format msgid "unrecognized option: '%s'" msgstr "tùy chọn không được thừa nhận: “%s”" -#: builtin/bisect--helper.c:665 +#: builtin/bisect--helper.c:667 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "“%s” không có vẻ như là một điểm xét duyệt hợp lệ" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:698 msgid "bad HEAD - I need a HEAD" msgstr "sai HEAD - Tôi cần một HEAD" -#: builtin/bisect--helper.c:711 +#: builtin/bisect--helper.c:713 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "lấy ra “%s” ra gặp lỗi. Hãy thử \"git bisect reset <nhánh_hợp_lệ>\"." -#: builtin/bisect--helper.c:732 +#: builtin/bisect--helper.c:734 msgid "won't bisect on cg-seek'ed tree" msgstr "sẽ không di chuyển nửa bước trên cây được cg-seek" -#: builtin/bisect--helper.c:735 +#: builtin/bisect--helper.c:737 msgid "bad HEAD - strange symbolic ref" msgstr "sai HEAD - tham chiếu mềm kỳ lạ" -#: builtin/bisect--helper.c:755 +#: builtin/bisect--helper.c:757 #, c-format msgid "invalid ref: '%s'" msgstr "refspec không hợp lệ: “%s”" -#: builtin/bisect--helper.c:813 +#: builtin/bisect--helper.c:815 msgid "You need to start by \"git bisect start\"\n" msgstr "Bạn cần khởi đầu bằng \"git bisect start\"\n" @@ -11047,105 +11081,105 @@ msgstr "Bạn cần khởi đầu bằng \"git bisect start\"\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:824 +#: builtin/bisect--helper.c:826 msgid "Do you want me to do it for you [Y/n]? " msgstr "Bạn có muốn tôi thực hiện điều này cho bạn không [Y/n]? " -#: builtin/bisect--helper.c:842 +#: builtin/bisect--helper.c:844 msgid "Please call `--bisect-state` with at least one argument" msgstr "Hãy gọi “--bisect-state” với ít nhất một đối số" -#: builtin/bisect--helper.c:855 +#: builtin/bisect--helper.c:857 #, c-format msgid "'git bisect %s' can take only one argument." msgstr "“git bisect %s” có thể lấy chỉ một đối số." -#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880 +#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882 #, c-format msgid "Bad rev input: %s" msgstr "Đầu vào rev sai: %s" -#: builtin/bisect--helper.c:887 +#: builtin/bisect--helper.c:889 #, c-format msgid "Bad rev input (not a commit): %s" msgstr "Đầu vào rev sai (không phải là lần chuyển giao): %s" -#: builtin/bisect--helper.c:919 +#: builtin/bisect--helper.c:921 msgid "We are not bisecting." msgstr "Chúng tôi không bisect." -#: builtin/bisect--helper.c:969 +#: builtin/bisect--helper.c:971 #, c-format msgid "'%s'?? what are you talking about?" msgstr "'%s'?? bạn đang nói gì thế?" -#: builtin/bisect--helper.c:981 +#: builtin/bisect--helper.c:983 #, c-format msgid "cannot read file '%s' for replaying" msgstr "không thể đọc tập tin '%s' để thao diễn lại" -#: builtin/bisect--helper.c:1054 +#: builtin/bisect--helper.c:1056 msgid "reset the bisection state" msgstr "đặt lại trạng di chuyển nửa bước" -#: builtin/bisect--helper.c:1056 +#: builtin/bisect--helper.c:1058 msgid "check whether bad or good terms exist" msgstr "kiểm tra xem các thời điểm xấu/tốt có tồn tại không" -#: builtin/bisect--helper.c:1058 +#: builtin/bisect--helper.c:1060 msgid "print out the bisect terms" msgstr "in ra các thời điểm di chuyển nửa bước" -#: builtin/bisect--helper.c:1060 +#: builtin/bisect--helper.c:1062 msgid "start the bisect session" msgstr "bắt đầu phiên di chuyển nửa bước" -#: builtin/bisect--helper.c:1062 +#: builtin/bisect--helper.c:1064 msgid "find the next bisection commit" msgstr "tìm lần chuyển giao không di chuyển phân đôi" -#: builtin/bisect--helper.c:1064 +#: builtin/bisect--helper.c:1066 msgid "mark the state of ref (or refs)" msgstr "đánh dấu trạng thái ref (hoặc refs)" -#: builtin/bisect--helper.c:1066 +#: builtin/bisect--helper.c:1068 msgid "list the bisection steps so far" msgstr "liệt kê các bước bisection đi quá xa" -#: builtin/bisect--helper.c:1068 +#: builtin/bisect--helper.c:1070 msgid "replay the bisection process from the given file" msgstr "phát lại quá trình bisection từ tệp đã cho" -#: builtin/bisect--helper.c:1070 +#: builtin/bisect--helper.c:1072 msgid "skip some commits for checkout" msgstr "bỏ qua một số lần chuyển giao để lấy ra" -#: builtin/bisect--helper.c:1072 +#: builtin/bisect--helper.c:1074 msgid "no log for BISECT_WRITE" msgstr "không có nhật ký cho BISECT_WRITE" -#: builtin/bisect--helper.c:1087 +#: builtin/bisect--helper.c:1089 msgid "--bisect-reset requires either no argument or a commit" msgstr "" "--bisect-reset requires không nhận đối số cũng không nhận lần chuyển giao" -#: builtin/bisect--helper.c:1092 +#: builtin/bisect--helper.c:1094 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check cần 2 hoặc 3 tham số" -#: builtin/bisect--helper.c:1098 +#: builtin/bisect--helper.c:1100 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms cần 0 hoặc 1 tham số" -#: builtin/bisect--helper.c:1107 +#: builtin/bisect--helper.c:1109 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next cần 0 tham số" -#: builtin/bisect--helper.c:1118 +#: builtin/bisect--helper.c:1120 msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log cần 0 tham số" -#: builtin/bisect--helper.c:1123 +#: builtin/bisect--helper.c:1125 msgid "no logfile given" msgstr "chưa chỉ ra tập tin ghi nhật ký" @@ -11201,7 +11235,7 @@ msgstr "hiển thị thống kê công sức làm việc" #: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 #: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 #: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 -#: builtin/push.c:575 builtin/send-pack.c:198 +#: builtin/push.c:566 builtin/send-pack.c:198 msgid "force progress reporting" msgstr "ép buộc báo cáo tiến triển công việc" @@ -11249,7 +11283,7 @@ msgstr "hiển thị thư điện tử của tác giả thay cho tên (Mặc đ msgid "ignore whitespace differences" msgstr "bỏ qua các khác biệt do khoảng trắng gây ra" -#: builtin/blame.c:883 builtin/log.c:1820 +#: builtin/blame.c:883 builtin/log.c:1823 msgid "rev" msgstr "rev" @@ -11838,19 +11872,19 @@ msgstr "git bundle list-heads <tập tin> [<tên tham chiếu>…]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <tập tin> [<tên tham chiếu>…]" -#: builtin/bundle.c:67 builtin/pack-objects.c:3747 +#: builtin/bundle.c:67 builtin/pack-objects.c:3907 msgid "do not show progress meter" msgstr "không hiển thị bộ đo tiến trình" -#: builtin/bundle.c:69 builtin/pack-objects.c:3749 +#: builtin/bundle.c:69 builtin/pack-objects.c:3909 msgid "show progress meter" msgstr "hiển thị bộ đo tiến trình" -#: builtin/bundle.c:71 builtin/pack-objects.c:3751 +#: builtin/bundle.c:71 builtin/pack-objects.c:3911 msgid "show progress meter during object writing phase" msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng" -#: builtin/bundle.c:74 builtin/pack-objects.c:3754 +#: builtin/bundle.c:74 builtin/pack-objects.c:3914 msgid "similar to --all-progress when progress meter is shown" msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện" @@ -11862,29 +11896,29 @@ msgstr "chỉ điịnh định dạng cho bundle" msgid "Need a repository to create a bundle." msgstr "Cần một kho chứa để có thể tạo một bundle." -#: builtin/bundle.c:107 +#: builtin/bundle.c:109 msgid "do not show bundle details" msgstr "không hiển thị chi tiết bundle (bó)" -#: builtin/bundle.c:122 +#: builtin/bundle.c:128 #, c-format msgid "%s is okay\n" msgstr "“%s” tốt\n" -#: builtin/bundle.c:163 +#: builtin/bundle.c:179 msgid "Need a repository to unbundle." msgstr "Cần một kho chứa để có thể giải nén một bundle." -#: builtin/bundle.c:171 builtin/remote.c:1700 +#: builtin/bundle.c:191 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "chi tiết; phải được đặt trước một lệnh-con" -#: builtin/bundle.c:193 builtin/remote.c:1731 +#: builtin/bundle.c:213 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "Không hiểu câu lệnh con: %s" -#: builtin/cat-file.c:598 +#: builtin/cat-file.c:596 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -11892,7 +11926,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <kiểu> | --textconv) | --filters) [--path=<đường/dẫn>] <đối_tượng>" -#: builtin/cat-file.c:599 +#: builtin/cat-file.c:597 msgid "" "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" "symlinks] [--textconv | --filters]" @@ -11900,72 +11934,72 @@ msgstr "" "git cat-file (--batch[=<định dạng>] | --batch-check[=<định dạng>]) [--follow-" "symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:620 +#: builtin/cat-file.c:618 msgid "only one batch option may be specified" msgstr "chỉ một tùy chọn batch được chỉ ra" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:636 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<kiểu> là một trong số: blob, tree, commit hoặc tag" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:637 msgid "show object type" msgstr "hiển thị kiểu đối tượng" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:638 msgid "show object size" msgstr "hiển thị kích thước đối tượng" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:640 msgid "exit with zero when there's no error" msgstr "thoát với 0 khi không có lỗi" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:641 msgid "pretty-print object's content" msgstr "in nội dung đối tượng dạng dễ đọc" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:643 msgid "for blob objects, run textconv on object's content" msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung của đối tượng" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:645 msgid "for blob objects, run filters on object's content" msgstr "với đối tượng blob, chạy lệnh filters trên nội dung của đối tượng" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:646 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:647 msgid "use a specific path for --textconv/--filters" msgstr "dùng một đường dẫn rõ ràng cho --textconv/--filters" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:649 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "cho phép -s và -t để làm việc với các đối tượng sai/hỏng" -#: builtin/cat-file.c:652 +#: builtin/cat-file.c:650 msgid "buffer --batch output" msgstr "đệm kết xuất --batch" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:652 msgid "show info and content of objects fed from the standard input" msgstr "" "hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:656 msgid "show info about objects fed from the standard input" msgstr "hiển thị các thông tin về đối tượng fed từ đầu vào tiêu chuẩn" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:660 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "theo liên kết mềm trong-cây (được dùng với --batch hay --batch-check)" -#: builtin/cat-file.c:664 +#: builtin/cat-file.c:662 msgid "show all objects with --batch or --batch-check" msgstr "hiển thị mọi đối tượng với --batch hay --batch-check" -#: builtin/cat-file.c:666 +#: builtin/cat-file.c:664 msgid "do not order --batch-all-objects output" msgstr "đừng sắp xếp đầu ra --batch-all-objects" @@ -11994,7 +12028,7 @@ msgid "terminate input and output records by a NUL character" msgstr "chấm dứt các bản ghi vào và ra bằng ký tự NULL" #: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 -#: builtin/worktree.c:491 +#: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "chặn các báo cáo tiến trình hoạt động" @@ -12052,9 +12086,10 @@ msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<các tùy chọn>]" #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/submodule--helper.c:1825 -#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836 -#: builtin/submodule--helper.c:2334 builtin/worktree.c:719 +#: builtin/column.c:31 builtin/submodule--helper.c:1824 +#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835 +#: builtin/submodule--helper.c:2333 builtin/worktree.c:491 +#: builtin/worktree.c:728 msgid "string" msgstr "chuỗi" @@ -12227,7 +12262,7 @@ msgstr "Không thể thực hiện reflog cho “%s”: %s\n" msgid "HEAD is now at" msgstr "HEAD hiện giờ tại" -#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "không thể cập nhật HEAD" @@ -12356,7 +12391,7 @@ msgstr "chỉ cần một tham chiếu" msgid "only one reference expected, %d given." msgstr "chỉ cần một tham chiếu, nhưng lại đưa ra %d." -#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438 +#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "tham chiếu không hợp lệ: %s" @@ -12465,7 +12500,7 @@ msgstr "thiếu tham số là nhánh hoặc lần chuyển giao" msgid "perform a 3-way merge with the new branch" msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới" -#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323 +#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323 msgid "style" msgstr "kiểu" @@ -12558,7 +12593,7 @@ msgstr "git checkout: --detach không nhận một đối số đường dẫn msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file xung khắc với --detach" -#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634 +#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file xung khắc với --patch" @@ -12576,7 +12611,7 @@ msgstr "bạn phải chỉ định các thư mục muốn hồi phục" #: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 #: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484 #: builtin/worktree.c:486 msgid "branch" msgstr "nhánh" @@ -12669,7 +12704,7 @@ msgstr "Nên bỏ qua kho chứa %s\n" msgid "could not lstat %s\n" msgstr "không thể lấy thông tin thống kê đầy đủ của %s\n" -#: builtin/clean.c:302 git-add--interactive.perl:593 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12682,7 +12717,7 @@ msgstr "" "foo - chọn mục trên cơ sở tiền tố duy nhất\n" " - (để trống) không chọn gì cả\n" -#: builtin/clean.c:306 git-add--interactive.perl:602 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12703,33 +12738,33 @@ msgstr "" "* - chọn tất\n" " - (để trống) kết thúc việc chọn\n" -#: builtin/clean.c:521 git-add--interactive.perl:568 +#: builtin/clean.c:519 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Hả (%s)?\n" -#: builtin/clean.c:661 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "Mẫu để lọc các tập tin đầu vào cần lờ đi>> " -#: builtin/clean.c:696 +#: builtin/clean.c:693 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "CẢNH BÁO: Không tìm thấy các mục được khớp bởi: %s" -#: builtin/clean.c:717 +#: builtin/clean.c:714 msgid "Select items to delete" msgstr "Chọn mục muốn xóa" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:755 #, c-format msgid "Remove %s [y/N]? " msgstr "Xóa bỏ “%s” [y/N]? " -#: builtin/clean.c:789 +#: builtin/clean.c:786 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12747,51 +12782,51 @@ msgstr "" "help - hiển thị chính trợ giúp này\n" "? - trợ giúp dành cho chọn bằng cách nhắc" -#: builtin/clean.c:825 +#: builtin/clean.c:822 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Có muốn gỡ bỏ (các) mục sau đây không:" -#: builtin/clean.c:841 +#: builtin/clean.c:838 msgid "No more files to clean, exiting." msgstr "Không còn tập-tin nào để dọn dẹp, đang thoát ra." -#: builtin/clean.c:903 +#: builtin/clean.c:900 msgid "do not print names of files removed" msgstr "không hiển thị tên của các tập tin đã gỡ bỏ" -#: builtin/clean.c:905 +#: builtin/clean.c:902 msgid "force" msgstr "ép buộc" -#: builtin/clean.c:906 +#: builtin/clean.c:903 msgid "interactive cleaning" msgstr "dọn bằng kiểu tương tác" -#: builtin/clean.c:908 +#: builtin/clean.c:905 msgid "remove whole directories" msgstr "gỡ bỏ toàn bộ thư mục" -#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186 +#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186 #: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "mẫu" -#: builtin/clean.c:910 +#: builtin/clean.c:907 msgid "add <pattern> to ignore rules" msgstr "thêm <mẫu> vào trong qui tắc bỏ qua" -#: builtin/clean.c:911 +#: builtin/clean.c:908 msgid "remove ignored files, too" msgstr "đồng thời gỡ bỏ cả các tập tin bị bỏ qua" -#: builtin/clean.c:913 +#: builtin/clean.c:910 msgid "remove only ignored files" msgstr "chỉ gỡ bỏ những tập tin bị bỏ qua" -#: builtin/clean.c:929 +#: builtin/clean.c:925 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -12799,7 +12834,7 @@ msgstr "" "clean.requireForce được đặt thành true và không đưa ra tùy chọn -i, -n mà " "cũng không -f; từ chối lệnh dọn dẹp (clean)" -#: builtin/clean.c:932 +#: builtin/clean.c:928 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -12807,7 +12842,7 @@ msgstr "" "clean.requireForce mặc định được đặt là true và không đưa ra tùy chọn -i, -n " "mà cũng không -f; từ chối lệnh dọn dẹp (clean)" -#: builtin/clean.c:944 +#: builtin/clean.c:940 msgid "-x and -X cannot be used together" msgstr "-x và -X không thể dùng cùng nhau" @@ -12823,7 +12858,7 @@ msgstr "đừng nhân bản từ kho nông" msgid "don't create a checkout" msgstr "không tạo một checkout" -#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542 msgid "create a bare repository" msgstr "tạo kho thuần" @@ -12855,26 +12890,26 @@ msgstr "khởi tạo mô-đun-con trong bản sao" msgid "number of submodules cloned in parallel" msgstr "số lượng mô-đun-con được nhân bản đồng thời" -#: builtin/clone.c:116 builtin/init-db.c:538 +#: builtin/clone.c:116 builtin/init-db.c:539 msgid "template-directory" msgstr "thư-mục-mẫu" -#: builtin/clone.c:117 builtin/init-db.c:539 +#: builtin/clone.c:117 builtin/init-db.c:540 msgid "directory from which templates will be used" msgstr "thư mục mà tại đó các mẫu sẽ được dùng" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832 -#: builtin/submodule--helper.c:2337 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "kho tham chiếu" -#: builtin/clone.c:123 builtin/submodule--helper.c:1834 -#: builtin/submodule--helper.c:2339 +#: builtin/clone.c:123 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "chỉ dùng --reference khi nhân bản" -#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495 +#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495 #: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 msgid "name" msgstr "tên" @@ -12891,7 +12926,7 @@ msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ" msgid "path to git-upload-pack on the remote" msgstr "đường dẫn đến git-upload-pack trên máy chủ" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862 #: builtin/pull.c:208 msgid "depth" msgstr "độ-sâu" @@ -12900,7 +12935,7 @@ msgstr "độ-sâu" msgid "create a shallow clone of that depth" msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho" -#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964 #: builtin/pull.c:211 msgid "time" msgstr "thời-gian" @@ -12918,8 +12953,8 @@ msgstr "điểm xét duyệt" msgid "deepen history of shallow clone, excluding rev" msgstr "làm sâu hơn lịch sử của bản sao shallow, bằng điểm xét duyệt loại trừ" -#: builtin/clone.c:137 builtin/submodule--helper.c:1844 -#: builtin/submodule--helper.c:2353 +#: builtin/clone.c:137 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch" @@ -12933,11 +12968,11 @@ msgstr "" msgid "any cloned submodules will be shallow" msgstr "mọi mô-đun-con nhân bản sẽ là shallow (nông)" -#: builtin/clone.c:142 builtin/init-db.c:547 +#: builtin/clone.c:142 builtin/init-db.c:548 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:143 builtin/init-db.c:548 +#: builtin/clone.c:143 builtin/init-db.c:549 msgid "separate git dir from working tree" msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc" @@ -12950,22 +12985,22 @@ msgid "set config inside the new repository" msgstr "đặt cấu hình bên trong một kho chứa mới" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 +#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196 msgid "server-specific" msgstr "đặc-tả-máy-phục-vụ" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 +#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197 msgid "option to transmit" msgstr "tùy chọn để chuyển giao" #: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 -#: builtin/push.c:585 +#: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "chỉ dùng địa chỉ IPv4" #: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 -#: builtin/push.c:587 +#: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "chỉ dùng địa chỉ IPv6" @@ -13064,7 +13099,7 @@ msgstr "không thể đóng gói để dọn dẹp" msgid "cannot unlink temporary alternates file" msgstr "không thể bỏ liên kết tập tin thay thế tạm thời" -#: builtin/clone.c:1001 builtin/receive-pack.c:2491 +#: builtin/clone.c:1001 builtin/receive-pack.c:2490 msgid "Too many arguments." msgstr "Có quá nhiều đối số." @@ -13086,7 +13121,7 @@ msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau." msgid "repository '%s' does not exist" msgstr "kho chứa “%s” chưa tồn tại" -#: builtin/clone.c:1039 builtin/fetch.c:2011 +#: builtin/clone.c:1039 builtin/fetch.c:2014 #, c-format msgid "depth %s is not a positive number" msgstr "độ sâu %s không phải là một số nguyên dương" @@ -13108,7 +13143,7 @@ msgid "working tree '%s' already exists." msgstr "cây làm việc “%s” đã sẵn tồn tại rồi." #: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 -#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312 #, c-format msgid "could not create leading directories of '%s'" msgstr "không thể tạo các thư mục dẫn đầu của “%s”" @@ -13170,12 +13205,16 @@ msgstr "kho nguồn là nông, nên bỏ qua --local" msgid "--local is ignored" msgstr "--local bị lờ đi" -#: builtin/clone.c:1337 builtin/clone.c:1345 +#: builtin/clone.c:1324 builtin/clone.c:1383 +msgid "remote transport reported error" +msgstr "vận chuyển máy mạng đã báo cáo lỗi" + +#: builtin/clone.c:1336 builtin/clone.c:1344 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s" -#: builtin/clone.c:1348 +#: builtin/clone.c:1347 msgid "You appear to have cloned an empty repository." msgstr "Bạn hình như là đã nhân bản một kho trống rỗng." @@ -13235,7 +13274,7 @@ msgid "could not find object directory matching %s" msgstr "không thể tìm thấy thư mục đối tượng khớp với “%s”" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776 +#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779 msgid "dir" msgstr "tmục" @@ -13338,7 +13377,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "cha mẹ bị trùng lặp %s đã bị bỏ qua" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562 #, c-format msgid "not a valid object name %s" msgstr "không phải là tên đối tượng hợp lệ “%s”" @@ -13366,13 +13405,13 @@ msgstr "cha-mẹ" msgid "id of a parent commit object" msgstr "mã số của đối tượng chuyển giao cha mẹ" -#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605 +#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601 #: builtin/tag.c:456 msgid "message" msgstr "chú thích" -#: builtin/commit-tree.c:115 builtin/commit.c:1614 +#: builtin/commit-tree.c:115 builtin/commit.c:1624 msgid "commit message" msgstr "chú thích của lần chuyển giao" @@ -13380,7 +13419,7 @@ msgstr "chú thích của lần chuyển giao" msgid "read commit log message from file" msgstr "đọc chú thích nhật ký lần chuyển giao từ tập tin" -#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299 +#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "Ký lần chuyển giao dùng GPG" @@ -13536,7 +13575,7 @@ msgstr "" "không thể chọn một ký tự ghi chú cái mà không được dùng\n" "trong phần ghi chú hiện tại" -#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158 +#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165 #, c-format msgid "could not lookup commit %s" msgstr "không thể tìm kiếm commit (lần chuyển giao) %s" @@ -13572,7 +13611,49 @@ msgstr "không thể đọc MERGE_MSG" msgid "could not write commit template" msgstr "không thể ghi mẫu chuyển giao" -#: builtin/commit.c:900 +#: builtin/commit.c:893 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored.\n" +msgstr "" +"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những\n" +"dòng được bắt đầu bằng “%c” sẽ được bỏ qua.\n" + +#: builtin/commit.c:895 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những dòng " +"được\n" +"bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần " +"chuyển giao.\n" + +#: builtin/commit.c:899 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +msgstr "" +"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những dòng " +"được\n" +"bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n" + +#: builtin/commit.c:903 +#, c-format +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '%c' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những dòng " +"được\n" +"bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n" +"Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao.\n" + +#: builtin/commit.c:915 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -13586,7 +13667,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "và thử lại.\n" -#: builtin/commit.c:905 +#: builtin/commit.c:920 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13600,99 +13681,76 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "và thử lại.\n" -#: builtin/commit.c:915 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be ignored, and an empty message aborts the commit.\n" -msgstr "" -"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những dòng " -"được\n" -"bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần " -"chuyển giao.\n" - -#: builtin/commit.c:923 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be kept; you may remove them yourself if you want to.\n" -"An empty message aborts the commit.\n" -msgstr "" -"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những dòng " -"được\n" -"bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n" -"Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao.\n" - -#: builtin/commit.c:940 +#: builtin/commit.c:947 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sTác giả: %.*s <%.*s>" -#: builtin/commit.c:948 +#: builtin/commit.c:955 #, c-format msgid "%sDate: %s" msgstr "%sNgày tháng: %s" -#: builtin/commit.c:955 +#: builtin/commit.c:962 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sNgười chuyển giao: %.*s <%.*s>" -#: builtin/commit.c:973 +#: builtin/commit.c:980 msgid "Cannot read index" msgstr "Không đọc được bảng mục lục" -#: builtin/commit.c:1018 +#: builtin/commit.c:1025 msgid "unable to pass trailers to --trailers" msgstr "không thể chuyển phần đuôi cho “--trailers”" -#: builtin/commit.c:1058 +#: builtin/commit.c:1065 msgid "Error building trees" msgstr "Gặp lỗi khi xây dựng cây" -#: builtin/commit.c:1072 builtin/tag.c:319 +#: builtin/commit.c:1079 builtin/tag.c:319 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Xin hãy cung cấp lời chú giải hoặc là dùng tùy chọn -m hoặc là -F.\n" -#: builtin/commit.c:1116 +#: builtin/commit.c:1123 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author “%s” không phải là “Họ và tên <thư điện tửl>” và không khớp bất kỳ " "tác giả nào sẵn có" -#: builtin/commit.c:1130 +#: builtin/commit.c:1137 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Chế độ bỏ qua không hợp lệ “%s”" -#: builtin/commit.c:1148 builtin/commit.c:1441 +#: builtin/commit.c:1155 builtin/commit.c:1448 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Chế độ cho các tập tin chưa được theo dõi không hợp lệ “%s”" -#: builtin/commit.c:1188 +#: builtin/commit.c:1195 msgid "--long and -z are incompatible" msgstr "hai tùy chọn -long và -z không tương thích với nhau" -#: builtin/commit.c:1219 +#: builtin/commit.c:1226 msgid "You are in the middle of a merge -- cannot reword." msgstr "" "Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “reword”." -#: builtin/commit.c:1221 +#: builtin/commit.c:1228 msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "" "Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc " "“reword”." -#: builtin/commit.c:1224 +#: builtin/commit.c:1231 #, c-format msgid "cannot combine reword option of --fixup with path '%s'" msgstr "không thể tổ hợp tùy chọn \"reword\" của --fixup với đường dẫn '%s'" -#: builtin/commit.c:1226 +#: builtin/commit.c:1233 msgid "" "reword option of --fixup is mutually exclusive with --patch/--interactive/--" "all/--include/--only" @@ -13700,109 +13758,109 @@ msgstr "" "tùy chọn \"reword\" của --fixup là loại trừ qua lại với --patch/--" "interactive/--all/--include/--only" -#: builtin/commit.c:1245 +#: builtin/commit.c:1252 msgid "Using both --reset-author and --author does not make sense" msgstr "Sử dụng cả hai tùy chọn --reset-author và --author không hợp lý" -#: builtin/commit.c:1254 +#: builtin/commit.c:1261 msgid "You have nothing to amend." msgstr "Không có gì để mà “tu bổ” cả." -#: builtin/commit.c:1257 +#: builtin/commit.c:1264 msgid "You are in the middle of a merge -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “tu bổ”." -#: builtin/commit.c:1259 +#: builtin/commit.c:1266 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc “tu " "bổ”." -#: builtin/commit.c:1261 +#: builtin/commit.c:1268 msgid "You are in the middle of a rebase -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình cải tổ -- nên không thể thực hiện việc “tu bổ”." -#: builtin/commit.c:1264 +#: builtin/commit.c:1271 msgid "Options --squash and --fixup cannot be used together" msgstr "Các tùy chọn --squash và --fixup không thể sử dụng cùng với nhau" -#: builtin/commit.c:1274 +#: builtin/commit.c:1281 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Chỉ được dùng một trong số tùy chọn trong số -c/-C/-F/--fixup." -#: builtin/commit.c:1276 +#: builtin/commit.c:1283 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Tùy chọn -m không thể được tổ hợp cùng với -c/-C/-F." -#: builtin/commit.c:1285 +#: builtin/commit.c:1292 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "--reset-author chỉ có thể được sử dụng với tùy chọn -C, -c hay --amend." -#: builtin/commit.c:1303 +#: builtin/commit.c:1310 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Chỉ một trong các tùy chọn --include/--only/--all/--interactive/--patch được " "sử dụng." -#: builtin/commit.c:1331 +#: builtin/commit.c:1338 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "không hiểu tùy chọn: --fixup=%s:%s" -#: builtin/commit.c:1345 +#: builtin/commit.c:1352 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "các đường dẫn “%s …” với tùy chọn -a không hợp lý" -#: builtin/commit.c:1476 builtin/commit.c:1642 +#: builtin/commit.c:1483 builtin/commit.c:1652 msgid "show status concisely" msgstr "hiển thị trạng thái ở dạng súc tích" -#: builtin/commit.c:1478 builtin/commit.c:1644 +#: builtin/commit.c:1485 builtin/commit.c:1654 msgid "show branch information" msgstr "hiển thị thông tin nhánh" -#: builtin/commit.c:1480 +#: builtin/commit.c:1487 msgid "show stash information" msgstr "hiển thị thông tin về tạm cất" -#: builtin/commit.c:1482 builtin/commit.c:1646 +#: builtin/commit.c:1489 builtin/commit.c:1656 msgid "compute full ahead/behind values" msgstr "tính đầy đủ giá trị trước/sau" -#: builtin/commit.c:1484 +#: builtin/commit.c:1491 msgid "version" msgstr "phiên bản" -#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560 -#: builtin/worktree.c:681 +#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551 +#: builtin/worktree.c:690 msgid "machine-readable output" msgstr "kết xuất dạng máy-có-thể-đọc" -#: builtin/commit.c:1487 builtin/commit.c:1650 +#: builtin/commit.c:1494 builtin/commit.c:1660 msgid "show status in long format (default)" msgstr "hiển thị trạng thái ở định dạng dài (mặc định)" -#: builtin/commit.c:1490 builtin/commit.c:1653 +#: builtin/commit.c:1497 builtin/commit.c:1663 msgid "terminate entries with NUL" msgstr "chấm dứt các mục bằng NUL" -#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656 +#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666 #: builtin/fast-export.c:1198 builtin/fast-export.c:1201 #: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 msgid "mode" msgstr "chế độ" -#: builtin/commit.c:1493 builtin/commit.c:1656 +#: builtin/commit.c:1500 builtin/commit.c:1666 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "hiển thị các tập tin chưa được theo dõi dấu vết, các chế độ tùy chọn: all, " "normal, no. (Mặc định: all)" -#: builtin/commit.c:1497 +#: builtin/commit.c:1504 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13810,11 +13868,11 @@ msgstr "" "hiển thị các tập tin bị bỏ qua, các chế độ tùy chọn: traditional, matching, " "no. (Mặc định: traditional)" -#: builtin/commit.c:1499 parse-options.h:193 +#: builtin/commit.c:1506 parse-options.h:193 msgid "when" msgstr "khi" -#: builtin/commit.c:1500 +#: builtin/commit.c:1507 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -13822,199 +13880,199 @@ msgstr "" "bỏ qua các thay đổi trong mô-đun-con, tùy chọn khi: all, dirty, untracked. " "(Mặc định: all)" -#: builtin/commit.c:1502 +#: builtin/commit.c:1509 msgid "list untracked files in columns" msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong các cột" -#: builtin/commit.c:1503 +#: builtin/commit.c:1510 msgid "do not detect renames" msgstr "không dò tìm các tên thay đổi" -#: builtin/commit.c:1505 +#: builtin/commit.c:1512 msgid "detect renames, optionally set similarity index" msgstr "dò các tên thay đổi, tùy ý đặt mục lục tương tự" -#: builtin/commit.c:1525 +#: builtin/commit.c:1535 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Không hỗ trỡ tổ hợp các tham số các tập tin bị bỏ qua và không được theo dõi" -#: builtin/commit.c:1607 +#: builtin/commit.c:1617 msgid "suppress summary after successful commit" msgstr "không hiển thị tổng kết sau khi chuyển giao thành công" -#: builtin/commit.c:1608 +#: builtin/commit.c:1618 msgid "show diff in commit message template" msgstr "hiển thị sự khác biệt trong mẫu tin nhắn chuyển giao" -#: builtin/commit.c:1610 +#: builtin/commit.c:1620 msgid "Commit message options" msgstr "Các tùy chọn ghi chú commit" -#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458 +#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458 msgid "read message from file" msgstr "đọc chú thích từ tập tin" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "author" msgstr "tác giả" -#: builtin/commit.c:1612 +#: builtin/commit.c:1622 msgid "override author for commit" msgstr "ghi đè tác giả cho commit" -#: builtin/commit.c:1613 builtin/gc.c:550 +#: builtin/commit.c:1623 builtin/gc.c:550 msgid "date" msgstr "ngày tháng" -#: builtin/commit.c:1613 +#: builtin/commit.c:1623 msgid "override date for commit" msgstr "ghi đè ngày tháng cho lần chuyển giao" -#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622 +#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632 #: parse-options.h:329 ref-filter.h:90 msgid "commit" msgstr "lần_chuyển_giao" -#: builtin/commit.c:1615 +#: builtin/commit.c:1625 msgid "reuse and edit message from specified commit" msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho nhưng có cho sửa chữa" -#: builtin/commit.c:1616 +#: builtin/commit.c:1626 msgid "reuse message from specified commit" msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c:1621 +#: builtin/commit.c:1631 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]commit" -#: builtin/commit.c:1621 +#: builtin/commit.c:1631 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" "dùng ghi chú có định dạng autosquash để sửa chữa hoặc tu bổ/reword lần " "chuyển giao đã chỉ ra" -#: builtin/commit.c:1622 +#: builtin/commit.c:1632 msgid "use autosquash formatted message to squash specified commit" msgstr "" "dùng lời nhắn có định dạng tự động nén để nén lại các lần chuyển giao đã chỉ " "ra" -#: builtin/commit.c:1623 +#: builtin/commit.c:1633 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "lần chuyển giao nhận tôi là tác giả (được dùng với tùy chọn -C/-c/--amend)" -#: builtin/commit.c:1624 builtin/interpret-trailers.c:111 +#: builtin/commit.c:1634 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "bộ dò vết" -#: builtin/commit.c:1624 +#: builtin/commit.c:1634 msgid "add custom trailer(s)" msgstr "thêm đuôi tự chọn" -#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302 +#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "thêm dòng Signed-off-by vào cuối" -#: builtin/commit.c:1626 +#: builtin/commit.c:1636 msgid "use specified template file" msgstr "sử dụng tập tin mẫu đã cho" -#: builtin/commit.c:1627 +#: builtin/commit.c:1637 msgid "force edit of commit" msgstr "ép buộc sửa lần commit" -#: builtin/commit.c:1629 +#: builtin/commit.c:1639 msgid "include status in commit message template" msgstr "bao gồm các trạng thái trong mẫu ghi chú chuyển giao" -#: builtin/commit.c:1634 +#: builtin/commit.c:1644 msgid "Commit contents options" msgstr "Các tùy nội dung ghi chú commit" -#: builtin/commit.c:1635 +#: builtin/commit.c:1645 msgid "commit all changed files" msgstr "chuyển giao tất cả các tập tin có thay đổi" -#: builtin/commit.c:1636 +#: builtin/commit.c:1646 msgid "add specified files to index for commit" msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao" -#: builtin/commit.c:1637 +#: builtin/commit.c:1647 msgid "interactively add files" msgstr "thêm các tập-tin bằng tương tác" -#: builtin/commit.c:1638 +#: builtin/commit.c:1648 msgid "interactively add changes" msgstr "thêm các thay đổi bằng tương tác" -#: builtin/commit.c:1639 +#: builtin/commit.c:1649 msgid "commit only specified files" msgstr "chỉ chuyển giao các tập tin đã chỉ ra" -#: builtin/commit.c:1640 +#: builtin/commit.c:1650 msgid "bypass pre-commit and commit-msg hooks" msgstr "vòng qua móc (hook) pre-commit và commit-msg" -#: builtin/commit.c:1641 +#: builtin/commit.c:1651 msgid "show what would be committed" msgstr "hiển thị xem cái gì có thể được chuyển giao" -#: builtin/commit.c:1654 +#: builtin/commit.c:1664 msgid "amend previous commit" msgstr "“tu bổ” (amend) lần commit trước" -#: builtin/commit.c:1655 +#: builtin/commit.c:1665 msgid "bypass post-rewrite hook" msgstr "vòng qua móc (hook) post-rewrite" -#: builtin/commit.c:1662 +#: builtin/commit.c:1672 msgid "ok to record an empty change" msgstr "ok để ghi lại một thay đổi trống rỗng" -#: builtin/commit.c:1664 +#: builtin/commit.c:1674 msgid "ok to record a change with an empty message" msgstr "ok để ghi các thay đổi với lời nhắn trống rỗng" -#: builtin/commit.c:1737 +#: builtin/commit.c:1747 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Tập tin MERGE_HEAD sai hỏng (%s)" -#: builtin/commit.c:1744 +#: builtin/commit.c:1754 msgid "could not read MERGE_MODE" msgstr "không thể đọc MERGE_MODE" -#: builtin/commit.c:1765 +#: builtin/commit.c:1775 #, c-format msgid "could not read commit message: %s" msgstr "không thể đọc phần chú thích (message) của lần chuyển giao: %s" -#: builtin/commit.c:1772 +#: builtin/commit.c:1782 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Bãi bỏ việc chuyển giao bởi vì phần chú thích của nó trống rỗng.\n" -#: builtin/commit.c:1777 +#: builtin/commit.c:1787 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" "Đang bỏ qua việc chuyển giao; bạn đã không biên soạn phần chú thích " "(message).\n" -#: builtin/commit.c:1788 +#: builtin/commit.c:1798 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "" "Bãi bỏ việc chuyển giao bởi vì phần thân chú thích của nó trống rỗng.\n" -#: builtin/commit.c:1824 +#: builtin/commit.c:1834 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -14276,7 +14334,7 @@ msgstr "--worktree chỉ có thể được dùng bên trong một kho git" #: builtin/config.c:684 msgid "$HOME not set" -msgstr "Chưa đặt biến môi trường HOME" +msgstr "Chưa đặt biến môi trường $HOME" #: builtin/config.c:708 msgid "" @@ -14653,35 +14711,35 @@ msgstr "các tập tin tạm đã sẵn có trong “%s”." msgid "you may want to cleanup or recover these." msgstr "bạn có lẽ muốn dọn dẹp hay phục hồi ở đây." -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "dùng “diff.guitool“ thay vì dùng “diff.tool“" -#: builtin/difftool.c:702 +#: builtin/difftool.c:701 msgid "perform a full-directory diff" msgstr "thực hiện một diff toàn thư mục" -#: builtin/difftool.c:704 +#: builtin/difftool.c:703 msgid "do not prompt before launching a diff tool" msgstr "đừng nhắc khi khởi chạy công cụ diff" -#: builtin/difftool.c:709 +#: builtin/difftool.c:708 msgid "use symlinks in dir-diff mode" msgstr "dùng liên kết mềm trong diff-thư-mục" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "tool" msgstr "công cụ" -#: builtin/difftool.c:711 +#: builtin/difftool.c:710 msgid "use the specified diff tool" msgstr "dùng công cụ diff đã cho" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "print a list of diff tools that may be used with `--tool`" msgstr "in ra danh sách các công cụ dif cái mà có thẻ dùng với “--tool“" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -14689,31 +14747,31 @@ msgstr "" "làm cho “git-difftool” thoát khi gọi công cụ diff trả về mã không phải số " "không" -#: builtin/difftool.c:719 +#: builtin/difftool.c:718 msgid "specify a custom command for viewing diffs" msgstr "chỉ định một lệnh tùy ý để xem diff" -#: builtin/difftool.c:720 +#: builtin/difftool.c:719 msgid "passed to `diff`" msgstr "chuyển cho “diff”" -#: builtin/difftool.c:735 +#: builtin/difftool.c:734 msgid "difftool requires worktree or --no-index" msgstr "difftool cần cây làm việc hoặc --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff xung khắc với --no-index" -#: builtin/difftool.c:745 +#: builtin/difftool.c:744 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool và --extcmd loại từ lẫn nhau" -#: builtin/difftool.c:753 +#: builtin/difftool.c:752 msgid "no <tool> given for --tool=<tool>" msgstr "chưa đưa ra <công_cụ> cho --tool=<công_cụ>" -#: builtin/difftool.c:760 +#: builtin/difftool.c:759 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>" @@ -14805,7 +14863,7 @@ msgstr "sử dụng tính năng done để chấm dứt luồng dữ liệu" msgid "skip output of blob data" msgstr "bỏ qua kết xuất của dữ liệu blob" -#: builtin/fast-export.c:1222 builtin/log.c:1823 +#: builtin/fast-export.c:1222 builtin/log.c:1826 msgid "refspec" msgstr "refspec" @@ -15129,7 +15187,7 @@ msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n" #: builtin/fetch.c:1129 #, c-format -msgid "reject %s because shallow roots are not allowed to be updated" +msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "từ chối %s bởi vì các gốc nông thì không được phép cập nhật" #: builtin/fetch.c:1206 builtin/fetch.c:1357 @@ -15232,48 +15290,52 @@ msgstr "" msgid "You need to specify a tag name." msgstr "Bạn phải định rõ tên thẻ." -#: builtin/fetch.c:1995 +#: builtin/fetch.c:1994 +msgid "--negotiate-only needs one or more --negotiate-tip=*" +msgstr "--negotiate-only cần một tham số hay nhiều --negotiate-tip=* hơn" + +#: builtin/fetch.c:1998 msgid "Negative depth in --deepen is not supported" msgstr "Mức sâu là số âm trong --deepen là không được hỗ trợ" -#: builtin/fetch.c:1997 +#: builtin/fetch.c:2000 msgid "--deepen and --depth are mutually exclusive" msgstr "Các tùy chọn--deepen và --depth loại từ lẫn nhau" -#: builtin/fetch.c:2002 +#: builtin/fetch.c:2005 msgid "--depth and --unshallow cannot be used together" msgstr "tùy chọn --depth và --unshallow không thể sử dụng cùng với nhau" -#: builtin/fetch.c:2004 +#: builtin/fetch.c:2007 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý" -#: builtin/fetch.c:2021 +#: builtin/fetch.c:2024 msgid "fetch --all does not take a repository argument" msgstr "lệnh lấy về \"fetch --all\" không lấy đối số kho chứa" -#: builtin/fetch.c:2023 +#: builtin/fetch.c:2026 msgid "fetch --all does not make sense with refspecs" msgstr "lệnh lấy về \"fetch --all\" không hợp lý với refspecs" -#: builtin/fetch.c:2032 +#: builtin/fetch.c:2035 #, c-format msgid "No such remote or remote group: %s" msgstr "Không có nhóm máy chủ hay máy chủ như thế: %s" -#: builtin/fetch.c:2039 +#: builtin/fetch.c:2042 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Việc lấy về cả một nhóm và chỉ định refspecs không hợp lý" -#: builtin/fetch.c:2055 +#: builtin/fetch.c:2058 msgid "must supply remote when using --negotiate-only" msgstr "phải cung cấp máy chủ khi sử dụng --negotiate-only" -#: builtin/fetch.c:2060 +#: builtin/fetch.c:2063 msgid "Protocol does not support --negotiate-only, exiting." msgstr "Giao thức không hỗ trợ --negotiate-only, nên thoát." -#: builtin/fetch.c:2079 +#: builtin/fetch.c:2082 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -15281,11 +15343,11 @@ msgstr "" "--filter chỉ có thể được dùng với máy chủ được cấu hình bằng extensions." "partialclone" -#: builtin/fetch.c:2083 +#: builtin/fetch.c:2086 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic chỉ có thể dùng khi lấy về từ một máy chủ" -#: builtin/fetch.c:2087 +#: builtin/fetch.c:2090 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin chỉ có thể dùng khi lấy về từ một máy chủ" @@ -15396,7 +15458,7 @@ msgstr "khóa cấu hình lưu trữ danh sách đường dẫn kho lưu trữ" msgid "missing --config=<config>" msgstr "thiếu --config=<config>" -#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128 +#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129 msgid "unknown" msgstr "không hiểu" @@ -15412,16 +15474,16 @@ msgstr "lỗi trong %s %s: %s" msgid "warning in %s %s: %s" msgstr "có cảnh báo trong %s %s: %s" -#: builtin/fsck.c:123 builtin/fsck.c:126 +#: builtin/fsck.c:124 builtin/fsck.c:127 #, c-format msgid "broken link from %7s %s" msgstr "liên kết gãy từ %7s %s" -#: builtin/fsck.c:135 +#: builtin/fsck.c:136 msgid "wrong object type in link" msgstr "kiểu đối tượng sai trong liên kết" -#: builtin/fsck.c:151 +#: builtin/fsck.c:152 #, c-format msgid "" "broken link from %7s %s\n" @@ -15430,211 +15492,211 @@ msgstr "" "liên kết gãy từ %7s %s \n" " tới %7s %s" -#: builtin/fsck.c:263 +#: builtin/fsck.c:264 #, c-format msgid "missing %s %s" msgstr "thiếu %s %s" -#: builtin/fsck.c:290 +#: builtin/fsck.c:291 #, c-format msgid "unreachable %s %s" msgstr "không tiếp cận được %s %s" -#: builtin/fsck.c:310 +#: builtin/fsck.c:311 #, c-format msgid "dangling %s %s" msgstr "dangling %s %s" -#: builtin/fsck.c:320 +#: builtin/fsck.c:321 msgid "could not create lost-found" msgstr "không thể tạo lost-found" -#: builtin/fsck.c:331 +#: builtin/fsck.c:332 #, c-format msgid "could not finish '%s'" msgstr "không thể hoàn thành “%s”" -#: builtin/fsck.c:348 +#: builtin/fsck.c:349 #, c-format msgid "Checking %s" msgstr "Đang kiểm tra %s" -#: builtin/fsck.c:386 +#: builtin/fsck.c:387 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Đang kiểm tra kết nối (%d đối tượng)" -#: builtin/fsck.c:405 +#: builtin/fsck.c:406 #, c-format msgid "Checking %s %s" msgstr "Đang kiểm tra %s %s" -#: builtin/fsck.c:410 +#: builtin/fsck.c:411 msgid "broken links" msgstr "các liên kết bị gẫy" -#: builtin/fsck.c:419 +#: builtin/fsck.c:420 #, c-format msgid "root %s" msgstr "gốc %s" -#: builtin/fsck.c:427 +#: builtin/fsck.c:428 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "đã đánh thẻ %s %s (%s) trong %s" -#: builtin/fsck.c:456 +#: builtin/fsck.c:457 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: đối tượng thiếu hay hỏng" -#: builtin/fsck.c:481 +#: builtin/fsck.c:482 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: mục reflog không hợp lệ %s" -#: builtin/fsck.c:495 +#: builtin/fsck.c:496 #, c-format msgid "Checking reflog %s->%s" msgstr "Đang kiểm tra việc đổi tên của “%s” thành “%s”" -#: builtin/fsck.c:529 +#: builtin/fsck.c:530 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: con trỏ sha1 không hợp lệ %s" -#: builtin/fsck.c:536 +#: builtin/fsck.c:537 #, c-format msgid "%s: not a commit" msgstr "%s: không phải là một lần chuyển giao" -#: builtin/fsck.c:590 +#: builtin/fsck.c:591 msgid "notice: No default references" msgstr "cảnh báo: Không có các tham chiếu mặc định" -#: builtin/fsck.c:605 +#: builtin/fsck.c:606 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: thiếu đối tượng hoặc hỏng: %s" -#: builtin/fsck.c:618 +#: builtin/fsck.c:619 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: không thể phân tích cú đối tượng: %s" -#: builtin/fsck.c:638 +#: builtin/fsck.c:639 #, c-format msgid "bad sha1 file: %s" msgstr "tập tin sha1 sai: %s" -#: builtin/fsck.c:653 +#: builtin/fsck.c:654 msgid "Checking object directory" msgstr "Đang kiểm tra thư mục đối tượng" -#: builtin/fsck.c:656 +#: builtin/fsck.c:657 msgid "Checking object directories" msgstr "Đang kiểm tra các thư mục đối tượng" -#: builtin/fsck.c:671 +#: builtin/fsck.c:672 #, c-format msgid "Checking %s link" msgstr "Đang lấy liên kết %s" -#: builtin/fsck.c:676 builtin/index-pack.c:866 +#: builtin/fsck.c:677 builtin/index-pack.c:864 #, c-format msgid "invalid %s" msgstr "%s không hợp lệ" -#: builtin/fsck.c:683 +#: builtin/fsck.c:684 #, c-format msgid "%s points to something strange (%s)" msgstr "%s chỉ đến thứ gì đó xa lạ (%s)" -#: builtin/fsck.c:689 +#: builtin/fsck.c:690 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: HEAD đã tách rời không chỉ vào đâu cả" -#: builtin/fsck.c:693 +#: builtin/fsck.c:694 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "chú ý: %s chỉ đến một nhánh chưa sinh (%s)" -#: builtin/fsck.c:705 +#: builtin/fsck.c:706 msgid "Checking cache tree" msgstr "Đang kiểm tra cây nhớ tạm" -#: builtin/fsck.c:710 +#: builtin/fsck.c:711 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: con trỏ sha1 không hợp lệ trong cache-tree" -#: builtin/fsck.c:719 +#: builtin/fsck.c:720 msgid "non-tree in cache-tree" msgstr "non-tree trong cache-tree" -#: builtin/fsck.c:750 +#: builtin/fsck.c:751 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<các tùy chọn>] [<đối-tượng>…]" -#: builtin/fsck.c:756 +#: builtin/fsck.c:757 msgid "show unreachable objects" msgstr "hiển thị các đối tượng không thể đọc được" -#: builtin/fsck.c:757 +#: builtin/fsck.c:758 msgid "show dangling objects" msgstr "hiển thị các đối tượng không được quản lý" -#: builtin/fsck.c:758 +#: builtin/fsck.c:759 msgid "report tags" msgstr "báo cáo các thẻ" -#: builtin/fsck.c:759 +#: builtin/fsck.c:760 msgid "report root nodes" msgstr "báo cáo node gốc" -#: builtin/fsck.c:760 +#: builtin/fsck.c:761 msgid "make index objects head nodes" msgstr "tạo “index objects head nodes”" -#: builtin/fsck.c:761 +#: builtin/fsck.c:762 msgid "make reflogs head nodes (default)" msgstr "tạo “reflogs head nodes” (mặc định)" -#: builtin/fsck.c:762 +#: builtin/fsck.c:763 msgid "also consider packs and alternate objects" msgstr "cũng cân nhắc đến các đối tượng gói và thay thế" -#: builtin/fsck.c:763 +#: builtin/fsck.c:764 msgid "check only connectivity" msgstr "chỉ kiểm tra kết nối" -#: builtin/fsck.c:764 builtin/mktag.c:75 +#: builtin/fsck.c:765 builtin/mktag.c:75 msgid "enable more strict checking" msgstr "cho phép kiểm tra hạn chế hơn" -#: builtin/fsck.c:766 +#: builtin/fsck.c:767 msgid "write dangling objects in .git/lost-found" msgstr "ghi các đối tượng không được quản lý trong .git/lost-found" -#: builtin/fsck.c:767 builtin/prune.c:134 +#: builtin/fsck.c:768 builtin/prune.c:134 msgid "show progress" msgstr "hiển thị quá trình" -#: builtin/fsck.c:768 +#: builtin/fsck.c:769 msgid "show verbose names for reachable objects" msgstr "hiển thị tên chi tiết cho các đối tượng đọc được" -#: builtin/fsck.c:827 builtin/index-pack.c:262 +#: builtin/fsck.c:828 builtin/index-pack.c:262 msgid "Checking objects" msgstr "Đang kiểm tra các đối tượng" -#: builtin/fsck.c:855 +#: builtin/fsck.c:856 #, c-format msgid "%s: object missing" msgstr "%s: thiếu đối tượng" -#: builtin/fsck.c:866 +#: builtin/fsck.c:867 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "tham số không hợp lệ: cần sha1, nhưng lại nhận được “%s”" @@ -15919,8 +15981,8 @@ msgstr "số tuyến đã cho không hợp lệ (%d) cho %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793 -#: builtin/pack-objects.c:2969 +#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791 +#: builtin/pack-objects.c:3129 #, c-format msgid "no threads support, ignoring %s" msgstr "không hỗ trợ đa tuyến, bỏ qua %s" @@ -15935,243 +15997,243 @@ msgstr "không thể đọc cây (%s)" msgid "unable to grep from object of type %s" msgstr "không thể thực hiện lệnh grep (lọc tìm) từ đối tượng thuộc kiểu %s" -#: builtin/grep.c:739 +#: builtin/grep.c:738 #, c-format msgid "switch `%c' expects a numerical value" msgstr "chuyển đến “%c” cần một giá trị bằng số" -#: builtin/grep.c:838 +#: builtin/grep.c:837 msgid "search in index instead of in the work tree" msgstr "tìm trong bảng mục lục thay vì trong cây làm việc" -#: builtin/grep.c:840 +#: builtin/grep.c:839 msgid "find in contents not managed by git" msgstr "tìm trong nội dung không được quản lý bởi git" -#: builtin/grep.c:842 +#: builtin/grep.c:841 msgid "search in both tracked and untracked files" msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết" -#: builtin/grep.c:844 +#: builtin/grep.c:843 msgid "ignore files specified via '.gitignore'" msgstr "các tập tin bị bỏ qua được chỉ định thông qua “.gitignore”" -#: builtin/grep.c:846 +#: builtin/grep.c:845 msgid "recursively search in each submodule" msgstr "tìm kiếm đệ quy trong từng mô-đun-con" -#: builtin/grep.c:849 +#: builtin/grep.c:848 msgid "show non-matching lines" msgstr "hiển thị những dòng không khớp với mẫu" -#: builtin/grep.c:851 +#: builtin/grep.c:850 msgid "case insensitive matching" msgstr "phân biệt HOA/thường" -#: builtin/grep.c:853 +#: builtin/grep.c:852 msgid "match patterns only at word boundaries" msgstr "chỉ khớp mẫu tại đường ranh giới từ" -#: builtin/grep.c:855 +#: builtin/grep.c:854 msgid "process binary files as text" msgstr "xử lý tập tin nhị phân như là dạng văn bản thường" -#: builtin/grep.c:857 +#: builtin/grep.c:856 msgid "don't match patterns in binary files" msgstr "không khớp mẫu trong các tập tin nhị phân" -#: builtin/grep.c:860 +#: builtin/grep.c:859 msgid "process binary files with textconv filters" msgstr "xử lý tập tin nhị phân với các bộ lọc “textconv”" -#: builtin/grep.c:862 +#: builtin/grep.c:861 msgid "search in subdirectories (default)" msgstr "tìm kiếm trong thư mục con (mặc định)" -#: builtin/grep.c:864 +#: builtin/grep.c:863 msgid "descend at most <depth> levels" msgstr "hạ xuống ít nhất là mức <sâu>" -#: builtin/grep.c:868 +#: builtin/grep.c:867 msgid "use extended POSIX regular expressions" msgstr "dùng biểu thức chính qui POSIX có mở rộng" -#: builtin/grep.c:871 +#: builtin/grep.c:870 msgid "use basic POSIX regular expressions (default)" msgstr "sử dụng biểu thức chính quy kiểu POSIX (mặc định)" -#: builtin/grep.c:874 +#: builtin/grep.c:873 msgid "interpret patterns as fixed strings" msgstr "diễn dịch các mẫu như là chuỗi cố định" -#: builtin/grep.c:877 +#: builtin/grep.c:876 msgid "use Perl-compatible regular expressions" msgstr "sử dụng biểu thức chính quy tương thích Perl" -#: builtin/grep.c:880 +#: builtin/grep.c:879 msgid "show line numbers" msgstr "hiển thị số của dòng" -#: builtin/grep.c:881 +#: builtin/grep.c:880 msgid "show column number of first match" msgstr "hiển thị số cột của khớp với mẫu đầu tiên" -#: builtin/grep.c:882 +#: builtin/grep.c:881 msgid "don't show filenames" msgstr "không hiển thị tên tập tin" -#: builtin/grep.c:883 +#: builtin/grep.c:882 msgid "show filenames" msgstr "hiển thị các tên tập tin" -#: builtin/grep.c:885 +#: builtin/grep.c:884 msgid "show filenames relative to top directory" msgstr "hiển thị tên tập tin tương đối với thư mục đỉnh (top)" -#: builtin/grep.c:887 +#: builtin/grep.c:886 msgid "show only filenames instead of matching lines" msgstr "chỉ hiển thị tên tập tin thay vì những dòng khớp với mẫu" -#: builtin/grep.c:889 +#: builtin/grep.c:888 msgid "synonym for --files-with-matches" msgstr "đồng nghĩa với --files-with-matches" -#: builtin/grep.c:892 +#: builtin/grep.c:891 msgid "show only the names of files without match" msgstr "chỉ hiển thị tên cho những tập tin không khớp với mẫu" -#: builtin/grep.c:894 +#: builtin/grep.c:893 msgid "print NUL after filenames" msgstr "thêm NUL vào sau tên tập tin" -#: builtin/grep.c:897 +#: builtin/grep.c:896 msgid "show only matching parts of a line" msgstr "chỉ hiển thị những phần khớp với mẫu của một dòng" -#: builtin/grep.c:899 +#: builtin/grep.c:898 msgid "show the number of matches instead of matching lines" msgstr "hiển thị số lượng khớp thay vì những dòng khớp với mẫu" -#: builtin/grep.c:900 +#: builtin/grep.c:899 msgid "highlight matches" msgstr "tô sáng phần khớp mẫu" -#: builtin/grep.c:902 +#: builtin/grep.c:901 msgid "print empty line between matches from different files" msgstr "hiển thị dòng trống giữa các lần khớp từ các tập tin khác biệt" -#: builtin/grep.c:904 +#: builtin/grep.c:903 msgid "show filename only once above matches from same file" msgstr "" "hiển thị tên tập tin một lần phía trên các lần khớp từ cùng một tập tin" -#: builtin/grep.c:907 +#: builtin/grep.c:906 msgid "show <n> context lines before and after matches" msgstr "hiển thị <n> dòng nội dung phía trước và sau các lần khớp" -#: builtin/grep.c:910 +#: builtin/grep.c:909 msgid "show <n> context lines before matches" msgstr "hiển thị <n> dòng nội dung trước khớp" -#: builtin/grep.c:912 +#: builtin/grep.c:911 msgid "show <n> context lines after matches" msgstr "hiển thị <n> dòng nội dung sau khớp" -#: builtin/grep.c:914 +#: builtin/grep.c:913 msgid "use <n> worker threads" msgstr "dùng <n> tuyến trình làm việc" -#: builtin/grep.c:915 +#: builtin/grep.c:914 msgid "shortcut for -C NUM" msgstr "dạng viết tắt của -C SỐ" -#: builtin/grep.c:918 +#: builtin/grep.c:917 msgid "show a line with the function name before matches" msgstr "hiển thị dòng vói tên hàm trước các lần khớp" -#: builtin/grep.c:920 +#: builtin/grep.c:919 msgid "show the surrounding function" msgstr "hiển thị hàm bao quanh" -#: builtin/grep.c:923 +#: builtin/grep.c:922 msgid "read patterns from file" msgstr "đọc mẫu từ tập-tin" -#: builtin/grep.c:925 +#: builtin/grep.c:924 msgid "match <pattern>" msgstr "match <mẫu>" -#: builtin/grep.c:927 +#: builtin/grep.c:926 msgid "combine patterns specified with -e" msgstr "tổ hợp mẫu được chỉ ra với tùy chọn -e" -#: builtin/grep.c:939 +#: builtin/grep.c:938 msgid "indicate hit with exit status without output" msgstr "đưa ra gợi ý với trạng thái thoát mà không có kết xuất" -#: builtin/grep.c:941 +#: builtin/grep.c:940 msgid "show only matches from files that match all patterns" msgstr "chỉ hiển thị những cái khớp từ tập tin mà nó khớp toàn bộ các mẫu" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "pager" msgstr "dàn trang" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "show matching files in the pager" msgstr "hiển thị các tập tin khớp trong trang giấy" -#: builtin/grep.c:948 +#: builtin/grep.c:947 msgid "allow calling of grep(1) (ignored by this build)" msgstr "cho phép gọi grep(1) (bị bỏ qua bởi lần dịch này)" -#: builtin/grep.c:1014 +#: builtin/grep.c:1013 msgid "no pattern given" msgstr "chưa chỉ ra mẫu" -#: builtin/grep.c:1050 +#: builtin/grep.c:1049 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index hay --untracked không được sử dụng cùng với revs" -#: builtin/grep.c:1058 +#: builtin/grep.c:1057 #, c-format msgid "unable to resolve revision: %s" msgstr "không thể phân giải điểm xét duyệt: %s" -#: builtin/grep.c:1088 +#: builtin/grep.c:1087 msgid "--untracked not supported with --recurse-submodules" msgstr "tùy chọn --untracked không được hỗ trợ với --recurse-submodules" -#: builtin/grep.c:1092 +#: builtin/grep.c:1091 msgid "invalid option combination, ignoring --threads" msgstr "tổ hợp tùy chọn không hợp lệ, bỏ qua --threads" -#: builtin/grep.c:1095 builtin/pack-objects.c:3930 +#: builtin/grep.c:1094 builtin/pack-objects.c:4090 msgid "no threads support, ignoring --threads" msgstr "không hỗ trợ đa tuyến, bỏ qua --threads" -#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966 +#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126 #, c-format msgid "invalid number of threads specified (%d)" msgstr "số tuyến chỉ ra không hợp lệ (%d)" -#: builtin/grep.c:1132 +#: builtin/grep.c:1131 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager chỉ làm việc trên cây-làm-việc" -#: builtin/grep.c:1158 +#: builtin/grep.c:1157 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached hay --untracked không được sử dụng với --no-index" -#: builtin/grep.c:1161 +#: builtin/grep.c:1160 msgid "--untracked cannot be used with --cached" msgstr "--untracked không thể được sử dụng với tùy chọn --cached" -#: builtin/grep.c:1167 +#: builtin/grep.c:1166 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu dấu vết" -#: builtin/grep.c:1175 +#: builtin/grep.c:1174 msgid "both --cached and trees are given" msgstr "cả hai --cached và các cây phải được chỉ ra" @@ -16294,30 +16356,30 @@ msgstr "" msgid "'%s': unknown man viewer." msgstr "“%s”: không rõ chương trình xem man." -#: builtin/help.c:453 +#: builtin/help.c:452 msgid "no man viewer handled the request" msgstr "không có trình xem trợ giúp dạng manpage tiếp hợp với yêu cầu" -#: builtin/help.c:461 +#: builtin/help.c:459 msgid "no info viewer handled the request" msgstr "không có trình xem trợ giúp dạng info tiếp hợp với yêu cầu" -#: builtin/help.c:520 builtin/help.c:531 git.c:348 +#: builtin/help.c:517 builtin/help.c:528 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "“%s” được đặt bí danh thành “%s”" -#: builtin/help.c:534 git.c:380 +#: builtin/help.c:531 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "chuỗi alias.%s sai: %s" -#: builtin/help.c:563 builtin/help.c:593 +#: builtin/help.c:561 builtin/help.c:591 #, c-format msgid "usage: %s%s" msgstr "cách dùng: %s%s" -#: builtin/help.c:577 +#: builtin/help.c:575 msgid "'git help config' for more information" msgstr "Chạy lệnh “git help config” để có thêm thông tin" @@ -16354,7 +16416,7 @@ msgstr "lỗi đọc ở đầu vào" msgid "used more bytes than were available" msgstr "sử dụng nhiều hơn số lượng byte mà nó sẵn có" -#: builtin/index-pack.c:325 builtin/pack-objects.c:624 +#: builtin/index-pack.c:325 builtin/pack-objects.c:756 msgid "pack too large for current definition of off_t" msgstr "gói quá lớn so với định nghĩa hiện tại của kiểu off_t" @@ -16381,233 +16443,233 @@ msgstr "chữ ký cho gói không khớp" msgid "pack version %<PRIu32> unsupported" msgstr "không hỗ trợ phiên bản gói %<PRIu32>" -#: builtin/index-pack.c:383 +#: builtin/index-pack.c:381 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "gói có đối tượng sai tại khoảng bù %<PRIuMAX>: %s" -#: builtin/index-pack.c:489 +#: builtin/index-pack.c:487 #, c-format msgid "inflate returned %d" msgstr "xả nén trả về %d" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:536 msgid "offset value overflow for delta base object" msgstr "tràn giá trị khoảng bù cho đối tượng delta cơ sở" -#: builtin/index-pack.c:546 +#: builtin/index-pack.c:544 msgid "delta base offset is out of bound" msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm vi" -#: builtin/index-pack.c:554 +#: builtin/index-pack.c:552 #, c-format msgid "unknown object type %d" msgstr "không hiểu kiểu đối tượng %d" -#: builtin/index-pack.c:585 +#: builtin/index-pack.c:583 msgid "cannot pread pack file" msgstr "không thể chạy hàm pread cho tập tin gói" -#: builtin/index-pack.c:587 +#: builtin/index-pack.c:585 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "tập tin gói bị kết thúc sớm, thiếu %<PRIuMAX> byte" -#: builtin/index-pack.c:613 +#: builtin/index-pack.c:611 msgid "serious inflate inconsistency" msgstr "sự mâu thuẫn xả nén nghiêm trọng" -#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788 -#: builtin/index-pack.c:827 builtin/index-pack.c:836 +#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786 +#: builtin/index-pack.c:825 builtin/index-pack.c:834 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!" -#: builtin/index-pack.c:761 builtin/pack-objects.c:171 -#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 +#: builtin/index-pack.c:759 builtin/pack-objects.c:292 +#: builtin/pack-objects.c:352 builtin/pack-objects.c:458 #, c-format msgid "unable to read %s" msgstr "không thể đọc %s" -#: builtin/index-pack.c:825 +#: builtin/index-pack.c:823 #, c-format msgid "cannot read existing object info %s" msgstr "không thể đọc thông tin đối tượng sẵn có %s" -#: builtin/index-pack.c:833 +#: builtin/index-pack.c:831 #, c-format msgid "cannot read existing object %s" msgstr "không thể đọc đối tượng đã tồn tại %s" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:845 #, c-format msgid "invalid blob object %s" msgstr "đối tượng blob không hợp lệ %s" -#: builtin/index-pack.c:850 builtin/index-pack.c:869 +#: builtin/index-pack.c:848 builtin/index-pack.c:867 msgid "fsck error in packed object" msgstr "lỗi fsck trong đối tượng đóng gói" -#: builtin/index-pack.c:871 +#: builtin/index-pack.c:869 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Không phải tất cả các đối tượng con của %s là có thể với tới được" -#: builtin/index-pack.c:932 builtin/index-pack.c:979 +#: builtin/index-pack.c:930 builtin/index-pack.c:977 msgid "failed to apply delta" msgstr "gặp lỗi khi áp dụng delta" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Receiving objects" msgstr "Đang nhận về các đối tượng" -#: builtin/index-pack.c:1162 +#: builtin/index-pack.c:1160 msgid "Indexing objects" msgstr "Các đối tượng bảng mục lục" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1194 msgid "pack is corrupted (SHA1 mismatch)" msgstr "gói bị sai hỏng (SHA1 không khớp)" -#: builtin/index-pack.c:1201 +#: builtin/index-pack.c:1199 msgid "cannot fstat packfile" msgstr "không thể lấy thông tin thống kê packfile" -#: builtin/index-pack.c:1204 +#: builtin/index-pack.c:1202 msgid "pack has junk at the end" msgstr "pack có phần thừa ở cuối" -#: builtin/index-pack.c:1216 +#: builtin/index-pack.c:1214 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()" -#: builtin/index-pack.c:1239 +#: builtin/index-pack.c:1237 msgid "Resolving deltas" msgstr "Đang phân giải các delta" -#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732 +#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892 #, c-format msgid "unable to create thread: %s" msgstr "không thể tạo tuyến: %s" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1281 msgid "confusion beyond insanity" msgstr "lộn xộn hơn cả điên rồ" -#: builtin/index-pack.c:1289 +#: builtin/index-pack.c:1287 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "đầy đủ với %d đối tượng nội bộ" -#: builtin/index-pack.c:1301 +#: builtin/index-pack.c:1299 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Gặp tổng kiểm tra tail không cần cho %s (đĩa hỏng?)" -#: builtin/index-pack.c:1305 +#: builtin/index-pack.c:1303 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "gói có %d delta chưa được giải quyết" -#: builtin/index-pack.c:1329 +#: builtin/index-pack.c:1327 #, c-format msgid "unable to deflate appended object (%d)" msgstr "không thể xả nén đối tượng nối thêm (%d)" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1423 #, c-format msgid "local object %s is corrupt" msgstr "đối tượng nội bộ %s bị hỏng" -#: builtin/index-pack.c:1446 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "tên tập tin tập tin gói “%s” không được kết thúc “.%s”" -#: builtin/index-pack.c:1470 +#: builtin/index-pack.c:1468 #, c-format msgid "cannot write %s file '%s'" msgstr "không thể ghi %s tập tin “%s”" -#: builtin/index-pack.c:1478 +#: builtin/index-pack.c:1476 #, c-format msgid "cannot close written %s file '%s'" msgstr "không thể đóng tập tin được ghi %s “%s”" -#: builtin/index-pack.c:1504 +#: builtin/index-pack.c:1502 msgid "error while closing pack file" msgstr "gặp lỗi trong khi đóng tập tin gói" -#: builtin/index-pack.c:1518 +#: builtin/index-pack.c:1516 msgid "cannot store pack file" msgstr "không thể lưu tập tin gói" -#: builtin/index-pack.c:1526 +#: builtin/index-pack.c:1524 msgid "cannot store index file" msgstr "không thể lưu trữ tập tin ghi mục lục" -#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977 +#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "sai pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1651 +#: builtin/index-pack.c:1649 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Không thể mở tập tin gói đã sẵn có “%s”" -#: builtin/index-pack.c:1653 +#: builtin/index-pack.c:1651 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Không thể mở tập tin idx của gói cho “%s”" -#: builtin/index-pack.c:1701 +#: builtin/index-pack.c:1699 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "không delta: %d đối tượng" -#: builtin/index-pack.c:1708 +#: builtin/index-pack.c:1706 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "chiều dài xích = %d: %lu đối tượng" -#: builtin/index-pack.c:1750 +#: builtin/index-pack.c:1748 msgid "Cannot come back to cwd" msgstr "Không thể quay lại cwd" -#: builtin/index-pack.c:1804 builtin/index-pack.c:1807 -#: builtin/index-pack.c:1823 builtin/index-pack.c:1827 +#: builtin/index-pack.c:1802 builtin/index-pack.c:1805 +#: builtin/index-pack.c:1821 builtin/index-pack.c:1825 #, c-format msgid "bad %s" msgstr "%s sai" -#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613 +#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614 #, c-format msgid "unknown hash algorithm '%s'" msgstr "không hiểu thuật toán băm dữ liệu “%s”" -#: builtin/index-pack.c:1852 +#: builtin/index-pack.c:1850 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin không thể được dùng mà không có --stdin" -#: builtin/index-pack.c:1854 +#: builtin/index-pack.c:1852 msgid "--stdin requires a git repository" msgstr "--stdin cần một kho git" -#: builtin/index-pack.c:1856 +#: builtin/index-pack.c:1854 msgid "--object-format cannot be used with --stdin" msgstr "--object-format không thể được dùng với --stdin" -#: builtin/index-pack.c:1871 +#: builtin/index-pack.c:1869 msgid "--verify with no packfile name given" msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile" -#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584 +#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "lỗi fsck trong các đối tượng gói" @@ -16651,56 +16713,56 @@ msgstr "các mẫu không được tìm thấy trong %s" msgid "not copying templates from '%s': %s" msgstr "không sao chép các mẫu từ “%s”: %s" -#: builtin/init-db.c:262 +#: builtin/init-db.c:263 #, c-format msgid "invalid initial branch name: '%s'" msgstr "tên nhánh khởi tạo không hợp lệ: “%s”" -#: builtin/init-db.c:353 +#: builtin/init-db.c:354 #, c-format msgid "unable to handle file type %d" msgstr "không thể xử lý (handle) tập tin kiểu %d" -#: builtin/init-db.c:356 +#: builtin/init-db.c:357 #, c-format msgid "unable to move %s to %s" msgstr "không di chuyển được %s vào %s" -#: builtin/init-db.c:372 +#: builtin/init-db.c:373 msgid "attempt to reinitialize repository with different hash" msgstr "cố để khởi tạo lại một kho với kiểu băm dữ liệu khác" -#: builtin/init-db.c:396 builtin/init-db.c:399 +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "%s đã có từ trước rồi" -#: builtin/init-db.c:431 +#: builtin/init-db.c:432 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: --initial-branch=%s bị bỏ qua" -#: builtin/init-db.c:462 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Đã khởi tạo lại kho Git chia sẻ sẵn có trong %s%s\n" -#: builtin/init-db.c:463 +#: builtin/init-db.c:464 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Đã khởi tạo lại kho Git sẵn có trong %s%s\n" -#: builtin/init-db.c:467 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Đã khởi tạo lại kho Git chia sẻ trống rỗng sẵn có trong %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:469 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Đã khởi tạo lại kho Git trống rỗng sẵn có trong %s%s\n" -#: builtin/init-db.c:517 +#: builtin/init-db.c:518 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -16708,41 +16770,41 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-" "quyền>]] [thư-mục]" -#: builtin/init-db.c:543 +#: builtin/init-db.c:544 msgid "permissions" msgstr "các quyền" -#: builtin/init-db.c:544 +#: builtin/init-db.c:545 msgid "specify that the git repository is to be shared amongst several users" msgstr "chỉ ra cái mà kho git được chia sẻ giữa nhiều người dùng" -#: builtin/init-db.c:550 +#: builtin/init-db.c:551 msgid "override the name of the initial branch" msgstr "ghi đè lên tên của nhánh khởi tạo" -#: builtin/init-db.c:551 builtin/verify-pack.c:74 +#: builtin/init-db.c:552 builtin/verify-pack.c:74 msgid "hash" msgstr "băm" -#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "chỉ định thuật toán băm dữ liệu muốn dùng" -#: builtin/init-db.c:559 +#: builtin/init-db.c:560 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "Các tùy chọn --separate-git-dir và --bare loại từ lẫn nhau" -#: builtin/init-db.c:590 builtin/init-db.c:595 +#: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" msgstr "không thể mkdir (tạo thư mục): %s" -#: builtin/init-db.c:599 builtin/init-db.c:654 +#: builtin/init-db.c:600 builtin/init-db.c:655 #, c-format msgid "cannot chdir to %s" msgstr "không thể chdir (chuyển đổi thư mục) sang %s" -#: builtin/init-db.c:626 +#: builtin/init-db.c:627 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -16751,12 +16813,12 @@ msgstr "" "%s (hoặc --work-tree=<thư-mục>) không cho phép không chỉ định %s (hoặc --git-" "dir=<thư-mục>)" -#: builtin/init-db.c:678 +#: builtin/init-db.c:679 #, c-format msgid "Cannot access work tree '%s'" msgstr "Không thể truy cập cây (tree) làm việc “%s”" -#: builtin/init-db.c:683 +#: builtin/init-db.c:684 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir xung khắc với kho thuần" @@ -16865,85 +16927,85 @@ msgstr "" msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<vùng>:<tập_tin> không thể được sử dụng với đặc tả đường dẫn" -#: builtin/log.c:303 +#: builtin/log.c:306 #, c-format msgid "Final output: %d %s\n" msgstr "Kết xuất cuối cùng: %d %s\n" -#: builtin/log.c:568 +#: builtin/log.c:571 #, c-format msgid "git show %s: bad file" msgstr "git show %s: sai tập tin" -#: builtin/log.c:583 builtin/log.c:673 +#: builtin/log.c:586 builtin/log.c:676 #, c-format msgid "could not read object %s" msgstr "không thể đọc đối tượng %s" -#: builtin/log.c:698 +#: builtin/log.c:701 #, c-format msgid "unknown type: %d" msgstr "không nhận ra kiểu: %d" -#: builtin/log.c:843 +#: builtin/log.c:846 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: bao bọc không hợp lệ từ chế độ mô tả" -#: builtin/log.c:850 +#: builtin/log.c:853 msgid "format.headers without value" msgstr "format.headers không có giá trị cụ thể" -#: builtin/log.c:979 +#: builtin/log.c:982 #, c-format msgid "cannot open patch file %s" msgstr "không thể mở tập tin miếng vá: %s" -#: builtin/log.c:996 +#: builtin/log.c:999 msgid "need exactly one range" msgstr "cần chính xác một vùng" -#: builtin/log.c:1006 +#: builtin/log.c:1009 msgid "not a range" msgstr "không phải là một vùng" -#: builtin/log.c:1170 +#: builtin/log.c:1173 msgid "cover letter needs email format" msgstr "“cover letter” cần cho định dạng thư" -#: builtin/log.c:1176 +#: builtin/log.c:1179 msgid "failed to create cover-letter file" msgstr "gặp lỗi khi tạo các tập tin cover-letter" -#: builtin/log.c:1263 +#: builtin/log.c:1266 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to điên rồ: %s" -#: builtin/log.c:1290 +#: builtin/log.c:1293 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<các tùy chọn>] [<kể-từ> | <vùng-xem-xét>]" -#: builtin/log.c:1348 +#: builtin/log.c:1351 msgid "two output directories?" msgstr "hai thư mục kết xuất?" -#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340 +#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 #, c-format msgid "unknown commit %s" msgstr "không hiểu lần chuyển giao %s" -#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ" -#: builtin/log.c:1519 +#: builtin/log.c:1522 msgid "could not find exact merge base" msgstr "không tìm thấy nền hòa trộn chính xác" -#: builtin/log.c:1529 +#: builtin/log.c:1532 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" @@ -16954,293 +17016,293 @@ msgstr "" "nhánh máy chủ. Hoặc là bạn có thể chỉ định lần chuyển giao nền bằng\n" "\"--base=<base-commit-id>\" một cách thủ công" -#: builtin/log.c:1552 +#: builtin/log.c:1555 msgid "failed to find exact merge base" msgstr "gặp lỗi khi tìm nền hòa trộn chính xác" -#: builtin/log.c:1569 +#: builtin/log.c:1572 msgid "base commit should be the ancestor of revision list" msgstr "lần chuyển giao nền không là tổ tiên của danh sách điểm xét duyệt" -#: builtin/log.c:1579 +#: builtin/log.c:1582 msgid "base commit shouldn't be in revision list" msgstr "lần chuyển giao nền không được trong danh sách điểm xét duyệt" -#: builtin/log.c:1637 +#: builtin/log.c:1640 msgid "cannot get patch id" msgstr "không thể lấy mã miếng vá" -#: builtin/log.c:1700 +#: builtin/log.c:1703 msgid "failed to infer range-diff origin of current series" msgstr "" "gặp lỗi khi suy luận range-diff (vùng khác biệt) gốc của sê-ri hiện tại" -#: builtin/log.c:1702 +#: builtin/log.c:1705 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "dùng “%s” như là gốc range-diff của sê-ri hiện tại" -#: builtin/log.c:1746 +#: builtin/log.c:1749 msgid "use [PATCH n/m] even with a single patch" msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn" -#: builtin/log.c:1749 +#: builtin/log.c:1752 msgid "use [PATCH] even with multiple patches" msgstr "dùng [VÁ] ngay cả với các miếng vá phức tạp" -#: builtin/log.c:1753 +#: builtin/log.c:1756 msgid "print patches to standard out" msgstr "hiển thị miếng vá ra đầu ra chuẩn" -#: builtin/log.c:1755 +#: builtin/log.c:1758 msgid "generate a cover letter" msgstr "tạo bì thư" -#: builtin/log.c:1757 +#: builtin/log.c:1760 msgid "use simple number sequence for output file names" msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra" -#: builtin/log.c:1758 +#: builtin/log.c:1761 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1759 +#: builtin/log.c:1762 msgid "use <sfx> instead of '.patch'" msgstr "sử dụng <sfx> thay cho “.patch”" -#: builtin/log.c:1761 +#: builtin/log.c:1764 msgid "start numbering patches at <n> instead of 1" msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1" -#: builtin/log.c:1762 +#: builtin/log.c:1765 msgid "reroll-count" msgstr "đếm reroll" -#: builtin/log.c:1763 +#: builtin/log.c:1766 msgid "mark the series as Nth re-roll" msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll" -#: builtin/log.c:1765 +#: builtin/log.c:1768 msgid "max length of output filename" msgstr "chiều dài tên tập tin đầu ra tối đa" -#: builtin/log.c:1767 +#: builtin/log.c:1770 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "dùng [VÁ RFC] thay cho [VÁ]" -#: builtin/log.c:1770 +#: builtin/log.c:1773 msgid "cover-from-description-mode" msgstr "cover-from-description-mode" -#: builtin/log.c:1771 +#: builtin/log.c:1774 msgid "generate parts of a cover letter based on a branch's description" msgstr "tạo ra các phần của một lá thư bao gồm dựa trên mô tả của nhánh" -#: builtin/log.c:1773 +#: builtin/log.c:1776 msgid "use [<prefix>] instead of [PATCH]" msgstr "dùng [<tiền-tố>] thay cho [VÁ]" -#: builtin/log.c:1776 +#: builtin/log.c:1779 msgid "store resulting files in <dir>" msgstr "lưu các tập tin kết quả trong <t.mục>" -#: builtin/log.c:1779 +#: builtin/log.c:1782 msgid "don't strip/add [PATCH]" msgstr "không strip/add [VÁ]" -#: builtin/log.c:1782 +#: builtin/log.c:1785 msgid "don't output binary diffs" msgstr "không kết xuất diff (những khác biệt) nhị phân" -#: builtin/log.c:1784 +#: builtin/log.c:1787 msgid "output all-zero hash in From header" msgstr "xuất mọi mã băm all-zero trong phần đầu From" -#: builtin/log.c:1786 +#: builtin/log.c:1789 msgid "don't include a patch matching a commit upstream" msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn" -#: builtin/log.c:1788 +#: builtin/log.c:1791 msgid "show patch format instead of default (patch + stat)" msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)" -#: builtin/log.c:1790 +#: builtin/log.c:1793 msgid "Messaging" msgstr "Lời nhắn" -#: builtin/log.c:1791 +#: builtin/log.c:1794 msgid "header" msgstr "đầu đề thư" -#: builtin/log.c:1792 +#: builtin/log.c:1795 msgid "add email header" msgstr "thêm đầu đề thư" -#: builtin/log.c:1793 builtin/log.c:1794 +#: builtin/log.c:1796 builtin/log.c:1797 msgid "email" msgstr "thư điện tử" -#: builtin/log.c:1793 +#: builtin/log.c:1796 msgid "add To: header" msgstr "thêm To: đầu đề thư" -#: builtin/log.c:1794 +#: builtin/log.c:1797 msgid "add Cc: header" msgstr "thêm Cc: đầu đề thư" -#: builtin/log.c:1795 +#: builtin/log.c:1798 msgid "ident" msgstr "thụt lề" -#: builtin/log.c:1796 +#: builtin/log.c:1799 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "đặt “Địa chỉ gửi” thành <thụ lề> (hoặc thụt lề người commit nếu bỏ quên)" -#: builtin/log.c:1798 +#: builtin/log.c:1801 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1799 +#: builtin/log.c:1802 msgid "make first mail a reply to <message-id>" msgstr "dùng thư đầu tiên để trả lời <message-id>" -#: builtin/log.c:1800 builtin/log.c:1803 +#: builtin/log.c:1803 builtin/log.c:1806 msgid "boundary" msgstr "ranh giới" -#: builtin/log.c:1801 +#: builtin/log.c:1804 msgid "attach the patch" msgstr "đính kèm miếng vá" -#: builtin/log.c:1804 +#: builtin/log.c:1807 msgid "inline the patch" msgstr "dùng miếng vá làm nội dung" -#: builtin/log.c:1808 +#: builtin/log.c:1811 msgid "enable message threading, styles: shallow, deep" msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”" -#: builtin/log.c:1810 +#: builtin/log.c:1813 msgid "signature" msgstr "chữ ký" -#: builtin/log.c:1811 +#: builtin/log.c:1814 msgid "add a signature" msgstr "thêm chữ ký" -#: builtin/log.c:1812 +#: builtin/log.c:1815 msgid "base-commit" msgstr "lần_chuyển_giao_nền" -#: builtin/log.c:1813 +#: builtin/log.c:1816 msgid "add prerequisite tree info to the patch series" msgstr "add trước hết đòi hỏi thông tin cây tới sê-ri miếng vá" -#: builtin/log.c:1816 +#: builtin/log.c:1819 msgid "add a signature from a file" msgstr "thêm chữ ký từ một tập tin" -#: builtin/log.c:1817 +#: builtin/log.c:1820 msgid "don't print the patch filenames" msgstr "không hiển thị các tên tập tin của miếng vá" -#: builtin/log.c:1819 +#: builtin/log.c:1822 msgid "show progress while generating patches" msgstr "hiển thị bộ đo tiến triển trong khi tạo các miếng vá" -#: builtin/log.c:1821 +#: builtin/log.c:1824 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "hiển thị các thay đổi dựa trên <rev> trong các chữ bao bọc hoặc miếng vá đơn" -#: builtin/log.c:1824 +#: builtin/log.c:1827 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "hiển thị các thay đổi dựa trên <refspec> trong các chữ bao bọc hoặc miếng vá " "đơn" -#: builtin/log.c:1826 builtin/range-diff.c:28 +#: builtin/log.c:1829 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "tỷ lệ phần trăm theo cái tạo là weighted" -#: builtin/log.c:1913 +#: builtin/log.c:1916 #, c-format msgid "invalid ident line: %s" msgstr "dòng định danh không hợp lệ: %s" -#: builtin/log.c:1928 +#: builtin/log.c:1931 msgid "-n and -k are mutually exclusive" msgstr "-n và -k loại trừ lẫn nhau" -#: builtin/log.c:1930 +#: builtin/log.c:1933 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc và -k xung khắc nhau" -#: builtin/log.c:1938 +#: builtin/log.c:1941 msgid "--name-only does not make sense" msgstr "--name-only không hợp lý" -#: builtin/log.c:1940 +#: builtin/log.c:1943 msgid "--name-status does not make sense" msgstr "--name-status không hợp lý" -#: builtin/log.c:1942 +#: builtin/log.c:1945 msgid "--check does not make sense" msgstr "--check không hợp lý" -#: builtin/log.c:1964 +#: builtin/log.c:1967 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "Các tùy chọn--stdout, --output, và --output-directory loại từ lẫn nhau" -#: builtin/log.c:2087 +#: builtin/log.c:2089 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff cần --cover-letter hoặc vá đơn" -#: builtin/log.c:2091 +#: builtin/log.c:2093 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:2092 +#: builtin/log.c:2094 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff dựa trên v%d:" -#: builtin/log.c:2098 +#: builtin/log.c:2100 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor yêu cầu --range-diff" -#: builtin/log.c:2102 +#: builtin/log.c:2104 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff yêu cầu --cover-letter hoặc miếng vá đơn" -#: builtin/log.c:2110 +#: builtin/log.c:2112 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:2111 +#: builtin/log.c:2113 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff dựa trên v%d:" -#: builtin/log.c:2122 +#: builtin/log.c:2124 #, c-format msgid "unable to read signature file '%s'" msgstr "không thể đọc tập tin chữ ký “%s”" -#: builtin/log.c:2158 +#: builtin/log.c:2160 msgid "Generating patches" msgstr "Đang tạo các miếng vá" -#: builtin/log.c:2202 +#: builtin/log.c:2204 msgid "failed to create output files" msgstr "gặp lỗi khi tạo các tập tin kết xuất" -#: builtin/log.c:2261 +#: builtin/log.c:2263 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]" -#: builtin/log.c:2315 +#: builtin/log.c:2317 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -17609,14 +17671,6 @@ msgstr "Đang hòa trộn %s với %s\n" msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<các tùy chọn>] [<commit>…]" -#: builtin/merge.c:59 -msgid "git merge --abort" -msgstr "git merge --abort" - -#: builtin/merge.c:60 -msgid "git merge --continue" -msgstr "git merge --continue" - #: builtin/merge.c:123 msgid "switch `m' requires a value" msgstr "switch “m” yêu cầu một giá trị" @@ -17774,7 +17828,7 @@ msgstr "Không cầm nắm gì ngoài hai head hòa trộn." msgid "Unknown option for merge-recursive: -X%s" msgstr "Không hiểu tùy chọn cho merge-recursive: -X%s" -#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "không thể ghi %s" @@ -18085,7 +18139,7 @@ msgstr "" "trong suốt quá trình đóng gói lại, gom các tập tin gói có kích cỡ nhỏ hơn " "vào một bó cái mà lớn hơn kích thước này" -#: builtin/multi-pack-index.c:180 +#: builtin/multi-pack-index.c:179 #, c-format msgid "unrecognized subcommand: %s" msgstr "không hiểu câu lệnh con: %s" @@ -18627,7 +18681,7 @@ msgstr "cố gắng gỡ bỏ một note chưa từng tồn tại không phải msgid "read object names from the standard input" msgstr "đọc tên đối tượng từ thiết bị nhập chuẩn" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146 msgid "do not remove, show only" msgstr "không gỡ bỏ, chỉ hiển thị" @@ -18643,26 +18697,26 @@ msgstr "notes-ref" msgid "use notes from <notes-ref>" msgstr "dùng “notes” từ <notes-ref>" -#: builtin/notes.c:1034 builtin/stash.c:1739 +#: builtin/notes.c:1034 builtin/stash.c:1735 #, c-format msgid "unknown subcommand: %s" msgstr "không hiểu câu lệnh con: %s" -#: builtin/pack-objects.c:54 +#: builtin/pack-objects.c:182 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [các tùy chọn…] [< <danh-sách-tham-chiếu> | < " "<danh-sách-đối-tượng>]" -#: builtin/pack-objects.c:55 +#: builtin/pack-objects.c:183 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [các tùy chọn…] <base-name> [< <danh-sách-ref> | < <danh-" "sách-đối-tượng>]" -#: builtin/pack-objects.c:440 +#: builtin/pack-objects.c:572 #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " @@ -18671,108 +18725,108 @@ msgstr "" "write_reuse_object: không thể phân bổ %s, cần tại vị trí bù %<PRIuMAX> trong " "gói %s" -#: builtin/pack-objects.c:448 +#: builtin/pack-objects.c:580 #, c-format msgid "bad packed object CRC for %s" msgstr "CRC của đối tượng gói sai với %s" -#: builtin/pack-objects.c:459 +#: builtin/pack-objects.c:591 #, c-format msgid "corrupt packed object for %s" msgstr "đối tượng đã đóng gói sai hỏng cho %s" -#: builtin/pack-objects.c:590 +#: builtin/pack-objects.c:722 #, c-format msgid "recursive delta detected for object %s" msgstr "dò thấy delta đệ quy cho đối tượng %s" -#: builtin/pack-objects.c:801 +#: builtin/pack-objects.c:941 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "đã sắp xếp %u đối tượng, cần %<PRIu32>" -#: builtin/pack-objects.c:896 +#: builtin/pack-objects.c:1036 #, c-format msgid "expected object at offset %<PRIuMAX> in pack %s" msgstr "cần đối tượng tại khoảng bù %<PRIuMAX> trong gói: %s" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1155 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "tắt ghi bitmap, các gói bị chia nhỏ bởi vì pack.packSizeLimit" -#: builtin/pack-objects.c:1028 +#: builtin/pack-objects.c:1168 msgid "Writing objects" msgstr "Đang ghi lại các đối tượng" -#: builtin/pack-objects.c:1089 builtin/update-index.c:90 +#: builtin/pack-objects.c:1229 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "gặp lỗi khi lấy thông tin thống kê về %s" -#: builtin/pack-objects.c:1141 +#: builtin/pack-objects.c:1281 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "đã ghi %<PRIu32> đối tượng trong khi cần %<PRIu32>" -#: builtin/pack-objects.c:1383 +#: builtin/pack-objects.c:1523 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "tắt ghi bitmap, như vậy một số đối tượng sẽ không được đóng gói" -#: builtin/pack-objects.c:1831 +#: builtin/pack-objects.c:1971 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "khoảng bù cơ sở cho delta bị tràn trong gói cho %s" -#: builtin/pack-objects.c:1840 +#: builtin/pack-objects.c:1980 #, c-format msgid "delta base offset out of bound for %s" msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm cho %s" -#: builtin/pack-objects.c:2121 +#: builtin/pack-objects.c:2261 msgid "Counting objects" msgstr "Đang đếm các đối tượng" -#: builtin/pack-objects.c:2266 +#: builtin/pack-objects.c:2426 #, c-format msgid "unable to parse object header of %s" msgstr "không thể phân tích phần đầu đối tượng của “%s”" -#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352 -#: builtin/pack-objects.c:2362 +#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512 +#: builtin/pack-objects.c:2522 #, c-format msgid "object %s cannot be read" msgstr "không thể đọc đối tượng %s" -#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366 +#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "đối tượng %s không nhất quán về chiều dài đối tượng (%<PRIuMAX> so với " "%<PRIuMAX>)" -#: builtin/pack-objects.c:2376 +#: builtin/pack-objects.c:2536 msgid "suboptimal pack - out of memory" msgstr "suboptimal pack - hết bộ nhớ" -#: builtin/pack-objects.c:2691 +#: builtin/pack-objects.c:2851 #, c-format msgid "Delta compression using up to %d threads" msgstr "Nén delta dùng tới %d tuyến trình" -#: builtin/pack-objects.c:2830 +#: builtin/pack-objects.c:2990 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "không thể đóng gói các đối tượng tiếp cận được từ thẻ “%s”" -#: builtin/pack-objects.c:2916 +#: builtin/pack-objects.c:3076 msgid "Compressing objects" msgstr "Đang nén các đối tượng" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:3082 msgid "inconsistency with delta count" msgstr "mâu thuẫn với số lượng delta" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3161 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -18781,7 +18835,7 @@ msgstr "" "giá trị của uploadpack.blobpackfileuri phải có dạng “<object-hash> <pack-" "hash> <uri>” (nhận “%s”)" -#: builtin/pack-objects.c:3004 +#: builtin/pack-objects.c:3164 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" @@ -18789,17 +18843,17 @@ msgstr "" "đối tượng đã được cấu hình trong một uploadpack.blobpackfileuri khác (đã " "nhận “%s”)" -#: builtin/pack-objects.c:3039 +#: builtin/pack-objects.c:3199 #, c-format msgid "could not get type of object %s in pack %s" msgstr "không thể lấy kiểu của đối tượng “%s” trong gói “%s”" -#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175 +#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335 #, c-format msgid "could not find pack '%s'" msgstr "không thể tìm thấy gói “%s”" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3378 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18808,7 +18862,7 @@ msgstr "" "cần ID đối tượng cạnh, nhận được rác:\n" " %s" -#: builtin/pack-objects.c:3224 +#: builtin/pack-objects.c:3384 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18817,248 +18871,248 @@ msgstr "" "cần ID đối tượng, nhận được rác:\n" " %s" -#: builtin/pack-objects.c:3322 +#: builtin/pack-objects.c:3482 msgid "invalid value for --missing" msgstr "giá trị cho --missing không hợp lệ" -#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490 +#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650 msgid "cannot open pack index" msgstr "không thể mở mục lục của gói" -#: builtin/pack-objects.c:3412 +#: builtin/pack-objects.c:3572 #, c-format msgid "loose object at %s could not be examined" msgstr "đối tượng mất tại %s không thể đã kiểm tra" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3658 msgid "unable to force loose object" msgstr "không thể buộc mất đối tượng" -#: builtin/pack-objects.c:3628 +#: builtin/pack-objects.c:3788 #, c-format msgid "not a rev '%s'" msgstr "không phải một rev “%s”" -#: builtin/pack-objects.c:3631 +#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061 #, c-format msgid "bad revision '%s'" msgstr "điểm xem xét sai “%s”" -#: builtin/pack-objects.c:3659 +#: builtin/pack-objects.c:3819 msgid "unable to add recent objects" msgstr "không thể thêm các đối tượng mới dùng" -#: builtin/pack-objects.c:3712 +#: builtin/pack-objects.c:3872 #, c-format msgid "unsupported index version %s" msgstr "phiên bản mục lục không được hỗ trợ %s" -#: builtin/pack-objects.c:3716 +#: builtin/pack-objects.c:3876 #, c-format msgid "bad index version '%s'" msgstr "phiên bản mục lục sai “%s”" -#: builtin/pack-objects.c:3755 +#: builtin/pack-objects.c:3915 msgid "<version>[,<offset>]" msgstr "<phiên bản>[,offset]" -#: builtin/pack-objects.c:3756 +#: builtin/pack-objects.c:3916 msgid "write the pack index file in the specified idx format version" msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho" -#: builtin/pack-objects.c:3759 +#: builtin/pack-objects.c:3919 msgid "maximum size of each output pack file" msgstr "kcíh thước tối đa cho tập tin gói được tạo" -#: builtin/pack-objects.c:3761 +#: builtin/pack-objects.c:3921 msgid "ignore borrowed objects from alternate object store" msgstr "bỏ qua các đối tượng vay mượn từ kho đối tượng thay thế" -#: builtin/pack-objects.c:3763 +#: builtin/pack-objects.c:3923 msgid "ignore packed objects" msgstr "bỏ qua các đối tượng đóng gói" -#: builtin/pack-objects.c:3765 +#: builtin/pack-objects.c:3925 msgid "limit pack window by objects" msgstr "giới hạn cửa sổ đóng gói theo đối tượng" -#: builtin/pack-objects.c:3767 +#: builtin/pack-objects.c:3927 msgid "limit pack window by memory in addition to object limit" msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng" -#: builtin/pack-objects.c:3769 +#: builtin/pack-objects.c:3929 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "độ dài tối đa của chuỗi móc xích “delta” được phép trong gói kết quả" -#: builtin/pack-objects.c:3771 +#: builtin/pack-objects.c:3931 msgid "reuse existing deltas" msgstr "dùng lại các delta sẵn có" -#: builtin/pack-objects.c:3773 +#: builtin/pack-objects.c:3933 msgid "reuse existing objects" msgstr "dùng lại các đối tượng sẵn có" -#: builtin/pack-objects.c:3775 +#: builtin/pack-objects.c:3935 msgid "use OFS_DELTA objects" msgstr "dùng các đối tượng OFS_DELTA" -#: builtin/pack-objects.c:3777 +#: builtin/pack-objects.c:3937 msgid "use threads when searching for best delta matches" msgstr "sử dụng các tuyến trình khi tìm kiếm cho các mẫu khớp delta tốt nhất" -#: builtin/pack-objects.c:3779 +#: builtin/pack-objects.c:3939 msgid "do not create an empty pack output" msgstr "không thể tạo kết xuất gói trống rỗng" -#: builtin/pack-objects.c:3781 +#: builtin/pack-objects.c:3941 msgid "read revision arguments from standard input" msgstr "đọc tham số “revision” từ thiết bị nhập chuẩn" -#: builtin/pack-objects.c:3783 +#: builtin/pack-objects.c:3943 msgid "limit the objects to those that are not yet packed" msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói" -#: builtin/pack-objects.c:3786 +#: builtin/pack-objects.c:3946 msgid "include objects reachable from any reference" msgstr "bao gồm các đối tượng có thể đọc được từ bất kỳ tham chiếu nào" -#: builtin/pack-objects.c:3789 +#: builtin/pack-objects.c:3949 msgid "include objects referred by reflog entries" msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog" -#: builtin/pack-objects.c:3792 +#: builtin/pack-objects.c:3952 msgid "include objects referred to by the index" msgstr "bao gồm các đối tượng được tham chiếu bởi mục lục" -#: builtin/pack-objects.c:3795 +#: builtin/pack-objects.c:3955 msgid "read packs from stdin" msgstr "đọc các gói từ đầu vào tiêu chuẩn" -#: builtin/pack-objects.c:3797 +#: builtin/pack-objects.c:3957 msgid "output pack to stdout" msgstr "xuất gói ra đầu ra tiêu chuẩn" -#: builtin/pack-objects.c:3799 +#: builtin/pack-objects.c:3959 msgid "include tag objects that refer to objects to be packed" msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói" -#: builtin/pack-objects.c:3801 +#: builtin/pack-objects.c:3961 msgid "keep unreachable objects" msgstr "giữ lại các đối tượng không thể đọc được" -#: builtin/pack-objects.c:3803 +#: builtin/pack-objects.c:3963 msgid "pack loose unreachable objects" msgstr "pack mất các đối tượng không thể đọc được" -#: builtin/pack-objects.c:3805 +#: builtin/pack-objects.c:3965 msgid "unpack unreachable objects newer than <time>" msgstr "" "xả nén (gỡ khỏi gói) các đối tượng không thể đọc được mới hơn <thời-gian>" -#: builtin/pack-objects.c:3808 +#: builtin/pack-objects.c:3968 msgid "use the sparse reachability algorithm" msgstr "sử dụng thuật toán “sparse reachability”" -#: builtin/pack-objects.c:3810 +#: builtin/pack-objects.c:3970 msgid "create thin packs" msgstr "tạo gói nhẹ" -#: builtin/pack-objects.c:3812 +#: builtin/pack-objects.c:3972 msgid "create packs suitable for shallow fetches" msgstr "tạo gói để phù hợp cho lấy về nông (shallow)" -#: builtin/pack-objects.c:3814 +#: builtin/pack-objects.c:3974 msgid "ignore packs that have companion .keep file" msgstr "bỏ qua các gói mà nó có tập tin .keep đi kèm" -#: builtin/pack-objects.c:3816 +#: builtin/pack-objects.c:3976 msgid "ignore this pack" msgstr "bỏ qua gói này" -#: builtin/pack-objects.c:3818 +#: builtin/pack-objects.c:3978 msgid "pack compression level" msgstr "mức nén gói" -#: builtin/pack-objects.c:3820 +#: builtin/pack-objects.c:3980 msgid "do not hide commits by grafts" msgstr "không ẩn các lần chuyển giao bởi “grafts”" -#: builtin/pack-objects.c:3822 +#: builtin/pack-objects.c:3982 msgid "use a bitmap index if available to speed up counting objects" msgstr "dùng mục lục ánh xạ nếu có thể được để nâng cao tốc độ đếm đối tượng" -#: builtin/pack-objects.c:3824 +#: builtin/pack-objects.c:3984 msgid "write a bitmap index together with the pack index" msgstr "ghi một mục lục ánh xạ cùng với mục lục gói" -#: builtin/pack-objects.c:3828 +#: builtin/pack-objects.c:3988 msgid "write a bitmap index if possible" msgstr "ghi mục lục ánh xạ nếu được" -#: builtin/pack-objects.c:3832 +#: builtin/pack-objects.c:3992 msgid "handling for missing objects" msgstr "xử lý cho thiếu đối tượng" -#: builtin/pack-objects.c:3835 +#: builtin/pack-objects.c:3995 msgid "do not pack objects in promisor packfiles" msgstr "không thể đóng gói các đối tượng trong các tập tin gói hứa hẹn" -#: builtin/pack-objects.c:3837 +#: builtin/pack-objects.c:3997 msgid "respect islands during delta compression" msgstr "tôn trọng island trong suốt quá trình nén “delta”" -#: builtin/pack-objects.c:3839 +#: builtin/pack-objects.c:3999 msgid "protocol" msgstr "giao thức" -#: builtin/pack-objects.c:3840 +#: builtin/pack-objects.c:4000 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "loại trừ bất kỳ cấu hình uploadpack.blobpackfileuri với giao thức này" -#: builtin/pack-objects.c:3873 +#: builtin/pack-objects.c:4033 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "mức sau xích delta %d là quá sâu, buộc dùng %d" -#: builtin/pack-objects.c:3878 +#: builtin/pack-objects.c:4038 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit là quá cao, ép dùng %d" -#: builtin/pack-objects.c:3934 +#: builtin/pack-objects.c:4094 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size không thể được sử dụng để xây dựng một gói để vận chuyển" -#: builtin/pack-objects.c:3936 +#: builtin/pack-objects.c:4096 msgid "minimum pack size limit is 1 MiB" msgstr "giới hạn kích thước tối thiểu của gói là 1 MiB" -#: builtin/pack-objects.c:3941 +#: builtin/pack-objects.c:4101 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin không thể được dùng để xây dựng gói đánh mục lục được" -#: builtin/pack-objects.c:3944 +#: builtin/pack-objects.c:4104 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable và --unpack-unreachable xung khắc nhau" -#: builtin/pack-objects.c:3950 +#: builtin/pack-objects.c:4110 msgid "cannot use --filter without --stdout" msgstr "không thể dùng tùy chọn --filter mà không có --stdout" -#: builtin/pack-objects.c:3952 +#: builtin/pack-objects.c:4112 msgid "cannot use --filter with --stdin-packs" msgstr "không thể dùng tùy chọn --filter với --stdin-packs" -#: builtin/pack-objects.c:3956 +#: builtin/pack-objects.c:4116 msgid "cannot use internal rev list with --stdin-packs" msgstr "không thể dùng danh sách rev bên trong với --stdin-packs" -#: builtin/pack-objects.c:4015 +#: builtin/pack-objects.c:4175 msgid "Enumerating objects" msgstr "Đánh số các đối tượng" -#: builtin/pack-objects.c:4052 +#: builtin/pack-objects.c:4212 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -19285,21 +19339,21 @@ msgstr "" "hoặc --ff-only trên dòng lệnh để ghi đè mặc định được cấu hình cho mỗi\n" "lần gọi.\n" -#: builtin/pull.c:991 +#: builtin/pull.c:990 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Đang cập nhật một nhánh chưa được sinh ra với các thay đổi được thêm vào " "bảng mục lục." -#: builtin/pull.c:995 +#: builtin/pull.c:994 msgid "pull with rebase" msgstr "pull với rebase" -#: builtin/pull.c:996 +#: builtin/pull.c:995 msgid "please commit or stash them." msgstr "xin hãy chuyển giao hoặc tạm cất (stash) chúng." -#: builtin/pull.c:1021 +#: builtin/pull.c:1020 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -19310,7 +19364,7 @@ msgstr "" "đang chuyển-tiếp-nhanh cây làm việc của bạn từ\n" "lần chuyển giaot %s." -#: builtin/pull.c:1027 +#: builtin/pull.c:1026 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -19328,15 +19382,15 @@ msgstr "" "$ git reset --hard\n" "để khôi phục lại." -#: builtin/pull.c:1042 +#: builtin/pull.c:1041 msgid "Cannot merge multiple branches into empty head." msgstr "Không thể hòa trộn nhiều nhánh vào trong một head trống rỗng." -#: builtin/pull.c:1046 +#: builtin/pull.c:1045 msgid "Cannot rebase onto multiple branches." msgstr "Không thể thực hiện lệnh rebase (cải tổ) trên nhiều nhánh." -#: builtin/pull.c:1067 +#: builtin/pull.c:1065 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "không thể cải tổ với các thay đổi mô-đun-con được ghi lại một cách cục bộ" @@ -19402,7 +19456,7 @@ msgstr "" "\n" " git push %s HEAD:<tên-của-nhánh-máy-chủ>\n" -#: builtin/push.c:194 +#: builtin/push.c:191 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -19416,12 +19470,19 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:202 +#: builtin/push.c:199 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "Nhánh hiện tại %s có nhiều nhánh thượng nguồn, từ chối push." -#: builtin/push.c:205 +#: builtin/push.c:217 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" +"Bạn đã không chỉ ra một refspecs nào để đẩy lên, và push.default là \"không " +"là gì cả\"." + +#: builtin/push.c:243 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -19433,14 +19494,7 @@ msgstr "" "nhánh hiện tại “%s” của bạn, mà không báo cho tôi biết là cái gì được push\n" "để cập nhật nhánh máy chủ nào." -#: builtin/push.c:260 -msgid "" -"You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "" -"Bạn đã không chỉ ra một refspecs nào để đẩy lên, và push.default là \"không " -"là gì cả\"." - -#: builtin/push.c:267 +#: builtin/push.c:258 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -19453,7 +19507,7 @@ msgstr "" "Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi " "tiết." -#: builtin/push.c:273 +#: builtin/push.c:264 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -19467,7 +19521,7 @@ msgstr "" "Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi " "tiết." -#: builtin/push.c:279 +#: builtin/push.c:270 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -19482,11 +19536,11 @@ msgstr "" "Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi " "tiết." -#: builtin/push.c:286 +#: builtin/push.c:277 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Việc cập nhật bị từ chối bởi vì thẻ đã sẵn có từ trước trên máy chủ." -#: builtin/push.c:289 +#: builtin/push.c:280 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -19498,7 +19552,7 @@ msgstr "" "đối tượng\n" "không phải chuyển giao, mà không sử dụng tùy chọn “--force”.\n" -#: builtin/push.c:294 +#: builtin/push.c:285 msgid "" "Updates were rejected because the tip of the remote-tracking\n" "branch has been updated since the last checkout. You may want\n" @@ -19510,103 +19564,103 @@ msgstr "" "tích hợp các thay đổi này một cách cục bộ (v.d. \"git pull …\")\n" "trước khi ép buộc một cập nhật.\n" -#: builtin/push.c:364 +#: builtin/push.c:355 #, c-format msgid "Pushing to %s\n" msgstr "Đang đẩy lên %s\n" -#: builtin/push.c:371 +#: builtin/push.c:362 #, c-format msgid "failed to push some refs to '%s'" msgstr "gặp lỗi khi đẩy tới một số tham chiếu đến “%s”" -#: builtin/push.c:553 +#: builtin/push.c:544 msgid "repository" msgstr "kho" -#: builtin/push.c:554 builtin/send-pack.c:189 +#: builtin/push.c:545 builtin/send-pack.c:189 msgid "push all refs" msgstr "đẩy tất cả các tham chiếu" -#: builtin/push.c:555 builtin/send-pack.c:191 +#: builtin/push.c:546 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "mirror tất cả các tham chiếu" -#: builtin/push.c:557 +#: builtin/push.c:548 msgid "delete refs" msgstr "xóa các tham chiếu" -#: builtin/push.c:558 +#: builtin/push.c:549 msgid "push tags (can't be used with --all or --mirror)" msgstr "đẩy các thẻ (không dùng cùng với --all hay --mirror)" -#: builtin/push.c:561 builtin/send-pack.c:192 +#: builtin/push.c:552 builtin/send-pack.c:192 msgid "force updates" msgstr "ép buộc cập nhật" -#: builtin/push.c:562 builtin/send-pack.c:204 +#: builtin/push.c:553 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "<tên-tham-chiếu>:<cần>" -#: builtin/push.c:563 builtin/send-pack.c:205 +#: builtin/push.c:554 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "yêu cầu giá-trị cũ của tham chiếu thì là giá-trị này" -#: builtin/push.c:566 builtin/send-pack.c:208 +#: builtin/push.c:557 builtin/send-pack.c:208 msgid "require remote updates to be integrated locally" msgstr "yêu cầu máy chủ cập nhật để thích hợp với máy cục bộ" -#: builtin/push.c:569 +#: builtin/push.c:560 msgid "control recursive pushing of submodules" msgstr "điều khiển việc đẩy lên (push) đệ qui của mô-đun-con" -#: builtin/push.c:570 builtin/send-pack.c:199 +#: builtin/push.c:561 builtin/send-pack.c:199 msgid "use thin pack" msgstr "tạo gói nhẹ" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186 #: builtin/send-pack.c:187 msgid "receive pack program" msgstr "chương trình nhận gói" -#: builtin/push.c:573 +#: builtin/push.c:564 msgid "set upstream for git pull/status" msgstr "đặt thượng nguồn cho git pull/status" -#: builtin/push.c:576 +#: builtin/push.c:567 msgid "prune locally removed refs" msgstr "xén tỉa những tham chiếu bị gỡ bỏ" -#: builtin/push.c:578 +#: builtin/push.c:569 msgid "bypass pre-push hook" msgstr "vòng qua móc tiền-đẩy (pre-push)" -#: builtin/push.c:579 +#: builtin/push.c:570 msgid "push missing but relevant tags" msgstr "push phần bị thiếu nhưng các thẻ lại thích hợp" -#: builtin/push.c:581 builtin/send-pack.c:193 +#: builtin/push.c:572 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "ký lần đẩy dùng GPG" -#: builtin/push.c:583 builtin/send-pack.c:200 +#: builtin/push.c:574 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "yêu cầu giao dịch hạt nhân bên phía máy chủ" -#: builtin/push.c:601 +#: builtin/push.c:592 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete là xung khắc với các tùy chọn --all, --mirror và --tags" -#: builtin/push.c:603 +#: builtin/push.c:594 msgid "--delete doesn't make sense without any refs" msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu nào" -#: builtin/push.c:623 +#: builtin/push.c:614 #, c-format msgid "bad repository '%s'" msgstr "repository (kho) sai “%s”" -#: builtin/push.c:624 +#: builtin/push.c:615 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -19627,27 +19681,27 @@ msgstr "" "\n" " git push <tên>\n" -#: builtin/push.c:639 +#: builtin/push.c:630 msgid "--all and --tags are incompatible" msgstr "--all và --tags xung khắc nhau" -#: builtin/push.c:641 +#: builtin/push.c:632 msgid "--all can't be combined with refspecs" msgstr "--all không thể được tổ hợp cùng với đặc tả đường dẫn" -#: builtin/push.c:645 +#: builtin/push.c:636 msgid "--mirror and --tags are incompatible" msgstr "--mirror và --tags xung khắc nhau" -#: builtin/push.c:647 +#: builtin/push.c:638 msgid "--mirror can't be combined with refspecs" msgstr "--mirror không thể được tổ hợp cùng với đặc tả đường dẫn" -#: builtin/push.c:650 +#: builtin/push.c:641 msgid "--all and --mirror are incompatible" msgstr "--all và --mirror xung khắc nhau" -#: builtin/push.c:657 +#: builtin/push.c:648 msgid "push options must not have new line characters" msgstr "các tùy chọn push phải không có ký tự dòng mới" @@ -20237,7 +20291,7 @@ msgstr "" "Hành động “--edit-todo” chỉ có thể dùng trong quá trình “rebase” (sửa lịch " "sử) tương tác." -#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122 msgid "Cannot read HEAD" msgstr "Không thể đọc HEAD" @@ -20343,8 +20397,8 @@ msgstr "Không chỉ đến một lần chuyển giao không hợp lệ “%s” msgid "fatal: no such branch/commit '%s'" msgstr "nghiêm trọng: không có nhánh/lần chuyển giao “%s” như thế" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:2415 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:39 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Không có tham chiếu nào như thế: %s" @@ -20413,7 +20467,7 @@ msgstr "Chuyển-tiếp-nhanh %s đến %s.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <thư-mục-git>" -#: builtin/receive-pack.c:1276 +#: builtin/receive-pack.c:1275 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" @@ -20443,7 +20497,7 @@ msgstr "" "Để chấm dứt lời nhắn này và vẫn giữ cách ứng xử mặc định, hãy đặt\n" "biến cấu hình “receive.denyCurrentBranch” thành “refuse”." -#: builtin/receive-pack.c:1296 +#: builtin/receive-pack.c:1295 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" @@ -20464,11 +20518,11 @@ msgstr "" "\n" "Để chấm dứt lời nhắn này, bạn hãy đặt nó thành “refuse”." -#: builtin/receive-pack.c:2479 +#: builtin/receive-pack.c:2478 msgid "quiet" msgstr "im lặng" -#: builtin/receive-pack.c:2493 +#: builtin/receive-pack.c:2492 msgid "You must specify a directory." msgstr "Bạn phải chỉ định thư mục." @@ -21442,15 +21496,15 @@ msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "" "git rerere [clear | forget <đường dẫn>… | status | remaining | diff | gc]" -#: builtin/rerere.c:60 +#: builtin/rerere.c:58 msgid "register clean resolutions in index" msgstr "sổ ghi dọn sạch các phân giải trong bản mục lục" -#: builtin/rerere.c:79 +#: builtin/rerere.c:77 msgid "'git rerere forget' without paths is deprecated" msgstr "“git rerere forget” mà không có các đường dẫn là đã lạc hậu" -#: builtin/rerere.c:113 +#: builtin/rerere.c:111 #, c-format msgid "unable to generate diff for '%s'" msgstr "không thể tạo khác biệt cho “%s”" @@ -21604,19 +21658,19 @@ msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét msgid "Could not write new index file." msgstr "Không thể ghi tập tin lưu bảng mục lục mới." -#: builtin/rev-list.c:538 +#: builtin/rev-list.c:541 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "không thể tổ hợp --exclude-promisor-objects và --missing" -#: builtin/rev-list.c:599 +#: builtin/rev-list.c:602 msgid "object filtering requires --objects" msgstr "lọc đối tượng yêu cầu --objects" -#: builtin/rev-list.c:659 +#: builtin/rev-list.c:674 msgid "rev-list does not support display of notes" msgstr "rev-list không hỗ trợ hiển thị các ghi chú" -#: builtin/rev-list.c:664 +#: builtin/rev-list.c:679 msgid "marked counting is incompatible with --objects" msgstr "được đánh dấu đếm là xung khắc với --objects" @@ -21636,6 +21690,18 @@ msgstr "dừng phân tích sau đối số đầu tiên không có tùy chọn" msgid "output in stuck long form" msgstr "kết xuất trong định dạng gậy dài" +#: builtin/rev-parse.c:438 +msgid "premature end of input" +msgstr "đầu vào chấm dứt bất thường" + +#: builtin/rev-parse.c:442 +msgid "no usage string given before the `--' separator" +msgstr "không có chuỗi cách dùng nào được đưa ra trước dấu phân cách '--'" + +#: builtin/rev-parse.c:548 +msgid "Needed a single revision" +msgstr "Cần một điểm xét duyệt đơn" + #: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" @@ -21650,6 +21716,50 @@ msgstr "" "\n" "Chạy lệnh \"git rev-parse --parseopt -h\" để có thêm thông tin về cách dùng." +#: builtin/rev-parse.c:712 +msgid "--resolve-git-dir requires an argument" +msgstr "--resolve-git-dir cần một tham số" + +#: builtin/rev-parse.c:715 +#, c-format +msgid "not a gitdir '%s'" +msgstr "không phải một thư mục git “%s”" + +#: builtin/rev-parse.c:739 +msgid "--git-path requires an argument" +msgstr "--git-path cần một tham số" + +#: builtin/rev-parse.c:749 +msgid "-n requires an argument" +msgstr "-n cần một tham số" + +#: builtin/rev-parse.c:763 +msgid "--path-format requires an argument" +msgstr "--path-format cần một tham số" + +#: builtin/rev-parse.c:769 +#, c-format +msgid "unknown argument to --path-format: %s" +msgstr "không hiều tham số cho --patch-format: %s" + +#: builtin/rev-parse.c:776 +msgid "--default requires an argument" +msgstr "--default cần một tham số" + +#: builtin/rev-parse.c:782 +msgid "--prefix requires an argument" +msgstr "--prefix cần một tham số" + +#: builtin/rev-parse.c:851 +#, c-format +msgid "unknown mode for --abbrev-ref: %s" +msgstr "không hiểu chế độ cho --abbrev-ref: %s" + +#: builtin/rev-parse.c:1023 +#, c-format +msgid "unknown mode for --show-object-format: %s" +msgstr "không hiểu chế độ cho --show-object-format: %s" + #: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<các tùy chọn>] <commit-ish>…" @@ -22192,10 +22302,6 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <tên-nhánh> [<stash>]" -#: builtin/stash.c:29 builtin/stash.c:70 -msgid "git stash clear" -msgstr "git stash clear" - #: builtin/stash.c:30 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" @@ -22345,93 +22451,93 @@ msgstr "bao gồm các tập tin không được theo dõi trong stash" msgid "only show untracked files in the stash" msgstr "chỉ hiển thị các tập tin không được theo dõi trong stash" -#: builtin/stash.c:932 builtin/stash.c:969 +#: builtin/stash.c:929 builtin/stash.c:966 #, c-format msgid "Cannot update %s with %s" msgstr "Không thể cập nhật %s với %s" -#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671 +#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667 msgid "stash message" msgstr "phần chú thích cho stash" -#: builtin/stash.c:960 +#: builtin/stash.c:957 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" cần một đối số <lần chuyển giao>" -#: builtin/stash.c:1175 +#: builtin/stash.c:1171 msgid "No changes selected" msgstr "Chưa có thay đổi nào được chọn" -#: builtin/stash.c:1275 +#: builtin/stash.c:1271 msgid "You do not have the initial commit yet" msgstr "Bạn chưa còn có lần chuyển giao khởi tạo" -#: builtin/stash.c:1302 +#: builtin/stash.c:1298 msgid "Cannot save the current index state" msgstr "Không thể ghi lại trạng thái bảng mục lục hiện hành" -#: builtin/stash.c:1311 +#: builtin/stash.c:1307 msgid "Cannot save the untracked files" msgstr "Không thể ghi lại các tập tin chưa theo dõi" -#: builtin/stash.c:1322 builtin/stash.c:1331 +#: builtin/stash.c:1318 builtin/stash.c:1327 msgid "Cannot save the current worktree state" msgstr "Không thể ghi lại trạng thái cây-làm-việc hiện hành" -#: builtin/stash.c:1359 +#: builtin/stash.c:1355 msgid "Cannot record working tree state" msgstr "Không thể ghi lại trạng thái cây làm việc hiện hành" -#: builtin/stash.c:1408 +#: builtin/stash.c:1404 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Không thể dùng --patch và --include-untracked hay --all cùng một lúc" -#: builtin/stash.c:1426 +#: builtin/stash.c:1422 msgid "Did you forget to 'git add'?" msgstr "Có lẽ bạn đã quên “git add ” phải không?" -#: builtin/stash.c:1441 +#: builtin/stash.c:1437 msgid "No local changes to save" msgstr "Không có thay đổi nội bộ nào được ghi lại" -#: builtin/stash.c:1448 +#: builtin/stash.c:1444 msgid "Cannot initialize stash" msgstr "Không thể khởi tạo stash" -#: builtin/stash.c:1463 +#: builtin/stash.c:1459 msgid "Cannot save the current status" msgstr "Không thể ghi lại trạng thái hiện hành" -#: builtin/stash.c:1468 +#: builtin/stash.c:1464 #, c-format msgid "Saved working directory and index state %s" msgstr "Đã ghi lại thư mục làm việc và trạng thái mục lục %s" -#: builtin/stash.c:1558 +#: builtin/stash.c:1554 msgid "Cannot remove worktree changes" msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc" -#: builtin/stash.c:1597 builtin/stash.c:1662 +#: builtin/stash.c:1593 builtin/stash.c:1658 msgid "keep index" msgstr "giữ nguyên bảng mục lục" -#: builtin/stash.c:1599 builtin/stash.c:1664 +#: builtin/stash.c:1595 builtin/stash.c:1660 msgid "stash in patch mode" msgstr "cất đi ở chế độ miếng vá" -#: builtin/stash.c:1600 builtin/stash.c:1665 +#: builtin/stash.c:1596 builtin/stash.c:1661 msgid "quiet mode" msgstr "chế độ im lặng" -#: builtin/stash.c:1602 builtin/stash.c:1667 +#: builtin/stash.c:1598 builtin/stash.c:1663 msgid "include untracked files in stash" msgstr "bao gồm các tập tin không được theo dõi trong stash" -#: builtin/stash.c:1604 builtin/stash.c:1669 +#: builtin/stash.c:1600 builtin/stash.c:1665 msgid "include ignore files" msgstr "bao gồm các tập tin bị bỏ qua" -#: builtin/stash.c:1704 +#: builtin/stash.c:1700 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -22455,40 +22561,40 @@ msgstr "giữ và xóa bỏ mọi dòng bắt đầu bằng ký tự ghi chú" msgid "prepend comment character and space to each line" msgstr "treo trước ký tự ghi chú và ký tự khoảng trắng cho từng dòng" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Cần tên tham chiếu dạng đầy đủ, nhưng lại nhận được %s" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:63 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote takes không nhận tham số" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:101 #, c-format msgid "cannot strip one component off url '%s'" msgstr "không thể cắt bỏ một thành phần ra khỏi “%s” url" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "điểm neo thay thế cho các đường dẫn tương đối" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:414 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=</đường/dẫn>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Không tìm thấy url cho đường dẫn mô-đun-con “%s” trong .gitmodules" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "Đang vào “%s”\n" -#: builtin/submodule--helper.c:528 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22497,7 +22603,7 @@ msgstr "" "run_command trả về trạng thái khác không cho %s\n" "." -#: builtin/submodule--helper.c:550 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22508,20 +22614,20 @@ msgstr "" "con lồng nhau của %s\n" "." -#: builtin/submodule--helper.c:566 +#: builtin/submodule--helper.c:565 msgid "suppress output of entering each submodule command" msgstr "chặn kết xuất của từng lệnh mô-đun-con" -#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889 -#: builtin/submodule--helper.c:1488 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:1487 msgid "recurse into nested submodules" msgstr "đệ quy vào trong mô-đun-con lồng nhau" -#: builtin/submodule--helper.c:573 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <lệnh>" -#: builtin/submodule--helper.c:600 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -22530,56 +22636,56 @@ msgstr "" "không thể tìm thấy cấu hình “%s”. Coi rằng đây là kho thượng nguồn có quyền " "sở hữu chính nó." -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:666 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:670 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:680 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "cảnh báo: chế độ lệnh cập nhật được gợi ý cho mô-đun-con “%s”\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:687 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:709 msgid "suppress output for initializing a submodule" msgstr "chặn kết xuất của khởi tạo một mô-đun-con" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<các tùy chọn>] [</đường/dẫn>]" -#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đường dẫn " "“%s”" -#: builtin/submodule--helper.c:836 +#: builtin/submodule--helper.c:835 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "không thể phân giải tham chiếu HEAD bên trong mô-đun-con “%s”" -#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "gặp lỗi khi đệ quy vào trong mô-đun-con “%s”" -#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "suppress submodule status output" msgstr "chặn kết xuất về tình trạng mô-đun-con" -#: builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:887 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -22587,103 +22693,102 @@ msgstr "" "dùng lần chuyển giao lưu trong mục lục thay cho cái được lưu trong HEAD mô-" "đun-con" -#: builtin/submodule--helper.c:894 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "" "git submodule status [--quiet] [--cached] [--recursive] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:918 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name </đường/dẫn>" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:989 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "" "* %s %s(blob)->%s(\n" ")" -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:992 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(mô-đun-con)->%s(blob)" -#: builtin/submodule--helper.c:1006 +#: builtin/submodule--helper.c:1005 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1056 +#: builtin/submodule--helper.c:1055 #, c-format msgid "couldn't hash object from '%s'" msgstr "không thể băm đối tượng từ “%s”" -#: builtin/submodule--helper.c:1060 +#: builtin/submodule--helper.c:1059 #, c-format msgid "unexpected mode %o\n" msgstr "gặp chế độ không như mong chờ %o\n" -#: builtin/submodule--helper.c:1301 +#: builtin/submodule--helper.c:1300 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "hùng lần chuyển giao đã lưu trong mục lục thay cho HEAD mô-đun-con" -#: builtin/submodule--helper.c:1303 -msgid "to compare the commit in the index with that in the submodule HEAD" -msgstr "" -"để so sánh lần chuyển giao lưu trong mục lục với cái trong HEAD mô-đun-con" +#: builtin/submodule--helper.c:1302 +msgid "compare the commit in the index with that in the submodule HEAD" +msgstr "để so sánh lần trong mục lục với cái trong HEAD mô-đun-con" -#: builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1304 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "" "bỏ qua các mô-đun-con với giá trị của “ignore_config” được đặt thành “all”" -#: builtin/submodule--helper.c:1307 +#: builtin/submodule--helper.c:1306 msgid "limit the summary size" msgstr "giới hạn kích cỡ tổng hợp" -#: builtin/submodule--helper.c:1312 +#: builtin/submodule--helper.c:1311 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "" "git submodule--helper summary [<các tùy chọn>] [<lần_chuyển_giao>] [--] [</" "đường/dẫn>]" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1335 msgid "could not fetch a revision for HEAD" msgstr "không thể lấy về một điểm xem xét cho HEAD" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1340 msgid "--cached and --files are mutually exclusive" msgstr "Các tùy chọn --cached và --files loại từ lẫn nhau" -#: builtin/submodule--helper.c:1408 +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Url mô-đun-con đồng bộ hóa cho “%s”\n" -#: builtin/submodule--helper.c:1414 +#: builtin/submodule--helper.c:1413 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:1428 +#: builtin/submodule--helper.c:1427 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "gặp lỗi khi lấy máy chủ mặc định cho mô-đun-con “%s”" -#: builtin/submodule--helper.c:1439 +#: builtin/submodule--helper.c:1438 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "gặp lỗi khi cập nhật cho mô-đun-con “%s”" -#: builtin/submodule--helper.c:1486 +#: builtin/submodule--helper.c:1485 msgid "suppress output of synchronizing submodule url" msgstr "chặn kết xuất của url mô-đun-con đồng bộ" -#: builtin/submodule--helper.c:1493 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [</đường/dẫn>]" -#: builtin/submodule--helper.c:1547 +#: builtin/submodule--helper.c:1546 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -22692,7 +22797,7 @@ msgstr "" "Cây làm việc mô-đun-con “%s” có chứa thư mục .git (dùng “rm -rf” nếu bạn " "thực sự muốn gỡ bỏ nó cùng với toàn bộ lịch sử của chúng)" -#: builtin/submodule--helper.c:1559 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -22701,45 +22806,45 @@ msgstr "" "Cây làm việc mô-đun-con “%s” chứa các thay đổi nội bộ; hãy dùng “-f” để loại " "bỏ chúng đi" -#: builtin/submodule--helper.c:1567 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "Đã xóa thư mục “%s”\n" -#: builtin/submodule--helper.c:1569 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Không thể gỡ bỏ cây làm việc mô-đun-con “%s”\n" -#: builtin/submodule--helper.c:1580 +#: builtin/submodule--helper.c:1579 #, c-format msgid "could not create empty submodule directory %s" msgstr "không thể tạo thư mục mô-đun-con rỗng “%s”" -#: builtin/submodule--helper.c:1596 +#: builtin/submodule--helper.c:1595 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1624 msgid "remove submodule working trees even if they contain local changes" msgstr "gỡ bỏ cây làm việc của mô-đun-con ngay cả khi nó có thay đổi nội bộ" -#: builtin/submodule--helper.c:1626 +#: builtin/submodule--helper.c:1625 msgid "unregister all submodules" msgstr "bỏ đăng ký tất cả các trong mô-đun-con" -#: builtin/submodule--helper.c:1631 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [</đường/dẫn>…]]" -#: builtin/submodule--helper.c:1645 +#: builtin/submodule--helper.c:1644 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Dùng “--all” nếu bạn thực sự muốn hủy khởi tạo mọi mô-đun-con" -#: builtin/submodule--helper.c:1714 +#: builtin/submodule--helper.c:1713 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -22754,46 +22859,46 @@ msgstr "" "bằng\n" "“--reference-if-able” thay vì dùng “--reference”." -#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756 +#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "mô-đun-con “%s” không thể thêm thay thế: %s" -#: builtin/submodule--helper.c:1792 +#: builtin/submodule--helper.c:1791 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Giá trị “%s” cho submodule.alternateErrorStrategy không được thừa nhận" -#: builtin/submodule--helper.c:1799 +#: builtin/submodule--helper.c:1798 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Giá trị “%s” cho submodule.alternateLocation không được thừa nhận" -#: builtin/submodule--helper.c:1823 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "nhân bản mô-đun-con mới vào chỗ nào" -#: builtin/submodule--helper.c:1826 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "tên của mô-đun-con mới" -#: builtin/submodule--helper.c:1829 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "url nơi mà nhân bản mô-đun-con từ đó" -#: builtin/submodule--helper.c:1837 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "chiều sâu lịch sử khi tạo bản sao" -#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "ép buộc tiến trình nhân bản" -#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 msgid "disallow cloning into non-empty directory" msgstr "làm đầy đủ dữ liệu cho bản sao vào trong một thư mục trống rỗng" -#: builtin/submodule--helper.c:1849 +#: builtin/submodule--helper.c:1848 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22803,105 +22908,105 @@ msgstr "" "<kho>] [--name <tên>] [--depth <sâu>] [--single-branch] [--url <url>] --path " "</đường/dẫn>" -#: builtin/submodule--helper.c:1874 +#: builtin/submodule--helper.c:1873 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "từ chối tạo/dùng “%s” trong một thư mục git của mô đun con" -#: builtin/submodule--helper.c:1885 +#: builtin/submodule--helper.c:1884 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "việc sao “%s” vào đường dẫn mô-đun-con “%s” gặp lỗi" -#: builtin/submodule--helper.c:1889 +#: builtin/submodule--helper.c:1888 #, c-format msgid "directory not empty: '%s'" msgstr "thư mục không trống: “%s”" -#: builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" msgstr "không thể lấy thư mục mô-đun-con cho “%s”" -#: builtin/submodule--helper.c:1937 +#: builtin/submodule--helper.c:1936 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Chế độ cập nhật “%s” không hợp lệ cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:1941 +#: builtin/submodule--helper.c:1940 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Chế độ cập nhật “%s” không hợp lệ được cấu hình cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:2042 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Đường dẫn mô-đun-con “%s” chưa được khởi tạo" -#: builtin/submodule--helper.c:2046 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "Có lẽ bạn là bạn muốn dùng \"update --init\" phải không?" -#: builtin/submodule--helper.c:2076 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Bỏ qua các mô-đun-con chưa được hòa trộn %s" -#: builtin/submodule--helper.c:2105 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "Bỏ qua mô-đun-con “%s”" -#: builtin/submodule--helper.c:2255 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Gặp lỗi khi nhân bản “%s”. Thử lại lịch trình" -#: builtin/submodule--helper.c:2266 +#: builtin/submodule--helper.c:2265 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Gặp lỗi khi nhân bản “%s” lần thứ hai nên bãi bỏ" -#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "đường dẫn đến cây làm việc" -#: builtin/submodule--helper.c:2331 +#: builtin/submodule--helper.c:2330 msgid "path into the working tree, across nested submodule boundaries" msgstr "đường dẫn đến cây làm việc, chéo biên giới mô-đun-con lồng nhau" -#: builtin/submodule--helper.c:2335 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout hoặc không làm gì cả" -#: builtin/submodule--helper.c:2341 +#: builtin/submodule--helper.c:2340 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "" "tạo một bản sao nông được cắt ngắn thành số lượng điểm xét duyệt đã cho" -#: builtin/submodule--helper.c:2344 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "công việc đồng thời" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2345 msgid "whether the initial clone should follow the shallow recommendation" msgstr "nhân bản lần đầu có nên theo khuyến nghị là nông hay không" -#: builtin/submodule--helper.c:2347 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "đừng in tiến trình nhân bản" -#: builtin/submodule--helper.c:2358 +#: builtin/submodule--helper.c:2357 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "" "git submodule--helper update-clone [--prefix=</đường/dẫn>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:2371 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "giá trị cho tham số cập nhật bị sai" -#: builtin/submodule--helper.c:2419 +#: builtin/submodule--helper.c:2418 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -22910,86 +23015,86 @@ msgstr "" "Nhánh mô-đun-con (%s) được cấu hình kế thừa nhánh từ siêu dự án, nhưng siêu " "dự án lại không trên bất kỳ nhánh nào" -#: builtin/submodule--helper.c:2542 +#: builtin/submodule--helper.c:2541 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "không thể lấy thẻ quản kho cho mô-đun-con “%s”" -#: builtin/submodule--helper.c:2575 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "đệ quy vào trong mô-đun-con" -#: builtin/submodule--helper.c:2581 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<các tùy chọn>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:2637 +#: builtin/submodule--helper.c:2636 msgid "check if it is safe to write to the .gitmodules file" msgstr "chọn nếu nó là an toàn để ghi vào tập tin .gitmodules" -#: builtin/submodule--helper.c:2640 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "bỏ đặt cấu hình trong tập tin .gitmodules" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <tên> [<giá trị>]" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <tên>" -#: builtin/submodule--helper.c:2647 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2666 git-submodule.sh:150 +#: builtin/submodule--helper.c:2665 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "hãy đảm bảo rằng tập tin .gitmodules có trong cây làm việc" -#: builtin/submodule--helper.c:2682 +#: builtin/submodule--helper.c:2681 msgid "suppress output for setting url of a submodule" msgstr "chặn kết xuất cho cài đặt url của một mô-đun-con" -#: builtin/submodule--helper.c:2686 +#: builtin/submodule--helper.c:2685 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] </đường/dẫn> <url_mới>" -#: builtin/submodule--helper.c:2719 +#: builtin/submodule--helper.c:2718 msgid "set the default tracking branch to master" msgstr "đặt nhánh theo dõi mặc định thành master" -#: builtin/submodule--helper.c:2721 +#: builtin/submodule--helper.c:2720 msgid "set the default tracking branch" msgstr "đặt nhánh theo dõi mặc định" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2724 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet](-d|--default)</đường/dẫn>" -#: builtin/submodule--helper.c:2726 +#: builtin/submodule--helper.c:2725 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <nhánh> </đường/" "dẫn>" -#: builtin/submodule--helper.c:2733 +#: builtin/submodule--helper.c:2732 msgid "--branch or --default required" msgstr "cần --branch hoặc --default" -#: builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2735 msgid "--branch and --default are mutually exclusive" msgstr "Các tùy chọn --branch và --default loại từ lẫn nhau" -#: builtin/submodule--helper.c:2793 git.c:449 git.c:724 +#: builtin/submodule--helper.c:2792 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s không hỗ trợ --super-prefix" -#: builtin/submodule--helper.c:2799 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "“%s” không phải là lệnh con submodule--helper hợp lệ" @@ -23619,7 +23724,7 @@ msgstr "git worktree remove [<các tùy chọn>] <worktree>" msgid "git worktree unlock <path>" msgstr "git worktree unlock </đường/dẫn>" -#: builtin/worktree.c:61 builtin/worktree.c:935 +#: builtin/worktree.c:61 builtin/worktree.c:944 #, c-format msgid "failed to delete '%s'" msgstr "gặp lỗi khi xóa “%s”" @@ -23629,25 +23734,25 @@ msgstr "gặp lỗi khi xóa “%s”" msgid "Removing %s/%s: %s" msgstr "Đang xóa %s/%s: %s" -#: builtin/worktree.c:149 +#: builtin/worktree.c:147 msgid "report pruned working trees" msgstr "báo cáo các cây làm việc đã prune" -#: builtin/worktree.c:151 +#: builtin/worktree.c:149 msgid "expire working trees older than <time>" msgstr "các cây làm việc hết hạn cũ hơn khoảng <thời gian>" -#: builtin/worktree.c:221 +#: builtin/worktree.c:219 #, c-format msgid "'%s' already exists" msgstr "“%s” đã có từ trước rồi" -#: builtin/worktree.c:230 +#: builtin/worktree.c:228 #, c-format msgid "unusable worktree destination '%s'" msgstr "đích cây làm việc không sử dụng được “%s”" -#: builtin/worktree.c:235 +#: builtin/worktree.c:233 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -23656,7 +23761,7 @@ msgstr "" "“%s” bị mất nhưng cây làm việc bị khóa;\n" "dùng “%s -f -f” để ghi đè, hoặc “unlock” và “prune” hay “remove” để xóa" -#: builtin/worktree.c:237 +#: builtin/worktree.c:235 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -23665,27 +23770,31 @@ msgstr "" "“%s” bị mất nhưng cây làm việc đã được đăng ký;\n" "dùng “%s -f” để ghi đè, hoặc “prune” hay “remove” để xóa" -#: builtin/worktree.c:288 +#: builtin/worktree.c:286 #, c-format msgid "could not create directory of '%s'" msgstr "không thể tạo thư mục của “%s”" -#: builtin/worktree.c:422 builtin/worktree.c:428 +#: builtin/worktree.c:308 +msgid "initializing" +msgstr "khởi tạo" + +#: builtin/worktree.c:420 builtin/worktree.c:426 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Đang chuẩn bị cây làm việc (nhánh mới “%s”)" -#: builtin/worktree.c:424 +#: builtin/worktree.c:422 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Đang chuẩn bị cây làm việc (đang cài đặt nhánh “%s”, trước đây tại %s)" -#: builtin/worktree.c:433 +#: builtin/worktree.c:431 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Đang chuẩn bị cây làm việc (đang lấy ra “%s”)" -#: builtin/worktree.c:439 +#: builtin/worktree.c:437 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Đang chuẩn bị cây làm việc (HEAD đã tách rời “%s”)" @@ -23710,84 +23819,92 @@ msgstr "di chuyển cây làm việc mới" msgid "keep the new working tree locked" msgstr "giữ cây làm việc mới bị khóa" -#: builtin/worktree.c:493 +#: builtin/worktree.c:492 builtin/worktree.c:729 +msgid "reason for locking" +msgstr "lý do khóa" + +#: builtin/worktree.c:495 msgid "set up tracking mode (see git-branch(1))" msgstr "cài đặt chế độ theo dõi (xem git-branch(1))" -#: builtin/worktree.c:496 +#: builtin/worktree.c:498 msgid "try to match the new branch name with a remote-tracking branch" msgstr "có khớp tên tên nhánh mới với một nhánh theo dõi máy chủ" -#: builtin/worktree.c:504 +#: builtin/worktree.c:506 msgid "-b, -B, and --detach are mutually exclusive" msgstr "Các tùy chọn -b, -B, và --detach loại từ lẫn nhau" -#: builtin/worktree.c:565 +#: builtin/worktree.c:508 +msgid "--reason requires --lock" +msgstr "--reason cần --lock" + +#: builtin/worktree.c:512 +msgid "added with --lock" +msgstr "được thêm với --lock" + +#: builtin/worktree.c:574 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track chỉ có thể được dùng nếu một nhánh mới được tạo" -#: builtin/worktree.c:682 +#: builtin/worktree.c:691 msgid "show extended annotations and reasons, if available" msgstr "hiển thị chú thích và lý do mở rộng, nếu có" -#: builtin/worktree.c:684 +#: builtin/worktree.c:693 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "" "thêm chú thích kiểu 'prunable' cho các cây làm việc hết hạn cũ hơn khoảng " "<thời gian>" -#: builtin/worktree.c:693 +#: builtin/worktree.c:702 msgid "--verbose and --porcelain are mutually exclusive" msgstr "--verbose và --porcelain loại từ lẫn nhau" -#: builtin/worktree.c:720 -msgid "reason for locking" -msgstr "lý do khóa" - -#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839 -#: builtin/worktree.c:963 +#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 +#: builtin/worktree.c:972 #, c-format msgid "'%s' is not a working tree" msgstr "%s không phải là cây làm việc" -#: builtin/worktree.c:734 builtin/worktree.c:767 +#: builtin/worktree.c:743 builtin/worktree.c:776 msgid "The main working tree cannot be locked or unlocked" msgstr "Cây thư mục làm việc chính không thể khóa hay bỏ khóa được" -#: builtin/worktree.c:739 +#: builtin/worktree.c:748 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "“%s” đã được khóa rồi, lý do: %s" -#: builtin/worktree.c:741 +#: builtin/worktree.c:750 #, c-format msgid "'%s' is already locked" msgstr "“%s” đã được khóa rồi" -#: builtin/worktree.c:769 +#: builtin/worktree.c:778 #, c-format msgid "'%s' is not locked" msgstr "“%s” chưa bị khóa" -#: builtin/worktree.c:810 +#: builtin/worktree.c:819 msgid "working trees containing submodules cannot be moved or removed" msgstr "cây làm việc có chứa mô-đun-con không thể di chuyển hay xóa bỏ" -#: builtin/worktree.c:818 +#: builtin/worktree.c:827 msgid "force move even if worktree is dirty or locked" msgstr "ép buộc ngay cả khi cây làm việc đang bẩn hay bị khóa" -#: builtin/worktree.c:841 builtin/worktree.c:965 +#: builtin/worktree.c:850 builtin/worktree.c:974 #, c-format msgid "'%s' is a main working tree" msgstr "“%s” là cây làm việc chính" -#: builtin/worktree.c:846 +#: builtin/worktree.c:855 #, c-format msgid "could not figure out destination name from '%s'" msgstr "không thể phác họa ra tên đích đến “%s”" -#: builtin/worktree.c:859 +#: builtin/worktree.c:868 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23796,7 +23913,7 @@ msgstr "" "không thể di chuyển một cây-làm-việc bị khóa, khóa vì: %s\n" "dùng “move -f -f” để ghi đè hoặc mở khóa trước đã" -#: builtin/worktree.c:861 +#: builtin/worktree.c:870 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23804,38 +23921,38 @@ msgstr "" "không thể di chuyển một cây-làm-việc bị khóa;\n" "dùng “move -f -f” để ghi đè hoặc mở khóa trước đã" -#: builtin/worktree.c:864 +#: builtin/worktree.c:873 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "thẩm tra gặp lỗi, không thể di chuyển một cây-làm-việc: %s" -#: builtin/worktree.c:869 +#: builtin/worktree.c:878 #, c-format msgid "failed to move '%s' to '%s'" msgstr "gặp lỗi khi chuyển “%s” sang “%s”" -#: builtin/worktree.c:915 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "gặp lỗi khi chạy “git status” vào “%s”" -#: builtin/worktree.c:919 +#: builtin/worktree.c:928 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" "“%s” có chứa các tập tin đã bị sửa chữa hoặc chưa được theo dõi, hãy dùng --" "force để xóa nó" -#: builtin/worktree.c:924 +#: builtin/worktree.c:933 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "gặp lỗi khi chạy “git status” trong “%s”, mã %d" -#: builtin/worktree.c:947 +#: builtin/worktree.c:956 msgid "force removal even if worktree is dirty or locked" msgstr "ép buộc di chuyển thậm chí cả khi cây làm việc đang bẩn hay bị khóa" -#: builtin/worktree.c:970 +#: builtin/worktree.c:979 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23844,7 +23961,7 @@ msgstr "" "không thể xóa bỏ một cây-làm-việc bị khóa, khóa vì: %s\n" "dùng “remove -f -f” để ghi đè hoặc mở khóa trước đã" -#: builtin/worktree.c:972 +#: builtin/worktree.c:981 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23852,17 +23969,17 @@ msgstr "" "không thể xóa bỏ một cây-làm-việc bị khóa;\n" "dùng “remove -f -f” để ghi đè hoặc mở khóa trước đã" -#: builtin/worktree.c:975 +#: builtin/worktree.c:984 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "thẩm tra gặp lỗi, không thể gỡ bỏ một cây-làm-việc: %s" -#: builtin/worktree.c:999 +#: builtin/worktree.c:1008 #, c-format msgid "repair: %s: %s" msgstr "sửa chữa: %s: %s" -#: builtin/worktree.c:1002 +#: builtin/worktree.c:1011 #, c-format msgid "error: %s: %s" msgstr "lỗi: %s: %s" @@ -24210,7 +24327,7 @@ msgstr "" msgid "Could not set SSL backend to '%s': already set" msgstr "Không thể đặt ứng dụng chạy sau SSL cho “%s”: đã đặt rồi" -#: http.c:2035 +#: http.c:2034 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -24262,95 +24379,95 @@ msgstr "không thể truy cập “%s”: %s" msgid "redirecting to %s" msgstr "chuyển hướng đến %s" -#: remote-curl.c:642 +#: remote-curl.c:644 msgid "shouldn't have EOF when not gentle on EOF" msgstr "không nên có EOF khi không gentle trên EOF" -#: remote-curl.c:654 -msgid "remote server sent stateless separator" -msgstr "máy phục vụ từ xa gửi các bộ ngăn cách không tình trạng" +#: remote-curl.c:656 +msgid "remote server sent unexpected response end packet" +msgstr "máy phục vụ gửi gói kết thúc không cần" -#: remote-curl.c:724 +#: remote-curl.c:726 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "không thể tua lại dữ liệu post rpc - thử tăng http.postBuffer" -#: remote-curl.c:754 +#: remote-curl.c:756 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "remote-curl: ký tự chiều dài dòng bị sai: %.4s" -#: remote-curl.c:756 +#: remote-curl.c:758 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl: gặp đáp ứng là gói kết thúc bất ngờ" -#: remote-curl.c:832 +#: remote-curl.c:834 #, c-format msgid "RPC failed; %s" msgstr "RPC gặp lỗi; %s" -#: remote-curl.c:872 +#: remote-curl.c:874 msgid "cannot handle pushes this big" msgstr "không thể xử lý đẩy cái lớn này" -#: remote-curl.c:987 +#: remote-curl.c:989 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "không thể giải nén yêu cầu; có lỗi khi giải nén của zlib %d" -#: remote-curl.c:991 +#: remote-curl.c:993 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "không thể giải nén yêu cầu; có lỗi ở cuối %d" -#: remote-curl.c:1041 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of length header were received" msgstr "đã nhận về phần đầu có chiều dài %d byte" -#: remote-curl.c:1043 +#: remote-curl.c:1045 #, c-format msgid "%d bytes of body are still expected" msgstr "phần thân vẫn còn cần %d byte" -#: remote-curl.c:1132 +#: remote-curl.c:1134 msgid "dumb http transport does not support shallow capabilities" msgstr "đổ vận chuyển http không hỗ trợ khả năng nông" -#: remote-curl.c:1147 +#: remote-curl.c:1149 msgid "fetch failed." msgstr "lấy về gặp lỗi." -#: remote-curl.c:1193 +#: remote-curl.c:1195 msgid "cannot fetch by sha1 over smart http" msgstr "không thể lấy về bằng sha1 thông qua smart http" -#: remote-curl.c:1237 remote-curl.c:1243 +#: remote-curl.c:1239 remote-curl.c:1245 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "lỗi giao thức: cần sha/ref, nhưng lại nhận được “%s”" -#: remote-curl.c:1255 remote-curl.c:1373 +#: remote-curl.c:1257 remote-curl.c:1375 #, c-format msgid "http transport does not support %s" msgstr "vận chuyển http không hỗ trợ %s" -#: remote-curl.c:1291 +#: remote-curl.c:1293 msgid "git-http-push failed" msgstr "git-http-push gặp lỗi" -#: remote-curl.c:1479 +#: remote-curl.c:1481 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: usage: git remote-curl <máy chủ> [<url>]" -#: remote-curl.c:1511 +#: remote-curl.c:1513 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: gặp lỗi khi đọc luồng dữ liệu lệnh từ git" -#: remote-curl.c:1518 +#: remote-curl.c:1520 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: đã cố gắng fetch mà không có kho nội bộ" -#: remote-curl.c:1559 +#: remote-curl.c:1561 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: không hiểu lệnh “%s” từ git" @@ -26082,39 +26199,39 @@ msgstr "không hiểu chế độ --patch: %s" msgid "invalid argument %s, expecting --" msgstr "đối số không hợp lệ %s, cần --" -#: git-send-email.perl:138 +#: git-send-email.perl:129 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "múi giờ nội bộ khác biệt với GMT bởi khoảng thời gian không-phút\n" -#: git-send-email.perl:145 git-send-email.perl:151 +#: git-send-email.perl:136 git-send-email.perl:142 msgid "local time offset greater than or equal to 24 hours\n" msgstr "khoảng bù thời gian nội bộ lớn hơn hoặc bằng 24 giờ\n" -#: git-send-email.perl:222 +#: git-send-email.perl:214 #, perl-format msgid "fatal: command '%s' died with exit code %d" msgstr "lỗi nghiêm trọng: lệnh '%s' chết với mã thoát %d" -#: git-send-email.perl:235 +#: git-send-email.perl:227 msgid "the editor exited uncleanly, aborting everything" msgstr "trình soạn thảo thoát không sạch sẽ, bãi bỏ mọi thứ" -#: git-send-email.perl:321 +#: git-send-email.perl:316 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "“%s” có chưa một phiên bản trung gian của thư bạn đã soạn.\n" -#: git-send-email.perl:326 +#: git-send-email.perl:321 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "“%s.final” chứa thư điện tử đã soạn thảo.\n" -#: git-send-email.perl:419 +#: git-send-email.perl:450 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases xung khắc với các tùy chọn khác\n" -#: git-send-email.perl:493 +#: git-send-email.perl:525 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -26124,11 +26241,11 @@ msgstr "" "git-send-email được cấu hình với các tùy chọn sendemail.* - chú ý “e”.\n" "Đặt sendemail.forbidSendmailVariables thành false để tắt kiểm tra này.\n" -#: git-send-email.perl:498 git-send-email.perl:700 +#: git-send-email.perl:530 git-send-email.perl:746 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Không thể chạy git format-patch ở ngoài một kho chứa\n" -#: git-send-email.perl:501 +#: git-send-email.perl:533 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -26136,37 +26253,37 @@ msgstr "" "“batch-size” và “relogin” phải được chỉ định cùng với nhau (thông qua dòng " "lệnh hoặc tùy chọn cấu hình)\n" -#: git-send-email.perl:514 +#: git-send-email.perl:546 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Không hiểu trường --suppress-cc: “%s”\n" -#: git-send-email.perl:545 +#: git-send-email.perl:577 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Không hiểu cài đặt --confirm: “%s”\n" -#: git-send-email.perl:573 +#: git-send-email.perl:617 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "cảnh báo: bí danh sendmail với dấu trích dẫn không được hỗ trợ: %s\n" -#: git-send-email.perl:575 +#: git-send-email.perl:619 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "cảnh báo: “:include:“ không được hỗ trợ: %s\n" -#: git-send-email.perl:577 +#: git-send-email.perl:621 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "cảnh báo: chuyển hướng “/file“ hay “|pipe“ không được hỗ trợ: %s\n" -#: git-send-email.perl:582 +#: git-send-email.perl:626 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "cảnh báo: dòng sendmail không nhận ra được: %s\n" -#: git-send-email.perl:666 +#: git-send-email.perl:711 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -26181,12 +26298,12 @@ msgstr "" " * Nói \"./%s\" nếu ý bạn là một tập tin; hoặc\n" " * Đưa ra tùy chọn --format-patch nếu ý bạn là chuẩn bị.\n" -#: git-send-email.perl:687 +#: git-send-email.perl:732 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Gặp lỗi khi mở thư mục “%s”: %s" -#: git-send-email.perl:720 +#: git-send-email.perl:767 msgid "" "\n" "No patch files specified!\n" @@ -26196,17 +26313,17 @@ msgstr "" "Chưa chỉ định các tập tin miếng vá!\n" "\n" -#: git-send-email.perl:733 +#: git-send-email.perl:780 #, perl-format msgid "No subject line in %s?" msgstr "Không có dòng chủ đề trong %s?" -#: git-send-email.perl:743 +#: git-send-email.perl:791 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Gặp lỗi khi mở “%s” để ghi: %s" -#: git-send-email.perl:754 +#: git-send-email.perl:802 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -26220,27 +26337,27 @@ msgstr "" "\n" "Xóa nội dung phần thân nếu bạn không muốn gửi tóm tắt.\n" -#: git-send-email.perl:778 +#: git-send-email.perl:826 #, perl-format msgid "Failed to open %s: %s" msgstr "Gặp lỗi khi mở “%s”: %s" -#: git-send-email.perl:795 +#: git-send-email.perl:843 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Gặp lỗi khi mở %s.final: %s" -#: git-send-email.perl:838 +#: git-send-email.perl:886 msgid "Summary email is empty, skipping it\n" msgstr "Thư tổng thể là trống rỗng, nên bỏ qua nó\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:873 +#: git-send-email.perl:935 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Bạn có chắc muốn dùng <%s> [y/N]? " -#: git-send-email.perl:928 +#: git-send-email.perl:990 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -26248,11 +26365,11 @@ msgstr "" "Các trường sau đây là 8bit, nhưng không khai báo một Content-Transfer-" "Encoding.\n" -#: git-send-email.perl:933 +#: git-send-email.perl:995 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Bảng mã 8bit nào tôi nên khai báo [UTF-8]? " -#: git-send-email.perl:941 +#: git-send-email.perl:1003 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -26265,20 +26382,20 @@ msgstr "" "có chủ đề ở dạng mẫu “*** SUBJECT HERE ***”. Dùng --force nếu bạn thực sự " "muốn gửi.\n" -#: git-send-email.perl:960 +#: git-send-email.perl:1022 msgid "To whom should the emails be sent (if anyone)?" msgstr "Tới người mà thư được gửi (nếu có)?" -#: git-send-email.perl:978 +#: git-send-email.perl:1040 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "nghiêm trọng: bí danh “%s” được khai triển thành chính nó\n" -#: git-send-email.perl:990 +#: git-send-email.perl:1052 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "Message-ID được dùng như là In-Reply-To cho thư đầu tiên (nếu có)? " -#: git-send-email.perl:1048 git-send-email.perl:1056 +#: git-send-email.perl:1114 git-send-email.perl:1122 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "lỗi: không thể rút trích một địa chỉ hợp lệ từ: %s\n" @@ -26286,16 +26403,16 @@ msgstr "lỗi: không thể rút trích một địa chỉ hợp lệ từ: %s\n #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1060 +#: git-send-email.perl:1126 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Làm gì với địa chỉ này? (thoát[q]|xóa[d]|sửa[e]): " -#: git-send-email.perl:1377 +#: git-send-email.perl:1446 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "Đường dẫn CA “%s” không tồn tại" -#: git-send-email.perl:1460 +#: git-send-email.perl:1529 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -26322,114 +26439,114 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1475 +#: git-send-email.perl:1544 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Gửi thư này chứ? ([y]có|[n]không|[e]sửa|[q]thoát|[a]tất): " -#: git-send-email.perl:1478 +#: git-send-email.perl:1547 msgid "Send this email reply required" msgstr "Gửi thư này trả lời yêu cầu" -#: git-send-email.perl:1506 +#: git-send-email.perl:1581 msgid "The required SMTP server is not properly defined." msgstr "Máy phục vụ SMTP chưa được định nghĩa một cách thích hợp." -#: git-send-email.perl:1553 +#: git-send-email.perl:1628 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Máy chủ không hỗ trợ STARTTLS! %s" -#: git-send-email.perl:1558 git-send-email.perl:1562 +#: git-send-email.perl:1633 git-send-email.perl:1637 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS gặp lỗi! %s" -#: git-send-email.perl:1571 +#: git-send-email.perl:1646 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Không thể khởi tạo SMTP một cách đúng đắn. Kiểm tra cấu hình và dùng --smtp-" "debug." -#: git-send-email.perl:1589 +#: git-send-email.perl:1664 #, perl-format msgid "Failed to send %s\n" msgstr "Gặp lỗi khi gửi %s\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Dry-Sent %s\n" msgstr "Thử gửi %s\n" -#: git-send-email.perl:1592 +#: git-send-email.perl:1667 #, perl-format msgid "Sent %s\n" msgstr "Gửi %s\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "Dry-OK. Log says:\n" msgstr "Dry-OK. Nhật ký nói rằng:\n" -#: git-send-email.perl:1594 +#: git-send-email.perl:1669 msgid "OK. Log says:\n" msgstr "OK. Nhật ký nói rằng:\n" -#: git-send-email.perl:1606 +#: git-send-email.perl:1688 msgid "Result: " msgstr "Kết quả: " -#: git-send-email.perl:1609 +#: git-send-email.perl:1691 msgid "Result: OK\n" msgstr "Kết quả: Tốt\n" -#: git-send-email.perl:1627 +#: git-send-email.perl:1709 #, perl-format msgid "can't open file %s" msgstr "không thể mở tập tin “%s”" -#: git-send-email.perl:1674 git-send-email.perl:1694 +#: git-send-email.perl:1756 git-send-email.perl:1776 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Thêm cc: %s từ dòng “%s”\n" -#: git-send-email.perl:1680 +#: git-send-email.perl:1762 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Đang thêm to: %s từ dòng “%s”\n" -#: git-send-email.perl:1737 +#: git-send-email.perl:1819 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Thêm cc: %s từ dòng “%s”\n" -#: git-send-email.perl:1772 +#: git-send-email.perl:1854 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Thêm cc: %s từ dòng “%s”\n" -#: git-send-email.perl:1883 +#: git-send-email.perl:1965 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Không thể thực thi “%s”" -#: git-send-email.perl:1890 +#: git-send-email.perl:1972 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Đang thêm %s: %s từ: “%s”\n" -#: git-send-email.perl:1894 +#: git-send-email.perl:1976 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) gặp lỗi khi đóng đường ống đến “%s”" -#: git-send-email.perl:1924 +#: git-send-email.perl:2006 msgid "cannot send message as 7bit" msgstr "không thể lấy gửi thư dạng 7 bít" -#: git-send-email.perl:1932 +#: git-send-email.perl:2014 msgid "invalid transfer encoding" msgstr "bảng mã truyền không hợp lệ" -#: git-send-email.perl:1966 +#: git-send-email.perl:2051 #, perl-format msgid "" "fatal: %s: rejected by sendemail-validate hook\n" @@ -26440,12 +26557,12 @@ msgstr "" "%s\n" "cảnh báo: không có miếng vá nào được gửi đi\n" -#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039 +#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124 #, perl-format msgid "unable to open %s: %s\n" msgstr "không thể mở %s: %s\n" -#: git-send-email.perl:1979 +#: git-send-email.perl:2064 #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" @@ -26454,17 +26571,32 @@ msgstr "" "nghiêm trọng: %s: %d là dài hơn 998 ký tự\n" "cảnh báo: không có miếng vá nào được gửi đi\n" -#: git-send-email.perl:1997 +#: git-send-email.perl:2082 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Bỏ qua %s với hậu tố sao lưu dự phòng “%s”.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:2001 +#: git-send-email.perl:2086 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): " +#~ msgid "unable to write stateless separator packet" +#~ msgstr "không thể ghi gói phân tách không trạng thái" + +#~ msgid "git merge --abort" +#~ msgstr "git merge --abort" + +#~ msgid "git merge --continue" +#~ msgstr "git merge --continue" + +#~ msgid "git stash clear" +#~ msgstr "git stash clear" + +#~ msgid "remote server sent stateless separator" +#~ msgstr "máy phục vụ từ xa gửi các bộ ngăn cách không tình trạng" + #~ msgid "--cached and --3way cannot be used together." #~ msgstr "--cached và --3way không thể dùng cùng nhau." @@ -26850,9 +26982,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): " #~ msgid "Cannot store %s" #~ msgstr "Không thể lưu “%s”" -#~ msgid "initialize sparse-checkout" -#~ msgstr "khởi tạo sparse-checkout" - #~ msgid "set sparse-checkout patterns" #~ msgstr "đặt các mẫu sparse-checkout" @@ -27783,9 +27912,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): " #~ msgid " (unable to update local ref)" #~ msgstr " (không thể cập nhật tham chiếu nội bộ)" -#~ msgid "Reinitialized existing" -#~ msgstr "Khởi tạo lại đã sẵn có rồi" - #~ msgid "Initialized empty" #~ msgstr "Khởi tạo trống rỗng" |