SOURCES: kdelibs-branch.diff, kdebase-branch.diff, kdepim-branch.d...

arekm arekm at pld-linux.org
Sat Nov 25 01:26:55 CET 2006


Author: arekm                        Date: Sat Nov 25 00:26:55 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kdelibs-branch.diff (1.43 -> 1.44) , kdebase-branch.diff (1.45 -> 1.46) , kdepim-branch.diff (1.31 -> 1.32) , kdenetwork-branch.diff (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.43 SOURCES/kdelibs-branch.diff:1.44
--- SOURCES/kdelibs-branch.diff:1.43	Sat Nov 18 01:34:22 2006
+++ SOURCES/kdelibs-branch.diff	Sat Nov 25 01:26:48 2006
@@ -1,7 +1,7 @@
 Index: interfaces/kscript/scriptinterface.desktop
 ===================================================================
---- interfaces/kscript/scriptinterface.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ interfaces/kscript/scriptinterface.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- interfaces/kscript/scriptinterface.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ interfaces/kscript/scriptinterface.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -30,6 +30,7 @@
  Comment[hr]=Ovo je generička ispitna skripta programa za ispitivanje sučelja skripte.
  Comment[hsb]=To je program za testowanje skript-interfejsa.
@@ -21,8 +21,8 @@
  Comment[vi]=Đây lĂ  cĆĄ cháşż táş­p lᝇnh tháť­ ra giáť‘ng loĂ i Ä‘áťƒ tháť­ ra giao diᝇn táş­p lᝇnh.
 Index: interfaces/kimproxy/interface/dcopinstantmessenger.desktop
 ===================================================================
---- interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -28,6 +28,7 @@
  Comment[hr]=Trenutne poruke s DCOP sučeljem
  Comment[hsb]=Instant Messenger z DCOP-interfejsom
@@ -33,8 +33,8 @@
  Comment[ja]=DCOP ă‚¤ăƒłă‚żăƒźăƒ•ă‚§ăƒźă‚šă‚’ă‚‚ă¤ă‚¤ăƒłă‚šă‚żăƒłăƒˆăƒĄăƒƒă‚ťăƒłă‚¸ăƒŁăƒź
 Index: interfaces/kimproxy/interface/kcm_instantmessenger.desktop
 ===================================================================
---- interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -66,7 +66,7 @@
  Comment[es]=El Instant Messenger permite conversaciĂłn en dos sentidos entre indivĂ­duos y grupos.
  Comment[et]=Kiirsuhtlus vĂľimaldab Ăźksikisikute ja gruppide kahepoolset vestlust.
@@ -54,8 +54,8 @@
  Comment[ja]=ă‚¤ăƒłă‚šă‚żăƒłăƒˆăƒĄăƒƒă‚ťăƒłă‚¸ăƒŁăƒźăŻĺ€‹äşşă¨ă‚°ăƒŤăƒźăƒ—ă¨ăŽĺŒć–šĺ‘ăƒăƒŁăƒƒăƒˆă‚’ĺŻčƒ˝ăŤă—ăžă™ă€‚
 Index: interfaces/kspeech/kspeech.h
 ===================================================================
---- interfaces/kspeech/kspeech.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ interfaces/kspeech/kspeech.h	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- interfaces/kspeech/kspeech.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ interfaces/kspeech/kspeech.h	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -371,10 +371,11 @@
   *
   * A Talker Code consists of a series of XML tags and attributes.
@@ -71,8 +71,8 @@
   * Markup Language (SSML) and Java Speech Markup Language (JSML).
 Index: interfaces/kspeech/dcoptexttospeech.desktop
 ===================================================================
---- interfaces/kspeech/dcoptexttospeech.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ interfaces/kspeech/dcoptexttospeech.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- interfaces/kspeech/dcoptexttospeech.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ interfaces/kspeech/dcoptexttospeech.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -26,6 +26,7 @@
  Comment[hr]=Usluga tekst-u-govor s DCOP sučeljem.
  Comment[hsb]=konwertowanje teksta na rěč z DCOP-interfejsom
@@ -83,8 +83,8 @@
  Comment[ja]=DCOP ă‚¤ăƒłă‚żăƒźăƒ•ă‚§ăƒźă‚šă§ĺ‹•ä˝œă™ă‚‹ăƒ†ă‚­ă‚šăƒˆčŞ­ăżä¸Šă’ă‚ľăƒźăƒ“ă‚š
 Index: interfaces/ktexteditor/ktexteditoreditor.desktop
 ===================================================================
---- interfaces/ktexteditor/ktexteditoreditor.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ interfaces/ktexteditor/ktexteditoreditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- interfaces/ktexteditor/ktexteditoreditor.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ interfaces/ktexteditor/ktexteditoreditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -31,6 +31,7 @@
  Comment[hr]=Ugradiva komponenta obrade teksta (bez Doc/View razdvajanja)
  Comment[hsb]=Integrujomna komponenta za wobdźěłanje tekstow (bjez doc/view-separacije)
@@ -95,8 +95,8 @@
  Comment[ja]=ĺŸ‹ă‚čžźăżĺŻčƒ˝ăŞăƒ†ă‚­ă‚šăƒˆă‚¨ăƒ‡ă‚Łă‚żă‚łăƒłăƒăƒźăƒăƒłăƒˆ (Doc/View ĺˆ†é›˘ăŞă—)
 Index: interfaces/ktexteditor/kcm_ktexteditor.desktop
 ===================================================================
---- interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -102,6 +102,7 @@
  Comment[hr]=Usluga tekstualnog uređivača aplikacijama omugućuje pregledavanje i uređivanje teksta. KDE aplikacije koje omogućuju uređivanje teksta trebale bi upotrebljavati ovo sučelje.
  Comment[hsb]=Wobdźěłanje teksta staji programam wobdźěłarja a wobhladowarja teksta k dispoziciji. KDE-aplikacije, kiŞ tajke něťto trjebaja, měli tutón serwis wuŞiwać.
@@ -107,8 +107,8 @@
  Comment[ja]=ăƒ†ă‚­ă‚šăƒˆă‚¨ăƒ‡ă‚Łă‚żă‚ľăƒźăƒ“ă‚šăŻă‚˘ăƒ—ăƒŞă‚ąăƒźă‚ˇăƒ§ăƒłăŤăƒ†ă‚­ă‚šăƒˆăƒ“ăƒĽăƒźă‚˘ă¨ăƒ†ă‚­ă‚šăƒˆă‚¨ăƒ‡ă‚Łă‚żă‚’ćäž›ă—ăžă™ă€‚ăƒ†ă‚­ă‚šăƒˆçˇ¨é›†ăŽćŠŸčƒ˝ă‚’ćŒă¤ KDEă‚˘ăƒ—ăƒŞă‚ąăƒźă‚ˇăƒ§ăƒłăŻă“ă‚Œă‚’ä˝żç”¨ă—ăžă™ă€‚
 Index: interfaces/ktexteditor/ktexteditor.desktop
 ===================================================================
---- interfaces/ktexteditor/ktexteditor.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ interfaces/ktexteditor/ktexteditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- interfaces/ktexteditor/ktexteditor.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ interfaces/ktexteditor/ktexteditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -31,6 +31,7 @@
  Comment[hr]=Ugradiva komponenta obrade teksta (s Doc/View razdvajanjem)
  Comment[hsb]=Komponenta za integrowane wobdźěłanje teksta
@@ -119,8 +119,8 @@
  Comment[ja]=ĺŸ‹ă‚čžźăżĺŻčƒ˝ăŞăƒ†ă‚­ă‚šăƒˆă‚¨ăƒ‡ă‚Łă‚żă‚łăƒłăƒăƒźăƒăƒłăƒˆ (Doc/View ĺˆ†é›˘)
 Index: interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
 ===================================================================
---- interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -21,8 +21,10 @@
  {
  protected:
@@ -135,8 +135,8 @@
  };
 Index: kmdi/kmdi/mainwindow.h
 ===================================================================
---- kmdi/kmdi/mainwindow.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kmdi/kmdi/mainwindow.h	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kmdi/kmdi/mainwindow.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kmdi/kmdi/mainwindow.h	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -107,6 +107,10 @@
       * as toplevel and stay-on-top on the application's main widget.
       * @param pWnd widget for the toolview
@@ -150,8 +150,8 @@
      KMDI::ToolViewAccessor *addToolWindow( QWidget* pWnd, KDockWidget::DockPosition pos = KDockWidget::DockNone, QWidget* pTargetWnd = 0L, int percent = 50, const QString& tabToolTip = 0, const QString& tabCaption = 0);
 Index: kmdi/kmdi/dockcontainer.h
 ===================================================================
---- kmdi/kmdi/dockcontainer.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kmdi/kmdi/dockcontainer.h	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kmdi/kmdi/dockcontainer.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kmdi/kmdi/dockcontainer.h	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -50,7 +50,7 @@
      /**
       * Add a widget to this container.
@@ -172,8 +172,8 @@
      virtual void setToolTip (KDockWidget *, QString &);
 Index: kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
 ===================================================================
---- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -27,6 +27,7 @@
  Name[hi]=क༇-ŕ¤ŸŕĽ‡ŕ¤•ŕĽŕ¤¸ŕĽŕ¤Ÿ-ŕ¤ŕ¤Ąŕ¤żŕ¤Ÿŕ¤° क༇-ŕ¤Ąŕ¤žŕ¤Ÿŕ¤ž-ŕ¤ŸŕĽ‚ŕ¤˛ ŕ¤ŞŕĽŕ¤˛ŕ¤—ŕ¤‡ŕ¤¨
  Name[hr]=KTextEditor dodatak za KDataTool
@@ -192,8 +192,8 @@
  Comment[ja]=ĺŒçžŠčŞžăƒ„ăƒźăƒŤă‚„ă‚šăƒšăƒŤăƒă‚§ăƒƒă‚ŻăŞăŠăŽăƒ‡ăƒźă‚żăƒ„ăƒźăƒŤă‚’ćœ‰ĺŠšăŤă—ăžă™ (ă‚¤ăƒłă‚šăƒˆăƒźăƒŤă•ă‚ŒăŚă„ă‚‹ĺ ´ĺˆ)
 Index: kate/plugins/insertfile/ktexteditor_insertfile.desktop
 ===================================================================
---- kate/plugins/insertfile/ktexteditor_insertfile.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/plugins/insertfile/ktexteditor_insertfile.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/plugins/insertfile/ktexteditor_insertfile.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/plugins/insertfile/ktexteditor_insertfile.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -96,6 +96,7 @@
  Comment[hr]=Na položaju pokazivača umetnite bilo koju čitljivu datoteku
  Comment[hsb]=Zasunje lubowólnu čitajomnu dataju na poziciji cursora
@@ -204,8 +204,8 @@
  Comment[ja]=ă‚Ťăƒźă‚˝ăƒŤä˝ç˝ŽăŤčŞ­ăżčžźăżĺŻčƒ˝ăŞăƒ•ă‚Ąă‚¤ăƒŤă‚’ćŒżĺ
Ľă—ぞす
 Index: kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
 ===================================================================
---- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -23,6 +23,7 @@
  Name[hi]=क༇-ŕ¤ŸŕĽ‡ŕ¤•ŕĽŕ¤¸ŕĽŕ¤Ÿ-ŕ¤ŕ¤Ąŕ¤żŕ¤Ÿŕ¤° ŕ¤‘ŕ¤ŸŕĽ‹ŕ¤ŹŕĽŕ¤•ŕ¤Žŕ¤žŕ¤°ŕĽŕ¤•ŕ¤°
  Name[hr]=KTextEditor automatske oznake
@@ -227,8 +227,8 @@
  Comment[lb]=Setzt Lieszeechen op d'Zeilen, dĂŠi ee bestĂŤmmtent Muster enthalen, wann d'Dokument geluede gĂŤtt
 Index: kate/plugins/autobookmarker/autobookmarker.cpp
 ===================================================================
---- kate/plugins/autobookmarker/autobookmarker.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/plugins/autobookmarker/autobookmarker.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/plugins/autobookmarker/autobookmarker.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/plugins/autobookmarker/autobookmarker.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -364,12 +364,12 @@
  {
    QString text = i18n("Select the MimeTypes for this pattern.\nPlease note that this will automatically edit the associated file extensions as well.");
@@ -248,8 +248,8 @@
  //END
 Index: kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
 ===================================================================
---- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -23,6 +23,7 @@
  Name[hr]=KTextEditor dodatak za dopunjavanje riječi
  Name[hsb]=KTextEditor Plugin za wudospołnjenje słowow
@@ -277,8 +277,8 @@
  Comment[ja]=ăƒăƒƒăƒ—ă‚˘ăƒƒăƒ—ăžăŸăŻăƒŚăƒźă‚śăŽćŒ‡ç¤şăŤă‚ˆăŁăŚăƒ‰ă‚­ăƒĽăƒĄăƒłăƒˆăŽĺ˜čŞžă‹ă‚‰čŁœĺŽŒă—ăžă™
 Index: kate/plugins/isearch/ktexteditor_isearch.desktop
 ===================================================================
---- kate/plugins/isearch/ktexteditor_isearch.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/plugins/isearch/ktexteditor_isearch.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/plugins/isearch/ktexteditor_isearch.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/plugins/isearch/ktexteditor_isearch.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -27,6 +27,7 @@
  Name[hr]=KTextEditor dodatak za traĹženje u koracima
  Name[hsb]=KTextEditor Plugin za inkrementelne pytanje
@@ -297,8 +297,8 @@
  Comment[ja]="ć‰“ăŁăŸă‚‚ăŽăăŽăžăžć¤œç´˘"ă¨ă—ăŚă‚‚çŸĽă‚‰ă‚ŒăŚă„ăžă™
 Index: kate/part/katecodecompletion.cpp
 ===================================================================
---- kate/part/katecodecompletion.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/part/katecodecompletion.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/part/katecodecompletion.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/part/katecodecompletion.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -56,7 +56,6 @@
    public:
      /**
@@ -309,8 +309,8 @@
      {
 Index: kate/part/katefactory.h
 ===================================================================
---- kate/part/katefactory.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/part/katefactory.h	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/part/katefactory.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/part/katefactory.h	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -75,6 +75,7 @@
       * @param widgetName widget name
       * @param parent QObject parent
@@ -321,8 +321,8 @@
       */
 Index: kate/part/katefiletype.cpp
 ===================================================================
---- kate/part/katefiletype.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/part/katefiletype.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/part/katefiletype.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/part/katefiletype.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -503,12 +503,12 @@
  
    QString text = i18n("Select the MimeTypes you want for this file type.\nPlease note that this will automatically edit the associated file extensions as well.");
@@ -342,8 +342,17 @@
  //END KateFileTypeConfigTab
 Index: kate/part/katejscript.cpp
 ===================================================================
---- kate/part/katejscript.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/part/katejscript.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/part/katejscript.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/part/katejscript.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
+@@ -99,7 +99,7 @@
+ {
+   switch (id) {
+     case Debug:
+-      kdDebug(13051) << args[0].toString(exec).ascii() << endl;
++      qDebug("Kate (KJS Scripting): %s", args[0].toString(exec).ascii());
+       return Undefined();
+     default:
+       break;
 @@ -360,7 +360,7 @@
  
  const KJS::ClassInfo KateJSDocument::info = { "KateJSDocument", 0, 0, 0 };
@@ -373,8 +382,8 @@
  
 Index: kate/part/kateview.h
 ===================================================================
---- kate/part/kateview.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/part/kateview.h	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/part/kateview.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/part/kateview.h	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -286,8 +286,8 @@
          { return getDoc()->textLine( cursorLine() ); }
      QString currentWord()
@@ -396,8 +405,8 @@
      void findPrev()               { findAgain( true );           }
 Index: kate/part/katedocument.h
 ===================================================================
---- kate/part/katedocument.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/part/katedocument.h	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/part/katedocument.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/part/katedocument.h	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -264,6 +264,7 @@
       * @p removeLine is true, @p length is ignored (eg not needed).
       * @param line line number
@@ -417,9 +426,39 @@
  
 Index: kate/part/katedocument.cpp
 ===================================================================
---- kate/part/katedocument.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/part/katedocument.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
-@@ -4688,9 +4688,9 @@
+--- kate/part/katedocument.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/part/katedocument.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
+@@ -3671,10 +3671,7 @@
+     removeText (sl, sc, sl, sc + startCommentLen);
+ 
+     editEnd ();
+-
+-    // Set the new selection
+-    ec -= endCommentLen + ( (el == sl) ? startCommentLen : 0 );
+-    view->setSelection(sl, sc, el, ec + 1);
++    // set new selection not necessary, as the selection cursors are KateSuperCursors
+   }
+ 
+   return remove;
+@@ -3737,16 +3734,7 @@
+   }
+ 
+   editEnd();
+-
+-  if (removed)
+-  {
+-    // Set the new selection
+-    KateDocCursor end (view->selEnd());
+-    end.setCol(view->selEndCol() - ((el == view->selEndLine()) ? removeLength : 0) );
+-
+-    setSelection(view->selStartLine(), view->selStartCol(), end.line(), end.col());
+-  }
+-
++  // updating selection already done by the KateSuperCursors
+   return removed;
+ }
+ 
+@@ -4688,9 +4676,9 @@
          else
            m_config->setIndentationMode( KateAutoIndent::modeNumber( val) );
        }
