From de3474b77fa8c0dbad40b80f95dea7c8fbb26286 Mon Sep 17 00:00:00 2001 From: nadena-dev-ci Date: Tue, 11 Mar 2025 13:36:39 +0900 Subject: [PATCH] Update source file en-US.json --- Editor/Localization/en-US.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Editor/Localization/en-US.json b/Editor/Localization/en-US.json index e01648df..4f05dd76 100644 --- a/Editor/Localization/en-US.json +++ b/Editor/Localization/en-US.json @@ -78,6 +78,9 @@ "merge_animator.relative_path_root.tooltip": "The root object to use when interpreting relative paths. If not specified, the object this component is attached to will be used.", "merge_animator.layer_priority": "Layer Priority", "merge_animator.layer_priority.tooltip": "Controls the order in which layers are merged into the animator - lower to higher. Negative values are merged before the original layer on the avatar descriptor, while zero and positive numbers are merged after.", + "merge_animator.merge_mode": "Merge Mode", + "merge_animator.merge_mode.Append": "Append to Animator", + "merge_animator.merge_mode.Replace": "Replace Existing Animator", "merge_armature.lockmode": "Position sync mode", "merge_armature.lockmode.not_locked.title": "Not locked", "merge_armature.lockmode.not_locked.body": "Merged armature does not sync its position with the base avatar.", @@ -154,6 +157,8 @@ "error.replace_object.replacing_replacement": "[MA-0009] The same target object cannot be specified in multiple Replace Object components", "error.replace_object.parent_of_target": "[MA-0010] The target object cannot be a parent of this object", "error.singleton": "[MA-0011] Only one instance of {0} is allowed in an avatar", + "error.merge_animator.multiple_replacements": "[MA-0012] Multiple Merge Animators are trying to replace the same layer", + "error.merge_animator.multiple_replacements:hint": "Because the 'Replace' mode of Merge Animator replaces the entire animator with a different one, it's not clear which of these you wanted to have win. Try either deleting all but one of these Merge Animators, or setting them to Append mode.", "validation.blendshape_sync.no_local_renderer": "[MA-1000] No renderer found on this object", "validation.blendshape_sync.no_local_renderer:hint": "Blendshape Sync acts on a Skinned Mesh Renderer on the same GameObject. Did you attach it to the right object?", "validation.blendshape_sync.no_local_mesh": "[MA-1001] No mesh found on the renderer on this object",