
The user gets asked now, if he want to merge the new categories with the
existing ones.

svn path=/trunk/kdepim/; revision=215811

lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi