Translated by Lilian
This commit is contained in:
parent
8988935a07
commit
7f230f4148
@ -22913,6 +22913,14 @@ significatif pour la lettre qui indique la base.</seg>
|
|||||||
<seg>Choisit la version A de cette différence.</seg>
|
<seg>Choisit la version A de cette différence.</seg>
|
||||||
</tuv>
|
</tuv>
|
||||||
</tu>
|
</tu>
|
||||||
|
<tu>
|
||||||
|
<tuv lang="en">
|
||||||
|
<seg>Choose the B version as the default from here down in the merge buffer.</seg>
|
||||||
|
</tuv>
|
||||||
|
<tuv lang="fr" changeid="Lilian" changedate="20220503T101243Z" creationid="Lilian" creationdate="20220503T101243Z">
|
||||||
|
<seg>Choisit la version B en tant que version par défaut à partir de maintenant et plus bas dans le tampon de fusion.</seg>
|
||||||
|
</tuv>
|
||||||
|
</tu>
|
||||||
<tu>
|
<tu>
|
||||||
<tuv lang="en">
|
<tuv lang="en">
|
||||||
<seg>Choose the B version of this difference.</seg>
|
<seg>Choose the B version of this difference.</seg>
|
||||||
@ -24334,6 +24342,22 @@ leurs arguments différemment des fonctions (les arguments ne sont pas
|
|||||||
<seg>Copie la région dans le registre @var{r} (@code{copy-to-register}).</seg>
|
<seg>Copie la région dans le registre @var{r} (@code{copy-to-register}).</seg>
|
||||||
</tuv>
|
</tuv>
|
||||||
</tu>
|
</tu>
|
||||||
|
<tu>
|
||||||
|
<tuv lang="en">
|
||||||
|
<seg>Copy the A version of this difference into the kill ring.</seg>
|
||||||
|
</tuv>
|
||||||
|
<tuv lang="fr" changeid="Lilian" changedate="20220503T101258Z" creationid="Lilian" creationdate="20220503T101258Z">
|
||||||
|
<seg>Copie la version A de cette différence dans la mémoire des coupes.</seg>
|
||||||
|
</tuv>
|
||||||
|
</tu>
|
||||||
|
<tu>
|
||||||
|
<tuv lang="en">
|
||||||
|
<seg>Copy the B version of this difference into the kill ring.</seg>
|
||||||
|
</tuv>
|
||||||
|
<tuv lang="fr" changeid="Lilian" changedate="20220503T101326Z" creationid="Lilian" creationdate="20220503T101326Z">
|
||||||
|
<seg>Copie la version B de cette différence dans la mémoire des coupes.</seg>
|
||||||
|
</tuv>
|
||||||
|
</tu>
|
||||||
<tu>
|
<tu>
|
||||||
<tuv lang="en">
|
<tuv lang="en">
|
||||||
<seg>Copy the region-rectangle into register @var{r} (@code{copy-rectangle-to-register}).</seg>
|
<seg>Copy the region-rectangle into register @var{r} (@code{copy-rectangle-to-register}).</seg>
|
||||||
@ -39695,6 +39719,22 @@ appelé Scheme.</seg>
|
|||||||
<seg>Insère le texte depuis le registre @var{r} (@code{insert-register}).</seg>
|
<seg>Insère le texte depuis le registre @var{r} (@code{insert-register}).</seg>
|
||||||
</tuv>
|
</tuv>
|
||||||
</tu>
|
</tu>
|
||||||
|
<tu>
|
||||||
|
<tuv lang="en">
|
||||||
|
<seg>Insert the A version of this difference at point.</seg>
|
||||||
|
</tuv>
|
||||||
|
<tuv lang="fr" changeid="Lilian" changedate="20220503T101342Z" creationid="Lilian" creationdate="20220503T101342Z">
|
||||||
|
<seg>Insère la version A de cette différence au point.</seg>
|
||||||
|
</tuv>
|
||||||
|
</tu>
|
||||||
|
<tu>
|
||||||
|
<tuv lang="en">
|
||||||
|
<seg>Insert the B version of this difference at point.</seg>
|
||||||
|
</tuv>
|
||||||
|
<tuv lang="fr" changeid="Lilian" changedate="20220503T101354Z" creationid="Lilian" creationdate="20220503T101354Z">
|
||||||
|
<seg>Insère la version B de cette différence au point.</seg>
|
||||||
|
</tuv>
|
||||||
|
</tu>
|
||||||
<tu>
|
<tu>
|
||||||
<tuv lang="en">
|
<tuv lang="en">
|
||||||
<seg>Insert the contents of @var{file} into the buffer that is current when this command-line argument is processed.</seg>
|
<seg>Insert the contents of @var{file} into the buffer that is current when this command-line argument is processed.</seg>
|
||||||
@ -51434,6 +51474,14 @@ Content-Transfer-Encoding: 8bit</seg>
|
|||||||
<seg>プッシュトークン</seg>
|
<seg>プッシュトークン</seg>
|
||||||
</tuv>
|
</tuv>
|
||||||
</tu>
|
</tu>
|
||||||
|
<tu>
|
||||||
|
<tuv lang="en">
|
||||||
|
<seg>Put point and mark around the difference.</seg>
|
||||||
|
</tuv>
|
||||||
|
<tuv lang="fr" changeid="Lilian" changedate="20220503T101513Z" creationid="Lilian" creationdate="20220503T101513Z">
|
||||||
|
<seg>Encadre la différence avec le point et la marque.</seg>
|
||||||
|
</tuv>
|
||||||
|
</tu>
|
||||||
<tu>
|
<tu>
|
||||||
<tuv lang="en">
|
<tuv lang="en">
|
||||||
<seg>Putting a file under version control.</seg>
|
<seg>Putting a file under version control.</seg>
|
||||||
@ -53609,6 +53657,14 @@ machine.</seg>
|
|||||||
<seg>Faire défiler le calendrier</seg>
|
<seg>Faire défiler le calendrier</seg>
|
||||||
</tuv>
|
</tuv>
|
||||||
</tu>
|
</tu>
|
||||||
|
<tu>
|
||||||
|
<tuv lang="en">
|
||||||
|
<seg>Scroll all three windows down (like @kbd{M-v}).</seg>
|
||||||
|
</tuv>
|
||||||
|
<tuv lang="fr" changeid="Lilian" changedate="20220503T102030Z" creationid="Lilian" creationdate="20220503T102030Z">
|
||||||
|
<seg>Défile les trois fenêtres vers le bas (comme @kbd{M-v}).</seg>
|
||||||
|
</tuv>
|
||||||
|
</tu>
|
||||||
<tu>
|
<tu>
|
||||||
<tuv lang="en">
|
<tuv lang="en">
|
||||||
<seg>Scroll backward (@code{scroll-down-command}).</seg>
|
<seg>Scroll backward (@code{scroll-down-command}).</seg>
|
||||||
@ -78212,6 +78268,22 @@ plus tard.</seg>
|
|||||||
<seg>c @r{(Dired)}</seg>
|
<seg>c @r{(Dired)}</seg>
|
||||||
</tuv>
|
</tuv>
|
||||||
</tu>
|
</tu>
|
||||||
|
<tu>
|
||||||
|
<tuv lang="en">
|
||||||
|
<seg>c a</seg>
|
||||||
|
</tuv>
|
||||||
|
<tuv lang="fr" changeid="Lilian" changedate="20220503T101247Z" creationid="Lilian" creationdate="20220503T101247Z">
|
||||||
|
<seg>c a</seg>
|
||||||
|
</tuv>
|
||||||
|
</tu>
|
||||||
|
<tu>
|
||||||
|
<tuv lang="en">
|
||||||
|
<seg>c b</seg>
|
||||||
|
</tuv>
|
||||||
|
<tuv lang="fr" changeid="Lilian" changedate="20220503T101315Z" creationid="Lilian" creationdate="20220503T101315Z">
|
||||||
|
<seg>c b</seg>
|
||||||
|
</tuv>
|
||||||
|
</tu>
|
||||||
<tu>
|
<tu>
|
||||||
<tuv lang="en">
|
<tuv lang="en">
|
||||||
<seg>c-mode))))</seg>
|
<seg>c-mode))))</seg>
|
||||||
@ -80592,6 +80664,14 @@ plus tard.</seg>
|
|||||||
<seg>d a</seg>
|
<seg>d a</seg>
|
||||||
</tuv>
|
</tuv>
|
||||||
</tu>
|
</tu>
|
||||||
|
<tu>
|
||||||
|
<tuv lang="en">
|
||||||
|
<seg>d b</seg>
|
||||||
|
</tuv>
|
||||||
|
<tuv lang="fr" changeid="Lilian" changedate="20220503T101236Z" creationid="Lilian" creationdate="20220503T101236Z">
|
||||||
|
<seg>d b</seg>
|
||||||
|
</tuv>
|
||||||
|
</tu>
|
||||||
<tu>
|
<tu>
|
||||||
<tuv lang="en">
|
<tuv lang="en">
|
||||||
<seg>dabbrev-abbrev-char-regexp</seg>
|
<seg>dabbrev-abbrev-char-regexp</seg>
|
||||||
@ -86498,6 +86578,22 @@ plus tard.</seg>
|
|||||||
<seg>i @r{(Dired)}</seg>
|
<seg>i @r{(Dired)}</seg>
|
||||||
</tuv>
|
</tuv>
|
||||||
</tu>
|
</tu>
|
||||||
|
<tu>
|
||||||
|
<tuv lang="en">
|
||||||
|
<seg>i a</seg>
|
||||||
|
</tuv>
|
||||||
|
<tuv lang="fr" changeid="Lilian" changedate="20220503T101329Z" creationid="Lilian" creationdate="20220503T101329Z">
|
||||||
|
<seg>i a</seg>
|
||||||
|
</tuv>
|
||||||
|
</tu>
|
||||||
|
<tu>
|
||||||
|
<tuv lang="en">
|
||||||
|
<seg>i b</seg>
|
||||||
|
</tuv>
|
||||||
|
<tuv lang="fr" changeid="Lilian" changedate="20220503T101344Z" creationid="Lilian" creationdate="20220503T101344Z">
|
||||||
|
<seg>i b</seg>
|
||||||
|
</tuv>
|
||||||
|
</tu>
|
||||||
<tu>
|
<tu>
|
||||||
<tuv lang="en">
|
<tuv lang="en">
|
||||||
<seg>iCalendar support</seg>
|
<seg>iCalendar support</seg>
|
||||||
|
Loading…
Reference in New Issue
Block a user