diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/fr.po | 1050 | ||||
| -rw-r--r-- | po/id.po | 1100 | ||||
| -rw-r--r-- | po/vi.po | 1014 |
3 files changed, 1629 insertions, 1535 deletions
@@ -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-08-03 17:06+0800\n" -"PO-Revision-Date: 2021-08-12 21:06+0200\n" +"POT-Creation-Date: 2021-08-14 07:56+0800\n" +"PO-Revision-Date: 2021-08-14 08:28+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,7 +92,7 @@ msgstr "" msgid "Huh (%s)?" msgstr "Hein (%s) ?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 +#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493 #: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 #: builtin/rebase.c:1953 msgid "could not read index" @@ -122,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:3707 +#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707 msgid "could not write index" msgstr "impossible d'écrire l'index" @@ -284,9 +284,10 @@ msgstr "non-indexé" #: 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 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886 +#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589 +#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893 #: git-add--interactive.perl:213 msgid "path" msgstr "chemin" @@ -868,7 +869,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." -#: advice.c:283 builtin/merge.c:1374 +#: advice.c:283 builtin/merge.c:1375 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." @@ -1662,7 +1663,7 @@ msgstr "impossible de lire %s" #: 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 +#: builtin/merge.c:1144 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" @@ -1751,7 +1752,8 @@ 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:1830 builtin/submodule--helper.c:2335 +#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352 +#: builtin/submodule--helper.c:2902 msgid "repo" msgstr "dépôt" @@ -1947,7 +1949,7 @@ msgstr "" "--reverse et --first-parent ensemble nécessitent la spécification d'un " "dernier commit" -#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333 +#: blame.c:2820 bundle.c:224 ref-filter.c:2278 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 @@ -3241,7 +3243,7 @@ msgstr "type de filtre inattendu" msgid "path name too long for external filter" msgstr "nom de chemin trop long pour un filtre externe" -#: convert.c:934 +#: convert.c:935 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3250,16 +3252,16 @@ msgstr "" "le filtre externe '%s' n'est plus disponible bien que tous les chemins " "n'aient pas été filtrés" -#: convert.c:1234 +#: convert.c:1236 msgid "true/false are no valid working-tree-encodings" msgstr "true/false ne sont pas des encodages d'arbre de travail valides" -#: convert.c:1414 convert.c:1447 +#: convert.c:1416 convert.c:1449 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s : le filtre clean '%s' a échoué" -#: convert.c:1490 +#: convert.c:1492 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s : le filtre smudge '%s' a échoué" @@ -3441,7 +3443,9 @@ msgstr " Paramètre dirstat inconnu '%s'\n" 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'" +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 @@ -3492,13 +3496,17 @@ msgstr "-G, -S et --find-object sont mutuellement exclusifs" #: 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" +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 " +"--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" +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" @@ -4061,7 +4069,9 @@ msgstr "Sortie vers un fichier spécifié" #: 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." +msgstr "" +"détection exhaustive de renommage annulée à cause d'un trop grand nombre de " +"fichiers." #: diff.c:6301 msgid "only found copies from modified paths due to too many files." @@ -4082,7 +4092,7 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "impossible de lire le fichier de commande '%s'" -#: diffcore-rename.c:1510 +#: diffcore-rename.c:1514 msgid "Performing inexact rename detection" msgstr "Détection de renommage inexact en cours" @@ -4102,51 +4112,51 @@ msgstr "" msgid "unrecognized pattern: '%s'" msgstr "motif non reconnu : '%s'" -#: dir.c:792 dir.c:806 +#: dir.c:790 dir.c:804 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "motif négatif non reconnu : '%s'" -#: dir.c:824 +#: dir.c:820 #, 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é" -#: dir.c:834 +#: dir.c:830 msgid "disabling cone pattern matching" msgstr "désactivation de la correspondance de motif de cone" -#: dir.c:1221 +#: dir.c:1214 #, c-format msgid "cannot use %s as an exclude file" msgstr "impossible d'utiliser %s comme fichier d'exclusion" -#: dir.c:2358 +#: dir.c:2351 #, c-format msgid "could not open directory '%s'" msgstr "impossible d'ouvrir le répertoire '%s'" -#: dir.c:2660 +#: dir.c:2653 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:2784 +#: dir.c:2777 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:3617 +#: dir.c:3610 #, c-format msgid "index file corrupt in repo %s" msgstr "fichier d'index corrompu dans le dépôt %s" -#: dir.c:3664 dir.c:3669 +#: dir.c:3657 dir.c:3662 #, c-format msgid "could not create directories for %s" msgstr "impossible de créer les répertoires pour %s" -#: dir.c:3698 +#: dir.c:3691 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossible de migrer le répertoire git de '%s' vers '%s'" @@ -4172,7 +4182,7 @@ msgstr "impossible de stat le fichier '%s'" msgid "bad git namespace path \"%s\"" msgstr "espaces de nom de Git \"%s\"" -#: environment.c:335 +#: environment.c:334 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "impossible de régler GIT_DIR à '%s'" @@ -4815,34 +4825,34 @@ msgstr "CRLF citées détectées" msgid "bad action '%s' for '%s'" msgstr "action invalide '%s' pour '%s'" -#: merge-ort.c:1228 merge-recursive.c:1206 +#: merge-ort.c:1569 merge-recursive.c:1201 #, 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:1237 merge-recursive.c:1213 +#: merge-ort.c:1578 merge-recursive.c:1208 #, 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:1246 merge-recursive.c:1220 +#: merge-ort.c:1587 merge-recursive.c:1215 #, 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)" -#: merge-ort.c:1256 merge-ort.c:1263 +#: merge-ort.c:1597 merge-ort.c:1604 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "Note : Avance rapide du sous-module %s à %s" -#: merge-ort.c:1284 +#: merge-ort.c:1625 #, c-format msgid "Failed to merge submodule %s" msgstr "Échec de la fusion du sous-module %s" -#: merge-ort.c:1291 +#: merge-ort.c:1632 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4852,7 +4862,7 @@ msgstr "" "existe :\n" "%s\n" -#: merge-ort.c:1295 merge-recursive.c:1274 +#: merge-ort.c:1636 merge-recursive.c:1269 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4869,7 +4879,7 @@ msgstr "" "\n" "qui acceptera cette suggestion.\n" -#: merge-ort.c:1308 +#: merge-ort.c:1649 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4879,21 +4889,21 @@ msgstr "" "existent :\n" "%s" -#: merge-ort.c:1527 merge-recursive.c:1363 +#: merge-ort.c:1868 merge-recursive.c:1358 msgid "Failed to execute internal merge" msgstr "Échec à l'exécution de la fusion interne" -#: merge-ort.c:1532 merge-recursive.c:1368 +#: merge-ort.c:1873 merge-recursive.c:1363 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s à la base de données" -#: merge-ort.c:1539 merge-recursive.c:1401 +#: merge-ort.c:1880 merge-recursive.c:1396 #, c-format msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-ort.c:1678 merge-recursive.c:2123 +#: merge-ort.c:2019 merge-recursive.c:2118 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4902,7 +4912,7 @@ 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:1688 merge-recursive.c:2133 +#: merge-ort.c:2029 merge-recursive.c:2128 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4911,7 +4921,7 @@ msgstr "" "CONFLIT (renommage implicite de répertoire) : impossible de transformer " "plusieurs chemins sur %s ; les chemins concernés sont : %s" -#: merge-ort.c:1746 +#: merge-ort.c:2087 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4922,7 +4932,7 @@ msgstr "" "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:1900 merge-recursive.c:2469 +#: merge-ort.c:2241 merge-recursive.c:2464 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4931,7 +4941,7 @@ msgstr "" "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été " "renommé." -#: merge-ort.c:2044 merge-recursive.c:3252 +#: merge-ort.c:2385 merge-recursive.c:3247 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4940,7 +4950,7 @@ 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:2051 merge-recursive.c:3259 +#: merge-ort.c:2392 merge-recursive.c:3254 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4949,7 +4959,7 @@ 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:2064 merge-recursive.c:3255 +#: merge-ort.c:2405 merge-recursive.c:3250 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4959,7 +4969,7 @@ msgstr "" "a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé " "vers %s." -#: merge-ort.c:2072 merge-recursive.c:3262 +#: merge-ort.c:2413 merge-recursive.c:3257 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4969,13 +4979,13 @@ msgstr "" "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:2228 +#: merge-ort.c:2569 #, 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." -#: merge-ort.c:2323 +#: merge-ort.c:2664 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4986,24 +4996,24 @@ msgstr "" "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:2342 merge-ort.c:2366 +#: merge-ort.c:2683 merge-ort.c:2707 #, 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." -#: merge-ort.c:2819 merge-recursive.c:3013 +#: merge-ort.c:3182 merge-recursive.c:3008 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" -#: merge-ort.c:2822 merge-recursive.c:3016 +#: merge-ort.c:3185 merge-recursive.c:3011 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" -#: merge-ort.c:3250 +#: merge-ort.c:3613 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " @@ -5012,7 +5022,7 @@ msgstr "" "CONFLIT (fichier/répertoire) : répertoire au milieu de %s depuis %s ; " "déplacement dans %s à la place." -#: merge-ort.c:3326 +#: merge-ort.c:3689 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " @@ -5021,7 +5031,7 @@ 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:3333 +#: merge-ort.c:3696 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " @@ -5031,24 +5041,24 @@ msgstr "" "renommé une d'entre elles de manière à pouvoir enregistrer les deux quelque " "part." -#: merge-ort.c:3433 merge-recursive.c:3092 +#: merge-ort.c:3796 merge-recursive.c:3087 msgid "content" msgstr "contenu" -#: merge-ort.c:3435 merge-recursive.c:3096 +#: merge-ort.c:3798 merge-recursive.c:3091 msgid "add/add" msgstr "ajout/ajout" -#: merge-ort.c:3437 merge-recursive.c:3141 +#: merge-ort.c:3800 merge-recursive.c:3136 msgid "submodule" msgstr "sous-module" -#: merge-ort.c:3439 merge-recursive.c:3142 +#: merge-ort.c:3802 merge-recursive.c:3137 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" -#: merge-ort.c:3470 +#: merge-ort.c:3833 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -5057,7 +5067,7 @@ msgstr "" "CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. " "Version %s de %s laissée dans l'arbre." -#: merge-ort.c:3757 +#: merge-ort.c:4120 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -5069,12 +5079,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:4116 +#: merge-ort.c:4487 #, 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:3707 +#: merge-ort-wrappers.c:13 merge-recursive.c:3702 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -5084,106 +5094,106 @@ msgstr "" "fusion :\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402 +#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402 msgid "Already up to date." msgstr "Déjà à jour." -#: merge-recursive.c:357 +#: merge-recursive.c:352 msgid "(bad commit)\n" msgstr "(mauvais commit)\n" -#: merge-recursive.c:380 +#: merge-recursive.c:375 #, 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:389 +#: merge-recursive.c:384 #, 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:877 +#: merge-recursive.c:872 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de créer le chemin '%s' %s" -#: merge-recursive.c:888 +#: merge-recursive.c:883 #, 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:902 merge-recursive.c:921 +#: merge-recursive.c:897 merge-recursive.c:916 msgid ": perhaps a D/F conflict?" msgstr ": peut-être un conflit D/F ?" -#: merge-recursive.c:911 +#: merge-recursive.c:906 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" -#: merge-recursive.c:952 builtin/cat-file.c:41 +#: merge-recursive.c:947 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" -#: merge-recursive.c:957 +#: merge-recursive.c:952 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:982 +#: merge-recursive.c:977 #, c-format msgid "failed to open '%s': %s" msgstr "échec à l'ouverture de '%s' : %s" -#: merge-recursive.c:993 +#: merge-recursive.c:988 #, c-format msgid "failed to symlink '%s': %s" msgstr "échec à la création du lien symbolique '%s' : %s" -#: merge-recursive.c:998 +#: merge-recursive.c:993 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" -#: merge-recursive.c:1228 merge-recursive.c:1240 +#: merge-recursive.c:1223 merge-recursive.c:1235 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Avance rapide du sous-module %s au commit suivant :" -#: merge-recursive.c:1231 merge-recursive.c:1243 +#: merge-recursive.c:1226 merge-recursive.c:1238 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avance rapide du sous-module %s" -#: merge-recursive.c:1266 +#: merge-recursive.c:1261 #, 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)" -#: merge-recursive.c:1270 +#: merge-recursive.c:1265 #, 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:1271 +#: merge-recursive.c:1266 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:1283 +#: merge-recursive.c:1278 #, 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:1425 +#: merge-recursive.c:1420 #, 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." -#: merge-recursive.c:1497 +#: merge-recursive.c:1492 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5192,7 +5202,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre." -#: merge-recursive.c:1502 +#: merge-recursive.c:1497 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5201,7 +5211,7 @@ 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:1509 +#: merge-recursive.c:1504 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5210,7 +5220,7 @@ 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:1514 +#: merge-recursive.c:1509 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5219,41 +5229,41 @@ 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:1549 +#: merge-recursive.c:1544 msgid "rename" msgstr "renommage" -#: merge-recursive.c:1549 +#: merge-recursive.c:1544 msgid "renamed" msgstr "renommé" -#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169 +#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Refus de perdre le fichier modifié %s" -#: merge-recursive.c:1610 +#: merge-recursive.c:1605 #, 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:1668 +#: merge-recursive.c:1663 #, 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" -#: merge-recursive.c:1699 +#: merge-recursive.c:1694 #, 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:1704 +#: merge-recursive.c:1699 #, 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:1731 +#: merge-recursive.c:1726 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5262,18 +5272,18 @@ msgstr "" "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche " "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" -#: merge-recursive.c:1736 +#: merge-recursive.c:1731 msgid " (left unresolved)" msgstr " (laissé non résolu)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1823 #, 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" -#: merge-recursive.c:2091 +#: merge-recursive.c:2086 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5284,7 +5294,7 @@ msgstr "" "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:2225 +#: merge-recursive.c:2220 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5293,79 +5303,79 @@ msgstr "" "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. " "Renommage de répertoire %s->%s dans %s" -#: merge-recursive.c:3080 +#: merge-recursive.c:3075 msgid "modify" msgstr "modification" -#: merge-recursive.c:3080 +#: merge-recursive.c:3075 msgid "modified" msgstr "modifié" -#: merge-recursive.c:3119 +#: merge-recursive.c:3114 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:3172 +#: merge-recursive.c:3167 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" -#: merge-recursive.c:3376 +#: merge-recursive.c:3371 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: merge-recursive.c:3399 +#: merge-recursive.c:3394 msgid "file/directory" msgstr "fichier/répertoire" -#: merge-recursive.c:3404 +#: merge-recursive.c:3399 msgid "directory/file" msgstr "répertoire/fichier" -#: merge-recursive.c:3411 +#: merge-recursive.c:3406 #, 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" -#: merge-recursive.c:3420 +#: merge-recursive.c:3415 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:3429 +#: merge-recursive.c:3424 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s" -#: merge-recursive.c:3482 +#: merge-recursive.c:3477 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:3576 +#: merge-recursive.c:3571 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:3589 +#: merge-recursive.c:3584 #, 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:3639 +#: merge-recursive.c:3634 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:3804 +#: merge-recursive.c:3799 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900 +#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901 #: builtin/stash.c:473 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." @@ -5375,7 +5385,7 @@ msgid "failed to read the cache" msgstr "impossible de lire le cache" #: 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/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821 #: builtin/stash.c:267 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" @@ -5461,7 +5471,8 @@ msgstr "impossible de stocker le fichier d'index inversé" #: 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" +msgstr "" +"index multi-paquet existant ignoré ; non-concordance de la somme de contrôle" #: midx.c:943 msgid "Adding packfiles to multi-pack-index" @@ -6529,10 +6540,10 @@ msgstr "entrées de préparation non ordonnées pour '%s'" #: 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/checkout.c:519 builtin/checkout.c:706 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 +#: builtin/submodule--helper.c:333 msgid "index file corrupt" msgstr "fichier d'index corrompu" @@ -6586,36 +6597,36 @@ msgstr "impossible de rafraîchir l'index partagé '%s'" msgid "broken index, expect %s in %s, got %s" msgstr "index cassé, %s attendu dans %s, %s obtenu" -#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 +#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: read-cache.c:3074 +#: read-cache.c:3075 msgid "failed to convert to a sparse-index" msgstr "échec de conversion d'un index clairsemé" -#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440 +#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440 #, c-format msgid "could not stat '%s'" msgstr "impossible de stat '%s'" -#: read-cache.c:3158 +#: read-cache.c:3159 #, c-format msgid "unable to open git dir: %s" msgstr "impossible d'ouvrir le répertoire git : %s" -#: read-cache.c:3170 +#: read-cache.c:3171 #, c-format msgid "unable to unlink: %s" msgstr "échec lors de l'unlink : %s" -#: read-cache.c:3199 +#: read-cache.c:3200 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "impossible de régler les bits de droit de '%s'" -#: read-cache.c:3348 +#: read-cache.c:3349 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s : impossible de revenir à l'étape 0" @@ -7034,17 +7045,17 @@ msgstr "réf avec un nom cassé %s ignoré" msgid "ignoring broken ref %s" msgstr "réf cassé %s ignoré" -#: ref-filter.c:2498 +#: ref-filter.c:2502 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atome %%(end) manquant" -#: ref-filter.c:2592 +#: ref-filter.c:2596 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: ref-filter.c:2597 +#: ref-filter.c:2601 #, c-format msgid "option `%s' must point to a commit" msgstr "l'option '%s' doit pointer sur un commit" @@ -7513,7 +7524,7 @@ msgid "Recorded preimage for '%s'" msgstr "Pré-image enregistrée pour '%s'" #: rerere.c:865 submodule.c:2076 builtin/log.c:2002 -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848 #, c-format msgid "could not create directory '%s'" msgstr "impossible de créer le répertoire '%s'" @@ -7551,7 +7562,7 @@ 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:3689 +#: reset.c:69 reset.c:75 sequencer.c:3689 #, c-format msgid "failed to find tree of %s" msgstr "impossible de trouver l'arbre de %s" @@ -7763,7 +7774,7 @@ 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:729 -#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910 +#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" @@ -7914,7 +7925,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:1702 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" @@ -7922,7 +7933,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:1615 builtin/merge.c:706 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" @@ -7940,8 +7951,8 @@ 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:1642 builtin/commit.c:1816 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:1819 builtin/merge.c:910 +#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" @@ -8630,7 +8641,8 @@ msgstr[1] "extensions de dépôt inconnues 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[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 :" @@ -8739,11 +8751,11 @@ msgstr "échec du setsid" msgid "attempting to use sparse-index without cone mode" msgstr "tentative d'utilisation de l'index partiel sans mode cone" -#: sparse-index.c:174 +#: sparse-index.c:176 msgid "unable to update cache-tree, staying full" msgstr "impossible de mettre à jour l'arbre de cache, full conservé" -#: sparse-index.c:261 +#: sparse-index.c:263 #, 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)" @@ -8901,7 +8913,7 @@ msgstr "" msgid "process for submodule '%s' failed" msgstr "le processus pour le sous-module '%s' a échoué" -#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." @@ -9659,7 +9671,7 @@ msgstr "" msgid "Updating index flags" msgstr "Mise à jour des drapeaux de l'index" -#: unpack-trees.c:2707 +#: unpack-trees.c:2718 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "" @@ -10464,7 +10476,7 @@ msgstr "simuler l'action" msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308 msgid "select hunks interactively" msgstr "sélection interactive des sections" @@ -10600,12 +10612,12 @@ msgstr "" 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/add.c:544 builtin/checkout.c:1733 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/add.c:551 builtin/checkout.c:1745 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" @@ -11440,7 +11452,7 @@ msgstr "" 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/blame.c:871 builtin/checkout.c:1519 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 @@ -12253,7 +12265,7 @@ 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" -#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 +#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549 #: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -12312,9 +12324,10 @@ 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:1824 -#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835 -#: builtin/submodule--helper.c:2333 builtin/worktree.c:491 +#: builtin/column.c:31 builtin/submodule--helper.c:1892 +#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903 +#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896 +#: builtin/submodule--helper.c:2899 builtin/worktree.c:491 #: builtin/worktree.c:728 msgid "string" msgstr "chaîne" @@ -12411,70 +12424,70 @@ msgstr "chemin '%s' : impossible de fusionner" msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le résultat de fusion pour '%s'" -#: builtin/checkout.c:414 +#: builtin/checkout.c:411 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "%d conflit du fusion recréé" msgstr[1] "%d conflits du fusion recréés" -#: builtin/checkout.c:419 +#: builtin/checkout.c:416 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "%d chemin mis à jour depuis %s" msgstr[1] "%d chemins mis à jour depuis %s" -#: builtin/checkout.c:426 +#: builtin/checkout.c:423 #, c-format msgid "Updated %d path from the index" 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:446 builtin/checkout.c:449 builtin/checkout.c:452 +#: builtin/checkout.c:456 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins" -#: builtin/checkout.c:462 builtin/checkout.c:465 +#: builtin/checkout.c:459 builtin/checkout.c:462 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:469 +#: builtin/checkout.c:466 #, 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." -#: builtin/checkout.c:473 +#: builtin/checkout.c:470 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "ni '%s', ni '%s' spécifié" -#: builtin/checkout.c:477 +#: builtin/checkout.c:474 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' ne peut pas être utilisé quand '%s' n'est pas spécifié" -#: builtin/checkout.c:482 builtin/checkout.c:487 +#: builtin/checkout.c:479 builtin/checkout.c:484 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' ou '%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:563 builtin/checkout.c:570 +#: builtin/checkout.c:558 builtin/checkout.c:565 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:739 +#: builtin/checkout.c:734 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:793 +#: builtin/checkout.c:788 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12484,50 +12497,50 @@ msgstr "" "suivants :\n" "%s" -#: builtin/checkout.c:886 +#: builtin/checkout.c:881 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s' : %s\n" -#: builtin/checkout.c:928 +#: builtin/checkout.c:923 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 +#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" -#: builtin/checkout.c:936 +#: builtin/checkout.c:931 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:939 +#: builtin/checkout.c:934 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:943 +#: builtin/checkout.c:938 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:945 builtin/checkout.c:1376 +#: builtin/checkout.c:940 builtin/checkout.c:1371 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:947 +#: builtin/checkout.c:942 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:998 +#: builtin/checkout.c:993 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:999 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12550,7 +12563,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1018 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12579,19 +12592,19 @@ msgstr[1] "" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:1058 +#: builtin/checkout.c:1053 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1057 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était sur" -#: builtin/checkout.c:1102 builtin/checkout.c:1371 +#: builtin/checkout.c:1097 builtin/checkout.c:1366 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#: builtin/checkout.c:1184 +#: builtin/checkout.c:1179 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12600,7 +12613,7 @@ msgstr "" "'%s' pourrait être un fichier local ou un branche de suivi.\n" "Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer" -#: builtin/checkout.c:1191 +#: builtin/checkout.c:1186 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" @@ -12620,51 +12633,51 @@ msgstr "" "ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n" "votre config." -#: builtin/checkout.c:1201 +#: builtin/checkout.c:1196 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' correspond à plusieurs (%d) branches de suivi à distance" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1262 msgid "only one reference expected" msgstr "une seule référence attendue" -#: builtin/checkout.c:1284 +#: builtin/checkout.c:1279 #, c-format msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." -#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436 +#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#: builtin/checkout.c:1343 builtin/checkout.c:1709 +#: builtin/checkout.c:1338 builtin/checkout.c:1707 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1385 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "branche attendue, mais étiquette '%s' reçue" -#: builtin/checkout.c:1392 +#: builtin/checkout.c:1387 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "une branche est attendue, mais une branche distante '%s' a été reçue" -#: builtin/checkout.c:1393 builtin/checkout.c:1401 +#: builtin/checkout.c:1388 builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got '%s'" msgstr "une branche est attendue, mais '%s' a été reçue" -#: builtin/checkout.c:1396 +#: builtin/checkout.c:1391 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "une branche est attendue, mais un commit '%s' a été reçu" -#: builtin/checkout.c:1412 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12672,7 +12685,7 @@ msgstr "" "impossible de basculer de branche pendant une fusion\n" "Envisagez \"git merge --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1416 +#: builtin/checkout.c:1411 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12680,7 +12693,7 @@ msgstr "" "impossible de basculer de branche pendant une session am\n" "Envisagez \"git am --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1420 +#: builtin/checkout.c:1415 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12688,7 +12701,7 @@ msgstr "" "impossible de basculer de branche pendant un rebasage\n" "Envisagez \"git rebase --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1424 +#: builtin/checkout.c:1419 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12696,7 +12709,7 @@ msgstr "" "impossible de basculer de branche pendant un picorage\n" "Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1428 +#: builtin/checkout.c:1423 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12704,139 +12717,139 @@ msgstr "" "impossible de basculer de branche pendant un retour\n" "Envisagez \"git revert --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1432 +#: builtin/checkout.c:1427 msgid "you are switching branch while bisecting" msgstr "vous basculez de branche en cours de bissection" -#: builtin/checkout.c:1439 +#: builtin/checkout.c:1434 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 +#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445 #, c-format 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:1449 builtin/checkout.c:1452 builtin/checkout.c:1455 +#: builtin/checkout.c:1460 builtin/checkout.c:1465 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1467 +#: builtin/checkout.c:1462 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' n'accepte pas <point-de-départ>" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1470 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1477 msgid "missing branch or commit argument" msgstr "argument de branche ou de commit manquant" -#: builtin/checkout.c:1525 +#: builtin/checkout.c:1520 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:1810 parse-options.h:323 +#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323 msgid "style" msgstr "style" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1522 msgid "conflict style (merge or diff3)" msgstr "style de conflit (merge (fusion) ou diff3)" -#: builtin/checkout.c:1539 builtin/worktree.c:488 +#: builtin/checkout.c:1534 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" -#: builtin/checkout.c:1540 +#: builtin/checkout.c:1535 msgid "set upstream info for new branch" msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1537 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1546 builtin/merge.c:301 +#: builtin/checkout.c:1541 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1549 +#: builtin/checkout.c:1544 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" -#: builtin/checkout.c:1562 +#: builtin/checkout.c:1557 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1560 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1569 +#: builtin/checkout.c:1564 msgid "do not limit pathspecs to sparse entries only" msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux" -#: builtin/checkout.c:1624 +#: builtin/checkout.c:1622 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1628 +#: builtin/checkout.c:1626 msgid "-p and --overlay are mutually exclusive" msgstr "-p et --overlay sont mutuellement exclusifs" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1663 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1670 +#: builtin/checkout.c:1668 #, c-format msgid "missing branch name; try -%c" msgstr "nom de branche manquant ; essayez -%c" -#: builtin/checkout.c:1702 +#: builtin/checkout.c:1700 #, c-format msgid "could not resolve %s" msgstr "impossible de résoudre %s" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1716 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1725 +#: builtin/checkout.c:1723 #, 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" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1727 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1736 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:1630 +#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file est incompatible avec --patch" -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1752 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12844,71 +12857,72 @@ msgstr "" "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n" "de l'extraction de l'index." -#: builtin/checkout.c:1759 +#: builtin/checkout.c:1757 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:2719 builtin/worktree.c:484 +#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834 +#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2887 builtin/worktree.c:484 #: builtin/worktree.c:486 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1786 +#: builtin/checkout.c:1784 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1786 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1789 +#: builtin/checkout.c:1787 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1791 +#: builtin/checkout.c:1789 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" "essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)" -#: builtin/checkout.c:1792 +#: builtin/checkout.c:1790 msgid "use overlay mode (default)" msgstr "utiliser le mode de superposition (défaut)" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1835 msgid "create and switch to a new branch" msgstr "créer et basculer sur une nouvelle branche" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1837 msgid "create/reset and switch to a branch" msgstr "créer/réinitialiser et basculer sur une branche" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1839 msgid "second guess 'git switch <no-such-branch>'" msgstr "interpréter 'git switch <branche-inexistante>'" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1841 msgid "throw away local modifications" msgstr "laisser tomber les modifications locales" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1875 msgid "which tree-ish to checkout from" msgstr "de quel <arbre-esque> faire l'extraction" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1877 msgid "restore the index" msgstr "restaurer l'index" -#: builtin/checkout.c:1881 +#: builtin/checkout.c:1879 msgid "restore the working tree (default)" msgstr "restaurer l'arbre de travail (par défaut)" -#: builtin/checkout.c:1883 +#: builtin/checkout.c:1881 msgid "ignore unmerged entries" msgstr "ignorer les entrées non-fusionnées" -#: builtin/checkout.c:1884 +#: builtin/checkout.c:1882 msgid "use overlay mode" msgstr "utiliser le mode de superposition" @@ -13138,13 +13152,13 @@ msgstr "répertoire-modèle" 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:1831 -#: builtin/submodule--helper.c:2336 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899 +#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903 msgid "reference repository" msgstr "dépôt de référence" -#: builtin/clone.c:123 builtin/submodule--helper.c:1833 -#: builtin/submodule--helper.c:2338 +#: builtin/clone.c:123 builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905 msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" @@ -13194,8 +13208,8 @@ msgid "deepen history of shallow clone, excluding rev" msgstr "" "approfondir l'historique d'un clone superficiel en excluant une révision" -#: builtin/clone.c:137 builtin/submodule--helper.c:1843 -#: builtin/submodule--helper.c:2352 +#: builtin/clone.c:137 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:2369 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" @@ -13869,8 +13883,10 @@ 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" +"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 @@ -14263,37 +14279,37 @@ msgstr "accepter d'enregistrer une modification vide" msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1747 +#: builtin/commit.c:1750 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1754 +#: builtin/commit.c:1757 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1775 +#: builtin/commit.c:1778 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1782 +#: builtin/commit.c:1785 #, 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:1787 +#: builtin/commit.c:1790 #, 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:1798 +#: builtin/commit.c:1801 #, 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" -#: builtin/commit.c:1834 +#: builtin/commit.c:1837 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -15327,7 +15343,9 @@ 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 (forced-updates) 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" @@ -15427,7 +15445,9 @@ msgstr "%s n'a pas envoyé tous les objets nécessaires\n" #: builtin/fetch.c:1129 #, c-format 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" +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 @@ -15680,15 +15700,15 @@ msgstr "afficher seulement les références qui ne contiennent pas le commit" msgid "git for-each-repo --config=<config> <command-args>" msgstr "git for-each-repo --config=<config> <arguments-de-commande>" -#: builtin/for-each-repo.c:37 +#: builtin/for-each-repo.c:34 msgid "config" msgstr "config" -#: builtin/for-each-repo.c:38 +#: builtin/for-each-repo.c:35 msgid "config key storing a list of repository paths" msgstr "clé de config qui stocke la liste des chemins de dépôts" -#: builtin/for-each-repo.c:46 +#: builtin/for-each-repo.c:43 msgid "missing --config=<config>" msgstr "--config=<config> manquant" @@ -18091,38 +18111,38 @@ msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n" msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:602 +#: builtin/merge.c:603 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" -#: builtin/merge.c:728 +#: builtin/merge.c:729 msgid "Not handling anything other than two heads merge." msgstr "Impossible de gérer autre chose que la fusion de deux têtes." -#: builtin/merge.c:741 +#: builtin/merge.c:742 #, c-format 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:223 +#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:812 +#: builtin/merge.c:813 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:821 +#: builtin/merge.c:822 #, 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" -#: builtin/merge.c:827 +#: builtin/merge.c:828 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -18134,11 +18154,11 @@ msgstr "" "branche de sujet.\n" "\n" -#: builtin/merge.c:832 +#: builtin/merge.c:833 msgid "An empty message aborts the commit.\n" msgstr "Un message vide abandonne la validation.\n" -#: builtin/merge.c:835 +#: builtin/merge.c:836 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -18147,74 +18167,74 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:888 +#: builtin/merge.c:889 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:903 +#: builtin/merge.c:904 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:964 +#: builtin/merge.c:965 #, 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" -#: builtin/merge.c:1003 +#: builtin/merge.c:1004 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:1005 +#: builtin/merge.c:1006 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:1007 +#: builtin/merge.c:1008 msgid "No default upstream defined for the current branch." msgstr "Pas de branche amont par défaut définie pour la branche courante." -#: builtin/merge.c:1012 +#: builtin/merge.c:1013 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1069 +#: builtin/merge.c:1070 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mauvaise valeur '%s' dans l'environnement '%s'" -#: builtin/merge.c:1172 +#: builtin/merge.c:1173 #, c-format msgid "not something we can merge in %s: %s" msgstr "pas possible de fusionner ceci dans %s : %s" -#: builtin/merge.c:1206 +#: builtin/merge.c:1207 msgid "not something we can merge" msgstr "pas possible de fusionner ceci" -#: builtin/merge.c:1316 +#: builtin/merge.c:1317 msgid "--abort expects no arguments" msgstr "--abort n'accepte pas d'argument" -#: builtin/merge.c:1320 +#: builtin/merge.c:1321 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)." -#: builtin/merge.c:1338 +#: builtin/merge.c:1339 msgid "--quit expects no arguments" msgstr "--quit n'accepte pas d'argument" -#: builtin/merge.c:1351 +#: builtin/merge.c:1352 msgid "--continue expects no arguments" msgstr "--continue ne supporte aucun argument" -#: builtin/merge.c:1355 +#: builtin/merge.c:1356 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)." -#: builtin/merge.c:1371 +#: builtin/merge.c:1372 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -18222,7 +18242,7 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1378 +#: builtin/merge.c:1379 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -18230,90 +18250,90 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1381 +#: builtin/merge.c:1382 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)." -#: builtin/merge.c:1395 +#: builtin/merge.c:1396 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1397 +#: builtin/merge.c:1398 msgid "You cannot combine --squash with --commit." msgstr "Vous ne pouvez pas combiner --squash avec --commit." -#: builtin/merge.c:1413 +#: builtin/merge.c:1414 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini." -#: builtin/merge.c:1430 +#: builtin/merge.c:1431 msgid "Squash commit into empty head not supported yet" msgstr "La validation compressée vers une tête vide n'est pas encore supportée" -#: builtin/merge.c:1432 +#: builtin/merge.c:1433 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide" -#: builtin/merge.c:1437 +#: builtin/merge.c:1438 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1439 +#: builtin/merge.c:1440 msgid "Can merge only exactly one commit into empty head" msgstr "" "Possible de fusionner exactement une seule validation dans une tête vide" -#: builtin/merge.c:1520 +#: builtin/merge.c:1521 msgid "refusing to merge unrelated histories" msgstr "refus de fusionner des historiques sans relation" -#: builtin/merge.c:1539 +#: builtin/merge.c:1540 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1587 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1594 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1623 +#: builtin/merge.c:1625 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1651 builtin/merge.c:1716 +#: builtin/merge.c:1653 builtin/merge.c:1719 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1655 +#: builtin/merge.c:1657 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1707 +#: builtin/merge.c:1709 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n" -#: builtin/merge.c:1709 +#: builtin/merge.c:1711 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1718 +#: builtin/merge.c:1721 #, c-format -msgid "Using the %s to prepare resolving by hand.\n" +msgid "Using the %s strategy to prepare resolving by hand.\n" msgstr "Utilisation de %s pour préparer la résolution à la main.\n" -#: builtin/merge.c:1732 +#: builtin/merge.c:1735 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -20698,7 +20718,7 @@ msgid "fatal: no such branch/commit '%s'" msgstr "fatal : pas de branche ou commit '%s'" #: builtin/rebase.c:1929 builtin/submodule--helper.c:39 -#: builtin/submodule--helper.c:2414 +#: builtin/submodule--helper.c:2431 #, c-format msgid "No such ref: %s" msgstr "Référence inexistante : %s" @@ -22445,7 +22465,9 @@ msgstr "" #: builtin/show-branch.c:711 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" -msgstr "--reflog est incompatible avec --all, --remotes, --independent et --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" @@ -22590,37 +22612,37 @@ msgstr "impossible de modifier la configuration d'index clairsemé" msgid "failed to open '%s'" msgstr "échec à l'ouverture de '%s'" -#: builtin/sparse-checkout.c:419 +#: builtin/sparse-checkout.c:413 #, c-format msgid "could not normalize path %s" msgstr "impossible de normaliser le chemin '%s'" -#: builtin/sparse-checkout.c:431 +#: builtin/sparse-checkout.c:425 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <motifs>)" -#: builtin/sparse-checkout.c:456 +#: builtin/sparse-checkout.c:450 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "impossible de décoter la chaîne en style C '%s'" -#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 +#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528 msgid "unable to load existing sparse-checkout patterns" msgstr "impossible de charger les motifs de l'extraction clairsemée existants" -#: builtin/sparse-checkout.c:579 +#: builtin/sparse-checkout.c:573 msgid "read patterns from standard in" msgstr "lire les motifs depuis l'entrée standard" -#: builtin/sparse-checkout.c:594 +#: builtin/sparse-checkout.c:588 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:613 +#: builtin/sparse-checkout.c:607 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:644 +#: builtin/sparse-checkout.c:638 msgid "error while refreshing working directory" msgstr "erreur lors du rafraîchissement du répertoire de travail" @@ -22908,7 +22930,7 @@ msgstr "" 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:46 builtin/submodule--helper.c:2423 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Nom de référence complet attendu, %s obtenu" @@ -22922,26 +22944,27 @@ msgstr "submodule--helper print-default-remote n'accepte aucun argument" msgid "cannot strip one component off url '%s'" msgstr "impossible de supprimer un composant de l'URL '%s'" -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887 +#: builtin/submodule--helper.c:2891 msgid "alternative anchor for relative paths" msgstr "ancre alternative pour les chemins relatifs" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:416 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:652 +#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:654 #, 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:524 +#: builtin/submodule--helper.c:526 #, c-format msgid "Entering '%s'\n" msgstr "Entrée dans '%s'\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:529 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22950,7 +22973,7 @@ msgstr "" "run_command a retourné un statut non-nul pour %s\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:551 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22961,21 +22984,21 @@ msgstr "" "modules inclus de %s\n" "." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:567 msgid "suppress output of entering each submodule command" msgstr "" "supprimer la sortie lors de l'entrée dans chaque commande de sous-module" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 -#: builtin/submodule--helper.c:1487 +#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:1489 msgid "recurse into nested submodules" msgstr "parcourir récursivement les sous-modules" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:574 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <commande>" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:601 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -22984,60 +23007,60 @@ msgstr "" "impossible de trouver la configuration '%s'. Ce dépôt est considéré comme " "son propre amont d'autorité." -#: builtin/submodule--helper.c:666 +#: builtin/submodule--helper.c:668 #, 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:670 +#: builtin/submodule--helper.c:672 #, 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:680 +#: builtin/submodule--helper.c:682 #, 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" -#: builtin/submodule--helper.c:687 +#: builtin/submodule--helper.c:689 #, 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'" -#: builtin/submodule--helper.c:709 +#: builtin/submodule--helper.c:711 msgid "suppress output for initializing a submodule" msgstr "supprimer la sortie lors de l'initialisation d'un sous-module" -#: builtin/submodule--helper.c:714 +#: builtin/submodule--helper.c:716 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<options>] [<chemin>]" -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, 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'" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:837 #, 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:862 builtin/submodule--helper.c:1457 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "récursion impossible dans le sous-module '%s'" -#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625 msgid "suppress submodule status output" msgstr "supprimer la sortie d'état du sous-module" -#: builtin/submodule--helper.c:887 +#: builtin/submodule--helper.c:889 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -23045,98 +23068,98 @@ msgstr "" "utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD " "du sous-module" -#: builtin/submodule--helper.c:893 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]" -#: builtin/submodule--helper.c:917 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper <nom> <chemin>" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:991 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" -#: builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:994 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(submodule)->%s(blob)" -#: builtin/submodule--helper.c:1005 +#: builtin/submodule--helper.c:1007 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1057 #, c-format msgid "couldn't hash object from '%s'" msgstr "impossible de calculer l'empreinte de l'objet depuis '%s'" -#: builtin/submodule--helper.c:1059 +#: builtin/submodule--helper.c:1061 #, c-format msgid "unexpected mode %o\n" msgstr "mode %o inattendu\n" -#: builtin/submodule--helper.c:1300 +#: builtin/submodule--helper.c:1302 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" -#: builtin/submodule--helper.c:1302 +#: builtin/submodule--helper.c:1304 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:1304 +#: builtin/submodule--helper.c:1306 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:1306 +#: builtin/submodule--helper.c:1308 msgid "limit the summary size" msgstr "limiter la taille du résumé" -#: builtin/submodule--helper.c:1311 +#: builtin/submodule--helper.c:1313 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<chemin>]" -#: builtin/submodule--helper.c:1335 +#: builtin/submodule--helper.c:1337 msgid "could not fetch a revision for HEAD" msgstr "impossible de récupérer une révision pour HEAD" -#: builtin/submodule--helper.c:1340 +#: builtin/submodule--helper.c:1342 msgid "--cached and --files are mutually exclusive" msgstr "--cached et --files sont mutuellement exclusifs" -#: builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1409 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synchronisation de l'URL sous-module pour '%s'\n" -#: builtin/submodule--helper.c:1413 +#: builtin/submodule--helper.c:1415 #, 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:1427 +#: builtin/submodule--helper.c:1429 #, 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:1438 +#: builtin/submodule--helper.c:1440 #, 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:1485 +#: builtin/submodule--helper.c:1487 msgid "suppress output of synchronizing submodule url" msgstr "" "supprimer la sortie lors de la synchronisation de l'URL d'un sous-module" -#: builtin/submodule--helper.c:1492 +#: builtin/submodule--helper.c:1494 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]" -#: builtin/submodule--helper.c:1546 +#: builtin/submodule--helper.c:1548 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -23146,7 +23169,7 @@ msgstr "" "'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " "historique)" -#: builtin/submodule--helper.c:1558 +#: builtin/submodule--helper.c:1560 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -23155,48 +23178,48 @@ msgstr "" "L'arbre de travail du sous-module '%s' contient des modifications locales ; " "utilisez '-f' pour les annuler" -#: builtin/submodule--helper.c:1566 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Cleared directory '%s'\n" msgstr "Répertoire '%s' nettoyé\n" -#: builtin/submodule--helper.c:1568 +#: builtin/submodule--helper.c:1570 #, 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:1579 +#: builtin/submodule--helper.c:1581 #, 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:1595 +#: builtin/submodule--helper.c:1597 #, 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:1624 +#: builtin/submodule--helper.c:1626 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" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1627 msgid "unregister all submodules" msgstr "désenregistrer tous les sous-modules" -#: builtin/submodule--helper.c:1630 +#: builtin/submodule--helper.c:1632 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]" -#: builtin/submodule--helper.c:1644 +#: builtin/submodule--helper.c:1646 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules" -#: builtin/submodule--helper.c:1713 +#: builtin/submodule--helper.c:1690 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" @@ -23208,47 +23231,69 @@ msgstr "" "submodule.alternateErrorStrategy à 'info', ou de manière équivalente,\n" "clonez avec '--reference-if-able' au lieu de '--reference'." -#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 #, 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:1791 +#: builtin/submodule--helper.c:1768 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" "La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue" -#: builtin/submodule--helper.c:1798 +#: builtin/submodule--helper.c:1775 #, 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:1822 +#: builtin/submodule--helper.c:1800 +#, 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" + +#: builtin/submodule--helper.c:1841 +#, 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:1846 +#, c-format +msgid "directory not empty: '%s'" +msgstr "le répertoire n'est pas vide : '%s'" + +#: builtin/submodule--helper.c:1858 +#, 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:1890 builtin/submodule--helper.c:2894 msgid "where the new submodule will be cloned to" msgstr "emplacement où le sous-module sera cloné" -#: builtin/submodule--helper.c:1825 +#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897 msgid "name of the new submodule" msgstr "nom du nouveau sous-module" -#: builtin/submodule--helper.c:1828 +#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900 msgid "url where to clone the submodule from" msgstr "URL depuis laquelle cloner le sous-module" -#: builtin/submodule--helper.c:1836 +#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907 msgid "depth for shallow clones" msgstr "profondeur de l'historique des clones superficiels" -#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 +#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365 +#: builtin/submodule--helper.c:2909 msgid "force cloning progress" msgstr "forcer l'affichage de la progression du clonage" -#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367 msgid "disallow cloning into non-empty directory" msgstr "interdire de cloner dans un répertoire non-vide" -#: builtin/submodule--helper.c:1848 +#: builtin/submodule--helper.c:1916 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -23258,105 +23303,84 @@ msgstr "" "<dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> " "--path <chemin>" -#: 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" - -#: 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:1888 -#, c-format -msgid "directory not empty: '%s'" -msgstr "le répertoire n'est pas vide : '%s'" - -#: 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:1936 +#: builtin/submodule--helper.c:1953 #, 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:1940 +#: builtin/submodule--helper.c:1957 #, 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'" -#: builtin/submodule--helper.c:2041 +#: builtin/submodule--helper.c:2058 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Le chemin de sous-module '%s' n'est pas initialisé" -#: builtin/submodule--helper.c:2045 +#: builtin/submodule--helper.c:2062 msgid "Maybe you want to use 'update --init'?" msgstr "Vous voudriez sûrement utiliser 'update --init' ?" -#: builtin/submodule--helper.c:2075 +#: builtin/submodule--helper.c:2092 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Sous-module non fusionné %s non traité" -#: builtin/submodule--helper.c:2104 +#: builtin/submodule--helper.c:2121 #, c-format msgid "Skipping submodule '%s'" msgstr "Sous-module '%s' non traité" -#: builtin/submodule--helper.c:2254 +#: builtin/submodule--helper.c:2271 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Impossible de cloner '%s'. Réessai prévu" -#: builtin/submodule--helper.c:2265 +#: builtin/submodule--helper.c:2282 #, 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:2327 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590 msgid "path into the working tree" msgstr "chemin dans la copie de travail" -#: builtin/submodule--helper.c:2330 +#: builtin/submodule--helper.c:2347 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "chemin dans la copie de travail, traversant les frontières de sous-modules" -#: builtin/submodule--helper.c:2334 +#: builtin/submodule--helper.c:2351 msgid "rebase, merge, checkout or none" msgstr "valeurs possibles : rebase, merge, checkout ou none" -#: builtin/submodule--helper.c:2340 +#: builtin/submodule--helper.c:2357 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:2343 +#: builtin/submodule--helper.c:2360 msgid "parallel jobs" msgstr "jobs parallèles" -#: builtin/submodule--helper.c:2345 +#: builtin/submodule--helper.c:2362 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:2346 +#: builtin/submodule--helper.c:2363 msgid "don't print cloning progress" msgstr "ne pas afficher la progression du clonage" -#: builtin/submodule--helper.c:2357 +#: builtin/submodule--helper.c:2374 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:2370 +#: builtin/submodule--helper.c:2387 msgid "bad value for update parameter" msgstr "valeur invalide pour la mise à jour du paramètre" -#: builtin/submodule--helper.c:2418 +#: builtin/submodule--helper.c:2435 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -23365,86 +23389,140 @@ 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:2541 +#: builtin/submodule--helper.c:2558 #, 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:2574 +#: builtin/submodule--helper.c:2591 msgid "recurse into submodules" msgstr "parcourir récursivement les sous-modules" -#: builtin/submodule--helper.c:2580 +#: builtin/submodule--helper.c:2597 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<options>] [<chemin>...]" -#: builtin/submodule--helper.c:2636 +#: builtin/submodule--helper.c:2653 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:2639 +#: builtin/submodule--helper.c:2656 msgid "unset the config in the .gitmodules file" msgstr "désactiver la configuration dans le fichier .gitmodules" -#: builtin/submodule--helper.c:2644 +#: builtin/submodule--helper.c:2661 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config name [<valeur>]" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2662 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nom>" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2663 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2665 git-submodule.sh:150 +#: builtin/submodule--helper.c:2682 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" -#: builtin/submodule--helper.c:2681 +#: builtin/submodule--helper.c:2698 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:2685 +#: builtin/submodule--helper.c:2702 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper sync [--quiet] <chemin> <nouvelle-url>" -#: builtin/submodule--helper.c:2718 +#: builtin/submodule--helper.c:2735 msgid "set the default tracking branch to master" msgstr "régler la branche de suivi par défaut à master" -#: builtin/submodule--helper.c:2720 +#: builtin/submodule--helper.c:2737 msgid "set the default tracking branch" msgstr "régler la branche de suivi par défaut" -#: builtin/submodule--helper.c:2724 +#: builtin/submodule--helper.c:2741 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:2725 +#: builtin/submodule--helper.c:2742 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:2732 +#: builtin/submodule--helper.c:2749 msgid "--branch or --default required" msgstr "--branch ou --default requis" -#: builtin/submodule--helper.c:2735 +#: builtin/submodule--helper.c:2752 msgid "--branch and --default are mutually exclusive" msgstr "--branch et --default sont mutuellement exclusifs" -#: builtin/submodule--helper.c:2792 git.c:449 git.c:724 +#: builtin/submodule--helper.c:2815 +#, c-format +msgid "Adding existing repo at '%s' to the index\n" +msgstr "Ajout du dépôt existant à '%s' dans l'index\n" + +#: builtin/submodule--helper.c:2818 +#, c-format +msgid "'%s' already exists and is not a valid git repo" +msgstr "'%s' existe déjà et n'est pas un dépôt git valide" + +#: builtin/submodule--helper.c:2828 +#, c-format +msgid "A git directory for '%s' is found locally with remote(s):" +msgstr "Un répertoire git pour '%s' est trouvé en local avec le(s) serveur(s) distant(s) :" + +#: builtin/submodule--helper.c:2833 +#, c-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from\n" +" %s\n" +"use the '--force' option. If the local git directory is not the correct " +"repo\n" +"or if you are unsure what this means, choose another name with the '--name' " +"option.\n" +msgstr "" +"Si vous voulez réutiliser ce répertoire local git au lieu de le recloner depuis\n" +" %s\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'.\n" + +#: builtin/submodule--helper.c:2842 +#, c-format +msgid "Reactivating local git directory for submodule '%s'\n" +msgstr "Réactivation du répertoire git local pour le sous-module '%s'\n" + +#: builtin/submodule--helper.c:2875 +#, c-format +msgid "unable to checkout submodule '%s'" +msgstr "Impossible d'extraire le sous-module '%s'" + +#: builtin/submodule--helper.c:2888 +msgid "branch of repository to checkout on cloning" +msgstr "la branche du dépôt à extraire lors du clonage" + +#: builtin/submodule--helper.c:2910 +msgid "allow adding an otherwise ignored submodule path" +msgstr "permettre l'ajout des chemins de modules ignorés par ailleurs" + +#: builtin/submodule--helper.c:2917 +msgid "" +"git submodule--helper add-clone [<options>...] --url <url> --path <path> --" +"name <name>" +msgstr "git submodule--helper add-clone [<options>...] --url <url> --path <chemin> --name <nom>" + +#: builtin/submodule--helper.c:2985 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:2798 +#: builtin/submodule--helper.c:2991 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" @@ -25719,73 +25797,29 @@ msgstr "'$sm_path' existe déjà dans l'index et n'est pas un sous-module" msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' n'a pas de commit extrait" -#: git-submodule.sh:249 -#, sh-format -msgid "Adding existing repo at '$sm_path' to the index" -msgstr "Ajout du dépôt existant à '$sm_path' dans l'index" - -#: git-submodule.sh:251 -#, sh-format -msgid "'$sm_path' already exists and is not a valid git repo" -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) :" - -#: 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." -msgstr "" -"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" -"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'." - -#: git-submodule.sh:267 -#, sh-format -msgid "Reactivating local git directory for submodule '$sm_name'." -msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'." - -#: git-submodule.sh:279 -#, sh-format -msgid "Unable to checkout submodule '$sm_path'" -msgstr "Impossible d'extraire le sous-module '$sm_path'" - -#: git-submodule.sh:284 +#: git-submodule.sh:248 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Échec d'ajout du sous-module '$sm_path'" -#: git-submodule.sh:293 +#: git-submodule.sh:257 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Échec d'enregistrement du sous-module '$sm_path'" -#: git-submodule.sh:568 +#: git-submodule.sh:532 #, 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'" -#: git-submodule.sh:578 +#: git-submodule.sh:542 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'" -#: git-submodule.sh:583 +#: git-submodule.sh:547 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -25794,7 +25828,7 @@ msgstr "" "Impossible de trouver la révision courante ${remote_name}/${branch} dans le " "chemin de sous-module '$sm_path'" -#: git-submodule.sh:601 +#: git-submodule.sh:565 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -25803,7 +25837,7 @@ msgstr "" "Impossible de rapatrier dans le chemin de sous-module '$displaypath' ; essai " "de rapatriement direct de $sha1 :" -#: git-submodule.sh:607 +#: git-submodule.sh:571 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -25812,52 +25846,52 @@ 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 +#: git-submodule.sh:578 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:615 +#: git-submodule.sh:579 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait" -#: git-submodule.sh:619 +#: git-submodule.sh:583 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:620 +#: git-submodule.sh:584 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'" -#: git-submodule.sh:625 +#: git-submodule.sh:589 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:626 +#: git-submodule.sh:590 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'" -#: git-submodule.sh:631 +#: git-submodule.sh:595 #, 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'" -#: git-submodule.sh:632 +#: git-submodule.sh:596 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'" -#: git-submodule.sh:663 +#: git-submodule.sh:627 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'" @@ -26629,8 +26663,10 @@ msgid "" "Set sendemail.forbidSendmailVariables to false to disable this check.\n" msgstr "" "fatal : options de configuration trouvées pour 'sendmail'\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 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:530 git-send-email.perl:746 msgid "Cannot run git format-patch from outside a repository\n" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-08-03 17:06+0800\n" -"PO-Revision-Date: 2021-05-17 18:32+0700\n" +"POT-Creation-Date: 2021-08-14 07:56+0800\n" +"PO-Revision-Date: 2021-08-14 09:35+0700\n" "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n" "Language-Team: Indonesian\n" "Language: id\n" @@ -22,7 +22,7 @@ msgstr "" msgid "Huh (%s)?" msgstr "Huh (%s)" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 +#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493 #: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 #: builtin/rebase.c:1953 msgid "could not read index" @@ -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:3707 +#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707 msgid "could not write index" msgstr "tidak dapat menulis indeks" @@ -211,9 +211,10 @@ msgstr "tak tergelar" #: 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 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886 +#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589 +#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893 #: git-add--interactive.perl:213 msgid "path" msgstr "jalur" @@ -782,7 +783,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:283 builtin/merge.c:1374 +#: advice.c:283 builtin/merge.c:1375 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" @@ -1517,7 +1518,7 @@ msgstr "Tidak dapat membaca %s" #: 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 +#: builtin/merge.c:1144 #, c-format msgid "could not read '%s'" msgstr "tidak dapat membaca '%s'" @@ -1606,7 +1607,8 @@ 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:1830 builtin/submodule--helper.c:2335 +#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352 +#: builtin/submodule--helper.c:2902 msgid "repo" msgstr "repositori" @@ -1794,9 +1796,10 @@ msgstr "tidak dapat menggunakan --contents dengan nama objek komit final" #: blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" -msgstr "--reverse dan --first-parent bersama-sama butuh komit terbaru yang disebutkan" +msgstr "" +"--reverse dan --first-parent bersama-sama butuh komit terbaru yang disebutkan" -#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333 +#: blame.c:2820 bundle.c:224 ref-filter.c:2278 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 @@ -1808,7 +1811,8 @@ 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" +"--reverse --first-parent bersama-sama butuh rentang bersama rantai induk " +"pertama" #: blame.c:2849 #, c-format @@ -2988,23 +2992,23 @@ msgstr "" msgid "path name too long for external filter" msgstr "" -#: convert.c:934 +#: convert.c:935 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -#: convert.c:1234 +#: convert.c:1236 msgid "true/false are no valid working-tree-encodings" msgstr "" -#: convert.c:1414 convert.c:1447 +#: convert.c:1416 convert.c:1449 #, c-format msgid "%s: clean filter '%s' failed" msgstr "" -#: convert.c:1490 +#: convert.c:1492 #, c-format msgid "%s: smudge filter %s failed" msgstr "" @@ -3235,10 +3239,10 @@ msgstr "" #: diff.c:4643 msgid "" -"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +"--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 " +"--pickaxe-all dan --find-object saling eksklusif, gunakan --pickaxe-all " "dengan -G dan -S" #: diff.c:4722 @@ -3780,8 +3784,7 @@ msgstr "Keluarkan ke berkas yang disebutkan" #: diff.c:6298 msgid "exhaustive rename detection was skipped due to too many files." -msgstr "" -"deteksi penamaan ulang lengkap dilewati karena terlalu banyak berkas." +msgstr "deteksi penamaan ulang lengkap dilewati karena terlalu banyak berkas." #: diff.c:6301 msgid "only found copies from modified paths due to too many files." @@ -3801,7 +3804,7 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:1510 +#: diffcore-rename.c:1514 msgid "Performing inexact rename detection" msgstr "" @@ -3820,49 +3823,49 @@ msgstr "" msgid "unrecognized pattern: '%s'" msgstr "" -#: dir.c:792 dir.c:806 +#: dir.c:790 dir.c:804 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "" -#: dir.c:824 +#: dir.c:820 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" -#: dir.c:834 +#: dir.c:830 msgid "disabling cone pattern matching" msgstr "" -#: dir.c:1221 +#: dir.c:1214 #, c-format msgid "cannot use %s as an exclude file" msgstr "" -#: dir.c:2358 +#: dir.c:2351 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2660 +#: dir.c:2653 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2784 +#: dir.c:2777 msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3617 +#: dir.c:3610 #, c-format msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:3664 dir.c:3669 +#: dir.c:3657 dir.c:3662 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3698 +#: dir.c:3691 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" @@ -3886,7 +3889,7 @@ msgstr "" msgid "bad git namespace path \"%s\"" msgstr "" -#: environment.c:335 +#: environment.c:334 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "" @@ -4500,39 +4503,39 @@ msgstr "" msgid "bad action '%s' for '%s'" msgstr "" -#: merge-ort.c:1228 merge-recursive.c:1206 +#: merge-ort.c:1569 merge-recursive.c:1201 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "" -#: merge-ort.c:1237 merge-recursive.c:1213 +#: merge-ort.c:1578 merge-recursive.c:1208 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "" -#: merge-ort.c:1246 merge-recursive.c:1220 +#: merge-ort.c:1587 merge-recursive.c:1215 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" -#: merge-ort.c:1256 merge-ort.c:1263 +#: merge-ort.c:1597 merge-ort.c:1604 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "" -#: merge-ort.c:1284 +#: merge-ort.c:1625 #, c-format msgid "Failed to merge submodule %s" msgstr "" -#: merge-ort.c:1291 +#: merge-ort.c:1632 #, 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 +#: merge-ort.c:1636 merge-recursive.c:1269 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4543,42 +4546,42 @@ msgid "" "which will accept this suggestion.\n" msgstr "" -#: merge-ort.c:1308 +#: merge-ort.c:1649 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" "%s" msgstr "" -#: merge-ort.c:1527 merge-recursive.c:1363 +#: merge-ort.c:1868 merge-recursive.c:1358 msgid "Failed to execute internal merge" msgstr "" -#: merge-ort.c:1532 merge-recursive.c:1368 +#: merge-ort.c:1873 merge-recursive.c:1363 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-ort.c:1539 merge-recursive.c:1401 +#: merge-ort.c:1880 merge-recursive.c:1396 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-ort.c:1678 merge-recursive.c:2123 +#: merge-ort.c:2019 merge-recursive.c:2118 #, 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 +#: merge-ort.c:2029 merge-recursive.c:2128 #, 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 +#: merge-ort.c:2087 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4586,47 +4589,47 @@ msgid "" "majority of the files." msgstr "" -#: merge-ort.c:1900 merge-recursive.c:2469 +#: merge-ort.c:2241 merge-recursive.c:2464 #, 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 +#: merge-ort.c:2385 merge-recursive.c:3247 #, 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 +#: merge-ort.c:2392 merge-recursive.c:3254 #, 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 +#: merge-ort.c:2405 merge-recursive.c:3250 #, 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 +#: merge-ort.c:2413 merge-recursive.c:3257 #, 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 +#: merge-ort.c:2569 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" -#: merge-ort.c:2323 +#: merge-ort.c:2664 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4634,67 +4637,67 @@ msgid "" "markers." msgstr "" -#: merge-ort.c:2342 merge-ort.c:2366 +#: merge-ort.c:2683 merge-ort.c:2707 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" -#: merge-ort.c:2819 merge-recursive.c:3013 +#: merge-ort.c:3182 merge-recursive.c:3008 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-ort.c:2822 merge-recursive.c:3016 +#: merge-ort.c:3185 merge-recursive.c:3011 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-ort.c:3250 +#: merge-ort.c:3613 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " "%s instead." msgstr "" -#: merge-ort.c:3326 +#: merge-ort.c:3689 #, 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 +#: merge-ort.c:3696 #, 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 +#: merge-ort.c:3796 merge-recursive.c:3087 msgid "content" msgstr "" -#: merge-ort.c:3435 merge-recursive.c:3096 +#: merge-ort.c:3798 merge-recursive.c:3091 msgid "add/add" msgstr "" -#: merge-ort.c:3437 merge-recursive.c:3141 +#: merge-ort.c:3800 merge-recursive.c:3136 msgid "submodule" msgstr "" -#: merge-ort.c:3439 merge-recursive.c:3142 +#: merge-ort.c:3802 merge-recursive.c:3137 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-ort.c:3470 +#: merge-ort.c:3833 #, 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:3757 +#: merge-ort.c:4120 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -4704,192 +4707,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:4116 +#: merge-ort.c:4487 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "" -#: merge-ort-wrappers.c:13 merge-recursive.c:3707 +#: merge-ort-wrappers.c:13 merge-recursive.c:3702 #, 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:3473 builtin/merge.c:402 +#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402 msgid "Already up to date." msgstr "Sudah terbaru." -#: merge-recursive.c:357 +#: merge-recursive.c:352 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:380 +#: merge-recursive.c:375 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:389 +#: merge-recursive.c:384 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:877 +#: merge-recursive.c:872 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:888 +#: merge-recursive.c:883 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:902 merge-recursive.c:921 +#: merge-recursive.c:897 merge-recursive.c:916 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:911 +#: merge-recursive.c:906 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:952 builtin/cat-file.c:41 +#: merge-recursive.c:947 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:957 +#: merge-recursive.c:952 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:982 +#: merge-recursive.c:977 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:993 +#: merge-recursive.c:988 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:998 +#: merge-recursive.c:993 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:1228 merge-recursive.c:1240 +#: merge-recursive.c:1223 merge-recursive.c:1235 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "" -#: merge-recursive.c:1231 merge-recursive.c:1243 +#: merge-recursive.c:1226 merge-recursive.c:1238 #, c-format msgid "Fast-forwarding submodule %s" msgstr "" -#: merge-recursive.c:1266 +#: merge-recursive.c:1261 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -#: merge-recursive.c:1270 +#: merge-recursive.c:1265 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "" -#: merge-recursive.c:1271 +#: merge-recursive.c:1266 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" -#: merge-recursive.c:1283 +#: merge-recursive.c:1278 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" -#: merge-recursive.c:1425 +#: merge-recursive.c:1420 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" -#: merge-recursive.c:1497 +#: merge-recursive.c:1492 #, 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:1502 +#: merge-recursive.c:1497 #, 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:1509 +#: merge-recursive.c:1504 #, 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:1514 +#: merge-recursive.c:1509 #, 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:1549 +#: merge-recursive.c:1544 msgid "rename" msgstr "" -#: merge-recursive.c:1549 +#: merge-recursive.c:1544 msgid "renamed" msgstr "" -#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169 +#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "" -#: merge-recursive.c:1610 +#: merge-recursive.c:1605 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" -#: merge-recursive.c:1668 +#: merge-recursive.c:1663 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" -#: merge-recursive.c:1699 +#: merge-recursive.c:1694 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1704 +#: merge-recursive.c:1699 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" -#: merge-recursive.c:1731 +#: merge-recursive.c:1726 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1736 +#: merge-recursive.c:1731 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1828 +#: merge-recursive.c:1823 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:2091 +#: merge-recursive.c:2086 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4897,85 +4900,85 @@ msgid "" "getting a majority of the files." msgstr "" -#: merge-recursive.c:2225 +#: merge-recursive.c:2220 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" -#: merge-recursive.c:3080 +#: merge-recursive.c:3075 msgid "modify" msgstr "" -#: merge-recursive.c:3080 +#: merge-recursive.c:3075 msgid "modified" msgstr "" -#: merge-recursive.c:3119 +#: merge-recursive.c:3114 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:3172 +#: merge-recursive.c:3167 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:3376 +#: merge-recursive.c:3371 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:3399 +#: merge-recursive.c:3394 msgid "file/directory" msgstr "" -#: merge-recursive.c:3404 +#: merge-recursive.c:3399 msgid "directory/file" msgstr "" -#: merge-recursive.c:3411 +#: merge-recursive.c:3406 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:3420 +#: merge-recursive.c:3415 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:3429 +#: merge-recursive.c:3424 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3482 +#: merge-recursive.c:3477 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:3576 +#: merge-recursive.c:3571 msgid "Merging:" msgstr "" -#: merge-recursive.c:3589 +#: merge-recursive.c:3584 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:3639 +#: merge-recursive.c:3634 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:3804 +#: merge-recursive.c:3799 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900 +#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901 #: builtin/stash.c:473 msgid "Unable to write index." msgstr "" @@ -4985,7 +4988,7 @@ msgid "failed to read the cache" msgstr "" #: 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/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821 #: builtin/stash.c:267 msgid "unable to write new index file" msgstr "" @@ -6082,10 +6085,10 @@ msgstr "" #: 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/checkout.c:519 builtin/checkout.c:706 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 +#: builtin/submodule--helper.c:333 msgid "index file corrupt" msgstr "" @@ -6139,36 +6142,36 @@ msgstr "" msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 +#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:3074 +#: read-cache.c:3075 msgid "failed to convert to a sparse-index" msgstr "" -#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440 +#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:3158 +#: read-cache.c:3159 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:3170 +#: read-cache.c:3171 #, c-format msgid "unable to unlink: %s" msgstr "" -#: read-cache.c:3199 +#: read-cache.c:3200 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "" -#: read-cache.c:3348 +#: read-cache.c:3349 #, c-format msgid "%s: cannot drop to stage #0" msgstr "" @@ -6532,17 +6535,17 @@ msgstr "" msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:2498 +#: ref-filter.c:2502 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2592 +#: ref-filter.c:2596 #, c-format msgid "malformed object name %s" msgstr "" -#: ref-filter.c:2597 +#: ref-filter.c:2601 #, c-format msgid "option `%s' must point to a commit" msgstr "" @@ -6984,7 +6987,7 @@ msgid "Recorded preimage for '%s'" msgstr "" #: rerere.c:865 submodule.c:2076 builtin/log.c:2002 -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848 #, c-format msgid "could not create directory '%s'" msgstr "" @@ -7022,7 +7025,7 @@ msgstr "" msgid "could not determine HEAD revision" msgstr "tidak dapat menentukan revisi HEAD" -#: reset.c:70 reset.c:76 sequencer.c:3689 +#: reset.c:69 reset.c:75 sequencer.c:3689 #, c-format msgid "failed to find tree of %s" msgstr "gagal menemukan pohon %s" @@ -7221,7 +7224,7 @@ msgid "unable to dequote value of '%s'" msgstr "" #: 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 +#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "" @@ -7334,7 +7337,7 @@ msgstr "" msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705 msgid "could not parse HEAD commit" msgstr "" @@ -7342,7 +7345,7 @@ msgstr "" msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707 msgid "git write-tree failed to write a tree" msgstr "" @@ -7360,8 +7363,8 @@ msgstr "" msgid "corrupt author: missing date information" msgstr "" -#: 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 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910 +#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "" @@ -8101,11 +8104,11 @@ msgstr "" msgid "attempting to use sparse-index without cone mode" msgstr "" -#: sparse-index.c:174 +#: sparse-index.c:176 msgid "unable to update cache-tree, staying full" msgstr "" -#: sparse-index.c:261 +#: sparse-index.c:263 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "" @@ -8260,7 +8263,7 @@ msgstr "" msgid "process for submodule '%s' failed" msgstr "proses untuk submodul '%s' gagal" -#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486 msgid "Failed to resolve HEAD as a valid ref." msgstr "Gagal menguraikan HEAD sebagai referensi valid." @@ -8928,7 +8931,7 @@ msgstr "" msgid "Updating index flags" msgstr "" -#: unpack-trees.c:2707 +#: unpack-trees.c:2718 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "" @@ -9717,7 +9720,7 @@ msgstr "latihan" msgid "interactive picking" msgstr "pengambilan interaktif" -#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308 msgid "select hunks interactively" msgstr "pilih bingkah secara interaktif" @@ -9848,12 +9851,12 @@ msgstr "Opsi --ignore-missing hanya dapat digunakan bersama dengan --dry-run" 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/add.c:544 builtin/checkout.c:1733 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 tidak kompatibel dengan argumen pathspec" -#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 +#: builtin/add.c:551 builtin/checkout.c:1745 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 butuh --pathspec-from-file" @@ -10287,15 +10290,17 @@ 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 "git bisect--helper --bisect-next-check <istilah bagus> <istilah jelek> [<istilah>]" +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]" +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" +"term-new]" #: builtin/bisect--helper.c:26 msgid "" @@ -10303,9 +10308,9 @@ 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>...]" +"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" @@ -10649,7 +10654,7 @@ msgstr "jangan perlakukan komit akar sebagai perbatasan (asali: off)" msgid "show work cost statistics" msgstr "perlihatkan statistik biaya usaha" -#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 +#: builtin/blame.c:871 builtin/checkout.c:1519 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 @@ -10754,7 +10759,8 @@ 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 "--progress tidak dapat digunakan dengan --incremental atau format porselen" +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 @@ -11422,7 +11428,7 @@ msgstr "" 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/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549 #: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "" @@ -11481,9 +11487,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:1824 -#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835 -#: builtin/submodule--helper.c:2333 builtin/worktree.c:491 +#: builtin/column.c:31 builtin/submodule--helper.c:1892 +#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903 +#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896 +#: builtin/submodule--helper.c:2899 builtin/worktree.c:491 #: builtin/worktree.c:728 msgid "string" msgstr "" @@ -11578,70 +11585,70 @@ msgstr "jalur '%s': tidak dapat gabung" msgid "Unable to add merge result for '%s'" msgstr "Tidak dapat menambahkan hasil penggabungan untuk '%s'" -#: builtin/checkout.c:414 +#: builtin/checkout.c:411 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Konflik penggabungan %d dibuat ulang" msgstr[1] "Konflik penggabungan %d dibuat ulang" -#: builtin/checkout.c:419 +#: builtin/checkout.c:416 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "%d jalur diperbarui dari %s" msgstr[1] "%d jalur diperbarui dari %s" -#: builtin/checkout.c:426 +#: builtin/checkout.c:423 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "%d jalur diperbarui dari indeks" msgstr[1] "%d jalur diperbarui dari indeks" -#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 -#: builtin/checkout.c:459 +#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452 +#: builtin/checkout.c:456 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' tidak dapat digunakan untuk memperbarui jalur" -#: builtin/checkout.c:462 builtin/checkout.c:465 +#: builtin/checkout.c:459 builtin/checkout.c:462 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' tidak dapat digunakan untuk %s" -#: builtin/checkout.c:469 +#: builtin/checkout.c:466 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Tidak dapat memperbarui jalur dan mengganti ke cabang '%s' dalam waktu yang " "bersamaan." -#: builtin/checkout.c:473 +#: builtin/checkout.c:470 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "baik '%s' atau '%s' tidak disebutkan" -#: builtin/checkout.c:477 +#: builtin/checkout.c:474 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' harus disebutkan ketika '%s' tidak disebutkan" -#: builtin/checkout.c:482 builtin/checkout.c:487 +#: builtin/checkout.c:479 builtin/checkout.c:484 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' atau '%s' tidak dapat digunakan untuk %s" -#: builtin/checkout.c:563 builtin/checkout.c:570 +#: builtin/checkout.c:558 builtin/checkout.c:565 #, c-format msgid "path '%s' is unmerged" msgstr "jalur '%s' tak tergabung" -#: builtin/checkout.c:739 +#: builtin/checkout.c:734 msgid "you need to resolve your current index first" msgstr "Anda perlu selesaikan dulu indeks Anda saat ini" -#: builtin/checkout.c:793 +#: builtin/checkout.c:788 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11651,50 +11658,50 @@ msgstr "" "berikut:\n" "%s" -#: builtin/checkout.c:886 +#: builtin/checkout.c:881 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Tidak dapat melakukan reflog untuk '%s': %s\n" -#: builtin/checkout.c:928 +#: builtin/checkout.c:923 msgid "HEAD is now at" msgstr "HEAD sekarang berada di" -#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 +#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "tidak dapat memperbarui HEAD" -#: builtin/checkout.c:936 +#: builtin/checkout.c:931 #, c-format msgid "Reset branch '%s'\n" msgstr "Ganti ulang cabang '%s'\n" -#: builtin/checkout.c:939 +#: builtin/checkout.c:934 #, c-format msgid "Already on '%s'\n" msgstr "Sudah berada pada '%s'\n" -#: builtin/checkout.c:943 +#: builtin/checkout.c:938 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Ganti ke dan ganti cabang '%s'\n" -#: builtin/checkout.c:945 builtin/checkout.c:1376 +#: builtin/checkout.c:940 builtin/checkout.c:1371 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Ganti ke cabang baru '%s'\n" -#: builtin/checkout.c:947 +#: builtin/checkout.c:942 #, c-format msgid "Switched to branch '%s'\n" msgstr "Ganti ke cabang '%s'\n" -#: builtin/checkout.c:998 +#: builtin/checkout.c:993 #, c-format msgid " ... and %d more.\n" msgstr "... dan %d lainnya.\n" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:999 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11717,7 +11724,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1018 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11740,19 +11747,19 @@ msgstr[1] "" "saat yang tepat untuk dilakukan dengan:\n" "git branch <nama-cabang-baru> %s\n" -#: builtin/checkout.c:1058 +#: builtin/checkout.c:1053 msgid "internal error in revision walk" msgstr "kesalahan internal dalam jalan revisi" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1057 msgid "Previous HEAD position was" msgstr "Posisi HEAD sebelumnya adalah" -#: builtin/checkout.c:1102 builtin/checkout.c:1371 +#: builtin/checkout.c:1097 builtin/checkout.c:1366 msgid "You are on a branch yet to be born" msgstr "Anda berada pada cabang yang belum lahir" -#: builtin/checkout.c:1184 +#: builtin/checkout.c:1179 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11761,7 +11768,7 @@ msgstr "" "'%s' bisa jadi berkas lokal dan cabang pelacak.\n" "Mohon gunakan -- (dan secara opsional --no-guess) untuk disambiguasi" -#: builtin/checkout.c:1191 +#: builtin/checkout.c:1186 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" @@ -11781,51 +11788,51 @@ msgstr "" "seperti remote 'origin', pertimbangkan untuk menyetel\n" "checkout.defaultRemote=origin di konfigurasi Anda" -#: builtin/checkout.c:1201 +#: builtin/checkout.c:1196 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' cocok dengan banyak (%d) cabang pelacak remote" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1262 msgid "only one reference expected" msgstr "hanya satu referensi yang diharapkan" -#: builtin/checkout.c:1284 +#: builtin/checkout.c:1279 #, c-format msgid "only one reference expected, %d given." msgstr "hanya satu referensi yang diharapkan, %d diberikan" -#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436 +#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "referensi tidak valid: %s" -#: builtin/checkout.c:1343 builtin/checkout.c:1709 +#: builtin/checkout.c:1338 builtin/checkout.c:1707 #, c-format msgid "reference is not a tree: %s" msgstr "referensi bukan pohon: %s" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1385 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "sebuah cabang diharapkan, dapat tag '%s'" -#: builtin/checkout.c:1392 +#: builtin/checkout.c:1387 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "sebuah cabang diharapkan, dapat cabang remote '%s'" -#: builtin/checkout.c:1393 builtin/checkout.c:1401 +#: builtin/checkout.c:1388 builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got '%s'" msgstr "sebuah cabang diharapkan, dapat '%s'" -#: builtin/checkout.c:1396 +#: builtin/checkout.c:1391 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "sebuah cabang diharapkan, dapat komit '%s'" -#: builtin/checkout.c:1412 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11834,7 +11841,7 @@ msgstr "" "Pertimbangkan untuk menggunakan \"git merge --quit\" atau \"git worktree add" "\"." -#: builtin/checkout.c:1416 +#: builtin/checkout.c:1411 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11842,7 +11849,7 @@ msgstr "" "tidak dapat mengganti cabang di tengah sesi am\n" "Pertimbangkan untuk menggunakan \"git am --quit\" atau \"git worktree add\"." -#: builtin/checkout.c:1420 +#: builtin/checkout.c:1415 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11851,7 +11858,7 @@ msgstr "" "Pertimbangkan untuk menggunakan \"git rebase --quit\" atau \"git worktree add" "\"." -#: builtin/checkout.c:1424 +#: builtin/checkout.c:1419 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11860,147 +11867,147 @@ msgstr "" "Pertimbangkan untuk menggunakan \"git cherry-pick --quit\" atau \"git " "worktree add\"." -#: builtin/checkout.c:1428 +#: builtin/checkout.c:1423 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" "tidak dapat mengganti cabang saat pembalikan\n" -"Pertimbangkan untuk menggunakan \"git revert --quit\" atau \"git " -"worktree add\"." +"Pertimbangkan untuk menggunakan \"git revert --quit\" atau \"git worktree add" +"\"." -#: builtin/checkout.c:1432 +#: builtin/checkout.c:1427 msgid "you are switching branch while bisecting" msgstr "Anda mengganti cabang saat pembagian dua" -#: builtin/checkout.c:1439 +#: builtin/checkout.c:1434 msgid "paths cannot be used with switching branches" msgstr "jalur tidak dapat digunakan dengan mengganti cabang" -#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 +#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' tidak dapat digunakan dengan mengganti cabang" -#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 -#: builtin/checkout.c:1465 builtin/checkout.c:1470 +#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455 +#: builtin/checkout.c:1460 builtin/checkout.c:1465 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' tidak dapat digunakan dengan '%s'" -#: builtin/checkout.c:1467 +#: builtin/checkout.c:1462 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' tidak bisa mengambil <titik-awal>" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1470 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Tidak dapat mengganti cabang ke bukan komit '%s'" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1477 msgid "missing branch or commit argument" msgstr "kehilangan argumen cabang atau komit" -#: builtin/checkout.c:1525 +#: builtin/checkout.c:1520 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:1810 parse-options.h:323 +#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323 msgid "style" msgstr "gaya" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1522 msgid "conflict style (merge or diff3)" msgstr "gaya konflik (merge atau diff3)" -#: builtin/checkout.c:1539 builtin/worktree.c:488 +#: builtin/checkout.c:1534 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "lepas HEAD pada komit bernama" -#: builtin/checkout.c:1540 +#: builtin/checkout.c:1535 msgid "set upstream info for new branch" msgstr "setel info hulu untuk cabang baru" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1537 msgid "force checkout (throw away local modifications)" msgstr "paksa checkout (buang modifikasi lokal)" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new-branch" msgstr "cabang baru" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new unparented branch" msgstr "cabang baru tanpa induk" -#: builtin/checkout.c:1546 builtin/merge.c:301 +#: builtin/checkout.c:1541 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "perbarui berkas yang diabaikan (default)" -#: builtin/checkout.c:1549 +#: builtin/checkout.c:1544 msgid "do not check if another worktree is holding the given ref" msgstr "" "jangan periksa jika pohon kerja yang lain mempunyai referensi yang diberikan" -#: builtin/checkout.c:1562 +#: builtin/checkout.c:1557 msgid "checkout our version for unmerged files" msgstr "checkout versi kami untuk berkas yang tak tergabung" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1560 msgid "checkout their version for unmerged files" msgstr "checkout versi mereka untuk berkas yang tak tergabung" -#: builtin/checkout.c:1569 +#: builtin/checkout.c:1564 msgid "do not limit pathspecs to sparse entries only" msgstr "jangan batasi jalur spek hanya ke entri tipis" -#: builtin/checkout.c:1624 +#: builtin/checkout.c:1622 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c dan --orphan saling eksklusif" -#: builtin/checkout.c:1628 +#: builtin/checkout.c:1626 msgid "-p and --overlay are mutually exclusive" msgstr "-p dan --overlay saling eksklusif" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1663 msgid "--track needs a branch name" msgstr "--track butuh nama cabang" -#: builtin/checkout.c:1670 +#: builtin/checkout.c:1668 #, c-format msgid "missing branch name; try -%c" msgstr "kehilangan nama cabang; coba -%c" -#: builtin/checkout.c:1702 +#: builtin/checkout.c:1700 #, c-format msgid "could not resolve %s" msgstr "tidak dapat menyelesaikan %s" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1716 msgid "invalid path specification" msgstr "spesifikasi jalur tidak valid" -#: builtin/checkout.c:1725 +#: builtin/checkout.c:1723 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' bukanlah commit dan cabang '%s' tidak dapat dibuat dari itu" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1727 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach tidak mengambil argumen jalur '%s'" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1736 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:1630 +#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file tidak kompatibel dengan --patch" -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1752 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12008,70 +12015,71 @@ msgstr "" "git checkout: --ours/--theirs, --force dan --merge tidak kompatibel saat\n" "men-checkout index" -#: builtin/checkout.c:1759 +#: builtin/checkout.c:1757 msgid "you must specify path(s) to restore" 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:2719 builtin/worktree.c:484 +#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834 +#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2887 builtin/worktree.c:484 #: builtin/worktree.c:486 msgid "branch" msgstr "cabang" -#: builtin/checkout.c:1786 +#: builtin/checkout.c:1784 msgid "create and checkout a new branch" msgstr "buat dan checkout cabang baru" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1786 msgid "create/reset and checkout a branch" msgstr "buat/setel ulang dan checkout cabang" -#: builtin/checkout.c:1789 +#: builtin/checkout.c:1787 msgid "create reflog for new branch" msgstr "buat reflog untuk cabang baru" -#: builtin/checkout.c:1791 +#: builtin/checkout.c:1789 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "tebakan kedua 'git checkout <tidak-ada-cabang-seperti-itu>' (default)" -#: builtin/checkout.c:1792 +#: builtin/checkout.c:1790 msgid "use overlay mode (default)" msgstr "gunakan mode hamparan (default)" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1835 msgid "create and switch to a new branch" msgstr "buat dan ganti ke cabang baru" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1837 msgid "create/reset and switch to a branch" msgstr "buat/setel ulang dan ganti ke cabang" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1839 msgid "second guess 'git switch <no-such-branch>'" msgstr "tebakan kedua 'git switch <tidak-ada-cabang-seperti-itu>'" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1841 msgid "throw away local modifications" msgstr "buang modifikasi lokal" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1875 msgid "which tree-ish to checkout from" msgstr "mana mirip-cabang untuk di-checkout" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1877 msgid "restore the index" msgstr "pulihkan indeks" -#: builtin/checkout.c:1881 +#: builtin/checkout.c:1879 msgid "restore the working tree (default)" msgstr "pulihkan pohon kerja (default)" -#: builtin/checkout.c:1883 +#: builtin/checkout.c:1881 msgid "ignore unmerged entries" msgstr "abaikan entri yang tak tergabung" -#: builtin/checkout.c:1884 +#: builtin/checkout.c:1882 msgid "use overlay mode" msgstr "gunakan mode hamparan" @@ -12301,13 +12309,13 @@ msgstr "direktori templat" 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:1831 -#: builtin/submodule--helper.c:2336 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899 +#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903 msgid "reference repository" msgstr "repositori rujukan" -#: builtin/clone.c:123 builtin/submodule--helper.c:1833 -#: builtin/submodule--helper.c:2338 +#: builtin/clone.c:123 builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905 msgid "use --reference only while cloning" msgstr "gunakan --reference hanya pada saat kloning" @@ -12356,8 +12364,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:1843 -#: builtin/submodule--helper.c:2352 +#: builtin/clone.c:137 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:2369 msgid "clone only one branch, HEAD or --branch" msgstr "klon hanya satu cabang, HEAD atau --branch" @@ -13396,36 +13404,36 @@ msgstr "ok merekam perubahan kosong" msgid "ok to record a change with an empty message" msgstr "ok merekam perubahan dengan pesan kosong" -#: builtin/commit.c:1747 +#: builtin/commit.c:1750 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Berkas MERGE_HEAD (%s) rusak" -#: builtin/commit.c:1754 +#: builtin/commit.c:1757 msgid "could not read MERGE_MODE" msgstr "tidak dapat membaca MERGE_MODE" -#: builtin/commit.c:1775 +#: builtin/commit.c:1778 #, c-format msgid "could not read commit message: %s" msgstr "tidak dapat membaca pesan komit: %s" -#: builtin/commit.c:1782 +#: builtin/commit.c:1785 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Batalkan komit karena pesan komit kosong.\n" -#: builtin/commit.c:1787 +#: builtin/commit.c:1790 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Batalkan komit; Anda tidak menyunting pesan.\n" -#: builtin/commit.c:1798 +#: builtin/commit.c:1801 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "Batalkan komit karena badan pesan komit kosong.\n" -#: builtin/commit.c:1834 +#: builtin/commit.c:1837 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -13833,7 +13841,9 @@ 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 "tidak ada kecocokan eksak pada referensi atau tag, mencari untuk menjelaskan \n" +msgstr "" +"tidak ada kecocokan eksak pada referensi atau tag, mencari untuk " +"menjelaskan \n" #: builtin/describe.c:397 #, c-format @@ -14769,15 +14779,15 @@ msgstr "" msgid "git for-each-repo --config=<config> <command-args>" msgstr "" -#: builtin/for-each-repo.c:37 +#: builtin/for-each-repo.c:34 msgid "config" msgstr "" -#: builtin/for-each-repo.c:38 +#: builtin/for-each-repo.c:35 msgid "config key storing a list of repository paths" msgstr "" -#: builtin/for-each-repo.c:46 +#: builtin/for-each-repo.c:43 msgid "missing --config=<config>" msgstr "" @@ -15432,7 +15442,8 @@ msgstr "cetak baris kosong di antara cocokan dari berkas yang berbeda" #: builtin/grep.c:903 msgid "show filename only once above matches from same file" -msgstr "perlihatkan nama berkas hanya sekali di atas cocokan dari berkas yang sama" +msgstr "" +"perlihatkan nama berkas hanya sekali di atas cocokan dari berkas yang sama" #: builtin/grep.c:906 msgid "show <n> context lines before and after matches" @@ -17116,38 +17127,38 @@ msgstr "Tidak ada pesan komit -- tak perbarui HEAD\n" msgid "'%s' does not point to a commit" msgstr "'%s' tidak menunjuk pada sebuah komit" -#: builtin/merge.c:602 +#: builtin/merge.c:603 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Untai branch.%s.mergeoptions jelek: %s" -#: builtin/merge.c:728 +#: builtin/merge.c:729 msgid "Not handling anything other than two heads merge." msgstr "Tak tangani apapun selain penggabungan dua kepala." -#: builtin/merge.c:741 +#: builtin/merge.c:742 #, c-format 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:223 +#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "tidak dapat menulis %s" -#: builtin/merge.c:812 +#: builtin/merge.c:813 #, c-format msgid "Could not read from '%s'" msgstr "Tidak dapat membaca dari '%s'" -#: builtin/merge.c:821 +#: builtin/merge.c:822 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Tak mengkomit penggabungan; gunakan 'git commit' untuk menyelesaikan " "penggabungan.\n" -#: builtin/merge.c:827 +#: builtin/merge.c:828 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -17157,11 +17168,11 @@ msgstr "" "diperlukan, khususnya jika itu menggabungkan hulu terbarui ke cabang\n" "topik.\n" -#: builtin/merge.c:832 +#: builtin/merge.c:833 msgid "An empty message aborts the commit.\n" msgstr "Pesan kosong membatalkan komit.\n" -#: builtin/merge.c:835 +#: builtin/merge.c:836 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -17170,72 +17181,72 @@ msgstr "" "Baris yang diawali dengan '%c' akan diabaikan, dan pesan kosong batalkan\n" "komit.\n" -#: builtin/merge.c:888 +#: builtin/merge.c:889 msgid "Empty commit message." msgstr "Pesan komit kosong" -#: builtin/merge.c:903 +#: builtin/merge.c:904 #, c-format msgid "Wonderful.\n" msgstr "Luar biasa.\n" -#: builtin/merge.c:964 +#: builtin/merge.c:965 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "Penggabungan otomatis gagal; selesaikan konflik lalu komit hasilnya.\n" -#: builtin/merge.c:1003 +#: builtin/merge.c:1004 msgid "No current branch." msgstr "Tidak ada cabang saat ini." -#: builtin/merge.c:1005 +#: builtin/merge.c:1006 msgid "No remote for the current branch." msgstr "Tidak ada remote untuk cabang saat ini." -#: builtin/merge.c:1007 +#: builtin/merge.c:1008 msgid "No default upstream defined for the current branch." msgstr "Tidak ada hulu asali yang ditentukan untuk cabang saat ini." -#: builtin/merge.c:1012 +#: builtin/merge.c:1013 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Tidak ada cabang pelacak remote untuk %s dari %s" -#: builtin/merge.c:1069 +#: builtin/merge.c:1070 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Nilai jelek '%s' dalam lingkungan '%s'" -#: builtin/merge.c:1172 +#: builtin/merge.c:1173 #, c-format msgid "not something we can merge in %s: %s" msgstr "bukan sesuatu yang kami bisa gabungkan di %s: %s" -#: builtin/merge.c:1206 +#: builtin/merge.c:1207 msgid "not something we can merge" msgstr "bukan sesuatu yang kami bisa gabungkan" -#: builtin/merge.c:1316 +#: builtin/merge.c:1317 msgid "--abort expects no arguments" msgstr "--abort harap tanpa argumen" -#: builtin/merge.c:1320 +#: builtin/merge.c:1321 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Tidak ada penggabungan yang bisa dibatalkan (MERGE_HEAD hilang)." -#: builtin/merge.c:1338 +#: builtin/merge.c:1339 msgid "--quit expects no arguments" msgstr "--quit harap tanpa argumen" -#: builtin/merge.c:1351 +#: builtin/merge.c:1352 msgid "--continue expects no arguments" msgstr "--continue harap tanpa argumen" -#: builtin/merge.c:1355 +#: builtin/merge.c:1356 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Tidak ada penggabungan yang sedang berlangsung (MERGE_HEAD hilang)." -#: builtin/merge.c:1371 +#: builtin/merge.c:1372 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17243,7 +17254,7 @@ msgstr "" "Anda belum mengakhiri penggabungan Anda (MERGE_HEAD ada).\n" "Mohon komit perubahan Anda sebelum Anda gabungkan." -#: builtin/merge.c:1378 +#: builtin/merge.c:1379 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17251,89 +17262,89 @@ msgstr "" "Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada).\n" "Mohon komit perubahan Anda sebelum Anda gabungkan." -#: builtin/merge.c:1381 +#: builtin/merge.c:1382 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada)." -#: builtin/merge.c:1395 +#: builtin/merge.c:1396 msgid "You cannot combine --squash with --no-ff." msgstr "Anda tidak dapat menggabungkan --squash dengan --no-ff." -#: builtin/merge.c:1397 +#: builtin/merge.c:1398 msgid "You cannot combine --squash with --commit." msgstr "Anda tidak dapat menggabungkan --squash dengan --commit" -#: builtin/merge.c:1413 +#: builtin/merge.c:1414 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Tidak ada komit yang disebutkan dan merge.defaultToUpstream tidak disetel." -#: builtin/merge.c:1430 +#: builtin/merge.c:1431 msgid "Squash commit into empty head not supported yet" msgstr "Lumat komit ke kepala kosong belum didukung" -#: builtin/merge.c:1432 +#: builtin/merge.c:1433 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Komit nir maju cepat tidak masuk akal ke kepala kosong" -#: builtin/merge.c:1437 +#: builtin/merge.c:1438 #, c-format msgid "%s - not something we can merge" msgstr "%s - bukan sesuatu yang kami bisa gabungkan" -#: builtin/merge.c:1439 +#: builtin/merge.c:1440 msgid "Can merge only exactly one commit into empty head" msgstr "Hanya bisa menggabungkan tepantnya satu komit ke kepala kosong" -#: builtin/merge.c:1520 +#: builtin/merge.c:1521 msgid "refusing to merge unrelated histories" msgstr "menolak menggabungkan riwayat tak terkait" -#: builtin/merge.c:1539 +#: builtin/merge.c:1540 #, c-format msgid "Updating %s..%s\n" msgstr "Memperbarui %s..%s\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1587 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Mencoba penggabungan dalam indeks yang sangat sepele\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1594 #, c-format msgid "Nope.\n" msgstr "Tidak.\n" -#: builtin/merge.c:1623 +#: builtin/merge.c:1625 msgid "Not possible to fast-forward, aborting." msgstr "Tidak mungkin untuk maju cepat, batalkan." -#: builtin/merge.c:1651 builtin/merge.c:1716 +#: builtin/merge.c:1653 builtin/merge.c:1719 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Memutar ulang pohon ke asli...\n" -#: builtin/merge.c:1655 +#: builtin/merge.c:1657 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Mencoba strategi penggabungan %s...\n" -#: builtin/merge.c:1707 +#: builtin/merge.c:1709 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Tidak ada strategi yang menangani penggabungan.\n" -#: builtin/merge.c:1709 +#: builtin/merge.c:1711 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Penggabungan dengan strategi %s gagal.\n" -#: builtin/merge.c:1718 +#: builtin/merge.c:1721 #, c-format -msgid "Using the %s to prepare resolving by hand.\n" -msgstr "Menggunakan %s untuk menyiapkan penyelesaian dengan tangan.\n" +msgid "Using the %s strategy to prepare resolving by hand.\n" +msgstr "Menggunakan strategi %s untuk menyiapkan penyelesaian dengan tangan.\n" -#: builtin/merge.c:1732 +#: builtin/merge.c:1735 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -19621,7 +19632,7 @@ msgid "fatal: no such branch/commit '%s'" msgstr "fatal: tidak ada cabang/komit seperti '%s'" #: builtin/rebase.c:1929 builtin/submodule--helper.c:39 -#: builtin/submodule--helper.c:2414 +#: builtin/submodule--helper.c:2431 #, c-format msgid "No such ref: %s" msgstr "Tidak ada referensi seperti: %s" @@ -20943,89 +20954,89 @@ msgstr "" #: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." -msgstr "" +msgstr "git revert [<opsi>] <mirip-komit>..." #: builtin/revert.c:25 msgid "git revert <subcommand>" -msgstr "" +msgstr "git revert <subperintah>" #: builtin/revert.c:30 msgid "git cherry-pick [<options>] <commit-ish>..." -msgstr "" +msgstr "git cherry-pick [<opsi>] <mirip-komit>..." #: builtin/revert.c:31 msgid "git cherry-pick <subcommand>" -msgstr "" +msgstr "git cherry-pick <subperintah>" #: builtin/revert.c:72 #, c-format msgid "option `%s' expects a number greater than zero" -msgstr "" +msgstr "opsi `%s' harap sebuah angka lebih dari nol" #: builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" -msgstr "" +msgstr "%s: %s tidak dapat digunakan dengan %s" #: builtin/revert.c:102 msgid "end revert or cherry-pick sequence" -msgstr "" +msgstr "akhiri rangkaian pembalikan atau pemetikan ceri" #: builtin/revert.c:103 msgid "resume revert or cherry-pick sequence" -msgstr "" +msgstr "lanjutkan rangkaian pembalikan atau pemetikan ceri" #: builtin/revert.c:104 msgid "cancel revert or cherry-pick sequence" -msgstr "" +msgstr "batalkan rangkaian pembalikan atau pemetikan ceri" #: builtin/revert.c:105 msgid "skip current commit and continue" -msgstr "" +msgstr "lewati komit saat ini dan lanjutkan" #: builtin/revert.c:107 msgid "don't automatically commit" -msgstr "" +msgstr "jangan komit otomatis" #: builtin/revert.c:108 msgid "edit the commit message" -msgstr "" +msgstr "sunting pesan komit" #: builtin/revert.c:111 msgid "parent-number" -msgstr "" +msgstr "nomor-induk" #: builtin/revert.c:112 msgid "select mainline parent" -msgstr "" +msgstr "pilih induk garis utama" #: builtin/revert.c:114 msgid "merge strategy" -msgstr "" +msgstr "strategi penggabungan" #: builtin/revert.c:116 msgid "option for merge strategy" -msgstr "" +msgstr "opsi untuk strategi penggabungan" #: builtin/revert.c:125 msgid "append commit name" -msgstr "" +msgstr "tambahkan nama komit" #: builtin/revert.c:127 msgid "preserve initially empty commits" -msgstr "" +msgstr "pertahankan komit kosong awal" #: builtin/revert.c:129 msgid "keep redundant, empty commits" -msgstr "" +msgstr "simpan komit kosong mubazir" #: builtin/revert.c:237 msgid "revert failed" -msgstr "" +msgstr "pembalikan gagal" #: builtin/revert.c:250 msgid "cherry-pick failed" -msgstr "" +msgstr "pemetikan ceri gagal" #: builtin/rm.c:20 msgid "git rm [<options>] [--] <file>..." @@ -21260,7 +21271,8 @@ msgstr "perlihatkan dasar penggabungan yang mungkin" #: builtin/show-branch.c:662 msgid "show refs unreachable from any other ref" -msgstr "perlihatkan referensi yang tidak dapat dicapai dari referensi yang lainnya" +msgstr "" +"perlihatkan referensi yang tidak dapat dicapai dari referensi yang lainnya" #: builtin/show-branch.c:664 msgid "show commits in topological order" @@ -21290,7 +21302,8 @@ msgstr "perlihatkan <n> entri ref-log terkini dimulai dari dasar" msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" -"--reflog tidak kompatibel dengan --all, --remotes, --independent atau --merge-base" +"--reflog tidak kompatibel dengan --all, --remotes, --independent atau --" +"merge-base" #: builtin/show-branch.c:735 msgid "no branches given, and HEAD is not valid" @@ -21342,8 +21355,8 @@ 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>...]" +"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>]" @@ -21379,7 +21392,9 @@ 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 "perlihatkan referensi dari masukan standar yang tidak ada dalam repositori lokal" +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>" @@ -21426,37 +21441,37 @@ msgstr "" msgid "failed to open '%s'" msgstr "" -#: builtin/sparse-checkout.c:419 +#: builtin/sparse-checkout.c:413 #, c-format msgid "could not normalize path %s" msgstr "" -#: builtin/sparse-checkout.c:431 +#: builtin/sparse-checkout.c:425 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "" -#: builtin/sparse-checkout.c:456 +#: builtin/sparse-checkout.c:450 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "" -#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 +#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528 msgid "unable to load existing sparse-checkout patterns" msgstr "" -#: builtin/sparse-checkout.c:579 +#: builtin/sparse-checkout.c:573 msgid "read patterns from standard in" msgstr "" -#: builtin/sparse-checkout.c:594 +#: builtin/sparse-checkout.c:588 msgid "git sparse-checkout reapply" msgstr "" -#: builtin/sparse-checkout.c:613 +#: builtin/sparse-checkout.c:607 msgid "git sparse-checkout disable" msgstr "" -#: builtin/sparse-checkout.c:644 +#: builtin/sparse-checkout.c:638 msgid "error while refreshing working directory" msgstr "" @@ -21742,7 +21757,7 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Mengharapkan nama referensi penuh, dapat %s" @@ -21756,27 +21771,28 @@ msgstr "submodule--helper print-default-remote tidak membutuhkan argumen" msgid "cannot strip one component off url '%s'" msgstr "tidak dapat mencopot satu komponen dari url '%s'" -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887 +#: builtin/submodule--helper.c:2891 msgid "alternative anchor for relative paths" msgstr "jangkar alternatif untuk jalur relatif" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:416 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<jalur>] [<jalur>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:652 +#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:654 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "" "Tidak ada url yang ditemukan untuk jalur submodul '%s' dalam .gitmodules" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:526 #, c-format msgid "Entering '%s'\n" msgstr "Memasuki '%s'\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:529 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -21785,7 +21801,7 @@ msgstr "" "run_command mengembalikan status bukan nol untuk %s\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:551 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -21796,21 +21812,21 @@ msgstr "" "bersarang %s\n" "." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:567 msgid "suppress output of entering each submodule command" msgstr "sembunyikan keluaran memasuki setiap perintah submodul" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 -#: builtin/submodule--helper.c:1487 +#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:1489 msgid "recurse into nested submodules" msgstr "rekursi ke dalam submodul bersarang" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:574 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "" "git submodule--helper foreach [--quiet] [--recursive] [--] [<perintah>]" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:601 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -21819,54 +21835,54 @@ msgstr "" "tidak dapat mencari konfigurasi '%s'. Asumsi bahwa repositori ini adalah " "hulu otoritatif tersendiri." -#: builtin/submodule--helper.c:666 +#: builtin/submodule--helper.c:668 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Gagal mendaftarkan url untuk jalur submodul '%s'" -#: builtin/submodule--helper.c:670 +#: builtin/submodule--helper.c:672 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Submodul '%s' (%s) didaftarkan untuk jalur '%s'\n" -#: builtin/submodule--helper.c:680 +#: builtin/submodule--helper.c:682 #, 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:687 +#: builtin/submodule--helper.c:689 #, 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:709 +#: builtin/submodule--helper.c:711 msgid "suppress output for initializing a submodule" msgstr "sembunyikan keluaran menginisialisasi submodul" -#: builtin/submodule--helper.c:714 +#: builtin/submodule--helper.c:716 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<opsi>] [<jalur>]" -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, 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:835 +#: builtin/submodule--helper.c:837 #, 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:862 builtin/submodule--helper.c:1457 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "gagal merekursi ke dalam submodul '%s'" -#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625 msgid "suppress submodule status output" msgstr "sembunyikan keluaran status submodul" -#: builtin/submodule--helper.c:887 +#: builtin/submodule--helper.c:889 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -21874,97 +21890,96 @@ msgstr "" "gunakan komit yang disimpan di dalam indeks daripada yang disimpan di dalam " "HEAD" -#: builtin/submodule--helper.c:893 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<jalur>...]" -#: builtin/submodule--helper.c:917 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <jalur>" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:991 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodul)" -#: builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:994 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(submodul)->%s(blob)" -#: builtin/submodule--helper.c:1005 +#: builtin/submodule--helper.c:1007 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1057 #, c-format msgid "couldn't hash object from '%s'" msgstr "tidak dapat hash objek dari '%s'" -#: builtin/submodule--helper.c:1059 +#: builtin/submodule--helper.c:1061 #, c-format msgid "unexpected mode %o\n" msgstr "mode tidak diharapkan %o\n" -#: builtin/submodule--helper.c:1300 +#: builtin/submodule--helper.c:1302 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:1302 +#: builtin/submodule--helper.c:1304 msgid "compare the commit in the index with that in the submodule HEAD" -msgstr "" -"bandingkan komit di dalam indeks dengan yang di dalam HEAD submodul" +msgstr "bandingkan komit di dalam indeks dengan yang di dalam HEAD submodul" -#: builtin/submodule--helper.c:1304 +#: builtin/submodule--helper.c:1306 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "lewatkan submodul dengan nilai 'ignore_config' disetel ke 'all'" -#: builtin/submodule--helper.c:1306 +#: builtin/submodule--helper.c:1308 msgid "limit the summary size" msgstr "batasi ukuran ringkasan" -#: builtin/submodule--helper.c:1311 +#: builtin/submodule--helper.c:1313 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "git submodule--helper summary [<opsi>] [<commit>] -- [<jalur>]" -#: builtin/submodule--helper.c:1335 +#: builtin/submodule--helper.c:1337 msgid "could not fetch a revision for HEAD" msgstr "tidak dapat mengambil revisi untuk HEAD" -#: builtin/submodule--helper.c:1340 +#: builtin/submodule--helper.c:1342 msgid "--cached and --files are mutually exclusive" msgstr "--cached dan --files saling eksklusif" -#: builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1409 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Mensinkronisasi url submodul untuk '%s'\n" -#: builtin/submodule--helper.c:1413 +#: builtin/submodule--helper.c:1415 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "gagal mendaftarkan url untuk jalur submodul '%s'" -#: builtin/submodule--helper.c:1427 +#: builtin/submodule--helper.c:1429 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "gagal mendapatkan remote asali untuk submodul '%s'" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1440 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "gagal memperbarui remote untuk submodul '%s'" -#: builtin/submodule--helper.c:1485 +#: builtin/submodule--helper.c:1487 msgid "suppress output of synchronizing submodule url" msgstr "sembunyikan keluaran mensinkronisasi url submodul" -#: builtin/submodule--helper.c:1492 +#: builtin/submodule--helper.c:1494 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<jalur>]" -#: builtin/submodule--helper.c:1546 +#: builtin/submodule--helper.c:1548 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -21973,7 +21988,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:1558 +#: builtin/submodule--helper.c:1560 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -21982,46 +21997,46 @@ msgstr "" "Pohon kerja submodul '%s' berisi modifikasi lokal; gunakan '-f' untuk " "menyingkirkan itu" -#: builtin/submodule--helper.c:1566 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Cleared directory '%s'\n" msgstr "Direktori '%s' dibersihkan\n" -#: builtin/submodule--helper.c:1568 +#: builtin/submodule--helper.c:1570 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Tidak dapat menghapus pohon kerja submodul '%s'\n" -#: builtin/submodule--helper.c:1579 +#: builtin/submodule--helper.c:1581 #, c-format msgid "could not create empty submodule directory %s" msgstr "tidak dapat membuat direktori submodul kosong %s" -#: builtin/submodule--helper.c:1595 +#: builtin/submodule--helper.c:1597 #, 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:1624 +#: builtin/submodule--helper.c:1626 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:1625 +#: builtin/submodule--helper.c:1627 msgid "unregister all submodules" msgstr "batal daftar semua submodul" -#: builtin/submodule--helper.c:1630 +#: builtin/submodule--helper.c:1632 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<jalur>...]]" -#: builtin/submodule--helper.c:1644 +#: builtin/submodule--helper.c:1646 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Gunakan '--all' jika Anda benar-benar ingin deinisialisasi semua submodul" -#: builtin/submodule--helper.c:1713 +#: builtin/submodule--helper.c:1690 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" @@ -22033,46 +22048,68 @@ msgstr "" " itu, setel submodule.alternateErrorStrategy ke 'info' atau yang sama,\n" "kloning degan '--reference-if-able' daripada '--reference'." -#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "submodul '%s' tidak dapat menambahkan pengganti: %s" -#: builtin/submodule--helper.c:1791 +#: builtin/submodule--helper.c:1768 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Nilai '%s' untuk submodule.alternateErrorStrategy tidak dikenal" -#: builtin/submodule--helper.c:1798 +#: builtin/submodule--helper.c:1775 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Nilai '%s' untuk submodule.alternateLocation tidak dikenal" -#: builtin/submodule--helper.c:1822 +#: builtin/submodule--helper.c:1800 +#, 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:1841 +#, c-format +msgid "clone of '%s' into submodule path '%s' failed" +msgstr "gagal mengkloning '%s' ke dalam jalur submodul '%s'" + +#: builtin/submodule--helper.c:1846 +#, c-format +msgid "directory not empty: '%s'" +msgstr "direktori tidak kosong: '%s'" + +#: builtin/submodule--helper.c:1858 +#, c-format +msgid "could not get submodule directory for '%s'" +msgstr "tidak dapat mendapatkan direktori submodul untuk '%s'" + +#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894 msgid "where the new submodule will be cloned to" msgstr "di mana submodul baru akan dikloning" -#: builtin/submodule--helper.c:1825 +#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897 msgid "name of the new submodule" msgstr "nama submodul baru" -#: builtin/submodule--helper.c:1828 +#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900 msgid "url where to clone the submodule from" msgstr "url di mana submodul dikloning" -#: builtin/submodule--helper.c:1836 +#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907 msgid "depth for shallow clones" msgstr "kedalaman untuk kloning dangkal" -#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 +#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365 +#: builtin/submodule--helper.c:2909 msgid "force cloning progress" msgstr "paksa perkembangan kloning" -#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367 msgid "disallow cloning into non-empty directory" msgstr "tak perbolehkan kloning ke dalam direktori bukan kosong" -#: builtin/submodule--helper.c:1848 +#: builtin/submodule--helper.c:1916 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22082,103 +22119,82 @@ msgstr "" "<repositori>] [--name <nama>] [--depth <kedalaman>] [--single-branch] --url " "<url> --path <jalur>" -#: 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: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:1888 -#, c-format -msgid "directory not empty: '%s'" -msgstr "direktori tidak kosong: '%s'" - -#: 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:1936 +#: builtin/submodule--helper.c:1953 #, 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:1940 +#: builtin/submodule--helper.c:1957 #, 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:2041 +#: builtin/submodule--helper.c:2058 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Jalur submodul '%s' tidak diinisialisasi" -#: builtin/submodule--helper.c:2045 +#: builtin/submodule--helper.c:2062 msgid "Maybe you want to use 'update --init'?" msgstr "Mungkin Anda ingin menggunakan 'update --init'?" -#: builtin/submodule--helper.c:2075 +#: builtin/submodule--helper.c:2092 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Melewati submodul tak tergabung %s" -#: builtin/submodule--helper.c:2104 +#: builtin/submodule--helper.c:2121 #, c-format msgid "Skipping submodule '%s'" msgstr "Melewati submodul '%s'" -#: builtin/submodule--helper.c:2254 +#: builtin/submodule--helper.c:2271 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Gagal mengkloning '%s'. Percobaan ulang dijadwalkan" -#: builtin/submodule--helper.c:2265 +#: builtin/submodule--helper.c:2282 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Gagal mengkloning '%s' untuk kedua kalinya, batalkan" -#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590 msgid "path into the working tree" msgstr "jalur ke dalam pohon kerja" -#: builtin/submodule--helper.c:2330 +#: builtin/submodule--helper.c:2347 msgid "path into the working tree, across nested submodule boundaries" msgstr "jalur ke dalam pohon kerja, melintasi perbatasan submodul bersarang" -#: builtin/submodule--helper.c:2334 +#: builtin/submodule--helper.c:2351 msgid "rebase, merge, checkout or none" msgstr "dasarkan ulang, gabungkan, checkout atau tidak sama sekali" -#: builtin/submodule--helper.c:2340 +#: builtin/submodule--helper.c:2357 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:2343 +#: builtin/submodule--helper.c:2360 msgid "parallel jobs" msgstr "pekerjaan paralel" -#: builtin/submodule--helper.c:2345 +#: builtin/submodule--helper.c:2362 msgid "whether the initial clone should follow the shallow recommendation" msgstr "apakah klon awal seharusnya mengikuti rekomendasi dangkal" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2363 msgid "don't print cloning progress" msgstr "jangan cetak perkembangan pengkloningan" -#: builtin/submodule--helper.c:2357 +#: builtin/submodule--helper.c:2374 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<jalur>] [<jalur>...]" -#: builtin/submodule--helper.c:2370 +#: builtin/submodule--helper.c:2387 msgid "bad value for update parameter" msgstr "nilai jelek untuk parameter pembaruan" -#: builtin/submodule--helper.c:2418 +#: builtin/submodule--helper.c:2435 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -22187,84 +22203,142 @@ msgstr "" "Cabang submodul (%s) dikonfigurasikan untuk mewarisi cabang dari proyek " "super, tapi proyek super tidak pada cabang apapun" -#: builtin/submodule--helper.c:2541 +#: builtin/submodule--helper.c:2558 #, 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:2574 +#: builtin/submodule--helper.c:2591 msgid "recurse into submodules" msgstr "rekursi ke dalam submodul" -#: builtin/submodule--helper.c:2580 +#: builtin/submodule--helper.c:2597 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<opsi>] [<jalur>...]" -#: builtin/submodule--helper.c:2636 +#: builtin/submodule--helper.c:2653 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:2639 +#: builtin/submodule--helper.c:2656 msgid "unset the config in the .gitmodules file" msgstr "batal setel konfigurasi dalam berkas .gitmodules" -#: builtin/submodule--helper.c:2644 +#: builtin/submodule--helper.c:2661 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <nama> [<nilai>]" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2662 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nama>" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2663 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2665 git-submodule.sh:150 +#: builtin/submodule--helper.c:2682 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:2681 +#: builtin/submodule--helper.c:2698 msgid "suppress output for setting url of a submodule" msgstr "sembunyikan keluaran penyetelan url submodule" -#: builtin/submodule--helper.c:2685 +#: builtin/submodule--helper.c:2702 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <jalur> <url baru>" -#: builtin/submodule--helper.c:2718 +#: builtin/submodule--helper.c:2735 msgid "set the default tracking branch to master" msgstr "setel cabang pelacak asali ke master" -#: builtin/submodule--helper.c:2720 +#: builtin/submodule--helper.c:2737 msgid "set the default tracking branch" msgstr "setel cabang pelacak asali" -#: builtin/submodule--helper.c:2724 +#: builtin/submodule--helper.c:2741 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:2725 +#: builtin/submodule--helper.c:2742 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <cabang> <jalur>" -#: builtin/submodule--helper.c:2732 +#: builtin/submodule--helper.c:2749 msgid "--branch or --default required" msgstr "--branch atau --default dibutuhkan" -#: builtin/submodule--helper.c:2735 +#: builtin/submodule--helper.c:2752 msgid "--branch and --default are mutually exclusive" msgstr "--branch dan --default saling eksklusif" -#: builtin/submodule--helper.c:2792 git.c:449 git.c:724 +#: builtin/submodule--helper.c:2815 +#, c-format +msgid "Adding existing repo at '%s' to the index\n" +msgstr "Menambahkan repo yang sudah ada pada '%s' ke indeks\n" + +#: builtin/submodule--helper.c:2818 +#, c-format +msgid "'%s' already exists and is not a valid git repo" +msgstr "'%s' sudah ada dan bukan repo git valid" + +#: builtin/submodule--helper.c:2828 +#, c-format +msgid "A git directory for '%s' is found locally with remote(s):" +msgstr "Sebuah direktori git untuk '%s' ditemukan lokal dengan remote:" + +#: builtin/submodule--helper.c:2833 +#, c-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from\n" +" %s\n" +"use the '--force' option. If the local git directory is not the correct " +"repo\n" +"or if you are unsure what this means, choose another name with the '--name' " +"option.\n" +msgstr "" +"Jika Anda ingin menggunakan ulang direktori git lokal ini daripada " +"mengkloning lagi dari\n" +" %s\n" +"gynakan opsi '--force'. Jika direktori git lokal bukan repo yang benar\n" +"atau Anda tidak yakin apa maksudnya, pilih nama yang lain dengan opsi " +"'--name'.\n" + +#: builtin/submodule--helper.c:2842 +#, c-format +msgid "Reactivating local git directory for submodule '%s'\n" +msgstr "Mengaktifkan ulang direktori git lokal untuk submodul '%s'\n" + +#: builtin/submodule--helper.c:2875 +#, c-format +msgid "unable to checkout submodule '%s'" +msgstr "Tidak dapat men-checkout submodul '%s'" + +#: builtin/submodule--helper.c:2888 +msgid "branch of repository to checkout on cloning" +msgstr "cabang repositori untuk di-checkout saat kloning" + +#: builtin/submodule--helper.c:2910 +msgid "allow adding an otherwise ignored submodule path" +msgstr "perbolehkan menambah jalur submodul yang diabaikan" + +#: builtin/submodule--helper.c:2917 +msgid "" +"git submodule--helper add-clone [<options>...] --url <url> --path <path> --" +"name <name>" +msgstr "" +"git submodule--helper add-clone [<opsi>...] --url <url> --path <path> " +"--name <nama>" + +#: builtin/submodule--helper.c:2985 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:2798 +#: builtin/submodule--helper.c:2991 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' bukan subperintah submodule--helper valid" @@ -24407,124 +24481,88 @@ msgstr "" msgid "'$sm_path' does not have a commit checked out" msgstr "" -#: git-submodule.sh:249 -#, sh-format -msgid "Adding existing repo at '$sm_path' to the index" -msgstr "" - -#: git-submodule.sh:251 -#, sh-format -msgid "'$sm_path' already exists and is not a valid git repo" -msgstr "" - -#: git-submodule.sh:259 -#, sh-format -msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "" - -#: 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." -msgstr "" - -#: git-submodule.sh:267 -#, sh-format -msgid "Reactivating local git directory for submodule '$sm_name'." -msgstr "" - -#: git-submodule.sh:279 -#, sh-format -msgid "Unable to checkout submodule '$sm_path'" -msgstr "" - -#: git-submodule.sh:284 +#: git-submodule.sh:248 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:293 +#: git-submodule.sh:257 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:568 +#: git-submodule.sh:532 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:578 +#: git-submodule.sh:542 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:583 +#: git-submodule.sh:547 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "" -#: git-submodule.sh:601 +#: git-submodule.sh:565 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "" -#: git-submodule.sh:607 +#: git-submodule.sh:571 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "" -#: git-submodule.sh:614 +#: git-submodule.sh:578 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:615 +#: git-submodule.sh:579 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:619 +#: git-submodule.sh:583 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:620 +#: git-submodule.sh:584 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:625 +#: git-submodule.sh:589 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:626 +#: git-submodule.sh:590 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:631 +#: git-submodule.sh:595 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:632 +#: git-submodule.sh:596 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "" -#: git-submodule.sh:663 +#: git-submodule.sh:627 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.33.0-rc0\n" +"Project-Id-Version: git 2.33.0-rc2\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-08-03 17:06+0800\n" -"PO-Revision-Date: 2021-08-12 14:03+0700\n" +"POT-Creation-Date: 2021-08-14 07:56+0800\n" +"PO-Revision-Date: 2021-08-14 14:53+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" @@ -26,7 +26,7 @@ msgstr "" msgid "Huh (%s)?" msgstr "Hả (%s)?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 +#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493 #: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 #: builtin/rebase.c:1953 msgid "could not read index" @@ -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:3707 +#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707 msgid "could not write index" msgstr "không thể ghi bảng mục lục" @@ -218,9 +218,10 @@ msgstr "chưa đưa lên bệ phóng" #: 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 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886 +#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589 +#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893 #: git-add--interactive.perl:213 msgid "path" msgstr "đường-dẫn" @@ -803,7 +804,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Thoát ra bởi vì xung đột không thể giải quyết." -#: advice.c:283 builtin/merge.c:1374 +#: advice.c:283 builtin/merge.c:1375 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại)." @@ -1577,7 +1578,7 @@ msgstr "không thể đọc %s" #: 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 +#: builtin/merge.c:1144 #, c-format msgid "could not read '%s'" msgstr "không thể đọc “%s”" @@ -1666,7 +1667,8 @@ 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:1830 builtin/submodule--helper.c:2335 +#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352 +#: builtin/submodule--helper.c:2902 msgid "repo" msgstr "kho" @@ -1858,7 +1860,7 @@ 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:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333 +#: blame.c:2820 bundle.c:224 ref-filter.c:2278 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 @@ -3121,7 +3123,7 @@ msgstr "gặp kiểu bộ lọc thừa" msgid "path name too long for external filter" msgstr "tên đường dẫn quá dài cho bộ lọc bên ngoài" -#: convert.c:934 +#: convert.c:935 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3130,16 +3132,16 @@ msgstr "" "bộ lọc bên ngoài “%s” không sẵn sàng nữa mặc dù không phải tất cả các đường " "dẫn đã được lọc" -#: convert.c:1234 +#: convert.c:1236 msgid "true/false are no valid working-tree-encodings" msgstr "true/false là không phải bảng-mã-cây-làm-việc hợp lệ" -#: convert.c:1414 convert.c:1447 +#: convert.c:1416 convert.c:1449 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: gặp lỗi khi xóa bộ lọc “%s”" -#: convert.c:1490 +#: convert.c:1492 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: smudge bộ lọc %s gặp lỗi" @@ -3364,11 +3366,11 @@ msgstr "" #: diff.c:4643 msgid "" -"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +"--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" +"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" @@ -3934,7 +3936,7 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”" -#: diffcore-rename.c:1510 +#: diffcore-rename.c:1514 msgid "Performing inexact rename detection" msgstr "Đang thực hiện dò tìm đổi tên không chính xác" @@ -3953,49 +3955,49 @@ msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tậ msgid "unrecognized pattern: '%s'" msgstr "mẫu không được thừa nhận: “%s”" -#: dir.c:792 dir.c:806 +#: dir.c:790 dir.c:804 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "mẫu âm không được thừa nhận: “%s”" -#: dir.c:824 +#: dir.c:820 #, 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:834 +#: dir.c:830 msgid "disabling cone pattern matching" msgstr "vô hiệu khớp mẫu nón" -#: dir.c:1221 +#: dir.c:1214 #, 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:2358 +#: dir.c:2351 #, c-format msgid "could not open directory '%s'" msgstr "không thể mở thư mục “%s”" -#: dir.c:2660 +#: dir.c:2653 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:2784 +#: dir.c:2777 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:3617 +#: dir.c:3610 #, 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:3664 dir.c:3669 +#: dir.c:3657 dir.c:3662 #, c-format msgid "could not create directories for %s" msgstr "không thể tạo thư mục cho %s" -#: dir.c:3698 +#: dir.c:3691 #, 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”" @@ -4019,7 +4021,7 @@ msgstr "không thể lấy thống kê tập tin “%s”" msgid "bad git namespace path \"%s\"" msgstr "đường dẫn không gian tên git \"%s\" sai" -#: environment.c:335 +#: environment.c:334 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "không thể đặt GIT_DIR thành “%s”" @@ -4646,34 +4648,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:1228 merge-recursive.c:1206 +#: merge-ort.c:1569 merge-recursive.c:1201 #, 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:1237 merge-recursive.c:1213 +#: merge-ort.c:1578 merge-recursive.c:1208 #, 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:1246 merge-recursive.c:1220 +#: merge-ort.c:1587 merge-recursive.c:1215 #, 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:1256 merge-ort.c:1263 +#: merge-ort.c:1597 merge-ort.c:1604 #, 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:1284 +#: merge-ort.c:1625 #, 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:1291 +#: merge-ort.c:1632 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" @@ -4682,7 +4684,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:1295 merge-recursive.c:1274 +#: merge-ort.c:1636 merge-recursive.c:1269 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4699,7 +4701,7 @@ msgstr "" "\n" "cái mà sẽ chấp nhận gợi ý này.\n" -#: merge-ort.c:1308 +#: merge-ort.c:1649 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" @@ -4708,21 +4710,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:1527 merge-recursive.c:1363 +#: merge-ort.c:1868 merge-recursive.c:1358 msgid "Failed to execute internal merge" msgstr "Gặp lỗi khi thực hiện trộn nội bộ" -#: merge-ort.c:1532 merge-recursive.c:1368 +#: merge-ort.c:1873 merge-recursive.c:1363 #, 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:1539 merge-recursive.c:1401 +#: merge-ort.c:1880 merge-recursive.c:1396 #, c-format msgid "Auto-merging %s" msgstr "Tự-động-hòa-trộn %s" -#: merge-ort.c:1678 merge-recursive.c:2123 +#: merge-ort.c:2019 merge-recursive.c:2118 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4731,7 +4733,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:1688 merge-recursive.c:2133 +#: merge-ort.c:2029 merge-recursive.c:2128 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4740,7 +4742,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:1746 +#: merge-ort.c:2087 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4751,7 +4753,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:1900 merge-recursive.c:2469 +#: merge-ort.c:2241 merge-recursive.c:2464 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4760,7 +4762,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:2044 merge-recursive.c:3252 +#: merge-ort.c:2385 merge-recursive.c:3247 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4769,7 +4771,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:2051 merge-recursive.c:3259 +#: merge-ort.c:2392 merge-recursive.c:3254 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4778,7 +4780,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:2064 merge-recursive.c:3255 +#: merge-ort.c:2405 merge-recursive.c:3250 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4787,7 +4789,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:2072 merge-recursive.c:3262 +#: merge-ort.c:2413 merge-recursive.c:3257 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4796,13 +4798,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:2228 +#: merge-ort.c:2569 #, 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:2323 +#: merge-ort.c:2664 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4813,23 +4815,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:2342 merge-ort.c:2366 +#: merge-ort.c:2683 merge-ort.c:2707 #, 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:2819 merge-recursive.c:3013 +#: merge-ort.c:3182 merge-recursive.c:3008 #, c-format msgid "cannot read object %s" msgstr "không thể đọc đối tượng %s" -#: merge-ort.c:2822 merge-recursive.c:3016 +#: merge-ort.c:3185 merge-recursive.c:3011 #, 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:3250 +#: merge-ort.c:3613 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " @@ -4838,7 +4840,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:3326 +#: merge-ort.c:3689 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " @@ -4847,7 +4849,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:3333 +#: merge-ort.c:3696 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " @@ -4856,24 +4858,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:3433 merge-recursive.c:3092 +#: merge-ort.c:3796 merge-recursive.c:3087 msgid "content" msgstr "nội dung" -#: merge-ort.c:3435 merge-recursive.c:3096 +#: merge-ort.c:3798 merge-recursive.c:3091 msgid "add/add" msgstr "thêm/thêm" -#: merge-ort.c:3437 merge-recursive.c:3141 +#: merge-ort.c:3800 merge-recursive.c:3136 msgid "submodule" msgstr "mô-đun-con" -#: merge-ort.c:3439 merge-recursive.c:3142 +#: merge-ort.c:3802 merge-recursive.c:3137 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s" -#: merge-ort.c:3470 +#: merge-ort.c:3833 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -4882,7 +4884,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:3757 +#: merge-ort.c:4120 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -4894,12 +4896,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:4116 +#: merge-ort.c:4487 #, 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:3707 +#: merge-ort-wrappers.c:13 merge-recursive.c:3702 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4909,109 +4911,109 @@ msgstr "" "hòa trộn:\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402 +#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402 msgid "Already up to date." msgstr "Đã cập nhật rồi." -#: merge-recursive.c:357 +#: merge-recursive.c:352 msgid "(bad commit)\n" msgstr "(commit sai)\n" -#: merge-recursive.c:380 +#: merge-recursive.c:375 #, 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:389 +#: merge-recursive.c:384 #, 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:877 +#: merge-recursive.c:872 #, 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:888 +#: merge-recursive.c:883 #, 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:902 merge-recursive.c:921 +#: merge-recursive.c:897 merge-recursive.c:916 msgid ": perhaps a D/F conflict?" msgstr ": có lẽ là một xung đột D/F?" -#: merge-recursive.c:911 +#: merge-recursive.c:906 #, 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:952 builtin/cat-file.c:41 +#: merge-recursive.c:947 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:957 +#: merge-recursive.c:952 #, c-format msgid "blob expected for %s '%s'" msgstr "mong đợi đối tượng blob cho %s “%s”" -#: merge-recursive.c:982 +#: merge-recursive.c:977 #, c-format msgid "failed to open '%s': %s" msgstr "gặp lỗi khi mở “%s”: %s" -#: merge-recursive.c:993 +#: merge-recursive.c:988 #, 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:998 +#: merge-recursive.c:993 #, 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:1228 merge-recursive.c:1240 +#: merge-recursive.c:1223 merge-recursive.c:1235 #, 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:1231 merge-recursive.c:1243 +#: merge-recursive.c:1226 merge-recursive.c:1238 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s”" -#: merge-recursive.c:1266 +#: merge-recursive.c:1261 #, 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:1270 +#: merge-recursive.c:1265 #, 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:1271 +#: merge-recursive.c:1266 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:1283 +#: merge-recursive.c:1278 #, 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:1425 +#: merge-recursive.c:1420 #, 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:1497 +#: merge-recursive.c:1492 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5020,7 +5022,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:1502 +#: merge-recursive.c:1497 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5029,7 +5031,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:1509 +#: merge-recursive.c:1504 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -5038,7 +5040,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:1514 +#: merge-recursive.c:1509 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -5047,45 +5049,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:1549 +#: merge-recursive.c:1544 msgid "rename" msgstr "đổi tên" -#: merge-recursive.c:1549 +#: merge-recursive.c:1544 msgid "renamed" msgstr "đã đổi tên" -#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169 +#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164 #, 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:1610 +#: merge-recursive.c:1605 #, 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:1668 +#: merge-recursive.c:1663 #, 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:1699 +#: merge-recursive.c:1694 #, 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:1704 +#: merge-recursive.c:1699 #, 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:1731 +#: merge-recursive.c:1726 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -5094,17 +5096,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:1736 +#: merge-recursive.c:1731 msgid " (left unresolved)" msgstr " (cần giải quyết)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1823 #, 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:2091 +#: merge-recursive.c:2086 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -5115,7 +5117,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:2225 +#: merge-recursive.c:2220 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -5124,79 +5126,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:3080 +#: merge-recursive.c:3075 msgid "modify" msgstr "sửa đổi" -#: merge-recursive.c:3080 +#: merge-recursive.c:3075 msgid "modified" msgstr "đã sửa" -#: merge-recursive.c:3119 +#: merge-recursive.c:3114 #, 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:3172 +#: merge-recursive.c:3167 #, c-format msgid "Adding as %s instead" msgstr "Thay vào đó thêm vào %s" -#: merge-recursive.c:3376 +#: merge-recursive.c:3371 #, c-format msgid "Removing %s" msgstr "Đang xóa %s" -#: merge-recursive.c:3399 +#: merge-recursive.c:3394 msgid "file/directory" msgstr "tập-tin/thư-mục" -#: merge-recursive.c:3404 +#: merge-recursive.c:3399 msgid "directory/file" msgstr "thư-mục/tập-tin" -#: merge-recursive.c:3411 +#: merge-recursive.c:3406 #, 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:3420 +#: merge-recursive.c:3415 #, c-format msgid "Adding %s" msgstr "Thêm \"%s\"" -#: merge-recursive.c:3429 +#: merge-recursive.c:3424 #, 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:3482 +#: merge-recursive.c:3477 #, 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:3576 +#: merge-recursive.c:3571 msgid "Merging:" msgstr "Đang trộn:" -#: merge-recursive.c:3589 +#: merge-recursive.c:3584 #, 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:3639 +#: merge-recursive.c:3634 msgid "merge returned no commit" msgstr "hòa trộn không trả về lần chuyển giao nào" -#: merge-recursive.c:3804 +#: merge-recursive.c:3799 #, c-format msgid "Could not parse object '%s'" msgstr "Không thể phân tích đối tượng “%s”" -#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900 +#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901 #: builtin/stash.c:473 msgid "Unable to write index." msgstr "Không thể ghi bảng mục lục." @@ -5206,7 +5208,7 @@ msgid "failed to read the cache" msgstr "gặp lỗi khi đọc bộ nhớ đệm" #: 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/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821 #: builtin/stash.c:267 msgid "unable to write new index file" msgstr "không thể ghi tập tin lưu bảng mục lục mới" @@ -6343,10 +6345,10 @@ msgstr "các mục tin stage không đúng thứ tự cho “%s”" #: 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/checkout.c:519 builtin/checkout.c:706 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 +#: builtin/submodule--helper.c:333 msgid "index file corrupt" msgstr "tập tin ghi bảng mục lục bị hỏng" @@ -6400,36 +6402,36 @@ msgstr "không thể làm tươi mới mục lục đã chia sẻ “%s”" 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:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145 +#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146 #, c-format msgid "could not close '%s'" msgstr "không thể đóng “%s”" -#: read-cache.c:3074 +#: read-cache.c:3075 msgid "failed to convert to a sparse-index" msgstr "gặp lỗi khi chuyển đổi sang \"sparse-index\"" -#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440 +#: read-cache.c:3146 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:3158 +#: read-cache.c:3159 #, c-format msgid "unable to open git dir: %s" msgstr "không thể mở thư mục git: %s" -#: read-cache.c:3170 +#: read-cache.c:3171 #, c-format msgid "unable to unlink: %s" msgstr "không thể bỏ liên kết (unlink): “%s”" -#: read-cache.c:3199 +#: read-cache.c:3200 #, 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:3348 +#: read-cache.c:3349 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: không thể xóa bỏ stage #0" @@ -6849,17 +6851,17 @@ msgstr "đang lờ đi tham chiếu với tên hỏng %s" msgid "ignoring broken ref %s" msgstr "đang lờ đi tham chiếu hỏng %s" -#: ref-filter.c:2498 +#: ref-filter.c:2502 #, c-format msgid "format: %%(end) atom missing" msgstr "định dạng: thiếu nguyên tử %%(end)" -#: ref-filter.c:2592 +#: ref-filter.c:2596 #, c-format msgid "malformed object name %s" msgstr "tên đối tượng dị hình %s" -#: ref-filter.c:2597 +#: ref-filter.c:2601 #, 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" @@ -7318,7 +7320,7 @@ msgid "Recorded preimage for '%s'" msgstr "Preimage đã được ghi lại cho “%s”" #: rerere.c:865 submodule.c:2076 builtin/log.c:2002 -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848 #, c-format msgid "could not create directory '%s'" msgstr "không thể tạo thư mục “%s”" @@ -7356,7 +7358,7 @@ 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:3689 +#: reset.c:69 reset.c:75 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" @@ -7565,7 +7567,7 @@ 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:729 -#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910 +#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "không thể mở “%s” để đọc" @@ -7721,7 +7723,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:1702 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705 msgid "could not parse HEAD commit" msgstr "không thể phân tích commit (lần chuyển giao) HEAD" @@ -7729,7 +7731,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:1615 builtin/merge.c:706 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707 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" @@ -7747,8 +7749,8 @@ 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:1642 builtin/commit.c:1816 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:1819 builtin/merge.c:910 +#: builtin/merge.c:935 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" @@ -8538,11 +8540,11 @@ msgstr "setsid gặp lỗi" 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:174 +#: sparse-index.c:176 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:261 +#: sparse-index.c:263 #, 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)" @@ -8698,7 +8700,7 @@ msgstr "" msgid "process for submodule '%s' failed" msgstr "xử lý cho mô-đun-con “%s” gặp lỗi" -#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486 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ệ." @@ -9103,7 +9105,7 @@ msgstr "các tùy chọn máy chủ yêu cầu giao thức phiên bản 2 hoặc #: transport.c:403 msgid "server does not support wait-for-done" -msgstr "Máy chủ không hỗ trợ wait-for-done" +msgstr "máy chủ không hỗ trợ wait-for-done" #: transport.c:755 msgid "could not parse transport.color.* config" @@ -9457,7 +9459,7 @@ msgstr "" msgid "Updating index flags" msgstr "Đang cập nhật các cờ mục lục" -#: unpack-trees.c:2707 +#: unpack-trees.c:2718 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "" @@ -10268,7 +10270,7 @@ msgstr "chạy thử" msgid "interactive picking" msgstr "sửa bằng cách tương tác" -#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308 +#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308 msgid "select hunks interactively" msgstr "chọn “hunks” theo kiểu tương tác" @@ -10403,12 +10405,12 @@ msgstr "Tùy chọn --ignore-missing chỉ có thể được dùng cùng với 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/add.c:544 builtin/checkout.c:1733 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 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/add.c:551 builtin/checkout.c:1745 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 cần --pathspec-from-file" @@ -11232,7 +11234,7 @@ msgstr "không coi các lần chuyển giao gốc là giới hạn (Mặc địn msgid "show work cost statistics" msgstr "hiển thị thống kê công sức làm việc" -#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 +#: builtin/blame.c:871 builtin/checkout.c:1519 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 @@ -12027,7 +12029,7 @@ msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn" msgid "terminate input and output records by a NUL character" msgstr "chấm dứt các bản ghi vào và ra bằng ký tự NULL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 +#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549 #: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "chặn các báo cáo tiến trình hoạt động" @@ -12086,9 +12088,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:1824 -#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835 -#: builtin/submodule--helper.c:2333 builtin/worktree.c:491 +#: builtin/column.c:31 builtin/submodule--helper.c:1892 +#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903 +#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896 +#: builtin/submodule--helper.c:2899 builtin/worktree.c:491 #: builtin/worktree.c:728 msgid "string" msgstr "chuỗi" @@ -12184,66 +12187,66 @@ msgstr "đường dẫn “%s”: không thể hòa trộn" msgid "Unable to add merge result for '%s'" msgstr "Không thể thêm kết quả hòa trộn cho “%s”" -#: builtin/checkout.c:414 +#: builtin/checkout.c:411 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Đã tạo lại %d xung đột hòa trộn" -#: builtin/checkout.c:419 +#: builtin/checkout.c:416 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Đã cập nhật đường dẫn %d từ %s" -#: builtin/checkout.c:426 +#: builtin/checkout.c:423 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Đã cập nhật đường dẫn %d từ mục lục" -#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455 -#: builtin/checkout.c:459 +#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452 +#: builtin/checkout.c:456 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "không được dùng “%s” với các đường dẫn cập nhật" -#: builtin/checkout.c:462 builtin/checkout.c:465 +#: builtin/checkout.c:459 builtin/checkout.c:462 #, c-format msgid "'%s' cannot be used with %s" msgstr "không được dùng “%s” với %s" -#: builtin/checkout.c:469 +#: builtin/checkout.c:466 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Không thể cập nhật các đường dẫn và chuyển đến nhánh “%s” cùng một lúc." -#: builtin/checkout.c:473 +#: builtin/checkout.c:470 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "không chỉ định “%s” cũng không “%s”" -#: builtin/checkout.c:477 +#: builtin/checkout.c:474 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "phải có “%s” khi không chỉ định “%s”" -#: builtin/checkout.c:482 builtin/checkout.c:487 +#: builtin/checkout.c:479 builtin/checkout.c:484 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "“%s” hay “%s” không thể được sử dụng với %s" -#: builtin/checkout.c:563 builtin/checkout.c:570 +#: builtin/checkout.c:558 builtin/checkout.c:565 #, c-format msgid "path '%s' is unmerged" msgstr "đường dẫn “%s” không được hòa trộn" -#: builtin/checkout.c:739 +#: builtin/checkout.c:734 msgid "you need to resolve your current index first" msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã" -#: builtin/checkout.c:793 +#: builtin/checkout.c:788 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12253,50 +12256,50 @@ msgstr "" "sau:\n" "%s" -#: builtin/checkout.c:886 +#: builtin/checkout.c:881 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Không thể thực hiện reflog cho “%s”: %s\n" -#: builtin/checkout.c:928 +#: builtin/checkout.c:923 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:203 +#: builtin/checkout.c:927 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" -#: builtin/checkout.c:936 +#: builtin/checkout.c:931 #, c-format msgid "Reset branch '%s'\n" msgstr "Đặt lại nhánh “%s”\n" -#: builtin/checkout.c:939 +#: builtin/checkout.c:934 #, c-format msgid "Already on '%s'\n" msgstr "Đã sẵn sàng trên “%s”\n" -#: builtin/checkout.c:943 +#: builtin/checkout.c:938 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Đã chuyển tới và đặt lại nhánh “%s”\n" -#: builtin/checkout.c:945 builtin/checkout.c:1376 +#: builtin/checkout.c:940 builtin/checkout.c:1371 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Đã chuyển đến nhánh mới “%s”\n" -#: builtin/checkout.c:947 +#: builtin/checkout.c:942 #, c-format msgid "Switched to branch '%s'\n" msgstr "Đã chuyển đến nhánh “%s”\n" -#: builtin/checkout.c:998 +#: builtin/checkout.c:993 #, c-format msgid " ... and %d more.\n" msgstr " … và nhiều hơn %d.\n" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:999 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12315,7 +12318,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1018 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12336,19 +12339,19 @@ msgstr[0] "" " git branch <tên_nhánh_mới> %s\n" "\n" -#: builtin/checkout.c:1058 +#: builtin/checkout.c:1053 msgid "internal error in revision walk" msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét duyệt" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1057 msgid "Previous HEAD position was" msgstr "Vị trí trước kia của HEAD là" -#: builtin/checkout.c:1102 builtin/checkout.c:1371 +#: builtin/checkout.c:1097 builtin/checkout.c:1366 msgid "You are on a branch yet to be born" msgstr "Bạn tại nhánh mà nó chưa hề được sinh ra" -#: builtin/checkout.c:1184 +#: builtin/checkout.c:1179 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12357,7 +12360,7 @@ msgstr "" "“%s” không thể là cả tập tin nội bộ và một nhánh theo dõi.\n" "Vui long dùng -- (và tùy chọn thêm --no-guess) để tránh lẫn lộn" -#: builtin/checkout.c:1191 +#: builtin/checkout.c:1186 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" @@ -12377,51 +12380,51 @@ msgstr "" "chưa rõ ràng, ví dụ máy chủ “origin”, cân nhắc cài đặt\n" "checkout.defaultRemote=origin trong cấu hình của bạn." -#: builtin/checkout.c:1201 +#: builtin/checkout.c:1196 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "“%s” khớp với nhiều (%d) nhánh máy chủ được theo dõi" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1262 msgid "only one reference expected" msgstr "chỉ cần một tham chiếu" -#: builtin/checkout.c:1284 +#: builtin/checkout.c:1279 #, c-format msgid "only one reference expected, %d given." msgstr "chỉ cần một tham chiếu, nhưng lại đưa ra %d." -#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436 +#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "tham chiếu không hợp lệ: %s" -#: builtin/checkout.c:1343 builtin/checkout.c:1709 +#: builtin/checkout.c:1338 builtin/checkout.c:1707 #, c-format msgid "reference is not a tree: %s" msgstr "tham chiếu không phải là một cây:%s" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1385 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "cần một nhánh, nhưng lại nhận được thẻ “%s”" -#: builtin/checkout.c:1392 +#: builtin/checkout.c:1387 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "cần một nhánh, nhưng lại nhận được nhánh máy phục vụ “%s”" -#: builtin/checkout.c:1393 builtin/checkout.c:1401 +#: builtin/checkout.c:1388 builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got '%s'" msgstr "cần một nhánh, nhưng lại nhận được “%s”" -#: builtin/checkout.c:1396 +#: builtin/checkout.c:1391 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "cần một nhánh, nhưng lại nhận được “%s”" -#: builtin/checkout.c:1412 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12429,7 +12432,7 @@ msgstr "" "không thể chuyển nhánh trong khi đang hòa trộn\n" "Cân nhắc dung \"git merge --quit\" hoặc \"git worktree add\"." -#: builtin/checkout.c:1416 +#: builtin/checkout.c:1411 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12437,7 +12440,7 @@ msgstr "" "không thể chuyển nhanh ở giữa một phiên am\n" "Cân nhắc dùng \"git am --quit\" hoặc \"git worktree add\"." -#: builtin/checkout.c:1420 +#: builtin/checkout.c:1415 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12445,7 +12448,7 @@ msgstr "" "không thể chuyển nhánh trong khi cải tổ\n" "Cân nhắc dùng \"git rebase --quit\" hay \"git worktree add\"." -#: builtin/checkout.c:1424 +#: builtin/checkout.c:1419 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12453,7 +12456,7 @@ msgstr "" "không thể chuyển nhánh trong khi cherry-picking\n" "Cân nhắc dùng \"git cherry-pick --quit\" hay \"git worktree add\"." -#: builtin/checkout.c:1428 +#: builtin/checkout.c:1423 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12461,143 +12464,143 @@ msgstr "" "không thể chuyển nhánh trong khi hoàn nguyên\n" "Cân nhắc dùng \"git revert --quit\" hoặc \"git worktree add\"." -#: builtin/checkout.c:1432 +#: builtin/checkout.c:1427 msgid "you are switching branch while bisecting" msgstr "" "bạn hiện tại đang thực hiện việc chuyển nhánh trong khi đang di chuyển nửa " "bước" -#: builtin/checkout.c:1439 +#: builtin/checkout.c:1434 msgid "paths cannot be used with switching branches" msgstr "các đường dẫn không thể dùng cùng với các nhánh chuyển" -#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450 +#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "“%s” không thể được sử dụng với các nhánh chuyển" -#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 -#: builtin/checkout.c:1465 builtin/checkout.c:1470 +#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455 +#: builtin/checkout.c:1460 builtin/checkout.c:1465 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "“%s” không thể được dùng với “%s”" -#: builtin/checkout.c:1467 +#: builtin/checkout.c:1462 #, c-format msgid "'%s' cannot take <start-point>" msgstr "“%s” không thể nhận <điểm-đầu>" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1470 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Không thể chuyển nhánh đến một thứ không phải là lần chuyển giao “%s”" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1477 msgid "missing branch or commit argument" msgstr "thiếu tham số là nhánh hoặc lần chuyển giao" -#: builtin/checkout.c:1525 +#: builtin/checkout.c:1520 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:1810 parse-options.h:323 +#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323 msgid "style" msgstr "kiểu" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1522 msgid "conflict style (merge or diff3)" msgstr "xung đột kiểu (hòa trộn hoặc diff3)" -#: builtin/checkout.c:1539 builtin/worktree.c:488 +#: builtin/checkout.c:1534 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "rời bỏ HEAD tại lần chuyển giao theo tên" -#: builtin/checkout.c:1540 +#: builtin/checkout.c:1535 msgid "set upstream info for new branch" msgstr "đặt thông tin thượng nguồn cho nhánh mới" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1537 msgid "force checkout (throw away local modifications)" msgstr "ép buộc lấy ra (bỏ đi những thay đổi nội bộ)" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new-branch" msgstr "nhánh-mới" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1539 msgid "new unparented branch" msgstr "nhánh không cha mới" -#: builtin/checkout.c:1546 builtin/merge.c:301 +#: builtin/checkout.c:1541 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "cập nhật các tập tin bị bỏ qua (mặc định)" -#: builtin/checkout.c:1549 +#: builtin/checkout.c:1544 msgid "do not check if another worktree is holding the given ref" msgstr "không kiểm tra nếu cây làm việc khác đang giữ tham chiếu đã cho" -#: builtin/checkout.c:1562 +#: builtin/checkout.c:1557 msgid "checkout our version for unmerged files" msgstr "" "lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1560 msgid "checkout their version for unmerged files" msgstr "" "lấy ra (checkout) phiên bản của chúng họ cho các tập tin chưa được hòa trộn" -#: builtin/checkout.c:1569 +#: builtin/checkout.c:1564 msgid "do not limit pathspecs to sparse entries only" msgstr "không giới hạn đặc tả đường dẫn thành chỉ các mục rải rác" -#: builtin/checkout.c:1624 +#: builtin/checkout.c:1622 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c và --orphan loại từ lẫn nhau" -#: builtin/checkout.c:1628 +#: builtin/checkout.c:1626 msgid "-p and --overlay are mutually exclusive" msgstr "-p và --overlay loại từ lẫn nhau" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1663 msgid "--track needs a branch name" msgstr "--track cần tên một nhánh" -#: builtin/checkout.c:1670 +#: builtin/checkout.c:1668 #, c-format msgid "missing branch name; try -%c" msgstr "thiếu tên nhánh; hãy thử -%c" -#: builtin/checkout.c:1702 +#: builtin/checkout.c:1700 #, c-format msgid "could not resolve %s" msgstr "không thể phân giải “%s”" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1716 msgid "invalid path specification" msgstr "đường dẫn đã cho không hợp lệ" -#: builtin/checkout.c:1725 +#: builtin/checkout.c:1723 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "“%s” không phải là một lần chuyển giao và một nhánh'%s” không thể được tạo " "từ đó" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1727 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach không nhận một đối số đường dẫn “%s”" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1736 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:1630 +#: builtin/checkout.c:1739 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" -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1752 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12605,70 +12608,71 @@ msgstr "" "git checkout: --ours/--theirs, --force và --merge là xung khắc với nhau khi\n" "checkout bảng mục lục (index)." -#: builtin/checkout.c:1759 +#: builtin/checkout.c:1757 msgid "you must specify path(s) to restore" msgstr "bạn phải chỉ định các thư mục muốn hồi phục" -#: builtin/checkout.c: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/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834 +#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2736 +#: builtin/submodule--helper.c:2887 builtin/worktree.c:484 #: builtin/worktree.c:486 msgid "branch" msgstr "nhánh" -#: builtin/checkout.c:1786 +#: builtin/checkout.c:1784 msgid "create and checkout a new branch" msgstr "tạo và checkout một nhánh mới" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1786 msgid "create/reset and checkout a branch" msgstr "tạo/đặt_lại và checkout một nhánh" -#: builtin/checkout.c:1789 +#: builtin/checkout.c:1787 msgid "create reflog for new branch" msgstr "tạo reflog cho nhánh mới" -#: builtin/checkout.c:1791 +#: builtin/checkout.c:1789 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "đoán thứ hai “git checkout <không-nhánh-nào-như-vậy>” (mặc định)" -#: builtin/checkout.c:1792 +#: builtin/checkout.c:1790 msgid "use overlay mode (default)" msgstr "dùng chế độ che phủ (mặc định)" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1835 msgid "create and switch to a new branch" msgstr "tạo và chuyển đến một nhánh mới" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1837 msgid "create/reset and switch to a branch" msgstr "tạo/đặt_lại và chuyển đến một nhánh" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1839 msgid "second guess 'git switch <no-such-branch>'" msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\"" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1841 msgid "throw away local modifications" msgstr "vứt bỏ các sửa đổi địa phương" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1875 msgid "which tree-ish to checkout from" msgstr "lấy ra từ tree-ish nào" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1877 msgid "restore the index" msgstr "phục hồi bảng mục lục" -#: builtin/checkout.c:1881 +#: builtin/checkout.c:1879 msgid "restore the working tree (default)" msgstr "phục hồi cây làm việc (mặc định)" -#: builtin/checkout.c:1883 +#: builtin/checkout.c:1881 msgid "ignore unmerged entries" msgstr "bỏ qua những thứ chưa hòa trộn: %s" -#: builtin/checkout.c:1884 +#: builtin/checkout.c:1882 msgid "use overlay mode" msgstr "dùng chế độ che phủ" @@ -12898,13 +12902,13 @@ msgstr "thư-mục-mẫu" 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:1831 -#: builtin/submodule--helper.c:2336 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899 +#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903 msgid "reference repository" msgstr "kho tham chiếu" -#: builtin/clone.c:123 builtin/submodule--helper.c:1833 -#: builtin/submodule--helper.c:2338 +#: builtin/clone.c:123 builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905 msgid "use --reference only while cloning" msgstr "chỉ dùng --reference khi nhân bản" @@ -12953,8 +12957,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:1843 -#: builtin/submodule--helper.c:2352 +#: builtin/clone.c:137 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:2369 msgid "clone only one branch, HEAD or --branch" msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch" @@ -14040,39 +14044,39 @@ msgstr "ok để ghi lại một thay đổi trống rỗng" 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:1747 +#: builtin/commit.c:1750 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Tập tin MERGE_HEAD sai hỏng (%s)" -#: builtin/commit.c:1754 +#: builtin/commit.c:1757 msgid "could not read MERGE_MODE" msgstr "không thể đọc MERGE_MODE" -#: builtin/commit.c:1775 +#: builtin/commit.c:1778 #, 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:1782 +#: builtin/commit.c:1785 #, 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:1787 +#: builtin/commit.c:1790 #, 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:1798 +#: builtin/commit.c:1801 #, 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:1834 +#: builtin/commit.c:1837 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -15446,15 +15450,15 @@ msgstr "chỉ hiển thị những tham chiếu mà nó không chứa lần chuy msgid "git for-each-repo --config=<config> <command-args>" msgstr "git for-each-repo --config=<config> <command-args>" -#: builtin/for-each-repo.c:37 +#: builtin/for-each-repo.c:34 msgid "config" msgstr "config" -#: builtin/for-each-repo.c:38 +#: builtin/for-each-repo.c:35 msgid "config key storing a list of repository paths" msgstr "khóa cấu hình lưu trữ danh sách đường dẫn kho lưu trữ" -#: builtin/for-each-repo.c:46 +#: builtin/for-each-repo.c:43 msgid "missing --config=<config>" msgstr "thiếu --config=<config>" @@ -17815,38 +17819,38 @@ msgstr "Không có lời chú thích hòa trộn -- nên không cập nhật HEA msgid "'%s' does not point to a commit" msgstr "“%s” không chỉ đến một lần chuyển giao nào cả" -#: builtin/merge.c:602 +#: builtin/merge.c:603 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Chuỗi branch.%s.mergeoptions sai: %s" -#: builtin/merge.c:728 +#: builtin/merge.c:729 msgid "Not handling anything other than two heads merge." msgstr "Không cầm nắm gì ngoài hai head hòa trộn." -#: builtin/merge.c:741 +#: builtin/merge.c:742 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Không hiểu tùy chọn cho merge-recursive: -X%s" -#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223 +#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "không thể ghi %s" -#: builtin/merge.c:812 +#: builtin/merge.c:813 #, c-format msgid "Could not read from '%s'" msgstr "Không thể đọc từ “%s”" -#: builtin/merge.c:821 +#: builtin/merge.c:822 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Vẫn chưa hòa trộn các lần chuyển giao; sử dụng lệnh “git commit” để hoàn tất " "việc hòa trộn.\n" -#: builtin/merge.c:827 +#: builtin/merge.c:828 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -17858,11 +17862,11 @@ msgstr "" "topic.\n" "\n" -#: builtin/merge.c:832 +#: builtin/merge.c:833 msgid "An empty message aborts the commit.\n" msgstr "Nếu phần chú thích rỗng sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/merge.c:835 +#: builtin/merge.c:836 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -17871,75 +17875,75 @@ msgstr "" "Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua, và nếu phần chú\n" "thích rỗng sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/merge.c:888 +#: builtin/merge.c:889 msgid "Empty commit message." msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng." -#: builtin/merge.c:903 +#: builtin/merge.c:904 #, c-format msgid "Wonderful.\n" msgstr "Tuyệt vời.\n" -#: builtin/merge.c:964 +#: builtin/merge.c:965 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao kết " "quả.\n" -#: builtin/merge.c:1003 +#: builtin/merge.c:1004 msgid "No current branch." msgstr "Không phải nhánh hiện hành." -#: builtin/merge.c:1005 +#: builtin/merge.c:1006 msgid "No remote for the current branch." msgstr "Không có máy chủ cho nhánh hiện hành." -#: builtin/merge.c:1007 +#: builtin/merge.c:1008 msgid "No default upstream defined for the current branch." msgstr "Không có thượng nguồn mặc định được định nghĩa cho nhánh hiện hành." -#: builtin/merge.c:1012 +#: builtin/merge.c:1013 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Không nhánh mạng theo dõi cho %s từ %s" -#: builtin/merge.c:1069 +#: builtin/merge.c:1070 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Giá trị sai “%s” trong biến môi trường “%s”" -#: builtin/merge.c:1172 +#: builtin/merge.c:1173 #, c-format msgid "not something we can merge in %s: %s" msgstr "không phải là một thứ gì đó mà chúng tôi có thể hòa trộn trong %s: %s" -#: builtin/merge.c:1206 +#: builtin/merge.c:1207 msgid "not something we can merge" msgstr "không phải là thứ gì đó mà chúng tôi có thể hòa trộn" -#: builtin/merge.c:1316 +#: builtin/merge.c:1317 msgid "--abort expects no arguments" msgstr "--abort không nhận các đối số" -#: builtin/merge.c:1320 +#: builtin/merge.c:1321 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Ở đây không có lần hòa trộn nào được hủy bỏ giữa chừng cả (thiếu MERGE_HEAD)." -#: builtin/merge.c:1338 +#: builtin/merge.c:1339 msgid "--quit expects no arguments" msgstr "--quit không nhận các đối số" -#: builtin/merge.c:1351 +#: builtin/merge.c:1352 msgid "--continue expects no arguments" msgstr "--continue không nhận đối số" -#: builtin/merge.c:1355 +#: builtin/merge.c:1356 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ở đây không có lần hòa trộn nào đang được xử lý cả (thiếu MERGE_HEAD)." -#: builtin/merge.c:1371 +#: builtin/merge.c:1372 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17947,7 +17951,7 @@ msgstr "" "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại).\n" "Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn." -#: builtin/merge.c:1378 +#: builtin/merge.c:1379 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17955,90 +17959,90 @@ msgstr "" "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n" "Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn." -#: builtin/merge.c:1381 +#: builtin/merge.c:1382 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)." -#: builtin/merge.c:1395 +#: builtin/merge.c:1396 msgid "You cannot combine --squash with --no-ff." msgstr "Bạn không thể kết hợp --squash với --no-ff." -#: builtin/merge.c:1397 +#: builtin/merge.c:1398 msgid "You cannot combine --squash with --commit." msgstr "Bạn không thể kết hợp --squash với --commit." -#: builtin/merge.c:1413 +#: builtin/merge.c:1414 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Không chỉ ra lần chuyển giao và merge.defaultToUpstream chưa được đặt." -#: builtin/merge.c:1430 +#: builtin/merge.c:1431 msgid "Squash commit into empty head not supported yet" msgstr "Squash commit vào một head trống rỗng vẫn chưa được hỗ trợ" -#: builtin/merge.c:1432 +#: builtin/merge.c:1433 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Chuyển giao không-chuyển-tiếp-nhanh không hợp lý ở trong một head trống rỗng" -#: builtin/merge.c:1437 +#: builtin/merge.c:1438 #, c-format msgid "%s - not something we can merge" msgstr "%s - không phải là thứ gì đó mà chúng tôi có thể hòa trộn" -#: builtin/merge.c:1439 +#: builtin/merge.c:1440 msgid "Can merge only exactly one commit into empty head" msgstr "" "Không thể hòa trộn một cách đúng đắn một lần chuyển giao vào một head rỗng" -#: builtin/merge.c:1520 +#: builtin/merge.c:1521 msgid "refusing to merge unrelated histories" msgstr "từ chối hòa trộn lịch sử không liên quan" -#: builtin/merge.c:1539 +#: builtin/merge.c:1540 #, c-format msgid "Updating %s..%s\n" msgstr "Đang cập nhật %s..%s\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1587 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Đang thử hòa trộn kiểu “trivial in-index”…\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1594 #, c-format msgid "Nope.\n" msgstr "Không.\n" -#: builtin/merge.c:1623 +#: builtin/merge.c:1625 msgid "Not possible to fast-forward, aborting." msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang bỏ qua." -#: builtin/merge.c:1651 builtin/merge.c:1716 +#: builtin/merge.c:1653 builtin/merge.c:1719 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Đang tua lại cây thành thời xa xưa…\n" -#: builtin/merge.c:1655 +#: builtin/merge.c:1657 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Đang thử chiến lược hòa trộn %s…\n" -#: builtin/merge.c:1707 +#: builtin/merge.c:1709 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n" -#: builtin/merge.c:1709 +#: builtin/merge.c:1711 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n" -#: builtin/merge.c:1718 +#: builtin/merge.c:1721 #, c-format -msgid "Using the %s to prepare resolving by hand.\n" -msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n" +msgid "Using the %s strategy to prepare resolving by hand.\n" +msgstr "Sử dụng chiến lược %s để chuẩn bị giải quyết bằng tay.\n" -#: builtin/merge.c:1732 +#: builtin/merge.c:1735 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -20399,7 +20403,7 @@ 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:39 -#: builtin/submodule--helper.c:2414 +#: builtin/submodule--helper.c:2431 #, c-format msgid "No such ref: %s" msgstr "Không có tham chiếu nào như thế: %s" @@ -22250,37 +22254,37 @@ msgstr "gặp lỗi khi sửa cấu hình \"sparse-index\"" msgid "failed to open '%s'" msgstr "gặp lỗi khi mở “%s”" -#: builtin/sparse-checkout.c:419 +#: builtin/sparse-checkout.c:413 #, c-format msgid "could not normalize path %s" msgstr "không thể thường hóa đường dẫn “%s”" -#: builtin/sparse-checkout.c:431 +#: builtin/sparse-checkout.c:425 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <các mẫu>)" -#: builtin/sparse-checkout.c:456 +#: builtin/sparse-checkout.c:450 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "không thể bỏ trích dẫn chuỗi kiểu C “%s”" -#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534 +#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528 msgid "unable to load existing sparse-checkout patterns" msgstr "không thể tải các mẫu sparse-checkout" -#: builtin/sparse-checkout.c:579 +#: builtin/sparse-checkout.c:573 msgid "read patterns from standard in" msgstr "đọc các mẫu từ đầu vào tiêu chuẩn" -#: builtin/sparse-checkout.c:594 +#: builtin/sparse-checkout.c:588 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:613 +#: builtin/sparse-checkout.c:607 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:644 +#: builtin/sparse-checkout.c:638 msgid "error while refreshing working directory" msgstr "gặp lỗi khi đọc lại thư mục làm việc" @@ -22563,7 +22567,7 @@ msgstr "giữ và xóa bỏ mọi dòng bắt đầu bằng ký tự ghi chú" msgid "prepend comment character and space to each line" msgstr "treo trước ký tự ghi chú và ký tự khoảng trắng cho từng dòng" -#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440 #, 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" @@ -22577,26 +22581,27 @@ msgstr "submodule--helper print-default-remote takes không nhận tham số" msgid "cannot strip one component off url '%s'" msgstr "không thể cắt bỏ một thành phần ra khỏi “%s” url" -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 +#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887 +#: builtin/submodule--helper.c:2891 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:414 +#: builtin/submodule--helper.c:416 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=</đường/dẫn>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 -#: builtin/submodule--helper.c:652 +#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631 +#: builtin/submodule--helper.c:654 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Không tìm thấy url cho đường dẫn mô-đun-con “%s” trong .gitmodules" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:526 #, c-format msgid "Entering '%s'\n" msgstr "Đang vào “%s”\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:529 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22605,7 +22610,7 @@ msgstr "" "run_command trả về trạng thái khác không cho %s\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:551 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22616,20 +22621,20 @@ msgstr "" "con lồng nhau của %s\n" "." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:567 msgid "suppress output of entering each submodule command" msgstr "chặn kết xuất của từng lệnh mô-đun-con" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 -#: builtin/submodule--helper.c:1487 +#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:1489 msgid "recurse into nested submodules" msgstr "đệ quy vào trong mô-đun-con lồng nhau" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:574 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <lệnh>" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:601 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -22638,56 +22643,56 @@ msgstr "" "không thể tìm thấy cấu hình “%s”. Coi rằng đây là kho thượng nguồn có quyền " "sở hữu chính nó." -#: builtin/submodule--helper.c:666 +#: builtin/submodule--helper.c:668 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:670 +#: builtin/submodule--helper.c:672 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n" -#: builtin/submodule--helper.c:680 +#: builtin/submodule--helper.c:682 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "cảnh báo: chế độ lệnh cập nhật được gợi ý cho mô-đun-con “%s”\n" -#: builtin/submodule--helper.c:687 +#: builtin/submodule--helper.c:689 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:709 +#: builtin/submodule--helper.c:711 msgid "suppress output for initializing a submodule" msgstr "chặn kết xuất của khởi tạo một mô-đun-con" -#: builtin/submodule--helper.c:714 +#: builtin/submodule--helper.c:716 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<các tùy chọn>] [</đường/dẫn>]" -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đường dẫn " "“%s”" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:837 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "không thể phân giải tham chiếu HEAD bên trong mô-đun-con “%s”" -#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "gặp lỗi khi đệ quy vào trong mô-đun-con “%s”" -#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625 msgid "suppress submodule status output" msgstr "chặn kết xuất về tình trạng mô-đun-con" -#: builtin/submodule--helper.c:887 +#: builtin/submodule--helper.c:889 msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -22695,102 +22700,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:893 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "" "git submodule status [--quiet] [--cached] [--recursive] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:917 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name </đường/dẫn>" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:991 #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "" "* %s %s(blob)->%s(\n" ")" -#: builtin/submodule--helper.c:992 +#: builtin/submodule--helper.c:994 #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(mô-đun-con)->%s(blob)" -#: builtin/submodule--helper.c:1005 +#: builtin/submodule--helper.c:1007 #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1057 #, c-format msgid "couldn't hash object from '%s'" msgstr "không thể băm đối tượng từ “%s”" -#: builtin/submodule--helper.c:1059 +#: builtin/submodule--helper.c:1061 #, c-format msgid "unexpected mode %o\n" msgstr "gặp chế độ không như mong chờ %o\n" -#: builtin/submodule--helper.c:1300 +#: builtin/submodule--helper.c:1302 msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "hùng lần chuyển giao đã lưu trong mục lục thay cho HEAD mô-đun-con" -#: builtin/submodule--helper.c:1302 +#: builtin/submodule--helper.c:1304 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:1304 +#: builtin/submodule--helper.c:1306 msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "" "bỏ qua các mô-đun-con với giá trị của “ignore_config” được đặt thành “all”" -#: builtin/submodule--helper.c:1306 +#: builtin/submodule--helper.c:1308 msgid "limit the summary size" msgstr "giới hạn kích cỡ tổng hợp" -#: builtin/submodule--helper.c:1311 +#: builtin/submodule--helper.c:1313 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "" "git submodule--helper summary [<các tùy chọn>] [<lần_chuyển_giao>] [--] [</" "đường/dẫn>]" -#: builtin/submodule--helper.c:1335 +#: builtin/submodule--helper.c:1337 msgid "could not fetch a revision for HEAD" msgstr "không thể lấy về một điểm xem xét cho HEAD" -#: builtin/submodule--helper.c:1340 +#: builtin/submodule--helper.c:1342 msgid "--cached and --files are mutually exclusive" msgstr "Các tùy chọn --cached và --files loại từ lẫn nhau" -#: builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1409 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Url mô-đun-con đồng bộ hóa cho “%s”\n" -#: builtin/submodule--helper.c:1413 +#: builtin/submodule--helper.c:1415 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:1427 +#: builtin/submodule--helper.c:1429 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "gặp lỗi khi lấy máy chủ mặc định cho mô-đun-con “%s”" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1440 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "gặp lỗi khi cập nhật cho mô-đun-con “%s”" -#: builtin/submodule--helper.c:1485 +#: builtin/submodule--helper.c:1487 msgid "suppress output of synchronizing submodule url" msgstr "chặn kết xuất của url mô-đun-con đồng bộ" -#: builtin/submodule--helper.c:1492 +#: builtin/submodule--helper.c:1494 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [</đường/dẫn>]" -#: builtin/submodule--helper.c:1546 +#: builtin/submodule--helper.c:1548 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -22799,7 +22804,7 @@ msgstr "" "Cây làm việc mô-đun-con “%s” có chứa thư mục .git (dùng “rm -rf” nếu bạn " "thực sự muốn gỡ bỏ nó cùng với toàn bộ lịch sử của chúng)" -#: builtin/submodule--helper.c:1558 +#: builtin/submodule--helper.c:1560 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -22808,45 +22813,45 @@ msgstr "" "Cây làm việc mô-đun-con “%s” chứa các thay đổi nội bộ; hãy dùng “-f” để loại " "bỏ chúng đi" -#: builtin/submodule--helper.c:1566 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Cleared directory '%s'\n" msgstr "Đã xóa thư mục “%s”\n" -#: builtin/submodule--helper.c:1568 +#: builtin/submodule--helper.c:1570 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Không thể gỡ bỏ cây làm việc mô-đun-con “%s”\n" -#: builtin/submodule--helper.c:1579 +#: builtin/submodule--helper.c:1581 #, c-format msgid "could not create empty submodule directory %s" msgstr "không thể tạo thư mục mô-đun-con rỗng “%s”" -#: builtin/submodule--helper.c:1595 +#: builtin/submodule--helper.c:1597 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n" -#: builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:1626 msgid "remove submodule working trees even if they contain local changes" msgstr "gỡ bỏ cây làm việc của mô-đun-con ngay cả khi nó có thay đổi nội bộ" -#: builtin/submodule--helper.c:1625 +#: builtin/submodule--helper.c:1627 msgid "unregister all submodules" msgstr "bỏ đăng ký tất cả các trong mô-đun-con" -#: builtin/submodule--helper.c:1630 +#: builtin/submodule--helper.c:1632 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [</đường/dẫn>…]]" -#: builtin/submodule--helper.c:1644 +#: builtin/submodule--helper.c:1646 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Dùng “--all” nếu bạn thực sự muốn hủy khởi tạo mọi mô-đun-con" -#: builtin/submodule--helper.c:1713 +#: builtin/submodule--helper.c:1690 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" @@ -22861,46 +22866,67 @@ msgstr "" "bằng\n" "“--reference-if-able” thay vì dùng “--reference”." -#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "mô-đun-con “%s” không thể thêm thay thế: %s" -#: builtin/submodule--helper.c:1791 +#: builtin/submodule--helper.c:1768 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Giá trị “%s” cho submodule.alternateErrorStrategy không được thừa nhận" -#: builtin/submodule--helper.c:1798 +#: builtin/submodule--helper.c:1775 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Giá trị “%s” cho submodule.alternateLocation không được thừa nhận" -#: builtin/submodule--helper.c:1822 +#: builtin/submodule--helper.c:1800 +#, 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:1841 +#, 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:1846 +#, c-format +msgid "directory not empty: '%s'" +msgstr "thư mục không trống: “%s”" + +#: builtin/submodule--helper.c:1858 +#, 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:1890 builtin/submodule--helper.c:2894 msgid "where the new submodule will be cloned to" msgstr "nhân bản mô-đun-con mới vào chỗ nào" -#: builtin/submodule--helper.c:1825 +#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897 msgid "name of the new submodule" msgstr "tên của mô-đun-con mới" -#: builtin/submodule--helper.c:1828 +#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900 msgid "url where to clone the submodule from" msgstr "url nơi mà nhân bản mô-đun-con từ đó" -#: builtin/submodule--helper.c:1836 +#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907 msgid "depth for shallow clones" msgstr "chiều sâu lịch sử khi tạo bản sao" -#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 +#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365 +#: builtin/submodule--helper.c:2909 msgid "force cloning progress" msgstr "ép buộc tiến trình nhân bản" -#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367 msgid "disallow cloning into non-empty directory" msgstr "làm đầy đủ dữ liệu cho bản sao vào trong một thư mục trống rỗng" -#: builtin/submodule--helper.c:1848 +#: builtin/submodule--helper.c:1916 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -22910,105 +22936,85 @@ msgstr "" "<kho>] [--name <tên>] [--depth <sâu>] [--single-branch] --url <url> --path </" "đường/dẫn>" -#: 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: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:1888 -#, c-format -msgid "directory not empty: '%s'" -msgstr "thư mục không trống: “%s”" - -#: 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:1936 +#: builtin/submodule--helper.c:1953 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Chế độ cập nhật “%s” không hợp lệ cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:1940 +#: builtin/submodule--helper.c:1957 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Chế độ cập nhật “%s” không hợp lệ được cấu hình cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:2041 +#: builtin/submodule--helper.c:2058 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Đường dẫn mô-đun-con “%s” chưa được khởi tạo" -#: builtin/submodule--helper.c:2045 +#: builtin/submodule--helper.c:2062 msgid "Maybe you want to use 'update --init'?" msgstr "Có lẽ bạn là bạn muốn dùng \"update --init\" phải không?" -#: builtin/submodule--helper.c:2075 +#: builtin/submodule--helper.c:2092 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Bỏ qua các mô-đun-con chưa được hòa trộn %s" -#: builtin/submodule--helper.c:2104 +#: builtin/submodule--helper.c:2121 #, c-format msgid "Skipping submodule '%s'" msgstr "Bỏ qua mô-đun-con “%s”" -#: builtin/submodule--helper.c:2254 +#: builtin/submodule--helper.c:2271 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Gặp lỗi khi nhân bản “%s”. Thử lại lịch trình" -#: builtin/submodule--helper.c:2265 +#: builtin/submodule--helper.c:2282 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Gặp lỗi khi nhân bản “%s” lần thứ hai nên bãi bỏ" -#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590 msgid "path into the working tree" msgstr "đường dẫn đến cây làm việc" -#: builtin/submodule--helper.c:2330 +#: builtin/submodule--helper.c:2347 msgid "path into the working tree, across nested submodule boundaries" msgstr "đường dẫn đến cây làm việc, chéo biên giới mô-đun-con lồng nhau" -#: builtin/submodule--helper.c:2334 +#: builtin/submodule--helper.c:2351 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout hoặc không làm gì cả" -#: builtin/submodule--helper.c:2340 +#: builtin/submodule--helper.c:2357 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "" "tạo một bản sao nông được cắt ngắn thành số lượng điểm xét duyệt đã cho" -#: builtin/submodule--helper.c:2343 +#: builtin/submodule--helper.c:2360 msgid "parallel jobs" msgstr "công việc đồng thời" -#: builtin/submodule--helper.c:2345 +#: builtin/submodule--helper.c:2362 msgid "whether the initial clone should follow the shallow recommendation" msgstr "nhân bản lần đầu có nên theo khuyến nghị là nông hay không" -#: builtin/submodule--helper.c:2346 +#: builtin/submodule--helper.c:2363 msgid "don't print cloning progress" msgstr "đừng in tiến trình nhân bản" -#: builtin/submodule--helper.c:2357 +#: builtin/submodule--helper.c:2374 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "" "git submodule--helper update-clone [--prefix=</đường/dẫn>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:2370 +#: builtin/submodule--helper.c:2387 msgid "bad value for update parameter" msgstr "giá trị cho tham số cập nhật bị sai" -#: builtin/submodule--helper.c:2418 +#: builtin/submodule--helper.c:2435 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -23017,86 +23023,143 @@ msgstr "" "Nhánh mô-đun-con (%s) được cấu hình kế thừa nhánh từ siêu dự án, nhưng siêu " "dự án lại không trên bất kỳ nhánh nào" -#: builtin/submodule--helper.c:2541 +#: builtin/submodule--helper.c:2558 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "không thể lấy thẻ quản kho cho mô-đun-con “%s”" -#: builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2591 msgid "recurse into submodules" msgstr "đệ quy vào trong mô-đun-con" -#: builtin/submodule--helper.c:2580 +#: builtin/submodule--helper.c:2597 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<các tùy chọn>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:2636 +#: builtin/submodule--helper.c:2653 msgid "check if it is safe to write to the .gitmodules file" msgstr "chọn nếu nó là an toàn để ghi vào tập tin .gitmodules" -#: builtin/submodule--helper.c:2639 +#: builtin/submodule--helper.c:2656 msgid "unset the config in the .gitmodules file" msgstr "bỏ đặt cấu hình trong tập tin .gitmodules" -#: builtin/submodule--helper.c:2644 +#: builtin/submodule--helper.c:2661 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <tên> [<giá trị>]" -#: builtin/submodule--helper.c:2645 +#: builtin/submodule--helper.c:2662 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <tên>" -#: builtin/submodule--helper.c:2646 +#: builtin/submodule--helper.c:2663 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2665 git-submodule.sh:150 +#: builtin/submodule--helper.c:2682 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "hãy đảm bảo rằng tập tin .gitmodules có trong cây làm việc" -#: builtin/submodule--helper.c:2681 +#: builtin/submodule--helper.c:2698 msgid "suppress output for setting url of a submodule" msgstr "chặn kết xuất cho cài đặt url của một mô-đun-con" -#: builtin/submodule--helper.c:2685 +#: builtin/submodule--helper.c:2702 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] </đường/dẫn> <url_mới>" -#: builtin/submodule--helper.c:2718 +#: builtin/submodule--helper.c:2735 msgid "set the default tracking branch to master" msgstr "đặt nhánh theo dõi mặc định thành master" -#: builtin/submodule--helper.c:2720 +#: builtin/submodule--helper.c:2737 msgid "set the default tracking branch" msgstr "đặt nhánh theo dõi mặc định" -#: builtin/submodule--helper.c:2724 +#: builtin/submodule--helper.c:2741 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet](-d|--default)</đường/dẫn>" -#: builtin/submodule--helper.c:2725 +#: builtin/submodule--helper.c:2742 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <nhánh> </đường/" "dẫn>" -#: builtin/submodule--helper.c:2732 +#: builtin/submodule--helper.c:2749 msgid "--branch or --default required" msgstr "cần --branch hoặc --default" -#: builtin/submodule--helper.c:2735 +#: builtin/submodule--helper.c:2752 msgid "--branch and --default are mutually exclusive" msgstr "Các tùy chọn --branch và --default loại từ lẫn nhau" -#: builtin/submodule--helper.c:2792 git.c:449 git.c:724 +#: builtin/submodule--helper.c:2815 +#, c-format +msgid "Adding existing repo at '%s' to the index\n" +msgstr "Đang thêm repo có sẵn tại “%s” vào bảng mục lục\n" + +#: builtin/submodule--helper.c:2818 +#, c-format +msgid "'%s' already exists and is not a valid git repo" +msgstr "“%s” đã tồn tại từ trước và không phải là một kho git hợp lệ" + +#: builtin/submodule--helper.c:2828 +#, c-format +msgid "A git directory for '%s' is found locally with remote(s):" +msgstr "Thư mục git cho “%s” được tìm thấy một cách cục bộ với các máy chủ:" + +#: builtin/submodule--helper.c:2833 +#, c-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from\n" +" %s\n" +"use the '--force' option. If the local git directory is not the correct " +"repo\n" +"or if you are unsure what this means, choose another name with the '--name' " +"option.\n" +msgstr "" +"Nếu bạn muốn sử dụng lại thư mục nội bộ này thay vì nhân bản lại lần nữa từ\n" +" %s\n" +"dùng tùy chọn “--force”. Nếu thư mục git nội bộ không phải là một kho đúng\n" +"hoặc là bạn không chắc chắn điều đó nghĩa là gì thì chọn tên khác với tùy " +"chọn “--name”.\n" + +#: builtin/submodule--helper.c:2842 +#, c-format +msgid "Reactivating local git directory for submodule '%s'\n" +msgstr "Phục hồi sự hoạt động của thư mục git nội bộ cho mô-đun-con “%s”.\n" + +#: builtin/submodule--helper.c:2875 +#, c-format +msgid "unable to checkout submodule '%s'" +msgstr "không thể lấy ra mô-đun-con “%s”" + +#: builtin/submodule--helper.c:2888 +msgid "branch of repository to checkout on cloning" +msgstr "nhánh của kho để lấy ra khi nhân bản" + +#: builtin/submodule--helper.c:2910 +msgid "allow adding an otherwise ignored submodule path" +msgstr "cho phép thêm một đường dẫn mô-đun-con bị bỏ qua khác" + +#: builtin/submodule--helper.c:2917 +msgid "" +"git submodule--helper add-clone [<options>...] --url <url> --path <path> --" +"name <name>" +msgstr "" +"git submodule--helper add-clone [<các tùy chọn>...] --url <url> --path </" +"đường/dẫn> --name <tên>" + +#: builtin/submodule--helper.c:2985 git.c:449 git.c:724 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s không hỗ trợ --super-prefix" -#: builtin/submodule--helper.c:2798 +#: builtin/submodule--helper.c:2991 #, 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ệ" @@ -25333,72 +25396,29 @@ msgstr "" msgid "'$sm_path' does not have a commit checked out" msgstr "“$sm_path” không có lần chuyển giao nào được lấy ra" -#: git-submodule.sh:249 -#, sh-format -msgid "Adding existing repo at '$sm_path' to the index" -msgstr "Đang thêm repo có sẵn tại “$sm_path” vào bảng mục lục" - -#: git-submodule.sh:251 -#, sh-format -msgid "'$sm_path' already exists and is not a valid git repo" -msgstr "”$sm_path” đã tồn tại từ trước và không phải là một kho git hợp lệ" - -#: git-submodule.sh:259 -#, sh-format -msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "" -"Thư mục git cho “$sm_name” được tìm thấy một cách cục bộ với các máy chủ:" - -#: 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." -msgstr "" -"Nếu bạn muốn sử dụng lại thư mục nội bộ này thay vì nhân bản lại lần nữa từ\n" -" $realrepo\n" -"dùng tùy chọn “--force”. Nếu thư mục git nội bộ không phải là một kho đúng\n" -"hoặc là bạn không chắc chắn điều đó nghĩa là gì thì chọn tên khác với tùy " -"chọn “--name”." - -#: git-submodule.sh:267 -#, sh-format -msgid "Reactivating local git directory for submodule '$sm_name'." -msgstr "" -"Phục hồi sự hoạt động của thư mục git nội bộ cho mô-đun-con “$sm_name”." - -#: git-submodule.sh:279 -#, sh-format -msgid "Unable to checkout submodule '$sm_path'" -msgstr "Không thể lấy ra mô-đun-con “$sm_path”" - -#: git-submodule.sh:284 +#: git-submodule.sh:248 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Gặp lỗi khi thêm mô-đun-con “$sm_path”" -#: git-submodule.sh:293 +#: git-submodule.sh:257 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun-con “$sm_path”" -#: git-submodule.sh:568 +#: git-submodule.sh:532 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Không tìm thấy điểm xét duyệt hiện hành trong đường dẫn mô-đun-con " "“$displaypath”" -#: git-submodule.sh:578 +#: git-submodule.sh:542 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:583 +#: git-submodule.sh:547 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -25407,7 +25427,7 @@ msgstr "" "Không thể tìm thấy điểm xét duyệt hiện hành ${remote_name}/${branch} trong " "đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:601 +#: git-submodule.sh:565 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -25416,7 +25436,7 @@ msgstr "" "Không thể lấy về trong đường dẫn mô-đun-con “$displaypath”; thử lấy về trực " "tiếp $sha1:" -#: git-submodule.sh:607 +#: git-submodule.sh:571 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -25425,50 +25445,50 @@ msgstr "" "Đã lấy về từ đường dẫn mô-đun con “$displaypath”, nhưng nó không chứa $sha1. " "Lấy về theo định hướng của lần chuyển giao đó gặp lỗi." -#: git-submodule.sh:614 +#: git-submodule.sh:578 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Không thể lấy ra “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:615 +#: git-submodule.sh:579 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: đã checkout “$sha1”" -#: git-submodule.sh:619 +#: git-submodule.sh:583 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Không thể cải tổ “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:620 +#: git-submodule.sh:584 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: được rebase vào trong “$sha1”" -#: git-submodule.sh:625 +#: git-submodule.sh:589 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Không thể hòa trộn (merge) “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:626 +#: git-submodule.sh:590 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: được hòa trộn vào “$sha1”" -#: git-submodule.sh:631 +#: git-submodule.sh:595 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Thực hiện không thành công lệnh “$command $sha1” trong đường dẫn mô-đun-con " "“$displaypath”" -#: git-submodule.sh:632 +#: git-submodule.sh:596 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: “$command $sha1”" -#: git-submodule.sh:663 +#: git-submodule.sh:627 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$displaypath”" |