This is an automated email from the ASF dual-hosted git repository. linkinstar pushed a commit to branch dev in repository https://gitbox.apache.org/repos/asf/answer.git
commit 3ddec99837df6fe3cc6e572390ed65d51bacba1a Merge: fbb877ab 216786a6 Author: LinkinStars <[email protected]> AuthorDate: Thu Dec 11 15:12:43 2025 +0800 Merge remote-tracking branch 'origin/main' into dev # Conflicts: # i18n/pl_PL.yaml # i18n/tr_TR.yaml Makefile | 2 +- README.md | 2 +- i18n/cs_CZ.yaml | 6 +-- i18n/cy_GB.yaml | 4 +- i18n/da_DK.yaml | 4 +- i18n/de_DE.yaml | 4 +- i18n/en_US.yaml | 5 +- i18n/es_ES.yaml | 4 +- i18n/fa_IR.yaml | 4 +- i18n/fr_FR.yaml | 4 +- i18n/hi_IN.yaml | 4 +- i18n/id_ID.yaml | 8 ++-- i18n/it_IT.yaml | 4 +- i18n/ja_JP.yaml | 6 +-- i18n/ko_KR.yaml | 4 +- i18n/ml_IN.yaml | 4 +- i18n/pl_PL.yaml | 8 ++-- i18n/pt_PT.yaml | 4 +- i18n/ro_RO.yaml | 4 +- i18n/ru_RU.yaml | 5 +- i18n/sk_SK.yaml | 4 +- i18n/sv_SE.yaml | 4 +- i18n/te_IN.yaml | 4 +- i18n/tr_TR.yaml | 10 ++-- i18n/uk_UA.yaml | 4 +- i18n/vi_VN.yaml | 4 +- i18n/zh_CN.yaml | 4 +- i18n/zh_TW.yaml | 4 +- ui/src/common/sideNavLayout.scss | 9 ++-- ui/src/components/Comment/index.tsx | 2 +- ui/src/components/Footer/index.tsx | 56 ++++++++++++---------- ui/src/components/SchemaForm/components/Input.tsx | 2 +- ui/src/index.scss | 6 +-- ui/src/pages/Admin/Badges/index.tsx | 2 +- ui/src/pages/Admin/Smtp/index.tsx | 4 +- ui/src/pages/Admin/index.tsx | 8 +++- .../Questions/Detail/components/Answer/index.tsx | 2 +- .../Questions/Detail/components/Question/index.tsx | 2 +- ui/src/pages/SideNavLayout/index.tsx | 8 +++- ui/src/services/admin/badges.ts | 2 +- ui/template/footer.html | 34 +++++++------ 41 files changed, 142 insertions(+), 123 deletions(-) diff --cc i18n/pl_PL.yaml index c5c97d11,7cf88431..a8d7b064 --- a/i18n/pl_PL.yaml +++ b/i18n/pl_PL.yaml @@@ -864,8 -864,7 +864,8 @@@ ui <li><p class="mb-2">twórz bloki kodu przy pomocy potrójnych odwrotnych apostrofów <code>`</code></p> <pre class="mb-0"><code>```<br/>kod tutaj<br/>```</code></pre> </li> -- </ul> - pagination: ++ ++ </ul> prev: Poprzedni next: Następny page_title: diff --cc i18n/tr_TR.yaml index 86a6321c,802a81f6..970ae8cb --- a/i18n/tr_TR.yaml +++ b/i18n/tr_TR.yaml @@@ -234,8 -234,8 +234,8 @@@ backend other: Güncelleme izni yok. content_cannot_empty: other: İçerik boş olamaz. - content_less_than_minumum: + content_less_than_minimum: - other: Not enough content entered. + other: Yeterli içerik girilmedi. rank: fail_to_meet_the_condition: other: İtibar seviyesi koşulu karşılamıyor.