@@ -433,8 +472,8 @@
        // STRING SETTINGS
 Index: kate/part/kateautoindent.h
 ===================================================================
---- kate/part/kateautoindent.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/part/kateautoindent.h	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/part/kateautoindent.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/part/kateautoindent.h	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -323,6 +323,7 @@
    uint  tabWidth;     //!< The number of characters simulated for a tab
    uint  indentWidth;  //!< The number of characters used when tabs are replaced by spaces
@@ -492,8 +531,8 @@
      virtual void processLine (KateDocCursor &line);
 Index: kate/part/kateviewhelpers.cpp
 ===================================================================
---- kate/part/kateviewhelpers.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/part/kateviewhelpers.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/part/kateviewhelpers.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/part/kateviewhelpers.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -277,7 +277,7 @@
    public:
      KateCmdLineFlagCompletion() {;}
@@ -505,8 +544,8 @@
      }
 Index: kate/part/katefactory.cpp
 ===================================================================
---- kate/part/katefactory.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/part/katefactory.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/part/katefactory.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/part/katefactory.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -52,6 +52,7 @@
       * @param widgetName widget name
       * @param parent QObject parent
@@ -517,8 +556,8 @@
       */
 Index: kate/part/katesearch.h
 ===================================================================
---- kate/part/katesearch.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/part/katesearch.h	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/part/katesearch.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/part/katesearch.h	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -223,7 +223,7 @@
      bool help(class Kate::View *, const QString &, QString &);
      QStringList cmds();
