Browse Source

* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 12 years ago
parent
commit
cc29364f06
  1. 1
      LAST_ENTERPRISE_SYNC
  2. 2
      Makefile.am.in
  3. 2147
      NewsLog.txt
  4. 8
      akregator/src/akregator.desktop
  5. 4
      akregator/src/akregator_plugin.desktop
  6. 50
      akregator/src/akregator_view.cpp
  7. 13
      akregator/src/eventsrc
  8. 5
      akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
  9. 9
      certmanager/certmanager.cpp
  10. 6
      certmanager/conf/kleopatra_config_appear.desktop
  11. 11
      certmanager/conf/kleopatra_config_dirserv.desktop
  12. 3
      certmanager/conf/kleopatra_config_dnorder.desktop
  13. 16
      certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
  14. 5
      certmanager/lib/backends/qgpgme/qgpgmedecryptjob.cpp
  15. 8
      certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.cpp
  16. 1
      certmanager/lib/backends/qgpgme/qgpgmedeletejob.cpp
  17. 4
      certmanager/lib/backends/qgpgme/qgpgmedownloadjob.cpp
  18. 5
      certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp
  19. 4
      certmanager/lib/backends/qgpgme/qgpgmeexportjob.cpp
  20. 8
      certmanager/lib/backends/qgpgme/qgpgmeimportjob.cpp
  21. 16
      certmanager/lib/backends/qgpgme/qgpgmejob.cpp
  22. 7
      certmanager/lib/backends/qgpgme/qgpgmejob.h
  23. 5
      certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.cpp
  24. 16
      certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
  25. 1
      certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h
  26. 4
      certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp
  27. 5
      certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
  28. 4
      certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.cpp
  29. 5
      certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.cpp
  30. 14
      certmanager/lib/kleo/job.cpp
  31. 6
      certmanager/lib/kleo/job.h
  32. 9
      certmanager/lib/libkleopatrarc.desktop
  33. 1
      certmanager/lib/tests/test_verify.cpp
  34. 6
      certmanager/lib/ui/cryptoconfigdialog.cpp
  35. 30
      certmanager/lib/ui/cryptoconfigmodule.cpp
  36. 2
      certmanager/lib/ui/cryptoconfigmodule.h
  37. 57
      certmanager/lib/ui/keyselectiondialog.cpp
  38. 15
      certmanager/lib/ui/keyselectiondialog.h
  39. 69
      certmanager/lib/ui/messagebox.cpp
  40. 3
      certmanager/lib/ui/messagebox.h
  41. 13
      cvs.sh.diff
  42. 6
      doc/kleopatra/index.docbook
  43. 205
      doc/kmail/configure.docbook
  44. 2
      doc/kmail/index.docbook
  45. 158
      doc/kmail/using-chiasmus.docbook
  46. 23
      doc/kmail/using-kmail.docbook
  47. 85
      doc/kontact/index.docbook
  48. 167
      doc/korganizer/index.docbook
  49. 10
      kabc/kabcdistlistupdater/kabcdistlistupdater.desktop
  50. 12
      kaddressbook/addresseeeditorextension.cpp
  51. 4
      kaddressbook/addresseeeditorextension.h
  52. 16
      kaddressbook/addresseeutil.cpp
  53. 11
      kaddressbook/addresseeutil.h
  54. 2
      kaddressbook/common/kaddressbook.kcfg
  55. 1
      kaddressbook/csv-templates/kaddressbook.desktop
  56. 4
      kaddressbook/csv-templates/yahoo.desktop
  57. 28
      kaddressbook/customfieldswidget.cpp
  58. 4
      kaddressbook/dcopaddressbook.desktop
  59. 49
      kaddressbook/distributionlisteditor.cpp
  60. 1
      kaddressbook/editors/cryptosettings.desktop
  61. 5
      kaddressbook/editors/imaddresseditor.desktop
  62. 2
      kaddressbook/editors/imeditorwidget.cpp
  63. 1
      kaddressbook/editors/kaddressbookimprotocol.desktop
  64. 1
      kaddressbook/editors/protocols/aimprotocol.desktop
  65. 1
      kaddressbook/editors/protocols/gaduprotocol.desktop
  66. 1
      kaddressbook/editors/protocols/groupwiseprotocol.desktop
  67. 1
      kaddressbook/editors/protocols/icqprotocol.desktop
  68. 1
      kaddressbook/editors/protocols/ircprotocol.desktop
  69. 1
      kaddressbook/editors/protocols/jabberprotocol.desktop
  70. 1
      kaddressbook/editors/protocols/meanwhileprotocol.desktop
  71. 2
      kaddressbook/editors/protocols/msnprotocol.desktop
  72. 1
      kaddressbook/editors/protocols/skypeprotocol.desktop
  73. 1
      kaddressbook/editors/protocols/smsprotocol.desktop
  74. 1
      kaddressbook/editors/protocols/yahooprotocol.desktop
  75. 8
      kaddressbook/features/distributionlist.desktop
  76. 10
      kaddressbook/features/distributionlistng.desktop
  77. 10
      kaddressbook/features/distributionlistngwidget.cpp
  78. 3
      kaddressbook/features/resourceselection.cpp
  79. 2
      kaddressbook/features/resourceselection.desktop
  80. 5
      kaddressbook/freebusywidget.cpp
  81. 2
      kaddressbook/imagewidget.cpp
  82. 1
      kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop
  83. 1
      kaddressbook/interfaces/kaddressbook_extension.desktop
  84. 4
      kaddressbook/interfaces/kaddressbook_xxport.desktop
  85. 173
      kaddressbook/kabcore.cpp
  86. 13
      kaddressbook/kabcore.h
  87. 7
      kaddressbook/kabtools.cpp
  88. 1
      kaddressbook/kaddressbook.desktop
  89. 1
      kaddressbook/kaddressbook_view.desktop
  90. 12
      kaddressbook/kcmconfigs/kabconfig.desktop
  91. 3
      kaddressbook/kcmconfigs/kabcustomfields.desktop
  92. 9
      kaddressbook/kcmconfigs/kabldapconfig.desktop
  93. 18
      kaddressbook/ldapsearchdialog.cpp
  94. 1
      kaddressbook/searchmanager.cpp
  95. 10
      kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
  96. 1
      kaddressbook/thumbnailcreator/ldifvcardcreator.h
  97. 1
      kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop
  98. 182
      kaddressbook/undocmds.cpp
  99. 43
      kaddressbook/undocmds.h
  100. 15
      kaddressbook/viewmanager.cpp
  101. 1
      kaddressbook/views/cardview.desktop
  102. 4
      kaddressbook/views/iconview.desktop
  103. 4
      kaddressbook/views/tableview.desktop
  104. 2
      kaddressbook/xxport/bookmark_xxport.desktop
  105. 5
      kaddressbook/xxport/csv_xxport.cpp
  106. 2
      kaddressbook/xxport/csv_xxport.desktop
  107. 4
      kaddressbook/xxport/csvimportdialog.cpp
  108. 2
      kaddressbook/xxport/eudora_xxport.desktop
  109. 2
      kaddressbook/xxport/gnokii_xxport.desktop
  110. 5
      kaddressbook/xxport/kde2_xxport.cpp
  111. 5
      kaddressbook/xxport/kde2_xxport.desktop
  112. 6
      kaddressbook/xxport/ldif_xxport.cpp
  113. 2
      kaddressbook/xxport/ldif_xxport.desktop
  114. 2
      kaddressbook/xxport/opera_xxport.desktop
  115. 2
      kaddressbook/xxport/pab_xxport.desktop
  116. 79
      kaddressbook/xxport/vcard_xxport.cpp
  117. 2
      kaddressbook/xxport/vcard_xxport.desktop
  118. 10
      kaddressbook/xxport/vcard_xxport.h
  119. 2
      kaddressbook/xxportmanager.cpp
  120. 3
      kalarm/Changelog
  121. 8
      kalarm/alarmevent.cpp
  122. 14
      kalarm/functions.cpp
  123. 1
      kalarm/functions.h
  124. 1
      kalarm/kalarm.desktop
  125. 3
      kalarm/kalarm.tray.desktop
  126. 2
      kalarm/kalarmapp.cpp
  127. 2
      kalarm/kalarmd/kalarmd.autostart.desktop
  128. 1
      kalarm/kalarmd/kalarmd.desktop
  129. 5
      kandy/src/kandy.desktop
  130. 1
      karm/support/karm.desktop
  131. 8
      karm/task.cpp
  132. 1
      kfile-plugins/ics/kfile_ics.desktop
  133. 1
      kfile-plugins/palm-databases/kfile_palm.desktop
  134. 1
      kfile-plugins/rfc822/kfile_rfc822.desktop
  135. 7
      kfile-plugins/vcf/kfile_vcf.cpp
  136. 1
      kfile-plugins/vcf/kfile_vcf.desktop
  137. 21
      kioslaves/imap4/imap4.cc
  138. 58
      kioslaves/sieve/sieve.cpp
  139. 1
      kioslaves/sieve/sieve.h
  140. 3
      kioslaves/sieve/sieve.protocol
  141. 1
      kitchensync/src/kitchensync.desktop
  142. 4
      kmail/KMail.desktop
  143. 23
      kmail/Makefile.am
  144. 2
      kmail/accountdialog.cpp
  145. 4
      kmail/accountwizard.cpp
  146. 2
      kmail/acljobs.cpp
  147. 8
      kmail/acljobs.h
  148. 2
      kmail/annotationjobs.cpp
  149. 12
      kmail/antispamwizard.cpp
  150. 4
      kmail/antispamwizard.h
  151. 2
      kmail/app_octetstream.cpp
  152. 2
      kmail/application_octetstream.desktop
  153. 209
      kmail/archivefolderdialog.cpp
  154. 62
      kmail/archivefolderdialog.h
  155. 18
      kmail/attachmentcollector.h
  156. 87
      kmail/attachmentstrategy.cpp
  157. 3
      kmail/attachmentstrategy.h
  158. 500
      kmail/backupjob.cpp
  159. 109
      kmail/backupjob.h
  160. 3
      kmail/bodypartformatter.cpp
  161. 141
      kmail/cachedimapjob.cpp
  162. 9
      kmail/cachedimapjob.h
  163. 82
      kmail/callback.cpp
  164. 4
      kmail/callback.h
  165. 13
      kmail/composer.h
  166. 181
      kmail/configuredialog.cpp
  167. 1
      kmail/configuredialog.h
  168. 12
      kmail/configuredialog_p.h
  169. 120
      kmail/customtemplates.cpp
  170. 20
      kmail/customtemplates.h
  171. 478
      kmail/customtemplates_base.ui
  172. 6
      kmail/customtemplates_kfg.kcfg
  173. 1
      kmail/dcopimap.desktop
  174. 1
      kmail/dcopmail.desktop
  175. 1
      kmail/dictionarycombobox.cpp
  176. 47
      kmail/distributionlistdialog.cpp
  177. 13
      kmail/editorwatcher.cpp
  178. 11
      kmail/editorwatcher.h
  179. 82
      kmail/encodingdetector.cpp
  180. 8
      kmail/eventsrc
  181. 51
      kmail/expirypropertiesdialog.cpp
  182. 31
      kmail/favoritefolderview.cpp
  183. 166
      kmail/filterimporterexporter.cpp
  184. 33
      kmail/filterimporterexporter.h
  185. 41
      kmail/folderdiaacltab.cpp
  186. 2
      kmail/folderdiaacltab.h
  187. 88
      kmail/foldersetselector.cpp
  188. 45
      kmail/foldersetselector.h
  189. 49
      kmail/folderstorage.cpp
  190. 18
      kmail/folderstorage.h
  191. 12
      kmail/foldertreebase.cpp
  192. 113
      kmail/folderutil.cpp
  193. 65
      kmail/folderutil.h
  194. 2
      kmail/globalsettings_base.kcfgc
  195. 38
      kmail/headeritem.cpp
  196. 3
      kmail/headeritem.h
  197. 15
      kmail/headerlistquicksearch.cpp
  198. 98
      kmail/headerstyle.cpp
  199. 46
      kmail/identitydialog.cpp
  200. 2
      kmail/identitydialog.h
  201. 42
      kmail/imapaccountbase.cpp
  202. 20
      kmail/imapaccountbase.h
  203. 2
      kmail/imapjob.cpp
  204. 107
      kmail/importarchivedialog.cpp
  205. 55
      kmail/importarchivedialog.h
  206. 396
      kmail/importjob.cpp
  207. 126
      kmail/importjob.h
  208. 6
      kmail/interfaces/bodypartformatter.h
  209. 35
      kmail/interfaces/urlhandler.h
  210. 11
      kmail/isubject.cpp
  211. 343
      kmail/keyresolver.cpp
  212. 2
      kmail/khtmlparthtmlwriter.cpp
  213. 7
      kmail/kleo_util.h
  214. 33
      kmail/kmacctcachedimap.cpp
  215. 7
      kmail/kmacctcachedimap.h
  216. 2
      kmail/kmacctimap.cpp
  217. 2
      kmail/kmacctimap.h
  218. 1
      kmail/kmacctlocal.cpp
  219. 1
      kmail/kmaddrbook.cpp
  220. 66
      kmail/kmail.kcfg
  221. 16
      kmail/kmailIface.h
  222. 6
      kmail/kmail_config_accounts.desktop
  223. 6
      kmail/kmail_config_appearance.desktop
  224. 3
      kmail/kmail_config_composer.desktop
  225. 9
      kmail/kmail_config_identity.desktop
  226. 9
      kmail/kmail_config_misc.desktop
  227. 9
      kmail/kmail_config_security.desktop
  228. 3
      kmail/kmail_part.rc
  229. 6
      kmail/kmailicalIface.h
  230. 167
      kmail/kmailicalifaceimpl.cpp
  231. 8
      kmail/kmailicalifaceimpl.h
  232. 204
      kmail/kmcommands.cpp
  233. 22
      kmail/kmcommands.h
  234. 360
      kmail/kmcomposewin.cpp
  235. 54
      kmail/kmcomposewin.h
  236. 264
      kmail/kmedit.cpp
  237. 79
      kmail/kmedit.h
  238. 7
      kmail/kmfawidgets.cpp
  239. 4
      kmail/kmfawidgets.h
  240. 214
      kmail/kmfilteraction.cpp
  241. 25
      kmail/kmfilterdlg.cpp
  242. 2
      kmail/kmfilterdlg.h
  243. 2
      kmail/kmfiltermgr.cpp
  244. 58
      kmail/kmfolder.cpp
  245. 23
      kmail/kmfolder.h
  246. 588
      kmail/kmfoldercachedimap.cpp
  247. 92
      kmail/kmfoldercachedimap.h
  248. 157
      kmail/kmfolderdia.cpp
  249. 2
      kmail/kmfolderdia.h
  250. 57
      kmail/kmfolderdir.cpp
  251. 19
      kmail/kmfolderdir.h
  252. 34
      kmail/kmfolderimap.cpp
  253. 19
      kmail/kmfolderimap.h
  254. 112
      kmail/kmfolderindex.cpp
  255. 24
      kmail/kmfolderindex.h
  256. 13
      kmail/kmfoldermaildir.cpp
  257. 26
      kmail/kmfoldermbox.cpp
  258. 1
      kmail/kmfoldersearch.cpp
  259. 445
      kmail/kmfolderseldlg.cpp
  260. 53
      kmail/kmfolderseldlg.h
  261. 95
      kmail/kmfoldertree.cpp
  262. 15
      kmail/kmfoldertree.h
  263. 4
      kmail/kmgroupware.cpp
  264. 156
      kmail/kmheaders.cpp
  265. 20
      kmail/kmheaders.h
  266. 182
      kmail/kmkernel.cpp
  267. 22
      kmail/kmkernel.h
  268. 93
      kmail/kmlineeditspell.cpp
  269. 276
      kmail/kmmainwidget.cpp
  270. 30
      kmail/kmmainwidget.h
  271. 2
      kmail/kmmainwin.cpp
  272. 3
      kmail/kmmainwin.rc
  273. 439
      kmail/kmmessage.cpp
  274. 143
      kmail/kmmessage.h
  275. 2
      kmail/kmmimeparttree.cpp
  276. 51
      kmail/kmmsgbase.cpp
  277. 33
      kmail/kmmsgbase.h
  278. 15
      kmail/kmmsgdict.cpp
  279. 96
      kmail/kmmsginfo.cpp
  280. 4
      kmail/kmmsginfo.h
  281. 5
      kmail/kmmsgpart.cpp
  282. 5
      kmail/kmmsgpartdlg.cpp
  283. 3
      kmail/kmpopheaders.cpp
  284. 78
      kmail/kmreadermainwin.cpp
  285. 21
      kmail/kmreadermainwin.h
  286. 735
      kmail/kmreaderwin.cpp
  287. 86
      kmail/kmreaderwin.h
  288. 21
      kmail/kmsearchpattern.cpp
  289. 8
      kmail/kmsearchpattern.h
  290. 22
      kmail/kmsearchpatternedit.cpp
  291. 3
      kmail/kmsearchpatternedit.h
  292. 5
      kmail/kmsender.cpp
  293. 9
      kmail/kmsystemtray.cpp
  294. 5
      kmail/kmsystemtray.h
  295. 2
      kmail/kmversion.h
  296. 46
      kmail/managesievescriptsdialog.cpp
  297. 3
      kmail/managesievescriptsdialog.h
  298. 3
      kmail/managesievescriptsdialog_p.h
  299. 18
      kmail/messageactions.cpp
  300. 17
      kmail/messageactions.h
  301. 36
      kmail/messagecomposer.cpp
  302. 35
      kmail/messageproperty.cpp
  303. 4
      kmail/messageproperty.h
  304. 102
      kmail/newfolderdialog.cpp
  305. 2
      kmail/newfolderdialog.h
  306. 706
      kmail/objecttreeparser.cpp
  307. 74
      kmail/objecttreeparser.h
  308. 350
      kmail/objecttreeparser_p.cpp
  309. 203
      kmail/objecttreeparser_p.h
  310. 236
      kmail/partNode.cpp
  311. 69
      kmail/partNode.h
  312. 4
      kmail/partmetadata.h
  313. 4
      kmail/partnodebodypart.cpp
  314. 2
      kmail/pics/Makefile.am
  315. BIN
      kmail/pics/kmmsginvitation.png
  316. 8
      kmail/profiles/profile-default-rc.desktop
  317. 2
      kmail/profiles/profile-high-contrast-rc.desktop
  318. 3
      kmail/profiles/profile-html-rc.desktop
  319. 4
      kmail/profiles/profile-purist-rc.desktop
  320. 5
      kmail/profiles/profile-secure-rc.desktop
  321. 5
      kmail/recipientseditor.cpp
  322. 6
      kmail/recipientspicker.cpp
  323. 9
      kmail/redirectdialog.cpp
  324. 2
      kmail/redirectdialog.h
  325. 87
      kmail/searchwindow.cpp
  326. 10
      kmail/searchwindow.h
  327. 65
      kmail/sievedebugdialog.cpp
  328. 6
      kmail/sievejob.cpp
  329. 2
      kmail/sievejob.h
  330. 249
      kmail/simplefoldertree.h
  331. 16
      kmail/simplestringlisteditor.cpp
  332. 1
      kmail/simplestringlisteditor.h
  333. 23
      kmail/snippetdlg.cpp
  334. 11
      kmail/snippetdlg.h
  335. 3
      kmail/snippetdlgbase.ui
  336. 10
      kmail/snippetitem.cpp
  337. 4
      kmail/snippetwidget.cpp
  338. 17
      kmail/stl_util.h
  339. 49
      kmail/stringutil.cpp
  340. 43
      kmail/stringutil.h
  341. 2
      kmail/subscriptiondialog.cpp
  342. 187
      kmail/templateparser.cpp
  343. 99
      kmail/templateparser.h
  344. 21
      kmail/templatesconfiguration.cpp
  345. 4
      kmail/templatesinsertcommand.cpp
  346. 3
      kmail/templatesinsertcommand.h
  347. 235
      kmail/treebase.cpp
  348. 83
      kmail/treebase.h
  349. 207
      kmail/urlhandlermanager.cpp
  350. 3
      kmail/urlhandlermanager.h
  351. 15
      kmail/vacation.cpp
  352. 36
      kmail/vacationdialog.cpp
  353. 7
      kmail/vacationdialog.h
  354. 10
      kmail/vcardviewer.cpp
  355. 41
      kmail/vcardviewer.h
  356. 5
      kmailcvt/Makefile.am
  357. 1
      kmailcvt/filter_evolution.cxx
  358. 2
      kmailcvt/filter_evolution_v2.cxx
  359. 35
      kmailcvt/filter_kmail_archive.cxx
  360. 32
      kmailcvt/filter_kmail_archive.hxx
  361. 2
      kmailcvt/filter_kmail_maildir.cxx
  362. 1
      kmailcvt/filter_lnotes.cxx
  363. 1
      kmailcvt/filter_mailapp.cxx
  364. 1
      kmailcvt/filter_mbox.cxx
  365. 1
      kmailcvt/filter_oe.cxx
  366. 2
      kmailcvt/filter_opera.cxx
  367. 1
      kmailcvt/filter_outlook.cxx
  368. 1
      kmailcvt/filter_plain.cxx
  369. 2
      kmailcvt/filter_pmail.cxx
  370. 2
      kmailcvt/filter_sylpheed.cxx
  371. 2
      kmailcvt/filter_thebat.cxx
  372. 2
      kmailcvt/filter_thunderbird.cxx
  373. 27
      kmailcvt/filters.cxx
  374. 10
      kmailcvt/filters.hxx
  375. 60
      kmailcvt/kmailcvt.cpp
  376. 3
      kmailcvt/kmailcvt.h
  377. 4
      kmailcvt/kselfilterpage.cpp
  378. 6
      kmailcvt/main.cpp
  379. 5
      kmobile/devices/digicam/libkmobile_digicam.desktop
  380. 7
      kmobile/devices/gammu/libkmobile_gammu.desktop
  381. 7
      kmobile/devices/gnokii/libkmobile_gnokii.desktop
  382. 2
      kmobile/devices/skeleton/libkmobile_skeleton.desktop
  383. 1
      kmobile/kioslave/mimetypes/mobile_addressbook.desktop
  384. 1
      kmobile/kioslave/mimetypes/mobile_calendar.desktop
  385. 1
      kmobile/kioslave/mimetypes/mobile_device.desktop
  386. 1
      kmobile/kioslave/mimetypes/mobile_notes.desktop
  387. 2
      kmobile/kmobile.desktop
  388. 1
      kmobile/libkmobile.desktop
  389. 1
      knode/KNode.desktop
  390. 45
      knode/articlewidget.cpp
  391. 2
      knode/kncomposer.cpp
  392. 27
      knode/knglobals.cpp
  393. 3
      knode/knglobals.h
  394. 5
      knode/knode_config_accounts.desktop
  395. 5
      knode/knode_config_appearance.desktop
  396. 2
      knode/knode_config_cleanup.desktop
  397. 5
      knode/knode_config_identity.desktop
  398. 1
      knode/knode_config_post_news.desktop
  399. 2
      knode/knode_config_privacy.desktop
  400. 4
      knode/knode_config_read_news.desktop
  401. 146
      knotes/knote.cpp
  402. 18
      knotes/knote.h
  403. 3
      knotes/knotealarmdlg.cpp
  404. 82
      knotes/knoteedit.cpp
  405. 16
      knotes/knoteedit.h
  406. 9
      knotes/knoteprinter.cpp
  407. 1
      knotes/knotes.desktop
  408. 4
      knotes/knotes_manager.desktop
  409. 5
      knotes/knotesalarm.cpp
  410. 59
      knotes/knotesapp.cpp
  411. 3
      knotes/knotesapp.h
  412. 7
      knotes/knoteslegacy.cpp
  413. 1
      knotes/local.desktop
  414. 12
      knotes/resourcelocal.cpp
  415. 48
      knotes/resourcemanager.cpp
  416. 2
      knotes/resourcemanager.h
  417. 8
      konsolekalendar/main.cpp
  418. 4
      kontact/interfaces/kontactplugin.desktop
  419. 4
      kontact/interfaces/plugin.h
  420. 2
      kontact/interfaces/uniqueapphandler.cpp
  421. 2
      kontact/plugins/akregator/akregator_plugin.h
  422. 19
      kontact/plugins/akregator/akregatorplugin.desktop
  423. 10
      kontact/plugins/akregator/akregatorplugin3.2.desktop
  424. 3
      kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
  425. 14
      kontact/plugins/kaddressbook/kaddressbookplugin.desktop
  426. 14
      kontact/plugins/karm/karmplugin.desktop
  427. 13
      kontact/plugins/kitchensync/kitchensync.desktop
  428. 2
      kontact/plugins/kmail/Makefile.am
  429. 21
      kontact/plugins/kmail/kcmkmailsummary.desktop
  430. 17
      kontact/plugins/kmail/kmailplugin.desktop
  431. 10
      kontact/plugins/knode/knodeplugin.desktop
  432. 4
      kontact/plugins/knotes/knotes_part.cpp
  433. 1
      kontact/plugins/knotes/knotes_part.h
  434. 10
      kontact/plugins/knotes/knotesplugin.desktop
  435. 10
      kontact/plugins/korganizer/journalplugin.desktop
  436. 2
      kontact/plugins/korganizer/journalplugin.h
  437. 14
      kontact/plugins/korganizer/kcmkorgsummary.desktop
  438. 35
      kontact/plugins/korganizer/korg_uniqueapp.cpp
  439. 47
      kontact/plugins/korganizer/korganizerplugin.cpp
  440. 11
      kontact/plugins/korganizer/korganizerplugin.desktop
  441. 57
      kontact/plugins/korganizer/summarywidget.cpp
  442. 36
      kontact/plugins/korganizer/todoplugin.cpp
  443. 14
      kontact/plugins/korganizer/todoplugin.desktop
  444. 9
      kontact/plugins/korganizer/todosummarywidget.cpp
  445. 9
      kontact/plugins/kpilot/kpilotplugin.desktop
  446. 5
      kontact/plugins/newsticker/kcmkontactknt.desktop
  447. 12
      kontact/plugins/newsticker/newstickerplugin.desktop
  448. 9
      kontact/plugins/specialdates/kcmsdsummary.desktop
  449. 14
      kontact/plugins/specialdates/sdsummarywidget.cpp
  450. 2
      kontact/plugins/specialdates/sdsummarywidget.h
  451. 2
      kontact/plugins/specialdates/specialdates_plugin.cpp
  452. 13
      kontact/plugins/specialdates/specialdatesplugin.desktop
  453. 4
      kontact/plugins/summary/kcmkontactsummary.cpp
  454. 11
      kontact/plugins/summary/kcmkontactsummary.desktop
  455. 16
      kontact/plugins/summary/summaryplugin.desktop
  456. 13
      kontact/plugins/summary/summaryview_plugin.cpp
  457. 5
      kontact/plugins/test/kptestplugin.desktop
  458. 10
      kontact/plugins/weather/weatherplugin.desktop
  459. 4
      kontact/src/Kontact.desktop
  460. 7
      kontact/src/about/kontact.css
  461. 15
      kontact/src/iconsidepane.cpp
  462. 5
      kontact/src/iconsidepane.h
  463. 75
      kontact/src/kontact.setdlg
  464. 5
      kontact/src/kontactui.rc
  465. 31
      kontact/src/main.cpp
  466. 193
      kontact/src/mainwindow.cpp
  467. 16
      kontact/src/mainwindow.h
  468. 10
      kontact/src/sidepanebase.cpp
  469. 16
      kontact/src/sidepanebase.h
  470. 9
      korganizer/Makefile.am
  471. 18
      korganizer/Todo-info.text
  472. 5
      korganizer/aboutdata.cpp
  473. 323
      korganizer/actionmanager.cpp
  474. 27
      korganizer/actionmanager.h
  475. 6
      korganizer/archivedialog.cpp
  476. 1231
      korganizer/calendarview.cpp
  477. 185
      korganizer/calendarview.h
  478. 124
      korganizer/datenavigator.cpp
  479. 47
      korganizer/datenavigator.h
  480. 108
      korganizer/datenavigatorcontainer.cpp
  481. 49
      korganizer/datenavigatorcontainer.h
  482. 1
      korganizer/dcopcalendar.desktop
  483. 68
      korganizer/eventarchiver.cpp
  484. 16
      korganizer/eventarchiver.h
  485. 23
      korganizer/exportwebdialog.cpp
  486. 8
      korganizer/exportwebdialog.h
  487. 167
      korganizer/freebusymanager.cpp
  488. 3
      korganizer/freebusymanager.h
  489. 10
      korganizer/importdialog.cpp
  490. 2
      korganizer/importdialog.h
  491. 225
      korganizer/incidencechanger.cpp
  492. 70
      korganizer/incidencechanger.h
  493. 1
      korganizer/interfaces/calendar/calendardecoration.desktop
  494. 4
      korganizer/interfaces/calendar/calendarplugin.desktop
  495. 95
      korganizer/interfaces/korganizer/baseview.h
  496. 3
      korganizer/interfaces/korganizer/corehelper.h
  497. 39
      korganizer/interfaces/korganizer/incidencechangerbase.h
  498. 1
      korganizer/interfaces/korganizer/korganizerpart.desktop
  499. 1
      korganizer/interfaces/korganizer/korgprintplugin.desktop
  500. 4
      korganizer/interfaces/korganizer/mainwindow.h
  501. Some files were not shown because too many files have changed in this diff Show More

