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:27:20 +02:00
parent a8b98aae27
commit 0abf8dd8e1
1 changed files with 112 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
omegat/project_save.tmx
View File

@ -42772,6 +42772,38 @@ autrement.</seg>
<seg>M-x edit-abbrevs</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>M-x emerge-buffers</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T092612Z" creationid="Lilian" creationdate="20220502T092612Z">
<seg>M-x emerge-buffers</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>M-x emerge-buffers-with-ancestor</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T092632Z" creationid="Lilian" creationdate="20220502T092632Z">
<seg>M-x emerge-buffers-with-ancestor</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>M-x emerge-files</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T092445Z" creationid="Lilian" creationdate="20220502T092445Z">
<seg>M-x emerge-files</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>M-x emerge-files-with-ancestor</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T092523Z" creationid="Lilian" creationdate="20220502T092523Z">
<seg>M-x emerge-files-with-ancestor</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>M-x eval-buffer</seg>
@ -44465,6 +44497,38 @@ elles ont été inspirées par Maclisp, qui a été écrit dans les années
<seg>Commandes de fusion</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>Merge two buffers with reference to a common ancestor in a third buffer.</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T092707Z" creationid="Lilian" creationdate="20220502T092707Z">
<seg>Fusionne deux tampons avec une référence à un ancêtre commun dans le troisième tampon.</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>Merge two buffers.</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T092630Z" creationid="Lilian" creationdate="20220502T092630Z">
<seg>Fusionne deux tampons.</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>Merge two specified files, with reference to a common ancestor.</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T092610Z" creationid="Lilian" creationdate="20220502T092610Z">
<seg>Fusionne deux fichiers spécifiés, avec une référence à un ancêtre commun.</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>Merge two specified files.</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T092501Z" creationid="Lilian" creationdate="20220502T092501Z">
<seg>Fusionne deux fichiers spécifiés.</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>Merging</seg>
@ -66998,6 +67062,14 @@ si nous continuons,</seg>
<seg>Pour spécifier quel arrangement a votre clavier, utilisez la commande @kbd{M-x quail-set-keyboard-layout}.</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>To start Emerge, run one of these four commands:</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T092441Z" creationid="Lilian" creationdate="20220502T092441Z">
<seg>Pour commencer Emerge, exécutez l'une de ces quatre commandes :</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>To tag image files, mark them in the dired buffer (you can also mark files in Dired from the thumbnail buffer by typing @kbd{m}) and type @kbd{C-t t} (@code{image-dired-tag-files}).</seg>
@ -81853,6 +81925,38 @@ plus tard.</seg>
<seg>emacsver.texi</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>emerge-buffers</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T092613Z" creationid="Lilian" creationdate="20220502T092613Z">
<seg>emerge-buffers</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>emerge-buffers-with-ancestor</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T092633Z" creationid="Lilian" creationdate="20220502T092633Z">
<seg>emerge-buffers-with-ancestor</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>emerge-files</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T092446Z" creationid="Lilian" creationdate="20220502T092446Z">
<seg>emerge-files</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>emerge-files-with-ancestor</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T092525Z" creationid="Lilian" creationdate="20220502T092525Z">
<seg>emerge-files-with-ancestor</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>empty-defun-braces</seg>
@ -89468,6 +89572,14 @@ April 15, 2016 Income tax due.</seg>
<seg>menu-bar</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>merge buffer (Emerge)</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220502T092720Z" creationid="Lilian" creationdate="20220502T092720Z">
<seg>fusionner des tampons (Emerge)</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>merging files</seg>