SOURCES: kdepim-branch.diff - updated

Sun Jan 8 23:35:51 CET 2006

Author: arekm                        Date: Sun Jan  8 22:35:51 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kdepim-branch.diff (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SOURCES/kdepim-branch.diff
diff -u SOURCES/kdepim-branch.diff:1.12 SOURCES/kdepim-branch.diff:1.13

--- SOURCES/kdepim-branch.diff:1.12	Sat Dec 31 17:58:31 2005
+++ SOURCES/kdepim-branch.diff	Sun Jan  8 23:35:46 2006
@@ -1,8 +1,8 @@
 Index: akregator/ChangeLog
 ===================================================================
---- akregator/ChangeLog	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/ChangeLog	(.../branches/KDE/3.5/kdepim)	(revision 492936)
-@@ -2,9 +2,18 @@
+--- akregator/ChangeLog	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/ChangeLog	(.../branches/KDE/3.5/kdepim)	(revision 495790)
+@@ -2,9 +2,20 @@
  ===================
  (c) 2004, 2005 the Akregator authors.
  
@@ -10,6 +10,8 @@
 +
 +Bug fixes:
 +
++ 2006/01/08 Fix problems with keyboard navigation getting stuck on duplicated articles
++            and prevent creation of new items when selecting an unread dupe (#114997) -fo
 + 2005/12/05 Wait 30 minutes before retrying fetching when fetching failed (host down, parsing error) 
 +            (#113358) -fo
 +
@@ -23,8 +25,8 @@
         
 Index: akregator/src/notificationmanager.cpp
 ===================================================================
---- akregator/src/notificationmanager.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/notificationmanager.cpp	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/notificationmanager.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/notificationmanager.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -33,7 +33,7 @@
  #include "feed.h"
  #include "notificationmanager.h"
@@ -43,8 +45,8 @@
  #include "notificationmanager.moc"
 Index: akregator/src/treenodeitem.cpp
 ===================================================================
---- akregator/src/treenodeitem.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/treenodeitem.cpp	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/treenodeitem.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/treenodeitem.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -34,7 +34,7 @@
  
  #include <kdebug.h>
@@ -65,8 +67,8 @@
 +} // namespace Akregator
 Index: akregator/src/tagnodeitem.cpp
 ===================================================================
---- akregator/src/tagnodeitem.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/tagnodeitem.cpp	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/tagnodeitem.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/tagnodeitem.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -33,7 +33,7 @@
  #include <qpoint.h>
  #include <qpopupmenu.h>
@@ -84,8 +86,8 @@
 +
 Index: akregator/src/feed.cpp
 ===================================================================
---- akregator/src/feed.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/feed.cpp	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/feed.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/feed.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -62,9 +62,14 @@
          bool markImmediatelyAsRead;
          bool useNotification;
@@ -144,8 +146,8 @@
          return;
 Index: akregator/src/articlelistview.cpp
 ===================================================================
---- akregator/src/articlelistview.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/articlelistview.cpp	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/articlelistview.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/articlelistview.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -59,9 +59,21 @@
  class ArticleListView::ArticleListViewPrivate
  {
@@ -218,8 +220,8 @@
  
 Index: akregator/src/mainwindow.cpp
 ===================================================================
---- akregator/src/mainwindow.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/mainwindow.cpp	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/mainwindow.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/mainwindow.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -59,7 +59,7 @@
  #include <qtimer.h>
  
@@ -240,8 +242,8 @@
  
 Index: akregator/src/actionmanagerimpl.cpp
 ===================================================================
---- akregator/src/actionmanagerimpl.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/actionmanagerimpl.cpp	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/actionmanagerimpl.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/actionmanagerimpl.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -69,14 +69,14 @@
      public:
      NodeSelectVisitor(ActionManagerImpl* manager) : m_manager(manager) {}
@@ -259,10 +261,25 @@
          m_manager->action("feed_fetch")->setText(i18n("&Fetch Feed"));
          m_manager->action("feed_remove")->setText(i18n("&Delete Feed"));
          m_manager->action("feed_modify")->setText(i18n("&Edit Feed..."));
+Index: akregator/src/mk4storage/metakit/src/column.cpp
+===================================================================
+--- akregator/src/mk4storage/metakit/src/column.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/mk4storage/metakit/src/column.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
+@@ -1441,8 +1441,9 @@
+       Set(index_++, c4_Bytes (ptr, length));
+     }
+   }
+-  else
++  else {
+     d4_assert(count_ == 0);
++  }
+ 
+   FixSize(false);
+ }
 Index: akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
 ===================================================================
---- akregator/src/mk4storage/akregator_mk4storage_plugin.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/mk4storage/akregator_mk4storage_plugin.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/mk4storage/akregator_mk4storage_plugin.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/mk4storage/akregator_mk4storage_plugin.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -5,8 +5,10 @@
  Name[cs]=Metakit ĂşloĹžiĹĄtÄ›
  Name[da]=Metakit lagringsgrĂŚnseflade
@@ -316,8 +333,8 @@
  
 Index: akregator/src/propertiesdialog.cpp
 ===================================================================
---- akregator/src/propertiesdialog.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/propertiesdialog.cpp	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/propertiesdialog.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/propertiesdialog.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -36,7 +36,7 @@
  #include <qbuttongroup.h>
  #include <qradiobutton.h>
@@ -337,8 +354,8 @@
  // vim: ts=4 sw=4 et
 Index: akregator/src/akregator_view.h
 ===================================================================
---- akregator/src/akregator_view.h	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/akregator_view.h	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/akregator_view.h	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/akregator_view.h	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -32,6 +32,7 @@
  
  #include <kurl.h>
@@ -404,8 +421,8 @@
  
 Index: akregator/src/feeditem.cpp
 ===================================================================
---- akregator/src/feeditem.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/feeditem.cpp	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/feeditem.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/feeditem.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -32,7 +32,7 @@
  #include <kiconloader.h>
  #include <qstring.h>
@@ -423,8 +440,8 @@
 +
 Index: akregator/src/folderitem.cpp
 ===================================================================
---- akregator/src/folderitem.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/folderitem.cpp	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/folderitem.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/folderitem.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -31,7 +31,7 @@
  #include <kaction.h>
  #include <kiconloader.h>
@@ -442,8 +459,8 @@
 +} // namespace Akregator
 Index: akregator/src/addfeeddialog.cpp
 ===================================================================
---- akregator/src/addfeeddialog.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/addfeeddialog.cpp	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/addfeeddialog.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/addfeeddialog.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -37,7 +37,7 @@
  #include <ksqueezedtextlabel.h>
  #include <kmessagebox.h>
@@ -463,8 +480,8 @@
  // vim: ts=4 sw=4 et
 Index: akregator/src/pageviewer.cpp
 ===================================================================
---- akregator/src/pageviewer.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/pageviewer.cpp	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/pageviewer.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/pageviewer.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -237,12 +237,15 @@
      closeURL();
  }
@@ -517,19 +534,24 @@
  void PageViewer::slotOpenURLRequest(const KURL& url, const KParts::URLArgs& args)
  {
      updateHistoryEntry();
-@@ -494,7 +478,7 @@
+@@ -492,9 +476,10 @@
+         else
+             kurl = KURL(url);
  //    kurl.addPath(url);
-         if (kurl.isValid())
-             ;//             slotOpenInNewWindow(kurl);
+-        if (kurl.isValid())
+-            ;//             slotOpenInNewWindow(kurl);
 -//      openURL( kurl );
++        if (kurl.isValid()) {
++            //slotOpenInNewWindow(kurl);
++        }
 +//      ( kurl );
      }
  }
  
 Index: akregator/src/viewer.cpp
 ===================================================================
---- akregator/src/viewer.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/viewer.cpp	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/viewer.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/viewer.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -45,7 +45,7 @@
  #include "akregator_run.h"
  #include "akregatorconfig.h"
@@ -550,8 +572,8 @@
  // vim: set et ts=4 sts=4 sw=4:
 Index: akregator/src/akregator_run.h
 ===================================================================
---- akregator/src/akregator_run.h	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/akregator_run.h	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/akregator_run.h	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/akregator_run.h	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -30,23 +30,37 @@
  namespace Akregator
  {
@@ -601,8 +623,8 @@
  }
 Index: akregator/src/pageviewer.h
 ===================================================================
---- akregator/src/pageviewer.h	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/pageviewer.h	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/pageviewer.h	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/pageviewer.h	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -45,9 +45,6 @@
              virtual ~PageViewer();
              virtual bool openURL(const KURL &url);
