diff --git a/po/documentation.fr.po b/po/documentation.fr.po index fe8d6e32648a27480a9d7f081975031faa207502..f47f2c809303f8b8f592deb7ec6006ddd3458274 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the Git package. # Jean-No챘l Avila <jn.avila@free.fr>, 2019. msgid "" -msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2022-04-09 23:15+0200\nPO-Revision-Date: 2022-04-25 00:13+0000\nLast-Translator: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage-Team: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 4.12.1-dev\n" +msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2022-04-09 23:15+0200\nPO-Revision-Date: 2022-04-28 15:12+0000\nLast-Translator: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage-Team: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 4.12.1-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:763 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:129 en/git-status.txt:31 @@ -61016,115 +61016,115 @@ msgstr "[[def_cherry-picking]]picorage" #: en/glossary-content.txt:59 #, priority:310 msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit." -msgstr "" +msgstr "Dans le jargon <<def_SCM,SCM>>, \"picorage\" signifie choisir un sous-ensemble de modifications dans une s챕rie de modifications (g챕n챕ralement des commits) et les enregistrer comme une nouvelle s챕rie de modifications sur une base de code diff챕rente. Dans Git, cela est effectu챕 par la commande \"git cherry-pick\" pour extraire la modification introduite par un <<def_commit,commit>> existant et pour l'enregistrer en fonction du sommet de la <<def_branch,branche>> actuelle en tant que nouveau commit." #. type: Labeled list #: en/glossary-content.txt:60 #, no-wrap, priority:310 msgid "[[def_clean]]clean" -msgstr "" +msgstr "[[def_clean]]propre" #. type: Plain text #: en/glossary-content.txt:64 #, priority:310 msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"." -msgstr "" +msgstr "Un <<def_working_tree,arbre de travail>> est propre, s'il correspond 횪 la <<def_revision,r챕vision>> r챕f챕renc챕e par la <<def_head,t챗te>> courante. Voir aussi \"<<def_dirty,sale>>\"." #. type: Labeled list #: en/glossary-content.txt:65 #, no-wrap, priority:310 msgid "[[def_commit]]commit" -msgstr "" +msgstr "[[def_commit]]commit" #. type: Plain text #: en/glossary-content.txt:72 #, priority:310 msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\". Also used as a short hand for <<def_commit_object,commit object>>." -msgstr "" +msgstr "En tant que substantif : Un point unique dans l'historique de Git ; l'historique complet d'un projet est repr챕sent챕 comme un ensemble de commits interconnect챕s. Le mot \"commit\" est souvent utilis챕 par Git aux m챗mes endroits o첫 d'autres syst챔mes de contr척le de r챕vision utilisent les mots \"revision\" ou \"version\". 횋galement utilis챕 comme raccourci pour <<def_commit_object,objet commit>>." #. type: Plain text #: en/glossary-content.txt:77 #, priority:310 msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit." -msgstr "" +msgstr "Comme verbe : le terme \"valider\" est utilis챕 en fran챌ais. L'action de stocker un nouvel instantan챕 de l'챕tat du projet dans l'historique Git, en cr챕ant un nouveau commit repr챕sentant l'챕tat actuel de l'<<def_index,index>> et en avan챌ant la <<def_HEAD,HEAD>> pour pointer vers le nouveau commit." #. type: Labeled list #: en/glossary-content.txt:78 #, no-wrap, priority:310 msgid "[[def_commit_object]]commit object" -msgstr "" +msgstr "[[def_commit_object]]objet commit" #. type: Plain text #: en/glossary-content.txt:84 #, priority:310 msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision." -msgstr "" +msgstr "Un <<def_object,objet>> qui contient les informations sur une <<def_revision,r챕vision>> particuli챔re, telles que ses <<def_parent,parents>>, validateur, auteur, date et le <<def_tree_object,objet arbre>> qui correspond au <<def_directory,r챕pertoire>> racine de la r챕vision stock챕e." #. type: Labeled list #: en/glossary-content.txt:85 #, no-wrap, priority:310 msgid "[[def_commit-ish]]commit-ish (also committish)" -msgstr "" +msgstr "[[def_commit-ish]]commit-esque (챕galement commitesque)" #. type: Plain text #: en/glossary-content.txt:96 #, priority:310 msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object. The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc." -msgstr "" +msgstr "Un <<def_commit_object,objet commit>> ou un <<def_object,objet>> qui peut 챗tre d챕r챕f챕renc챕 r챕cursivement vers un objet commit. Les 챕l챕ments suivants sont tous des objets commit : un objet commit, un <<def_tag_object,objet 챕tiquette>> qui pointe vers un objet commit, un objet 챕tiquette qui pointe vers un objet 챕tiquette qui pointe vers un objet commit, etc." #. type: Labeled list #: en/glossary-content.txt:97 #, no-wrap, priority:310 msgid "[[def_core_git]]core Git" -msgstr "" +msgstr "[[def_core_git]]c흹ur Git" #. type: Plain text #: en/glossary-content.txt:100 #, priority:310 msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools." -msgstr "" +msgstr "Structures de donn챕es fondamentales et utilitaires de Git. N'expose que des outils limit챕s de gestion du code source." #. type: Labeled list #: en/glossary-content.txt:101 #, no-wrap, priority:310 msgid "[[def_DAG]]DAG" -msgstr "" +msgstr "[[def_DAG]]DAG" #. type: Plain text #: en/glossary-content.txt:106 #, priority:310 msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)." -msgstr "" +msgstr "Graphe acyclique dirig챕 ('Directed Acyclique Graph\"). Les <<def_commit_object,objets commit>> forment un graphe acyclique dirig챕, car ils ont des parents (dirig챕s), et le graphe des objets commit est acyclique (il n'y a pas de <<def_chain,cha챤ne>> qui commence et se termine par le m챗me <<def_object,objet>>)." #. type: Labeled list #: en/glossary-content.txt:107 #, no-wrap, priority:310 msgid "[[def_dangling_object]]dangling object" -msgstr "" +msgstr "[[def_dangling_object]]objet en suspens" #. type: Plain text #: en/glossary-content.txt:112 #, priority:310 msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>." -msgstr "" +msgstr "Un <<def_unreachable_object,objet inatteignable>> qui n'est pas <<def_reachable,joignable>> m챗me 횪 partir d'autres objets inatteignables ; un objet en suspens n'a aucune r챕f챕rence vers lui 횪 partir de n'importe quelle r챕f챕rence ou <<def_object,objet>> dans le <<def_repository,d챕p척t>>." #. type: Labeled list #: en/glossary-content.txt:113 #, no-wrap, priority:310 msgid "[[def_detached_HEAD]]detached HEAD" -msgstr "" +msgstr "[[def_detached_HEAD]]HEAD d챕tach챕e" #. type: Plain text #: en/glossary-content.txt:122 #, priority:310 msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. The HEAD in such a state is called \"detached\"." -msgstr "" +msgstr "Normalement, la <<def_HEAD,HEAD>> stocke le nom d'une <<def_branch,branche>> et les commandes qui op챔rent sur l'historique que repr챕sente le HEAD op챔rent sur l'historique menant au sommet de la branche vers laquelle pointe la HEAD. Cependant, Git vous permet 챕galement d' <<def_checkout,extraire>> un <<def_commit,commit>> arbitraire qui n'est pas n챕cessairement le sommet d'une branche particuli챔re. La HEAD dans un tel 챕tat est appel챕 \"d챕tach챕e\"." #. type: Plain text #: en/glossary-content.txt:131 #, priority:310 msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state." -msgstr "" +msgstr "Notez que les commandes qui op챔rent sur l'historique de la branche actuelle (par exemple `git commit` pour construire un nouvel historique par dessus) fonctionnent toujours m챗me si la HEAD est d챕tach챕e. Elles mettent 횪 jour la HEAD pour pointer 횪 l'extr챕mit챕 de l'historique mis 횪 jour sans affecter aucune branche. Les commandes qui mettent 횪 jour ou demandent des informations _sur_ la branche courante (par exemple `git branch --set-upstream-to` qui d챕finit avec quelle branche de suivi 횪 distance la branche actuelle s'int챔gre) ne fonctionnent 챕videmment pas, car il n'y a pas de branche actuelle (r챕elle) 횪 demander dans cet 챕tat." #. type: Labeled list #: en/glossary-content.txt:132 @@ -61136,193 +61136,193 @@ msgstr "[[def_directory]]r챕pertoire" #: en/glossary-content.txt:134 #, priority:310 msgid "The list you get with \"ls\" :-)" -msgstr "" +msgstr "La liste que vous obtenez avec \"ls\" :-)" #. type: Labeled list #: en/glossary-content.txt:135 #, no-wrap, priority:310 msgid "[[def_dirty]]dirty" -msgstr "" +msgstr "[[def_dirty]]sale" #. type: Plain text #: en/glossary-content.txt:139 #, priority:310 msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>." -msgstr "" +msgstr "Un <<def_working_tree,arbre de travail>> est dit \"sale\" s'il contient des modifications qui n'ont pas 챕t챕 <<def_commit,valid챕es>> dans la <<def_branch,branche>> actuelle." #. type: Labeled list #: en/glossary-content.txt:140 #, no-wrap, priority:310 msgid "[[def_evil_merge]]evil merge" -msgstr "" +msgstr "[[def_evil_merge]]fusion mal챕fique" #. type: Plain text #: en/glossary-content.txt:143 #, priority:310 msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>." -msgstr "" +msgstr "Une fusion mal챕fique est une <<def_merge,fusion>> qui introduit des modifications qui n'apparaissent dans aucun des <<def_parent,parents>>." #. type: Labeled list #: en/glossary-content.txt:144 #, no-wrap, priority:310 msgid "[[def_fast_forward]]fast-forward" -msgstr "" +msgstr "[[def_fast_forward]]avance rapide" #. type: Plain text #: en/glossary-content.txt:153 #, priority:310 msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update your branch to point at the same revision as the branch you are merging. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>." -msgstr "" +msgstr "Une avance rapide est un type sp챕cial de <<def_merge,fusion>> o첫 vous avez une <<def_revision,r챕vision>> et vous \"fusionnez\" les modifications d'une autre <<def_branch,branche>> qui se trouvent 챗tre descendantes de ce que vous avez. Dans ce cas, vous ne faites pas un nouveau <<def_commit,commit>> de <<def_merge,fusion>> mais vous mettez simplement 횪 jour votre branche pour qu'elle pointe vers la m챗me r챕vision que la branche que vous fusionnez. Cela se produit fr챕quemment sur une <<def_remote_tracking_branch,branche de suivis 횪 distance>> d'un <<def_repository,d챕p척t>> distant." #. type: Labeled list #: en/glossary-content.txt:154 #, no-wrap, priority:310 msgid "[[def_fetch]]fetch" -msgstr "" +msgstr "[[def_fetch]]r챕cup챕rer" #. type: Plain text #: en/glossary-content.txt:160 #, priority:310 msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too. See also linkgit:git-fetch[1]." -msgstr "" +msgstr "R챕cup챕rer une <<def_branch,branche>> signifie obtenir la <<def_head_ref,r챕f챕rence head>> de la branche 횪 partir d'un <<def_repository,d챕p척t>> distant, pour trouver quels objets manquent dans la <<def_object_database,base de donn챕es d'objets>> locale, et les obtenir 챕galement. Voir aussi linkgit:git-fetch[1]." #. type: Labeled list #: en/glossary-content.txt:161 #, no-wrap, priority:310 msgid "[[def_file_system]]file system" -msgstr "" +msgstr "[[def_file_system]]syst챔me de fichiers" #. type: Plain text #: en/glossary-content.txt:165 #, priority:310 msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git." -msgstr "" +msgstr "Linus Torvalds a con챌u 횪 l'origine Git pour 챗tre un syst챔me de fichiers en espace utilisateur, c'est-횪-dire l'infrastructure pour contenir les fichiers et les r챕pertoires. Cela garantissait l'efficacit챕 et la rapidit챕 de Git." #. type: Labeled list #: en/glossary-content.txt:166 #, no-wrap, priority:310 msgid "[[def_git_archive]]Git archive" -msgstr "" +msgstr "[[def_git_archive]]Archives Git" #. type: Plain text #: en/glossary-content.txt:168 #, priority:310 msgid "Synonym for <<def_repository,repository>> (for arch people)." -msgstr "" +msgstr "Synonyme de <<def_repository,d챕p척t>> (pour les utilisateurs d'Arch)." #. type: Labeled list #: en/glossary-content.txt:169 #, no-wrap, priority:310 msgid "[[def_gitfile]]gitfile" -msgstr "" +msgstr "[[def_gitfile]]fichier-git" #. type: Plain text #: en/glossary-content.txt:172 #, priority:310 msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository." -msgstr "" +msgstr "Un simple fichier `.git` 횪 la racine d'un arbre de travail qui pointe vers le r챕pertoire qui est le vrai d챕p척t." #. type: Labeled list #: en/glossary-content.txt:173 #, no-wrap, priority:310 msgid "[[def_grafts]]grafts" -msgstr "" +msgstr "[[def_grafts]]greffes" #. type: Plain text #: en/glossary-content.txt:179 #, priority:310 msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." -msgstr "" +msgstr "Une greffe permet de relier deux lignes de d챕veloppement diff챕rentes en enregistrant de fausses informations d'ascendance pour les commits. De cette fa챌on, vous pouvez faire croire 횪 Git que l'ensemble des <<def_parent,parents>> d'un <<def_commit,commit>> est diff챕rent de ce qui a 챕t챕 enregistr챕 lors de la cr챕ation du commit. Configur챕 via le fichier `.git/info/grafts`." #. type: Plain text #: en/glossary-content.txt:183 #, priority:310 msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing." -msgstr "" +msgstr "Notez que le m챕canisme de greffes est d챕pass챕 et peut conduire 횪 des probl챔mes de transfert d'objets entre d챕p척ts ; voir linkgit:git-replace[1] pour un syst챔me plus flexible et plus robuste pour faire la m챗me chose." #. type: Labeled list #: en/glossary-content.txt:184 #, no-wrap, priority:310 msgid "[[def_hash]]hash" -msgstr "" +msgstr "[[def_hash]]hachage" #. type: Plain text #: en/glossary-content.txt:186 #, priority:310 msgid "In Git's context, synonym for <<def_object_name,object name>>." -msgstr "" +msgstr "Dans le contexte de Git, synonyme de <<def_object_name,nom de l'objet>>." #. type: Labeled list #: en/glossary-content.txt:187 #, no-wrap, priority:310 msgid "[[def_head]]head" -msgstr "" +msgstr "[[def_head]]t챗te" #. type: Plain text #: en/glossary-content.txt:192 #, priority:310 msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)" -msgstr "" +msgstr "Une <<def_ref,r챕f챕rence nomm챕e>> au <<def_commit,commit>> au sommet d'une <<def_branch,branche>>. Les t챗tes sont stock챕es dans un fichier dans le r챕pertoire `$GIT_DIR/refs/heads/`, sauf lors de l'utilisation de refs empaquet챕es. (Voir linkgit:git-pack-refs[1].)" #. type: Labeled list #: en/glossary-content.txt:193 #, no-wrap, priority:310 msgid "[[def_HEAD]]HEAD" -msgstr "" +msgstr "[[def_HEAD]]HEAD" #. type: Plain text #: en/glossary-content.txt:200 #, priority:310 msgid "The current <<def_branch,branch>>. In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit." -msgstr "" +msgstr "La <<def_branch,branche>> actuelle. Plus en d챕tail : Votre <<def_working_tree, arbre de travail>> est normalement d챕riv챕 de l'챕tat de l'arbre auquel fait r챕f챕rence HEAD. HEAD est une r챕f챕rence 횪 l'un des <<def_head,t챗tes>> de votre d챕p척t, sauf si vous utilisez une <<def_detached_HEAD,HEAD d챕tach챕e>>, auquel cas elle fait directement et librement r챕f챕rence 횪 un commit." #. type: Labeled list #: en/glossary-content.txt:201 #, no-wrap, priority:310 msgid "[[def_head_ref]]head ref" -msgstr "" +msgstr "[[def_head_ref]]r챕f. t챗te" #. type: Plain text #: en/glossary-content.txt:203 #, priority:310 msgid "A synonym for <<def_head,head>>." -msgstr "" +msgstr "Un synonyme de <<def_head,t챗te>>." #. type: Labeled list #: en/glossary-content.txt:204 #, no-wrap, priority:310 msgid "[[def_hook]]hook" -msgstr "" +msgstr "[[def_hook]]crochet" #. type: Plain text #: en/glossary-content.txt:213 #, priority:310 msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable." -msgstr "" +msgstr "Au cours de l'ex챕cution normale de plusieurs commandes Git, des appels sont faits 횪 des scripts optionnels qui permettent 횪 un d챕veloppeur d'ajouter des fonctionnalit챕s ou des v챕rifications. Typiquement, les crochets permettent de pr챕-v챕rifier une commande et de l'interrompre 챕ventuellement, et permettent une post-notification une fois l'op챕ration effectu챕e. Les scripts de crochet se trouvent dans le r챕pertoire `$GIT_DIR/hooks/`, et sont activ챕s en retirant simplement le suffixe `.sample` du nom du fichier. Dans les versions pr챕c챕dentes de Git, vous deviez les rendre ex챕cutables." #. type: Labeled list #: en/glossary-content.txt:214 #, no-wrap, priority:310 msgid "[[def_index]]index" -msgstr "" +msgstr "[[def_index]]index" #. type: Plain text #: en/glossary-content.txt:220 #, priority:310 msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>." -msgstr "" +msgstr "Une collection de fichiers contenant des informations sur les statuts, dont le contenu est stock챕 sous forme d'objets. L'index est une version stock챕e de votre <<def_working_tree,arbre de travail>>. � vrai dire, il peut aussi contenir une deuxi챔me, voire une troisi챔me version d'un arbre de travail, qui sont utilis챕es lors de <<def_merge,fusions>>." #. type: Labeled list #: en/glossary-content.txt:221 #, no-wrap, priority:310 msgid "[[def_index_entry]]index entry" -msgstr "" +msgstr "[[def_index_entry]]entr챕e d�셢ndex" #. type: Plain text #: en/glossary-content.txt:226 #, priority:310 msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)." -msgstr "" +msgstr "Les informations concernant un fichier particulier, stock챕es dans l'<<def_index,index>>. Une entr챕e d'index peut 챗tre non-fusionn챕e, si une <<def_merge,fusion>> a 챕t챕 lanc챕e, mais pas encore termin챕 (c'est-횪-dire si l'index contient plusieurs versions de ce fichier)." #. type: Labeled list #: en/glossary-content.txt:227