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

Translated by Lilian

Browse Source
This commit is contained in:
Lilian 2022-05-02 11:30:16 +02:00
parent 0abf8dd8e1
commit 203519e27e
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
omegat/project_save.tmx
View File

@ -13953,6 +13953,14 @@ key binding = raccourci clavier...
<seg>Un démon "background" se déconnecte du terminal et s'exécute en arrière-plan (@samp{--daemon} est un alias pour @samp{--bg-daemon}).</seg> <seg>Un démon "background" se déconnecte du terminal et s'exécute en arrière-plan (@samp{--daemon} est un alias pour @samp{--bg-daemon}).</seg>
</tuv> </tuv>
</tu> </tu>
<tu>
<tuv lang="en">
<seg>A and B buffers (Emerge)</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T092735Z" creationid="Lilian" creationdate="20220502T092735Z">
<seg>tampons A et B (Emerge)</seg>
</tuv>
</tu>
<tu> <tu>
<tuv lang="en"> <tuv lang="en">
<seg>A better solution is to use the Emacs server to reduce the number of times you have to start Emacs (@pxref{Emacs Server}).</seg> <seg>A better solution is to use the Emacs server to reduce the number of times you have to start Emacs (@pxref{Emacs Server}).</seg>
@ -57040,6 +57048,14 @@ de Lisp également.</seg>
<seg>L'organiseur Emacs.</seg> <seg>L'organiseur Emacs.</seg>
</tuv> </tuv>
</tu> </tu>
<tu>
<tuv lang="en">
<seg>The Emerge commands compare two files or buffers, and display the comparison in three buffers: one for each input text (the @dfn{A buffer} and the @dfn{B buffer}), and one (the @dfn{merge buffer}) where merging takes place.</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T093005Z" creationid="Lilian" creationdate="20220502T092903Z">
<seg>Les commandes Emerge comparent deux fichiers ou tampons, et affichent la comparaison dans trois tampons : une pour chaque entrée de texte (le @dfn{tampon A} et le @dfn{tampon B}), et un (le @dfn{tampon de fusion}) où la fusion a lieu.</seg>
</tuv>
</tu>
<tu> <tu>
<tuv lang="en"> <tuv lang="en">
<seg>The Ethiopic calendar is identical in structure, but has different year numbers and month names.</seg> <seg>The Ethiopic calendar is identical in structure, but has different year numbers and month names.</seg>
@ -89576,8 +89592,8 @@ April 15, 2016 Income tax due.</seg>
<tuv lang="en"> <tuv lang="en">
<seg>merge buffer (Emerge)</seg> <seg>merge buffer (Emerge)</seg>
</tuv> </tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T092720Z" creationid="Lilian" creationdate="20220502T092720Z"> <tuv lang="fr" changeid="Lilian" changedate="20220502T093016Z" creationid="Lilian" creationdate="20220502T092720Z">
<seg>fusionner des tampons (Emerge)</seg> <seg>tampon de fusion (Emerge)</seg>
</tuv> </tuv>
</tu> </tu>
<tu> <tu>