brandelune
/
documentation_emacs
2
4
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Translated by Lilian

This commit is contained in:
Lilian 2022-05-17 15:59:36 +02:00
parent fb6187e44c
commit 62a9f973f5
1 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
omegat/project_save.tmx
View File

@ -71110,6 +71110,14 @@ les citer pour les employer comme constantes dans un programme.</seg>
<seg>C'est la valeur de @code{abbrev-mode} pour les tampons qui ne la modifient pas.</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>This is typically the result of a failed merge from a version control system update outside VC, due to conflicting changes to a file.</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220517T135935Z" creationid="Lilian" creationdate="20220517T135935Z">
<seg>Il est généralement le résultat d'une fusion échouée à partir d'une mise à jour du système de contrôle de version en-dehors du versionnage, à cause de modifications conflictuelles à un fichier.</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>This is typically used when entering a file name, where @kbd{M-@key{TAB}} can be used a few times to descend in the hierarchy of directories.</seg>
@ -80800,6 +80808,14 @@ des nombres négatifs à virgule flottante, comme dans @samp{- 1.0}.</seg>
<seg>Vous pouvez utiliser @kbd{M-x add-file-local-variable-prop-line} au lieu de taper vous-même les entrées une par une.</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>You can use @kbd{M-x smerge-mode} to turn on Smerge mode, a minor mode for editing output from the @command{diff3} program.</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220517T135803Z" creationid="Lilian" creationdate="20220517T135803Z">
<seg>Il est possible d'utiliser @kbd{M-x smerge-mode} pour activer le mode « Smerge », un mode mineur pour la modification d'une sortie à partir du programme @command{diff3}.</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>You can use @key{SPC} and @key{DEL} in the calendar window to scroll that list up and down, respectively.</seg>
@ -86048,6 +86064,14 @@ plus tard.</seg>
<seg>compare-windows</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>comparing 3 files (@code{diff3})</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220517T135645Z" creationid="Lilian" creationdate="20220517T135645Z">
<seg>comparer 3 fichiers (@code{diff3})</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>comparing files</seg>
@ -90912,6 +90936,14 @@ plus tard.</seg>
<seg>types de caractères, personnaliser</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>failed merges</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220517T135625Z" creationid="Lilian" creationdate="20220517T135625Z">
<seg>fusions échouées</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>fido mode</seg>
@ -98298,6 +98330,14 @@ April 15, 2016 Income tax due.</seg>
<seg>tampon de fusion (Emerge)</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>merges, failed</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220517T135634Z" creationid="Lilian" creationdate="20220517T135634Z">
<seg>fusions, échec</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>merging files</seg>
@ -102389,6 +102429,14 @@ April 15, 2016 Income tax due.</seg>
<seg>small-temporary-file-directory</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>smerge-mode</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220517T135612Z" creationid="Lilian" creationdate="20220517T135612Z">
<seg>smerge-mode</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>soft newline</seg>