GitLab

A somewhat structured PDF with a QR code

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"

(cherry picked from commit 9033bd84)

That now has a leading 0 in its minor version number.

(cherry picked from commit ed6ddeb3)

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"

BUG: 424853

Other systems don't have that and instead use Asia/Shanghai as defined
in the timezone database. This caused different timezone lookup results
in the vicinity of China on those systems, like in the HKG test.

We no explicitly check for this when generating our timezone tables.

This is now possible that Wikidata got that information, and enables for
example Thalys barcodes to be matched to the correct stations.

This also includes a bit of refactoring of the station identifier db
generation to get rid of some of the code duplication there.

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"