@@ -530,8 +569,8 @@
      /**
 Index: kate/part/kateautoindent.cpp
 ===================================================================
---- kate/part/kateautoindent.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/part/kateautoindent.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/part/kateautoindent.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/part/kateautoindent.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -215,6 +215,8 @@
    normalAttrib = 255;
    extensionAttrib = 255;
@@ -693,8 +732,8 @@
    if (!found)
 Index: kate/part/katedialogs.cpp
 ===================================================================
---- kate/part/katedialogs.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/part/katedialogs.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/part/katedialogs.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/part/katedialogs.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -1423,13 +1423,13 @@
  {
    QString text = i18n("Select the MimeTypes you want highlighted using the '%1' syntax highlight rules.\nPlease note that this will automatically edit the associated file extensions as well.").arg( hlCombo->currentText() );
@@ -715,8 +754,8 @@
  //END KateHlConfigPage
 Index: kate/scripts/jstest.desktop
 ===================================================================
---- kate/scripts/jstest.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/scripts/jstest.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/scripts/jstest.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/scripts/jstest.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -9,7 +9,7 @@
  Name[es]=Prueba JavaScript de Kate Part
  Name[et]=Kate komponendi JavaScripti test
@@ -744,8 +783,8 @@
  Comment[ja]=kate part ăŽă‚šă‚ŻăƒŞăƒ—ăƒˆă‚’ăƒ†ă‚šăƒˆă™ă‚‹ăŸă‚ăŽă‚šă‚ŻăƒŞăƒ—ăƒˆ
 Index: kate/data/css.xml
 ===================================================================
---- kate/data/css.xml	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/data/css.xml	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/data/css.xml	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/data/css.xml	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -1,6 +1,6 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE language SYSTEM "language.dtd">
@@ -776,8 +815,8 @@
      <contexts>
 Index: kate/data/Makefile.am
 ===================================================================
---- kate/data/Makefile.am	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/data/Makefile.am	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/data/Makefile.am	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/data/Makefile.am	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -19,7 +19,7 @@
                  cg.xml html-php.xml css-php.xml javascript-php.xml ahdl.xml ansic89.xml tibasic.xml \
                  purebasic.xml mips.xml logtalk.xml txt2tags.xml xslt.xml stata.xml glsl.xml \
@@ -790,7 +829,7 @@
 Index: kate/data/actionscript.xml
 ===================================================================
 --- kate/data/actionscript.xml	(.../tags/KDE/3.5.5/kdelibs)	(revision 0)
-+++ kate/data/actionscript.xml	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
++++ kate/data/actionscript.xml	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -0,0 +1,334 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE language SYSTEM "language.dtd">
@@ -1128,8 +1167,8 @@
 +</language>
 Index: kate/data/php.xml
 ===================================================================
---- kate/data/php.xml	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kate/data/php.xml	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kate/data/php.xml	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kate/data/php.xml	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -1,12 +1,24 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <!--
@@ -1214,8 +1253,8 @@
        <itemData name="Hex" defStyleNum="dsBaseN" />
 Index: kab/qconfigDB.h
 ===================================================================
---- kab/qconfigDB.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kab/qconfigDB.h	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kab/qconfigDB.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kab/qconfigDB.h	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -199,7 +199,7 @@
    bool save(QTextStream& file, int count); 
    /**
@@ -1335,8 +1374,8 @@
     */
 Index: kab/addressbook.h
 ===================================================================
