kdenlive:release/24.02

Last commit made on 2024-04-21
Get this branch:
git clone -b release/24.02 https://git.launchpad.net/kdenlive

Branch merges

Branch information

Name:
release/24.02
Repository:
lp:kdenlive

Recent commits

88706ef... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

2b2f051... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

236bf8d... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

0baccae... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

13db438... by l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

03060fa... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

0a61bc9... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

51ef000... by l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

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"

ba64fed... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

8741281... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn