diff options
| -rw-r--r-- | po/fr.po | 254 | ||||
| -rw-r--r-- | po/id.po | 323 | ||||
| -rw-r--r-- | po/sv.po | 227 | ||||
| -rw-r--r-- | po/tr.po | 245 | ||||
| -rw-r--r-- | po/vi.po | 281 |
5 files changed, 1013 insertions, 317 deletions
@@ -80,8 +80,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2024-07-17 21:57+0000\n" -"PO-Revision-Date: 2024-07-19 20:25+0200\n" +"POT-Creation-Date: 2024-10-02 16:57+0000\n" +"PO-Revision-Date: 2024-10-04 23:03+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" @@ -628,7 +628,7 @@ msgid "" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" -"p - print the current hunk\n" +"p - print the current hunk, 'P' to use the pager\n" "? - print help\n" msgstr "" "j - laisser cette section non décidée et aller à la suivante non-décidée\n" @@ -639,7 +639,7 @@ msgstr "" "/ - rechercher une section correspondant à une regex donnée\n" "s - découper la section en sections plus petites\n" "e - éditer manuellement la section actuelle\n" -"p - afficher la section actuelle\n" +"p - afficher la section actuelle, 'P' pour utiliser un paginateur\n" "? - afficher l'aide\n" #, c-format @@ -1330,6 +1330,15 @@ msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "" "tenter une fusion à 3 points, revenir à un rustinage normal en cas d'échec" +msgid "for conflicts, use our version" +msgstr "pour les conflits, utiliser notre version (our)" + +msgid "for conflicts, use their version" +msgstr "pour les conflits, utiliser leur version (their)" + +msgid "for conflicts, use a union version" +msgstr "pour les conflits, utiliser l'union des versions" + msgid "build a temporary index based on embedded index information" msgstr "" "construire un index temporaire fondé sur l'information de l'index embarqué" @@ -1380,6 +1389,9 @@ msgstr "préfixer tous les noms de fichier avec <root>" msgid "don't return error for empty patches" msgstr "ne pas renvoyer d'erreur pour les rustines vides" +msgid "--ours, --theirs, and --union require --3way" +msgstr "--ours, --theirs et --union requièrent --3way" + #, c-format msgid "cannot stream blob %s" msgstr "impossible de transmettre le blob %s en flux" @@ -1453,6 +1465,9 @@ msgstr "nom d'objet invalide : %s" msgid "not a tree object: %s" msgstr "objet arbre invalide : %s" +msgid "unable to checkout working tree" +msgstr "impossible d'extraire la copie de travail" + #, c-format msgid "File not found: %s" msgstr "Fichier non trouvé : %s" @@ -2566,9 +2581,6 @@ msgstr "" "Les options supportées sont : --term-good|--term-old et --term-bad|--term-" "new." -msgid "revision walk setup failed\n" -msgstr "échec de la préparation du parcours des révisions\n" - #, c-format msgid "could not open '%s' for appending" msgstr "impossible d'ouvrir '%s' en ajout" @@ -3364,7 +3376,7 @@ msgstr "%s nécessite des arguments" #, c-format msgid "%s takes no arguments" -msgstr "%s n'accepte aucune argument" +msgstr "%s n'accepte aucun argument" msgid "only one batch option may be specified" msgstr "une seule option de traitement ne peut être spécifiée à la fois" @@ -3569,9 +3581,14 @@ msgstr "git check-mailmap [<options>] <contact>..." msgid "also read contacts from stdin" msgstr "lire aussi les contacts depuis l'entrée standard" -#, c-format -msgid "unable to parse contact: %s" -msgstr "impossible d'analyser le contact : %s" +msgid "read additional mailmap entries from file" +msgstr "lire des entrées supplémentaires de mailmap depuis un fichier" + +msgid "blob" +msgstr "blob" + +msgid "read additional mailmap entries from blob" +msgstr "lire des entrées supplémentaires depuis un blob" msgid "no contacts specified" msgstr "aucun contact spécifié" @@ -3929,6 +3946,10 @@ msgid "'%s' cannot be used with switching branches" msgstr "'%s' ne peut pas être utilisé avec un basculement de branches" #, c-format +msgid "'%s' needs the paths to check out" +msgstr "'%s' requiert les chemins à extraire" + +#, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" @@ -4415,9 +4436,6 @@ msgstr "" "la HEAD distante réfère à une référence non existante, impossible de " "l'extraire" -msgid "unable to checkout working tree" -msgstr "impossible d'extraire la copie de travail" - msgid "unable to write parameters to config file" msgstr "impossible d'écrire les paramètres dans le fichier de configuration" @@ -4707,7 +4725,7 @@ msgstr "git commit-tree : échec de la lecture" msgid "" "git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" " [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|" -"reword):]<commit>)]\n" +"reword):]<commit>]\n" " [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n" " [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" " [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" @@ -4718,7 +4736,7 @@ msgstr "" "git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" " [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|" "reword):]<commit>)]\n" -" [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n" +" [-F <fichier> | -m <msg>] [--reset-author] [--allow-empty]\n" " [--allow-empty-message] [--no-verify] [-e] [--author=<auteur>]\n" " [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" " [-i | -o] [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n" @@ -5222,12 +5240,11 @@ msgstr "" msgid "" "git config get [<file-option>] [<display-option>] [--includes] [--all] [--" -"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " -"<name>" +"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>" msgstr "" "git config get [<option-de-fichier>] [<option-d-affichage>] [--includes] [--" -"all] [--regexp=<regexp>] [--value=<valeur>] [--fixed-value] [--" -"default=<défaut>] <name>" +"all] [--regexp] [--value=<valeur>] [--fixed-value] [--default=<défaut>] " +"<name>" msgid "" "git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--" @@ -5258,6 +5275,15 @@ msgstr "" "git config [<option-de-fichier>] --get-colorbool <nom> [<stdout-est-tty>]" msgid "" +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--" +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " +"<name>" +msgstr "" +"git config get [<option-de-fichier>] [<option-d-affichage>] [--includes] [--" +"all] [--regexp=<regexp>] [--value=<valeur>] [--fixed-value] [--" +"default=<défaut>] <name>" + +msgid "" "git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " "[--value=<value>] [--fixed-value] <name> <value>" msgstr "" @@ -6077,8 +6103,8 @@ msgstr "" "'git config fetch.showForcedUpdates false' pour éviter cette vérification\n" #, c-format -msgid "%s did not send all necessary objects\n" -msgstr "%s n'a pas envoyé tous les objets nécessaires\n" +msgid "%s did not send all necessary objects" +msgstr "%s n'a pas envoyé tous les objets nécessaires" #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" @@ -6117,8 +6143,8 @@ msgid "option \"%s\" value \"%s\" is not valid for %s" msgstr "la valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s" #, c-format -msgid "option \"%s\" is ignored for %s\n" -msgstr "l'option \"%s\" est ignorée pour %s\n" +msgid "option \"%s\" is ignored for %s" +msgstr "l'option \"%s\" est ignorée pour %s" #, c-format msgid "%s is not a valid object" @@ -6797,6 +6823,9 @@ msgstr "être plus consciencieux (durée de traitement allongée)" msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" +msgid "perform garbage collection in the background" +msgstr "réaliser le glanage de cellules en arrière plan" + msgid "force running gc even if there may be another gc running" msgstr "" "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes " @@ -6897,6 +6926,9 @@ msgstr "la tâche '%s' ne peut pas être sélectionnée plusieurs fois" msgid "run tasks based on the state of the repository" msgstr "lancer les tâches selon l'état du dépôt" +msgid "perform maintenance in the background" +msgstr "réaliser la maintenance en arrière-plan" + msgid "frequency" msgstr "fréquence" @@ -7776,9 +7808,6 @@ msgstr "" msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" -msgid "unable to create temporary object directory" -msgstr "impossible de créer un répertoire d'objets temporaire" - #, c-format msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" @@ -8365,15 +8394,6 @@ msgstr "utiliser une fusion basée sur diff3" msgid "use a zealous diff3 based merge" msgstr "utiliser une fusion basée sur un diff3 zélée" -msgid "for conflicts, use our version" -msgstr "pour les conflits, utiliser notre version (our)" - -msgid "for conflicts, use their version" -msgstr "pour les conflits, utiliser leur version (their)" - -msgid "for conflicts, use a union version" -msgstr "pour les conflits, utiliser l'ensemble des versions" - msgid "<algorithm>" msgstr "<algorithme>" @@ -8848,6 +8868,9 @@ msgstr "paquet à réutiliser lors du calcul de bitmap de multi-paquet" msgid "write multi-pack bitmap" msgstr "écriture du bitmap de multi-paquet" +msgid "write a new incremental MIDX" +msgstr "écrire un nouveau MIDX incrémental" + msgid "write multi-pack index containing only given indexes" msgstr "écrire l'index multi-paquet ne contenant que les index fournis" @@ -10903,6 +10926,9 @@ msgstr "format de référence invalide : %s" msgid "git refs migrate --ref-format=<format> [--dry-run]" msgstr "git refs migrate --ref-format=<format> [--dry-run]" +msgid "git refs verify [--strict] [--verbose]" +msgstr "git refs verify [--strict] [--verbose]" + msgid "specify the reference format to convert to" msgstr "spécifier le format de réference vers lequel convertir" @@ -10916,6 +10942,12 @@ msgstr "--ref-format=<format> manquant" msgid "repository already uses '%s' format" msgstr "le dépôt utilise déjà le format '%s'" +msgid "enable strict checking" +msgstr "activer une vérification plus strict" + +msgid "'git refs verify' takes no arguments" +msgstr "'git refs verify' n'accepte aucun argument" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -12370,13 +12402,11 @@ msgstr "la référence n'existe pas" msgid "failed to look up reference" msgstr "échec de la recherche de la référence" -msgid "only show tags (can be combined with branches)" -msgstr "" -"afficher seulement les étiquettes (peut être combiné avec les branches)" +msgid "only show tags (can be combined with --branches)" +msgstr "afficher seulement les étiquettes (peut être combiné avec --branches)" -msgid "only show branches (can be combined with tags)" -msgstr "" -"afficher seulement les branches (peut être combiné avec les étiquettes)" +msgid "only show branches (can be combined with --tags)" +msgstr "afficher seulement les branches (peut être combiné avec --tags)" msgid "check for reference existence without resolving" msgstr "vérifier l'existence de la référence sans la résoudre" @@ -12435,6 +12465,10 @@ msgid "failed to create directory for sparse-checkout file" msgstr "" "échec de la création du répertoire pour le fichier d'extraction clairsemée" +#, c-format +msgid "unable to fdopen %s" +msgstr "impossible d'ouvrir %s avec fdopen" + msgid "failed to initialize worktree config" msgstr "échec lors de l'initialisation de la configuration d'arbre de travail" @@ -12904,8 +12938,8 @@ msgid "couldn't hash object from '%s'" msgstr "impossible de calculer l'empreinte de l'objet depuis '%s'" #, c-format -msgid "unexpected mode %o\n" -msgstr "mode %o inattendu\n" +msgid "unexpected mode %o" +msgstr "mode %o inattendu" msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "" @@ -17628,13 +17662,16 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Impossible de créer '%s.lock' : %s" +msgid "unable to create temporary object directory" +msgstr "impossible de créer un répertoire d'objets temporaire" + #, c-format msgid "could not write loose object index %s" msgstr "impossible d'écrire l'objet esseulé %s" #, c-format -msgid "failed to write loose object index %s\n" -msgstr "Échec de l'écriture de l'index d'objet esseulé %s\n" +msgid "failed to write loose object index %s" +msgstr "Échec de l'écriture de l'index d'objet esseulé %s" #, c-format msgid "unexpected line: '%s'" @@ -18190,6 +18227,17 @@ msgstr "impossible de charger le paquet" msgid "could not open index for %s" msgstr "impossible d'ouvrir l'index pour %s" +#, c-format +msgid "unable to link '%s' to '%s'" +msgstr "impossible de lier '%s' à '%s'" + +#, c-format +msgid "failed to clear multi-pack-index at %s" +msgstr "échec du nettoyage de l'index de multi-paquet à %s" + +msgid "cannot write incremental MIDX with bitmap" +msgstr "impossible d'écrire un MIDX incrémental avec des bitmap" + msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "" "index multi-paquet existant ignoré ; non-concordance de la somme de contrôle" @@ -18219,18 +18267,34 @@ msgstr "aucun fichier paquet à l'index." msgid "refusing to write multi-pack .bitmap without any objects" msgstr "refus d'écrire le .bitmap multi-paquet sans aucun objet" +msgid "unable to create temporary MIDX layer" +msgstr "impossible de créer une couche MIDX temporaire" + msgid "could not write multi-pack bitmap" msgstr "impossible d'écrire le bitmap multi-paquet" +msgid "unable to open multi-pack-index chain file" +msgstr "impossible d'ouvrir le fichier d'index multi-paquet" + +msgid "unable to rename new multi-pack-index layer" +msgstr "impossible d'écrire la nouvelle couche de l'index multi-paquet" + msgid "could not write multi-pack-index" msgstr "échec de l'écriture de l'index de multi-paquet" +msgid "cannot expire packs from an incremental multi-pack-index" +msgstr "" +"impossible d'expirer les paquets dpuis un index multi-paquet incrémental" + msgid "Counting referenced objects" msgstr "Comptage des objets référencés" msgid "Finding and deleting unreferenced packfiles" msgstr "Recherche et effacement des fichiers paquets non-référencés" +msgid "cannot repack an incremental multi-pack-index" +msgstr "impossible de ré-empaqueter un index multi-paquet" + msgid "could not start pack-objects" msgstr "impossible de démarrer le groupement d'objets" @@ -18303,6 +18367,28 @@ msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" "index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'" +msgid "multi-pack-index chain file too small" +msgstr "le fichier de chaîne d'index multi-paquet est trop petit" + +#, c-format +msgid "pack count in base MIDX too high: %<PRIuMAX>" +msgstr "nombre de paquets dans la base MIDX trop haut : %<PRIuMAX>" + +#, c-format +msgid "object count in base MIDX too high: %<PRIuMAX>" +msgstr "nombre d'objets dans la base MIDX trop haut : %<PRIuMAX>" + +#, c-format +msgid "invalid multi-pack-index chain: line '%s' not a hash" +msgstr "" +"chaîne d'index multi-paquet invalide : la ligne '%s' n'est pas une empreinte" + +msgid "unable to find all multi-pack index files" +msgstr "impossible de trouver tous les fichiers d'index multi-paquet" + +msgid "invalid MIDX object position, MIDX is likely corrupt" +msgstr "position d'objet MIDX invalide. MIDX est vraisemblablement corrompu" + #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "mauvais pack-int-id : %u (%u paquets au total)" @@ -18321,10 +18407,6 @@ msgstr "" msgid "multi-pack-index large offset out of bounds" msgstr "le grand décalage de l'index-multi-paquet est hors limite" -#, c-format -msgid "failed to clear multi-pack-index at %s" -msgstr "échec du nettoyage de l'index de multi-paquet à %s" - msgid "multi-pack-index file exists, but failed to parse" msgstr "le fichier d'index multi-paquet existe mais n'a pu être analysé" @@ -18534,6 +18616,14 @@ msgid "missing mapping of %s to %s" msgstr "correspondance manquante entre %s et %s" #, c-format +msgid "unable to open %s" +msgstr "impossible d'ouvrir %s" + +#, c-format +msgid "files '%s' and '%s' differ in contents" +msgstr "les fichiers '%s' et '%s' diffèrent par leur contenu" + +#, c-format msgid "unable to write file %s" msgstr "impossible d'écrire le fichier %s" @@ -18619,10 +18709,6 @@ msgid "%s is not a valid '%s' object" msgstr "%s n'est pas un objet '%s' valide" #, c-format -msgid "unable to open %s" -msgstr "impossible d'ouvrir %s" - -#, c-format msgid "hash mismatch for %s (expected %s)" msgstr "incohérence de hachage pour %s (%s attendu)" @@ -19866,6 +19952,10 @@ msgid "expected format: %%(ahead-behind:<committish>)" msgstr "format attendu : %%(ahead-behind:<commit-esque>)" #, c-format +msgid "expected format: %%(is-base:<committish>)" +msgstr "format attendu : %%(is-base:<commit-esque>)" + +#, c-format msgid "malformed field name: %.*s" msgstr "nom de champ malformé %.*s" @@ -20100,6 +20190,13 @@ msgstr "" "normale trouvée" #, c-format +msgid "cannot open directory %s" +msgstr "impossible d'ouvrir le répertoire %s" + +msgid "Checking references consistency" +msgstr "Vérification de la cohérence des références" + +#, c-format msgid "refname is dangerous: %s" msgstr "le nom de réference est dangereux : %s" @@ -20750,13 +20847,17 @@ msgstr "ne télécharger les méta-données que pour la branche qui sera extrait msgid "create repository within 'src' directory" msgstr "Créer un dépôt dans le repertoire 'src'" +msgid "specify if tags should be fetched during clone" +msgstr "" +"spécifier si les étiquettes devraient être récupérées pendant le clonage" + msgid "" "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n" -"\t[--[no-]src] <url> [<enlistment>]" +"\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]" msgstr "" "scalar clone [--single-branch] [--branch <branche-principale>] [--full-" "clone]\n" -"\t[--[no-]src] <url> [<enrôlement>]" +"\t[--[no-]src] [--[no-]tags] <url> [<enrôlement>]" #, c-format msgid "cannot deduce worktree name from '%s'" @@ -20775,6 +20876,10 @@ msgid "could not configure remote in '%s'" msgstr "impossible de paramétrer le distant dans '%s'" #, c-format +msgid "could not disable tags in '%s'" +msgstr "impossible de désactiver les étiquettes dans '%s'" + +#, c-format msgid "could not configure '%s'" msgstr "impossible de configurer '%s'" @@ -21846,6 +21951,10 @@ msgid "failed to stat '%*s%s%s'" msgstr "échec du stat de '%*s%s%s'" #, c-format +msgid "safe.directory '%s' not absolute" +msgstr "safe.directory '%s' n'est pas absolu" + +#, c-format msgid "" "detected dubious ownership in repository at '%s'\n" "%sTo add an exception for this directory, call:\n" @@ -22320,6 +22429,25 @@ msgstr "jeton" msgid "command token to send to the server" msgstr "jeton de commande à envoyer au serveur" +msgid "unit-test [<options>]" +msgstr "unit-test [<options>]" + +msgid "immediately exit upon the first failed test" +msgstr "sortir immédiatement sur le premier échec" + +msgid "suite[::test]" +msgstr "suite[::test]" + +msgid "run only test suite or individual test <suite[::test]>" +msgstr "" +"lancer seulement la suite de test ou le test individuel <suite[::test]>" + +msgid "suite" +msgstr "suite" + +msgid "exclude test suite <suite>" +msgstr "exclure la suite de tests <suite>" + #, c-format msgid "running trailer command '%s' failed" msgstr "échec de la commande trailer '%s'" @@ -23526,6 +23654,9 @@ msgstr "'%s.final' contient le courriel composé.\n" msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases est incompatible avec d'autres options\n" +msgid "--dump-aliases and --translate-aliases are mutually exclusive\n" +msgstr "--dump-aliases et --translate-aliases sont mutuellement exclusifs.\n" + msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -23830,6 +23961,13 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " +#~ msgid "revision walk setup failed\n" +#~ msgstr "échec de la préparation du parcours des révisions\n" + +#, c-format +#~ msgid "unable to parse contact: %s" +#~ msgstr "impossible d'analyser le contact : %s" + #, c-format #~ msgid "truncating .rej filename to %.*s.rej" #~ msgstr "troncature du nom de fichier .rej en %.*s.rej" @@ -23855,10 +23993,6 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " #~ msgstr "aucune URL configurée pour le dépôt distant '%s'" #, c-format -#~ msgid "unable to copy '%s' to '%s'" -#~ msgstr "impossible de copier '%s' vers '%s'" - -#, c-format #~ msgid "remote '%s' has no configured URL" #~ msgstr "le distant '%s' n'a pas d'URL configuré" @@ -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: 2024-07-19 14:03+0700\n" -"PO-Revision-Date: 2024-07-19 14:25+0700\n" +"POT-Creation-Date: 2024-10-04 08:33+0700\n" +"PO-Revision-Date: 2024-10-04 08:52+0700\n" "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n" "Language-Team: Indonesian\n" "Language: id\n" @@ -651,18 +651,20 @@ msgid "" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" -"p - print the current hunk\n" +"p - print the current hunk, 'P' to use the pager\n" "? - print help\n" msgstr "" -"j - biarkan bingkah ini, lihat bingkah berikutnya yang belum diputuskan\n" -"J - biarkan bingkah ini, lihat bingkah berikutnya\n" -"k - biarkan bingkah ini, lihat bingkah sebelumnya yang belum diputuskan\n" -"K - biarkan bingkah ini, lihat bingkah sebelumnya\n" +"j - biarkan bingkah ini tak diputuskan, lihat bingkah berikutnya yang belum " +"diputuskan\n" +"J - biarkan bingkah ini tak diputuskan, lihat bingkah berikutnya\n" +"k - biarkan bingkah ini tak diputuskan, lihat bingkah sebelumnya yang belum " +"diputuskan\n" +"K - biarkan bingkah ini tak diputuskan, lihat bingkah sebelumnya\n" "g - pilih satu bingkah untuk dikunjungi\n" "/ - cari satu bingkah yang cocok dengan regex yang diberikan\n" "s - belah bingkah saat ini ke dalam bingkah yang lebih kecil\n" "e - sunting bingkah saat ini secara manual\n" -"p - lihat bingkah saat ini\n" +"p - lihat bingkah saat ini, 'P' untuk menggunakan pager\n" "? - lihat bantuan\n" #: add-patch.c @@ -1502,6 +1504,18 @@ msgstr "juga terapkan tambalan (gunakan dengan --stat/--summary/--check)" msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "coba penggabungan tiga arah, mundur ke penambalan normal jika gagal" +#: apply.c builtin/merge-file.c +msgid "for conflicts, use our version" +msgstr "untuk konflik, gunakan versi kami" + +#: apply.c builtin/merge-file.c +msgid "for conflicts, use their version" +msgstr "untuk konflik, gunakan versi mereka" + +#: apply.c builtin/merge-file.c +msgid "for conflicts, use a union version" +msgstr "untuk konflik, gunakan versi bersatu" + #: apply.c msgid "build a temporary index based on embedded index information" msgstr "bangun sebuah indeks sementara berdasarkan informasi indeks tertanam" @@ -1563,6 +1577,10 @@ msgstr "tambahkan <akar> di depan semua nama berkas" msgid "don't return error for empty patches" msgstr "jangan kembalikan kesalahan untuk tambalan kosong" +#: apply.c +msgid "--ours, --theirs, and --union require --3way" +msgstr "--ours, --theirs, dan --union memerlukan --3way" + #: archive-tar.c archive-zip.c #, c-format msgid "cannot stream blob %s" @@ -1652,6 +1670,10 @@ msgstr "bukan nama objek valid: %s" msgid "not a tree object: %s" msgstr "bukan objek pohon: %s" +#: archive.c builtin/clone.c +msgid "unable to checkout working tree" +msgstr "tidak dapat men-checkout pohon kerja" + #: archive.c #, c-format msgid "File not found: %s" @@ -1768,7 +1790,7 @@ msgstr "opsi `%s' butuh '%s'" msgid "Unexpected option --output" msgstr "Opsi --output tak diharapkan" -#: archive.c +#: archive.c t/unit-tests/unit-test.c #, c-format msgid "extra command line parameter '%s'" msgstr "parameter konfigurasi tambahan: '%s'" @@ -1840,7 +1862,7 @@ msgid "unable to stat '%s'" msgstr "tidak dapat men-stat '%s'" #: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c -#: builtin/pack-objects.c combine-diff.c rerere.c +#: builtin/pack-objects.c combine-diff.c object-file.c rerere.c #, c-format msgid "unable to read %s" msgstr "tidak dapat membaca %s" @@ -1978,7 +2000,7 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse dan --first-parent bersama-sama butuh komit terbaru yang disebutkan" -#: blame.c builtin/commit.c builtin/log.c builtin/merge.c +#: blame.c builtin/bisect.c builtin/commit.c builtin/log.c builtin/merge.c #: builtin/pack-objects.c builtin/shortlog.c midx-write.c pack-bitmap.c #: remote.c sequencer.c submodule.c msgid "revision walk setup failed" @@ -2239,7 +2261,7 @@ msgstr "latihan" #: builtin/add.c builtin/check-ignore.c builtin/commit.c #: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c -#: builtin/read-tree.c +#: builtin/read-tree.c builtin/refs.c msgid "be verbose" msgstr "jadi berkata-kata" @@ -2738,7 +2760,7 @@ msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c #: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c #: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c -#: builtin/tag.c builtin/verify-tag.c +#: builtin/submodule--helper.c builtin/tag.c builtin/verify-tag.c msgid "format" msgstr "format" @@ -3037,10 +3059,6 @@ msgstr "" "Opsi yang didukung adalah: --term-good|--term-old dan --term-bad|--term-new." #: builtin/bisect.c -msgid "revision walk setup failed\n" -msgstr "setup jalan revisi gagal\n" - -#: builtin/bisect.c #, c-format msgid "could not open '%s' for appending" msgstr "tidak dapat membuka '%s' untuk menambahkan" @@ -4282,9 +4300,16 @@ msgid "also read contacts from stdin" msgstr "juga baca kontak dari masukan standar" #: builtin/check-mailmap.c -#, c-format -msgid "unable to parse contact: %s" -msgstr "tidak dapat menguraikan kontak: %s" +msgid "read additional mailmap entries from file" +msgstr "baca entri mailmap tambahan dari berkas" + +#: builtin/check-mailmap.c +msgid "blob" +msgstr "blob" + +#: builtin/check-mailmap.c +msgid "read additional mailmap entries from blob" +msgstr "baca entri mailmap tambahan dari blob" #: builtin/check-mailmap.c msgid "no contacts specified" @@ -4711,6 +4736,11 @@ msgstr "'%s' tidak dapat digunakan dengan mengganti cabang" #: builtin/checkout.c #, c-format +msgid "'%s' needs the paths to check out" +msgstr "'%s' butuh jalur untuk di-checkout" + +#: builtin/checkout.c +#, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' tidak dapat digunakan dengan '%s'" @@ -5178,7 +5208,7 @@ msgstr "direktori git" msgid "separate git dir from working tree" msgstr "pisahkan direktori git dari pohon kerja" -#: builtin/clone.c builtin/init-db.c +#: builtin/clone.c builtin/init-db.c builtin/submodule--helper.c msgid "specify the reference format to use" msgstr "sebutkan format referensi untuk digunakan" @@ -5276,7 +5306,7 @@ msgstr "gagal membuat tautan '%s'" msgid "failed to copy file to '%s'" msgstr "gagal menyalin berkas ke '%s'" -#: builtin/clone.c +#: builtin/clone.c refs/files-backend.c #, c-format msgid "failed to iterate over '%s'" msgstr "gagal iterasi pada '%s'" @@ -5319,10 +5349,6 @@ msgid "remote HEAD refers to nonexistent ref, unable to checkout" msgstr "HEAD remote merujuk pada ref yang tidak ada, tidak dapat men-checkout" #: builtin/clone.c -msgid "unable to checkout working tree" -msgstr "tidak dapat men-checkout pohon kerja" - -#: builtin/clone.c msgid "unable to write parameters to config file" msgstr "tidak dapat menulis parameter ke berkas konfigurasi" @@ -5342,7 +5368,8 @@ msgstr "Terlalu banyak argumen." msgid "You must specify a repository to clone." msgstr "Anda harus sebutkan repositori untuk diklon." -#: builtin/clone.c builtin/init-db.c builtin/refs.c setup.c +#: builtin/clone.c builtin/init-db.c builtin/refs.c builtin/submodule--helper.c +#: setup.c #, c-format msgid "unknown ref storage format '%s'" msgstr "format penyimpanan referensi tidak dikenal '%s'" @@ -5687,7 +5714,7 @@ msgstr "git commit-tree: gagal membaca" msgid "" "git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" " [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|" -"reword):]<commit>)]\n" +"reword):]<commit>]\n" " [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n" " [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" " [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" @@ -5697,7 +5724,7 @@ msgid "" msgstr "" "git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" " [--dry-run] [(-c | -C | --squash) <komit> | --fixup [(amend|" -"reword):]<komit>)]\n" +"reword):]<komit>]\n" " [-F <berkas> | -m <pesan>] [--reset-author] [--allow-empty]\n" " [--allow-empty-message] [--no-verify] [-e] [--" "author=<pengarang>]\n" @@ -6304,12 +6331,10 @@ msgstr "git config list [<opsi berkas>] [<opsi tampilan>] [--includes]" #: builtin/config.c msgid "" "git config get [<file-option>] [<display-option>] [--includes] [--all] [--" -"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " -"<name>" +"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>" msgstr "" -"git config get [<opsi berkas>] [<opsi tampilan] [--includes] [--all] [--" -"regexp=<regexp> [--value=<nilai>] [--fixed-value] [--default=<default>] " -"<nama>" +"git config get [<opsi berkas>] [<opsi tampilan>] [--includes] [--all] [--" +"regexp] [--value=<nilai>] [--fixed-value] [--default=<default>] <nama>" #: builtin/config.c msgid "" @@ -6345,6 +6370,16 @@ msgstr "git config [<opsi berkas>] --get-colorbool <nama> [<stdout-is-tty>]" #: builtin/config.c msgid "" +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--" +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " +"<name>" +msgstr "" +"git config get [<opsi berkas>] [<opsi tampilan] [--includes] [--all] [--" +"regexp=<regexp> [--value=<nilai>] [--fixed-value] [--default=<default>] " +"<nama>" + +#: builtin/config.c +msgid "" "git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " "[--value=<value>] [--fixed-value] <name> <value>" msgstr "" @@ -7372,8 +7407,8 @@ msgstr "" #: builtin/fetch.c #, c-format -msgid "%s did not send all necessary objects\n" -msgstr "%s tidak mengirim semua objek yang diperlukan\n" +msgid "%s did not send all necessary objects" +msgstr "%s tidak mengirim semua objek yang diperlukan" #: builtin/fetch.c #, c-format @@ -7419,8 +7454,8 @@ msgstr "opsi \"%s\" nilai \"%s\" tidak valid untuk %s" #: builtin/fetch.c #, c-format -msgid "option \"%s\" is ignored for %s\n" -msgstr "opsi \"%s\" diabaikan untuk %s\n" +msgid "option \"%s\" is ignored for %s" +msgstr "opsi \"%s\" diabaikan untuk %s" #: builtin/fetch.c object-file.c #, c-format @@ -8277,6 +8312,10 @@ msgid "enable auto-gc mode" msgstr "aktifkan mode gc otomatis" #: builtin/gc.c +msgid "perform garbage collection in the background" +msgstr "lakukan pengumpulan sampah di latar belakang" + +#: builtin/gc.c msgid "force running gc even if there may be another gc running" msgstr "paksa jalankan gc bahkan jika mungkin ada gc lain yang berjalan" @@ -8397,6 +8436,10 @@ msgid "run tasks based on the state of the repository" msgstr "jalankan tugas berdasarkan keadaan repositori" #: builtin/gc.c +msgid "perform maintenance in the background" +msgstr "lakukan pemeliharaan di latar belakang" + +#: builtin/gc.c msgid "frequency" msgstr "frekuensi" @@ -9503,10 +9546,6 @@ msgid "Final output: %d %s\n" msgstr "Keluaran terakhir: %d %s\n" #: builtin/log.c -msgid "unable to create temporary object directory" -msgstr "tidak dapat membuat direktori objek sementara" - -#: builtin/log.c #, c-format msgid "git show %s: bad file" msgstr "git show %s: berkas jelek" @@ -10246,18 +10285,6 @@ msgstr "gunakan penggabungan berdasarkan diff3" msgid "use a zealous diff3 based merge" msgstr "gunakan penggabungan berdasarkan diff3 yang bersemangat" -#: builtin/merge-file.c -msgid "for conflicts, use our version" -msgstr "untuk konflik, gunakan versi kami" - -#: builtin/merge-file.c -msgid "for conflicts, use their version" -msgstr "untuk konflik, gunakan versi mereka" - -#: builtin/merge-file.c -msgid "for conflicts, use a union version" -msgstr "untuk konflik, gunakan versi bersatu" - #: builtin/merge-file.c diff.c msgid "<algorithm>" msgstr "<algoritma>" @@ -10553,7 +10580,7 @@ msgstr "Tidak dapat menulis indeks." msgid "Not handling anything other than two heads merge." msgstr "Tak tangani apapun selain penggabungan dua kepala." -#: builtin/merge.c +#: builtin/merge.c builtin/sparse-checkout.c #, c-format msgid "unable to write %s" msgstr "tidak dapat menulis %s" @@ -10853,6 +10880,10 @@ msgid "write multi-pack bitmap" msgstr "tulis bitmap multipak" #: builtin/multi-pack-index.c +msgid "write a new incremental MIDX" +msgstr "tulis MIDX tambahan baru" + +#: builtin/multi-pack-index.c msgid "write multi-pack index containing only given indexes" msgstr "tulis indeks multipak yang hanya berisi indeks yang diberikan" @@ -13337,6 +13368,10 @@ msgid "git refs migrate --ref-format=<format> [--dry-run]" msgstr "git refs migrate --ref-format=<format> [--dry-run]" #: builtin/refs.c +msgid "git refs verify [--strict] [--verbose]" +msgstr "git refs verify [--strict] [---verbose]" + +#: builtin/refs.c msgid "specify the reference format to convert to" msgstr "sebutkan format referensi untuk dikonversi" @@ -13353,6 +13388,14 @@ msgstr "--ref-format=<format> hilang" msgid "repository already uses '%s' format" msgstr "repositori telah menggunakan format '%s'" +#: builtin/refs.c +msgid "enable strict checking" +msgstr "aktifkan pemeriksaan lebih ketat" + +#: builtin/refs.c +msgid "'git refs verify' takes no arguments" +msgstr "'git refs verify' tidak mengambil argumen" + #: builtin/remote.c msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" @@ -15156,12 +15199,12 @@ msgid "failed to look up reference" msgstr "gagal mencari referensi" #: builtin/show-ref.c -msgid "only show tags (can be combined with branches)" -msgstr "hanya perlihatkan tag (bisa dikombinasikan dengan cabang)" +msgid "only show tags (can be combined with --branches)" +msgstr "hanya perlihatkan tag (bisa dikombinasikan dengan --branches)" #: builtin/show-ref.c -msgid "only show branches (can be combined with tags)" -msgstr "hanya perlihatkan cabang (bisa dikombinasikan dengan tag)" +msgid "only show branches (can be combined with --tags)" +msgstr "hanya perlihatkan cabang (bisa dikombinasikan dengan --tags)" #: builtin/show-ref.c msgid "check for reference existence without resolving" @@ -15228,6 +15271,11 @@ msgid "failed to create directory for sparse-checkout file" msgstr "gagal membuat direktori untuk berkas sparse-checkout" #: builtin/sparse-checkout.c +#, c-format +msgid "unable to fdopen %s" +msgstr "tidak dapat membuka (fdopen) %s" + +#: builtin/sparse-checkout.c msgid "failed to initialize worktree config" msgstr "gagal menginisialisasi konfigurasi pohon kerja" @@ -15797,8 +15845,8 @@ msgstr "tidak dapat hash objek dari '%s'" #: builtin/submodule--helper.c #, c-format -msgid "unexpected mode %o\n" -msgstr "mode tidak diharapkan %o\n" +msgid "unexpected mode %o" +msgstr "mode tidak diharapkan %o" #: builtin/submodule--helper.c msgid "use the commit stored in the index instead of the submodule HEAD" @@ -18519,7 +18567,7 @@ msgstr "gagal menulis jumlah id grafik dasar yang benar" msgid "unable to create temporary graph layer" msgstr "tidak dapat membuat lapisan grafik dasar" -#: commit-graph.c +#: commit-graph.c midx-write.c #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "tidak dapat menyesuaikan perizinan berbagi untuk '%s'" @@ -19894,7 +19942,7 @@ msgstr "" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Nilai tidak dikenal untuk variabel konfigurasi 'diff.submodule': '%s'" -#: diff.c transport.c +#: diff.c merge-recursive.c transport.c #, c-format msgid "unknown value for config '%s': %s" msgstr "nilai tidak dikenal untuk konfigurasi '%s': %s" @@ -21529,6 +21577,10 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Tidak dapat membuat '%s.lock': %s" +#: log-tree.c +msgid "unable to create temporary object directory" +msgstr "tidak dapat membuat direktori objek sementara" + #: loose.c #, c-format msgid "could not write loose object index %s" @@ -21536,8 +21588,8 @@ msgstr "tidak dapat menulis indeks objek longgar %s" #: loose.c #, c-format -msgid "failed to write loose object index %s\n" -msgstr "gagal menulis indeks objek longgar %s\n" +msgid "failed to write loose object index %s" +msgstr "gagal menulis indeks objek longgar %s" #: ls-refs.c #, c-format @@ -22201,6 +22253,20 @@ msgid "could not open index for %s" msgstr "tidak dapat membuka indeks untuk %s" #: midx-write.c +#, c-format +msgid "unable to link '%s' to '%s'" +msgstr "tidak dapat mentautkan '%s' ke '%s'" + +#: midx-write.c midx.c +#, c-format +msgid "failed to clear multi-pack-index at %s" +msgstr "gagal membersihkan indeks multipak pada %s" + +#: midx-write.c +msgid "cannot write incremental MIDX with bitmap" +msgstr "tidak dapat menulis MIDX tambahan dengan bitmap" + +#: midx-write.c msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "abaikan indeks multipak yang sudah ada; checksum tidak cocok" @@ -22237,14 +22303,30 @@ msgid "refusing to write multi-pack .bitmap without any objects" msgstr "menolak menulis .bitmap multipak tanpa objek apapun" #: midx-write.c +msgid "unable to create temporary MIDX layer" +msgstr "tidak dapat membuat lapisan MIDX sementara" + +#: midx-write.c msgid "could not write multi-pack bitmap" msgstr "tidak dapat menulis bitmap multipak" #: midx-write.c +msgid "unable to open multi-pack-index chain file" +msgstr "tidak dapat membuka berkas rantai indeks multipak" + +#: midx-write.c +msgid "unable to rename new multi-pack-index layer" +msgstr "tidak dapat menamai ulang lapisan indeks multipak baru" + +#: midx-write.c msgid "could not write multi-pack-index" msgstr "gagal menulis indeks multipak" #: midx-write.c +msgid "cannot expire packs from an incremental multi-pack-index" +msgstr "tidak dapat mengkadaluarsakan pak dari indeks multipak tambahan" + +#: midx-write.c msgid "Counting referenced objects" msgstr "Menghitung objek tereferensi" @@ -22253,6 +22335,10 @@ msgid "Finding and deleting unreferenced packfiles" msgstr "Mencari dan menghapus berkas pak tak tereferensi" #: midx-write.c +msgid "cannot repack an incremental multi-pack-index" +msgstr "tidak dapat mempak ulang indeks multipak tambahan" + +#: midx-write.c msgid "could not start pack-objects" msgstr "tidak dapat memulai pack-objects" @@ -22329,6 +22415,33 @@ msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "nama pak indeks multipak tidak berurutan: '%s' sebelum '%s'" #: midx.c +msgid "multi-pack-index chain file too small" +msgstr "berkas rantai indeks multipak terlalu kecil" + +#: midx.c +#, c-format +msgid "pack count in base MIDX too high: %<PRIuMAX>" +msgstr "jumlah pak pada MIDX dasarterlalu tinggi: %<PRIuMAX>" + +#: midx.c +#, c-format +msgid "object count in base MIDX too high: %<PRIuMAX>" +msgstr "jumlah object pada MIDX dasar terlalu tinggi: %<PRIuMAX>" + +#: midx.c +#, c-format +msgid "invalid multi-pack-index chain: line '%s' not a hash" +msgstr "rantai indeks multipak tidak valid: baris '%s' bukan suatu hash" + +#: midx.c +msgid "unable to find all multi-pack index files" +msgstr "tidak dapat menemukan semua berkas indeks multipak" + +#: midx.c +msgid "invalid MIDX object position, MIDX is likely corrupt" +msgstr "posisi objek MIDX tidak valid, MIDX mungkin rusak" + +#: midx.c #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "pack-int-id jelek: %u (total pak %u)" @@ -22351,11 +22464,6 @@ msgid "multi-pack-index large offset out of bounds" msgstr "offset indeks multipak besar di luar jangkauan" #: midx.c -#, c-format -msgid "failed to clear multi-pack-index at %s" -msgstr "gagal membersihkan indeks multipak pada %s" - -#: midx.c msgid "multi-pack-index file exists, but failed to parse" msgstr "berkas indeks multipak ada, tetapi gagal diurai" @@ -22616,6 +22724,16 @@ msgstr "pemetaan %s ke %s hilang" #: object-file.c #, c-format +msgid "unable to open %s" +msgstr "tidak dapat membuka %s" + +#: object-file.c +#, c-format +msgid "files '%s' and '%s' differ in contents" +msgstr "berkas '%s' dan '%s' berbeda konteks" + +#: object-file.c +#, c-format msgid "unable to write file %s" msgstr "tidak dapat menulis berkas %s" @@ -22724,11 +22842,6 @@ msgstr "%s bukan sebuah objek '%s' valid" #: object-file.c #, c-format -msgid "unable to open %s" -msgstr "tidak dapat membuka %s" - -#: object-file.c -#, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash tidak cocok untuk %s (diharapkan %s)" @@ -24215,6 +24328,11 @@ msgstr "format yang diharapkan: %%(ahead-behind:<mirip komit>)" #: ref-filter.c #, c-format +msgid "expected format: %%(is-base:<committish>)" +msgstr "format yang diharapkan: %%(is-base:<mirip komit>)" + +#: ref-filter.c +#, c-format msgid "malformed field name: %.*s" msgstr "nama bidang rusak: %.*s" @@ -24502,6 +24620,15 @@ msgstr "" "tidak dapat mengunci referensi '%s': diharapkan referensi simbolik dengan " "target '%s': tetapi bukan referensi reguler" +#: refs/files-backend.c +#, c-format +msgid "cannot open directory %s" +msgstr "tidak dapat membuka direktori %s" + +#: refs/files-backend.c +msgid "Checking references consistency" +msgstr "Memeriksa konsistensi referensi" + #: refs/reftable-backend.c #, c-format msgid "refname is dangerous: %s" @@ -25290,12 +25417,16 @@ msgid "create repository within 'src' directory" msgstr "salin repositori di dalam direktori 'src'" #: scalar.c +msgid "specify if tags should be fetched during clone" +msgstr "rincikan jikan tag hendak diambil selama kloning" + +#: scalar.c msgid "" "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n" -"\t[--[no-]src] <url> [<enlistment>]" +"\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]" msgstr "" "scalar clone [--single-branch] [--branch <cabang utama>] [--full-clone]\n" -"\t[--[-no-]src] <url> [<pendaftaran>]" +"\t[--[-no-]src] [--[no-]tags] <url> [<pendaftaran>]" #: scalar.c #, c-format @@ -25319,6 +25450,11 @@ msgstr "tidak dapat menyetel remote di '%s'" #: scalar.c #, c-format +msgid "could not disable tags in '%s'" +msgstr "tidak dapat menonaktifkan tag di '%s'" + +#: scalar.c +#, c-format msgid "could not configure '%s'" msgstr "tidak dapat menyetel '%s'" @@ -26608,6 +26744,11 @@ msgstr "gagal men-stat '%*s%s%s'" #: setup.c #, c-format +msgid "safe.directory '%s' not absolute" +msgstr "safe.directory '%s' bukan mutlak" + +#: setup.c +#, c-format msgid "" "detected dubious ownership in repository at '%s'\n" "%sTo add an exception for this directory, call:\n" @@ -27181,6 +27322,30 @@ msgstr "token" msgid "command token to send to the server" msgstr "token perintah untuk dikirim ke peladen" +#: t/unit-tests/unit-test.c +msgid "unit-test [<options>]" +msgstr "unit-test [<opsi>]" + +#: t/unit-tests/unit-test.c +msgid "immediately exit upon the first failed test" +msgstr "langsung keluar pada saat kegagalan tes pertama" + +#: t/unit-tests/unit-test.c +msgid "suite[::test]" +msgstr "suite[::test]" + +#: t/unit-tests/unit-test.c +msgid "run only test suite or individual test <suite[::test]>" +msgstr "hanya jalankan rangkaian tes atau tes individu <suite[::test]>" + +#: t/unit-tests/unit-test.c +msgid "suite" +msgstr "rangkaian" + +#: t/unit-tests/unit-test.c +msgid "exclude test suite <suite>" +msgstr "kecualikan rangkaian tes <rangkaian>" + #: trailer.c #, c-format msgid "running trailer command '%s' failed" @@ -28630,6 +28795,10 @@ msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases tidak kompatibel dengan opsi yang lain\n" #: git-send-email.perl +msgid "--dump-aliases and --translate-aliases are mutually exclusive\n" +msgstr "--dump-aliases dan --translate-aliases saling eksklusif\n" + +#: git-send-email.perl msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.46.0\n" +"Project-Id-Version: git 2.47.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2024-07-20 21:56+0100\n" -"PO-Revision-Date: 2024-07-21 14:53+0100\n" +"POT-Creation-Date: 2024-09-19 02:06+0000\n" +"PO-Revision-Date: 2024-09-28 15:45+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -542,7 +542,7 @@ msgid "" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" -"p - print the current hunk\n" +"p - print the current hunk, 'P' to use the pager\n" "? - print help\n" msgstr "" "j - lämna stycket obestämt, se nästa obestämda stycke\n" @@ -553,7 +553,7 @@ msgstr "" "/ - sök efter stycke som motsvarar angivet reguljärt uttryck\n" "s - dela aktuellt stycke i mindre styckens\n" "e - redigera aktuellt stycke manuellt\n" -"p - visa aktuellt stycke\n" +"p - visa aktuellt stycke, ”P” för att använda bläddrare\n" "? - visa hjälp\n" #, c-format @@ -664,7 +664,7 @@ msgstr "" "som lämpligt för att ange lösning och checka in." msgid "Exiting because of an unresolved conflict." -msgstr "Avslutar på grund av olöst konflikgt." +msgstr "Avslutar på grund av olöst konflikt." msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." @@ -1229,6 +1229,15 @@ msgstr "" "försök en trevägssammanslagning, fall tillbaka på normal patch om det " "misslyckas" +msgid "for conflicts, use our version" +msgstr "för konflikter, använd vår version" + +msgid "for conflicts, use their version" +msgstr "för konflikter, använd deras version" + +msgid "for conflicts, use a union version" +msgstr "för konflikter, använd en förenad version" + msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" @@ -1274,6 +1283,9 @@ msgstr "lägg till <rot> i alla filnamn" msgid "don't return error for empty patches" msgstr "ge inte någon felkod för tomma patchar" +msgid "--ours, --theirs, and --union require --3way" +msgstr "--ours, --theirs, och --union kräver --3way" + #, c-format msgid "cannot stream blob %s" msgstr "kan inte strömma blob:en %s" @@ -2440,9 +2452,6 @@ msgstr "" "ogiltigt argument %s för ”git bisect terms”.\n" "Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new." -msgid "revision walk setup failed\n" -msgstr "misslyckades starta revisionstraversering\n" - #, c-format msgid "could not open '%s' for appending" msgstr "kunde inte öppna ”%s” för tillägg" @@ -3414,9 +3423,14 @@ msgstr "git check-mailmap [<flaggor>] <kontakt>..." msgid "also read contacts from stdin" msgstr "läs även kontakter från standard in" -#, c-format -msgid "unable to parse contact: %s" -msgstr "kan inte tolka kontakt: %s" +msgid "read additional mailmap entries from file" +msgstr "läs ytterligare mailmap-poster från fil" + +msgid "blob" +msgstr "blob" + +msgid "read additional mailmap entries from blob" +msgstr "läs ytterligare mailmap-poster från blob" msgid "no contacts specified" msgstr "inga kontakter angavs" @@ -3765,6 +3779,10 @@ msgid "'%s' cannot be used with switching branches" msgstr "”%s” kan inte användas vid byte av gren" #, c-format +msgid "'%s' needs the paths to check out" +msgstr "”%s” behöver sökvägar att checka ut" + +#, c-format msgid "'%s' cannot be used with '%s'" msgstr "”%s” kan inte användas med ”%s”" @@ -4521,7 +4539,7 @@ msgstr "git commit-tree: misslyckades läsa" msgid "" "git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" " [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|" -"reword):]<commit>)]\n" +"reword):]<commit>]\n" " [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n" " [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" " [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" @@ -4531,7 +4549,7 @@ msgid "" msgstr "" "git commit [-a | --interactive | --patch] [-s] [-v] [-u<läge>] [--amend]\n" " [--dry-run] [(-c | -C | --squash) <incheckning> | --fixup [(amend|" -"reword):]<incheckning>)]\n" +"reword):]<incheckning>]\n" " [-F <fil> | -m <medd>] [--reset-author] [--allow-empty]\n" " [--allow-empty-message] [--no-verify] [-e] [--" "author=<författare>]\n" @@ -5022,12 +5040,10 @@ msgstr "git config list [<filflagga>] [<visningsflagga>] [--includes]" msgid "" "git config get [<file-option>] [<display-option>] [--includes] [--all] [--" -"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " -"<name>" +"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>" msgstr "" "git config get [<filflagga>] [<visningsflagga>] [--includes] [--all] [--" -"regexp=<reguttr>] [--value=<värde>] [--fixed-value] [--default=<förval>] " -"<namn>" +"regexp] [--value=<värde>] [--fixed-value] [--default=<förval>] <namn>" msgid "" "git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--" @@ -5056,6 +5072,15 @@ msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]" msgstr "git config [<filflagga>] --get-colorbool <namn> [<stdout-är-tty>]" msgid "" +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--" +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " +"<name>" +msgstr "" +"git config get [<filflagga>] [<visningsflagga>] [--includes] [--all] [--" +"regexp=<reguttr>] [--value=<värde>] [--fixed-value] [--default=<förval>] " +"<namn>" + +msgid "" "git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " "[--value=<value>] [--fixed-value] <name> <value>" msgstr "" @@ -5853,8 +5878,8 @@ msgstr "" "false” för att undvika testet\n" #, c-format -msgid "%s did not send all necessary objects\n" -msgstr "%s sände inte alla nödvändiga objekt\n" +msgid "%s did not send all necessary objects" +msgstr "%s sände inte alla nödvändiga objekt" #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" @@ -5891,8 +5916,8 @@ msgid "option \"%s\" value \"%s\" is not valid for %s" msgstr "flaggan ”%s” med värdet ”%s” är inte giltigt för %s" #, c-format -msgid "option \"%s\" is ignored for %s\n" -msgstr "flaggan ”%s” ignoreras för %s\n" +msgid "option \"%s\" is ignored for %s" +msgstr "flaggan ”%s” ignoreras för %s" #, c-format msgid "%s is not a valid object" @@ -6568,6 +6593,9 @@ msgstr "var mer grundlig (ökar körtiden)" msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" +msgid "perform garbage collection in the background" +msgstr "utför skräpsamling i bakgrunden" + msgid "force running gc even if there may be another gc running" msgstr "tvinga gc-körning även om en annan gc kanske körs" @@ -6664,6 +6692,9 @@ msgstr "uppgiften ”%s” kan inte väljas flera gånger" msgid "run tasks based on the state of the repository" msgstr "kör uppgifter baserad på arkivets tillstånd" +msgid "perform maintenance in the background" +msgstr "utför underhåll i bakgrunden" + msgid "frequency" msgstr "frekvens" @@ -7521,9 +7552,6 @@ msgstr "-L<intervall>:<fil> kan inte användas med sökvägsspecifikation" msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -msgid "unable to create temporary object directory" -msgstr "kan inte skapa temporär objektkatalog" - #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" @@ -8080,15 +8108,6 @@ msgstr "använd diff3-baserad sammanslagning" msgid "use a zealous diff3 based merge" msgstr "använd nitisk diff3-baserad sammanslagning" -msgid "for conflicts, use our version" -msgstr "för konflikter, använd vår version" - -msgid "for conflicts, use their version" -msgstr "för konflikter, använd deras version" - -msgid "for conflicts, use a union version" -msgstr "för konflikter, använd en förenad version" - msgid "<algorithm>" msgstr "<algoritm>" @@ -8553,6 +8572,9 @@ msgstr "paket att återanvända vid beräkning av multipaketsbitkarta" msgid "write multi-pack bitmap" msgstr "skriv flerpaketsbitkarta" +msgid "write a new incremental MIDX" +msgstr "skriv en ny inkrementell MIDX" + msgid "write multi-pack index containing only given indexes" msgstr "skriv flerpaketsindex som endast innehåller angivna index" @@ -10546,6 +10568,9 @@ msgstr "felaktigt referensformat: %s" msgid "git refs migrate --ref-format=<format> [--dry-run]" msgstr "git refs migrate --ref-format=<format> [--dry-run]" +msgid "git refs verify [--strict] [--verbose]" +msgstr "git refs verify [--strict] [--verbose]" + msgid "specify the reference format to convert to" msgstr "ange referensformatet att konvertera till" @@ -10559,6 +10584,12 @@ msgstr "saknad --ref-format=<format>" msgid "repository already uses '%s' format" msgstr "arkivet använder redan ”%s”-format" +msgid "enable strict checking" +msgstr "aktivera strikt kontroll" + +msgid "'git refs verify' takes no arguments" +msgstr "”git refs verify” tar inget argument" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -11978,11 +12009,11 @@ msgstr "referensen existerar inte" msgid "failed to look up reference" msgstr "misslyckades slå upp referensen" -msgid "only show tags (can be combined with branches)" -msgstr "visa endast taggar (kan kombineras med grenar)" +msgid "only show tags (can be combined with --branches)" +msgstr "visa endast taggar (kan kombineras med --branches)" -msgid "only show branches (can be combined with tags)" -msgstr "visa endast grenar (kan kombineras med taggar)" +msgid "only show branches (can be combined with --tags)" +msgstr "visa endast grenar (kan kombineras med --tags)" msgid "check for reference existence without resolving" msgstr "kontrollerar att referensen existerar utan att slå upp dem" @@ -12034,6 +12065,10 @@ msgstr "misslyckades ta bort katalogen ”%s”" msgid "failed to create directory for sparse-checkout file" msgstr "misslyckades skapa katalog för ”sparse-checkout”-filen" +#, c-format +msgid "unable to fdopen %s" +msgstr "kan inte utföra fdopen %s" + msgid "failed to initialize worktree config" msgstr "misslyckades initiera arbetskataloginställning" @@ -12485,8 +12520,8 @@ msgid "couldn't hash object from '%s'" msgstr "kunde inte hasha objekt från ”%s”" #, c-format -msgid "unexpected mode %o\n" -msgstr "okänt läge %o\n" +msgid "unexpected mode %o" +msgstr "okänt läge %o" msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "använd incechkning lagrad i indexet istället för undermodulens HEAD" @@ -17031,13 +17066,16 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Kunde inte skapa ”%s.lock”: %s" +msgid "unable to create temporary object directory" +msgstr "kan inte skapa temporär objektkatalog" + #, c-format msgid "could not write loose object index %s" msgstr "kunde inte skriva löst objektindex %s" #, c-format -msgid "failed to write loose object index %s\n" -msgstr "misslyckades skriva löst objektindex %s\n" +msgid "failed to write loose object index %s" +msgstr "misslyckades skriva löst objektindex %s" #, c-format msgid "unexpected line: '%s'" @@ -17586,6 +17624,17 @@ msgstr "kunde inte läsa paket{" msgid "could not open index for %s" msgstr "kunde inte öppna indexet för %s" +#, c-format +msgid "unable to link '%s' to '%s'" +msgstr "kan inte länka ”%s” till ”%s”" + +#, c-format +msgid "failed to clear multi-pack-index at %s" +msgstr "misslyckades städa multi-pack-index på %s" + +msgid "cannot write incremental MIDX with bitmap" +msgstr "kan inte skriva inkrementell MIDX med bitkarta" + msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma" @@ -17614,18 +17663,33 @@ msgstr "inga paketfiler att indexera." msgid "refusing to write multi-pack .bitmap without any objects" msgstr "kunde inte skriva fler-paketsbitkarta utan några objekt" +msgid "unable to create temporary MIDX layer" +msgstr "kan inte skapa temporärt MIDX-lager" + msgid "could not write multi-pack bitmap" msgstr "kunde inte skriva fler-paketsbitkarta" +msgid "unable to open multi-pack-index chain file" +msgstr "kan inte öppna kedjefil för multi-pack-index" + +msgid "unable to rename new multi-pack-index layer" +msgstr "kan inte byta namn på nytt multi-pack-index-lager" + msgid "could not write multi-pack-index" msgstr "kunde inte skriva flerpakets-index" +msgid "cannot expire packs from an incremental multi-pack-index" +msgstr "kan inte låta tid gå ut för paket från inkrementellt multi-pack-index" + msgid "Counting referenced objects" msgstr "Räknar refererade objekt" msgid "Finding and deleting unreferenced packfiles" msgstr "Ser efter och tar bort orefererade packfiler" +msgid "cannot repack an incremental multi-pack-index" +msgstr "kunde packa om ett inkrementellt multi-pack-index" + msgid "could not start pack-objects" msgstr "kunde inte starta pack-objects" @@ -17687,6 +17751,27 @@ msgstr "paketnamnstycke för multi-pack-index är för kort" msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "paketnamn för multi-pack-index i fel ordning: ”%s” före ”%s”" +msgid "multi-pack-index chain file too small" +msgstr "kedjefilen för multi-pack-index är för liten" + +#, c-format +msgid "pack count in base MIDX too high: %<PRIuMAX>" +msgstr "antalet paket i bas-MIDX för högt: %<PRIuMAX>" + +#, c-format +msgid "object count in base MIDX too high: %<PRIuMAX>" +msgstr "antalet object i bas-MIDX för högt: %<PRIuMAX>" + +#, c-format +msgid "invalid multi-pack-index chain: line '%s' not a hash" +msgstr "ogiltig kedja för multi-pack-index: raden ”%s” är inte ett hash-värde" + +msgid "unable to find all multi-pack index files" +msgstr "kan inte hitta alla indexfiler för multi-pack" + +msgid "invalid MIDX object position, MIDX is likely corrupt" +msgstr "ogiltig MIDX-objektposition, MIDX är troligtvis trasig" + #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "bad pack-int-id: %u (%u paket totalt)" @@ -17704,10 +17789,6 @@ msgstr "multi-pack-index innehåller 64-bitars offset, men off_t är för liten" msgid "multi-pack-index large offset out of bounds" msgstr "stort offset för mult-pack-index utanför gränsen" -#, c-format -msgid "failed to clear multi-pack-index at %s" -msgstr "misslyckades städa multi-pack-index på %s" - msgid "multi-pack-index file exists, but failed to parse" msgstr "multi-pack-indexfilen finns, men kunde inte tolkas" @@ -19219,6 +19300,10 @@ msgid "expected format: %%(ahead-behind:<committish>)" msgstr "förväntat format: %%(ahead-behind:<incheckning-igt>)" #, c-format +msgid "expected format: %%(is-base:<committish>)" +msgstr "förväntat format: %%(is-base:<incheckning-igt>)" + +#, c-format msgid "malformed field name: %.*s" msgstr "felformat fältnamn: %.*s" @@ -19451,6 +19536,13 @@ msgstr "" "men är en vanlig referens" #, c-format +msgid "cannot open directory %s" +msgstr "kunde inte öppna katalogen %s" + +msgid "Checking references consistency" +msgstr "Kontrollerar konsistens för referenser" + +#, c-format msgid "refname is dangerous: %s" msgstr "refnamnet är farligt: %s" @@ -20077,12 +20169,15 @@ msgstr "hämta endast metadata för grenen som skall checkas ut" msgid "create repository within 'src' directory" msgstr "skapa arkiv inuti katalogen ”src”" +msgid "specify if tags should be fetched during clone" +msgstr "ange om taggar ska hämtas vid kloning" + msgid "" "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n" -"\t[--[no-]src] <url> [<enlistment>]" +"\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]" msgstr "" "scalar clone [--single-branch] [--branch <huvudgren>] [--full-clone]\n" -"\t[--[no-]src] <url> [<enrollering>]" +"\t[--[no-]src] [--[no-]tags] <url> [<enrollering>]" #, c-format msgid "cannot deduce worktree name from '%s'" @@ -20101,6 +20196,10 @@ msgid "could not configure remote in '%s'" msgstr "kunde inte ställa in fjärr i ”%s”" #, c-format +msgid "could not disable tags in '%s'" +msgstr "kunde inte inaktivera taggar i ”%s”" + +#, c-format msgid "could not configure '%s'" msgstr "kunde inte ställa in ”%s”" @@ -21162,6 +21261,10 @@ msgid "failed to stat '%*s%s%s'" msgstr "misslyckades ta status på ”%*ss%s%s”" #, c-format +msgid "safe.directory '%s' not absolute" +msgstr "safe.directory ”%s” är inte absolut" + +#, c-format msgid "" "detected dubious ownership in repository at '%s'\n" "%sTo add an exception for this directory, call:\n" @@ -21624,6 +21727,24 @@ msgstr "igenkänningstecken" msgid "command token to send to the server" msgstr "igenkänningstecken för kommando att sända till servern" +msgid "unit-test [<options>]" +msgstr "unit-test [<flaggor>]" + +msgid "immediately exit upon the first failed test" +msgstr "avsluta omedelbart vid det första misslyckade testet" + +msgid "suite[::test]" +msgstr "svit[::test]" + +msgid "run only test suite or individual test <suite[::test]>" +msgstr "kör endast testsviten eller individuella testet <svit[::test]>" + +msgid "suite" +msgstr "svit" + +msgid "exclude test suite <suite>" +msgstr "uteslut testsviten <svit>" + #, c-format msgid "running trailer command '%s' failed" msgstr "misslyckades utföra släpradskommandot ”%s”" @@ -22793,6 +22914,9 @@ msgstr "”%s.final” innehåller det skrivna brevet.\n" msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases är inkompatibelt med andra flaggor\n" +msgid "--dump-aliases and --translate-aliases are mutually exclusive\n" +msgstr "--dump-aliases och --translate-aliases är ömsesidigt utelsutande\n" + msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -23093,3 +23217,10 @@ msgstr "" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " + +#~ msgid "revision walk setup failed\n" +#~ msgstr "misslyckades starta revisionstraversering\n" + +#, c-format +#~ msgid "unable to parse contact: %s" +#~ msgstr "kan inte tolka kontakt: %s" @@ -96,8 +96,8 @@ msgid "" msgstr "" "Project-Id-Version: Git Turkish Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2024-07-19 13:59+0300\n" -"PO-Revision-Date: 2024-07-19 14:00+0300\n" +"POT-Creation-Date: 2024-10-03 06:52+0300\n" +"PO-Revision-Date: 2024-10-03 07:00+0300\n" "Last-Translator: Emir SARI <emir_sari@icloud.com>\n" "Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n" "Language: tr\n" @@ -632,7 +632,7 @@ msgid "" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" -"p - print the current hunk\n" +"p - print the current hunk, 'P' to use the pager\n" "? - print help\n" msgstr "" "j - bu parça için sonra karar ver, bir sonraki karar verilmemiş parçayı gör\n" @@ -642,8 +642,8 @@ msgstr "" "g - gidilecek bir parça seç\n" "/ - verilen düzenli ifade ile eşleşen bir parça ara\n" "s - geçerli parçayı daha ufak parçalara böl\n" -"e - geçerli parçayı el ile düzenle\n" -"p - geçerli parçalı yazdır\n" +"e - geçerli parçayı elle düzenle\n" +"p - geçerli parçalı yazdır, sayfalayıcı için 'P' kullan\n" "? - yardımı yazdır\n" #, c-format @@ -1314,6 +1314,15 @@ msgstr "ek olarak yamayı da uygula (--stat/--summary/--check ile kullan)" msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "3 yönlü birleştirme dene, başarısız olursa normal yamaya geri çekil" +msgid "for conflicts, use our version" +msgstr "çakışmalarda bizim sürümü kullan" + +msgid "for conflicts, use their version" +msgstr "çakışmalarda onların sürümünü kullan" + +msgid "for conflicts, use a union version" +msgstr "çakışmalarda birlik olmuş bir sürüm kullan" + msgid "build a temporary index based on embedded index information" msgstr "gömülü indeks bilgisini temel alan geçici bir indeks oluştur" @@ -1359,6 +1368,9 @@ msgstr "tüm dosya adlarının başına <kök> ekle" msgid "don't return error for empty patches" msgstr "boş yamalar için hata döndürme" +msgid "--ours, --theirs, and --union require --3way" +msgstr "--ours, --theirs ve --union; --3way gerektiriyor" + #, c-format msgid "cannot stream blob %s" msgstr "%s ikili nesnesi akıtılamıyor" @@ -1429,6 +1441,9 @@ msgstr "geçerli bir nesne adı değil: %s" msgid "not a tree object: %s" msgstr "bir ağaç nesnesi değil: %s" +msgid "unable to checkout working tree" +msgstr "çalışma ağacı çıkış yapılamıyor" + #, c-format msgid "File not found: %s" msgstr "Dosya bulunamadı: %s" @@ -2531,9 +2546,6 @@ msgstr "" "'git bisect terms' için geçersiz argüman %s.\n" "Desteklenen seçenekler: --term-good|--term-old ve --term-bad|--term-new." -msgid "revision walk setup failed\n" -msgstr "revizyonda gezinme ayarlaması başarısız oldu\n" - #, c-format msgid "could not open '%s' for appending" msgstr "'%s' iliştirme için açılamadı" @@ -3508,9 +3520,14 @@ msgstr "git check-mailmap [<seçenekler>] <kişi>..." msgid "also read contacts from stdin" msgstr "stdin'den kişileri de oku" -#, c-format -msgid "unable to parse contact: %s" -msgstr "kişi ayrıştırılamadı: %s" +msgid "read additional mailmap entries from file" +msgstr "dosyadan ek mailmap girdilerini oku" + +msgid "blob" +msgstr "ikili nesne" + +msgid "read additional mailmap entries from blob" +msgstr "ikili nesneden ek mailmap girdilerini oku" msgid "no contacts specified" msgstr "kişi belirtilmedi" @@ -3858,6 +3875,10 @@ msgid "'%s' cannot be used with switching branches" msgstr "dal değiştirilirken '%s' kullanılamaz" #, c-format +msgid "'%s' needs the paths to check out" +msgstr "çıkış yapmak için '%s' yollara gereksinim duyuyor" + +#, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s', '%s' ile birlikte kullanılamaz" @@ -4334,9 +4355,6 @@ msgstr "sparse-checkout ilklendirilemedi" msgid "remote HEAD refers to nonexistent ref, unable to checkout" msgstr "uzak konum HEAD'i, var olmayan başvuruya başvuruyor; çıkış yapılamıyor" -msgid "unable to checkout working tree" -msgstr "çalışma ağacı çıkış yapılamıyor" - msgid "unable to write parameters to config file" msgstr "parametreler yapılandırma dosyasına yazılamıyor" @@ -4622,7 +4640,7 @@ msgstr "git commit-tree: okunamadı" msgid "" "git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" " [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|" -"reword):]<commit>)]\n" +"reword):]<commit>]\n" " [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n" " [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" " [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" @@ -4631,14 +4649,14 @@ msgid "" " [--] [<pathspec>...]" msgstr "" "git commit [-a | --interactive | --patch] [-s] [-v] [-u<kip>] [--amend]\n" -" [--dry-run] [(-c | -C | --squash) <işleme> | --fixup [(amend|" -"reword):]<işleme>)]\n" -" [-F <dosya> | -m <ileti>] [--reset-author] [--allow-empty]\n" +" [--dry-run] [(-c | -C | --squash) <işleme> | --fixup\n" +" [(amend|reword):]<işleme>] [-F <dosya> | -m <ileti>] [--" +"reset-author] [--allow-empty]\n" " [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" " [--date=<tarih>] [--cleanup=<kip>] [--[no-]status]\n" " [-i | -o] [--pathspec-from-file=<dosya> [--pathspec-file-nul]]\n" " [(--trailer <jeton>[(=|:)<değer>])...] [-S[<anahtar-kimliği>]]\n" -" [--] [<yol-blrtç>...]" +" [--] [<yol-belirteci>...]" msgid "git status [<options>] [--] [<pathspec>...]" msgstr "git status [<seçenekler>] [--] [<yol-blrtç>...]" @@ -5131,12 +5149,10 @@ msgstr "" msgid "" "git config get [<file-option>] [<display-option>] [--includes] [--all] [--" -"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " -"<name>" +"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>" msgstr "" -"git config get [<dosya-seçeneği>] [<görüntüleme-seçeneği>] [--includes] [--" -"all] [--regexp=<düzenli-ifade>] [--value=<değer>] [--fixed-value] [--" -"default=<öntanımlı>] <ad>" +"git config get [<dosya-sçnği>] [<görüntü-sçnği>] [--includes] [--all] [--" +"regexp] [--value=<değer>] [--fixed-value] [--default=<öntanımlı>] <ad>" msgid "" "git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--" @@ -5165,6 +5181,15 @@ msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]" msgstr "git config [<dosya-seçeneği>] --get-colorbool <ad> [<stdout-tty>]" msgid "" +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--" +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " +"<name>" +msgstr "" +"git config get [<dosya-seçeneği>] [<görüntüleme-seçeneği>] [--includes] [--" +"all] [--regexp=<düzenli-ifade>] [--value=<değer>] [--fixed-value] [--" +"default=<öntanımlı>] <ad>" + +msgid "" "git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " "[--value=<value>] [--fixed-value] <name> <value>" msgstr "" @@ -5966,8 +5991,8 @@ msgstr "" "bu denetlemeden kaçınabilirsiniz.\n" #, c-format -msgid "%s did not send all necessary objects\n" -msgstr "%s tüm gerekli nesneleri göndermedi\n" +msgid "%s did not send all necessary objects" +msgstr "%s tüm gerekli nesneleri göndermedi" #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" @@ -6004,8 +6029,8 @@ msgid "option \"%s\" value \"%s\" is not valid for %s" msgstr "\"%s\" seçeneği \"%s\" değeri %s için geçerli değil" #, c-format -msgid "option \"%s\" is ignored for %s\n" -msgstr "\"%s\" seçeneği %s için yok sayılıyor\n" +msgid "option \"%s\" is ignored for %s" +msgstr "\"%s\" seçeneği %s için yok sayılıyor" #, c-format msgid "%s is not a valid object" @@ -6678,6 +6703,9 @@ msgstr "biraz daha titiz ol (artırılmış işleyiş süresi)" msgid "enable auto-gc mode" msgstr "auto-gc kipini etkinleştir" +msgid "perform garbage collection in the background" +msgstr "çöp toplamayı arka planda gerçekleştir" + msgid "force running gc even if there may be another gc running" msgstr "başka bir gc çalışıyor olsa bile zorla gc çalıştır" @@ -6773,6 +6801,9 @@ msgstr "'%s' görevi birden çok kez seçilemez" msgid "run tasks based on the state of the repository" msgstr "görevleri deponun durumuna göre çalıştır" +msgid "perform maintenance in the background" +msgstr "bakımı arka planda gerçekleştir" + msgid "frequency" msgstr "sıklık" @@ -7635,9 +7666,6 @@ msgstr "-L<erim>:<dosya>, yol belirteci ile kullanılamıyor" msgid "Final output: %d %s\n" msgstr "Son çıktı: %d %s\n" -msgid "unable to create temporary object directory" -msgstr "geçici nesne dizini oluşturulamıyor" - #, c-format msgid "git show %s: bad file" msgstr "git show %s: hatalı dosya" @@ -8199,15 +8227,6 @@ msgstr "diff3 tabanlı birleştirme kullan" msgid "use a zealous diff3 based merge" msgstr "gayretli bir diff3 tabanlı birleştirme kullan" -msgid "for conflicts, use our version" -msgstr "çakışmalarda bizim sürümü kullan" - -msgid "for conflicts, use their version" -msgstr "çakışmalarda onların sürümünü kullan" - -msgid "for conflicts, use a union version" -msgstr "çakışmalarda birlik olmuş bir sürüm kullan" - msgid "<algorithm>" msgstr "<algoritma>" @@ -8670,6 +8689,9 @@ msgstr "bir çoklu paket biteşlemi hesaplanırken yeniden kullanılacak paket" msgid "write multi-pack bitmap" msgstr "çoklu paket biteşlemi yaz" +msgid "write a new incremental MIDX" +msgstr "yeni bir artımlı MIDX yaz" + msgid "write multi-pack index containing only given indexes" msgstr "yalnızca verilen indeksleri içeren çoklu paket indekslerini yaz" @@ -10678,6 +10700,9 @@ msgstr "geçersiz başvuru biçimi: %s" msgid "git refs migrate --ref-format=<format> [--dry-run]" msgstr "git refs migrate --ref-format=<biçim> [--dry-run]" +msgid "git refs verify [--strict] [--verbose]" +msgstr "git refs verify [--strict] [--verbose]" + msgid "specify the reference format to convert to" msgstr "dönüştürülecek başvuru biçimini belirt" @@ -10691,6 +10716,12 @@ msgstr "--ref-format=<biçim> eksik" msgid "repository already uses '%s' format" msgstr "depo halihazırda '%s' biçimini kullanıyor" +msgid "enable strict checking" +msgstr "kesin denetlemeyi etkinleştir" + +msgid "'git refs verify' takes no arguments" +msgstr "'git refs verify' bir argüman almıyor" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -12121,11 +12152,11 @@ msgstr "başvuru yok" msgid "failed to look up reference" msgstr "başvuru bakılamadı" -msgid "only show tags (can be combined with branches)" -msgstr "yalnızca etiketleri göster (dallarla birlikte kullanılabilir)" +msgid "only show tags (can be combined with --branches)" +msgstr "yalnızca etiketleri göster (--branches ile birlikte kullanılabilir)" -msgid "only show branches (can be combined with tags)" -msgstr "yalnızca dalları göster (etiketlerle birlikte kullanılabilir)" +msgid "only show branches (can be combined with --tags)" +msgstr "yalnızca dalları göster (--tags ile birlikte kullanılabilir)" msgid "check for reference existence without resolving" msgstr "çözmeden başvuru varlığını denetle" @@ -12177,6 +12208,10 @@ msgstr "'%s' dizini kaldırılamadı" msgid "failed to create directory for sparse-checkout file" msgstr "aralıklı çıkış dosyası için dizin oluşturulamadı" +#, c-format +msgid "unable to fdopen %s" +msgstr "%s fdopen yapılamıyor" + msgid "failed to initialize worktree config" msgstr "çalışma ağacı yapılandırması ilklendirilemedi" @@ -12625,8 +12660,8 @@ msgid "couldn't hash object from '%s'" msgstr "'%s' üzerinden nesne sağlaması yapılamadı" #, c-format -msgid "unexpected mode %o\n" -msgstr "beklenmedik kip %o\n" +msgid "unexpected mode %o" +msgstr "beklenmedik kip %o" msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "altmodül HEAD'i içindeki işleme ile indekstekini karşılaştırmak için" @@ -17177,13 +17212,16 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "'%s.lock' oluşturulamıyor: %s" +msgid "unable to create temporary object directory" +msgstr "geçici nesne dizini oluşturulamıyor" + #, c-format msgid "could not write loose object index %s" msgstr "gevşek nesne indeksi %s yazılamadı" #, c-format -msgid "failed to write loose object index %s\n" -msgstr "gevşek nesne indeksi %s yazımı başarısız\n" +msgid "failed to write loose object index %s" +msgstr "gevşek nesne indeksi %s yazılamadı" #, c-format msgid "unexpected line: '%s'" @@ -17739,6 +17777,17 @@ msgstr "paket yüklenemedi" msgid "could not open index for %s" msgstr "%s için indeks açılamadı" +#, c-format +msgid "unable to link '%s' to '%s'" +msgstr "'%s', '%s' ile bağlantılanamıyor" + +#, c-format +msgid "failed to clear multi-pack-index at %s" +msgstr "multi-pack-index %s konumunda temizlenemedi" + +msgid "cannot write incremental MIDX with bitmap" +msgstr "biteşlem ile artımlı MIDX yazılamıyor" + msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "var olan multi-pack-index yok sayılıyor; sağlama toplamı uyumsuzluğu" @@ -17767,18 +17816,34 @@ msgstr "indekslenecek paket dosyası yok." msgid "refusing to write multi-pack .bitmap without any objects" msgstr "bir nesne olmadan multi-pack .bitmap yazımı reddediliyor" +msgid "unable to create temporary MIDX layer" +msgstr "geçici MIDX katmanı oluşturulamıyor" + msgid "could not write multi-pack bitmap" msgstr "çoklu paket biteşlem yazılamadı" +msgid "unable to open multi-pack-index chain file" +msgstr "multi-pack-index zincir dosyası açılamıyor" + +msgid "unable to rename new multi-pack-index layer" +msgstr "yeni multi-pack-index katmanı yeniden adlandırılamıyor" + msgid "could not write multi-pack-index" msgstr "multi-pack-index yazılamadı" +msgid "cannot expire packs from an incremental multi-pack-index" +msgstr "" +"artımlı bir multi-pack-index ögesinden paketlerin süresi doldurulamıyor" + msgid "Counting referenced objects" msgstr "Başvurulmuş nesneler sayılıyor" msgid "Finding and deleting unreferenced packfiles" msgstr "Başvurulmamış paket dosyaları bulunuyor ve siliniyor" +msgid "cannot repack an incremental multi-pack-index" +msgstr "artımlı bir multi-pack-index yeniden paketlenemiyor" + msgid "could not start pack-objects" msgstr "pack-objects başlatılamadı" @@ -17836,6 +17901,27 @@ msgstr "multi-pack-index pack-name iri parçası pek kısa" msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "multi-pack-index paket adlarının sırasız: '%s' şundan önce: '%s'" +msgid "multi-pack-index chain file too small" +msgstr "multi-pack-index zincir dosyası pek küçük" + +#, c-format +msgid "pack count in base MIDX too high: %<PRIuMAX>" +msgstr "temel MIDX içindeki paket sayısı pek yüksek: %<PRIuMAX>" + +#, c-format +msgid "object count in base MIDX too high: %<PRIuMAX>" +msgstr "temel MIDX içindeki nesne sayısı pek yüksek: %<PRIuMAX>" + +#, c-format +msgid "invalid multi-pack-index chain: line '%s' not a hash" +msgstr "geçersiz multi-pack-index zinciri: '%s' bir sağlama değil" + +msgid "unable to find all multi-pack index files" +msgstr "tüm multi-pack-index dosyaları bulunamıyor" + +msgid "invalid MIDX object position, MIDX is likely corrupt" +msgstr "geçersiz MIDX nesnesi konumu, MIDX büyük olasılıkla hasarlı" + #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "hatalı pack-int-id: %u (%u toplam paket)" @@ -17853,10 +17939,6 @@ msgstr "multi-pack-index bir 64 bit ofset depoluyor; ancak off_t pek küçük" msgid "multi-pack-index large offset out of bounds" msgstr "multi-pack-index geniş ofseti sınırlar dışında" -#, c-format -msgid "failed to clear multi-pack-index at %s" -msgstr "multi-pack-index %s konumunda temizlenemedi" - msgid "multi-pack-index file exists, but failed to parse" msgstr "multi-pack-index dosyası var; ancak ayrıştırılamadı" @@ -18065,6 +18147,14 @@ msgid "missing mapping of %s to %s" msgstr "%s ögesinin %s ögesine eksik eşlemlemesi" #, c-format +msgid "unable to open %s" +msgstr "%s açılamıyor" + +#, c-format +msgid "files '%s' and '%s' differ in contents" +msgstr "'%s' ve '%s' dosyalarının içeriği farklı" + +#, c-format msgid "unable to write file %s" msgstr "%s dosyası yazılamıyor" @@ -18149,10 +18239,6 @@ msgid "%s is not a valid '%s' object" msgstr "%s geçerli bir '%s' nesnesi değil" #, c-format -msgid "unable to open %s" -msgstr "%s açılamıyor" - -#, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s için sağlama uyuşmazlığı (%s bekleniyordu)" @@ -19362,6 +19448,10 @@ msgid "expected format: %%(ahead-behind:<committish>)" msgstr "beklenen biçim: %%(ahead-behind:<işlememsi>)" #, c-format +msgid "expected format: %%(is-base:<committish>)" +msgstr "beklenen biçim: %%(is-base:<işlememsi>)" + +#, c-format msgid "malformed field name: %.*s" msgstr "hatalı oluşturulmuş alan adı: %.*s" @@ -19597,6 +19687,13 @@ msgstr "" "bekleniyordu; ancak bu normal bir başvuru" #, c-format +msgid "cannot open directory %s" +msgstr "%s dizini açılamıyor" + +msgid "Checking references consistency" +msgstr "Başvuruların tutarlılığı denetleniyor" + +#, c-format msgid "refname is dangerous: %s" msgstr "başvuru adı tehlikeli: %s" @@ -20227,12 +20324,15 @@ msgstr "yalnızca çıkış yapılacak dalın üstverisini indir" msgid "create repository within 'src' directory" msgstr "'src' dizininde depo oluştur" +msgid "specify if tags should be fetched during clone" +msgstr "etiketlerin klonlama sırasında getirilip getirilmeyeceğini belirt" + msgid "" "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n" -"\t[--[no-]src] <url> [<enlistment>]" +"\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]" msgstr "" "scalar clone [--single-branch] [--branch <ana-dal>] [--full-clone]\n" -"\t[--[no-]src] <url> [<yazılma>]" +"\t[--[no-]src] [--[no-]tags] <url> [<listeleme>]" #, c-format msgid "cannot deduce worktree name from '%s'" @@ -20251,6 +20351,10 @@ msgid "could not configure remote in '%s'" msgstr "'%s' içindeki uzak konum yapılandırılamadı" #, c-format +msgid "could not disable tags in '%s'" +msgstr "'%s' içindeki etiketler devre dışı bırakılamıyor" + +#, c-format msgid "could not configure '%s'" msgstr "'%s' yapılandırılamadı" @@ -21306,6 +21410,10 @@ msgid "failed to stat '%*s%s%s'" msgstr "'%*s%s%s' bilgileri alınamadı" #, c-format +msgid "safe.directory '%s' not absolute" +msgstr "safe.directory '%s' mutlak değil" + +#, c-format msgid "" "detected dubious ownership in repository at '%s'\n" "%sTo add an exception for this directory, call:\n" @@ -21768,6 +21876,24 @@ msgstr "jeton" msgid "command token to send to the server" msgstr "sunucuya gönderilecek komut jetonu" +msgid "unit-test [<options>]" +msgstr "unit-test [<seçenekler>]" + +msgid "immediately exit upon the first failed test" +msgstr "ilk başarısız sınamada anında çık" + +msgid "suite[::test]" +msgstr "suite[::test]" + +msgid "run only test suite or individual test <suite[::test]>" +msgstr "yalnızca sınama paketini veya bireysel <süit[::sınama]> çalıştır" + +msgid "suite" +msgstr "suite" + +msgid "exclude test suite <suite>" +msgstr "<süit> sınama süitini dışla" + #, c-format msgid "running trailer command '%s' failed" msgstr "'%s' artbilgi komutunu çalıştırma başarısız oldu" @@ -22934,6 +23060,9 @@ msgstr "'%s.final' yazılan e-postayı içeriyor.\n" msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases diğer seçeneklerle uyumsuz\n" +msgid "--dump-aliases and --translate-aliases are mutually exclusive\n" +msgstr "--dump-aliases ve --translate-aliases birlikte kullanılamaz\n" + msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -64,10 +64,10 @@ # +------------------------------------------------------------------+ msgid "" msgstr "" -"Project-Id-Version: git 2.46\n" +"Project-Id-Version: git 2.47\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2024-07-21 00:11+0700\n" -"PO-Revision-Date: 2024-07-26 11:31+0700\n" +"POT-Creation-Date: 2024-10-05 01:20+0000\n" +"PO-Revision-Date: 2024-10-05 16:48+0700\n" "Last-Translator: Vũ Tiến Hưng <newcomerminecraft@gmail.com>\n" "Language-Team: Vietnamese <https://github.com/Nekosha/git-po>\n" "Language: vi\n" @@ -605,7 +605,7 @@ msgid "" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" -"p - print the current hunk\n" +"p - print the current hunk, 'P' to use the pager\n" "? - print help\n" msgstr "" "j - để lại khúc này là chưa quyết định, xem khúc chưa quyết định kế tiếp\n" @@ -616,7 +616,7 @@ msgstr "" "/ - tìm một khúc khớp với biểu thức chính quy\n" "s - chia khúc hiện tại thành các khúc nhỏ hơn\n" "e - sửa bằng tay khúc hiện hành\n" -"p - in ra khúc hiện hành\n" +"p - in ra khúc hiện hành, 'P' để chạy trình phân trang\n" "? - hiển thị trợ giúp\n" #, c-format @@ -1282,6 +1282,15 @@ msgstr "đồng thời áp dụng bản vá (dùng với tùy chọn --stat/--su msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "thử hòa trộn kiểu three-way, quay lại kiểu bình thường nếu thất bại" +msgid "for conflicts, use our version" +msgstr "nếu xung đột, sử dụng phiên bản của ta" + +msgid "for conflicts, use their version" +msgstr "nếu xung đột, sử dụng phiên bản của họ" + +msgid "for conflicts, use a union version" +msgstr "nếu xung đột, sử dụng phiên bản kết hợp" + msgid "build a temporary index based on embedded index information" msgstr "xây dựng chỉ mục tạm thời dựa trên thông tin chỉ mục được nhúng" @@ -1328,6 +1337,9 @@ msgstr "thêm <gốc> vào trước tất cả các tên tập tin" msgid "don't return error for empty patches" msgstr "đừng trả về lỗi khi các bản vá trống rỗng" +msgid "--ours, --theirs, and --union require --3way" +msgstr "--ours, --theirs, và --union cần tuỳ chọn --3way" + #, c-format msgid "cannot stream blob %s" msgstr "không thể stream blob '%s'" @@ -1400,6 +1412,10 @@ msgid "not a tree object: %s" msgstr "không phải là đối tượng cây: %s" #, c-format +msgid "failed to unpack tree object %s" +msgstr "gặp lỗi khi giải nén đối tượng cây %s" + +#, c-format msgid "File not found: %s" msgstr "Không tìm thấy tập tin: %s" @@ -2497,9 +2513,6 @@ msgstr "" "tham số không hợp lệ %s cho 'git bisect terms'.\n" "Các tùy chọn hỗ trợ là: --term-good|--term-old và --term-bad|--term-new." -msgid "revision walk setup failed\n" -msgstr "gặp lỗi cài đặt việc di chuyển qua các điểm xét duyệt\n" - #, c-format msgid "could not open '%s' for appending" msgstr "không thể mở '%s' để nối thêm" @@ -2707,17 +2720,17 @@ msgid "ignore revisions from <file>" msgstr "bỏ qua các điểm xét duyệt từ <tập tin>" msgid "color redundant metadata from previous line differently" -msgstr "siêu dữ liệu dư thừa màu từ dòng trước khác hẳn" +msgstr "tô màu khác cho siêu dữ liệu dư thừa từ dòng trước" msgid "color lines by age" -msgstr "các dòng màu theo tuổi" +msgstr "tô màu các dòng theo tuổi" msgid "spend extra cycles to find better match" -msgstr "tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa" +msgstr "tiêu thụ thêm tài nguyên để tìm kiếm tốt hơn nữa" msgid "use revisions from <file> instead of calling git-rev-list" msgstr "" -"sử dụng các điểm xét duyệt (revision) từ <tập tin> thay vì gọi 'git-rev-list'" +"sử dụng các điểm xét duyệt (revision) từ <tập tin> thay vì gọi git-rev-list" msgid "use <file>'s contents as the final image" msgstr "sử dụng nội dung của <tập tin> như là ảnh cuối cùng" @@ -3474,9 +3487,14 @@ msgstr "git check-mailmap [<các tùy chọn>] <danh-bạ>..." msgid "also read contacts from stdin" msgstr "đồng thời đọc các danh bạ từ stdin" -#, c-format -msgid "unable to parse contact: %s" -msgstr "không thể đọc danh bạ: '%s'" +msgid "read additional mailmap entries from file" +msgstr "đọc thêm mục mailmap từ tập-tin" + +msgid "blob" +msgstr "blob" + +msgid "read additional mailmap entries from blob" +msgstr "đọc thêm mục mailmap từ blob" msgid "no contacts specified" msgstr "chưa chỉ ra danh bạ" @@ -3813,7 +3831,11 @@ msgstr "các đường dẫn không thể dùng cùng với các nhánh chuyển #, 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" +msgstr "'%s' không thể được sử dụng khi chuyển nhánh" + +#, c-format +msgid "'%s' needs the paths to check out" +msgstr "'%s' cần đường dẫn để checkout" #, c-format msgid "'%s' cannot be used with '%s'" @@ -4585,7 +4607,7 @@ msgstr "git commit-tree: gặp lỗi khi đọc" msgid "" "git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" " [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|" -"reword):]<commit>)]\n" +"reword):]<commit>]\n" " [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n" " [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" " [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" @@ -4660,7 +4682,7 @@ msgid "updating files failed" msgstr "cập nhật tập tin gặp lỗi" msgid "failed to unpack HEAD tree object" -msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây" +msgstr "gặp lỗi khi giải nén đối tượng cây HEAD" msgid "No paths with --include/--only does not make sense." msgstr "Không đường dẫn với các tùy chọn --include/--only không hợp lý." @@ -5106,12 +5128,11 @@ msgstr "git config list [<tuỳ-chọn>] [<tuỳ-chọn-hiển-thị>] [--includ msgid "" "git config get [<file-option>] [<display-option>] [--includes] [--all] [--" -"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " -"<name>" +"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>" msgstr "" "git config get [<tuỳ-chọn>] [<tuỳ-chọn-hiển-thị>] [--includes] [--all] [--" -"regexp=<biểu-thức-chính-quy>] [--value=<giá-trị>] [--fixed-value] [--" -"default=<giá-trị-mặc-định>] <khoá>" +"regexp] [--value=<giá-trị>] [--fixed-value] [--default=<giá-trị-mặc-định>] " +"<tên>" msgid "" "git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--" @@ -5141,6 +5162,15 @@ msgstr "" "git config [<tuỳ-chọn>] --get-colorbool <tên> [<stdout-là-tty-hay-không>]" msgid "" +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--" +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " +"<name>" +msgstr "" +"git config get [<tuỳ-chọn>] [<tuỳ-chọn-hiển-thị>] [--includes] [--all] [--" +"regexp=<biểu-thức-chính-quy>] [--value=<giá-trị>] [--fixed-value] [--" +"default=<giá-trị-mặc-định>] <khoá>" + +msgid "" "git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " "[--value=<value>] [--fixed-value] <name> <value>" msgstr "" @@ -5941,8 +5971,8 @@ msgstr "" "để tránh kiểm tra này\n" #, c-format -msgid "%s did not send all necessary objects\n" -msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n" +msgid "%s did not send all necessary objects" +msgstr "%s đã không gửi tất cả các đối tượng cần thiết" #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" @@ -5979,8 +6009,8 @@ msgid "option \"%s\" value \"%s\" is not valid for %s" msgstr "tùy chọn \"%s\" có giá trị \"%s\" là không hợp lệ cho %s" #, c-format -msgid "option \"%s\" is ignored for %s\n" -msgstr "tùy chọn \"%s\" bị bỏ qua với %s\n" +msgid "option \"%s\" is ignored for %s" +msgstr "tùy chọn \"%s\" bị bỏ qua với %s" #, c-format msgid "%s is not a valid object" @@ -6652,7 +6682,10 @@ msgid "be more thorough (increased runtime)" msgstr "cẩn thận hơn nữa (tăng thời gian chạy)" msgid "enable auto-gc mode" -msgstr "bật chế độ auto-gc" +msgstr "bật chế độ auto-gc (tự động dọn rác)" + +msgid "perform garbage collection in the background" +msgstr "tiến hành gc (dọn rác) trong nền" msgid "force running gc even if there may be another gc running" msgstr "buộc gc chạy ngay cả khi có tiến trình gc khác đang chạy" @@ -6751,6 +6784,9 @@ msgstr "nhiệm vụ '%s' không được chọn nhiều lần" msgid "run tasks based on the state of the repository" msgstr "chạy nhiệm vụ dựa trên trạng thái của kho chứa" +msgid "perform maintenance in the background" +msgstr "tiến hành bảo trì trong nền" + msgid "frequency" msgstr "tần số" @@ -7030,10 +7066,10 @@ msgid "show only matches from files that match all patterns" msgstr "chỉ hiển thị những cái khớp từ tập tin mà nó khớp toàn bộ các mẫu" msgid "pager" -msgstr "dàn trang" +msgstr "trình phân trang" msgid "show matching files in the pager" -msgstr "hiển thị các tập tin khớp trong trang giấy" +msgstr "hiển thị các tập tin khớp trong trình phân trang" msgid "allow calling of grep(1) (ignored by this build)" msgstr "cho phép gọi grep(1) (bị bỏ qua bởi lần dịch này)" @@ -7519,7 +7555,7 @@ msgid "edit files in place" msgstr "sửa các tập tin tại chỗ" msgid "trim empty trailers" -msgstr "cắt bỏ phần trống thừa ở đuôi" +msgstr "cắt bỏ phần trailer trống ở đuôi" msgid "placement" msgstr "vị trí" @@ -7603,9 +7639,6 @@ msgstr "-L<vùng>:<tập tin> không thể được sử dụng với đặc t msgid "Final output: %d %s\n" msgstr "Đầu ra cuối cùng: %d %s\n" -msgid "unable to create temporary object directory" -msgstr "không thể tạo thư mục đối tượng tạm thời" - #, c-format msgid "git show %s: bad file" msgstr "git show %s: sai tập tin" @@ -8174,15 +8207,6 @@ msgstr "dùng kiểu hòa dựa trên diff3" msgid "use a zealous diff3 based merge" msgstr "dùng kiểu hòa trộn dựa trên 'zealous diff3'" -msgid "for conflicts, use our version" -msgstr "nếu xung đột, sử dụng phiên bản của ta" - -msgid "for conflicts, use their version" -msgstr "nếu xung đột, sử dụng phiên bản của họ" - -msgid "for conflicts, use a union version" -msgstr "nếu xung đột, sử dụng phiên bản kết hợp" - msgid "<algorithm>" msgstr "<thuật toán>" @@ -8654,6 +8678,9 @@ msgstr "gói được sử dụng khi tính toán một \"multi-pack bitmap\"" msgid "write multi-pack bitmap" msgstr "ghi multi-pack bitmap" +msgid "write a new incremental MIDX" +msgstr "ghi incremental MIDX mới" + msgid "write multi-pack index containing only given indexes" msgstr "ghi chỉ mục multi-pack chỉ chứa các chỉ mục đã cho" @@ -10674,6 +10701,9 @@ msgstr "định dạng tham chiếu không hợp lệ: %s" msgid "git refs migrate --ref-format=<format> [--dry-run]" msgstr "git refs migrate --ref-format=<định dạng> [--dry-run]" +msgid "git refs verify [--strict] [--verbose]" +msgstr "git refs verify [--strict] [--verbose]" + msgid "specify the reference format to convert to" msgstr "chỉ định định dạng tham chiếu để chuyển đổi sang" @@ -10687,6 +10717,12 @@ msgstr "thiếu --ref-format=<định dạng>" msgid "repository already uses '%s' format" msgstr "kho đã dùng định dạng '%s'" +msgid "enable strict checking" +msgstr "cho phép kiểm tra nghiêm ngặt" + +msgid "'git refs verify' takes no arguments" +msgstr "'git refs verify' không nhận tham số" + msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -12095,11 +12131,11 @@ msgstr "tham chiếu không tồn tại" msgid "failed to look up reference" msgstr "gặp lỗi khi tìm tham chiếu" -msgid "only show tags (can be combined with branches)" -msgstr "chỉ hiển thị thẻ (có thể tổ hợp cùng với nhánh)" +msgid "only show tags (can be combined with --branches)" +msgstr "chỉ hiển thị thẻ (có thể kết hợp với --branches)" -msgid "only show branches (can be combined with tags)" -msgstr "chỉ hiển thị đầu (có thể tổ hợp cùng với thẻ)" +msgid "only show branches (can be combined with --tags)" +msgstr "chỉ hiển thị đầu (có thể kết hợp với --tags)" msgid "check for reference existence without resolving" msgstr "kiểm tra tồn tại tham chiếu nhưng không phân giải" @@ -12151,6 +12187,10 @@ msgstr "gặp lỗi khi gỡ bỏ thư mục \"%s\"" msgid "failed to create directory for sparse-checkout file" msgstr "gặp lỗi khi tạo thư mục cho tập tin sparse-checkout" +#, c-format +msgid "unable to fdopen %s" +msgstr "không thể fdopen %s" + msgid "failed to initialize worktree config" msgstr "gặp lỗi khi khởi tạo cấu hình cây làm việc" @@ -12394,7 +12434,7 @@ msgid "failed to parse tree" msgstr "gặp lỗi khi đọc cây" msgid "failed to unpack trees" -msgstr "gặp lỗi khi tháo dỡ cây" +msgstr "gặp lỗi khi giải nén cây" msgid "include untracked files in the stash" msgstr "bao gồm các tập tin không được theo dõi trong stash" @@ -12605,8 +12645,8 @@ msgid "couldn't hash object from '%s'" msgstr "không thể băm đối tượng từ '%s'" #, c-format -msgid "unexpected mode %o\n" -msgstr "gặp chế độ không như mong chờ %o\n" +msgid "unexpected mode %o" +msgstr "gặp chế độ không rõ %o" msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "hùng lần chuyển giao đã lưu trong chỉ mục thay cho HEAD mô-đun-con" @@ -14774,7 +14814,7 @@ msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Đang ghi ra đồ thị các lần chuyển giao trong lần %d" msgid "unable to open commit-graph chain file" -msgstr "không thể mở tập tin mắt xích đồ thị chuyển giao" +msgstr "không thể mở tập tin chain đồ thị chuyển giao" msgid "failed to rename base commit-graph file" msgstr "gặp lỗi khi đổi tên tập tin đồ-thị-chuyển-giao" @@ -17171,13 +17211,16 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Không thể tạo '%s.lock': %s" +msgid "unable to create temporary object directory" +msgstr "không thể tạo thư mục đối tượng tạm thời" + #, c-format msgid "could not write loose object index %s" msgstr "không thể ghi tập tin đối tượng loose %s" #, c-format -msgid "failed to write loose object index %s\n" -msgstr "ghi chỉ mục đối tượng loose %s thất bại\n" +msgid "failed to write loose object index %s" +msgstr "ghi chỉ mục đối tượng loose %s thất bại" #, c-format msgid "unexpected line: '%s'" @@ -17701,7 +17744,7 @@ msgstr "gặp lỗi khi đọc bộ nhớ đệm" #, c-format msgid "failed to add packfile '%s'" -msgstr "gặp lỗi khi thêm tập tin gói '%s'" +msgstr "gặp lỗi khi thêm packfile '%s'" #, c-format msgid "failed to open pack-index '%s'" @@ -17729,6 +17772,17 @@ msgstr "không thể tải gói" msgid "could not open index for %s" msgstr "không thể mở chỉ mục cho %s" +#, c-format +msgid "unable to link '%s' to '%s'" +msgstr "không thể liên kết '%s' vào '%s'" + +#, c-format +msgid "failed to clear multi-pack-index at %s" +msgstr "gặp lỗi khi xóa multi-pack-index tại %s" + +msgid "cannot write incremental MIDX with bitmap" +msgstr "không thể ghi incremental MIDX với bitmap" + msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "bỏ qua multi-pack-index sẵn có; tổng kiểm không khớp" @@ -17737,7 +17791,7 @@ msgstr "Đang thêm tập tin gói từ multi-pack-index" #, c-format msgid "unknown preferred pack: '%s'" -msgstr "không hiểu \"preferred pack\": %s" +msgstr "không hiểu preferred pack: %s" #, c-format msgid "cannot select preferred pack %s with no objects" @@ -17749,19 +17803,31 @@ msgstr "đã không thấy tập tin gói %s để xóa" #, c-format msgid "preferred pack '%s' is expired" -msgstr "\"preferred pack\" '%s' đã hết hạn" +msgstr "preferred pack '%s' đã hết hạn" msgid "no pack files to index." msgstr "không có tập tin gói để đánh chỉ mục." msgid "refusing to write multi-pack .bitmap without any objects" -msgstr "từ chối ghi 'multi-pack bitmap' mà không có bất kỳ đối tượng nào" +msgstr "từ chối ghi multi-pack bitmap mà không có bất kỳ đối tượng nào" + +msgid "unable to create temporary MIDX layer" +msgstr "không thể tạo lớp MIDX tạm thời" msgid "could not write multi-pack bitmap" -msgstr "không thể ghi 'multi-pack bitmap'" +msgstr "không thể ghi multi-pack bitmap" + +msgid "unable to open multi-pack-index chain file" +msgstr "không thể mở tập tin chain multi-pack-index" + +msgid "unable to rename new multi-pack-index layer" +msgstr "gặp lỗi khi đổi tên lớp multi-pack-index" msgid "could not write multi-pack-index" -msgstr "không thể ghi 'multi-pack-index'" +msgstr "không thể ghi multi-pack-index" + +msgid "cannot expire packs from an incremental multi-pack-index" +msgstr "không thể hết hạn gói từ incremental multi-pack-index" msgid "Counting referenced objects" msgstr "Đang đếm các đối tượng được tham chiếu" @@ -17769,6 +17835,9 @@ msgstr "Đang đếm các đối tượng được tham chiếu" msgid "Finding and deleting unreferenced packfiles" msgstr "Đang tìm và xóa các gói không được tham chiếu" +msgid "cannot repack an incremental multi-pack-index" +msgstr "không thể repack incremental multi-pack-index" + msgid "could not start pack-objects" msgstr "không thể khởi chạy pack-objects" @@ -17825,6 +17894,27 @@ msgstr "tập tin đồ thị multi-pack-index %s quá nhỏ" msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "các tên gói multi-pack-index không đúng thứ tự: '%s' trước '%s'" +msgid "multi-pack-index chain file too small" +msgstr "tập tin chain multi-pack-index quá nhỏ" + +#, c-format +msgid "pack count in base MIDX too high: %<PRIuMAX>" +msgstr "số pack trong base MIDX quá lớn: %<PRIuMAX>" + +#, c-format +msgid "object count in base MIDX too high: %<PRIuMAX>" +msgstr "số đối tượng trong base MIDX quá lớn: %<PRIuMAX>" + +#, c-format +msgid "invalid multi-pack-index chain: line '%s' not a hash" +msgstr "multi-pack-index chain không hợp lệ: dòng '%s' không phải là mã băm" + +msgid "unable to find all multi-pack index files" +msgstr "không thể tìm thấy tất cả các tập tin multi-pack index" + +msgid "invalid MIDX object position, MIDX is likely corrupt" +msgstr "vị trí đối tượng MIDX không hợp lệ. MIDX có vẻ như đã bị hỏng" + #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "pack-int-id sai: %u (%u các gói tổng)" @@ -17842,10 +17932,6 @@ msgstr "multi-pack-index lưu trữ một offset 64-bít, nhưng off_t là quá msgid "multi-pack-index large offset out of bounds" msgstr "multi-pack-index large offset nằm ngoài biên" -#, c-format -msgid "failed to clear multi-pack-index at %s" -msgstr "gặp lỗi khi xóa multi-pack-index tại %s" - msgid "multi-pack-index file exists, but failed to parse" msgstr "đã có tập tin multi-pack-index, nhưng gặp lỗi khi đọc cú pháp" @@ -18056,6 +18142,14 @@ msgid "missing mapping of %s to %s" msgstr "thiếu ánh xạ %s sang %s" #, c-format +msgid "unable to open %s" +msgstr "không thể mở %s" + +#, c-format +msgid "files '%s' and '%s' differ in contents" +msgstr "tập tin '%s' và '%s' có nội dung khác nhau" + +#, c-format msgid "unable to write file %s" msgstr "không thể ghi tập tin %s" @@ -18103,7 +18197,7 @@ msgstr "deflateEnd trên đối tượng stream gặp lỗi (%d)" #, c-format msgid "unable to create directory %s" -msgstr "tạo thư mục \"%s\" gặp lỗi" +msgstr "tạo thư mục %s gặp lỗi" #, c-format msgid "cannot read object for %s" @@ -18141,10 +18235,6 @@ msgid "%s is not a valid '%s' object" msgstr "%s không phải là một đối tượng '%s' hợp lệ" #, c-format -msgid "unable to open %s" -msgstr "không thể mở %s" - -#, c-format msgid "hash mismatch for %s (expected %s)" msgstr "mã băm không khớp cho %s (cần %s)" @@ -19079,10 +19169,10 @@ msgid "broken index, expect %s in %s, got %s" msgstr "chỉ mục bị hỏng, cần %s trong %s, nhưng lại có %s" msgid "cannot write split index for a sparse index" -msgstr "không thể ghi chỉ mục chia tách cho \"sparse index\"" +msgstr "không thể ghi chỉ mục chia tách cho sparse index" msgid "failed to convert to a sparse-index" -msgstr "gặp lỗi khi chuyển đổi sang \"sparse-index\"" +msgstr "gặp lỗi khi chuyển đổi sang sparse-index" #, c-format msgid "unable to open git dir: %s" @@ -19352,6 +19442,10 @@ msgid "expected format: %%(ahead-behind:<committish>)" msgstr "cần định dạng: %%(ahead-behind:<committish>)" #, c-format +msgid "expected format: %%(is-base:<committish>)" +msgstr "cần định dạng: %%(is-base:<committish>)" + +#, c-format msgid "malformed field name: %.*s" msgstr "tên trường sai quy cách: %.*s" @@ -19586,6 +19680,13 @@ msgstr "" "tham chiếu thường" #, c-format +msgid "cannot open directory %s" +msgstr "không thể mở thư mục %s" + +msgid "Checking references consistency" +msgstr "Đang kiểm tra tính nhất quán các tham chiếu" + +#, c-format msgid "refname is dangerous: %s" msgstr "tên tham chiếu không an toàn: %s" @@ -20144,7 +20245,7 @@ msgstr "không thể tạo tuyến trình async: %s" #, c-format msgid "'%s' does not exist" -msgstr "\"%s\" không tồn tại" +msgstr "'%s' không tồn tại" #, c-format msgid "could not switch to '%s'" @@ -20212,12 +20313,15 @@ msgstr "chỉ siêu dữ liệu tải về cho nhánh mà sẽ được checkout msgid "create repository within 'src' directory" msgstr "tạo kho chứa trong thư mục 'src'" +msgid "specify if tags should be fetched during clone" +msgstr "có nên lấy về thẻ khi nhân bản" + msgid "" "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n" -"\t[--[no-]src] <url> [<enlistment>]" +"\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]" msgstr "" "scalar clone [--single-branch] [--branch <nhánh-chính>] [--full-clone]\n" -"\t[--[no-]src] <url> [<enlistment>]" +"\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]" #, c-format msgid "cannot deduce worktree name from '%s'" @@ -20236,6 +20340,10 @@ msgid "could not configure remote in '%s'" msgstr "không thể cấu hình máy chủ trong '%s'" #, c-format +msgid "could not disable tags in '%s'" +msgstr "không thể vô hiệu thẻ trong '%s'" + +#, c-format msgid "could not configure '%s'" msgstr "không thể cấu hình '%s'" @@ -21301,6 +21409,10 @@ msgid "failed to stat '%*s%s%s'" msgstr "gặp lỗi khi stat'%*s%s%s'" #, c-format +msgid "safe.directory '%s' not absolute" +msgstr "safe.directory '%s' không phải đường dẫn tuyệt đối" + +#, c-format msgid "" "detected dubious ownership in repository at '%s'\n" "%sTo add an exception for this directory, call:\n" @@ -21762,9 +21874,27 @@ msgstr "thẻ bài" msgid "command token to send to the server" msgstr "thẻ bài lệnh để gửi lên cho máy chủ" +msgid "unit-test [<options>]" +msgstr "unit-test [<các tùy chọn>]" + +msgid "immediately exit upon the first failed test" +msgstr "thoát ngay khi gặp test thất bại" + +msgid "suite[::test]" +msgstr "suite[::test]" + +msgid "run only test suite or individual test <suite[::test]>" +msgstr "chạy riêng test suite hoặc test <suite[::test]>" + +msgid "suite" +msgstr "suite" + +msgid "exclude test suite <suite>" +msgstr "loại trừ test suite <suite>" + #, c-format msgid "running trailer command '%s' failed" -msgstr "chạy lệnh kéo theo '%s' gặp lỗi" +msgstr "chạy lệnh trailer '%s' gặp lỗi" #, c-format msgid "unknown value '%s' for key '%s'" @@ -21772,7 +21902,7 @@ msgstr "không hiểu giá trị '%s' cho khóa '%s'" #, c-format msgid "empty trailer token in trailer '%.*s'" -msgstr "thẻ thừa trống rỗng trong phần thừa '%.*s'" +msgstr "thẻ trailer trống rỗng trong phần trailer '%.*s'" msgid "full write to remote helper failed" msgstr "ghi đầy đủ lên helper máy chủ gặp lỗi" @@ -22962,6 +23092,9 @@ msgstr "'%s.final' chứa emal đã soạn thảo.\n" msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases không tương thích với các tùy chọn khác\n" +msgid "--dump-aliases and --translate-aliases are mutually exclusive\n" +msgstr "--dump-aliases và --translate-aliases không tương thích với nhau\n" + msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" |