1
LAST_ENTERPRISE_SYNC

@ -0,0 +1 @@
Revision 1170137

2
Makefile.am.in

@ -23,7 +23,7 @@ COMPILE_BEFORE_certmanager = libkdenetwork libkpgp
COMPILE_BEFORE_korganizer = libkdepim libkpimidentities libkpimexchange kgantt
COMPILE_BEFORE_kaddressbook = libkdepim certmanager akregator
COMPILE_BEFORE_kandy = libkdepim
COMPILE_BEFORE_kmail= libkdepim libkpimidentities certmanager libkpgp libkmime indexlib
COMPILE_BEFORE_kmail= libkdepim libkpimidentities certmanager libkpgp libkmime
COMPILE_BEFORE_knode= libkdepim libkpgp libkmime
COMPILE_BEFORE_karm = libkdepim kresources
COMPILE_BEFORE_plugins = kmail libkdepim libkcal

2147
NewsLog.txt

File diff suppressed because it is too large Load Diff

8
akregator/src/akregator.desktop

@ -28,7 +28,6 @@ GenericName[hu]=RSS hírolvasó
GenericName[is]=RSS fréttaforrit
GenericName[it]=Lettore Fonti RSS
GenericName[ja]=RSS ニュースリーダー
GenericName[ka]=RSS კვების წამკითხველი
GenericName[kk]=RSS жаңалықтарын оқу
GenericName[km]=កមមវមតន RSS
GenericName[ko]=RSS 피드 리더
@ -53,8 +52,7 @@ GenericName[sv]=Läsare av RSS-kanaler
GenericName[ta]=RSS பஃடி
GenericName[tr]=RSS Haber Kaynağı Okuyucu
GenericName[uk]=Програма для читання подач RSS
GenericName[uz]=RSS yangiliklarni oʻquvchi
GenericName[uz@cyrillic]=RSS янгиликларни ўқувчи
GenericName[uz]=RSS янгиликларни ўқувчи
GenericName[zh_CN]=RSS 种子阅读器
GenericName[zh_TW]=RSS Feed 閱讀器
Comment=An RSS Aggregator for KDE
@ -79,7 +77,6 @@ Comment[hu]=KDE-s hírolvasó RSS hírcsatornákhoz
Comment[is]=RSS fréttaforrit fyrir KDE
Comment[it]=Un concentratore KDE per RSS
Comment[ja]=KDE 用 RSS アグリゲータ
Comment[ka]= RSS აგრეგატი KDE-სთვის
Comment[kk]=KDE-нің RSS жаңалық агрегаторы
Comment[km]=កមមវន RSS សម KDE
Comment[ko]=KDE용 RSS 리더
@ -102,8 +99,7 @@ Comment[sv]=En RSS-samlare för KDE
Comment[ta]=கிின ஒர RSS ச
Comment[tr]=Bir KDE RSS Okuyucusu
Comment[uk]=Агрегатор RSS для KDE
Comment[uz]=KDE uchun RSS yangiliklarni oʻquvchi
Comment[uz@cyrillic]=KDE учун RSS янгиликларни ўқувчи
Comment[uz]=KDE учун RSS янгиликларни ўқувчи
Comment[zh_CN]=KDE RSS 新闻收集器
Comment[zh_TW]=KDE 的 RSS 收集器
Terminal=false

