SVN commit 855487 by s_dibbern:

Scripted merge of stable rev. 855484 and trunk rev. 855484

 M  +575 -569  extragear-graphics/digikam.po  
 M  +59 -36    extragear-graphics/kcoloredit.po  
 M  +475 -479  extragear-multimedia/amarok.po  
 M  +150 -134  extragear-network/ktorrent.po  
 M  +28 -28    extragear-office/kile.po  
 M  +76 -52    extragear-pim/mailody.po  
 M  +6 -6      kdeadmin/ksystemlog.po  
 M  +20 -16    kdebase/desktop_kdebase.po  
 M  +12 -12    kdebase/kcm_phononxine.po  
 M  +18 -18    kdebase/kcmcolors.po  
 M  +86 -6     kdebase/kcmcomponentchooser.po  
 M  +2 -2      kdebase/kcmkonqhtml.po  
 M  +122 -70   kdebase/kcmkwincompositing.po  
 M  +2 -2      kdebase/kcmsmserver.po  
 M  +2 -2      kdebase/kcmsolidproc.po  
 M  +5 -2      kdebase/kcmstyle.po  
 M  +288 -288  kdebase/khotkeys.po  
 M  +174 -234  kdebase/konqueror.po  
 M  +2 -4      kdebase/konsole.po  
 M  +38 -27    kdebase/kwin.po  
 M  +624 -363  kdebase/kwin_effects.po  
 M  +3 -3      kdebase/libplasma.po  
 M  +12 -12    kdebase/nepomuk.po  
 M  +12 -12    kdebase/plasma_applet_clock.po  
 M  +44 -44    kdebase/plasma_applet_desktop.po  
 M  +5 -5      kdebase/plasma_applet_devicenotifier.po  
 M  +14 -14    kdebase/plasma_applet_dig_clock.po  
 M  +2 -2      kdebase/plasma_applet_folderview.po  
 M  +15 -15    kdebase/plasma_applet_launcher.po  
 M  +29 -29    kdeedu/kstars.po  
 M  +5 -5      kdeedu/marble.po  
 M  +98 -82    kdeedu/parley.po  
 M  +2 -2      kdegames/kmines.po  
 M  +270 -258  kdegames/ksirk.po  
 M  +8 -8      kdegraphics/gwenview.po  
 M  +4 -6      kdegraphics/kolourpaint.po  
 M  +20 -13    kdegraphics/okular.po  
 M  +157 -144  kdelibs/katepart4.po  
 M  +706 -959  kdelibs/kdelibs4.po  
 M  +91 -91    kdelibs/kio4.po  
 M  +2 -2      kdelibs/timezones4.po  
 M  +128 -128  kdemultimedia/kscd.po  
 M  +3 -3      kdenetwork/desktop_kdenetwork.po  
 M  +14 -14    kdenetwork/kget.po  
 M  +288 -208  kdenetwork/kopete.po  
 M  +8 -8      kdenetwork/krdc.po  
 M  +6 -6      kdenetwork/plasma_applet_kget.po  
 M  +26 -4     kdepim/akregator.po  
 M  +2 -2      kdepim/desktop_kdepim.po  
 M  +12 -12    kdepim/kaddressbook.po  
 M  +45 -45    kdepim/kalarm.po  
 M  +190 -113  kdepim/kitchensync.po  
 M  +2 -2      kdepim/kleopatra.po  
 M  +2 -2      kdepim/kmail.po  
 M  +4 -4      kdepim/kontact.po  
 M  +11 -11    kdepim/korganizer.po  
 M  +95 -95    kdepim/kpilot.po  
 M  +24 -24    kdepim/ktnef.po  
 M  +2 -2      kdepim/libkdepim.po  
 M  +55 -43    kdepimlibs/kabc_ldapkio.po  
 M  +53 -23    kdeplasma-addons/desktop_kdeplasma-addons.po  
 M  +89 -11    kdeplasma-addons/krunner_converterrunner.po  
 M  +12 -12    kdeplasma-addons/plasma_applet_binaryclock.po  
 M  +4 -4      kdeplasma-addons/plasma_applet_fuzzy_clock.po  
 M  +178 -5    kdereview/desktop_kdereview.po  
 M  +6 -6      kdesdk/katefindinfilesplugin.po  
 M  +307 -59   kdesdk/katetabbarextension.po  
 M  +8 -8      kdesdk/kio_svn.po  
 M  +535 -535  kdesdk/umbrello.po  
 M  +132 -11   kdeutils/ark.po  
 M  +279 -173  kdeutils/kgpg.po  
 M  +29 -9     kdevelop/desktop_kdevelop.po  
 M  +99 -155   kdevelop/kdevelop.po  
 M  +44 -44    koffice/TextShape.po  
 M  +2 -2      koffice/desktop_koffice.po  
 M  +18 -18    koffice/koffice.po  
 M  +576 -496  koffice/krita.po  
 M  +92 -92    koffice/kword.po  
 M  +122 -7    playground-ioslaves/kio_bookmarks.po  
 M  +3 -3      qt/desktop_phonon.po