From 203519e27e0443cc463caa2aec209f69825a73a8 Mon Sep 17 00:00:00 2001 From: Lilian Date: Mon, 2 May 2022 11:30:16 +0200 Subject: [PATCH] Translated by Lilian --- omegat/project_save.tmx | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/omegat/project_save.tmx b/omegat/project_save.tmx index 94afe09d..0cd73da8 100644 --- a/omegat/project_save.tmx +++ b/omegat/project_save.tmx @@ -13953,6 +13953,14 @@ key binding = raccourci clavier... 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}). + + + A and B buffers (Emerge) + + + tampons A et B (Emerge) + + A better solution is to use the Emacs server to reduce the number of times you have to start Emacs (@pxref{Emacs Server}). @@ -57040,6 +57048,14 @@ de Lisp également. L'organiseur Emacs. + + + 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. + + + 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. + + The Ethiopic calendar is identical in structure, but has different year numbers and month names. @@ -89576,8 +89592,8 @@ April 15, 2016 Income tax due. merge buffer (Emerge) - - fusionner des tampons (Emerge) + + tampon de fusion (Emerge)