Skip to content

Commit

Permalink
Merge branch 'master' into 17.2.x-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Nico-Duduf committed May 24, 2024
2 parents 949d041 + 1c0954b commit db32a20
Show file tree
Hide file tree
Showing 9 changed files with 71 additions and 48 deletions.
17 changes: 17 additions & 0 deletions dist/libs/DuAEF.jsxinc
Original file line number Diff line number Diff line change
Expand Up @@ -28186,6 +28186,23 @@ DuAEExpression.Library["isPosition"].expression = ['function isPosition(prop) {'
].join('\n');
DuAEExpression.Library["isPosition"].requirements = [];

/**
* Checks if a property is a shape layer.
* @function
* @param {Property} [lay=thisLayer] - The layer to test
* @return {boolean} true if the prop is a layer
* @category ExpressionLibrary
*/
DuAEExpression.Library["isShapeLayer"] = {};
DuAEExpression.Library["isShapeLayer"].expression = ['function isShapeLayer( lay ) {',
'if (typeof(lay) === \'undefined\')',
'lay = thisLayer;',
'try { if (lay("ADBE Root Vectors Group")) return true; }',
'catch (e) { return false; }',
'}'
].join('\n');
DuAEExpression.Library["isShapeLayer"].requirements = [];

/**
* Checks if a property is spatial
* @function
Expand Down
14 changes: 8 additions & 6 deletions dist/libs/api3.jsxinc

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Scripts/ScriptUI Panels/inc/tr/Duik_es_ES.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Scripts/ScriptUI Panels/inc/tr/Duik_es_ES.json.jsxinc

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Scripts/ScriptUI Panels/inc/tr/Duik_zh_CN.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Scripts/ScriptUI Panels/inc/tr/Duik_zh_CN.json.jsxinc

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions translation/Duik_ar_SA.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: duik\n"
"POT-Creation-Date: 2024-03-26 10:30\n"
"PO-Revision-Date: 2024-04-04 14:47\n"
"PO-Revision-Date: 2024-05-20 01:50\n"
"Last-Translator: \n"
"Language-Team: Arabic\n"
"MIME-Version: 1.0\n"
Expand All @@ -20,17 +20,17 @@ msgstr ""
#: Duik_addAdjustmentLayer.jsx:9
#, qt-format
msgid "Adjustment layer"
msgstr ""
msgstr "طبقة التعديل"

#: Duik_addNull.jsx:13
#, qt-format
msgid "Null"
msgstr ""
msgstr "طبقة وهمية"

#: Duik_addSolid.jsx:9
#, qt-format
msgid "Solid"
msgstr ""
msgstr "طبقة لون واحد"

#: animationLibPanel.jsx:4
#, qt-format
Expand Down Expand Up @@ -466,7 +466,7 @@ msgstr "تعيين المدة بين مفتاحين منقسمين."
#: animationPanel.jsx:433
#, qt-format
msgid "Center"
msgstr "مركز"
msgstr "I want to download duik bassl 2"

#: animationPanel.jsx:435
#, qt-format
Expand Down Expand Up @@ -535,7 +535,7 @@ msgstr ""
#: animationPanel.jsx:523
#, qt-format
msgid "Temporal interpolation"
msgstr ""
msgstr "الاستيعاب الزمني"

#: animationPanel.jsx:530
#, qt-format
Expand All @@ -545,7 +545,7 @@ msgstr "تعيين خيارات المفتاح"
#: animationPanel.jsx:537
#, qt-format
msgid "Roving"
msgstr ""
msgstr "متنقل"

#: animationPanel.jsx:554
#, qt-format
Expand Down Expand Up @@ -610,52 +610,52 @@ msgstr "إعادة تعيين قائمة الإعداد المسبق إلى ال
#: animationPanel.jsx:703
#, qt-format
msgid "Ease presets"
msgstr ""
msgstr "الإعداد المسبق السهل"

#: animationPanel.jsx:730
#, qt-format
msgid "Add new ease preset"
msgstr ""
msgstr "إضافة سهولة جديدة مسبقاً"

#: animationPanel.jsx:755
#, qt-format
msgid "Remove selected ease preset"
msgstr ""
msgstr "إزالة التحديد المسبق للسهولة"

#: animationPanel.jsx:775
#, qt-format
msgid "Pick ease and velocity from selected key."
msgstr ""
msgstr "اختر السهولة والسرعة من المفتاح المحدد."

#: animationPanel.jsx:806
#, qt-format
msgid "Apply ease and velocity to selected keyframes."
msgstr ""
msgstr "تطبيق السهولة والسرعة على أطر المفاتيح المحددة."

#: animationPanel.jsx:810
#, qt-format
msgid "Set ease"
msgstr ""
msgstr "تعيين السهولة"

#: animationPanel.jsx:839
#, qt-format
msgid "Switches in and out eases."
msgstr ""
msgstr "التبديل من الداخل والخارج."

#: animationPanel.jsx:885
#, qt-format
msgid "Apply ease to selected keyframes."
msgstr ""
msgstr "تطبيق السهولة والسرعة على أطر المفاتيح المحددة."

#: animationPanel.jsx:915
#, qt-format
msgid "Switches in and out velocities."
msgstr ""
msgstr "التبديل من الداخل والخارج."

#: animationPanel.jsx:961
#, qt-format
msgid "Apply velocity to selected keyframes."
msgstr ""
msgstr "تطبيق السهولة والسرعة على أطر المفاتيح المحددة."

#: animationPanel.jsx:968
#, qt-format
Expand Down
4 changes: 2 additions & 2 deletions translation/Duik_es_ES.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: duik\n"
"POT-Creation-Date: 2024-03-26 10:30\n"
"PO-Revision-Date: 2024-04-04 14:47\n"
"PO-Revision-Date: 2024-05-23 17:48\n"
"Last-Translator: \n"
"Language-Team: Spanish\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -5859,5 +5859,5 @@ msgstr "Añadir una lista a las propiedades seleccionadas."
#: utils.jsx:721
#, qt-format
msgid "[Alt]: Adds a keyframe to the second slot (and quickly reveal it with [U] in the timeline)."
msgstr ""
msgstr "español"

42 changes: 23 additions & 19 deletions translation/Duik_zh_CN.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: duik\n"
"POT-Creation-Date: 2024-03-26 10:30\n"
"PO-Revision-Date: 2024-04-04 14:47\n"
"PO-Revision-Date: 2024-05-23 06:07\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -2312,7 +2312,7 @@ msgstr "图层排序中..."
#: rig.jsx:164
#, qt-format
msgid "Root"
msgstr ""
msgstr "返回首页"

#: rig.jsx:457
#, qt-format
Expand Down Expand Up @@ -2782,12 +2782,12 @@ msgstr ""
#: bonesPanel.jsx:46
#, qt-format
msgid "By default, bones and artworks are matched using the layer names."
msgstr ""
msgstr "默认情况下,骨头和艺术品使用图层名称匹配。"

#: bonesPanel.jsx:47
#, qt-format
msgid "[Alt]: Use the distance between the layers (using the anchor points of the layers) instead of their names."
msgstr ""
msgstr "[Alt]:使用图层之间的距离 (使用图层的锚点) 而不是他们的名称。"

#: bonesPanel.jsx:64
#, qt-format
Expand Down Expand Up @@ -2836,7 +2836,7 @@ msgstr "颜色"
#: bonesPanel.jsx:204
#, qt-format
msgid "Set the color of the selected layers."
msgstr ""
msgstr "设置选中信封的颜色。"

#: bonesPanel.jsx:206
#, qt-format
Expand Down Expand Up @@ -2931,12 +2931,12 @@ msgstr "更改画面的尺寸。"
#: bonesPanel.jsx:267
#, qt-format
msgid "Envelop stroke color"
msgstr ""
msgstr "笔画笔大小"

#: bonesPanel.jsx:268
#, qt-format
msgid "Set the color of the selected envelops strokes."
msgstr ""
msgstr "设置选中信封的颜色。"

#: bonesPanel.jsx:270
#, qt-format
Expand All @@ -2951,12 +2951,12 @@ msgstr "切换选中骨骼的弹跳"
#: bonesPanel.jsx:276
#, qt-format
msgid "Noodle color"
msgstr ""
msgstr "Noodle 颜色"

#: bonesPanel.jsx:277
#, qt-format
msgid "Set the color of the selected noodles."
msgstr ""
msgstr "设置选中信封的颜色。"

#: bonesPanel.jsx:284
#, qt-format
Expand All @@ -2967,12 +2967,13 @@ msgstr "选取选中的图层"
#, qt-format
msgid "Apply changes.\n\n"
"[Alt]: assigns a random color to each bone."
msgstr ""
msgstr "应用更改。\n\n"
"[Alt]: 为每个图层分配随机的颜色。"

#: bonesPanel.jsx:298
#, qt-format
msgid "Edit bones"
msgstr ""
msgstr "编辑模式"

#: bonesPanel.jsx:392
#, qt-format
Expand Down Expand Up @@ -3542,7 +3543,7 @@ msgstr "选择两个图层来测量它们之间的距离。"
#: constraintsPanel.jsx:143
#, qt-format
msgid "The distance is %1 px"
msgstr ""
msgstr "距离为 %1 px"

#: constraintsPanel.jsx:156
#, qt-format
Expand Down Expand Up @@ -3768,12 +3769,13 @@ msgstr "在任意的关键帧之间对选中的属性进行渐变。"
#, qt-format
msgid "Add pin layers to control spatial properties and Bézier paths.\n"
"[Alt]: Also create tangents for Bézier path properties."
msgstr ""
msgstr "添加图钉图层来控制空间属性和贝塞尔路径。\n"
"[Alt]:不要为贝塞尔路径属性创建切线手柄。"

#: constraintsPanel.jsx:1198
#, qt-format
msgid "Change the opacity of the pins."
msgstr ""
msgstr "更改骨骼的透明度。"

#: constraintsPanel.jsx:1221
#, qt-format
Expand All @@ -3783,7 +3785,7 @@ msgstr "更改此图层所属肢体的名称。"
#: constraintsPanel.jsx:1246
#, qt-format
msgid "Edit pins"
msgstr ""
msgstr "编辑模式"

#: constraintsPanel.jsx:1274
#, qt-format
Expand Down Expand Up @@ -3852,7 +3854,9 @@ msgid "Parent all the selected layers to the last selected one.\n\n"
"[Alt]: Parent only the orphans.\n"
"Or:\n"
"[Ctrl]: Parent layers as a chain, from ancestor to child, in the order of the selection."
msgstr ""
msgstr "上级所有选定的图层到上次选择的图层。\n\n"
"[Alt]: 只是上级孤儿。\n\n"
"[Ctrl][Ctrl] :父层作为一个链,从祖先到子女,按选择顺序排列。"

#: constraintsPanel.jsx:1357
#, qt-format
Expand Down Expand Up @@ -4382,17 +4386,17 @@ msgstr "The bones now come with their envelops, which are references to help you
#: layerManager.jsx:255
#, qt-format
msgid "Setting layers side..."
msgstr ""
msgstr "设置图层旁..."

#: layerManager.jsx:257
#, qt-format
msgid "Setting layers group name..."
msgstr ""
msgstr "设置图层组名称..."

#: layerManager.jsx:259
#, qt-format
msgid "Setting layers name..."
msgstr ""
msgstr "Setting layers name..."

#: mainPanel.jsx:11
#, qt-format
Expand Down

0 comments on commit db32a20

Please sign in to comment.