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

Merge pull request #3973 from tomhughes/one

Include count in messages for the "one" plural category

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

Drop legacy forums from help page

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

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

Merge pull request #3846 from SK53/osgb-date-2022

Update OSGB date range for copyright

Update copyright date based on LWG request

Document the procedure to change the copyright attribution page

This comes up every now and then, and so let's have the existing procedure documented.

Merge pull request #3958 from tomhughes/geocoder-post

Use POST for geocoder backends

Rework confirmations page to avoid raw html in translations

Rework shared kramdown instructions to avoid html in translations

Remove html from translations for terms page

Remove remaining html in translations from fixthemap page

Refactor communities page to avoid html in translations

Refactor potlatch page to avoid html in translations

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

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

Add the i18n-tasks gem

This can be used for checking our translations, for example to see
if there are unused translations in en.yml

Remove unused user_blocks translations

These checkboxes were removed in 95c3d640a44857b0b92ec3be6dad606e40057c5c

Remove used issues#update translations

These are covered by reports#create, and there is no issues#update
controller method or view.

Remove used translations on the registration page

We use activerecord attributes for this instead

Remove set_home translation

The corresponding method was removed in 2010 with fbe529d87e61ab63bcf749067422ab2cbbb655d0

Remove several unused translations from the user#show page

Use POST for geocoder backends

The geocoder backend calls are a private implementation detail
and using POST enables request forgery checks and makes scraping
of nominatim via the backend calls harder.

Add rubocop-capybara

Update bundle

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

Bump qs from 6.11.0 to 6.11.1

Bumps [qs](https://github.com/ljharb/qs) from 6.11.0 to 6.11.1.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.11.0...v6.11.1)

---
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.

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

Update to iD v2.25.1

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

Localisation updates from https://translatewiki.net.

Bump coverallsapp/github-action from 1.2.2 to 1.2.4

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

---
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>

Fix new rubocop warnings

Update bundle

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

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

Remove duplicate translation key

It's already defined three lines above.

Remove old model name

I doubt this was ever used, but anyway it was made redundant in
4395b79bf72f85543bce8ff3627eb7a0583b5ccc when the class was renamed.

Bump coverallsapp/github-action from 1.2.1 to 1.2.2

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v1.2.1...v1.2.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>

Bump eslint from 8.34.0 to 8.35.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.34.0 to 8.35.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.34.0...v8.35.0)

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

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

Remove translations that are no longer used when showing messages

Remove used translations for new messages

We use the activerecord attribute hierarchy for this

Remove unused translations

These were removed in 6adcce4e5d75fa21dea85742fa3

Bump coverallsapp/github-action to 1.2.1

Localisation updates from https://translatewiki.net.

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

Remove unused tooltip translations

These were removed in 2d9a083b365e5cfa527c40add35464630c1a9b00

Remove unused metro extract translations

Refs 9340c461732ef7387dd453ea3fcf5e64ea782ab4

Remove translations no longer used on the login page

This page was refactored in 2a3bc0a38789b29b8798eafd80fc4fb77c5c7957

Bump coverallsapp/github-action from 1.1.3 to 1.2.0

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 1.1.3 to 1.2.0.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/1.1.3...v1.2.0)

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

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

Localisation updates from https://translatewiki.net.

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

Merge pull request #3935 from Hufkratzer/rename-horse-riding-label

Change label for leisure=horse_riding in en.yml

Rework about page to avoid html in the translations

Remove html from translations for the welcome page

This also refactors the "any questions" section, which is shared with the fixthemap page.

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

Ensure kramdown table alignment styles are converted to bootstrap classes

Adds tests for commit f42a7a2d8dd507a3746a1e2de91deda9614cf807

Refactor trace guidance to avoid raw html in translations

Also rearrange to avoid multiple sentences in a heading.

Refactor translation to avoid raw html tags

Move public editing content into its own partial

This makes the editing page easier to read, and simplifies the i18n
in the public editing section.

Refactor public editing note to avoid raw html in the translations

Update bundle

Localisation updates from https://translatewiki.net.

Change label for leisure=horse_riding in en.yml

Change "Horse Riding" to "Horse Riding Centre"

Localisation updates from https://translatewiki.net.

Update bundle

Localisation updates from https://translatewiki.net.

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

Bump eslint from 8.33.0 to 8.34.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.33.0 to 8.34.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.33.0...v8.34.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 remote-tracking branch 'upstream/pull/3924'

Localisation updates from https://translatewiki.net.

Update to iD v2.24.2

Merge pull request #3691 from AntonKhorev/wikipedia-secondary-links

Link prefixed wikipedia tags

Update bundle

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

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

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

Avoid converting conditional restriction tags into emails

Fixes #3884

Refactor to use submit_tag helper

This is more readable than interpolating into element attributes

Refactor translation strings for notes

These aren't used by any javascript code, so don't need to be in
the `javascripts` key.

Use data attributes to pass alternative button labels

This allows the text to be defined in the html partials, instead
of looking up the i18n via javascript.

Move browse#note to notes#show

This allows a more resourceful routing approach.