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"

As suggested by Krazy2.

As suggested by Krazy2.

See also:
https://blogs.kde.org/node/3919

As suggested by Krazy2.

As suggested by Krazy2.

See also:
https://marcmutz.wordpress.com/effective-qt/prefer-to-use-normalised-signalslot-signatures/

As suggested by Krazy2.

As suggested by Krazy2.

As suggested by Krazy2.

As suggested by Krazy2.

As suggested by Krazy2. It is more efficient to use single-quotes than
double-quotes when appending single-chars to QStrings, etc.

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"

Proper support for PolkitQt5 was introduced in KAuth 5.1.0, which
requires Qt 5.2.0.

KF5Service is no longer a direct dependency of systemd-kcm.

Use an integrated editor for editing unit files. A new KAuth action was
added for saving the unit files. This provides better security than
the old method of calling an external editor using kdesu.

Thanks to Johan Ouwerkerk for reporting the issue.

Port away from boost::chrono to std::chrono. Since std::chrono support
requires C++ 2011 mode on the compiler and since mixed-type arithmetic
using doubles is potentially iffy on certain implementations, a fallback
mechanism to select boost::chrono is provided.

Correct chrono to use is auto-detected, feature-detection implementation
copied from KActivities (thanks to Ivan Cukic for doing all the hard
work of figuring out cmake 'magic'!).

REVIEW: 124615

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"

The initialization of config parameters for the systemd configuration
files was moved to separate files confparms.h and confparms.cpp from
the main source file kcmsystemd.cpp. This reduces the size of
kcmsystemd.cpp significantly.

in kcmsystemd::main().

Replace usage of boost::filesystem with KDiskFreeSpaceInfo to find
partition sizes. This adds KF5::KIOCore as dependency.

REVIEW: 124587

Convert two static members of kcmsystemd to non-static. Pass arguments
as pointer instead.

Instead of accessing a static variable, pass a pointer to confOptList as
argument to ConfDelegate constructor.

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"

Conflicts:
	CMakeLists.txt
	NEWS
	README.md
	config.h.cmake
	other/CMakeLists.txt
	other/kcm_systemd.desktop
	src/CMakeLists.txt
	src/confoption.cpp
	src/confoption.h
	src/helper/CMakeLists.txt
	src/helper/helper.cpp
	src/helper/helper.h
	src/helper/kcmsystemd.actions
	src/kcmsystemd.cpp
	src/kcmsystemd.h
	ui/kcmsystemd.ui

* Merge changes from new upstream repository

Assume UTF-8 coding instead of Latin 1 for strings when parsing from and
passing to the journal.

The sd_journal_print() documentation recommends applications use UTF-8
when logging. It is likely that applications do log in UTF-8, if only
because its a typical default in locale set up (e.g. US_EN.UTF8).
BUG: 350070

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"

- translate more UI visible strings
- fix string puzzles
- remove exclamation marks from error strings

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"

This option was added in systemd 220.