---- kab/addressbook.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kab/addressbook.h	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kab/addressbook.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kab/addressbook.h	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -178,7 +178,7 @@
   *  your mainwindow (or whereever). (The toolbar is not implemented by now). <BR>
   *  Some parts of the AddressBook widget are \e interactive, that means they are
@@ -1439,8 +1478,8 @@
     **/
 Index: kab/kabapi.h
 ===================================================================
---- kab/kabapi.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ kab/kabapi.h	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- kab/kabapi.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ kab/kabapi.h	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -77,6 +77,7 @@
     * without failures. Thus you have to call init before you can
     * use the database.
@@ -1460,8 +1499,8 @@
     * @return NoError if an entry is found or NoEntry.
 Index: arts/kde/kplayobject.h
 ===================================================================
---- arts/kde/kplayobject.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ arts/kde/kplayobject.h	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- arts/kde/kplayobject.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ arts/kde/kplayobject.h	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -37,7 +37,7 @@
  
  	/**
@@ -1473,8 +1512,8 @@
  	
 Index: arts/knotify/knotify.cpp
 ===================================================================
---- arts/knotify/knotify.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ arts/knotify/knotify.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- arts/knotify/knotify.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ arts/knotify/knotify.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -26,24 +26,29 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -1686,8 +1725,8 @@
  void KNotify::sessionReady()
 Index: arts/knotify/Makefile.am
 ===================================================================
---- arts/knotify/Makefile.am	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ arts/knotify/Makefile.am	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- arts/knotify/Makefile.am	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ arts/knotify/Makefile.am	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -6,7 +6,9 @@
  kde_module_LTLIBRARIES = knotify.la
  
@@ -1700,8 +1739,8 @@
  
 Index: arts/knotify/knotify.h
 ===================================================================
---- arts/knotify/knotify.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ arts/knotify/knotify.h	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- arts/knotify/knotify.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ arts/knotify/knotify.h	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -23,7 +23,6 @@
  #include <qobject.h>
  #include <knotifyclient.h>
@@ -1712,8 +1751,8 @@
  class KProcess;
 Index: arts/knotify/knotify.desktop
 ===================================================================
---- arts/knotify/knotify.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ arts/knotify/knotify.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- arts/knotify/knotify.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ arts/knotify/knotify.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -68,7 +68,7 @@
  Comment[ms]=Daemon Pemberitahuan KDE
  Comment[mt]=Daemon tan-notifika KDE
@@ -1725,8 +1764,8 @@
  Comment[nso]=Daemon ya Tsebiso ya KDE
 Index: arts/Makefile.am
 ===================================================================
---- arts/Makefile.am	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ arts/Makefile.am	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- arts/Makefile.am	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ arts/Makefile.am	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -1,4 +1,8 @@
 +if include_ARTS
  SUBDIRS = kde knotify message
@@ -1738,8 +1777,8 @@
  include ../admin/Doxyfile.am
 Index: arts/configure.in.in
 ===================================================================
---- arts/configure.in.in	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ arts/configure.in.in	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- arts/configure.in.in	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ arts/configure.in.in	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -22,7 +22,6 @@
  ARTS_OK=no
  
@@ -1750,8 +1789,8 @@
  
 Index: mimetypes/all.desktop
 ===================================================================
---- mimetypes/all.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ mimetypes/all.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- mimetypes/all.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ mimetypes/all.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -31,6 +31,7 @@
  Comment[hi]=सभༀ ऍटञइल༇ं और ŕ¤Ťŕ¤źŕĽ‹ŕ¤˛ŕĽŕ¤Ąŕ¤°
  Comment[hr]=Sve datoteke i mape
@@ -1762,8 +1801,8 @@
  Comment[ja]=ă™ăšăŚăŽăƒ•ă‚Ąă‚¤ăƒŤă¨ăƒ‡ă‚ŁăƒŹă‚ŻăƒˆăƒŞ
 Index: mimetypes/model/vrml.desktop
 ===================================================================
---- mimetypes/model/vrml.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ mimetypes/model/vrml.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- mimetypes/model/vrml.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ mimetypes/model/vrml.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -30,6 +30,7 @@
  Comment[hi]=VRML ऎ༉थल
  Comment[hr]=VRML model
@@ -1774,8 +1813,8 @@
  Comment[ja]=VRML ăƒ˘ă‚¸ăƒĽăƒźăƒŤ
 Index: mimetypes/audio/x-oggflac.desktop
 ===================================================================
---- mimetypes/audio/x-oggflac.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ mimetypes/audio/x-oggflac.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- mimetypes/audio/x-oggflac.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ mimetypes/audio/x-oggflac.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -31,6 +31,7 @@
  Comment[hi]=ऑग FLAC ऑथिय་
  Comment[hr]=Ogg FLAC zvuk
@@ -1786,8 +1825,8 @@
  Comment[ja]=Ogg FLAC ă‚Şăƒźăƒ‡ă‚Łă‚Ş
 Index: mimetypes/audio/vnd.rn-realaudio.desktop
 ===================================================================
---- mimetypes/audio/vnd.rn-realaudio.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ mimetypes/audio/vnd.rn-realaudio.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- mimetypes/audio/vnd.rn-realaudio.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ mimetypes/audio/vnd.rn-realaudio.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -34,6 +34,7 @@
  Comment[hi]=रༀयलऑथिय་ ऍटञइल
  Comment[hr]=RealAudio datoteka
@@ -1798,8 +1837,8 @@
  Comment[ja]=RealAudio ăƒ•ă‚Ąă‚¤ăƒŤ
 Index: mimetypes/audio/x-vorbis.desktop
 ===================================================================
---- mimetypes/audio/x-vorbis.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 605720)
-+++ mimetypes/audio/x-vorbis.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 605720)
+--- mimetypes/audio/x-vorbis.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 607536)
++++ mimetypes/audio/x-vorbis.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 607536)
 @@ -31,6 +31,7 @@
  Comment[hi]=ऑग ŕ¤ľŕĽ‰ŕ¤°ŕĽŕ¤Źŕ¤żŕ¤¸ ऑथिय་
  Comment[hr]=Ogg Vorbis zvuk
@@ -1810,8 +1849,8 @@
  Comment[ja]=Ogg Vorbis ă‚Şăƒźăƒ‡ă‚Łă‚Ş
 Index: mimetypes/audio/x-flac.desktop
 ===================================================================
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.43&r2=1.44&f=u
    http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.45&r2=1.46&f=u
    http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.31&r2=1.32&f=u
    http://cvs.pld-linux.org/SOURCES/kdenetwork-branch.diff?r1=1.18&r2=1.19&f=u



More information about the pld-cvs-commit mailing list