mirror of
https://github.com/nextcloud/documentation.git
synced 2026-01-04 02:36:49 +07:00
Translate conflicts.pot in fr [Manual Sync]
100% translated source file: 'conflicts.pot' on 'fr'.
This commit is contained in:
committed by
GitHub
parent
ff0b8cc475
commit
dc660defa8
168
user_manual/locale/fr/LC_MESSAGES/desktop/conflicts.pot
Normal file
168
user_manual/locale/fr/LC_MESSAGES/desktop/conflicts.pot
Normal file
@@ -0,0 +1,168 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) 2025 Nextcloud GmbH
|
||||
# This file is distributed under the same license as the Nextcloud latest User Manual package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Luc Van Vlasselaer <news@lv2.com>, 2025
|
||||
# Florian DANIEL aka Facyla <i.daniel.florian@gmail.com>, 2025
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Nextcloud latest User Manual latest\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2025-02-12 13:02+0000\n"
|
||||
"PO-Revision-Date: 2025-02-12 13:33+0000\n"
|
||||
"Last-Translator: Florian DANIEL aka Facyla <i.daniel.florian@gmail.com>, 2025\n"
|
||||
"Language-Team: French (https://app.transifex.com/nextcloud/teams/64236/fr/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: fr\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
|
||||
|
||||
#: ../../desktop/conflicts.rst:3
|
||||
msgid "Conflicts"
|
||||
msgstr "Conflits"
|
||||
|
||||
#: ../../desktop/conflicts.rst:6
|
||||
msgid "Overview"
|
||||
msgstr "Résumé"
|
||||
|
||||
#: ../../desktop/conflicts.rst:8
|
||||
msgid ""
|
||||
"The Nextcloud desktop client uploads local changes and downloads remote "
|
||||
"changes. When a file has changed on the local side and on the remote between"
|
||||
" synchronization runs the client will be unable to resolve the situation on "
|
||||
"its own. It will create a conflict file with the local version, download the"
|
||||
" remote version and notify the user that a conflict occurred which needs "
|
||||
"attention."
|
||||
msgstr ""
|
||||
"Le client de bureau Nextcloud téléverse les modifications locales et "
|
||||
"télécharge les modifications distantes. Si un fichier change en local et à "
|
||||
"distance entre deux synchronisations, le client sera incapable de résoudre "
|
||||
"le problème. Il crée donc un fichier en conflit avec le fichier local, il "
|
||||
"télécharge la version distante et notifie l'utilisateur qu'un conflit s'est "
|
||||
"produit et nécessite une résolution."
|
||||
|
||||
#: ../../desktop/conflicts.rst:15
|
||||
msgid "Example"
|
||||
msgstr "Exemple"
|
||||
|
||||
#: ../../desktop/conflicts.rst:17
|
||||
msgid ""
|
||||
"Imagine there is a file called ``mydata.txt`` your synchronized folder. It "
|
||||
"has not changed for a while and contains the text \"contents\" locally and "
|
||||
"remotely. Now, nearly at the same time you update it locally to say \"local "
|
||||
"contents\" while the file on the server gets updated to contain \"remote "
|
||||
"contents\" by someone else."
|
||||
msgstr ""
|
||||
"Imaginez un fichier nommé \"monfichier.txt\" dans votre dossier synchronisé."
|
||||
" Il n'a pas changé depuis un moment, et contient le texte \"contenu\" "
|
||||
"localement et à distance. Maintenant, quasiment en même temps vous le "
|
||||
"modifiez localement et remplacez le texte par \"contenu local\" pendant que "
|
||||
"sur le serveur quelqu'un met à jour le texte et le remplace par \"contenu "
|
||||
"distant\"."
|
||||
|
||||
#: ../../desktop/conflicts.rst:22
|
||||
msgid ""
|
||||
"When attempting to upload your local changes the desktop client will notice "
|
||||
"that the server version has also changed. It creates a conflict and you will"
|
||||
" now have two files on your local machine:"
|
||||
msgstr ""
|
||||
"Lorsque le client de bureau essaye de téléverser vos modifications locales, "
|
||||
"il va constater que la version serveur a changée. Il crée un conflit et vous"
|
||||
" aurez deux fichiers sur votre machine locale."
|
||||
|
||||
#: ../../desktop/conflicts.rst:26
|
||||
msgid "``mydata.txt`` containing \"remote contents\""
|
||||
msgstr "\"monfichier.txt\" contenant \"contenu distant\""
|
||||
|
||||
#: ../../desktop/conflicts.rst:27
|
||||
msgid ""
|
||||
"``mydata (conflicted copy 2018-04-10 093612).txt`` containing \"local "
|
||||
"contents\""
|
||||
msgstr ""
|
||||
"\"monfichier (copie en conflit 2018-04-10 093612).txt contenant \"contenu "
|
||||
"local\""
|
||||
|
||||
#: ../../desktop/conflicts.rst:29
|
||||
msgid ""
|
||||
"In this situation the file ``mydata.txt`` has the remote changes (and will "
|
||||
"continue to be updated with further remote changes when they happen), but "
|
||||
"your local adjustments have not been sent to the server (unless the server "
|
||||
"enables conflict uploading, see below)."
|
||||
msgstr ""
|
||||
"Dans cette situation, le fichier \"monfichier.txt\" contient les "
|
||||
"modifications distantes (et continuera à être mis à jour avec tous les "
|
||||
"changements distants) , mais vos modifications locales n'ont pas été "
|
||||
"envoyées au serveur (à moins que le serveur autorise le téléversement des "
|
||||
"conflits, voir plus loin)"
|
||||
|
||||
#: ../../desktop/conflicts.rst:34
|
||||
msgid ""
|
||||
"The desktop client notifies you of this situation via system notifications, "
|
||||
"the system tray icon and a yellow \"unresolved conflicts\" badge in the "
|
||||
"account settings window. Clicking this badge shows a list that includes the "
|
||||
"unresolved conflicts and clicking one of them opens an explorer window "
|
||||
"pointing at the relevant file."
|
||||
msgstr ""
|
||||
"Le client de bureau vous informe de cette situation via des notifications "
|
||||
"système, l'icône de la barre d'état système et une vignette jaune \"conflits"
|
||||
" non résolus\" dans les paramètres du compte. Cliquer sur ce badge affiche "
|
||||
"la liste des conflits non résolus et cliquer sur l'un d'entre eux ouvre une "
|
||||
"fenêtre d'exploration qui pointe vers le fichier concerné."
|
||||
|
||||
#: ../../desktop/conflicts.rst:39
|
||||
msgid ""
|
||||
"To resolve this conflict, open both files, compare the differences and copy "
|
||||
"your local changes from the \"conflicted copy\" file into the base file "
|
||||
"where applicable. In this example you might change ``mydata.txt`` to say "
|
||||
"\"local and remote contents\" and delete the file with \"conflicted copy\" "
|
||||
"in its name. With that, the conflict is resolved."
|
||||
msgstr ""
|
||||
"Pour résoudre ce conflit, ouvrez les deux fichiers, comparez les différences"
|
||||
" et copiez les modifications locales du fichier de la \"copie en conflit\" "
|
||||
"dans le fichier de base, le cas échéant. Dans cet exemple, vous pourriez "
|
||||
"modifier ``mydata.txt`` pour indiquer \"contenu local et distant\" et "
|
||||
"supprimer le fichier dont le nom contient \"copie en conflit\". Le conflit "
|
||||
"est ainsi résolu."
|
||||
|
||||
#: ../../desktop/conflicts.rst:46
|
||||
msgid "Uploading conflicts (experimental)"
|
||||
msgstr "Conflits de téléversement (expérimental)"
|
||||
|
||||
#: ../../desktop/conflicts.rst:48
|
||||
msgid ""
|
||||
"By default the conflict file (the file with \"conflicted copy\" in its name "
|
||||
"that contains your local conflicting changes) is not uploaded to the server."
|
||||
" The idea is that you, the author of the changes, are the best person for "
|
||||
"resolving the conflict and showing the conflict to other users might create "
|
||||
"confusion."
|
||||
msgstr ""
|
||||
"Par défaut, le fichier en conflit (le fichier avec le nom \"copie en "
|
||||
"conflit\" qui contient vos modifications locales conflictuelles) n'est pas "
|
||||
"téléversé sur le serveur. L'idée est que vous, l'auteur des modifications, "
|
||||
"êtes la personne la mieux placée pour résoudre le conflit. Le fait de le "
|
||||
"montrer le conflit aux autres utilisateurs pourrait créer de la confusion."
|
||||
|
||||
#: ../../desktop/conflicts.rst:53
|
||||
msgid ""
|
||||
"However, in some scenarios it makes a lot of sense to upload these "
|
||||
"conflicting changes such that local work can become visible even if the "
|
||||
"conflict won't be resolved immediately."
|
||||
msgstr ""
|
||||
"Cependant, dans certains scénarios, il est tout à fait judicieux de "
|
||||
"téléverser ces modifications conflictuelles afin que le travail local puisse"
|
||||
" devenir visible même si le conflit n'est pas résolu immédiatement."
|
||||
|
||||
#: ../../desktop/conflicts.rst:57
|
||||
msgid ""
|
||||
"In the future there might be a server-wide switch for this behavior. For now"
|
||||
" it can already be tested by setting the environment variable "
|
||||
"``OWNCLOUD_UPLOAD_CONFLICT_FILES=1``."
|
||||
msgstr ""
|
||||
"À l'avenir, un changement de comportement à l'échelle du serveur pourrait "
|
||||
"être apporté. Pour l'instant, il est possible de le tester en définissant la"
|
||||
" variable d'environnement « OWNCLOUD_UPLOAD_CONFLICT_FILES=1 »."
|
||||
Reference in New Issue
Block a user