Move applications.menu to kde-applications.menu, and applications-merged becomes kde-applications-merged. Fixes the GNOME conflict.
Changed paths: