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"

Add an option to the alarm edit dialog to display an alarm as a
notification instead of in a window.

Fix the next trigger time being shown as "Never" after using the Try
button for a command display alarm, if the command fails.

1) Don't display the alarm window; only display an error message.
2) Don't redisplay the alarm on every restart.

relicensecheck.pl has permission from all contributors.

(cherry picked from commit 35c05fe4)

Renamed messagewin_p.h -> messagedisplayhelper_p.h

This will allow implementation of a new option to use system
notifications instead of windows for displaying alarms.