GitLab

(cherry picked from commit 7cde8eac)

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"

It actually has nothing to do with Solid

This pre-selects date/time, the country for searching stops and the
departure stop if available based on the current timeline position,
as long as that is in the future.

Needed by the (still disabled) add train trip feature, and eventually also
to replace our own QSFPM QML exports.

Happens when we add from a journey query rather than import a booking
document.

So far this is only enabled in development mode due to depending on
unreleased dependencies.

This should enable reuse of JourneyQueryPage for adding new timeline
elements from arbitrary journey queries.

Now also with proper test coverage.

That's needed for completing the base data (coordinates, timezones,
transport modes, etc), not yet for realtime disruption data.