-
Volker Krause authored
Merged revisions 1035218,1035246,1035249,1035263,1035323,1035349,1035393,1035410,1035413-1035414,1035417 via svnmerge from https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim ........ r1035218 | ervin | 2009-10-14 16:59:11 +0200 (Wed, 14 Oct 2009) | 5 lines If there's only one root reported in the list then use this one for the quota info, if not find the one with the same name than the mailbox. CCMAIL: vkrause@kde.org ........ r1035246 | vkrause | 2009-10-14 17:41:52 +0200 (Wed, 14 Oct 2009) | 9 lines Ugly stuff, but necessary: - Add a copy of the ontologies for use in the apps part of kdepim. Not as bad as it sounds, all ontologies will be moved to kdelibs (or higher) for 4.4 as discussed with Sebastian Trüg, making our two copies unecessary, as well as the one in kdebase. - Move the Nepomuk email feeder from the runtime part to the apps one so we can use the new message handling libs in it, most notably the OTP from messageviewer to deal with encrypted content. ........ r1035249 | ervin | 2009-10-14 17:51:35 +0200 (Wed, 14 Oct 2009) | 6 lines Convert to bytes to make tokoe happy. ;-) More seriously, I really wonder why the guys who wrote the RFC settled on kB, I was completely assuming bytes here... ........ r1035263 | tokoe | 2009-10-14 18:12:08 +0200 (Wed, 14 Oct 2009) | 2 lines Adapt to latest CollectionQuotaAttribute changes ........ r1035323 | winterz | 2009-10-14 21:12:35 +0200 (Wed, 14 Oct 2009) | 4 lines Full helpText, whatsThis and KUIT. MERGE: none DO_NOT_BACKPORT: new i18n strings ........ r1035349 | winterz | 2009-10-14 22:18:16 +0200 (Wed, 14 Oct 2009) | 5 lines make the hidden entries as hidden="true" give the ForceStartupPlugin entry a tooltip. MERGE: none DO_NOT_BACKPORT: new i18n string ........ r1035393 | tstaerk | 2009-10-14 23:46:25 +0200 (Wed, 14 Oct 2009) | 4 lines Code cleanup CCBUGS:209570 ........ r1035410 | djarvie | 2009-10-15 00:33:19 +0200 (Thu, 15 Oct 2009) | 2 lines Tidy ........ r1035413 | winterz | 2009-10-15 01:06:34 +0200 (Thu, 15 Oct 2009) | 5 lines complete helpText, toolTips, whatsThis almost full KUIT MERGE: none DO_NOT_BACKPORT: new i18n strings ........ r1035414 | winterz | 2009-10-15 01:13:46 +0200 (Thu, 15 Oct 2009) | 6 lines relicense to LGPL (v2+), with permission granted by Andreas. To wit: "Permission to relicense my contributed code as GPL v2-or higher or even LGPL is granted." CCMAIL: a.gungl@gmx.de ........ r1035417 | bbigras | 2009-10-15 01:36:23 +0200 (Thu, 15 Oct 2009) | 2 lines Fix the build CCMAIL: ervin@kde.org ........ svn path=/branches/work/akonadi-ports/kdepim/; revision=1035474
7c7dc0ee