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"

To build Kid3 with bundled handbooks, go into the
folder doc/ and run the download-pos.sh script.
Then make rebuild_cache before building with handbooks.

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"

Now the names of the functions mentioned in the handbook should
be the same as in the GUI after commit c11978
"Change ‘directory’ to ‘folder’ in user-visible strings".

The entities introduced by commit 5ecdde
"Use DocBook 4.5, add entries for translators, use entities" are not known
by normal DocBook, which causes a lot of "parser error : Entity 'x' not defined"
error messages when generating HTML or man pages. This commit adds the used
entities to the fixed source docbook.

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"

Change ‘directory’ to ‘folder’ in user-visible strings

See merge request kde/kid3!1

To build Kid3 with bundled translations, go into the
folder translations/ and run the download-pos.sh script.
Then make rebuild_cache before building with translations.

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"

A build of all packages is possible with
kid3/buildlibs.sh rundocker $HOME/projects/kid3/src/build-all.sh

These features will be deprecated in TagLib 1.12, but if possible
they are not used here when TagLib 1.11.1 is used.