diff -Nru kdepim-4.9.4/CMakeLists.txt kdepim-4.9.5/CMakeLists.txt
--- kdepim-4.9.4/CMakeLists.txt	2012-11-30 07:38:45.000000000 +0000
+++ kdepim-4.9.5/CMakeLists.txt	2012-12-27 18:01:27.870335473 +0000
@@ -115,7 +115,7 @@
   set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
 endif()
 
-set(KDEPIM_VERSION "4.9.4")
+set(KDEPIM_VERSION "4.9.5")
 
 configure_file(kdepim-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdepim-version.h @ONLY)
 
diff -Nru kdepim-4.9.4/akregator/configuration/akregator_config_advanced.desktop kdepim-4.9.5/akregator/configuration/akregator_config_advanced.desktop
--- kdepim-4.9.4/akregator/configuration/akregator_config_advanced.desktop	2012-11-30 07:38:45.000000000 +0000
+++ kdepim-4.9.5/akregator/configuration/akregator_config_advanced.desktop	2012-12-27 18:01:27.870335473 +0000
@@ -76,7 +76,7 @@
 Comment[es]=Configuración avanzada del lector de fuentes
 Comment[et]=Uudistevoogude lugeja muud seadistused
 Comment[fi]=Syötelukijan lisäasetukset
-Comment[fr]=Configuration avancée du lecteur de flux
+Comment[fr]=Configuration avancé du lecteur de flux
 Comment[gl]=Configuración avanzada do lector de novas
 Comment[hu]=Hírolvasó-beállítások
 Comment[ia]=Preferentias avantiate de lector de syndication
@@ -111,6 +111,7 @@
 Comment[zh_CN]=高级信息源阅读器设置
 Comment[zh_TW]=進階 Feed 閱讀器設定
 X-KDE-Keywords=akregator, configure, settings, advanced
+X-KDE-Keywords[bs]=akregator, konfigurirati, postavke, napredni
 X-KDE-Keywords[ca]=akregator, configura, arranjament, avançat
 X-KDE-Keywords[da]=akregator, indstil, indstillinger, avanceret
 X-KDE-Keywords[de]=Akregator,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen,weiterführend
diff -Nru kdepim-4.9.4/akregator/configuration/akregator_config_appearance.desktop kdepim-4.9.5/akregator/configuration/akregator_config_appearance.desktop
--- kdepim-4.9.4/akregator/configuration/akregator_config_appearance.desktop	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/akregator/configuration/akregator_config_appearance.desktop	2012-12-27 18:01:27.870335473 +0000
@@ -130,6 +130,7 @@
 Comment[zh_CN]=配置信息源阅读器外观
 Comment[zh_TW]=設定 Feed 閱讀器外觀
 X-KDE-Keywords=akregator, configure, settings, appearance, look, feel
+X-KDE-Keywords[bs]=akregator, konfigurirati, postavke, izgled, izraz, osjećaj
 X-KDE-Keywords[ca]=akregator, configura, arranjament, aparença, aspecte, comportament
 X-KDE-Keywords[da]=akregator, indstil, indstillinger, avanceret, udseende
 X-KDE-Keywords[de]=Akregator,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen,Erscheinungsbild,Aussehen,Handhabung
diff -Nru kdepim-4.9.4/akregator/configuration/akregator_config_archive.desktop kdepim-4.9.5/akregator/configuration/akregator_config_archive.desktop
--- kdepim-4.9.4/akregator/configuration/akregator_config_archive.desktop	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/akregator/configuration/akregator_config_archive.desktop	2012-12-27 18:01:27.870335473 +0000
@@ -110,6 +110,7 @@
 Comment[zh_CN]=配置信息源存档
 Comment[zh_TW]=設定 Feed 歸檔
 X-KDE-Keywords=akregator, configure, settings, archive
+X-KDE-Keywords[bs]=akregator, konfigurirati, postavke, arhiva
 X-KDE-Keywords[ca]=akregator, configura, arranjament, arxiu
 X-KDE-Keywords[da]=akregator, indstil, indstillinger, arkiv
 X-KDE-Keywords[de]=Akregator,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen,Archiv
diff -Nru kdepim-4.9.4/akregator/configuration/akregator_config_browser.desktop kdepim-4.9.5/akregator/configuration/akregator_config_browser.desktop
--- kdepim-4.9.4/akregator/configuration/akregator_config_browser.desktop	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/akregator/configuration/akregator_config_browser.desktop	2012-12-27 18:01:27.870335473 +0000
@@ -110,6 +110,7 @@
 Comment[zh_CN]=配置内部浏览器组件
 Comment[zh_TW]=設定內部瀏覽器組件
 X-KDE-Keywords=akregator, configure, settings, Browser, Web, Internal
+X-KDE-Keywords[bs]=akregator, konfigurirati, postavke, pretraživač, web, interni
 X-KDE-Keywords[ca]=akregator, configura, arranjament, navegador, Web, intern
 X-KDE-Keywords[da]=akregator, indstil, indstillinger, browser, web, intern
 X-KDE-Keywords[de]=Akregator,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen,Browser,Web,intern
diff -Nru kdepim-4.9.4/akregator/configuration/akregator_config_general.desktop kdepim-4.9.5/akregator/configuration/akregator_config_general.desktop
--- kdepim-4.9.4/akregator/configuration/akregator_config_general.desktop	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/akregator/configuration/akregator_config_general.desktop	2012-12-27 18:01:27.870335473 +0000
@@ -131,6 +131,7 @@
 Comment[zh_CN]=配置信息源
 Comment[zh_TW]=設定 Feed
 X-KDE-Keywords=akregator, configure, settings, General
+X-KDE-Keywords[bs]=akregator, konfigurirati, postavke, opšti
 X-KDE-Keywords[ca]=akregator, configura, arranjament, General
 X-KDE-Keywords[da]=akregator, indstil, indstillinger, generelt
 X-KDE-Keywords[de]=Akregator,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen,allgemein
diff -Nru kdepim-4.9.4/akregator/plugins/onlinesync/akregator_config_onlinesync.desktop kdepim-4.9.5/akregator/plugins/onlinesync/akregator_config_onlinesync.desktop
--- kdepim-4.9.4/akregator/plugins/onlinesync/akregator_config_onlinesync.desktop	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/akregator/plugins/onlinesync/akregator_config_onlinesync.desktop	2012-12-27 18:01:27.870335473 +0000
@@ -9,6 +9,7 @@
 X-KDE-ParentComponents=akregator,kontact_akregatorplugin
 X-KDE-CfgDlgHierarchy=Akregator
 X-KDE-Keywords=akregator, configure, settings, online readers
+X-KDE-Keywords[bs]=akregator, konfigurirati, postavke, internet čitači
 X-KDE-Keywords[ca]=akregator, configura, arranjament, lectors en línia
 X-KDE-Keywords[da]=akregator, indstil, indstillinger, online læsere
 X-KDE-Keywords[de]=Akregator,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen,online Reader
diff -Nru kdepim-4.9.4/akregator/plugins/sharemicroblog/akregator_config_sharemicroblog.desktop kdepim-4.9.5/akregator/plugins/sharemicroblog/akregator_config_sharemicroblog.desktop
--- kdepim-4.9.4/akregator/plugins/sharemicroblog/akregator_config_sharemicroblog.desktop	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/akregator/plugins/sharemicroblog/akregator_config_sharemicroblog.desktop	2012-12-27 18:01:27.870335473 +0000
@@ -9,6 +9,7 @@
 X-KDE-ParentComponents=akregator,kontact_akregatorplugin
 X-KDE-CfgDlgHierarchy=Akregator
 X-KDE-Keywords=akregator, configure, settings, online readers
+X-KDE-Keywords[bs]=akregator, konfigurirati, postavke, internet čitači
 X-KDE-Keywords[ca]=akregator, configura, arranjament, lectors en línia
 X-KDE-Keywords[da]=akregator, indstil, indstillinger, online læsere
 X-KDE-Keywords[de]=Akregator,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen,online Reader
@@ -44,6 +45,7 @@
 X-KDE-Weight=150
 
 Name=Share Services
+Name[bs]=Servisi dijeljenja
 Name[ca]=Serveis de compartició
 Name[ca@valencia]=Serveis de compartició
 Name[cs]=Sdílené služby
@@ -86,6 +88,7 @@
 Name[x-test]=xxShare Servicesxx
 Name[zh_TW]=分享服務
 Comment=Configure Share Services
+Comment[bs]=Podešavanje servisa dijeljenja
 Comment[ca]=Configura els serveis de compartició
 Comment[ca@valencia]=Configura els serveis de compartició
 Comment[cs]=Nastavit služby sdílení
diff -Nru kdepim-4.9.4/akregator/plugins/sharemicroblog/akregator_sharemicroblog_plugin.desktop kdepim-4.9.5/akregator/plugins/sharemicroblog/akregator_sharemicroblog_plugin.desktop
--- kdepim-4.9.4/akregator/plugins/sharemicroblog/akregator_sharemicroblog_plugin.desktop	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/akregator/plugins/sharemicroblog/akregator_sharemicroblog_plugin.desktop	2012-12-27 18:01:27.874335423 +0000
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Type=Service
 Name=Akregator Online Article Share
+Name[bs]=Dijeljenje članaka na mreži
 Name[ca]=Compartidor d'article en línia de l'Akregator
 Name[ca@valencia]=Compartidor d'article en línia de l'Akregator
 Name[da]=Deling af online-artikler med Akregator
diff -Nru kdepim-4.9.4/akregator/src/akregator.desktop kdepim-4.9.5/akregator/src/akregator.desktop
--- kdepim-4.9.4/akregator/src/akregator.desktop	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/akregator/src/akregator.desktop	2012-12-27 18:01:27.874335423 +0000
@@ -121,6 +121,7 @@
 GenericName[zh_CN]=RSS 种子阅读器
 GenericName[zh_TW]=RSS Feed 閱讀器
 Comment=A KDE News Feed Reader
+Comment[bs]=Dovod KDE vijesti
 Comment[ca]=Un lector de fonts d'informació del KDE
 Comment[ca@valencia]=Un lector de fonts d'informació del KDE
 Comment[da]=En KDE nyhedsfeed-læser
diff -Nru kdepim-4.9.4/archivemailagent/akonadi_archivemail_agent.notifyrc kdepim-4.9.5/archivemailagent/akonadi_archivemail_agent.notifyrc
--- kdepim-4.9.4/archivemailagent/akonadi_archivemail_agent.notifyrc	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/archivemailagent/akonadi_archivemail_agent.notifyrc	2012-12-27 18:01:27.874335423 +0000
@@ -1,5 +1,6 @@
 [Global]
 Comment=Archive Mail Agent
+Comment[bs]=Arhiva poštanskih agenata
 Comment[ca]=Agent d'arxivat de correus
 Comment[da]=Agent til mail-arkivering
 Comment[de]=Agent zur E-Mail-Archivierung
@@ -30,6 +31,7 @@
 Comment[x-test]=xxArchive Mail Agentxx
 Comment[zh_TW]=歸檔郵件代理程式
 Name=Archive Mail Agent
+Name[bs]=Arhiva poštanskih agenata
 Name[ca]=Agent d'arxivat de correus
 Name[da]=Agent til mail-arkivering
 Name[de]=Agent zur E-Mail-Archivierung
@@ -62,6 +64,7 @@
 
 [Event/archivemailfinished]
 Name=Archive Mail finished
+Name[bs]=Arhiva završene pošte
 Name[ca]=Ha finalitzat l'arxivat de correus
 Name[da]=Mail-arkivering gennemført
 Name[de]=E-Mail-Archivierung beendet
@@ -95,6 +98,7 @@
 
 [Event/archivemailstarted]
 Name=Archive Mail started
+Name[bs]=Arhiva započete pošte
 Name[ca]=S'ha iniciat l'arxivat de correus
 Name[da]=Mail-arkivering startet
 Name[de]=E-Mail-Archivierung gestartet
@@ -128,6 +132,7 @@
 
 [Event/archivemailerror]
 Name=Archive Mail Error
+Name[bs]=arhiva pogrešne pošte
 Name[ca]=Error d'arxivat de correus
 Name[da]=Fejl i mail-arkivering
 Name[de]=E-Mail-Archivierungsfehler
diff -Nru kdepim-4.9.4/archivemailagent/archivemailagent.desktop kdepim-4.9.5/archivemailagent/archivemailagent.desktop
--- kdepim-4.9.4/archivemailagent/archivemailagent.desktop	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/archivemailagent/archivemailagent.desktop	2012-12-27 18:01:27.874335423 +0000
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Archive Mail Agent
+Name[bs]=Arhiva poštanskih agenata
 Name[ca]=Agent d'arxivat de correus
 Name[da]=Agent til mail-arkivering
 Name[de]=Agent zur E-Mail-Archivierung
@@ -30,6 +31,7 @@
 Name[x-test]=xxArchive Mail Agentxx
 Name[zh_TW]=歸檔郵件代理程式
 Comment=Archive Mail Agent
