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-03 10:45:48 +02:00
parent 0ccabda3f8
commit 87bdedcad2
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
omegat/project_save.tmx
View File

@ -16122,6 +16122,14 @@ programmeur.</seg>
facultatif @var{divisor}.</seg> facultatif @var{divisor}.</seg>
</tuv> </tuv>
</tu> </tu>
<tu>
<tuv lang="en">
<seg>All differences start in the default-A state (and thus the merge buffer is a copy of the A buffer), except those for which one alternative is preferred (see below).</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220503T084547Z" creationid="Lilian" creationdate="20220503T084547Z">
<seg>Toutes les différences commencent dans l'état par défaut A (le tampon de fusion étant donc une copie du tampon A), sauf ceux dont une alternative est préférée (voir ci-dessous).</seg>
</tuv>
</tu>
<tu> <tu>
<tuv lang="en"> <tuv lang="en">
<seg>All editing commands use the current buffer's mark ring.</seg> <seg>All editing commands use the current buffer's mark ring.</seg>
@ -59716,6 +59724,14 @@ marqueurs.</seg>
<seg>L'entrée du journal apparaît à la date anniversaire du calendrier hébreu et le jour précédent.</seg> <seg>L'entrée du journal apparaît à la date anniversaire du calendrier hébreu et le jour précédent.</seg>
</tuv> </tuv>
</tu> </tu>
<tu>
<tuv lang="en">
<seg>The difference is showing the A or the B state by default, because you haven't made a choice.</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220503T075614Z" creationid="Lilian" creationdate="20220503T075614Z">
<seg>La différence montre l'état A ou B par défaut car vous n'avez pas choisi.</seg>
</tuv>
</tu>
<tu> <tu>
<tuv lang="en"> <tuv lang="en">
<seg>The difference is showing the A version.</seg> <seg>The difference is showing the A version.</seg>
@ -80560,6 +80576,14 @@ plus tard.</seg>
<seg>default-A</seg> <seg>default-A</seg>
</tuv> </tuv>
</tu> </tu>
<tu>
<tuv lang="en">
<seg>default-B</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220503T075523Z" creationid="Lilian" creationdate="20220503T075523Z">
<seg>default-B</seg>
</tuv>
</tu>
<tu> <tu>
<tuv lang="en"> <tuv lang="en">
<seg>default-abbrev-mode</seg> <seg>default-abbrev-mode</seg>