Merge remote-tracking branch 'upstream/pull/4037'

Merge remote-tracking branch 'upstream/pull/4035'

Bump eslint from 8.40.0 to 8.41.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.40.0 to 8.41.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.40.0...v8.41.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump leaflet from 1.9.3 to 1.9.4

Bumps [leaflet](https://github.com/Leaflet/Leaflet) from 1.9.3 to 1.9.4.
- [Release notes](https://github.com/Leaflet/Leaflet/releases)
- [Changelog](https://github.com/Leaflet/Leaflet/blob/v1.9.4/CHANGELOG.md)
- [Commits](https://github.com/Leaflet/Leaflet/compare/v1.9.3...v1.9.4)

---
updated-dependencies:
- dependency-name: leaflet
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Localisation updates from https://translatewiki.net.

Update minimum ruby version to 3.0

Add rubocop-factory_bot and fix warnings

Update bundle

Merge remote-tracking branch 'upstream/pull/4034'

Bump qs from 6.11.1 to 6.11.2

Bumps [qs](https://github.com/ljharb/qs) from 6.11.1 to 6.11.2.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.11.1...v6.11.2)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Update bundle

Localisation updates from https://translatewiki.net.

Merge remote-tracking branch 'upstream/pull/4029'

Bump eslint from 8.39.0 to 8.40.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.39.0 to 8.40.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.39.0...v8.40.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Update bundle

Localisation updates from https://translatewiki.net.

Merge remote-tracking branch 'upstream/pull/4013'

Merge remote-tracking branch 'upstream/pull/4026'

Bump osm-community-index from 5.5.1 to 5.5.2

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.5.1 to 5.5.2.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.5.1...v5.5.2)

---
updated-dependencies:
- dependency-name: osm-community-index
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Localisation updates from https://translatewiki.net.

Merge remote-tracking branch 'upstream/pull/4024'

Update to iD v2.25.2

Merge remote-tracking branch 'upstream/pull/4023'

Merge remote-tracking branch 'upstream/pull/4021'

Use rails to migrate database for vagrant

This brings the vagrant provisioning script into line with the
installation notes, docker and CI.

Remove apache packages from install instructions and vagrant provisioning

These are unnecessary for development environments, and are not used in
the Fedora instructions nor in the Dockerfile.

Update bundle

Merge remote-tracking branch 'upstream/pull/4020'

Bump js-cookie from 3.0.4 to 3.0.5

Bumps [js-cookie](https://github.com/js-cookie/js-cookie) from 3.0.4 to 3.0.5.
- [Release notes](https://github.com/js-cookie/js-cookie/releases)
- [Changelog](https://github.com/js-cookie/js-cookie/blob/main/.release-it.json)
- [Commits](https://github.com/js-cookie/js-cookie/compare/v3.0.4...v3.0.5)

---
updated-dependencies:
- dependency-name: js-cookie
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Localisation updates from https://translatewiki.net.

Merge remote-tracking branch 'upstream/pull/4017'

Merge remote-tracking branch 'upstream/pull/4016'

Merge remote-tracking branch 'upstream/pull/4014'

Merge remote-tracking branch 'upstream/pull/4011'

Bump eslint from 8.38.0 to 8.39.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.38.0 to 8.39.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.38.0...v8.39.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump js-cookie from 3.0.1 to 3.0.4

Bumps [js-cookie](https://github.com/js-cookie/js-cookie) from 3.0.1 to 3.0.4.
- [Release notes](https://github.com/js-cookie/js-cookie/releases)
- [Changelog](https://github.com/js-cookie/js-cookie/blob/main/.release-it.json)
- [Commits](https://github.com/js-cookie/js-cookie/compare/v3.0.1...v3.0.4)

---
updated-dependencies:
- dependency-name: js-cookie
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump osm-community-index from 5.5.0 to 5.5.1

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.5.0 to 5.5.1.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.5.0...v5.5.1)

---
updated-dependencies:
- dependency-name: osm-community-index
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Update docker compose to solve stray PID problem

Resolves https://github.com/OpenHistoricalMap/issues/issues/516

Bump coverallsapp/github-action from 2.1.0 to 2.1.2

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.1.0 to 2.1.2.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.1.0...v2.1.2)

---
updated-dependencies:
- dependency-name: coverallsapp/github-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Update bundle

Remove incorrect translations

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Merge remote-tracking branch 'upstream/pull/4007'

Add some validations for i18n values

These only apply to the en.yml file for now, but can be expanded
in due course.

Update bundle

Remove incorrect translations

Update rubocop todo

Update bundle

Merge remote-tracking branch 'upstream/pull/4004'

Merge remote-tracking branch 'upstream/pull/4002'

Update URLs to use https

Closes #4000

Bump coverallsapp/github-action from 1.2.4 to 2.1.0

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 1.2.4 to 2.1.0.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v1.2.4...v2.1.0)

---
updated-dependencies:
- dependency-name: coverallsapp/github-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Localisation updates from https://translatewiki.net.

Bump eslint from 8.37.0 to 8.38.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.37.0 to 8.38.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.37.0...v8.38.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Localisation updates from https://translatewiki.net.

Update bundle

Merge remote-tracking branch 'upstream/pull/3999'

Rework note events to avoid raw html in translations

Rework geocoder titles to avoid raw html in translations

Rework the map attribution to avoid raw html in translations.

Rework the help text to avoid raw html in translations

Unfortunately bootstrap_form has no method for passing interpolation
values to the automatic help text system, so instead we'll use an
explicit override.

Avoid raw html in translations for the note icon

Merge remote-tracking branch 'upstream/pull/3990'

Merge remote-tracking branch 'upstream/pull/3985'

Merge remote-tracking branch 'upstream/pull/3986'

Rework browse pages to avoid raw html in translations

Avoid raw html in translations for changeset comments

Avoid using raw html in translations for the issues index

Avoid using raw html in translations on the about page

Bump eslint from 8.36.0 to 8.37.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.36.0 to 8.37.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.36.0...v8.37.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Update bundle

Localisation updates from https://translatewiki.net.

Remove unused small.scss symlinks

These should have been removed as part of 5ab682dbbdc0bc4034d1c93aae3d082dae09fa65

Merge remote-tracking branch 'upstream/pull/3983'

Avoid using raw html in credit translations

Avoid using raw html in translations on the copyright page

Merge remote-tracking branch 'upstream/pull/3982'

Merge remote-tracking branch 'upstream/pull/3981'

Merge pull request #3973 from tomhughes/one

Include count in messages for the "one" plural category

Fix indentation

Use with_locale for the copyright page

This avoids having to override the locale on each and every translation

Use .with_locale for about page

This simplifies the code, since we can avoid having to specify the
locale for every translation.

The test was added since I originally developed another approach,
but that caused exceptions on invalid locales.

Remove the language block from around the original guidance

The guidance is shown in the user's own language, not in english.

Remove the language block from around the guidance

This was unnecessary and also incorrect. The guidance is shown in the users
own language, not in the @locale of the copyright statement, and so
doesn't need any language wrapping and certainly not stating that it's in
the @locale.

Update bundle

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Include count in messages for the "one" plural category

Update bundle

Merge remote-tracking branch 'upstream/pull/3968'

Localisation updates from https://translatewiki.net.

Remove accidental commit

Fix "load more" button on search results

Fixes #3969

Set the locale when rendering a generic error page

Bump eslint from 8.35.0 to 8.36.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.35.0 to 8.36.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.35.0...v8.36.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Merge pull request #3966 from willemarcel/patch-2

Add space between form and Publish diary button

Add space between form and Publish diary button