This is an automated email from the ASF dual-hosted git repository. linkinstar pushed a commit to branch release/1.4.2 in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
commit 2e4e02879756891bd0428388516617151f51fa1e Merge: b5235996 6ae18901 Author: LinkinStars <[email protected]> AuthorDate: Mon Dec 9 15:54:37 2024 +0800 Merge branch 'main' into release/1.4.2 # Conflicts: # i18n/zh_CN.yaml i18n/cs_CZ.yaml | 510 +++++++------ i18n/cy_GB.yaml | 56 +- i18n/da_DK.yaml | 56 +- i18n/de_DE.yaml | 56 +- i18n/es_ES.yaml | 56 +- i18n/fa_IR.yaml | 56 +- i18n/fr_FR.yaml | 56 +- i18n/hi_IN.yaml | 56 +- i18n/id_ID.yaml | 56 +- i18n/it_IT.yaml | 58 +- i18n/ja_JP.yaml | 2188 ++++++++++++++++++++++++++++--------------------------- i18n/ko_KR.yaml | 56 +- i18n/ml_IN.yaml | 40 +- i18n/pl_PL.yaml | 74 +- i18n/pt_PT.yaml | 76 +- i18n/ro_RO.yaml | 62 +- i18n/ru_RU.yaml | 58 +- i18n/sk_SK.yaml | 56 +- i18n/sv_SE.yaml | 70 +- i18n/te_IN.yaml | 56 +- i18n/tr_TR.yaml | 56 +- i18n/uk_UA.yaml | 1196 +++++++++++++++--------------- i18n/vi_VN.yaml | 56 +- i18n/zh_CN.yaml | 57 +- i18n/zh_TW.yaml | 66 +- 25 files changed, 3041 insertions(+), 2142 deletions(-)
