Automated merge from 20.0 to 21.0 by tool pullmerge.sh

This commit is contained in:
Laurent Destailleur 2026-06-10 19:08:51 +02:00
commit 2b3909aa85

View file

@ -62,9 +62,8 @@ exit_code=0
grep --no-filename -r -oP -- '^([^#=]+?)(?=\s*=.*)' "${LANG_DIR}" \
| grep -x -v -F -f "${EXCLUDE_KEYS_SRC_FILE}" \
| sort > "${AVAILABLE_FILE_NODEDUP}"
sort -u \
< "${AVAILABLE_FILE_NODEDUP}" \
> "${AVAILABLE_FILE}"
# sort -u is buggued in ubutnu 26.04. The line StatusProspect-1 and StatusProspect1 are treated as similar lines Replaced with "uniq".
uniq < "${AVAILABLE_FILE_NODEDUP}" > "${AVAILABLE_FILE}"
# Combine strings found in sources with pre-determined dynamic string values.