SVN_MERGE

Merged revisions 1031834-1031835,1031856,1031977 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

........
  r1031834 | skelly | 2009-10-06 10:48:14 +0200 (Tue, 06 Oct 2009) | 1 line
  
  Use the Akonadi::SelectionProxyModel in AkonadiConsole with lazy population.
........
  r1031835 | scripty | 2009-10-06 10:48:34 +0200 (Tue, 06 Oct 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r1031856 | skelly | 2009-10-06 11:50:07 +0200 (Tue, 06 Oct 2009) | 1 line
  
  Build fix.
........
  r1031977 | vkrause | 2009-10-06 17:26:35 +0200 (Tue, 06 Oct 2009) | 4 lines
  
  Don't get stuck if we encounter an unknown collection attribute.
  
  CCBUG: 208555
........

svn path=/branches/work/akonadi-ports/kdepim/; revision=1032182

dbusimap.desktop

@@ -16,7 +16,7 @@ Comment[km]=កម្មវិធី​សំបុត្រ​ដែល​ម
 Comment[lv]=Pasta programma ar D-BUS saskarni
 Comment[nb]=E-postprogram med D-Bus-grensesnitt
 Comment[nds]=Nettpostprogramm mit en D-Bus-Koppelsteed
-Comment[nl]=E-mailprogramma met een DBUS-interface
+Comment[nl]=E-mailprogramma met een D-Bus-interface
 Comment[nn]=E-postprogram med eit D-Bus-grensesnitt
 Comment[pt]=Um programa de correio electrónico com uma interface D-Bus
 Comment[pt_BR]=Programa de e-mail com interface D-Bus

dbusmail.desktop

@@ -16,7 +16,7 @@ Comment[km]=កម្មវិធី​សំបុត្រ​ដែល​ម
 Comment[lv]=Pasta programma ar D-BUS saskarni
 Comment[nb]=E-postprogram med D-Bus-grensesnitt
 Comment[nds]=Nettpostprogramm mit en D-Bus-Koppelsteed
-Comment[nl]=E-mailprogramma met een DBUS-interface
+Comment[nl]=E-mailprogramma met een D-Bus-interface
 Comment[nn]=E-postprogram med eit D-Bus-grensesnitt
 Comment[pt]=Um programa de correio electrónico com uma interface D-Bus
 Comment[pt_BR]=Programa de e-mail com interface D-Bus