po: merge changes

Signed-off-by: Karel Zak <kzak@redhat.com>
docs: update AUTHORS file

Signed-off-by: Karel Zak <kzak@redhat.com>
docs: update v2.25-ReleaseNotes

Signed-off-by: Karel Zak <kzak@redhat.com>
build-sys: release++ (v2.25-rc2)

Signed-off-by: Karel Zak <kzak@redhat.com>
cal: add const function attributes

Reference: http://lwn.net/Articles/285332/
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
cal: prefer defined constant rather than magic values

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
swapon: share get_swap_prober() with swaplabel to print uuid and label

The swapon(8) listing was almost complete, apart from label and uuid.
This change moves the code from swaplabel(8) to shared scope to be used
for printouts in other swap commands, such as swapon.

Adding this feature to lsblk(8) was a consideration, but lsblk is not
interested of swapfiles, so the swapon seems like a better option to add
this information.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>