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"

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"

No actual change in license, just how it is presented.

Looks stupid to have a new plan with a selected backup type which is
unavailable.

Without this it can start with a very small, unusable, window size.

This can actually take some time for bigger repos, so better to show
what is going on.
Also add labels to tell user what operation is ongoing, both for this new
one and the file copying.

The idea of adding the debug output was for end users to be able to include
in bug reports. That means it has to be there in release builds.

It seems at some point someone changed this widget to show itself
by default.

Most of kup had already been changed to use save instead of take.
These are just the last remaining cases.

For now it's just a simple selection of text file.
Idea is that it is better to have some ability to do this than wait for
a fancy rule GUI that may never happen because nobody has time to create
such a thing.
Bup and rsync having different ways of specifying rules also makes such
a fancy solution even more difficult.

Increasing the spacing between settings makes it clearer what description
belongs to which checkbox.

Also make sure to show a window and an entry in taskbar directly at startup

None of it should matter but good to keep the list short so that any
actual problem would not get lost in the noise.

This was added in bup version 0.30. Make use of size from metadata if it
is provided, instead of calculating it.

This caused the dolphin address bar to not show the whole path. Very minor
issue.

Consider it harmless if files have gone missing after indexing but before
saving. Avoids having to re-run backups that are actually OK, just to get
a successful backup status.

API seems to have stabilized a lot, such that different distros can be
expected to have a compatible version.

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"