4
akregator/src/akregator_plugin.desktop

@ -25,7 +25,6 @@ Comment[hu]=Akregator bővítőmodul
Comment[is]=Íforrit fyrir Akregator
Comment[it]=Plugin per Akregator
Comment[ja]=Akregator 用プラグイン
Comment[ka]=Akregator-ის მოდული
Comment[kk]=Akregator-дың плагин модулі
Comment[km]=កមមវយ Akregator
Comment[ko]=Akregator 플러그인
@ -49,8 +48,7 @@ Comment[sr@Latn]=Priključak za Akregator
Comment[sv]=Insticksprogram för Akregator
Comment[tr]=Akregator Eklentisi
Comment[uk]=Втулок для Akregator
Comment[uz]=Akregator uchun plagin
Comment[uz@cyrillic]=Akregator учун плагин
Comment[uz]=Akregator учун плагин
Comment[zh_CN]=Akregator 插件
Comment[zh_TW]=Akregator 外掛程式

50
akregator/src/akregator_view.cpp

@ -225,7 +225,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
setFocusPolicy(TQWidget::StrongFocus);
TQVBoxLayout *lt = new TQVBoxLayout( this );
m_horizontalSplitter = new TQSplitter(TQSplitter::Horizontal, this);
m_horizontalSplitter->setOpaqueResize(true);
@ -260,7 +260,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
connect(m_tagNodeListView, TQT_SIGNAL(signalContextMenu(KListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(KListView*, TreeNode*, const TQPoint&)));
ProgressManager::self()->setFeedList(m_feedList);
m_tabs = new TabWidget(m_horizontalSplitter);
@ -321,8 +321,12 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
connectFrame(m_mainFrame);
m_tabs->addFrame(m_mainFrame);
m_horizontalSplitter->setSizes( Settings::splitter1Sizes() );
m_articleSplitter->setSizes( Settings::splitter2Sizes() );
const TQValueList<int> sp1sizes = Settings::splitter1Sizes();
if ( sp1sizes.count() >= m_horizontalSplitter->sizes().count() )
m_horizontalSplitter->setSizes( sp1sizes );
const TQValueList<int> sp2sizes = Settings::splitter2Sizes();
if ( sp2sizes.count() >= m_articleSplitter->sizes().count() )
m_articleSplitter->setSizes( sp2sizes );
KConfig *conf = Settings::self()->config();
conf->setGroup("General");
@ -374,7 +378,7 @@ void View::slotSettingsChanged()
{
// if tagging is hidden, show only feed list
m_listTabWidget->setViewMode(Settings::showTaggingGUI() ? ListTabWidget::verticalTabs : ListTabWidget::single);
}
void View::slotOnShutdown()
@ -406,8 +410,12 @@ void View::slotOnShutdown()
void View::saveSettings()
{
Settings::setSplitter1Sizes( m_horizontalSplitter->sizes() );
Settings::setSplitter2Sizes( m_articleSplitter->sizes() );
const TQValueList<int> spl1 = m_horizontalSplitter->sizes();
if ( spl1.contains( 0 ) == 0 )
Settings::setSplitter1Sizes( spl1 );
const TQValueList<int> spl2 = m_articleSplitter->sizes();
if ( spl2.contains( 0 ) == 0 )
Settings::setSplitter2Sizes( spl2 );
Settings::setViewMode( m_viewMode );
Settings::writeConfig();
}
@ -415,7 +423,7 @@ void View::saveSettings()
void View::slotOpenNewTab(const KURL& url, bool background)
{
PageViewer* page = new PageViewer(this, "page");
connect( m_part, TQT_SIGNAL(signalSettingsChanged()), page, TQT_SLOT(slotPaletteOrFontChanged()));
connect( page, TQT_SIGNAL(setTabIcon(const TQPixmap&)),
@ -822,7 +830,7 @@ void View::slotOpenURL(const KURL& url, Viewer* currentViewer, BrowserRun::Openi
else
{
KParts::URLArgs args = currentViewer ? currentViewer->browserExtension()->urlArgs() : KParts::URLArgs();
BrowserRun* r = new BrowserRun(this, currentViewer, url, args, mode);
connect(r, TQT_SIGNAL(signalOpenInViewer(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode)),
this, TQT_SLOT(slotOpenURLReply(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode)));
@ -832,7 +840,7 @@ void View::slotOpenURL(const KURL& url, Viewer* currentViewer, BrowserRun::Openi
//TODO: KDE4 remove this ugly ugly hack
void View::slotUrlClickedInViewer(const KURL& url, Viewer* viewer, bool newTab, bool background)
{
if (!newTab)
{
slotOpenURL(url, viewer, BrowserRun::CURRENT_TAB);
@ -983,7 +991,7 @@ void View::slotNextUnreadArticle()
{
if (m_viewMode == CombinedView)
m_listTabWidget->activeView()->slotNextUnreadFeed();
TreeNode* sel = m_listTabWidget->activeView()->selectedNode();
if (sel && sel->unread() > 0)
m_articleList->slotNextUnreadArticle();
@ -995,7 +1003,7 @@ void View::slotPrevUnreadArticle()
{
if (m_viewMode == CombinedView)
m_listTabWidget->activeView()->slotPrevUnreadFeed();
TreeNode* sel = m_listTabWidget->activeView()->selectedNode();
if (sel && sel->unread() > 0)
m_articleList->slotPreviousUnreadArticle();
@ -1211,8 +1219,8 @@ void View::slotOpenCurrentArticle()
link = article.link();
else if (article.guidIsPermaLink())
link = KURL(article.guid());
if (link.isValid())
if (link.isValid())
{
slotOpenURL(link, 0L, BrowserRun::NEW_TAB_FOREGROUND);
}
@ -1236,8 +1244,8 @@ void View::slotOpenCurrentArticleBackgroundTab()
link = article.link();
else if (article.guidIsPermaLink())
link = KURL(article.guid());
if (link.isValid())
if (link.isValid())
{
slotOpenURL(link, 0L, BrowserRun::NEW_TAB_BACKGROUND);
}
@ -1307,7 +1315,7 @@ void View::slotArticleDelete()
msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").arg(TQStyleSheet::escape(articles.first().title()));
break;
default:
msg = i18n("<qt>Are you sure you want to delete the selected article?</qt>",
msg = i18n("<qt>Are you sure you want to delete the selected article?</qt>",
"<qt>Are you sure you want to delete the %n selected articles?</qt>",
articles.count());
}
@ -1386,7 +1394,7 @@ void View::slotTextToSpeechRequest()
else
{
TQString selectedText = static_cast<PageViewer *>(m_currentFrame->part())->selectedText();
if (!selectedText.isEmpty())
SpeechClient::self()->slotSpeak(selectedText, "en");
}
@ -1439,7 +1447,7 @@ void View::slotMouseOverInfo(const KFileItem *kifi)
void View::readProperties(KConfig* config)
{
if (!Settings::resetQuickFilterOnNodeChange())
{
m_searchBar->slotSetText(config->readEntry("searchLine"));
@ -1447,7 +1455,7 @@ void View::readProperties(KConfig* config)
if (statusfilter != -1)
m_searchBar->slotSetStatus(statusfilter);
}
int selectedID = config->readNumEntry("selectedNodeID", -1);
if (selectedID != -1)
{
@ -1471,7 +1479,7 @@ void View::saveProperties(KConfig* config)
// save filter settings
config->writeEntry("searchLine", m_searchBar->text());
config->writeEntry("searchCombo", m_searchBar->status());
TreeNode* sel = m_listTabWidget->activeView()->selectedNode();
if (sel)

13
akregator/src/eventsrc

@ -29,7 +29,6 @@ Name[hu]=Hírforrás felvéve
Name[is]=Straum bætt við
Name[it]=Aggiunta fonte
Name[ja]=フィード追加
Name[ka]=დამატებულია კვება
Name[kk]=Қор қосылды
Name[km]=បបនមត
Name[ko]=피드 추가됨
@ -53,8 +52,7 @@ Name[sv]=Kanal tillagd
Name[ta]=பஃடகபபடடத
Name[tr]=Haber kaynağı eklendi
Name[uk]=Подачу додано
Name[uz]=Yangiliklar tasmasi qoʻshildi
Name[uz@cyrillic]=Янгиликлар тасмаси қўшилди
Name[uz]=Янгиликлар тасмаси қўшилди
Name[zh_CN]=添加了新闻源
Name[zh_TW]=已加入 Feed
Comment=A new feed was remotely added to Akregator
@ -78,7 +76,6 @@ Comment[hu]=Egy hírforrást távolról felvettek az Akregatorba
Comment[is]=Nýjum straum var bætt við Akregator
Comment[it]=Una nuova fonte è stata aggiunta ad Akregator da remoto
Comment[ja]=新規フィードがリモートで Akregator に追加されました
Comment[ka]=Akregator-ის სიას დისტანციურად ახალი კვება დაემატა
Comment[kk]=Akregator-ға қашықтан жаңа қор қосылды
Comment[km]=បបនមតចម Akregator
Comment[ko]=Akregator에 피드가 원격으로 추가됨
@ -102,8 +99,7 @@ Comment[sv]=En ny kanal har lagts till i aKregator utifrån
Comment[ta]=Akregatorக ஒரிய உளகபபடடத
Comment[tr]=Akregator'a yeni bir haber kaynağı eklendi
Comment[uk]=Нову подачу було віддалено додано до Akregator
Comment[uz]=Akregator dasturiga yangi yangiliklar tasmasi qoʻshildi
Comment[uz@cyrillic]=Akregator дастурига янги янгиликлар тасмаси қўшилди
Comment[uz]=Akregator дастурига янги янгиликлар тасмаси қўшилди
Comment[zh_CN]=新闻源远程添加进了 Akregator
Comment[zh_TW]=已從遠端加入新的 feed 到 Akregator
default_presentation=4
@ -135,7 +131,6 @@ Name[hu]=Hírekk
Name[is]=Nýjar greinar
Name[it]=Nuovi articoli
Name[ja]=新規記事
Name[ka]=ახალი სტატიები
Name[kk]=Жаңа мақалалар
Name[km]=អតថបទ
Name[ko]=새 글
@ -160,8 +155,7 @@ Name[sv]=Nya artiklar
Name[ta]= பிய சிகள
Name[tr]=Yeni Haberler
Name[uk]=Нові статті
Name[uz]=Yangi maqolalar
Name[uz@cyrillic]=Янги мақолалар
Name[uz]=Янги мақолалар
Name[zh_CN]=新闻文章
Name[zh_TW]=新文章
Comment=New articles were fetched
@ -188,7 +182,6 @@ Comment[hu]=Új hírek lettek letöltve
Comment[is]=Nýjar greinar voru sóttar
Comment[it]=I nuovi articoli sono stati recuperati
Comment[ja]=新規記事を取得しました
Comment[ka]=მიღებულია ახალი სტატიები
Comment[kk]=Жаңа мақалалар қабылданды
Comment[km]=បរមអតថបទ
Comment[ko]=새 글을 가져옴

5
akregator/src/mk4storage/akregator_mk4storage_plugin.desktop

@ -21,7 +21,6 @@ Name[hu]=Metakit tároló
Name[is]=Metakit geymslu bakendi
Name[it]=Backend archiviazione metakit
Name[ja]=メタキットストレージバックエンド
Name[ka]=Metakit მეხსიერების ბუფერი
Name[kk]=Metakit архивтеу бағдарламасы
Name[km]=កមមវសមរកក (Metakit)
Name[ko]=Metakit 저장소 백엔드
@ -69,7 +68,6 @@ Comment[hu]=Akregator bővítőmodul
Comment[is]=Íforrit fyrir Akregator
Comment[it]=Plugin per Akregator
Comment[ja]=Akregator 用プラグイン
Comment[ka]=Akregator-ის მოდული
Comment[kk]=Akregator-дың плагин модулі
Comment[km]=កមមវយ Akregator
Comment[ko]=Akregator 플러그인
@ -93,8 +91,7 @@ Comment[sr@Latn]=Priključak za Akregator
Comment[sv]=Insticksprogram för Akregator
Comment[tr]=Akregator Eklentisi
Comment[uk]=Втулок для Akregator
Comment[uz]=Akregator uchun plagin
Comment[uz@cyrillic]=Akregator учун плагин
Comment[uz]=Akregator учун плагин
Comment[zh_CN]=Akregator 插件
Comment[zh_TW]=Akregator 外掛程式
ServiceTypes=Akregator/Plugin

9
certmanager/certmanager.cpp

@ -889,7 +889,8 @@ void CertManager::slotDirmngrExited() {
This slot will import CRLs from a file.
*/
void CertManager::importCRLFromFile() {
TQString filter = TQString("*.crl *.arl *-crl.der *-arl.der|") + i18n("Certificate Revocation List (*.crl *.arl *-crl.der *-arl.der)");
// loadcrl can only work with DER encoded files (verified with dirmngr 1.0.3)
TQString filter = TQString("*.crl *.arl *-crl.der *-arl.der|") + i18n("Certificate Revocation List, DER encoded (*.crl *.arl *-crl.der *-arl.der)");
KURL url = KFileDialog::getOpenURL( TQString::null,
filter,
this,
@ -1277,9 +1278,11 @@ void CertManager::slotCertificateExportResult( const GpgME::Error & err, const T
void CertManager::slotExportSecretKey() {
Kleo::KeySelectionDialog dlg( i18n("Secret Key Export"),
i18n("Select the secret key to export "
"<qt>" +
i18n("Select the secret key to export "
"(<b>Warning: The PKCS#12 format is insecure; "
"exporting secret keys is discouraged</b>):"),
"exporting secret keys is discouraged</b>):") +
"</qt>",
std::vector<GpgME::Key>(),
Kleo::KeySelectionDialog::SecretKeys|Kleo::KeySelectionDialog::SMIMEKeys,
false /* no multiple selection */,

6
certmanager/conf/kleopatra_config_appear.desktop

@ -40,7 +40,6 @@ Name[hu]=Megjelenés
Name[is]=Útlit
Name[it]=Aspetto
Name[ja]=外観
Name[ka]=იერსახე
Name[kk]=Сыртқы көрінісі
Name[km]=របរ
Name[ko]=모양
@ -67,8 +66,7 @@ Name[ta]=தறம
Name[tg]=Намуди зоҳирӣ
Name[tr]=Görünüm
Name[uk]=Вигляд
Name[uz]=Koʻrinishi
Name[uz@cyrillic]=Кўриниши
Name[uz]=Кўриниши
Name[zh_CN]=外观
Comment=Colors & Fonts Configuration
Comment[af]=Kleur en skrif tipe opstelling
@ -97,7 +95,6 @@ Comment[hu]=A színek és betűtípusok beállítása
Comment[is]=Stilling lita & leturgerða
Comment[it]=Configurazione tipi di carattere e colori
Comment[ja]=色とフォントの設定
Comment[ka]=ფერთა და შრიფტთა კონფიგურაცია
Comment[kk]=Түс & Қаріп параметрлері
Comment[km]=កណតរចនសមពណ & ពពអកសរ
Comment[ko]=색과 글꼴 설정
@ -153,7 +150,6 @@ Keywords[hu]=szín,betűtípus,beállítások
Keywords[is]=litir,letur, stillingar
Keywords[it]=colori, font, caratteri, configurazione
Keywords[ja]=色,フォント,設定
Keywords[ka]=ფერები,შრიფტები, კონფიგურაცია
Keywords[km]=ពណ,ពពអកសរ,កណតរចនសម
Keywords[ko]=색,글꼴,설정
Keywords[lt]=color,font, configuration, spalvų, šriftų konfigūravimas

11
certmanager/conf/kleopatra_config_dirserv.desktop

@ -27,7 +27,7 @@ Name[et]=Kataloogiteenused
Name[eu]=Direktorio zerbitzuak
Name[fa]=خدمات فهرست راهنما
Name[fi]=Hakemistopalvelut
Name[fr]=Services d'annuaire
Name[fr]=Services de répertoires
Name[fy]=Maptsjinsten
Name[ga]=Seirbhísí Eolaire
Name[gl]=Servicios de Directorio
@ -36,7 +36,6 @@ Name[hu]=Címtárszolgáltatások
Name[is]=Nafnaþjónustur
Name[it]=Servizi Directory
Name[ja]=ディレクトリサービス
Name[ka]=საცნობარო მომსახურება
Name[kk]=Каталог қызметтері
Name[km]=សថត
Name[ko]=디렉터리 서비스
@ -80,7 +79,7 @@ Comment[et]=LDAP kataloogiteenuste seadistused
Comment[eu]=LDAP direktorio zerbitzuen konfigurazioa
Comment[fa]=پیکربندی خدمات فهرست راهنمای LDAP
Comment[fi]=Hakemistopalveluiden asetukset
Comment[fr]=Configuration des services d'annuaire LDAP
Comment[fr]=Configuration des répertoires LDAP
Comment[fy]=Konfiguraasje foar LDAP-tsjinsten
Comment[gl]=Configuración dos servicios de directorio LDAP
Comment[he]=תצורה של שירותי ספרייה עבור LDAP
@ -88,7 +87,6 @@ Comment[hu]=Az LDAP címtárszolgáltatások beállításai
Comment[is]=Stillingar LDAP uppflettingaþjónustunnar
Comment[it]=Configurazione servizi LDAP
Comment[ja]=LDAP ディレクトリサービスの設定
Comment[ka]=LDAP საცნობარო მომსახურების კონფიგურაცია
Comment[kk]=LDAP каталог қызметтер параметрлері
Comment[km]=កណតរចនសមរបសថត LDAP
Comment[ko]=LDAP 디렉터리 서비스 설정
@ -133,7 +131,7 @@ Keywords[et]=ldap,kataloog,teenused
Keywords[eu]=Idap, direktorio, zerbitzuak
Keywords[fa]=ldap، فهرست راهنما، خدمات
Keywords[fi]=ldap,hakemisto,palvelut
Keywords[fr]=ldap,annuaire,annuaires,service,services
Keywords[fr]=ldap,dossier,dossiers,service,services
Keywords[fy]=ldap,directory,services,triemtafel,tsjinsten
Keywords[ga]=ldap,eolaire,seirbhísí
Keywords[gl]=ldap,directorio,servicios
@ -142,7 +140,6 @@ Keywords[hu]=ldap,címtár,szolgáltatások
Keywords[is]=ldap,directory,services,nafnaþjónusta
Keywords[it]=ldap, servizi, directory
Keywords[ja]=ldap,ディレクトリ,サービス
Keywords[ka]=ldap,ცნობარი,მომსახურება
Keywords[km]=ldap,ថត,ស
Keywords[ko]=ldap,디렉터리,서비스
Keywords[lt]=ldap,directory,services,aplankai,tarnybos
@ -152,7 +149,7 @@ Keywords[nb]=ldap,mappe,tjenester
Keywords[nds]=LDAP,Verteken,Deensten
Keywords[ne]=ldap,डइरटर,क
Keywords[nn]=ldap,katalog,tenester
Keywords[pl]=katalog,usługi katalogowe,usługi,LDAP
Keywords[pl]=ldap,katalog,usługi katalogowe,usługi,LDAP
Keywords[pt]=ldap,directório,serviços
Keywords[pt_BR]=ldap,diretório,serviços
Keywords[ru]=LDAP,службы каталогов

3
certmanager/conf/kleopatra_config_dnorder.desktop

@ -34,7 +34,6 @@ Name[hu]=DN-attribútumsorrend
Name[is]=DN eiginleikaröðun
Name[it]=Attributi DN, ordine
Name[ja]=DN 属性順位
Name[ka]=DN ატრიბუტთა რიგი
Name[kk]=DN-атрибуттер реті
Name[km]=លណលកខណ DN
Name[ko]=DN 분배 순서
@ -85,7 +84,6 @@ Comment[hu]=A DN-attribútumok megjelenítési sorrendjének beállítása
Comment[is]=Stilla röð DN eiginleikanna
Comment[it]=Configura l'ordine in cui sono mostrati gli attributi DN
Comment[ja]=DN 属性を表示する順位を設定
Comment[ka]=DN ატრიბუტთა ჩვენების რიგის კონფიგურაცია
Comment[kk]=DN атрибуттерді көрсету ретін баптау
Comment[km]=កណតរចនសមបងណលកខណ DN
Comment[lt]=Konfigūruoti DN savybių rodymo tvarką
@ -137,7 +135,6 @@ Keywords[hu]=DN,sorrend,RDN,attribútum
Keywords[is]=DN,röð,order,RDN,attribute
Keywords[it]=DN,ordine,RDN,attributi
Keywords[ja]=DN,順位,RDN,属性
Keywords[ka]=DN,რიგი,RDN,ატრიბუტი
Keywords[km]=DN,ល,RDN,គណលកខណ
Keywords[lt]=DN,order,RDN,attribute,savybė,tvarka
Keywords[mk]=DN,order,RDN,attribute,редослед,атрибут

16
certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp

@ -447,6 +447,13 @@ TQVariant QGpgMECryptoConfigEntry::stringToValue( const TQString& str, bool unes
bool isString = isStringType();
if ( isList() ) {
if ( argType() == ArgType_None ) {
bool ok = true;
const TQVariant v = str.isEmpty() ? 0U : str.toUInt( &ok ) ;
if ( !ok )
kdWarning(5150) << "list-of-none should have an unsigned int as value:" << str << endl;
return v;
}
TQValueList<TQVariant> lst;
TQStringList items = TQStringList::split( ',', str );
for( TQStringList::const_iterator valit = items.begin(); valit != items.end(); ++valit ) {
@ -657,7 +664,10 @@ void QGpgMECryptoConfigEntry::resetToDefault()
if ( mFlags & GPGCONF_FLAG_DEFAULT )
mValue = mDefaultValue;
else if ( mArgType == ArgType_None )
mValue = false;
if ( isList() )
mValue = 0U;
else
mValue = false;
}
void QGpgMECryptoConfigEntry::setBoolValue( bool b )
@ -715,7 +725,9 @@ void QGpgMECryptoConfigEntry::setNumberOfTimesSet( unsigned int i )
{
Q_ASSERT( mArgType == ArgType_None );
Q_ASSERT( isList() );
setUIntValue( i );
mValue = i;
mSet = i > 0;
mDirty = true;
}
void QGpgMECryptoConfigEntry::setStringValueList( const TQStringList& lst )

5
certmanager/lib/backends/qgpgme/qgpgmedecryptjob.cpp

@ -85,7 +85,10 @@ GpgME::DecryptionResult Kleo::QGpgMEDecryptJob::exec( const TQByteArray & cipher
}
void Kleo::QGpgMEDecryptJob::doOperationDoneEvent( const GpgME::Error & ) {
emit result( mCtx->decryptionResult(), mOutDataDataProvider->data() );
const GpgME::DecryptionResult res = mCtx->decrypt( *mInData, *mOutData );
const TQByteArray plainText = mOutDataDataProvider->data();
getAuditLog();
emit result( res, plainText );
}
#include "qgpgmedecryptjob.moc"

8
certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.cpp

@ -87,9 +87,11 @@ Kleo::QGpgMEDecryptVerifyJob::exec( const TQByteArray & cipherText, TQByteArray
}
void Kleo::QGpgMEDecryptVerifyJob::doOperationDoneEvent( const GpgME::Error & ) {
emit result( mCtx->decryptionResult(),
mCtx->verificationResult(),
mOutDataDataProvider->data() );
const GpgME::DecryptionResult dr = mCtx->decryptionResult();
const GpgME::VerificationResult vr = mCtx->verificationResult();
const TQByteArray plainText = mOutDataDataProvider->data();
getAuditLog();
emit result( dr, vr, plainText );
}
#include "qgpgmedecryptverifyjob.moc"

1
certmanager/lib/backends/qgpgme/qgpgmedeletejob.cpp

@ -64,6 +64,7 @@ GpgME::Error Kleo::QGpgMEDeleteJob::start( const GpgME::Key & key, bool allowSec
}
void Kleo::QGpgMEDeleteJob::doOperationDoneEvent( const GpgME::Error & error ) {
getAuditLog();
emit result( error );
}

4
certmanager/lib/backends/qgpgme/qgpgmedownloadjob.cpp

@ -72,7 +72,9 @@ GpgME::Error Kleo::QGpgMEDownloadJob::start( const TQStringList & pats ) {
}
void Kleo::QGpgMEDownloadJob::doOperationDoneEvent( const GpgME::Error & error ) {
emit result( error, mOutDataDataProvider->data() );
const TQByteArray data = mOutDataDataProvider->data();
getAuditLog();
emit result( error, data );
}
#include "qgpgmedownloadjob.moc"

5
certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp

@ -97,7 +97,10 @@ GpgME::EncryptionResult Kleo::QGpgMEEncryptJob::exec( const std::vector<GpgME::K
}
void Kleo::QGpgMEEncryptJob::doOperationDoneEvent( const GpgME::Error & ) {
emit result( mResult = mCtx->encryptionResult(), mOutDataDataProvider->data() );
mResult = mCtx->encryptionResult();
const TQByteArray ciphertext = mOutDataDataProvider->data();
getAuditLog();
emit result( mResult, ciphertext );
}
void Kleo::QGpgMEEncryptJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const {

4
certmanager/lib/backends/qgpgme/qgpgmeexportjob.cpp

@ -72,7 +72,9 @@ GpgME::Error Kleo::QGpgMEExportJob::start( const TQStringList & pats ) {
}
void Kleo::QGpgMEExportJob::doOperationDoneEvent( const GpgME::Error & error ) {
emit result( error, mOutDataDataProvider->data() );
const TQByteArray data = mOutDataDataProvider->data();
getAuditLog();
emit result( error, data );
}
#include "qgpgmeexportjob.moc"

8
certmanager/lib/backends/qgpgme/qgpgmeimportjob.cpp

@ -75,11 +75,15 @@ GpgME::Error Kleo::QGpgMEImportJob::start( const TQByteArray & keyData ) {
GpgME::ImportResult Kleo::QGpgMEImportJob::exec( const TQByteArray & keyData ) {
setup( keyData );
return mCtx->importKeys( *mInData );
const GpgME::ImportResult res = mCtx->importKeys( *mInData );
getAuditLog();
return res;
}
void Kleo::QGpgMEImportJob::doOperationDoneEvent( const GpgME::Error & ) {
emit result( mCtx->importResult() );
const GpgME::ImportResult res = mCtx->importResult();
getAuditLog();
emit result( res );
}

16
certmanager/lib/backends/qgpgme/qgpgmejob.cpp

@ -236,21 +236,19 @@ void Kleo::QGpgMEJob::createOutData() {
static const unsigned int GetAuditLogFlags = GpgME::Context::AuditLogWithHelp|GpgME::Context::HtmlAuditLog;
static TQString audit_log_as_html( GpgME::Context * ctx ) {
if ( !ctx )
return TQString();
static TQString audit_log_as_html( GpgME::Context * ctx, GpgME::Error & err ) {
assert( ctx );
QGpgME::QByteArrayDataProvider dp;
GpgME::Data data( &dp );
assert( !data.isNull() );
if ( const GpgME::Error err = ctx->getAuditLog( data, GetAuditLogFlags ) )
if ( ( err = ctx->getAuditLog( data, GetAuditLogFlags ) ) )
return TQString();
else
return TQString::fromUtf8( dp.data().data() );
const TQByteArray ba = dp.data();
return TQString::fromUtf8( ba.data(), ba.size() );
}
void Kleo::QGpgMEJob::doSlotOperationDoneEvent( GpgME::Context * context, const GpgME::Error & e ) {
if ( context == mCtx ) {
getAuditLog();
doEmitDoneSignal();
doOperationDoneEvent( e );
mThis->deleteLater();
@ -258,7 +256,9 @@ void Kleo::QGpgMEJob::doSlotOperationDoneEvent( GpgME::Context * context, const
}
void Kleo::QGpgMEJob::getAuditLog() {
mAuditLogAsHtml = audit_log_as_html( mCtx );
if ( !mCtx )
return;
mAuditLogAsHtml = audit_log_as_html( mCtx, mAuditLogError );
}
void Kleo::QGpgMEJob::doSlotCancel() {

7
certmanager/lib/backends/qgpgme/qgpgmejob.h

@ -37,6 +37,7 @@
#include <gpgmepp/interfaces/passphraseprovider.h>
#include <gpgmepp/key.h>
#include <gpgmepp/context.h>
#include <tqcstring.h>
#include <tqstring.h>
@ -45,8 +46,6 @@
#include <kdepimmacros.h>
namespace GpgME {
class Error;
class Context;
class Data;
}
@ -120,6 +119,7 @@ namespace Kleo {
virtual void doEmitDoneSignal() = 0;
void doSlotCancel();
TQString auditLogAsHtml() const { return mAuditLogAsHtml; }
GpgME::Error auditLogError() const { return mAuditLogError; }
private:
/*! \reimp from GpgME::ProgressProvider */
@ -146,6 +146,7 @@ namespace Kleo {
unsigned int mNumPatterns;
unsigned int mChunkSize;
unsigned int mPatternStartIndex, mPatternEndIndex;
GpgME::Error mAuditLogError;
TQString mAuditLogAsHtml;
};
@ -154,7 +155,7 @@ namespace Kleo {
#define make_slot_cancel private: void slotCancel() { QGpgMEJob::doSlotCancel(); }
#define make_progress_emitter private: void doEmitProgressSignal( const TQString & what, int cur, int tot ) { emit progress( what, cur, tot ); }
#define make_done_emitter private: void doEmitDoneSignal() { emit done(); }
#define make_auditLogAsHtml private: TQString auditLogAsHtml() const { return QGpgMEJob::auditLogAsHtml(); }
#define make_auditLogAsHtml private: TQString auditLogAsHtml() const { return QGpgMEJob::auditLogAsHtml(); } GpgME::Error auditLogError() const { return QGpgMEJob::auditLogError(); }
#define QGPGME_JOB make_slot_cancel make_progress_emitter make_done_emitter make_auditLogAsHtml
#endif // __KLEO_QGPGMEJOB_H__

5
certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.cpp

@ -80,7 +80,10 @@ GpgME::Error Kleo::QGpgMEKeyGenerationJob::start( const TQString & parameters )
}
void Kleo::QGpgMEKeyGenerationJob::doOperationDoneEvent( const GpgME::Error & ) {
emit result( mCtx->keyGenerationResult(), mPubKeyDataProvider ? mPubKeyDataProvider->data() : TQByteArray() );
const GpgME::KeyGenerationResult res = mCtx->keyGenerationResult();
const TQByteArray data = mPubKeyDataProvider ? mPubKeyDataProvider->data() : TQByteArray() ;
getAuditLog();
emit result( res, data );
}
#include "qgpgmekeygenerationjob.moc"

16
certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp

@ -48,6 +48,7 @@
#include <kdebug.h>
#include <tqstringlist.h>
#include <tqtimer.h>
#include <algorithm>
@ -97,6 +98,10 @@ GpgME::Error Kleo::QGpgMEKeyListJob::start( const TQStringList & pats, bool secr
kdDebug(5150) << "QGpgMEKeyListJob::start(): retrying keylisting with chunksize " << chunkSize() << endl;
continue;
}
} else if ( err.code() == GPG_ERR_EOF ) {
kdDebug(5150) << "QGpgMEKeyListJob::start(): early end of keylisting, trying to fake an empty result" << endl;
TQTimer::singleShot( 10, this, TQT_SLOT(slotFakeOperationDoneEvent()) );
return GpgME::Error();
}
deleteLater();
mResult = GpgME::KeyListResult( 0, err );
@ -158,6 +163,17 @@ void Kleo::QGpgMEKeyListJob::slotNextKeyEvent( GpgME::Context * context, const G
emit nextKey( key );
}
void Kleo::QGpgMEKeyListJob::slotFakeOperationDoneEvent() {
const GpgME::KeyListResult res = mCtx->keyListResult();
if ( !res.error().code() == GPG_ERR_EOF )
kdDebug(5150) << "QGpgMEKeyListJob::slotFakeOperationDoneEvent: expected EOF, got "
<< res.error().asString() << endl;
mResult = GpgME::KeyListResult();
emit done();
emit result( mResult );
deleteLater();
}
void Kleo::QGpgMEKeyListJob::slotOperationDoneEvent( GpgME::Context * context, const GpgME::Error & ) {
if ( context != mCtx )
return;

1
certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h

@ -65,6 +65,7 @@ namespace Kleo {
private slots:
void slotNextKeyEvent( GpgME::Context * context, const GpgME::Key & key );
void slotOperationDoneEvent( GpgME::Context * context, const GpgME::Error & e );
void slotFakeOperationDoneEvent();
private:
void doOperationDoneEvent( const GpgME::Error &) {} // unused, we implement slotOperationDoneEvent ourselves.

4
certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp

@ -109,7 +109,9 @@ Kleo::QGpgMESignEncryptJob::exec( const std::vector<GpgME::Key> & signers,
void Kleo::QGpgMESignEncryptJob::doOperationDoneEvent( const GpgME::Error & ) {
mResult.first = mCtx->signingResult();
mResult.second = mCtx->encryptionResult();
emit result( mResult.first, mResult.second, mOutDataDataProvider->data() );
const TQByteArray cipherText = mOutDataDataProvider->data();
getAuditLog();
emit result( mResult.first, mResult.second, cipherText );
}
void Kleo::QGpgMESignEncryptJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const {

5
certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp

@ -102,7 +102,10 @@ GpgME::SigningResult Kleo::QGpgMESignJob::exec( const std::vector<GpgME::Key> &
}
void Kleo::QGpgMESignJob::doOperationDoneEvent( const GpgME::Error & ) {
emit result( mResult = mCtx->signingResult(), mOutDataDataProvider->data() );
mResult = mCtx->signingResult();
const TQByteArray signature = mOutDataDataProvider->data();
getAuditLog();
emit result( mResult, signature );
}
void Kleo::QGpgMESignJob::showErrorDialog( TQWidget * parent, const TQString & caption ) const {

4
certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.cpp

@ -89,7 +89,9 @@ GpgME::VerificationResult Kleo::QGpgMEVerifyDetachedJob::exec( const TQByteArray
}
void Kleo::QGpgMEVerifyDetachedJob::doOperationDoneEvent( const GpgME::Error & ) {
emit result( mCtx->verificationResult() );
const GpgME::VerificationResult res = mCtx->verificationResult();
getAuditLog();
emit result( res );
}

5
certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.cpp

@ -84,7 +84,10 @@ GpgME::VerificationResult Kleo::QGpgMEVerifyOpaqueJob::exec( const TQByteArray &
}
void Kleo::QGpgMEVerifyOpaqueJob::doOperationDoneEvent( const GpgME::Error & ) {
emit result( mCtx->verificationResult(), mOutDataDataProvider->data() );
const GpgME::VerificationResult res = mCtx->verificationResult();
const TQByteArray plainText = mOutDataDataProvider->data();
getAuditLog();
emit result( res, plainText );
}

14
certmanager/lib/kleo/job.cpp

@ -52,9 +52,13 @@
#include "refreshkeysjob.h"
#include "specialjob.h"
#include <gpgmepp/context.h>
#include <tqapplication.h>
#include <kdebug.h>
#include <gpg-error.h>
Kleo::Job::Job( TQObject * parent, const char * name )
: TQObject( parent, name )
{
@ -75,6 +79,16 @@ TQString Kleo::Job::auditLogAsHtml() const {
return TQString();
}
GpgME::Error Kleo::Job::auditLogError() const {
kdDebug() << "Kleo::Job::auditLogError() should be reimplemented in Kleo::Job subclasses!" << endl;
return GpgME::Error( gpg_error( GPG_ERR_NOT_IMPLEMENTED ) );
}