+Comment[bs]=Arhiva poštanskih agenata
 Comment[ca]=Agent d'arxivat de correus
 Comment[da]=Agent til mail-arkivering
 Comment[de]=Agent zur E-Mail-Archivierung
diff -Nru kdepim-4.9.4/backupmail/backupmail.desktop kdepim-4.9.5/backupmail/backupmail.desktop
--- kdepim-4.9.4/backupmail/backupmail.desktop	2012-11-30 07:38:45.000000000 +0000
+++ kdepim-4.9.5/backupmail/backupmail.desktop	2012-12-27 18:01:27.874335423 +0000
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Backup Mail
+Name[bs]=Sigurna kopija pošte
 Name[ca]=Còpia de seguretat de correu
 Name[da]=Tag backup af e-mails
 Name[de]=E-Mail-Sicherung
@@ -32,6 +33,7 @@
 Exec=backupmail
 Type=Application
 Comment=Backup Mail allows to save all data from kmail and restore them in other system.
+Comment[bs]=Sigurna kopija pošte vam omogućava da spremite sve podatke iz Kmail i vratiti ih u drugi sistem.
 Comment[ca]=La còpia de seguretat de correu us permet desar totes les dades del KMail i restaura-les en un altre sistema.
 Comment[da]=Backup af e-mails lader dig gemme alle data fra KMail og genskabe dem på et andet system.
 Comment[el]=Τα εφεδρικά αντίγραφα αλληλογραφίας σας επιτρέπουν την αποθήκευση όλων των δεδομένων από το kmail και την επαναφορά τους σε άλλο σύστημα.
diff -Nru kdepim-4.9.4/blogilo/src/toolbox.cpp kdepim-4.9.5/blogilo/src/toolbox.cpp
--- kdepim-4.9.4/blogilo/src/toolbox.cpp	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/blogilo/src/toolbox.cpp	2012-12-27 18:01:27.874335423 +0000
@@ -541,7 +541,7 @@
 void Toolbox::requestEntriesListContextMenu( const QPoint & pos )
 {
     Q_UNUSED(pos);
-    KMenu *entriesContextMenu = new KMenu( this );
+    KMenu *entriesContextMenu = new KMenu;
     KAction *actEntriesOpenInBrowser = new KAction( KIcon("applications-internet"),
                                                     i18n("Open in browser"), entriesContextMenu );
     connect( actEntriesOpenInBrowser, SIGNAL(triggered()), this, SLOT(openPostInBrowser()) );
@@ -555,6 +555,7 @@
     entriesContextMenu->addAction( actEntriesCopyUrl );
     entriesContextMenu->addAction( actEntriesCopyTitle );
     entriesContextMenu->exec( QCursor::pos() );
+    delete entriesContextMenu;
 }
 
 void Toolbox::openPostInBrowser()
diff -Nru kdepim-4.9.4/calendarviews/eventviews/agenda/agendaitem.cpp kdepim-4.9.5/calendarviews/eventviews/agenda/agendaitem.cpp
--- kdepim-4.9.4/calendarviews/eventviews/agenda/agendaitem.cpp	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/calendarviews/eventviews/agenda/agendaitem.cpp	2012-12-27 18:01:27.874335423 +0000
@@ -1088,7 +1088,7 @@
     x += visRect.left();
     eventX = x;
     txtWidth = visRect.right() - margin - x;
