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

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

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

Consistent plural forms for browse.way.nodes_count

Without this, translatewiki's validator shows an error for English.

Bump eslint from 8.44.0 to 8.45.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.44.0 to 8.45.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.44.0...v8.45.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 coverallsapp/github-action from 2.2.0 to 2.2.1

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.2.0...v2.2.1)

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

Remove default imagery blacklist

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

Block mapy.cz as non-approved imagery

Issue: https://github.com/openstreetmap/openstreetmap-website/issues/4085

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

Update to iD v2.26.2

Localisation updates from https://translatewiki.net.

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

Bump osm-community-index from 5.5.3 to 5.5.4

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.5.3 to 5.5.4.
- [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.3...v5.5.4)

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

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

Update to iD v2.26.1

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

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

Avoid using sprockets for combining stylesheets

There are two options for combining stylesheets, using sprockets
(via `require` statements) or using sass (via `@import` statements).

This commit switches to using `@import` statements throughout, to
avoid a bug with libsass that prevents us from using bootstrap 5.2+

See https://github.com/sass/sassc-rails/issues/174

Since R2 is not triggered when `@import`ing a file, we need to
switch the top-level stylesheet names to include the extension. We
can also take the opportunity to remove a level of indirection,
along with removing symlinks which cause problems on some platforms.

* https://github.com/openstreetmap/openstreetmap-website/issues/3984
* https://github.com/openstreetmap/openstreetmap-website/issues/3422

Update to iD v2.26.0

Update bundle

Localisation updates from https://translatewiki.net.

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

Bump sanitize from 6.0.1 to 6.0.2

Bumps [sanitize](https://github.com/rgrove/sanitize) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/main/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v6.0.1...v6.0.2)

---
updated-dependencies:
- dependency-name: sanitize
  dependency-type: direct:production
...

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

Localisation updates from https://translatewiki.net.

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

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

Avoid using the zero key for pluralisation in English

This makes it impossible to translate to other languages that use the
`zero:` key, e.g. for other numbers that end in zero.

An alternative approach would be possible in future, when ruby-i18n
and rails and translatewiki all have full support for `0:` and `1:` keys.

Fixes #3997

Expand raw html checks to all translation files

This closes a potential security issue, where unreviewed html could
be added via translation files.

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

Remove obsolete pt-BR.yml translation file

Translatewiki now pushes pt-BR to pt.yml, which is used for both
pt and pt-BR.

Fixes #3670.

Update bundle

Localisation updates from https://translatewiki.net.

Update bundle

Update to rails 7.0.6

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

Fix confirmation prompt when granting or revoking roles

Bump eslint from 8.43.0 to 8.44.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.43.0 to 8.44.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.43.0...v8.44.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.

Fix new rubocop warnings

Update bundle

Update to rails 7.0.5.1

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Update bundle

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

Bump osm-community-index from 5.5.2 to 5.5.3

Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.5.2 to 5.5.3.
- [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.2...v5.5.3)

---
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/4068'

Bump eslint from 8.42.0 to 8.43.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.42.0 to 8.43.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.42.0...v8.43.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.

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

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

Use Time.utc for consistency with other tests

This also allows times to be created in short form, e.g. Time.utc(2020)

Fix test to work in non-UK timezones

Time.new(...).utc is not the same as Time.utc(...). The
first creates a given date in local time, and then converts that to
utc, whereas the second creates the given time in UTC.

Merge pull request #3907 from Dimitar5555/patch-1

Facelift `offline.html` and use Bootstrap classes for "notifications" under the search bar

Merge pull request #4061 from stalker314314/master

rerun script/misc/update-wiki-pages

Update bundle

Localisation updates from https://translatewiki.net.

Merge pull request #4062 from stalker314314/fix-erb-lint-copyright

Fix ERB Lint for copyright page

Fix ERB Lint for copyright

update wiki pages

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

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

Adding information about Serbia sources

Localisation updates from https://translatewiki.net.

Bump coverallsapp/github-action from 2.1.2 to 2.2.0

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.1.2 to 2.2.0.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v2.1.2...v2.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>

Fix new rubocop warnings

Update bundle

Localisation updates from https://translatewiki.net.

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

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

Clarify that symlinks refers to git not the operating system

Bump eslint from 8.41.0 to 8.42.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.41.0 to 8.42.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.41.0...v8.42.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.

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

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

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

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

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

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

Simplify ruby installations

Refs #4048

* We don't currently need a specific version suffix on the package names,
  since ubuntu only ships with one ruby version (and newer versions on
  e.g. 23.04 are fine).
* We don't need to explicitly install libruby, since it's pulled in by
  other packages as required.
* Ubuntu again ships a decent enough version of bundler for our needs,
  so we don't need to install it via rubygems.

Silence image_optim warnings in development

Lots of new developers see this during configuration (e.g. rails
db:migrate) and then spend time trying to fix them. So let's avoid
the warnings entirely.

Ignore .bundle/config

This can be created by passing flags to bundler, such as the ones
used in our vagrant provisioning

Use the db:create command for vagrant provisioning

This is to align with the INSTALL.md instructions

Use default version of node, but use npm to install yarn

* Node 12 is sufficient for now, and aligns with INSTALL.md and vagrant
* Upstream yarnpkg is completely broken, see
  https://bugs.launchpad.net/ubuntu/+source/node-yarnpkg/+bug/2003697

Refs #4048

Update vagrant provisioning for 22.04

Refs #4048

* geckodriver is now inside the firefox snap package
* the yarnpkg package is completely broken, see
  https://bugs.launchpad.net/ubuntu/+source/node-yarnpkg/+bug/2003697

Update workflows to run on Ubuntu 22.04

Normalise timestamp types for database structure comparison

Update bundle

Update to rails 7.0.5

Localisation updates from https://translatewiki.net.

Localisation updates from https://translatewiki.net.

Limit coveralls to reading lcov output

Fixes #4043

Update bundle

Get docker working on Ubuntu 22.04

Localisation updates from https://translatewiki.net.

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>