- updated

Changed files:
    kde4-kdepimlibs-branch.diff -> 1.6

diff --git a/kde4-kdepimlibs-branch.diff b/kde4-kdepimlibs-branch.diff
index 7605c2b8ef5bf70f1dcb27d8d157132733271316..7a131335dd3156b65aabad9dc3ef85c7e7ed53ef 100644 (file)
--- a/kde4-kdepimlibs-branch.diff
+++ b/kde4-kdepimlibs-branch.diff
@@ -1,7 +1,7 @@
 Index: cmake/modules/FindLibical.cmake
 ===================================================================
---- cmake/modules/FindLibical.cmake    (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ cmake/modules/FindLibical.cmake    (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- cmake/modules/FindLibical.cmake    (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ cmake/modules/FindLibical.cmake    (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -16,7 +16,6 @@
  
  if (WIN32)
@@ -44,8 +44,8 @@ Index: cmake/modules/FindLibical.cmake
  
 Index: kresources/kresources_manager.desktop
 ===================================================================
---- kresources/kresources_manager.desktop      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kresources/kresources_manager.desktop      (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kresources/kresources_manager.desktop      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kresources/kresources_manager.desktop      (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -10,6 +10,7 @@
  Name[fr]=Gestionnaire de ressources
  Name[ga]=Bainisteoir KResources
@@ -64,8 +64,8 @@ Index: kresources/kresources_manager.desktop
  Comment[ja]=KDE リソースマネージャ
 Index: kresources/kresources.desktop
 ===================================================================
---- kresources/kresources.desktop      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kresources/kresources.desktop      (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kresources/kresources.desktop      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kresources/kresources.desktop      (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -20,6 +20,7 @@
  Name[fr]=Ressources KDE
  Name[ga]=Acmhainní KDE
@@ -84,8 +84,8 @@ Index: kresources/kresources.desktop
  Comment[ja]=KDE リソースの設定
 Index: kresources/kresources_plugin.desktop
 ===================================================================
---- kresources/kresources_plugin.desktop       (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kresources/kresources_plugin.desktop       (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kresources/kresources_plugin.desktop       (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kresources/kresources_plugin.desktop       (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -10,6 +10,7 @@
  Name[fr]=Module externe de gestion de ressources
  Name[ga]=Breiseán KResources
@@ -104,8 +104,8 @@ Index: kresources/kresources_plugin.desktop
  Comment[ja]=KDE リソースフレームワークのプラグイン
 Index: kcal/localdir.desktop
 ===================================================================
---- kcal/localdir.desktop      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/localdir.desktop      (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/localdir.desktop      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/localdir.desktop      (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -11,6 +11,7 @@
  Name[fr]=Calendrier dans un dossier local
  Name[ga]=Féilire i gComhadlann Logánta
@@ -116,8 +116,8 @@ Index: kcal/localdir.desktop
  Name[ja]=ローカルディレクトリのカレンダー
 Index: kcal/local.desktop
 ===================================================================
---- kcal/local.desktop (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/local.desktop (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/local.desktop (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/local.desktop (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -11,6 +11,7 @@
  Name[fr]=Calendrier dans un fichier local
  Name[ga]=Féilire i gComhad Logánta
@@ -128,8 +128,8 @@ Index: kcal/local.desktop
  Name[ja]=ローカルファイルのカレンダー
 Index: kcal/kcal_manager.desktop
 ===================================================================
---- kcal/kcal_manager.desktop  (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/kcal_manager.desktop  (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/kcal_manager.desktop  (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/kcal_manager.desktop  (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -12,6 +12,7 @@
  Name[fr]=Calendrier
  Name[ga]=Féilire
@@ -140,8 +140,8 @@ Index: kcal/kcal_manager.desktop
  Name[ja]=カレンダー
 Index: kcal/vcalformat.cpp
 ===================================================================
---- kcal/vcalformat.cpp        (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/vcalformat.cpp        (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/vcalformat.cpp        (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/vcalformat.cpp        (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -263,8 +263,10 @@
  
    // organizer stuff
@@ -188,8 +188,8 @@ Index: kcal/vcalformat.cpp
      QStringList::ConstIterator it;
 Index: kcal/icalformat_p.cpp
 ===================================================================
---- kcal/icalformat_p.cpp      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/icalformat_p.cpp      (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/icalformat_p.cpp      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/icalformat_p.cpp      (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -580,8 +580,10 @@
  
    // organizer stuff
@@ -264,8 +264,8 @@ Index: kcal/icalformat_p.cpp
        a, icalproperty_new_summary( alarm->mailSubject().toUtf8() ) );
 Index: kcal/tests/testtodo.cpp
 ===================================================================
---- kcal/tests/testtodo.cpp    (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/tests/testtodo.cpp    (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/tests/testtodo.cpp    (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/tests/testtodo.cpp    (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -98,3 +98,24 @@
    Todo todo2 = todo1;
    QVERIFY( todo1 == todo2 );
@@ -293,8 +293,8 @@ Index: kcal/tests/testtodo.cpp
 +}
 Index: kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics
 ===================================================================
---- kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics    (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics    (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics    (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics    (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -12,7 +12,7 @@
  SUMMARY:20. Mai 2005\, 13-14 Uhr\, alle 3 Tage\, bis 30. Juni 2005
  CLASS:PUBLIC
@@ -306,8 +306,8 @@ Index: kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics
  TRANSP:OPAQUE
 Index: kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref
 ===================================================================
---- kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref   (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref   (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref   (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref   (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -9,7 +9,7 @@
  SEQUENCE:1
  LAST-MODIFIED:20050520T105327Z
@@ -319,8 +319,8 @@ Index: kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics.vcal.ref
  PRIORITY:5
 Index: kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref
 ===================================================================
---- kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref   (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref   (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref   (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref   (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -9,7 +9,7 @@
  SEQUENCE:2
  LAST-MODIFIED:20050520T105740Z
@@ -332,8 +332,8 @@ Index: kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics.vcal.ref
  PRIORITY:5
 Index: kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics
 ===================================================================
---- kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics    (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics    (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics    (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics    (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -13,7 +13,7 @@
    12. 2006
  CLASS:PUBLIC
@@ -345,8 +345,8 @@ Index: kcal/tests/data/vCalendar/KOrganizer_vCalTestCase13.ics
  TRANSP:OPAQUE
 Index: kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref
 ===================================================================
---- kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref   (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref   (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref   (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref   (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -9,7 +9,7 @@
  SEQUENCE:1
  LAST-MODIFIED:20050520T104819Z
@@ -358,8 +358,8 @@ Index: kcal/tests/data/vCalendar/KOrganizer_vCalTestCase12.ics.vcal.ref
  PRIORITY:5
 Index: kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref
 ===================================================================
---- kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref   (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref   (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref   (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref   (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -9,7 +9,7 @@
  SEQUENCE:4
  LAST-MODIFIED:20050520T105750Z
@@ -371,8 +371,8 @@ Index: kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics.vcal.ref
  PRIORITY:5
 Index: kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics
 ===================================================================
---- kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics    (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics    (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics    (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics    (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -13,7 +13,7 @@
    2006
  CLASS:PUBLIC
@@ -384,8 +384,8 @@ Index: kcal/tests/data/vCalendar/KOrganizer_vCalTestCase04.ics
  TRANSP:OPAQUE
 Index: kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics
 ===================================================================
---- kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics    (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics    (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics    (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics    (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -13,7 +13,7 @@
    Juni 2005
  CLASS:PUBLIC
@@ -397,8 +397,8 @@ Index: kcal/tests/data/vCalendar/KOrganizer_vCalTestCase05.ics
  TRANSP:OPAQUE
 Index: kcal/tests/testtodo.h
 ===================================================================
---- kcal/tests/testtodo.h      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/tests/testtodo.h      (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/tests/testtodo.h      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/tests/testtodo.h      (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -31,6 +31,7 @@
      void testCompare();
      void testClone();
@@ -409,8 +409,8 @@ Index: kcal/tests/testtodo.h
  #endif
 Index: kcal/CMakeLists.txt
 ===================================================================
---- kcal/CMakeLists.txt        (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/CMakeLists.txt        (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/CMakeLists.txt        (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/CMakeLists.txt        (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -1,10 +1,7 @@
  project(kcal)
  
@@ -425,8 +425,8 @@ Index: kcal/CMakeLists.txt
  
 Index: kcal/todo.cpp
 ===================================================================
---- kcal/todo.cpp      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/todo.cpp      (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/todo.cpp      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/todo.cpp      (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -508,7 +508,9 @@
        while ( !todo->recursAt( nextDate ) ||
                nextDate <= KDateTime::currentUtcDateTime() ) {
@@ -440,8 +440,8 @@ Index: kcal/todo.cpp
  
 Index: kcal/versit/vobject.h
 ===================================================================
---- kcal/versit/vobject.h      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/versit/vobject.h      (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/versit/vobject.h      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/versit/vobject.h      (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -142,7 +142,7 @@
  #define VCEventProp                           "VEVENT"
  #define VCEWorldProp                  "EWORLD"
@@ -453,8 +453,8 @@ Index: kcal/versit/vobject.h
  #define VCFamilyNameProp              "F"
 Index: kcal/versit/vobject.c
 ===================================================================
---- kcal/versit/vobject.c      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/versit/vobject.c      (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/versit/vobject.c      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/versit/vobject.c      (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -804,7 +804,7 @@
      { VCEventProp, 0, 0, PD_BEGIN },
      { VCEWorldProp, 0, 0, 0 },
@@ -466,8 +466,8 @@ Index: kcal/versit/vobject.c
      { VCFamilyNameProp, 0, 0, 0 },
 Index: kcal/alarm.cpp
 ===================================================================
---- kcal/alarm.cpp     (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kcal/alarm.cpp     (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kcal/alarm.cpp     (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kcal/alarm.cpp     (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -412,12 +412,18 @@
    if ( hasTime() ) {
      return d->mAlarmTime;
@@ -492,8 +492,8 @@ Index: kcal/alarm.cpp
    } else {
 Index: kioslave/imap4/imapparser.cpp
 ===================================================================
---- kioslave/imap4/imapparser.cpp      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kioslave/imap4/imapparser.cpp      (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kioslave/imap4/imapparser.cpp      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kioslave/imap4/imapparser.cpp      (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -80,8 +80,8 @@
    lastHandled = 0;
  }
@@ -580,8 +580,8 @@ Index: kioslave/imap4/imapparser.cpp
      case '*':
 Index: kioslave/imap4/imapparser.h
 ===================================================================
---- kioslave/imap4/imapparser.h        (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kioslave/imap4/imapparser.h        (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kioslave/imap4/imapparser.h        (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kioslave/imap4/imapparser.h        (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -205,13 +205,13 @@
     * @param aCmd The command to perform
     * @return The completed command
@@ -611,8 +611,8 @@ Index: kioslave/imap4/imapparser.h
     * everything we didn't handle, everything but the greeting is bogus
 Index: kioslave/imap4/imap4.cpp
 ===================================================================
---- kioslave/imap4/imap4.cpp   (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kioslave/imap4/imap4.cpp   (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kioslave/imap4/imap4.cpp   (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kioslave/imap4/imap4.cpp   (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -206,7 +206,7 @@
  
    if (aSequence == "0:0" && getState() == ISTATE_SELECT)
@@ -1083,8 +1083,8 @@ Index: kioslave/imap4/imap4.cpp
    {
 Index: kioslave/imap4/imapcommand.cpp
 ===================================================================
---- kioslave/imap4/imapcommand.cpp     (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kioslave/imap4/imapcommand.cpp     (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kioslave/imap4/imapcommand.cpp     (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kioslave/imap4/imapcommand.cpp     (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -156,19 +156,19 @@
      return id() + ' ' + command() + ' ' + parameter() + "\r\n";
  }
@@ -1394,8 +1394,8 @@ Index: kioslave/imap4/imapcommand.cpp
  
 Index: kioslave/imap4/imapcommand.h
 ===================================================================
---- kioslave/imap4/imapcommand.h       (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kioslave/imap4/imapcommand.h       (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kioslave/imap4/imapcommand.h       (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kioslave/imap4/imapcommand.h       (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -27,6 +27,11 @@
  #include <QString>
  #include <QMap>
@@ -1681,8 +1681,8 @@ Index: kioslave/imap4/imapcommand.h
    QString aCommand;
 Index: kioslave/imap4/CMakeLists.txt
 ===================================================================
---- kioslave/imap4/CMakeLists.txt      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kioslave/imap4/CMakeLists.txt      (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kioslave/imap4/CMakeLists.txt      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kioslave/imap4/CMakeLists.txt      (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -1,6 +1,7 @@
  
  set(imap4_optional_includes)
@@ -1702,8 +1702,8 @@ Index: kioslave/imap4/CMakeLists.txt
  
 Index: kioslave/sieve/sieve.protocol
 ===================================================================
---- kioslave/sieve/sieve.protocol      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kioslave/sieve/sieve.protocol      (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kioslave/sieve/sieve.protocol      (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kioslave/sieve/sieve.protocol      (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -22,6 +22,7 @@
  Description[fr]=Un module d'entrée / sortie pour le protocole de filtrage de messagerie Sieve
  Description[ga]=ioslave le haghaidh prótacail scagtha ríomhphoist Sieve
@@ -1714,8 +1714,8 @@ Index: kioslave/sieve/sieve.protocol
  Description[ja]=Sieve メールフィルタリングプロトコルのための ioslave
 Index: mailtransport/kcm_mailtransport.desktop
 ===================================================================
---- mailtransport/kcm_mailtransport.desktop    (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ mailtransport/kcm_mailtransport.desktop    (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- mailtransport/kcm_mailtransport.desktop    (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ mailtransport/kcm_mailtransport.desktop    (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -23,6 +23,7 @@
  Name[fr]=Transport de courriel
  Name[ga]=Iompar Ríomhphoist
@@ -1726,8 +1726,8 @@ Index: mailtransport/kcm_mailtransport.desktop
  Name[ja]=メール送信手段
 Index: kabc/plugins/file/file.desktop
 ===================================================================
---- kabc/plugins/file/file.desktop     (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kabc/plugins/file/file.desktop     (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kabc/plugins/file/file.desktop     (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kabc/plugins/file/file.desktop     (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -11,6 +11,7 @@
  Name[fr]=Fichier
  Name[ga]=Comhad
@@ -1738,8 +1738,8 @@ Index: kabc/plugins/file/file.desktop
  Name[km]=ឯកសារ
 Index: kabc/plugins/ldapkio/ldapkio.desktop
 ===================================================================
---- kabc/plugins/ldapkio/ldapkio.desktop       (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kabc/plugins/ldapkio/ldapkio.desktop       (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kabc/plugins/ldapkio/ldapkio.desktop       (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kabc/plugins/ldapkio/ldapkio.desktop       (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -1,5 +1,6 @@
  [Desktop Entry]
  Name=LDAP
@@ -1749,8 +1749,8 @@ Index: kabc/plugins/ldapkio/ldapkio.desktop
  Name[x-test]=xxLDAPxx
 Index: kabc/plugins/net/net.desktop
 ===================================================================
---- kabc/plugins/net/net.desktop       (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kabc/plugins/net/net.desktop       (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kabc/plugins/net/net.desktop       (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kabc/plugins/net/net.desktop       (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -11,6 +11,7 @@
  Name[fr]=Réseau
  Name[ga]=Líonra
@@ -1761,8 +1761,8 @@ Index: kabc/plugins/net/net.desktop
  Name[ja]=ネットワーク
 Index: kabc/plugins/dir/dir.desktop
 ===================================================================
---- kabc/plugins/dir/dir.desktop       (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kabc/plugins/dir/dir.desktop       (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kabc/plugins/dir/dir.desktop       (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kabc/plugins/dir/dir.desktop       (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -11,6 +11,7 @@
  Name[fr]=Dossier
  Name[ga]=Comhadlann
@@ -1773,8 +1773,8 @@ Index: kabc/plugins/dir/dir.desktop
  Name[ja]=ディレクトリ
 Index: kabc/kabc_manager.desktop
 ===================================================================
---- kabc/kabc_manager.desktop  (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kabc/kabc_manager.desktop  (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kabc/kabc_manager.desktop  (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kabc/kabc_manager.desktop  (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -11,6 +11,7 @@
  Name[et]=Kontaktid
  Name[ga]=Teagmhálacha
@@ -1785,8 +1785,8 @@ Index: kabc/kabc_manager.desktop
  Name[ja]=連絡先
 Index: kabc/formats/binary.desktop
 ===================================================================
---- kabc/formats/binary.desktop        (.../tags/KDE/4.2.1/kdepimlibs) (wersja 935632)
-+++ kabc/formats/binary.desktop        (.../branches/KDE/4.2/kdepimlibs)       (wersja 935632)
+--- kabc/formats/binary.desktop        (.../tags/KDE/4.2.1/kdepimlibs) (wersja 936422)
++++ kabc/formats/binary.desktop        (.../branches/KDE/4.2/kdepimlibs)       (wersja 936422)
 @@ -11,6 +11,7 @@
  Name[fr]=Binaire
  Name[ga]=Dénártha