GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

not the most beautiful, but functional

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Requires a bit of refactoring in how we expose data to Grantlee. As that
can't easily do array or map lookups we need to interleave reservation and
state data already on the outside.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Also, make the visual representations of inline actions a bit more compact.

This prevents the corresponding actions from showing up in the UI.

The previous method of only looking of unique fragments of the name worked
reasonably well in Europe, but not in the US. In the US there are many
(regional) airports with overlapping name fragments so that even major
international airports could not be looked up properly. We now also
consider non-unique fragments if they result in a unique subset. This
doesn't impact the database size much, but it significantly improves
the detection of US airports.

This also re-generates the database from latest Wikidata data, reducing
the IATA code conflicts from ~250 to 140 due to upstream fixes.

The previous declarative extractor engine used to do that too, makes e.g.
Eurowings bookings look nicer.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

If we don't find a timezone at the given coordinate, check the
surroundings. This helps with locations close to the coast, where
due to rounding/anti-aliasing we hit water initially.

This reduces the remaining timezone lookup failures from 125 to 89, for
the ~7700 airports.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

This avoids an infinite loop.
Thanks Dmitry Nezhevenko for investigating.

CHANGELOG: Fixed an issue that would cause Plasma to freeze when there was an agenda item with no start date in the calendar

BUG: 367541

Differential Revision: https://phabricator.kde.org/D9811