[Bf-docboard-svn] bf-manual-translations: [5641] trunk/blender_docs/locale/fr/LC_MESSAGES: (fr) Resolved pending conflicts.
Daniel Thonon
noreply at blender.org
Sat Nov 14 22:39:44 CET 2020
Revision: 5641
https://developer.blender.org/rBMT5641
Author: dthonon
Date: 2020-11-14 22:39:43 +0100 (Sat, 14 Nov 2020)
Log Message:
-----------
(fr) Resolved pending conflicts. No more errors during make!
Modified Paths:
--------------
trunk/blender_docs/locale/fr/LC_MESSAGES/addons/lighting/sun_position.po
trunk/blender_docs/locale/fr/LC_MESSAGES/animation/armatures/bones/properties/relations.po
trunk/blender_docs/locale/fr/LC_MESSAGES/animation/armatures/posing/tool_settings.po
trunk/blender_docs/locale/fr/LC_MESSAGES/animation/constraints/tracking/track_to.po
trunk/blender_docs/locale/fr/LC_MESSAGES/modeling/modifiers/generate/mesh_to_volume.po
trunk/blender_docs/locale/fr/LC_MESSAGES/modeling/modifiers/generate/volume_to_mesh.po
trunk/blender_docs/locale/fr/LC_MESSAGES/physics/fluid/type/domain/settings.po
trunk/blender_docs/locale/fr/LC_MESSAGES/physics/rigid_body/properties/dynamics.po
trunk/blender_docs/locale/fr/LC_MESSAGES/render/lights/light_object.po
trunk/blender_docs/locale/fr/LC_MESSAGES/sculpt_paint/brush/cursor.po
trunk/blender_docs/locale/fr/LC_MESSAGES/sculpt_paint/sculpting/tools/line_project.po
trunk/blender_docs/locale/fr/LC_MESSAGES/sculpt_paint/vertex_paint/editing.po
trunk/blender_docs/locale/fr/LC_MESSAGES/troubleshooting/crash.po
trunk/blender_docs/locale/fr/LC_MESSAGES/video_editing/sequencer/strips/transitions/cross.po
Modified: trunk/blender_docs/locale/fr/LC_MESSAGES/addons/lighting/sun_position.po
===================================================================
--- trunk/blender_docs/locale/fr/LC_MESSAGES/addons/lighting/sun_position.po 2020-11-14 19:44:25 UTC (rev 5640)
+++ trunk/blender_docs/locale/fr/LC_MESSAGES/addons/lighting/sun_position.po 2020-11-14 21:39:43 UTC (rev 5641)
@@ -32,7 +32,6 @@
"and date. It is based on the Earth System Research Laboratory's `online "
"calculator <https://www.esrl.noaa.gov/gmd/grad/solcalc>`__."
msgstr ""
-<<<<<<< .mine
"*Sun Position* permet de positionner et d'animer *Sun* (avec un "
"certain degré de précision), afin de simuler l'éclairage naturel du monde"
" réel. Elle utilise des caractéristiques physiques pour positionner le "
@@ -396,7 +395,7 @@
#: ../../manual/addons/lighting/sun_position.rst:186
msgid "Michael Martin (xaire)"
-msgstr ""
+msgstr "Michael Martin (xaire)"
#: ../../manual/addons/lighting/sun_position.rst
msgid "Maintainer"
@@ -412,7 +411,7 @@
#: ../../manual/addons/lighting/sun_position.rst:188
msgid "GPL"
-msgstr ""
+msgstr "GPL"
#: ../../manual/addons/lighting/sun_position.rst
msgid "Support Level"
@@ -424,7 +423,7 @@
#: ../../manual/addons/lighting/sun_position.rst
msgid "Note"
-msgstr ""
+msgstr "Note"
#: ../../manual/addons/lighting/sun_position.rst:190
msgid "This add-on is bundled with Blender."
Modified: trunk/blender_docs/locale/fr/LC_MESSAGES/animation/armatures/bones/properties/relations.po
===================================================================
--- trunk/blender_docs/locale/fr/LC_MESSAGES/animation/armatures/bones/properties/relations.po 2020-11-14 19:44:25 UTC (rev 5640)
+++ trunk/blender_docs/locale/fr/LC_MESSAGES/animation/armatures/bones/properties/relations.po 2020-11-14 21:39:43 UTC (rev 5641)
@@ -95,7 +95,6 @@
":kbd:`M` to show the usual pop-up layers menu. Note that this way, you "
"assign the same layers to all selected bones."
msgstr ""
-<<<<<<< .mine
"dans l'éditeur Vue 3D, utilisez le menu :menuselection:`Armature --> Move"
" Bone To Layer` ou :menuselection:`Pose --> Move Bone To Layer` ou "
"pressez :kbd:`M` pour afficher le menu pop-up *layers* habituel. Notez "
@@ -522,98 +521,4 @@
"Cette fonction est quelque peu étendu/complété par l'outil "
":doc:`pose library </animation/armatures/properties/pose_library>`."
-#~ msgid ""
-#~ "Corrects the transformation inherited from "
-#~ "the parent to remove shear caused "
-#~ "by non-uniform parent scaling and "
-#~ "rotation. The process preserves the bone"
-#~ " direction, length and volume, and "
-#~ "minimally affects roll on average."
-#~ msgstr ""
-#~ "Corrige la transformation héritée du "
-#~ "parent pour supprimer le cisaillement "
-#~ "causé par la mise à l'échelle et"
-#~ " la rotation non uniforme du parent."
-#~ " Le processus préserve la direction, "
-#~ "la longueur et le volume de l'os,"
-#~ " et n'affecte que très peu le "
-#~ "roulis en moyenne."
-
-#~ msgid ""
-#~ "This mode never causes shear and "
-#~ "is natural for connected chains like "
-#~ "limbs and tentacles."
-#~ msgstr ""
-#~ "Ce mode ne provoque jamais de "
-#~ "cisaillement et est naturel pour les "
-#~ "chaînes connectées comme les membres et"
-#~ " les tentacules."
-
-#~ msgid ""
-#~ "When disabled, this will \"break\" the"
-#~ " scale relationship to the bone's "
-#~ "parent."
-#~ "When disabled, this will \"break\" the scale relationship to the bone's "
-#~ "parent."
-#~ "This effectively keeps the uniform part"
-#~ " of the scaling of the parent, "
-#~ "while removing squash and stretch "
-#~ "effects. Uniform scaling never causes "
-#~ "shear."
-#~ msgstr ""
-#~ "Si l'option est désactivée, ceci va "
-#~ "*casser* la relation d'échelle au parent"
-#~ " de l'os."
-
-#~ msgid ""
-#~ "Corrects the transformation inherited from "
-#~ "the parent to remove shear caused "
-#~ "by non-uniform parent scaling and "
-#~ "rotation. The process preserves the bone"
-#~ " direction, length and volume, and "
-#~ "minimally affects roll on average."
-#~ msgstr ""
-#~ "Corrige la transformation héritée du "
-#~ "parent pour supprimer le cisaillement "
-#~ "causé par la mise à l'échelle et"
-#~ " la rotation non uniforme du parent."
-#~ " Le processus préserve la direction, "
-#~ "la longueur et le volume de l'os,"
-#~ " et n'affecte que très peu le "
-#~ "roulis en moyenne."
-
-#~ msgid ""
-#~ "This mode never causes shear and "
-#~ "is natural for connected chains like "
-#~ "limbs and tentacles."
-#~ msgstr ""
-#~ "Ce mode ne provoque jamais de "
-#~ "cisaillement et est naturel pour les "
-#~ "chaînes connectées comme les membres et"
-#~ " les tentacules."
-
-#~ msgid ""
-#~ "This effectively keeps the uniform part"
-#~ " of the scaling of the parent, "
-#~ "while removing squash and stretch "
-#~ "effects. Uniform scaling never causes "
-#~ "shear."
-#~ msgstr ""
-#~ "Cela permet effectivement de conserver "
-#~ "la partie uniforme de la mise à"
-#~ " l'échelle du parent, tout en "
-#~ "supprimant les effets de compression et"
-#~ " d'étirement. Une mise à l'échelle "
-#~ "uniforme ne provoque jamais de "
-#~ "cisaillement."
-
-#~ "Si l'option est désactivée, ceci va *casser* la relation d'échelle au "
-#~ "parent de l'os."
-#~ "Cela permet effectivement de conserver "
-#~ "la partie uniforme de la mise à"
-#~ " l'échelle du parent, tout en "
-#~ "supprimant les effets de compression et"
-#~ " d'étirement. Une mise à l'échelle "
-#~ "uniforme ne provoque jamais de "
-#~ "cisaillement."
-
+#
\ No newline at end of file
Modified: trunk/blender_docs/locale/fr/LC_MESSAGES/animation/armatures/posing/tool_settings.po
===================================================================
--- trunk/blender_docs/locale/fr/LC_MESSAGES/animation/armatures/posing/tool_settings.po 2020-11-14 19:44:25 UTC (rev 5640)
+++ trunk/blender_docs/locale/fr/LC_MESSAGES/animation/armatures/posing/tool_settings.po 2020-11-14 21:39:43 UTC (rev 5641)
@@ -94,7 +94,7 @@
#: ../../manual/animation/armatures/posing/tool_settings.rst:56
msgid ":menuselection:`Sidebar --> Tool --> Options --> Relative Mirror`"
-msgstr ""
+msgstr ":menuselection:`Sidebar --> Tool --> Options --> Relative Mirror`"
#: ../../manual/animation/armatures/posing/tool_settings.rst:58
msgid "Accounts for any relative transformations when using *X-Axis Mirror*."
@@ -102,92 +102,8 @@
#: ../../manual/animation/armatures/posing/tool_settings.rst:62
msgid ":ref:`Naming bones <armature-editing-naming-bones>`."
-msgstr ""
+msgstr ":ref:`Nommer les os <armature-editing-naming-bones>`."
#: ../../manual/animation/armatures/posing/tool_settings.rst:66
msgid "Known Limitations"
msgstr ""
-<<<<<<< .mine
-||||||| .r5325
-
-#~ msgid ""
-#~ "This option enables automatic mirroring "
-#~ "of editing actions along the X "
-#~ "axis. Another very useful tool is "
-#~ "the *X-Axis Mirror* editing option by"
-#~ " :menuselection:`Tool tab --> Options "
-#~ "panel`, while the armature is selected"
-#~ " in *Edit Mode*. When you have "
-#~ "pairs of bones of the same name"
-#~ " with just a different \"side "
-#~ "suffix\" (e.g. \".R\"/\".L\", or "
-#~ "\"_right\"/\"_left\" ...), once this option"
-#~ " is enabled, each time you transform"
-#~ " (move/rotate/scale...) a bone, its \"other"
-#~ " side\" counterpart will be transformed "
-#~ "accordingly, through a symmetry along "
-#~ "the armature local X axis. As most"
-#~ " rigs have at least one axis of"
-#~ " symmetry (animals, humans, ...), it "
-#~ "is an easy way to spare you "
-#~ "half of the editing work!"
-#~ msgstr ""
-
-#~ msgid ":menuselection:`Sidebar region --> Tool --> Pose Options`"
-#~ msgstr ""
-
-#~ msgid ":menuselection:`Sidebar region --> Tool --> Options --> X-Axis Mirror`"
-#~ msgstr ""
-
-#~ msgid ""
-#~ ":menuselection:`Sidebar region --> Tool -->"
-#~ " Options --> Relative Mirror`"
-#~ msgstr ""
-
-=======
-
-#: ../../manual/animation/armatures/posing/tool_settings.rst:68
-msgid "Relative Mirror is not supported with `Auto IK`_ enabled."
-msgstr ""
-
-#~ msgid ""
-#~ "This option enables automatic mirroring "
-#~ "of editing actions along the X "
-#~ "axis. Another very useful tool is "
-#~ "the *X-Axis Mirror* editing option by"
-#~ " :menuselection:`Tool tab --> Options "
-#~ "panel`, while the armature is selected"
-#~ " in *Edit Mode*. When you have "
-#~ "pairs of bones of the same name"
-#~ " with just a different \"side "
-#~ "suffix\" (e.g. \".R\"/\".L\", or "
-#~ "\"_right\"/\"_left\" ...), once this option"
-#~ " is enabled, each time you transform"
-#~ " (move/rotate/scale...) a bone, its \"other"
-#~ " side\" counterpart will be transformed "
-#~ "accordingly, through a symmetry along "
-#~ "the armature local X axis. As most"
-#~ " rigs have at least one axis of"
-#~ " symmetry (animals, humans, ...), it "
-#~ "is an easy way to spare you "
-#~ "half of the editing work!"
-#~ msgstr ""
-
-#~ msgid ":menuselection:`Sidebar region --> Tool --> Pose Options`"
-#~ msgstr ""
-
-#~ msgid ":menuselection:`Sidebar region --> Tool --> Options --> X-Axis Mirror`"
-#~ msgstr ""
-
-#~ msgid ""
-#~ ":menuselection:`Sidebar region --> Tool -->"
-#~ " Options --> Relative Mirror`"
-#~ msgstr ""
-
-#~ msgid "Relative Mirror Limitation"
-#~ msgstr ""
-
-#~ msgid "This option is not supported with `Auto IK`_ enabled."
-#~ msgstr ""
-
->>>>>>> .r5351
Modified: trunk/blender_docs/locale/fr/LC_MESSAGES/animation/constraints/tracking/track_to.po
===================================================================
--- trunk/blender_docs/locale/fr/LC_MESSAGES/animation/constraints/tracking/track_to.po 2020-11-14 19:44:25 UTC (rev 5640)
+++ trunk/blender_docs/locale/fr/LC_MESSAGES/animation/constraints/tracking/track_to.po 2020-11-14 21:39:43 UTC (rev 5641)
@@ -43,22 +43,9 @@
"contrainte facilement contrôlable."
#: ../../manual/animation/constraints/tracking/track_to.rst:16
-<<<<<<< .mine
msgid "This constraint shares a close relationship to the :doc:`Inverse Kinematics constraint </animation/constraints/tracking/ik_solver>` in some ways."
msgstr "Cette contrainte partage une relation étroite avec la :doc:`contrainte Kinematics Inverse "
"</animation/constraints/tracking/ik_solver>` d'une certaine façon."
-||||||| .r5580
-msgid "This constraint shares a close relationship to the :doc:`Inverse Kinematics constraint </animation/constraints/tracking/ik_solver>` in some ways."
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-docboard-svn
mailing list