Commit 62f200a3 authored by Volker Krause's avatar Volker Krause
Browse files

SVN_MERGE

Merged revisions 1044997,1045147,1045235,1045244,1045266 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

........
  r1044997 | vkrause | 2009-11-05 09:17:44 +0100 (Thu, 05 Nov 2009) | 2 lines
  
  ignore warnings of generated and 3rd-party code
........
  r1045147 | scripty | 2009-11-05 12:43:31 +0100 (Thu, 05 Nov 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
........
  r1045235 | vkrause | 2009-11-05 15:36:17 +0100 (Thu, 05 Nov 2009) | 3 lines
  
  Keep encryption details around a bit longer, so we know what part was
  encrypted with what key when doing the indexing.
........
  r1045244 | vkrause | 2009-11-05 16:32:50 +0100 (Thu, 05 Nov 2009) | 4 lines
  
  Create one index per encryption key, when using encrypted indexes. Seems
  to work, ie. we get one Nepomuk database per key, not actually encrypted
  yet of course, that's next.
........
  r1045266 | tokoe | 2009-11-05 17:33:07 +0100 (Thu, 05 Nov 2009) | 4 lines
  
  Save/restore the field selection when skipping the first row
  
  BUG: 213160
........

svn path=/branches/work/akonadi-ports/kdepim/; revision=1045539
parent b70efd52
......@@ -39,6 +39,7 @@ Name[zh_TW]=DBUS行事曆
Type=ServiceType
X-KDE-ServiceType=DBUS/Organizer
Comment=Organizer with a D-Bus interface
Comment[cs]=Organizátor s D-BUS rozhraním
Comment[da]=Planlægningskalender med en D-BUS-grænseflade
Comment[de]=Organizer mit D-Bus-Schnittstelle
Comment[el]=Οργανωτής με διασύνδεση D-Bus
......
......@@ -41,6 +41,7 @@ Name[zh_TW]=行事曆維基「本日圖片」外掛程式
Type=Service
Comment=This plugin provides the Wikipedia Picture of the Day
Comment[ca]=Aquest connector proporciona la imatge del dia de la Viquipèdia
Comment[cs]=Wikipedia modul 'Obrázek dne'
Comment[da]=Dette plugin viser Dagens billede fra Wikipedia
Comment[de]=Dieses Modul stellt das Bild des Tages aus Wikipedia zur Verfügung.
Comment[el]=Αυτό το πρόσθετο προσφέρει την εικόνα της ημέρας της Wikipedia.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment