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 11:45:47 +02:00
parent 874fa4ea29
commit 4c8323abd8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
omegat/project_save.tmx
View File

@ -67432,6 +67432,14 @@ si nous continuons,</seg>
<seg>Ainsi, deux commandes @kbd{C-k} sans argument peuvent couper une ligne non vide, exactement comme @kbd{C-k} avec un argument de 1.</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>Thus, where the A buffer agrees with the common ancestor, the B version is preferred, because chances are it is the one that was actually changed.</seg>
</tuv>
<tuv lang="fr" changeid="Lilian" changedate="20220503T094547Z" creationid="Lilian" creationdate="20220503T094547Z">
<seg>Donc, lorsque le tampon A est en accord avec l'ancêtre commun, la version B est préférée car il est probable que celle-ci ait été en réalité modifiée.</seg>
</tuv>
</tu>
<tu>
<tuv lang="en">
<seg>Thus, while moving sequentially, you can effectively make the A version the default for some sections of the merge buffer and the B version the default for others by using @kbd{d a} and @kbd{d b} between sections.</seg>