@@ -615,8 +637,8 @@
              class HistoryEntry;
 Index: akregator/src/akregator_run.cpp
 ===================================================================
---- akregator/src/akregator_run.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/akregator_run.cpp	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/akregator_run.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/akregator_run.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -27,14 +27,19 @@
  #include "viewer.h"
  #include "akregator_run.h"
@@ -669,10 +691,23 @@
  #include "akregator_run.moc"
  
  // vim: set et ts=4 sts=4 sw=4:
+Index: akregator/src/aboutdata.h
+===================================================================
+--- akregator/src/aboutdata.h	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/aboutdata.h	(.../branches/KDE/3.5/kdepim)	(revision 495790)
+@@ -28,7 +28,7 @@
+ #include <kaboutdata.h>
+ #include <kdepimmacros.h>
+ 
+-#define AKREGATOR_VERSION "1.2"
++#define AKREGATOR_VERSION "1.2.1"
+ 
+ namespace Akregator {
+ /**
 Index: akregator/src/akregator_plugin.desktop
 ===================================================================
---- akregator/src/akregator_plugin.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/akregator_plugin.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/akregator_plugin.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/akregator_plugin.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -3,15 +3,19 @@
  X-KDE-ServiceType=Akregator/Plugin
  Comment=Plugin for Akregator
@@ -710,8 +745,8 @@
  
 Index: akregator/src/akregator.desktop
 ===================================================================
---- akregator/src/akregator.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/akregator.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/akregator.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/akregator.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -1,7 +1,6 @@
  [Desktop Entry]
  Encoding=UTF-8
@@ -771,8 +806,8 @@
  Categories=Qt;KDE;Network;
 Index: akregator/src/akregator_part.rc
 ===================================================================
---- akregator/src/akregator_part.rc	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/akregator_part.rc	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/akregator_part.rc	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/akregator_part.rc	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -1,5 +1,5 @@
  <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 -<kpartgui name="akregator_part" version="77">
@@ -801,8 +836,8 @@
    <Menu name="settings">
 Index: akregator/src/akregator_part.desktop
 ===================================================================
---- akregator/src/akregator_part.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/akregator_part.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/akregator_part.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/akregator_part.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -8,7 +8,6 @@
  Name[pt_BR]=Componente do aKregator
  Name[sv]=aKregator-delprogram
@@ -813,8 +848,8 @@
  Type=Service
 Index: akregator/src/viewer.h
 ===================================================================
---- akregator/src/viewer.h	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/viewer.h	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/viewer.h	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/viewer.h	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -40,14 +40,18 @@
      {
          Q_OBJECT
@@ -860,8 +895,8 @@
  
 Index: akregator/src/eventsrc
 ===================================================================
---- akregator/src/eventsrc	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/eventsrc	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/eventsrc	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/eventsrc	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -3,7 +3,6 @@
  Comment=Akregator
  Comment[da]=Akregator Plugin
@@ -954,8 +989,8 @@
  
 Index: akregator/src/akregator_view.cpp
 ===================================================================
---- akregator/src/akregator_view.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ akregator/src/akregator_view.cpp	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- akregator/src/akregator_view.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/akregator_view.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -26,6 +26,7 @@
  
  #include "actionmanagerimpl.h"
@@ -1183,10 +1218,43 @@
  }
  
  void View::connectToFeedList(FeedList* feedList)
+Index: akregator/src/article.cpp
+===================================================================
+--- akregator/src/article.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ akregator/src/article.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
+@@ -241,22 +241,24 @@
+ 
+ bool Article::operator<(const Article &other) const
+ {
+-    return pubDate() > other.pubDate();
++    return pubDate() > other.pubDate() || 
++            (pubDate() == other.pubDate() && guid() < other.guid() );
+ }
+ 
+ bool Article::operator<=(const Article &other) const
+ {
+-    return pubDate() >= other.pubDate();
++    return (pubDate() > other.pubDate() || *this == other);
+ }
+ 
+ bool Article::operator>(const Article &other) const
+ {
+-    return pubDate() < other.pubDate();
++    return pubDate() < other.pubDate() || 
++            (pubDate() == other.pubDate() && guid() > other.guid() );
+ }
+ 
+ bool Article::operator>=(const Article &other) const
+ {
+-    return pubDate() <= other.pubDate();
++    return (pubDate() > other.pubDate() || *this == other);
+ }
+ 
+ bool Article::operator==(const Article &other) const
 Index: kmobile/libkmobile.desktop
 ===================================================================
---- kmobile/libkmobile.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kmobile/libkmobile.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kmobile/libkmobile.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kmobile/libkmobile.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -38,5 +38,4 @@
  Name[tg]=Đ”Ń€Đ°ĐšĐ˛ĐľŃ€Đ¸ ĐżĐ°ŃŃ‚Đ´Đ°Ń€Đ°ŇˇĐ°Đ˛Đ¸Đ¸ ĐşĐžŃ€ ĐąĐž Đ´Đ°ŃŃ‚ĐłĐžŇłĐ¸ ĐźĐžĐąĐ¸ĐťÓŁ Đ´Đ°Ń€ KDE
  Name[tr]=KDE TaĹŸÄąnabilir AygÄąt DĂźĹŸĂźk Seviye DonanÄąm SĂźrĂźcĂźsĂź
@@ -1195,8 +1263,8 @@
  Name[zh_CN]=KDE ç§ťĺŠ¨čŽžĺ¤‡ä˝Žçş§çĄŹäťśéŠąĺŠ¨ç¨‹ĺş
 Index: kmobile/devices/gnokii/libkmobile_gnokii.desktop
 ===================================================================
---- kmobile/devices/gnokii/libkmobile_gnokii.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kmobile/devices/gnokii/libkmobile_gnokii.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kmobile/devices/gnokii/libkmobile_gnokii.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kmobile/devices/gnokii/libkmobile_gnokii.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -41,7 +41,6 @@
  Name[tr]=Cep Telefonu ya da Organizer (gnokii)
  Name[uk]=ĐœĐžĐąŃ–ĐťŃŒĐ˝Đ¸Đš Ń‚ĐľĐťĐľŃ„ĐžĐ˝ Ń‚Đ° Ń‚Đ¸ĐśĐ˝ĐľĐ˛Đ¸Đş (gnokii)
@@ -1215,8 +1283,8 @@
  ServiceTypes=kdedevice/mobiledevice
 Index: kmobile/devices/skeleton/libkmobile_skeleton.desktop
 ===================================================================
---- kmobile/devices/skeleton/libkmobile_skeleton.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kmobile/devices/skeleton/libkmobile_skeleton.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kmobile/devices/skeleton/libkmobile_skeleton.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kmobile/devices/skeleton/libkmobile_skeleton.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -40,7 +40,6 @@
  Name[tg]=ĐŸŃ€ĐžŃ‚ĐžŃ‚Đ¸ĐżĐ¸ Đ´Đ°ŃŃ‚ĐłĐžŇł
  Name[tr]=Ă‡atÄą AygÄąt
@@ -1243,8 +1311,8 @@
  ServiceTypes=kdedevice/mobiledevice
 Index: kmobile/devices/gammu/libkmobile_gammu.desktop
 ===================================================================
---- kmobile/devices/gammu/libkmobile_gammu.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kmobile/devices/gammu/libkmobile_gammu.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kmobile/devices/gammu/libkmobile_gammu.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kmobile/devices/gammu/libkmobile_gammu.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -41,7 +41,6 @@
  Name[tr]=Cep Telefonu ya da Organizer (gammu)
  Name[uk]=ĐœĐžĐąŃ–ĐťŃŒĐ˝Đ¸Đš Ń‚ĐľĐťĐľŃ„ĐžĐ˝ Ń‚Đ° Ń‚Đ¸ĐśĐ˝ĐľĐ˛Đ¸Đş (gammu)
@@ -1263,8 +1331,8 @@
  ServiceTypes=kdedevice/mobiledevice
 Index: kmobile/devices/digicam/libkmobile_digicam.desktop
 ===================================================================
---- kmobile/devices/digicam/libkmobile_digicam.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kmobile/devices/digicam/libkmobile_digicam.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kmobile/devices/digicam/libkmobile_digicam.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kmobile/devices/digicam/libkmobile_digicam.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -45,7 +45,6 @@
  Name[tr]=Dijital Kamera
  Name[uk]=ĐŚĐ¸Ń„Ń€ĐžĐ˛Đ¸Đš Ń„ĐžŃ‚ĐžĐ°ĐżĐ°Ń€Đ°Ń‚
@@ -1283,8 +1351,8 @@
  ServiceTypes=kdedevice/mobiledevice
 Index: kmobile/kmobile.desktop
 ===================================================================
---- kmobile/kmobile.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kmobile/kmobile.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kmobile/kmobile.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kmobile/kmobile.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -12,7 +12,6 @@
  Name[nn]=KMobil
  Name[sv]=Kmobile
@@ -1311,8 +1379,8 @@
  X-KDE-StartupNotify=false
 Index: kmobile/kioslave/mimetypes/mobile_addressbook.desktop
 ===================================================================
---- kmobile/kioslave/mimetypes/mobile_addressbook.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kmobile/kioslave/mimetypes/mobile_addressbook.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kmobile/kioslave/mimetypes/mobile_addressbook.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kmobile/kioslave/mimetypes/mobile_addressbook.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -40,7 +40,6 @@
  Comment[tg]=ĐĐťĐžŇ›ĐžŃ‚ Đ´Đ°Ń€ Đ´Đ°ŃŃ‚ĐłĐžŇłĐ¸ ĐźĐžĐąĐ¸ĐťÓŁ
  Comment[tr]=TaĹŸÄąnabilir AygÄąt BaÄŸlantÄąlarÄą
@@ -1323,8 +1391,8 @@
  Type=MimeType
 Index: kmobile/kioslave/mimetypes/mobile_notes.desktop
 ===================================================================
---- kmobile/kioslave/mimetypes/mobile_notes.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kmobile/kioslave/mimetypes/mobile_notes.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kmobile/kioslave/mimetypes/mobile_notes.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kmobile/kioslave/mimetypes/mobile_notes.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -39,7 +39,6 @@
  Comment[tg]=ĐĽĐ°ĐąĐ°Ń€ŇłĐž Đ´Đ°Ń€ Đ´Đ°ŃŃ‚ĐłĐžŇłĐ¸ ĐźĐžĐąĐ¸ĐťÓŁ
  Comment[tr]=Cep Telefonu NotlarÄą
@@ -1335,8 +1403,8 @@
  Type=MimeType
 Index: kmobile/kioslave/mimetypes/mobile_calendar.desktop
 ===================================================================
---- kmobile/kioslave/mimetypes/mobile_calendar.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kmobile/kioslave/mimetypes/mobile_calendar.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kmobile/kioslave/mimetypes/mobile_calendar.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kmobile/kioslave/mimetypes/mobile_calendar.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -40,7 +40,6 @@
  Comment[tg]=Đ˘Đ°Ň›Đ˛Đ¸Đź Đ´Đ°Ń€ Đ´Đ°ŃŃ‚ĐłĐžŇłĐ¸ ĐźĐžĐąĐ¸ĐťÓŁ
  Comment[tr]=Cep Telefonu Takvimi
@@ -1347,8 +1415,8 @@
  Type=MimeType
 Index: kmobile/kioslave/mimetypes/mobile_device.desktop
 ===================================================================
---- kmobile/kioslave/mimetypes/mobile_device.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kmobile/kioslave/mimetypes/mobile_device.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kmobile/kioslave/mimetypes/mobile_device.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kmobile/kioslave/mimetypes/mobile_device.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -43,7 +43,6 @@
  Comment[tg]=Đ”Đ°ŃŃ‚ĐłĐžŇłĐ¸ ĐźĐžĐąĐ¸ĐťÓŁ
  Comment[tr]=TaĹŸÄąnabilir AygÄąt
@@ -1359,8 +1427,8 @@
  Type=MimeType
 Index: wizards/groupwarewizard.desktop
 ===================================================================
---- wizards/groupwarewizard.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ wizards/groupwarewizard.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- wizards/groupwarewizard.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ wizards/groupwarewizard.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -6,11 +6,15 @@
  Name[cs]=PrĹŻvodce KDE groupwarem
  Name[da]=KDE Groupware-guide
@@ -1393,8 +1461,8 @@
  Type=Application
 Index: kresources/egroupware/kabc_xmlrpc.desktop
 ===================================================================
---- kresources/egroupware/kabc_xmlrpc.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kresources/egroupware/kabc_xmlrpc.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kresources/egroupware/kabc_xmlrpc.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kresources/egroupware/kabc_xmlrpc.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -15,6 +15,7 @@
  Name[hu]=eGroupware-kiszolgĂĄlĂł (XML-RPC-n keresztĂźl)
  Name[is]=eGroupware ĂžjĂłnn (gegnum XML-RPC)
@@ -1413,8 +1481,8 @@
  Type=Service
 Index: kresources/egroupware/knotes_xmlrpc.desktop
 ===================================================================
---- kresources/egroupware/knotes_xmlrpc.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kresources/egroupware/knotes_xmlrpc.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kresources/egroupware/knotes_xmlrpc.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kresources/egroupware/knotes_xmlrpc.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -15,6 +15,7 @@
  Name[hu]=eGroupware-kiszolgĂĄlĂł (XML-RPC-n keresztĂźl)
  Name[is]=eGroupware ĂžjĂłnn (gegnum XML-RPC)
@@ -1433,8 +1501,8 @@
  Type=Service
 Index: kresources/egroupware/kcal_xmlrpc.desktop
 ===================================================================
---- kresources/egroupware/kcal_xmlrpc.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kresources/egroupware/kcal_xmlrpc.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kresources/egroupware/kcal_xmlrpc.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kresources/egroupware/kcal_xmlrpc.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -15,6 +15,7 @@
  Name[hu]=eGroupware-kiszolgĂĄlĂł (XML-RPC-n keresztĂźl)
  Name[is]=eGroupware ĂžjĂłnn (gegnum XML-RPC)
@@ -1453,8 +1521,8 @@
  Type=Service
 Index: kresources/tvanytime/kcal_tvanytime.desktop
 ===================================================================
---- kresources/tvanytime/kcal_tvanytime.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kresources/tvanytime/kcal_tvanytime.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kresources/tvanytime/kcal_tvanytime.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kresources/tvanytime/kcal_tvanytime.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -5,12 +5,15 @@
  Name[cs]=TV programy
  Name[da]=Tv-oversigt
@@ -1486,8 +1554,8 @@
  Type=Service
 Index: kresources/tvanytime/kcal_resourcetvanytime.cpp
 ===================================================================
---- kresources/tvanytime/kcal_resourcetvanytime.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kresources/tvanytime/kcal_resourcetvanytime.cpp	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kresources/tvanytime/kcal_resourcetvanytime.cpp	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kresources/tvanytime/kcal_resourcetvanytime.cpp	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -183,7 +183,7 @@
             SLOT( slotJobResult( KIO::Job * ) ) );
  
@@ -1499,8 +1567,8 @@
             SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
 Index: kresources/exchange/exchange.desktop
 ===================================================================
---- kresources/exchange/exchange.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kresources/exchange/exchange.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kresources/exchange/exchange.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kresources/exchange/exchange.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -21,6 +21,7 @@
  Name[hu]=Exchange 2000-kiszolgĂĄlĂł
  Name[is]=Exchange 2000 ĂžjĂłnn
@@ -1518,8 +1586,8 @@
  
 Index: kresources/exchange/exchange_deprecated.desktop
 ===================================================================
---- kresources/exchange/exchange_deprecated.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kresources/exchange/exchange_deprecated.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kresources/exchange/exchange_deprecated.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kresources/exchange/exchange_deprecated.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -15,6 +15,7 @@
  Name[hu]=Exchange 2000-kiszolgĂĄlĂł (elavult)
  Name[is]=Exchange 2000 ĂžjĂłnn (Ăşrelt)
@@ -1537,8 +1605,8 @@
  
 Index: kresources/groupwise/kcal_groupwise.desktop
 ===================================================================
---- kresources/groupwise/kcal_groupwise.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 492936)
-+++ kresources/groupwise/kcal_groupwise.desktop	(.../branches/KDE/3.5/kdepim)	(revision 492936)
+--- kresources/groupwise/kcal_groupwise.desktop	(.../tags/KDE/3.5.0/kdepim)	(revision 495790)
++++ kresources/groupwise/kcal_groupwise.desktop	(.../branches/KDE/3.5/kdepim)	(revision 495790)
 @@ -6,7 +6,7 @@
  Name[ca]=Servidor Novell GroupWise
  Name[cs]=Novell GroupWise server
@@ -1564,10 +1632,23 @@
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.12&r2=1.13&f=u