-    paintIcons( &p, x, margin, ft );
+    paintIcons( &p, x, margin / 2, ft );
     hTxtWidth = visRect.right() - margin - x;
   } else {
     // paint headline
diff -Nru kdepim-4.9.4/calendarviews/eventviews/month/monthitem.cpp kdepim-4.9.5/calendarviews/eventviews/month/monthitem.cpp
--- kdepim-4.9.4/calendarviews/eventviews/month/monthitem.cpp	2012-11-30 07:38:45.000000000 +0000
+++ kdepim-4.9.5/calendarviews/eventviews/month/monthitem.cpp	2012-12-27 18:01:27.874335423 +0000
@@ -572,9 +572,11 @@
   const QSet<EventView::ItemIcon> icons =
     monthScene()->monthView()->preferences()->monthViewIcons();
 
+  QString customIconName;
   if ( icons.contains( EventViews::EventView::CalendarCustomIcon ) ) {
     const QString iconName = EventView::iconForItem( item );
     if ( !iconName.isEmpty() && iconName != "view-calendar" && iconName != "office-calendar" ) {
+      customIconName = iconName;
       ret << new QPixmap( cachedSmallIcon( iconName ) );
     }
   }
@@ -604,7 +606,10 @@
                                                              EventView::JournalIcon ) ) {
     KDateTime occurrenceDateTime = mIncidence->dateTime( Incidence::RoleRecurrenceStart );
     occurrenceDateTime.setDate( realStartDate() );
-    ret << new QPixmap( cachedSmallIcon( mIncidence->iconName( occurrenceDateTime ) ) );
+
+    const QString incidenceIconName = mIncidence->iconName( occurrenceDateTime );
+    if ( customIconName != incidenceIconName )
+      ret << new QPixmap( cachedSmallIcon( incidenceIconName ) );
   }
 
   if ( icons.contains( EventView::ReadOnlyIcon ) &&
diff -Nru kdepim-4.9.4/debian/changelog kdepim-4.9.5/debian/changelog
--- kdepim-4.9.4/debian/changelog	2012-12-29 19:30:15.000000000 +0000
+++ kdepim-4.9.5/debian/changelog	2013-02-24 22:36:37.000000000 +0000
@@ -1,3 +1,9 @@
+kdepim (4:4.9.5-0ubuntu0.1) quantal; urgency=low
+
+  * New upstream bugfix release (LP: #1094523)
+
+ -- Philip Muškovac <yofel@kubuntu.org>  Sun, 30 Dec 2012 21:33:30 +0100
+
 kdepim (4:4.9.4-0ubuntu0.1) quantal; urgency=low
 
   * New upstream bugfix release (LP: #1085516)
diff -Nru kdepim-4.9.4/debian/control kdepim-4.9.5/debian/control
--- kdepim-4.9.4/debian/control	2012-12-01 23:56:42.000000000 +0000
+++ kdepim-4.9.5/debian/control	2012-12-30 20:33:29.000000000 +0000
@@ -11,8 +11,8 @@
  debhelper (>= 7.3.16), 
  pkg-kde-tools (>= 0.12), 
  pkg-config,
- kdelibs5-dev (>= 4:4.9.4), 
- kdepimlibs5-dev (>= 4:4.9.4), 
+ kdelibs5-dev (>= 4:4.9.5), 
+ kdepimlibs5-dev (>= 4:4.9.5), 
  libphonon-dev (>= 4:4.6.0really4.3.80),
  libgpgme11-dev, 
  libboost1.49-dev, 
@@ -107,7 +107,7 @@
  kontact (>= ${binary:Version}), korganizer (>= ${binary:Version}),
  ktimetracker (>= ${binary:Version}),
  kdepim-strigi-plugins (>= ${binary:Version}),
- libkdepim4 (= ${binary:Version}), kdepimlibs5-dev (>= 4:4.9.4),
+ libkdepim4 (= ${binary:Version}), kdepimlibs5-dev (>= 4:4.9.5),
  libphonon-dev (>= 4:4.6.0really4.3.80),
  libgpgme11-dev, libboost1.49-dev, libboost-graph1.49-dev, libsasl2-dev, libxss-dev,
  libqca2-dev (>= 2.0.0), libpisock-dev, libassuan-dev, libstreams-dev,
Binary files /tmp/UyIhmS1O6C/kdepim-4.9.4/doc/akregator/index.cache.bz2 and /tmp/YQ9aYRSv81/kdepim-4.9.5/doc/akregator/index.cache.bz2 differ
Binary files /tmp/UyIhmS1O6C/kdepim-4.9.4/doc/blogilo/index.cache.bz2 and /tmp/YQ9aYRSv81/kdepim-4.9.5/doc/blogilo/index.cache.bz2 differ
Binary files /tmp/UyIhmS1O6C/kdepim-4.9.4/doc/kabcclient/index.cache.bz2 and /tmp/YQ9aYRSv81/kdepim-4.9.5/doc/kabcclient/index.cache.bz2 differ
Binary files /tmp/UyIhmS1O6C/kdepim-4.9.4/doc/kalarm/index.cache.bz2 and /tmp/YQ9aYRSv81/kdepim-4.9.5/doc/kalarm/index.cache.bz2 differ
Binary files /tmp/UyIhmS1O6C/kdepim-4.9.4/doc/kleopatra/index.cache.bz2 and /tmp/YQ9aYRSv81/kdepim-4.9.5/doc/kleopatra/index.cache.bz2 differ
Binary files /tmp/UyIhmS1O6C/kdepim-4.9.4/doc/kmail/index.cache.bz2 and /tmp/YQ9aYRSv81/kdepim-4.9.5/doc/kmail/index.cache.bz2 differ
Binary files /tmp/UyIhmS1O6C/kdepim-4.9.4/doc/knode/index.cache.bz2 and /tmp/YQ9aYRSv81/kdepim-4.9.5/doc/knode/index.cache.bz2 differ
Binary files /tmp/UyIhmS1O6C/kdepim-4.9.4/doc/konsolekalendar/index.cache.bz2 and /tmp/YQ9aYRSv81/kdepim-4.9.5/doc/konsolekalendar/index.cache.bz2 differ
Binary files /tmp/UyIhmS1O6C/kdepim-4.9.4/doc/kontact/index.cache.bz2 and /tmp/YQ9aYRSv81/kdepim-4.9.5/doc/kontact/index.cache.bz2 differ
Binary files /tmp/UyIhmS1O6C/kdepim-4.9.4/doc/korganizer/index.cache.bz2 and /tmp/YQ9aYRSv81/kdepim-4.9.5/doc/korganizer/index.cache.bz2 differ
Binary files /tmp/UyIhmS1O6C/kdepim-4.9.4/doc/ktimetracker/index.cache.bz2 and /tmp/YQ9aYRSv81/kdepim-4.9.5/doc/ktimetracker/index.cache.bz2 differ
diff -Nru kdepim-4.9.4/examples/coisceim/coisceimpart.desktop kdepim-4.9.5/examples/coisceim/coisceimpart.desktop
--- kdepim-4.9.4/examples/coisceim/coisceimpart.desktop	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/examples/coisceim/coisceimpart.desktop	2012-12-27 18:01:27.874335423 +0000
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=CoisceimPart
+Name[bs]=CoisceimPart
 Name[ca]=CoisceimPart
 Name[ca@valencia]=CoisceimPart
 Name[da]=CoisceimPart
diff -Nru kdepim-4.9.4/examples/coisceim/kontact-plugin/coisceim_plugin.desktop kdepim-4.9.5/examples/coisceim/kontact-plugin/coisceim_plugin.desktop
--- kdepim-4.9.4/examples/coisceim/kontact-plugin/coisceim_plugin.desktop	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/examples/coisceim/kontact-plugin/coisceim_plugin.desktop	2012-12-27 18:01:27.874335423 +0000
@@ -17,6 +17,7 @@
 X-KDE-PluginInfo-AllowEmptySettings=true
 
 Comment=Coisceim Plugin
+Comment[bs]=Coisceim dodatak
 Comment[ca]=Connector del Coisceim
 Comment[ca@valencia]=Connector del Coisceim
 Comment[da]=Coisceim-plugin
@@ -54,6 +55,7 @@
 Comment[x-test]=xxCoisceim Pluginxx
 Comment[zh_TW]=Coisceim 外掛程式
 Name=Trips
+Name[bs]=Trips
 Name[ca]=Trips
 Name[ca@valencia]=Trips
 Name[da]=Trips
diff -Nru kdepim-4.9.4/examples/mailreader/kmail-plasma/plasma-applet-kpapplet.desktop kdepim-4.9.5/examples/mailreader/kmail-plasma/plasma-applet-kpapplet.desktop
--- kdepim-4.9.4/examples/mailreader/kmail-plasma/plasma-applet-kpapplet.desktop	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/examples/mailreader/kmail-plasma/plasma-applet-kpapplet.desktop	2012-12-27 18:01:27.874335423 +0000
@@ -75,6 +75,7 @@
 Name[zh_TW]=郵件管理_KMail
 # ctxt: KMail plasma widget's comment, NOT translators' e-mail addresses.
 Comment=Your emails
+Comment[bs]=samir.ribic@etf.unsa.ba,ndjedovic1@etf.unsa.ba
 Comment[ca]=Els vostres correus
 Comment[ca@valencia]=Els vostres correus
 Comment[cs]=Vaše e-maily
diff -Nru kdepim-4.9.4/importwizard/importwizard.desktop kdepim-4.9.5/importwizard/importwizard.desktop
--- kdepim-4.9.4/importwizard/importwizard.desktop	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/importwizard/importwizard.desktop	2012-12-27 18:01:27.874335423 +0000
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Import Wizard
+Name[bs]=Čarobnjak za uvoz
 Name[ca]=Assistent d'importació
 Name[da]=Importguide
 Name[de]=Import-Assistent 
@@ -35,6 +36,7 @@
 Type=Application
 Icon=kontact-import-wizard
 Comment=Launch the import wizard to migrate data from mailer as thunderbird/evolution etc.
+Comment[bs]=Pokrenite i uvedite čarobnjaka za pomjeranje podataka iz mailera kao thunderbird/evolution etc.
 Comment[ca]=Engega l'assistent d'importació per migrar les dades dels agents de correus com el Thunderbird/Evolution etc.
 Comment[da]=Kør importguiden for at migrere data fra e-mail-programmer såsom Thunderbird, Evolution osv.
 Comment[el]=Εκτελέστε τον οδηγό εισαγωγής για να μεταφέρετε δεδομένα από πελάτες αλληλογραφίας όπως το thunderbird, evolution κλπ.
diff -Nru kdepim-4.9.4/incidenceeditor-ng/incidencedatetime.cpp kdepim-4.9.5/incidenceeditor-ng/incidencedatetime.cpp
--- kdepim-4.9.4/incidenceeditor-ng/incidencedatetime.cpp	2012-11-30 07:38:45.000000000 +0000
+++ kdepim-4.9.5/incidenceeditor-ng/incidencedatetime.cpp	2012-12-27 18:01:27.874335423 +0000
@@ -850,7 +850,11 @@
                                 "The to-do is due before it starts.\n"
                                 "Please correct dates and times." );
 
+    } else if ( mLoadedIncidence->type() == KCalCore::Incidence::TypeJournal ) {
+      return true;
     }
+
+    kDebug() << mLastErrorString;
     return false;
   } else {
     mLastErrorString.clear();
diff -Nru kdepim-4.9.4/kaddressbook/grantlee/tests/themes/air/theme-air.desktop kdepim-4.9.5/kaddressbook/grantlee/tests/themes/air/theme-air.desktop
--- kdepim-4.9.4/kaddressbook/grantlee/tests/themes/air/theme-air.desktop	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/kaddressbook/grantlee/tests/themes/air/theme-air.desktop	2012-12-27 18:01:27.874335423 +0000
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Air
+Name[bs]=Vazduh
 Name[ca]=Aire
 Name[ca@valencia]=Aire
 Name[cs]=Vzduch
@@ -42,6 +43,7 @@
 Name[x-test]=xxAirxx
 Name[zh_TW]=Air
 Description=An Air theme
+Description[bs]=Vazdušna tema
 Description[ca]=Un tema aire
 Description[ca@valencia]=Un tema aire
 Description[cs]=Vzdušný motiv
diff -Nru kdepim-4.9.4/kaddressbook/grantlee/tests/themes/simple/theme-simple.desktop kdepim-4.9.5/kaddressbook/grantlee/tests/themes/simple/theme-simple.desktop
--- kdepim-4.9.4/kaddressbook/grantlee/tests/themes/simple/theme-simple.desktop	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/kaddressbook/grantlee/tests/themes/simple/theme-simple.desktop	2012-12-27 18:01:27.874335423 +0000
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Simple
+Name[bs]=Jednostavan
 Name[ca]=Senzill
 Name[ca@valencia]=Senzill
 Name[cs]=Jednoduchý
@@ -42,6 +43,7 @@
 Name[x-test]=xxSimplexx
 Name[zh_TW]=簡單
 Description=A Simple theme
+Description[bs]=Jednostavna tema
 Description[ca]=Un tema senzill
 Description[ca@valencia]=Un tema senzill
 Description[cs]=Jednoduchý motiv
diff -Nru kdepim-4.9.4/kaddressbook/grantlee/tests/themes/test/theme-test.desktop kdepim-4.9.5/kaddressbook/grantlee/tests/themes/test/theme-test.desktop
--- kdepim-4.9.4/kaddressbook/grantlee/tests/themes/test/theme-test.desktop	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/kaddressbook/grantlee/tests/themes/test/theme-test.desktop	2012-12-27 18:01:27.874335423 +0000
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Test
+Name[bs]=Test
 Name[ca]=Prova
 Name[ca@valencia]=Prova
 Name[cs]=Test
@@ -42,6 +43,7 @@
 Name[x-test]=xxTestxx
 Name[zh_TW]=測試
 Description=A Test theme
+Description[bs]=Testna tema
 Description[ca]=Un tema de proves
 Description[ca@valencia]=Un tema de proves
 Description[cs]=Testovací motiv
diff -Nru kdepim-4.9.4/kalarm/Changelog kdepim-4.9.5/kalarm/Changelog
--- kdepim-4.9.4/kalarm/Changelog	2012-11-30 07:38:45.000000000 +0000
+++ kdepim-4.9.5/kalarm/Changelog	2012-12-27 18:01:27.878335373 +0000
@@ -1,9 +1,13 @@
 KAlarm Change Log
 
-=== Version 2.9.3 --- 13 November 2012 ===
+=== Version 2.9.4 --- 10 December 2012 ===
+- [Akonadi] Fix memory leak when an alarm message window is displayed.
+- [Akonadi] Fix memory leak on alarm edit.
+
+=== Version 2.9.3 (KDE 4.9.4) --- 13 November 2012 ===
 - [Akonadi] Fix alarm list not sorting new alarms when calendar is enabled.
 
-=== Version 2.9.2 --- 22 August 2012 ===
+=== Version 2.9.2 (KDE 4.9.1) --- 22 August 2012 ===
 - Fix Quit not working in system tray icon context menu.
 - [KResources] Fix KAlarm button not highlighting the alarm in the main window.
 
diff -Nru kdepim-4.9.4/kalarm/functions.cpp kdepim-4.9.5/kalarm/functions.cpp
--- kdepim-4.9.4/kalarm/functions.cpp	2012-11-30 07:38:45.000000000 +0000
+++ kdepim-4.9.5/kalarm/functions.cpp	2012-12-27 18:01:27.878335373 +0000
@@ -123,7 +123,7 @@
 const char*   DONT_SHOW_ERRORS_GROUP = "DontShowErrors";
 
 void editNewTemplate(EditAlarmDlg::Type, const KAEvent* preset, QWidget* parent);
-KAlarm::UpdateStatus sendToKOrganizer(const KAEvent*);
+KAlarm::UpdateStatus sendToKOrganizer(const KAEvent&);
 KAlarm::UpdateStatus deleteFromKOrganizer(const QString& eventID);
 KAlarm::UpdateStatus runKOrganizer();
 QString uidKOrganizer(const QString& eventID);
@@ -232,19 +232,24 @@
     {
         // Save the event details in the calendar file, and get the new event ID
         AlarmCalendar* cal = AlarmCalendar::resources();
-        KAEvent* newev = new KAEvent(event);
 #ifdef USE_AKONADI
-        if (!cal->addEvent(*newev, msgParent, (options & USE_EVENT_ID), calendar, (options & NO_RESOURCE_PROMPT), &cancelled))
+        // Note that AlarmCalendar::addEvent() updates 'event'.
+        if (!cal->addEvent(event, msgParent, (options & USE_EVENT_ID), calendar, (options & NO_RESOURCE_PROMPT), &cancelled))
 #else
+        KAEvent* newev = new KAEvent(event);
         if (!cal->addEvent(newev, msgParent, (options & USE_EVENT_ID), calendar, (options & NO_RESOURCE_PROMPT), &cancelled))
 #endif
         {
+#ifndef USE_AKONADI
             delete newev;
+#endif
             status = UPDATE_FAILED;
         }
         else
         {
+#ifndef USE_AKONADI
             event = *newev;   // update event ID etc.
+#endif
             if (!cal->save())
                 status = SAVE_FAILED;
         }
@@ -252,7 +257,7 @@
         {
             if ((options & ALLOW_KORG_UPDATE)  &&  event.copyToKOrganizer())
             {
-                UpdateStatus st = sendToKOrganizer(newev);    // tell KOrganizer to show the event
+                UpdateStatus st = sendToKOrganizer(event);    // tell KOrganizer to show the event
                 if (st > status)
                     status = st;
             }
@@ -311,7 +316,6 @@
         {
             // Save the event details in the calendar file, and get the new event ID
 #ifdef USE_AKONADI
-            KAEvent* const newev = &events[i];
             if (!cal->addEvent(events[i], msgParent, false, &collection))
 #else
             KAEvent* newev = new KAEvent(events[i]);
@@ -328,9 +332,9 @@
 #ifndef USE_AKONADI
             events[i] = *newev;   // update event ID etc.
 #endif
-            if (allowKOrgUpdate  &&  newev->copyToKOrganizer())
+            if (allowKOrgUpdate  &&  events[i].copyToKOrganizer())
             {
-                UpdateStatus st = sendToKOrganizer(newev);    // tell KOrganizer to show the event
+                UpdateStatus st = sendToKOrganizer(events[i]);    // tell KOrganizer to show the event
                 if (st != UPDATE_OK)
                 {
                     ++warnKOrg;
@@ -528,7 +532,7 @@
             {
                 if (newEvent.copyToKOrganizer())
                 {
-                    UpdateStatus st = sendToKOrganizer(&newEvent);    // tell KOrganizer to show the new event
+                    UpdateStatus st = sendToKOrganizer(newEvent);    // tell KOrganizer to show the new event
                     if (st > status)
                         status = st;
                 }
@@ -894,7 +898,7 @@
             }
             if (newev->copyToKOrganizer())
             {
-                UpdateStatus st = sendToKOrganizer(newev);    // tell KOrganizer to show the event
+                UpdateStatus st = sendToKOrganizer(*newev);    // tell KOrganizer to show the event
                 if (st != UPDATE_OK)
                 {
                     ++warnKOrg;
@@ -2377,40 +2381,40 @@
 * It will be held by KOrganizer as a simple event, without alarms - KAlarm
 * is still responsible for alarming.
 */
-KAlarm::UpdateStatus sendToKOrganizer(const KAEvent* event)
+KAlarm::UpdateStatus sendToKOrganizer(const KAEvent& event)
 {
 #ifdef USE_AKONADI
     Event::Ptr kcalEvent(new KCalCore::Event);
-        event->updateKCalEvent(kcalEvent, KAEvent::UID_IGNORE);
+    event.updateKCalEvent(kcalEvent, KAEvent::UID_IGNORE);
 #else
-    Event* kcalEvent = AlarmCalendar::resources()->createKCalEvent(event);
+    Event* kcalEvent = AlarmCalendar::resources()->createKCalEvent(&event);
 #endif
     // Change the event ID to avoid duplicating the same unique ID as the original event
-    QString uid = uidKOrganizer(event->id());
+    QString uid = uidKOrganizer(event.id());
     kcalEvent->setUid(uid);
     kcalEvent->clearAlarms();
     QString userEmail;
-    switch (event->actionTypes())
+    switch (event.actionTypes())
     {
         case KAEvent::ACT_DISPLAY:
         case KAEvent::ACT_COMMAND:
         case KAEvent::ACT_DISPLAY_COMMAND:
-            kcalEvent->setSummary(event->cleanText());
+            kcalEvent->setSummary(event.cleanText());
             userEmail = Preferences::emailAddress();
             break;
         case KAEvent::ACT_EMAIL:
         {
-            QString from = event->emailFromId()
-                         ? Identities::identityManager()->identityForUoid(event->emailFromId()).fullEmailAddr()
+            QString from = event.emailFromId()
+                         ? Identities::identityManager()->identityForUoid(event.emailFromId()).fullEmailAddr()
                          : Preferences::emailAddress();
             AlarmText atext;
-            atext.setEmail(event->emailAddresses(", "), from, QString(), QString(), event->emailSubject(), QString());
+            atext.setEmail(event.emailAddresses(", "), from, QString(), QString(), event.emailSubject(), QString());
             kcalEvent->setSummary(atext.displayText());
             userEmail = from;
             break;
         }
         case KAEvent::ACT_AUDIO:
-            kcalEvent->setSummary(event->audioFile());
+            kcalEvent->setSummary(event.audioFile());
             break;
         default:
             break;
diff -Nru kdepim-4.9.4/kalarm/kalarm.h kdepim-4.9.5/kalarm/kalarm.h
--- kdepim-4.9.4/kalarm/kalarm.h	2012-11-30 07:38:45.000000000 +0000
+++ kdepim-4.9.5/kalarm/kalarm.h	2012-12-27 18:01:27.878335373 +0000
@@ -28,7 +28,7 @@
 #else
 #define VERSION_SUFFIX "-res"
 #endif
-#define KALARM_VERSION "2.9.3" VERSION_SUFFIX
+#define KALARM_VERSION "2.9.4" VERSION_SUFFIX
 
 #define KALARM_NAME "KAlarm"
 #define KALARM_DBUS_SERVICE  "org.kde.kalarm"  // D-Bus service name of KAlarm application
diff -Nru kdepim-4.9.4/kalarm/messagewin.cpp kdepim-4.9.5/kalarm/messagewin.cpp
--- kdepim-4.9.4/kalarm/messagewin.cpp	2012-11-30 07:38:43.000000000 +0000
+++ kdepim-4.9.5/kalarm/messagewin.cpp	2012-12-27 18:01:27.878335373 +0000
@@ -1299,12 +1299,13 @@
     if (!mAlwaysHide)
     {
         // Copy the alarm to the displaying calendar in case of a crash, etc.
-        KAEvent* dispEvent = new KAEvent;
 #ifdef USE_AKONADI
+        KAEvent dispEvent;
         Akonadi::Collection collection = AkonadiModel::instance()->collectionForItem(event.itemId());
-        dispEvent->setDisplaying(event, mAlarmType, collection.id(),
+        dispEvent.setDisplaying(event, mAlarmType, collection.id(),
                     mDateTime.effectiveKDateTime(), mShowEdit, !mNoDefer);
 #else
+        KAEvent* dispEvent = new KAEvent;
         AlarmResource* resource = AlarmResources::instance()->resource(kcalEvent);
         dispEvent->setDisplaying(event, mAlarmType, (resource ? resource->identifier() : QString()),
                     mDateTime.effectiveKDateTime(), mShowEdit, !mNoDefer);
@@ -1313,17 +1314,19 @@
         if (cal)
         {
 #ifdef USE_AKONADI
-            cal->deleteDisplayEvent(dispEvent->id());   // in case it already exists
-            if (!cal->addEvent(*dispEvent))
+            cal->deleteDisplayEvent(dispEvent.id());   // in case it already exists
+            cal->addEvent(dispEvent);
 #else
             cal->deleteEvent(dispEvent->id());   // in case it already exists
             if (!cal->addEvent(dispEvent))
-#endif
                 delete dispEvent;
+#endif
             cal->save();
         }
+#ifndef USE_AKONADI
         else
             delete dispEvent;
+#endif
     }
     theApp()->rescheduleAlarm(event, alarm);
 }
diff -Nru kdepim-4.9.4/kalarm/rtcwakeaction.actions kdepim-4.9.5/kalarm/rtcwakeaction.actions
--- kdepim-4.9.4/kalarm/rtcwakeaction.actions	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kalarm/rtcwakeaction.actions	2012-12-27 18:01:27.878335373 +0000
@@ -71,6 +71,7 @@
 
 [org.kde.kalarmrtcwake.settimer]
 Name=Set RTC wakeup time
+Name[bs]=Postavlja vrijeme buđenja sata realnog vremena
 Name[ca]=Defineix l'hora d'activació de l'RTC
 Name[ca@valencia]=Defineix l'hora d'activació de l'RTC
 Name[da]=Angiv RTC-opvågningstidspunkt
@@ -106,6 +107,7 @@
 Name[x-test]=xxSet RTC wakeup timexx
 Name[zh_TW]=設定 RTC 喚醒時間
 Description=Set RTC wake-from-suspend time
+Description[bs]=Postavlja vrijeme buđenja iz suspenzije sata realnog vremena
 Description[ca]=Defineix l'hora d'activació des de suspensió de l'RTC
 Description[ca@valencia]=Defineix l'hora d'activació des de suspensió de l'RTC
 Description[da]=Angiv RTC-opvågningstidspunkt fra suspendering
diff -Nru kdepim-4.9.4/kjots/plasmoid/akonotes.desktop kdepim-4.9.5/kjots/plasmoid/akonotes.desktop
--- kdepim-4.9.4/kjots/plasmoid/akonotes.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kjots/plasmoid/akonotes.desktop	2012-12-27 18:01:27.878335373 +0000
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Akonotes plasmoid
+Name[bs]=Akonotes plasmoid
 Name[ca]=Estri Akonotes
 Name[ca@valencia]=Estri Akonotes
 Name[cs]=Plasmoid Akonotes
@@ -40,6 +41,7 @@
 Name[zh_CN]=Akonotes plasmoid
 Name[zh_TW]=Akonotes 小程式
 Comment=Akonotes plasmoid
+Comment[bs]=Akonotes plasmoid
 Comment[ca]=L'estri Akonotes
 Comment[ca@valencia]=L'estri Akonotes
 Comment[cs]=Plasmoid Akonotes
diff -Nru kdepim-4.9.4/kjots/plasmoid/akonotes_list.desktop kdepim-4.9.5/kjots/plasmoid/akonotes_list.desktop
--- kdepim-4.9.4/kjots/plasmoid/akonotes_list.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kjots/plasmoid/akonotes_list.desktop	2012-12-27 18:01:27.878335373 +0000
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Akonotes list plasmoid
+Name[bs]=Akonotes lista plasmoid
 Name[ca]=Estri llista de l'Akonotes
 Name[ca@valencia]=Estri llista de l'Akonotes
 Name[da]=Akonotes liste-plasmoid
@@ -38,6 +39,7 @@
 Name[zh_CN]=Akonotes 列表 plasmoid
 Name[zh_TW]=Akonotes list 小程式
 Comment=Akonotes list plasmoid
+Comment[bs]=Akonotes lista plasmoid
 Comment[ca]=L'estri llista de l'Akonotes
 Comment[ca@valencia]=L'estri llista de l'Akonotes
 Comment[da]=Akonotes list-plasmoid
diff -Nru kdepim-4.9.4/kjots/plasmoid/akonotes_note.desktop kdepim-4.9.5/kjots/plasmoid/akonotes_note.desktop
--- kdepim-4.9.4/kjots/plasmoid/akonotes_note.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kjots/plasmoid/akonotes_note.desktop	2012-12-27 18:01:27.878335373 +0000
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Akonotes note plasmoid
+Name[bs]=Akonotes napomena plasmoid
 Name[ca]=Estri nota de l'Akonotes
 Name[ca@valencia]=Estri nota de l'Akonotes
 Name[da]=Akonotes note-plasmoid
@@ -38,6 +39,7 @@
 Name[zh_CN]=Akonotes 便笺 plasmoid
 Name[zh_TW]=Akonotes note 小程式
 Comment=Akonotes note plasmoid
+Comment[bs]=Akonotes napomena plasmoid
 Comment[ca]=L'estri nota de l'Akonotes
 Comment[ca@valencia]=L'estri nota de l'Akonotes
 Comment[da]=Akonotes note-plasmoid
diff -Nru kdepim-4.9.4/kleopatra/conf/kleopatra_config_appear.desktop kdepim-4.9.5/kleopatra/conf/kleopatra_config_appear.desktop
--- kdepim-4.9.4/kleopatra/conf/kleopatra_config_appear.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kleopatra/conf/kleopatra_config_appear.desktop	2012-12-27 18:01:27.878335373 +0000
@@ -150,6 +150,7 @@
 Comment[zh_CN]=颜色和字体配置
 Comment[zh_TW]=設定顏色與字型
 X-KDE-Keywords=color,font, configuration
+X-KDE-Keywords[bs]=boja, vrsta slova, konfiguracija
 X-KDE-Keywords[ca]=color,tipus de lletra, configuració
 X-KDE-Keywords[cs]=barva,písmu,nastavení
 X-KDE-Keywords[da]=farve,skriftype,konfiguration
diff -Nru kdepim-4.9.4/kleopatra/conf/kleopatra_config_cryptooperations.desktop kdepim-4.9.5/kleopatra/conf/kleopatra_config_cryptooperations.desktop
--- kdepim-4.9.4/kleopatra/conf/kleopatra_config_cryptooperations.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kleopatra/conf/kleopatra_config_cryptooperations.desktop	2012-12-27 18:01:27.878335373 +0000
@@ -13,6 +13,7 @@
 X-KDE-CfgDlgHierarchy=Kleopatra
 
 Name=Crypto Operations
+Name[bs]=Operacije šifrovanja
 Name[ca]=Operacions de criptografia
 Name[ca@valencia]=Operacions de criptografia
 Name[cs]=Šifrovací operace
@@ -56,6 +57,7 @@
 Name[zh_CN]=加密操作
 Name[zh_TW]=加密操作
 Comment=Configuration of Crypto Operations
+Comment[bs]=Konfigurisanje operacija šifrovanja
 Comment[ca]=Configuració de les operacions de criptografia
 Comment[ca@valencia]=Configuració de les operacions de criptografia
 Comment[cs]=Nastavení šifrovacích operací
@@ -99,6 +101,7 @@
 Comment[zh_CN]=加密操作配置
 Comment[zh_TW]=加密操作設定
 X-KDE-Keywords=sign,encrypt,email,quick mode,checksum,configuration
+X-KDE-Keywords[bs]=potpis, šifriranje, elektronska pošta, brzi mod, checksum, konfiguracija
 X-KDE-Keywords[ca]=signa,encripta,correu electrònic,mode ràpid,suma de verificació,configuració
 X-KDE-Keywords[da]=signer,krypter,e-mail,kviktilstand,tjeksum,konfiguration
 X-KDE-Keywords[de]=signieren,verschlüsseln,E-Mail,email,schneller Modus,Prüfsumme,Konfiguration,Einrichtung,Einstellungen
diff -Nru kdepim-4.9.4/kleopatra/conf/kleopatra_config_dirserv.desktop kdepim-4.9.5/kleopatra/conf/kleopatra_config_dirserv.desktop
--- kdepim-4.9.4/kleopatra/conf/kleopatra_config_dirserv.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kleopatra/conf/kleopatra_config_dirserv.desktop	2012-12-27 18:01:27.878335373 +0000
@@ -124,6 +124,7 @@
 Comment[zh_CN]=目录服务配置
 Comment[zh_TW]=目錄服務設定
 X-KDE-Keywords=ldap,directory,services,hkp,keyserver
+X-KDE-Keywords[bs]=ldap,podsjetnik, usluge, HKP, keyserver
 X-KDE-Keywords[ca]=ldap,directori,serveis,hkp,servidor de claus
 X-KDE-Keywords[da]=ldap,directory,tjenester,hkp,nøgleserver
 X-KDE-Keywords[de]=LDAP,Verzeichnis,Dienste,HKP,Schlüsselserver
diff -Nru kdepim-4.9.4/kleopatra/conf/kleopatra_config_gnupgsystem.desktop kdepim-4.9.5/kleopatra/conf/kleopatra_config_gnupgsystem.desktop
--- kdepim-4.9.4/kleopatra/conf/kleopatra_config_gnupgsystem.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kleopatra/conf/kleopatra_config_gnupgsystem.desktop	2012-12-27 18:01:27.878335373 +0000
@@ -105,6 +105,7 @@
 Comment[zh_CN]=GnuPG 系统选项的配置
 Comment[zh_TW]=設定 GnuPG 系統選項
 X-KDE-Keywords=gpg,gpgsm,gpg-agent,dirmngr,scdaemon,kleopatra,signing,encryption
+X-KDE-Keywords[bs]=gpg, gpgsm, gpg-agent, dirmngr, scdaemon, kleopatra, potpisivanje, šifriranje
 X-KDE-Keywords[ca]=gpg,gpgsm,gpg-agent,dirmngr,scdaemon,kleopatra,signatura,encriptatge
 X-KDE-Keywords[da]=gpg,gpgsm,gpg-agent,dirmngr,scdaemon,kleopatra,signering,kryptering
 X-KDE-Keywords[de]=GPG,GPGSM,GPG-Agent,dirmngr,SC-Daemon,Kleopatra,signieren,verschlüsseln
diff -Nru kdepim-4.9.4/kleopatra/conf/kleopatra_config_smimevalidation.desktop kdepim-4.9.5/kleopatra/conf/kleopatra_config_smimevalidation.desktop
--- kdepim-4.9.4/kleopatra/conf/kleopatra_config_smimevalidation.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kleopatra/conf/kleopatra_config_smimevalidation.desktop	2012-12-27 18:01:27.878335373 +0000
@@ -104,6 +104,7 @@
 Comment[zh_CN]=配置 S/MIME 证书校验选项
 Comment[zh_TW]=設定 S/MIME 憑證確認選項
 X-KDE-Keywords=smime,validation,kleopatra,signing,encryption
+X-KDE-Keywords[bs]=smime, validacija, kleopatra, potpisivanje, šifriranje
 X-KDE-Keywords[ca]=smime,validació,kleopatra,signatura,encriptatge
 X-KDE-Keywords[da]=smime,validering,kleopatra,signering,kryptering
 X-KDE-Keywords[de]=SMIME,Überprüfung,Kleopatra,signieren,verschlüsseln
diff -Nru kdepim-4.9.4/kleopatra/kleopatra_signencryptfiles.desktop kdepim-4.9.5/kleopatra/kleopatra_signencryptfiles.desktop
--- kdepim-4.9.4/kleopatra/kleopatra_signencryptfiles.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kleopatra/kleopatra_signencryptfiles.desktop	2012-12-27 18:01:27.878335373 +0000
@@ -54,6 +54,7 @@
 
 [Desktop Action kleoencryptsignfiles]
 Name=Sign & Encrypt File
+Name[bs]=Potpiši i šifruj daoteku
 Name[ca]=Signa i encripta el fitxer
 Name[ca@valencia]=Signa i encripta el fitxer
 Name[cs]=Podepsat a zašifrovat soubor
diff -Nru kdepim-4.9.4/kleopatra/kleopatra_signencryptfolders.desktop kdepim-4.9.5/kleopatra/kleopatra_signencryptfolders.desktop
--- kdepim-4.9.4/kleopatra/kleopatra_signencryptfolders.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kleopatra/kleopatra_signencryptfolders.desktop	2012-12-27 18:01:27.882335324 +0000
@@ -52,6 +52,7 @@
 
 [Desktop Action kleosignencryptfolder]
 Name=Archive, Sign && Encrypt Folder
+Name[bs]=Arhiviraj, potpiši i šifruj fasciklu
 Name[ca]=Arxiva, signa i encripta la carpeta
 Name[ca@valencia]=Arxiva, signa i encripta la carpeta
 Name[cs]=Archivovat, podepsat a zašifrovat složku
@@ -93,6 +94,7 @@
 
 [Desktop Action kleoencryptfolder]
 Name=Archive && Encrypt Folder
+Name[bs]=Arhiviraj i šifruj fasciklu
 Name[ca]=Arxiva i encripta la carpeta
 Name[ca@valencia]=Arxiva i encripta la carpeta
 Name[cs]=Archivovat a zašifrovat složku
diff -Nru kdepim-4.9.4/kmail/configuredialog.cpp kdepim-4.9.5/kmail/configuredialog.cpp
--- kdepim-4.9.4/kmail/configuredialog.cpp	2012-11-30 07:38:45.000000000 +0000
+++ kdepim-4.9.5/kmail/configuredialog.cpp	2012-12-27 18:01:27.882335324 +0000
@@ -2173,14 +2173,14 @@
   }
 
   QListWidgetItem *item = mTagListBox->currentItem();
-  TagListWidgetItem *tagItem = static_cast<TagListWidgetItem*>( item );
-  if ( !tagItem ) {
+  if ( !item ) {
     return;
   }
 
   slotRecordTagSettings( currentRow );
   const int numberOfMsgTagList = count;
   for ( int i=0; i < numberOfMsgTagList; ++i ) {
+    TagListWidgetItem *tagItem = static_cast<TagListWidgetItem*>( mTagListBox->item(i) );
     if ( ( i>=mOriginalMsgTagList.count() ) || *(tagItem->kmailTag()) != *(mOriginalMsgTagList[i]) ) {
       KMail::Tag::Ptr tag = tagItem->kmailTag();
       tag->priority = i;
diff -Nru kdepim-4.9.4/kmail/kcm_kpimidentities/kcm_kpimidentities.desktop kdepim-4.9.5/kmail/kcm_kpimidentities/kcm_kpimidentities.desktop
--- kdepim-4.9.4/kmail/kcm_kpimidentities/kcm_kpimidentities.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kmail/kcm_kpimidentities/kcm_kpimidentities.desktop	2012-12-27 18:01:27.882335324 +0000
@@ -144,6 +144,7 @@
 Comment[zh_CN]=管理身份
 Comment[zh_TW]=管理身份
 X-KDE-Keywords=kmail,identity
+X-KDE-Keywords[bs]=kmail, identitet
 X-KDE-Keywords[ca]=kmail,identitat
 X-KDE-Keywords[cs]=kmail,identita
 X-KDE-Keywords[da]=kmail,identitet
diff -Nru kdepim-4.9.4/kmail/kmail2.notifyrc kdepim-4.9.5/kmail/kmail2.notifyrc
--- kdepim-4.9.4/kmail/kmail2.notifyrc	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kmail/kmail2.notifyrc	2012-12-27 18:01:27.882335324 +0000
@@ -72,6 +72,7 @@
 
 [Event/akonadi-instance-warning]
 Name=Akonadi server sent a warning
+Name[bs]=Akonadi server poslao upozorenje
 Name[ca]=El servidor Akonadi ha enviat un avís
 Name[da]=Akonadi-serveren sendte en advarsel
 Name[de]=Warnung des Akonadi-Servers
@@ -104,6 +105,7 @@
 Name[x-test]=xxAkonadi server sent a warningxx
 Name[zh_TW]=Akonadi 伺服器送出一個警告
 Comment=Akonadi server sent a warning
+Comment[bs]=Akonadi server poslao upozorenje
 Comment[ca]=El servidor Akonadi ha enviat un avís
 Comment[da]=Akonadi-serveren sendte en advarsel
 Comment[de]=Warnung des Akonadi-Servers
@@ -139,6 +141,7 @@
 
 [Event/akonadi-instance-error]
 Name=Akonadi server sent an error
+Name[bs]=Akonadi server poslao grešku
 Name[ca]=El servidor Akonadi ha enviat un error
 Name[da]=Akonadi-serveren sendte en fejl
 Name[de]=Fehlermeldung des Akonadi-Servers
@@ -171,6 +174,7 @@
 Name[x-test]=xxAkonadi server sent an errorxx
 Name[zh_TW]=Akonadi 伺服器送出一個錯誤
 Comment=Akonadi server sent an error
+Comment[bs]=Akonadi server poslao grešku
 Comment[ca]=El servidor Akonadi ha enviat un error
 Comment[da]=Akonadi-serveren sendte en fejl
 Comment[de]=Fehlermeldung des Akonadi-Servers
@@ -206,6 +210,7 @@
 
 [Event/akonadi-resource-broken]
 Name=A resource is broken
+Name[bs]=Resurs je prekinut
 Name[ca]=Hi ha un recurs trencat
 Name[ca@valencia]=Hi ha un recurs trencat
 Name[cs]=Zdroj je poškozen
@@ -241,6 +246,7 @@
 Name[x-test]=xxA resource is brokenxx
 Name[zh_TW]=某個資源已損毀
 Comment=A resource change its state to broken
+Comment[bs]=Promjena resursa  je prekinuta
 Comment[ca]=Un recurs canvia el seu estat a trencat
 Comment[ca@valencia]=Un recurs canvia el seu estat a trencat
 Comment[da]=En ressource ændrede sin status til defekt
diff -Nru kdepim-4.9.4/kmail/kmail_addattachmentservicemenu.desktop kdepim-4.9.5/kmail/kmail_addattachmentservicemenu.desktop
--- kdepim-4.9.4/kmail/kmail_addattachmentservicemenu.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kmail/kmail_addattachmentservicemenu.desktop	2012-12-27 18:01:27.882335324 +0000
@@ -7,6 +7,7 @@
 [Desktop Action sendto]
 Icon=kmail
 Name=Send as Email Attachment
+Name[bs]=Pošalji kao dodatak elektronske pošte
 Name[ca]=Envia com a adjunt a correu
 Name[ca@valencia]=Envia com a adjunt a correu
 Name[cs]=Odeslat jako přílohu emailu
diff -Nru kdepim-4.9.4/kmail/kmail_config_accounts.desktop kdepim-4.9.5/kmail/kmail_config_accounts.desktop
--- kdepim-4.9.4/kmail/kmail_config_accounts.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kmail/kmail_config_accounts.desktop	2012-12-27 18:01:27.882335324 +0000
@@ -147,6 +147,7 @@
 Comment[zh_CN]=收发邮件设置
 Comment[zh_TW]=發送與接收信件設定
 X-KDE-Keywords=kmail,accounts
+X-KDE-Keywords[bs]=kmail, nalozi
 X-KDE-Keywords[ca]=kmail,comptes
 X-KDE-Keywords[cs]=kmail,účty
 X-KDE-Keywords[da]=kmail,konti
diff -Nru kdepim-4.9.4/kmail/kmail_config_appearance.desktop kdepim-4.9.5/kmail/kmail_config_appearance.desktop
--- kdepim-4.9.4/kmail/kmail_config_appearance.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kmail/kmail_config_appearance.desktop	2012-12-27 18:01:27.882335324 +0000
@@ -150,6 +150,7 @@
 Comment[zh_CN]=自定义视觉外观
 Comment[zh_TW]=調整視覺顯示
 X-KDE-Keywords=kmail,appearance
+X-KDE-Keywords[bs]=kmail, izgled
 X-KDE-Keywords[ca]=kmail,aparença
 X-KDE-Keywords[cs]=kmail,vzhled
 X-KDE-Keywords[da]=kmail,udseende
diff -Nru kdepim-4.9.4/kmail/kmail_config_composer.desktop kdepim-4.9.5/kmail/kmail_config_composer.desktop
--- kdepim-4.9.4/kmail/kmail_config_composer.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kmail/kmail_config_composer.desktop	2012-12-27 18:01:27.882335324 +0000
@@ -126,6 +126,7 @@
 Comment[zh_CN]=信件撰写器设置
 Comment[zh_TW]=訊息編寫器設定
 X-KDE-Keywords=kmail,composer
+X-KDE-Keywords[bs]=kmail, composer
 X-KDE-Keywords[ca]=kmail,editor
 X-KDE-Keywords[da]=kmail,brevskriver
 X-KDE-Keywords[de]=KMail,Komposer,Editor
diff -Nru kdepim-4.9.4/kmail/kmail_config_identity.desktop kdepim-4.9.5/kmail/kmail_config_identity.desktop
--- kdepim-4.9.4/kmail/kmail_config_identity.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kmail/kmail_config_identity.desktop	2012-12-27 18:01:27.882335324 +0000
@@ -148,6 +148,7 @@
 Comment[zh_CN]=管理身份
 Comment[zh_TW]=管理身份
 X-KDE-Keywords=kmail,identity
+X-KDE-Keywords[bs]=kmail, identitet
 X-KDE-Keywords[ca]=kmail,identitat
 X-KDE-Keywords[cs]=kmail,identita
 X-KDE-Keywords[da]=kmail,identitet
diff -Nru kdepim-4.9.4/kmail/kmail_config_misc.desktop kdepim-4.9.5/kmail/kmail_config_misc.desktop
--- kdepim-4.9.4/kmail/kmail_config_misc.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kmail/kmail_config_misc.desktop	2012-12-27 18:01:27.882335324 +0000
@@ -145,6 +145,7 @@
 Comment[zh_CN]=其它设置
 Comment[zh_TW]=不屬於任何其他地方的設定
 X-KDE-Keywords=kmail,misc
+X-KDE-Keywords[bs]=kmail, razno
 X-KDE-Keywords[ca]=kmail,misc
 X-KDE-Keywords[da]=kmail,diverse
 X-KDE-Keywords[de]=KMail,Verschiedenes
diff -Nru kdepim-4.9.4/kmail/kmail_config_security.desktop kdepim-4.9.5/kmail/kmail_config_security.desktop
--- kdepim-4.9.4/kmail/kmail_config_security.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kmail/kmail_config_security.desktop	2012-12-27 18:01:27.882335324 +0000
@@ -151,6 +151,7 @@
 Comment[zh_CN]=安全和隐私设置
 Comment[zh_TW]=安全性與隱私設定
 X-KDE-Keywords=kmail,security
+X-KDE-Keywords[bs]=kmail, sigurnost
 X-KDE-Keywords[ca]=kmail,seguretat
 X-KDE-Keywords[cs]=kmail,bezpečnost
 X-KDE-Keywords[da]=kmail,sikkerhed
diff -Nru kdepim-4.9.4/kmail/tagselectdialog.cpp kdepim-4.9.5/kmail/tagselectdialog.cpp
--- kdepim-4.9.4/kmail/tagselectdialog.cpp	2012-11-30 07:38:45.000000000 +0000
+++ kdepim-4.9.5/kmail/tagselectdialog.cpp	2012-12-27 18:01:27.882335324 +0000
@@ -72,6 +72,7 @@
 
   foreach( const Tag::Ptr &tag, tagList ) {
     QListWidgetItem *item = new QListWidgetItem( tag->tagName, mListTag );
+    item->setData(UrlTag, tag->nepomukResourceUri.toString());
     item->setFlags( Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable );
     item->setCheckState( Qt::Unchecked );
     mListTag->addItem( item );
@@ -99,7 +100,7 @@
     QListWidgetItem *item = mListTag->item( i );
     if ( item->checkState() == Qt::Checked )
     {
-      lst.append( item->text() );
+      lst.append( item->data(UrlTag).toString() );
     }
   }
   return lst;
diff -Nru kdepim-4.9.4/kmail/tagselectdialog.h kdepim-4.9.5/kmail/tagselectdialog.h
--- kdepim-4.9.4/kmail/tagselectdialog.h	2012-11-30 07:38:45.000000000 +0000
+++ kdepim-4.9.5/kmail/tagselectdialog.h	2012-12-27 18:01:27.882335324 +0000
@@ -46,6 +46,10 @@
   ~TagSelectDialog();
   QList<QString> selectedTag() const;
 private:
+  enum ItemType {
+      UrlTag = Qt::UserRole + 1
+  };
+
   QListWidget *mListTag;
   KListWidgetSearchLine *mListWidgetSearchLine;
 };
diff -Nru kdepim-4.9.4/knode/knarticlemanager.cpp kdepim-4.9.5/knode/knarticlemanager.cpp
--- kdepim-4.9.4/knode/knarticlemanager.cpp	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/knode/knarticlemanager.cpp	2012-12-27 18:01:27.886335275 +0000
@@ -299,7 +299,7 @@
       knGlobals.scheduler()->nntpMutex().unlock();
   }
 
-  else { //folder
+  else if (f_older) {
 
     KNLocalArticle::Ptr art;
     if(f_ilter) {
@@ -955,6 +955,10 @@
 void KNArticleManager::createCompleteThread( KNRemoteArticle::Ptr a )
 {
   KNRemoteArticle::Ptr ref = a->displayedReference();
+  if ( !ref ) {
+    return;
+  }
+
   KNRemoteArticle::Ptr art, top;
   bool inThread=false;
   bool showThreads = knGlobals.settings()->showThreads();
diff -Nru kdepim-4.9.4/kontact/plugins/kmail/kcmkmailsummary.desktop kdepim-4.9.5/kontact/plugins/kmail/kcmkmailsummary.desktop
--- kdepim-4.9.4/kontact/plugins/kmail/kcmkmailsummary.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kontact/plugins/kmail/kcmkmailsummary.desktop	2012-12-27 18:01:27.886335275 +0000
@@ -127,6 +127,7 @@
 Comment[zh_CN]=邮件摘要设置
 Comment[zh_TW]=郵件摘要設定
 X-KDE-Keywords=email, summary, configure, settings
+X-KDE-Keywords[bs]=elektronska pošta, rezime, konfiguriranje, postavke
 X-KDE-Keywords[ca]=correu electrònic, resum, configura, arranjament
 X-KDE-Keywords[da]=e-mail, oversigt, indstil, indstillinger
 X-KDE-Keywords[de]=E-Mail,email,Übersicht,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen
diff -Nru kdepim-4.9.4/kontact/plugins/knotes/knotes.setdlg kdepim-4.9.5/kontact/plugins/knotes/knotes.setdlg
--- kdepim-4.9.4/kontact/plugins/knotes/knotes.setdlg	2012-11-30 07:38:45.000000000 +0000
+++ kdepim-4.9.5/kontact/plugins/knotes/knotes.setdlg	2012-12-27 18:01:27.886335275 +0000
@@ -61,7 +61,7 @@
 Comment[es]=Componente de las notas emergentes
 Comment[et]=Sedelite komponent
 Comment[fi]=Ponnahdusviestiosa
-Comment[fr]=Composant de petites notes
+Comment[fr]=Composant de petites de notes
 Comment[ga]=Comhpháirt Preabnótaí
 Comment[gl]=Compoñente de notas emerxentes
 Comment[hu]=Jegyzetlap objektum
diff -Nru kdepim-4.9.4/kontact/plugins/korganizer/kcmapptsummary.desktop kdepim-4.9.5/kontact/plugins/korganizer/kcmapptsummary.desktop
--- kdepim-4.9.4/kontact/plugins/korganizer/kcmapptsummary.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kontact/plugins/korganizer/kcmapptsummary.desktop	2012-12-27 18:01:27.886335275 +0000
@@ -111,6 +111,7 @@
 Comment[zh_CN]=近期事件摘要设置
 Comment[zh_TW]=將發生的事件摘要設定
 X-KDE-Keywords=calendar, events, configure, settings
+X-KDE-Keywords[bs]=kalendar, događaji, konfigurirati, postavke
 X-KDE-Keywords[ca]=calendari, esdeveniments, configura, arranjament
 X-KDE-Keywords[da]=kalender, begivenheder, indstil, indstillinger
 X-KDE-Keywords[de]=Ereignisse,Kalendar,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen
diff -Nru kdepim-4.9.4/kontact/plugins/korganizer/kcmtodosummary.desktop kdepim-4.9.5/kontact/plugins/korganizer/kcmtodosummary.desktop
--- kdepim-4.9.4/kontact/plugins/korganizer/kcmtodosummary.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kontact/plugins/korganizer/kcmtodosummary.desktop	2012-12-27 18:01:27.886335275 +0000
@@ -112,6 +112,7 @@
 Comment[zh_CN]=未决待办事项摘要设置
 Comment[zh_TW]=未決定的待辦事項摘要設定
 X-KDE-Keywords=calendar, todos, configure, settings
+X-KDE-Keywords[bs]=kalendar, zadaci , konfigurirati,  postavke
 X-KDE-Keywords[ca]=calendari, tasques pendents, configura, arranjament
 X-KDE-Keywords[da]=kalender, gøremål, indstil, indstillinger
 X-KDE-Keywords[de]=Kalendar,Aufgaben,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen
diff -Nru kdepim-4.9.4/kontact/plugins/planner/kcmplanner.desktop kdepim-4.9.5/kontact/plugins/planner/kcmplanner.desktop
--- kdepim-4.9.4/kontact/plugins/planner/kcmplanner.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kontact/plugins/planner/kcmplanner.desktop	2012-12-27 18:01:27.886335275 +0000
@@ -109,6 +109,7 @@
 Comment[zh_CN]=安排计划设定
 Comment[zh_TW]=行事曆設定
 X-KDE-Keywords=calendar, todos, configure, settings
+X-KDE-Keywords[bs]=kalendar, zadaci , konfigurirati,  postavke
 X-KDE-Keywords[ca]=calendari, tasques pendents, configura, arranjament
 X-KDE-Keywords[da]=kalender, gøremål, indstil, indstillinger
 X-KDE-Keywords[de]=Kalendar,Aufgaben,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen
diff -Nru kdepim-4.9.4/kontact/plugins/specialdates/kcmsdsummary.desktop kdepim-4.9.5/kontact/plugins/specialdates/kcmsdsummary.desktop
--- kdepim-4.9.4/kontact/plugins/specialdates/kcmsdsummary.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kontact/plugins/specialdates/kcmsdsummary.desktop	2012-12-27 18:01:27.886335275 +0000
@@ -114,6 +114,7 @@
 Comment[zh_CN]=近期日期摘要设置
 Comment[zh_TW]=將來臨的特殊日期摘要設定
 X-KDE-Keywords=birthday, anniversary, holiday, configure, settings
+X-KDE-Keywords[bs]=rođendan, godišnjica, odmor, konfigurirati, postavke
 X-KDE-Keywords[ca]=naixement, aniversari, festiu, configura, arranjament
 X-KDE-Keywords[da]=fødselsdag, årsdag, helligdag, indstil, indstillinger
 X-KDE-Keywords[de]=Geburtstag,Jahrestag,Feiertag,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen
diff -Nru kdepim-4.9.4/kontact/src/kontactconfig.desktop kdepim-4.9.5/kontact/src/kontactconfig.desktop
--- kdepim-4.9.4/kontact/src/kontactconfig.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kontact/src/kontactconfig.desktop	2012-12-27 18:01:27.886335275 +0000
@@ -12,6 +12,7 @@
 X-KDE-Weight=0
 
 Name=Kontact Configuration
+Name[bs]=Konfiguracija programa Kontakt
 Name[ca]=Configuració de Kontact
 Name[ca@valencia]=Configuració de Kontact
 Name[cs]=Nastavení Kontact
@@ -94,6 +95,7 @@
 Comment[zh_CN]=默认 KDE Kontact 组件
 Comment[zh_TW]=預設 KDE Kontact 元件
 X-KDE-Keywords=kontact
+X-KDE-Keywords[bs]=Kontact
 X-KDE-Keywords[ca]=kontact
 X-KDE-Keywords[cs]=kontact
 X-KDE-Keywords[da]=kontact
diff -Nru kdepim-4.9.4/kontact/src/mainwindow.cpp kdepim-4.9.5/kontact/src/mainwindow.cpp
--- kdepim-4.9.4/kontact/src/mainwindow.cpp	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/kontact/src/mainwindow.cpp	2012-12-27 18:01:27.886335275 +0000
@@ -178,14 +178,17 @@
   createGUI( 0 );
 
   KToolBar *navigatorToolBar = findToolBar( "navigatorToolBar" );
-  Q_ASSERT( navigatorToolBar );
-  if ( layoutDirection() == Qt::LeftToRight ) {
-    navigatorToolBar->setLayoutDirection( Qt::RightToLeft );
+  if ( navigatorToolBar ) {
+    if ( layoutDirection() == Qt::LeftToRight ) {
+      navigatorToolBar->setLayoutDirection( Qt::RightToLeft );
+    } else {
+      navigatorToolBar->setLayoutDirection( Qt::LeftToRight );
+    }
+    Q_ASSERT( navigatorToolBar->sizeHint().isValid() );
+    navigatorToolBar->setMinimumWidth( navigatorToolBar->sizeHint().width() );
   } else {
-    navigatorToolBar->setLayoutDirection( Qt::LeftToRight );
+    kError() << "Unable to find navigatorToolBar, probably kontactui.rc is missing";
   }
-  Q_ASSERT( navigatorToolBar->sizeHint().isValid() );
-  navigatorToolBar->setMinimumWidth( navigatorToolBar->sizeHint().width() );
 }
 
 void MainWindow::waitForKSycoca()
diff -Nru kdepim-4.9.4/korganizer/calendarview.cpp kdepim-4.9.5/korganizer/calendarview.cpp
--- kdepim-4.9.4/korganizer/calendarview.cpp	2012-11-30 07:38:45.000000000 +0000
+++ kdepim-4.9.5/korganizer/calendarview.cpp	2012-12-27 18:01:27.886335275 +0000
@@ -1296,6 +1296,16 @@
   IncidenceEditorNG::IncidenceDefaults defaults =
     IncidenceEditorNG::IncidenceDefaults::minimalIncidenceDefaults();
 
+  bool allDay = true;
+  if ( mViewManager->currentView()->isEventView() ) {
+    QDateTime startDt;
+    QDateTime endDt;
+    dateTimesForNewEvent( startDt, endDt, allDay );
+
+    defaults.setStartDateTime( KDateTime( startDt ) );
+    defaults.setEndDateTime( KDateTime( endDt ) );
+  }
+
   Journal::Ptr journal( new Journal );
   defaults.setDefaults( journal );
 
diff -Nru kdepim-4.9.4/korganizer/kcmconfigs/korganizer_configcolorsandfonts.desktop kdepim-4.9.5/korganizer/kcmconfigs/korganizer_configcolorsandfonts.desktop
--- kdepim-4.9.4/korganizer/kcmconfigs/korganizer_configcolorsandfonts.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/korganizer/kcmconfigs/korganizer_configcolorsandfonts.desktop	2012-12-27 18:01:27.886335275 +0000
@@ -110,6 +110,7 @@
 Comment[zh_CN]=KOrganizer 颜色和字体配置
 Comment[zh_TW]=KOrganizer 顏色與字型設定
 X-KDE-Keywords=korganizer,colors,fonts
+X-KDE-Keywords[bs]=KOrganizator, boje, vrsta slova
 X-KDE-Keywords[ca]=korganizer,colors,tipus de lletra
 X-KDE-Keywords[da]=korganizer,farver,skrifttyper
 X-KDE-Keywords[de]=KOrganizer,Farben,Schriftarten
diff -Nru kdepim-4.9.4/korganizer/kcmconfigs/korganizer_configdesignerfields.desktop kdepim-4.9.5/korganizer/kcmconfigs/korganizer_configdesignerfields.desktop
--- kdepim-4.9.4/korganizer/kcmconfigs/korganizer_configdesignerfields.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/korganizer/kcmconfigs/korganizer_configdesignerfields.desktop	2012-12-27 18:01:27.886335275 +0000
@@ -142,6 +142,7 @@
 Comment[zh_CN]=配置定制页
 Comment[zh_TW]=設定 Custom Pages
 X-KDE-Keywords=korganizer, configure, settings, custom fields
+X-KDE-Keywords[bs]=KOrganizator, konfigurirati, postavke, korisnička polja
 X-KDE-Keywords[ca]=korganizer, configura, arranjament, camps personalitzats
 X-KDE-Keywords[da]=korganizer, indstil, indstillinger, brugertilpassede felter
 X-KDE-Keywords[de]=KOrganizer,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen,benutzerdefinierte Felder
diff -Nru kdepim-4.9.4/korganizer/kcmconfigs/korganizer_configfreebusy.desktop kdepim-4.9.5/korganizer/kcmconfigs/korganizer_configfreebusy.desktop
--- kdepim-4.9.4/korganizer/kcmconfigs/korganizer_configfreebusy.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/korganizer/kcmconfigs/korganizer_configfreebusy.desktop	2012-12-27 18:01:27.890335226 +0000
@@ -139,6 +139,7 @@
 Comment[zh_CN]=KOrganizer 空闲/忙碌配置
 Comment[zh_TW]=KOrganizer 行程資訊設定
 X-KDE-Keywords=korganizer,freebusy,scheduling
+X-KDE-Keywords[bs]=KOrganizator, slobodno zauzeto, raspored
 X-KDE-Keywords[ca]=korganizer,lliure/ocupat,planificació
 X-KDE-Keywords[da]=korganizer,freebusy,skemalægning
 X-KDE-Keywords[de]=KOrganizer,Frei/Beschäftigt,Frei/Belegt,Ablaufplanung
diff -Nru kdepim-4.9.4/korganizer/kcmconfigs/korganizer_configgroupscheduling.desktop kdepim-4.9.5/korganizer/kcmconfigs/korganizer_configgroupscheduling.desktop
--- kdepim-4.9.4/korganizer/kcmconfigs/korganizer_configgroupscheduling.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/korganizer/kcmconfigs/korganizer_configgroupscheduling.desktop	2012-12-27 18:01:27.890335226 +0000
@@ -136,6 +136,7 @@
 Comment[zh_CN]=Korganizer 组日程安排配置
 Comment[zh_TW]=KOrganizer 群組排程設定
 X-KDE-Keywords=korganizer,group,scheduling
+X-KDE-Keywords[bs]=KOrganizator, grupa, raspored
 X-KDE-Keywords[ca]=korganizer,grup,planificació
 X-KDE-Keywords[da]=korganizer,gruppe,skemalægning
 X-KDE-Keywords[de]=KOrganizer,Gruppe,Ablaufplanung
diff -Nru kdepim-4.9.4/korganizer/kcmconfigs/korganizer_configmain.desktop kdepim-4.9.5/korganizer/kcmconfigs/korganizer_configmain.desktop
--- kdepim-4.9.4/korganizer/kcmconfigs/korganizer_configmain.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/korganizer/kcmconfigs/korganizer_configmain.desktop	2012-12-27 18:01:27.890335226 +0000
@@ -148,6 +148,7 @@
 Comment[zh_CN]=KOrganizer 主要配置
 Comment[zh_TW]=KOrganizer 主設定
 X-KDE-Keywords=korganizer,main
+X-KDE-Keywords[bs]=KOrganizator, pošta
 X-KDE-Keywords[ca]=korganizer,principal
 X-KDE-Keywords[cs]=korganizer,hlavní
 X-KDE-Keywords[da]=korganizer,hoved
diff -Nru kdepim-4.9.4/korganizer/kcmconfigs/korganizer_configplugins.desktop kdepim-4.9.5/korganizer/kcmconfigs/korganizer_configplugins.desktop
--- kdepim-4.9.4/korganizer/kcmconfigs/korganizer_configplugins.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/korganizer/kcmconfigs/korganizer_configplugins.desktop	2012-12-27 18:01:27.890335226 +0000
@@ -143,6 +143,7 @@
 Comment[zh_CN]=KOrganizer 插件配置
 Comment[zh_TW]=KOrganizer外掛程式設定
 X-KDE-Keywords=korganizer,plugin,module
+X-KDE-Keywords[bs]=KOrganizator, dodaci, modul
 X-KDE-Keywords[ca]=korganizer,connector,mòdul
 X-KDE-Keywords[da]=korganizer,plugin,modul
 X-KDE-Keywords[de]=KOrganizer,Modul,Modul
diff -Nru kdepim-4.9.4/korganizer/kcmconfigs/korganizer_configtime.desktop kdepim-4.9.5/korganizer/kcmconfigs/korganizer_configtime.desktop
--- kdepim-4.9.4/korganizer/kcmconfigs/korganizer_configtime.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/korganizer/kcmconfigs/korganizer_configtime.desktop	2012-12-27 18:01:27.890335226 +0000
@@ -114,6 +114,7 @@
 Comment[zh_CN]=KOrganizer 时间和日期配置
 Comment[zh_TW]=KOrganizer 時間與日期設定
 X-KDE-Keywords=korganizer,time
+X-KDE-Keywords[bs]=KOrganizator, vrijeme
 X-KDE-Keywords[ca]=korganizer,hora
 X-KDE-Keywords[cs]=korganizer,čas
 X-KDE-Keywords[da]=korganizer,tid
diff -Nru kdepim-4.9.4/korganizer/kcmconfigs/korganizer_configviews.desktop kdepim-4.9.5/korganizer/kcmconfigs/korganizer_configviews.desktop
--- kdepim-4.9.4/korganizer/kcmconfigs/korganizer_configviews.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/korganizer/kcmconfigs/korganizer_configviews.desktop	2012-12-27 18:01:27.890335226 +0000
@@ -145,6 +145,7 @@
 Comment[zh_CN]=KOrganizer 视图配置
 Comment[zh_TW]=KOrganizer 檢視設定
 X-KDE-Keywords=korganizer,view
+X-KDE-Keywords[bs]=KOrganizator, pogled
 X-KDE-Keywords[ca]=korganizer,vista
 X-KDE-Keywords[cs]=korganizer,pohled
 X-KDE-Keywords[da]=korganizer,vis
diff -Nru kdepim-4.9.4/korganizer/kodaymatrix.cpp kdepim-4.9.5/korganizer/kodaymatrix.cpp
--- kdepim-4.9.4/korganizer/kodaymatrix.cpp	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/korganizer/kodaymatrix.cpp	2012-12-27 18:01:27.890335226 +0000
@@ -692,6 +692,7 @@
       } else if ( a == move ) {
         action = DRAG_MOVE;
       }
+      delete menu;
     }
 
     if ( action == DRAG_COPY  || action == DRAG_MOVE ) {
diff -Nru kdepim-4.9.4/korganizer/korgac/korgacagent.desktop kdepim-4.9.5/korganizer/korgac/korgacagent.desktop
--- kdepim-4.9.4/korganizer/korgac/korgacagent.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/korganizer/korgac/korgacagent.desktop	2012-12-27 18:01:27.890335226 +0000
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Reminder Daemon
+Name[bs]=Demon za podsjećanje
 Name[ca]=Dimoni de recordatoris
 Name[ca@valencia]=Dimoni de recordatoris
 Name[cs]=Démon upomínek
@@ -41,6 +42,7 @@
 Name[x-test]=xxReminder Daemonxx
 Name[zh_TW]=提醒守護程式
 Comment=Event and task reminder daemon
+Comment[bs]=Demon za podsjećanje na događaje i zadatke
 Comment[ca]=Dimoni de recordatoris de tasques i esdeveniments
 Comment[ca@valencia]=Dimoni de recordatoris de tasques i esdeveniments
 Comment[cs]=Démon upomínek na události a úkoly
diff -Nru kdepim-4.9.4/korganizer/korganizer-import.desktop kdepim-4.9.5/korganizer/korganizer-import.desktop
--- kdepim-4.9.4/korganizer/korganizer-import.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/korganizer/korganizer-import.desktop	2012-12-27 18:01:27.890335226 +0000
@@ -207,3 +207,4 @@
 GenericName[zh_TW]=個人行程組織軟體
 X-KDE-StartupNotify=true
 X-DBUS-StartupType=Unique
+InitialPreference=10
diff -Nru kdepim-4.9.4/korganizer/korganizer.desktop kdepim-4.9.5/korganizer/korganizer.desktop
--- kdepim-4.9.4/korganizer/korganizer.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/korganizer/korganizer.desktop	2012-12-27 18:01:27.890335226 +0000
@@ -210,3 +210,4 @@
 X-DBUS-StartupType=Unique
 X-DBUS-ServiceName=org.kde.korganizer
 Categories=Qt;KDE;Office;Calendar;
+InitialPreference=10
diff -Nru kdepim-4.9.4/ktimetracker/ktimetracker_config_behavior.desktop kdepim-4.9.5/ktimetracker/ktimetracker_config_behavior.desktop
--- kdepim-4.9.4/ktimetracker/ktimetracker_config_behavior.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/ktimetracker/ktimetracker_config_behavior.desktop	2012-12-27 18:01:27.890335226 +0000
@@ -107,6 +107,7 @@
 Comment[zh_CN]=配置行为
 Comment[zh_TW]=設定行為
 X-KDE-Keywords=ktimetracker, configure, settings
+X-KDE-Keywords[bs]=ktimetracker, konfigurirati, postavke
 X-KDE-Keywords[ca]=ktimetracker, configura, arranjament
 X-KDE-Keywords[da]=ktimetracker, indstil, indstillinger
 X-KDE-Keywords[de]=KTimetracker,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen
diff -Nru kdepim-4.9.4/ktimetracker/ktimetracker_config_display.desktop kdepim-4.9.5/ktimetracker/ktimetracker_config_display.desktop
--- kdepim-4.9.4/ktimetracker/ktimetracker_config_display.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/ktimetracker/ktimetracker_config_display.desktop	2012-12-27 18:01:27.890335226 +0000
@@ -132,6 +132,7 @@
 Comment[zh_CN]=配置外观
 Comment[zh_TW]=設定外觀
 X-KDE-Keywords=ktimetracker, configure, settings
+X-KDE-Keywords[bs]=ktimetracker, konfigurirati, postavke
 X-KDE-Keywords[ca]=ktimetracker, configura, arranjament
 X-KDE-Keywords[da]=ktimetracker, indstil, indstillinger
 X-KDE-Keywords[de]=KTimetracker,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen
diff -Nru kdepim-4.9.4/ktimetracker/ktimetracker_config_storage.desktop kdepim-4.9.5/ktimetracker/ktimetracker_config_storage.desktop
--- kdepim-4.9.4/ktimetracker/ktimetracker_config_storage.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/ktimetracker/ktimetracker_config_storage.desktop	2012-12-27 18:01:27.890335226 +0000
@@ -106,6 +106,7 @@
 Comment[zh_CN]=配置存储
 Comment[zh_TW]=設定儲存裝置
 X-KDE-Keywords=ktimetracker, configure, settings
+X-KDE-Keywords[bs]=ktimetracker, konfigurirati, postavke
 X-KDE-Keywords[ca]=ktimetracker, configura, arranjament
 X-KDE-Keywords[da]=ktimetracker, indstil, indstillinger
 X-KDE-Keywords[de]=KTimetracker,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen
diff -Nru kdepim-4.9.4/ktnef/ktnef.desktop kdepim-4.9.5/ktnef/ktnef.desktop
--- kdepim-4.9.4/ktnef/ktnef.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/ktnef/ktnef.desktop	2012-12-27 18:01:27.890335226 +0000
@@ -3,6 +3,7 @@
 Name[af]=KTnef
 Name[bg]=KTnef
 Name[br]=KTnef
+Name[bs]=KTnef
 Name[ca]=KTnef
 Name[cy]=KTnef
 Name[da]=KTnef
@@ -46,6 +47,7 @@
 GenericName=TNEF File Viewer
 GenericName[af]=TNEF lêer leser
 GenericName[bg]=Преглед на файлове TNEF
+GenericName[bs]=Pregledač TNEF datoteke
 GenericName[ca]=Visor de fitxers TNEF
 GenericName[cy]=Syllwr Ffeil TNEF
 GenericName[da]=Fremviser til TNEF-filer
@@ -94,6 +96,7 @@
 Comment=A viewer/extractor for TNEF files
 Comment[af]='n Leeser en data onttrekker vir TNEF lêers
 Comment[bg]=Програма за преглед и извличане на файлове TNEF
+Comment[bs]=Pregledač/izdvajač iz TNEF datoteka
 Comment[ca]=Un visor/extractor pels fitxers TNEF
 Comment[cy]=Gwelydd/echdynnydd i ffeiliau TNEF
 Comment[da]=En fremviser/udpakker til TNEF-filer
diff -Nru kdepim-4.9.4/libkdepim/CMakeLists.txt kdepim-4.9.5/libkdepim/CMakeLists.txt
--- kdepim-4.9.4/libkdepim/CMakeLists.txt	2012-11-30 07:38:45.000000000 +0000
+++ kdepim-4.9.5/libkdepim/CMakeLists.txt	2012-12-27 18:01:27.890335226 +0000
@@ -88,6 +88,7 @@
 if(NOT KDEPIM_NO_NEPOMUK)
   target_link_libraries(kdepim
     ${NEPOMUK_QUERY_LIBRARIES}
+    ${NEPOMUK_LIBRARIES}
     ${SOPRANO_LIBRARIES}
   )
 endif()
diff -Nru kdepim-4.9.4/libkdepim/ldap/kcmldap.desktop kdepim-4.9.5/libkdepim/ldap/kcmldap.desktop
--- kdepim-4.9.4/libkdepim/ldap/kcmldap.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/libkdepim/ldap/kcmldap.desktop	2012-12-27 18:01:27.890335226 +0000
@@ -98,6 +98,7 @@
 Comment[zh_CN]=配置可用的 LDAP 服务器
 Comment[zh_TW]=設定可用的 LDAP 伺服器
 X-KDE-Keywords=kaddressbook, configure, settings, LDAP
+X-KDE-Keywords[bs]=kaddressbook, konfigurirati, postavke, LDAP
 X-KDE-Keywords[ca]=kaddressbook, configura, arranjament, LDAP
 X-KDE-Keywords[da]=kaddressbook, indstil, indstillinger, LDAP
 X-KDE-Keywords[de]=KAddressbook,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen,LDAP
diff -Nru kdepim-4.9.4/libkleo/libkleopatrarc-win32.desktop kdepim-4.9.5/libkleo/libkleopatrarc-win32.desktop
--- kdepim-4.9.4/libkleo/libkleopatrarc-win32.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/libkleo/libkleopatrarc-win32.desktop	2012-12-27 18:01:27.890335226 +0000
@@ -56,6 +56,7 @@
 output-file=sha1sum.txt
 id=sha1sum
 Name=sha1sum
+Name[bs]=sha1sum
 Name[ca]=sha1sum
 Name[ca@valencia]=sha1sum
 Name[cs]=sha1sum
@@ -105,6 +106,7 @@
 output-file=sha256sum.txt
 id=sha256sum
 Name=sha256sum
+Name[bs]=sha256sum
 Name[ca]=sha256sum
 Name[ca@valencia]=sha256sum
 Name[cs]=sha256sum
@@ -153,6 +155,7 @@
 output-file=md5sum.txt
 id=md5sum
 Name=md5sum
+Name[bs]=md5sum
 Name[ca]=md5sum
 Name[ca@valencia]=md5sum
 Name[cs]=md5sum
diff -Nru kdepim-4.9.4/libkleo/libkleopatrarc.desktop kdepim-4.9.5/libkleo/libkleopatrarc.desktop
--- kdepim-4.9.4/libkleo/libkleopatrarc.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/libkleo/libkleopatrarc.desktop	2012-12-27 18:01:27.890335226 +0000
@@ -145,6 +145,7 @@
 output-file=sha1sum.txt
 id=sha1sum
 Name=sha1sum
+Name[bs]=sha1sum
 Name[ca]=sha1sum
 Name[ca@valencia]=sha1sum
 Name[cs]=sha1sum
@@ -194,6 +195,7 @@
 output-file=md5sum.txt
 id=md5sum
 Name=md5sum
+Name[bs]=md5sum
 Name[ca]=md5sum
 Name[ca@valencia]=md5sum
 Name[cs]=md5sum
diff -Nru kdepim-4.9.4/mailcommon/filter/filteractionunsetstatus.cpp kdepim-4.9.5/mailcommon/filter/filteractionunsetstatus.cpp
--- kdepim-4.9.4/mailcommon/filter/filteractionunsetstatus.cpp	2012-11-30 07:38:45.000000000 +0000
+++ kdepim-4.9.5/mailcommon/filter/filteractionunsetstatus.cpp	2012-12-27 18:01:27.890335226 +0000
@@ -36,8 +36,23 @@
   const int index = mParameterList.indexOf( mParameter );
   if ( index < 1 )
     return ErrorButGoOn;
+  
+  Akonadi::MessageStatus status;
+  status.setStatusFromFlags( context.item().flags() );
+
+
+  Akonadi::MessageStatus newStatus = FilterActionStatus::stati[ index - 1 ];
+  //Laurent unread status doesn't exist. And crash if we use "const Akonadi::Item::Flag flag = *(flags.begin());" etc. => if we unset "unread" we set read
+  if ( newStatus == Akonadi::MessageStatus::statusUnread() ) {
+    Akonadi::MessageStatus oldStatus = status;
+    newStatus.setRead( true );
+    if( oldStatus != newStatus ) {
+      context.item().setFlags( newStatus.statusFlags() );
+      context.setNeedsFlagStore();
+    }
+    return GoOn;
+  }
 
-  const Akonadi::MessageStatus newStatus = FilterActionStatus::stati[ index - 1 ];
   QSet<QByteArray> flags = newStatus.statusFlags();
   const Akonadi::Item::Flag flag = *(flags.begin());
   if ( context.item().hasFlag( flag ) ) {
diff -Nru kdepim-4.9.4/mailfilteragent/akonadi_mailfilter_agent.notifyrc kdepim-4.9.5/mailfilteragent/akonadi_mailfilter_agent.notifyrc
--- kdepim-4.9.4/mailfilteragent/akonadi_mailfilter_agent.notifyrc	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/mailfilteragent/akonadi_mailfilter_agent.notifyrc	2012-12-27 18:01:27.890335226 +0000
@@ -1,6 +1,7 @@
 [Global]
 IconName=view-filter
 Comment=Mail Filter Agent
+Comment[bs]=Agent poštanskog filtera
 Comment[ca]=Agent de filtre de correu
 Comment[cs]=Agent filtrování pošty
 Comment[da]=Mailfilteragent
@@ -33,6 +34,7 @@
 Comment[x-test]=xxMail Filter Agentxx
 Comment[zh_TW]=郵件過濾代理程式
 Name=Mail Filter Agent
+Name[bs]=Agent poštanskog filtera
 Name[ca]=Agent de filtre de correu
 Name[cs]=Agent filtrování pošty
 Name[da]=Mailfilteragent
@@ -68,6 +70,7 @@
 
 [Event/mailfilterlogenabled]
 Name=Mail filter log enabled
+Name[bs]=Poštanski filter omogućen
 Name[ca]=Activat el registre de filtratge de correu
 Name[cs]=Záznam filtrování pošty povolen
 Name[da]=Mailfilterlog aktiveret
diff -Nru kdepim-4.9.4/mailfilteragent/mailfilteragent.desktop kdepim-4.9.5/mailfilteragent/mailfilteragent.desktop
--- kdepim-4.9.4/mailfilteragent/mailfilteragent.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/mailfilteragent/mailfilteragent.desktop	2012-12-27 18:01:27.890335226 +0000
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Mail Filter Agent
+Name[bs]=Agent poštanskog filtera
 Name[ca]=Agent de filtre de correu
 Name[cs]=Agent filtrování pošty
 Name[da]=Mailfilteragent
@@ -33,6 +34,7 @@
 Name[x-test]=xxMail Filter Agentxx
 Name[zh_TW]=郵件過濾代理程式
 Comment=Extension to filter emails
+Comment[bs]=Proširenje za filtriranje elektronske pošte
 Comment[ca]=Extensió per a filtrar correus
 Comment[ca@valencia]=Extensió per a filtrar correus
 Comment[da]=Udvidelse til at filtrere e-mails
diff -Nru kdepim-4.9.4/messageviewer/viewer_p.cpp kdepim-4.9.5/messageviewer/viewer_p.cpp
--- kdepim-4.9.4/messageviewer/viewer_p.cpp	2012-11-30 07:38:45.000000000 +0000
+++ kdepim-4.9.5/messageviewer/viewer_p.cpp	2012-12-27 18:01:27.894335177 +0000
@@ -202,6 +202,7 @@
     mShowRawToltecMail( false ),
     mRecursionCountForDisplayMessage( 0 ),
     mCurrentContent( 0 ),
+    mMessagePartNode( 0 ),
     mJob( 0 ),
     q( aParent ),
     mShowFullToAddressList( true ),
@@ -1343,6 +1344,7 @@
   enableMessageDisplay(); // just to make sure it's on
   mMessage.reset();
   mNodeHelper->clear();
+  mMessagePartNode = 0;
   delete mMimePartModel->root();
   mMimePartModel->setRoot( 0 );
   mSavedRelativePosition = 0;
@@ -1410,6 +1412,7 @@
   mUpdateReaderWinTimer.stop();
 
   if ( node ) {
+    mMessagePartNode = node;
     if ( node->bodyIsMessage() ) {
       mMainWindow->setWindowTitle( node->bodyAsMessage()->subject()->asUnicodeString() );
     } else {
@@ -2250,6 +2253,8 @@
       mColorBar->hide();
     }
     displayMessage();
+  } else if( mMessagePartNode ) {
+    setMessagePart( mMessagePartNode );
   } else {
     mColorBar->hide();
 #ifndef QT_NO_TREEVIEW
diff -Nru kdepim-4.9.4/messageviewer/viewer_p.h kdepim-4.9.5/messageviewer/viewer_p.h
--- kdepim-4.9.4/messageviewer/viewer_p.h	2012-11-30 07:38:45.000000000 +0000
+++ kdepim-4.9.5/messageviewer/viewer_p.h	2012-12-27 18:01:27.894335177 +0000
@@ -669,6 +669,7 @@
   bool mZoomTextOnly;
   int mRecursionCountForDisplayMessage;
   KMime::Content *mCurrentContent;
+  KMime::Content *mMessagePartNode;
   QString mCurrentFileName;
   QString mMessagePath;
   QMap<EditorWatcher*, KMime::Content*> mEditorWatchers;
diff -Nru kdepim-4.9.4/mobile/calendar/korganizer-mobile.desktop kdepim-4.9.5/mobile/calendar/korganizer-mobile.desktop
--- kdepim-4.9.4/mobile/calendar/korganizer-mobile.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/mobile/calendar/korganizer-mobile.desktop	2012-12-27 18:01:27.894335177 +0000
@@ -83,6 +83,7 @@
 X-DBUS-StartupType=Unique
 X-DBUS-ServiceName=org.kde.korganizer
 Keywords=mobile
+Keywords[bs]=mobilni
 Keywords[ca]=mòbil
 Keywords[ca@valencia]=mòbil
 Keywords[cs]=mobilní
diff -Nru kdepim-4.9.4/mobile/mail/kmail-mobile.notifyrc kdepim-4.9.5/mobile/mail/kmail-mobile.notifyrc
--- kdepim-4.9.4/mobile/mail/kmail-mobile.notifyrc	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/mobile/mail/kmail-mobile.notifyrc	2012-12-27 18:01:27.894335177 +0000
@@ -1,6 +1,7 @@
 [Global]
 IconName=mail-mobile
 Comment=KDE Kontact Touch e-mail client
+Comment[bs]=KDE Kontact Touch klijent za elektronsku poštu
 Comment[ca]=Client de correu del Kontact Touch del KDE
 Comment[ca@valencia]=Client de correu del Kontact Touch del KDE
 Comment[da]=KDE Kontact Touch e-mail-klient
@@ -38,6 +39,7 @@
 Comment[x-test]=xxKDE Kontact Touch e-mail clientxx
 Comment[zh_TW]=KDE Kontact Touch 收發信軟體
 Name=Kontact Touch Mail
+Name[bs]=Kontact Touch pošta
 Name[ca]=Correu del Kontact Touch
 Name[ca@valencia]=Correu del Kontact Touch
 Name[da]=Kontact Touch E-mail
@@ -78,6 +80,7 @@
 
 [Event/sendfailed]
 Name=Error while sending email
+Name[bs]=Greška u slanju pošte
 Name[ca]=Error en enviar correu
 Name[ca@valencia]=Error en enviar correu
 Name[cs]=Chyba při odesílání emailu
@@ -118,6 +121,7 @@
 Name[zh_CN]=发送邮件时出错
 Name[zh_TW]=傳送郵件時發生錯誤
 Comment=There was an error while trying to send the e-mail.
+Comment[bs]=Desila se greška pri pokušaju slanja elektronske pošte
 Comment[ca]=S'ha produït un error en provar d'enviar el correu electrònic.
 Comment[ca@valencia]=S'ha produït un error en provar d'enviar el correu electrònic.
 Comment[cs]=Nastala chyba při odesílání emailu.
diff -Nru kdepim-4.9.4/mobile/tasks/tasks-mobile.desktop kdepim-4.9.5/mobile/tasks/tasks-mobile.desktop
--- kdepim-4.9.4/mobile/tasks/tasks-mobile.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/mobile/tasks/tasks-mobile.desktop	2012-12-27 18:01:27.894335177 +0000
@@ -2,6 +2,7 @@
 Version=1.0
 Encoding=UTF-8
 Name=Tasks
+Name[bs]=Zadaci
 Name[ca]=Tasques
 Name[ca@valencia]=Tasques
 Name[cs]=Úkoly
diff -Nru kdepim-4.9.4/plugins/messageviewer/bodypartformatter/application_ms-tnef.desktop kdepim-4.9.5/plugins/messageviewer/bodypartformatter/application_ms-tnef.desktop
--- kdepim-4.9.4/plugins/messageviewer/bodypartformatter/application_ms-tnef.desktop	2012-11-30 07:38:44.000000000 +0000
+++ kdepim-4.9.5/plugins/messageviewer/bodypartformatter/application_ms-tnef.desktop	2012-12-27 18:01:27.894335177 +0000
@@ -1,5 +1,6 @@
 [Misc]
 Name=TNEF
+Name[bs]=TNEF
 Name[ca]=TNEF
 Name[ca@valencia]=TNEF
 Name[cs]=TNEF
@@ -39,6 +40,7 @@
 Name[x-test]=xxTNEFxx
 Name[zh_TW]=TNEF
 Comment=A bodypart formatter plugin for TNEF attachments
+Comment[bs]=Formater za glavno tijelo TNEF priloga
 Comment[ca]=Un connector formatador del cos per adjunts TNEF
 Comment[ca@valencia]=Un connector formatador del cos per adjunts TNEF
 Comment[da]=Et bodypart formaterings-plugin til TNEF-bilag