* upstream/main:
  Fix parsing of JabRef v5.7 study.yml files (#9124)
  Fix integrity check  for tilde accents in author names (#9097)
  Rework the Define study parameters dialog (#9123)
  Fix parsing of save actions (#9122)
  Fix exception that occurs when saving name formatters (#9121)
  Refine code for BibEntry#replaceDownloadedFile (#9118)

…-user-directory-first

* upstream/main:
  fix l10n
  Compile fix
  Fix parsing of JabRef v5.7 study.yml files (#9124)
  Fix integrity check  for tilde accents in author names (#9097)
  Rework the Define study parameters dialog (#9123)

# Conflicts:
#	CHANGELOG.md

…nto linkedFilesfixesRelative

* 'linkedFilesfixesRelative' of github.com:JabRef/jabref: (52 commits)
  Enable files/files
  Don't show the info button when the authors field content is identical (#9128)
  "study.yml" is static now (#9125)
  fix l10n
  Compile fix
  Fix parsing of JabRef v5.7 study.yml files (#9124)
  Fix integrity check  for tilde accents in author names (#9097)
  Rework the Define study parameters dialog (#9123)
  Fix parsing of save actions (#9122)
  Fix exception that occurs when saving name formatters (#9121)
  Refine code for BibEntry#replaceDownloadedFile (#9118)
  Show a warning in the merge dialog when authors are the same but formatted differently (#9088)
  Fix subdatabase from aux on cli (#9117)
  Visual improvements to LinkedFilesEditor (#9114)
  SLR Remove "last-search-date" (#9116)
  Hide diffs when one of the field values is blank a.k.a no conflict (#9110)
  Squashed 'buildres/csl/csl-locales/' changes from e637746677..b2afeb4d87
  Squashed 'buildres/csl/csl-styles/' changes from c750b6e..8d69f16
  Fix title case capitalization after en-dash characters (#9102)
  Update journal abbrev list (#9109)
  ...

* upstream/main: (111 commits)
  Fix link and remove obsolete FAQ
  Rename 'Close' to 'Cancel' in the External Changes Resolver dialog (JabRef#9130)
  Tiny rephrasing
  Linked files with an absolute path can be opened again (JabRef#9129)
  Oberservable Preferences M (CleanupPreferences) (JabRef#9126)
  fix broken link
  Fix broken link
  Fix old JabRef linked files containing the file directory as element in the filename (JabRef#9046)
  PDFs are not stored next to .bib file if file directory is configured (JabRef#9113)
  Remove double stateManager.activeDatabaseProperty() (JabRef#9127)
  Don't show the info button when the authors field content is identical (JabRef#9128)
  "study.yml" is static now (JabRef#9125)
  fix l10n
  Compile fix
  Fix parsing of JabRef v5.7 study.yml files (JabRef#9124)
  Fix integrity check  for tilde accents in author names (JabRef#9097)
  Rework the Define study parameters dialog (JabRef#9123)
  Fix parsing of save actions (JabRef#9122)
  Fix exception that occurs when saving name formatters (JabRef#9121)
  Refine code for BibEntry#replaceDownloadedFile (JabRef#9118)
  ...