Related to #1460

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"

CCBUG: 455140

Related to #1458

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"

CCBUG: 455140

Related to #1453

Nathan Hinton authored Jun 08, 2022 and Julius Künzel committed Jun 08, 2022

Now when the subtitle export feature is used there is a check for the extension and if not present is appended automatically

Fixes #988

Gary Wang authored Jun 08, 2022 and Julius Künzel committed Jun 08, 2022

As suggested by @jlskuz at !301, the offset should apply to the `{{frame}}` placeholder too. This patch add such support.

Related to !310

Fixes #1451

BUG: 430193
FIXED-IN: 22.08

BUG: 450556

Nathan Hinton authored Jun 06, 2022 and Jean-Baptiste Mardelle committed Jun 06, 2022

This merge should fix the issue about the line number appearing in subtitles mentioned in #1450 [this comment](#1450 (comment 462700))

Related to #1447
CCBUG: 451406

Related to #1447
CCBUG: 451406

(cherry picked from commit 9c05c284)