SOURCES: kdelibs-branch.diff, kdebase-branch.diff, kdepim-branch.d...
arekm
arekm at pld-linux.org
Sat Dec 2 23:21:23 CET 2006
Author: arekm Date: Sat Dec 2 22:21:23 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up
---- Files affected:
SOURCES:
kdelibs-branch.diff (1.45 -> 1.46) , kdebase-branch.diff (1.47 -> 1.48) , kdepim-branch.diff (1.33 -> 1.34) , kdenetwork-branch.diff (1.20 -> 1.21)
---- Diffs:
================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.45 SOURCES/kdelibs-branch.diff:1.46
--- SOURCES/kdelibs-branch.diff:1.45 Tue Nov 28 10:50:57 2006
+++ SOURCES/kdelibs-branch.diff Sat Dec 2 23:21:17 2006
@@ -1,7 +1,7 @@
Index: interfaces/kscript/sample/shellscript.desktop
===================================================================
---- interfaces/kscript/sample/shellscript.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ interfaces/kscript/sample/shellscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- interfaces/kscript/sample/shellscript.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ interfaces/kscript/sample/shellscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -15,7 +15,7 @@
Name[es]=Ejecutor de script para intĂŠrprete de comandos de bash
Name[et]=Bash shelli skripti käivitaja
@@ -13,8 +13,8 @@
Name[fy]=Bash Flues Skript Rinner
Index: interfaces/kscript/scriptinterface.desktop
===================================================================
---- interfaces/kscript/scriptinterface.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- interfaces/kscript/scriptinterface.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -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.
@@ -34,8 +34,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 608741)
-+++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -28,6 +28,7 @@
Comment[hr]=Trenutne poruke s DCOP suÄeljem
Comment[hsb]=Instant Messenger z DCOP-interfejsom
@@ -46,8 +46,8 @@
Comment[ja]=DCOP ă¤ăłăżăźăă§ăźăšăăă¤ă¤ăłăšăżăłăăĄăăťăłă¸ăŁăź
Index: interfaces/kimproxy/interface/kcm_instantmessenger.desktop
===================================================================
---- interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -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.
@@ -67,8 +67,8 @@
Comment[ja]=ă¤ăłăšăżăłăăĄăăťăłă¸ăŁăźăŻĺäşşă¨ă°ăŤăźăă¨ăŽĺćšĺăăŁăăăĺŻč˝ăŤăăžăă
Index: interfaces/kspeech/kspeech.h
===================================================================
---- interfaces/kspeech/kspeech.h (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ interfaces/kspeech/kspeech.h (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- interfaces/kspeech/kspeech.h (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ interfaces/kspeech/kspeech.h (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -371,10 +371,11 @@
*
* A Talker Code consists of a series of XML tags and attributes.
@@ -84,8 +84,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 608741)
-+++ interfaces/kspeech/dcoptexttospeech.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- interfaces/kspeech/dcoptexttospeech.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ interfaces/kspeech/dcoptexttospeech.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -26,6 +26,7 @@
Comment[hr]=Usluga tekst-u-govor s DCOP suÄeljem.
Comment[hsb]=konwertowanje teksta na rÄÄ z DCOP-interfejsom
@@ -96,8 +96,8 @@
Comment[ja]=DCOP ă¤ăłăżăźăă§ăźăšă§ĺä˝ăăăăăšăčŞăżä¸ăăľăźăăš
Index: interfaces/ktexteditor/ktexteditoreditor.desktop
===================================================================
---- interfaces/ktexteditor/ktexteditoreditor.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ interfaces/ktexteditor/ktexteditoreditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- interfaces/ktexteditor/ktexteditoreditor.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ interfaces/ktexteditor/ktexteditoreditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -20,7 +20,7 @@
Comment[es]=Componente incrustable de editor de textos (sin separaciĂłn Doc/Vista)
Comment[et]=PĂľimitav tekstiredaktori komponent
@@ -117,8 +117,8 @@
Comment[ja]=ĺăčžźăżĺŻč˝ăŞăăăšăă¨ăăŁăżăłăłăăźăăłă (Doc/View ĺé˘ăŞă)
Index: interfaces/ktexteditor/kcm_ktexteditor.desktop
===================================================================
---- interfaces/ktexteditor/kcm_ktexteditor.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ interfaces/ktexteditor/kcm_ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- interfaces/ktexteditor/kcm_ktexteditor.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ interfaces/ktexteditor/kcm_ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -90,7 +90,7 @@
Comment[es]=El servicio del editor de texto proporciona aplicaciones con un visor de textos y un editor de textos. Las aplicaciones KDE que suministran propiedades de ediciĂłn deberĂan utilizar este servicio.
Comment[et]=Tekstiredaktori teenus annab rakendustele komponendi teksti vaatamiseks ja redigeerimiseks. Seda kasutavad kĂľik KDE rakendused, mis tegelevad teksti redigeerimisega.
@@ -138,8 +138,8 @@
Comment[ja]=ăăăšăă¨ăăŁăżăľăźăăšăŻă˘ăăŞăąăźăˇă§ăłăŤăăăšăăăĽăźă˘ă¨ăăăšăă¨ăăŁăżăćäžăăžăăăăăšă硨éăŽćŠč˝ăć㤠KDEă˘ăăŞăąăźăˇă§ăłăŻăăă使ç¨ăăžăă
Index: interfaces/ktexteditor/ktexteditor.desktop
===================================================================
---- interfaces/ktexteditor/ktexteditor.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ interfaces/ktexteditor/ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- interfaces/ktexteditor/ktexteditor.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ interfaces/ktexteditor/ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -20,7 +20,7 @@
Comment[es]=Componente incrustable de editor de textos (con separaciĂłn Doc/Vista)
Comment[et]=PĂľimitav tekstiredaktori komponent (dokument/vaade eraldamisega)
@@ -159,8 +159,8 @@
Comment[ja]=ĺăčžźăżĺŻč˝ăŞăăăšăă¨ăăŁăżăłăłăăźăăłă (Doc/View ĺé˘)
Index: interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
===================================================================
---- interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -21,8 +21,10 @@
{
protected:
@@ -175,8 +175,8 @@
};
Index: kmdi/kmdi/mainwindow.h
===================================================================
---- kmdi/kmdi/mainwindow.h (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kmdi/kmdi/mainwindow.h (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kmdi/kmdi/mainwindow.h (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kmdi/kmdi/mainwindow.h (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -107,6 +107,10 @@
* as toplevel and stay-on-top on the application's main widget.
* @param pWnd widget for the toolview
@@ -190,8 +190,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 608741)
-+++ kmdi/kmdi/dockcontainer.h (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kmdi/kmdi/dockcontainer.h (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kmdi/kmdi/dockcontainer.h (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -50,7 +50,7 @@
/**
* Add a widget to this container.
@@ -212,8 +212,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 608741)
-+++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -27,6 +27,7 @@
Name[hi]=ŕ¤ŕĽ-ŕ¤ŕĽŕ¤ŕĽŕ¤¸ŕĽŕ¤-ŕ¤ŕ¤Ąŕ¤żŕ¤ŕ¤° ŕ¤ŕĽ-थञŕ¤ŕ¤ž-ŕ¤ŕĽŕ¤˛ पŕĽŕ¤˛ŕ¤ŕ¤ŕ¤¨
Name[hr]=KTextEditor dodatak za KDataTool
@@ -232,8 +232,8 @@
Comment[ja]=ĺ瞊čŞăăźăŤăăšăăŤăă§ăăŻăŞăŠăŽăăźăżăăźăŤăćĺšăŤăăžă (ă¤ăłăšăăźăŤăăăŚăăĺ ´ĺ)
Index: kate/plugins/insertfile/ktexteditor_insertfile.desktop
===================================================================
---- kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -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
@@ -244,8 +244,8 @@
Comment[ja]=ăŤăźă˝ăŤä˝ç˝ŽăŤčŞăżčžźăżĺŻč˝ăŞăăĄă¤ăŤăćżĺ
Ľăăžă
Index: kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
===================================================================
---- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -23,6 +23,7 @@
Name[hi]=ŕ¤ŕĽ-ŕ¤ŕĽŕ¤ŕĽŕ¤¸ŕĽŕ¤-ŕ¤ŕ¤Ąŕ¤żŕ¤ŕ¤° ŕ¤ŕ¤ŕĽŕ¤ŹŕĽŕ¤ŕ¤Žŕ¤žŕ¤°ŕĽŕ¤ŕ¤°
Name[hr]=KTextEditor automatske oznake
@@ -267,8 +267,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 608741)
-+++ kate/plugins/autobookmarker/autobookmarker.cpp (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/plugins/autobookmarker/autobookmarker.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/plugins/autobookmarker/autobookmarker.cpp (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -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.");
@@ -288,8 +288,8 @@
//END
Index: kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
===================================================================
---- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -23,6 +23,7 @@
Name[hr]=KTextEditor dodatak za dopunjavanje rijeÄi
Name[hsb]=KTextEditor Plugin za wudospoĹnjenje sĹowow
@@ -317,8 +317,8 @@
Comment[ja]=ăăăă˘ăăăžăăŻăŚăźăśăŽć示ăŤăăŁăŚăăăĽăĄăłăăŽĺčŞăăčŁĺŽăăžă
Index: kate/plugins/isearch/ktexteditor_isearch.desktop
===================================================================
---- kate/plugins/isearch/ktexteditor_isearch.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/plugins/isearch/ktexteditor_isearch.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/plugins/isearch/ktexteditor_isearch.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/plugins/isearch/ktexteditor_isearch.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -27,6 +27,7 @@
Name[hr]=KTextEditor dodatak za traĹženje u koracima
Name[hsb]=KTextEditor Plugin za inkrementelne pytanje
@@ -346,8 +346,8 @@
Comment[ja]="ćăŁăăăŽăăŽăžăžć¤ç´˘"ă¨ăăŚăçĽăăăŚăăžă
Index: kate/part/katecodecompletion.cpp
===================================================================
---- kate/part/katecodecompletion.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/part/katecodecompletion.cpp (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/part/katecodecompletion.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/part/katecodecompletion.cpp (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -56,7 +56,6 @@
public:
/**
@@ -358,8 +358,8 @@
{
Index: kate/part/katefactory.h
===================================================================
---- kate/part/katefactory.h (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/part/katefactory.h (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/part/katefactory.h (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/part/katefactory.h (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -75,6 +75,7 @@
* @param widgetName widget name
* @param parent QObject parent
@@ -370,8 +370,8 @@
*/
Index: kate/part/katefiletype.cpp
===================================================================
---- kate/part/katefiletype.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/part/katefiletype.cpp (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/part/katefiletype.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/part/katefiletype.cpp (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -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.");
@@ -391,8 +391,8 @@
//END KateFileTypeConfigTab
Index: kate/part/katejscript.cpp
===================================================================
---- kate/part/katejscript.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/part/katejscript.cpp (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/part/katejscript.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/part/katejscript.cpp (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -99,7 +99,7 @@
{
switch (id) {
@@ -431,8 +431,8 @@
Index: kate/part/kateview.h
===================================================================
---- kate/part/kateview.h (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/part/kateview.h (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/part/kateview.h (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/part/kateview.h (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -286,8 +286,8 @@
{ return getDoc()->textLine( cursorLine() ); }
QString currentWord()
@@ -454,8 +454,8 @@
void findPrev() { findAgain( true ); }
Index: kate/part/katedocument.h
===================================================================
---- kate/part/katedocument.h (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/part/katedocument.h (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/part/katedocument.h (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/part/katedocument.h (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -264,6 +264,7 @@
* @p removeLine is true, @p length is ignored (eg not needed).
* @param line line number
@@ -475,8 +475,8 @@
Index: kate/part/katedocument.cpp
===================================================================
---- kate/part/katedocument.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/part/katedocument.cpp (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/part/katedocument.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/part/katedocument.cpp (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -3671,10 +3671,7 @@
removeText (sl, sc, sl, sc + startCommentLen);
@@ -521,8 +521,8 @@
// STRING SETTINGS
Index: kate/part/kateautoindent.h
===================================================================
---- kate/part/kateautoindent.h (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/part/kateautoindent.h (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/part/kateautoindent.h (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/part/kateautoindent.h (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -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
@@ -580,8 +580,8 @@
virtual void processLine (KateDocCursor &line);
Index: kate/part/kateviewhelpers.cpp
===================================================================
---- kate/part/kateviewhelpers.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/part/kateviewhelpers.cpp (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/part/kateviewhelpers.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/part/kateviewhelpers.cpp (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -277,7 +277,7 @@
public:
KateCmdLineFlagCompletion() {;}
@@ -593,8 +593,8 @@
}
Index: kate/part/katefactory.cpp
===================================================================
---- kate/part/katefactory.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/part/katefactory.cpp (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/part/katefactory.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/part/katefactory.cpp (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -52,6 +52,7 @@
* @param widgetName widget name
* @param parent QObject parent
@@ -605,8 +605,8 @@
*/
Index: kate/part/katesearch.h
===================================================================
---- kate/part/katesearch.h (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/part/katesearch.h (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/part/katesearch.h (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/part/katesearch.h (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -223,7 +223,7 @@
bool help(class Kate::View *, const QString &, QString &);
QStringList cmds();
@@ -618,8 +618,8 @@
/**
Index: kate/part/kateautoindent.cpp
===================================================================
---- kate/part/kateautoindent.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/part/kateautoindent.cpp (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/part/kateautoindent.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/part/kateautoindent.cpp (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -215,6 +215,8 @@
normalAttrib = 255;
extensionAttrib = 255;
@@ -781,8 +781,8 @@
if (!found)
Index: kate/part/katedialogs.cpp
===================================================================
---- kate/part/katedialogs.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/part/katedialogs.cpp (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/part/katedialogs.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/part/katedialogs.cpp (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -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() );
@@ -803,8 +803,8 @@
//END KateHlConfigPage
Index: kate/scripts/jstest.desktop
===================================================================
---- kate/scripts/jstest.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/scripts/jstest.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/scripts/jstest.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/scripts/jstest.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -9,7 +9,7 @@
Name[es]=Prueba JavaScript de Kate Part
Name[et]=Kate komponendi JavaScripti test
@@ -832,8 +832,8 @@
Comment[ja]=kate part ăŽăšăŻăŞăăăăăšăăăăăăŽăšăŻăŞăă
Index: kate/data/css.xml
===================================================================
---- kate/data/css.xml (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/data/css.xml (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/data/css.xml (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/data/css.xml (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
@@ -864,8 +864,8 @@
<contexts>
Index: kate/data/Makefile.am
===================================================================
---- kate/data/Makefile.am (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/data/Makefile.am (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/data/Makefile.am (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/data/Makefile.am (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -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 \
@@ -878,7 +878,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 608741)
++++ kate/data/actionscript.xml (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -0,0 +1,334 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
@@ -1216,8 +1216,8 @@
+</language>
Index: kate/data/php.xml
===================================================================
---- kate/data/php.xml (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/data/php.xml (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/data/php.xml (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/data/php.xml (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -1,12 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
@@ -1302,8 +1302,8 @@
<itemData name="Hex" defStyleNum="dsBaseN" />
Index: kate/data/java.xml
===================================================================
---- kate/data/java.xml (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kate/data/java.xml (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kate/data/java.xml (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kate/data/java.xml (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
@@ -1327,8 +1327,8 @@
<context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
Index: kab/qconfigDB.h
===================================================================
---- kab/qconfigDB.h (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kab/qconfigDB.h (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kab/qconfigDB.h (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kab/qconfigDB.h (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -199,7 +199,7 @@
bool save(QTextStream& file, int count);
/**
@@ -1448,8 +1448,8 @@
*/
Index: kab/addressbook.h
===================================================================
---- kab/addressbook.h (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kab/addressbook.h (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kab/addressbook.h (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kab/addressbook.h (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -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
@@ -1552,8 +1552,8 @@
**/
Index: kab/kabapi.h
===================================================================
---- kab/kabapi.h (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ kab/kabapi.h (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- kab/kabapi.h (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ kab/kabapi.h (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -77,6 +77,7 @@
* without failures. Thus you have to call init before you can
* use the database.
@@ -1573,8 +1573,8 @@
* @return NoError if an entry is found or NoEntry.
Index: doc/common/footer.html
===================================================================
---- doc/common/footer.html (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ doc/common/footer.html (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- doc/common/footer.html (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ doc/common/footer.html (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -45,7 +45,7 @@
<div id="footer_left">
Maintained by <a href="mailto:groot@kde.org">Adriaan de Groot</a>
@@ -1586,8 +1586,8 @@
<a href="http://www.kde.org/contact/impressum.php">Legal</a>
Index: arts/kde/kplayobject.h
===================================================================
---- arts/kde/kplayobject.h (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ arts/kde/kplayobject.h (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- arts/kde/kplayobject.h (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ arts/kde/kplayobject.h (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -37,7 +37,7 @@
/**
@@ -1599,8 +1599,8 @@
Index: arts/knotify/knotify.cpp
===================================================================
---- arts/knotify/knotify.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ arts/knotify/knotify.cpp (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- arts/knotify/knotify.cpp (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ arts/knotify/knotify.cpp (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -26,24 +26,29 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -1812,8 +1812,8 @@
void KNotify::sessionReady()
Index: arts/knotify/Makefile.am
===================================================================
---- arts/knotify/Makefile.am (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ arts/knotify/Makefile.am (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- arts/knotify/Makefile.am (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ arts/knotify/Makefile.am (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -6,7 +6,9 @@
kde_module_LTLIBRARIES = knotify.la
@@ -1826,8 +1826,8 @@
Index: arts/knotify/knotify.h
===================================================================
---- arts/knotify/knotify.h (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ arts/knotify/knotify.h (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- arts/knotify/knotify.h (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ arts/knotify/knotify.h (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -23,7 +23,6 @@
#include <qobject.h>
#include <knotifyclient.h>
@@ -1838,8 +1838,8 @@
class KProcess;
Index: arts/knotify/knotify.desktop
===================================================================
---- arts/knotify/knotify.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ arts/knotify/knotify.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- arts/knotify/knotify.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ arts/knotify/knotify.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -68,7 +68,7 @@
Comment[ms]=Daemon Pemberitahuan KDE
Comment[mt]=Daemon tan-notifika KDE
@@ -1851,8 +1851,8 @@
Comment[nso]=Daemon ya Tsebiso ya KDE
Index: arts/Makefile.am
===================================================================
---- arts/Makefile.am (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ arts/Makefile.am (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- arts/Makefile.am (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ arts/Makefile.am (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -1,4 +1,8 @@
+if include_ARTS
SUBDIRS = kde knotify message
@@ -1864,8 +1864,8 @@
include ../admin/Doxyfile.am
Index: arts/configure.in.in
===================================================================
---- arts/configure.in.in (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ arts/configure.in.in (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- arts/configure.in.in (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ arts/configure.in.in (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -22,7 +22,6 @@
ARTS_OK=no
@@ -1876,8 +1876,8 @@
Index: mimetypes/all.desktop
===================================================================
---- mimetypes/all.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ mimetypes/all.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- mimetypes/all.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ mimetypes/all.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -31,6 +31,7 @@
Comment[hi]=सŕ¤ŕĽ ऍटञŕ¤ŕ¤˛ŕĽŕ¤ ŕ¤ŕ¤° ऍटŕĽŕ¤˛ŕĽŕ¤Ąŕ¤°
Comment[hr]=Sve datoteke i mape
@@ -1888,8 +1888,8 @@
Comment[ja]=ăăšăŚăŽăăĄă¤ăŤă¨ăăŁăŹăŻăăŞ
Index: mimetypes/model/vrml.desktop
===================================================================
---- mimetypes/model/vrml.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ mimetypes/model/vrml.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- mimetypes/model/vrml.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ mimetypes/model/vrml.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -30,6 +30,7 @@
Comment[hi]=VRML ऎŕĽŕ¤Ąŕ¤˛
Comment[hr]=VRML model
@@ -1900,8 +1900,8 @@
Comment[ja]=VRML ă˘ă¸ăĽăźăŤ
Index: mimetypes/audio/x-oggflac.desktop
===================================================================
---- mimetypes/audio/x-oggflac.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ mimetypes/audio/x-oggflac.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- mimetypes/audio/x-oggflac.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ mimetypes/audio/x-oggflac.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -31,6 +31,7 @@
Comment[hi]=ŕ¤ŕ¤ FLAC ŕ¤ŕ¤Ąŕ¤żŕ¤ŻŕĽ
Comment[hr]=Ogg FLAC zvuk
@@ -1912,8 +1912,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 608741)
-+++ mimetypes/audio/vnd.rn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- mimetypes/audio/vnd.rn-realaudio.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ mimetypes/audio/vnd.rn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -34,6 +34,7 @@
Comment[hi]=रŕĽŕ¤Żŕ¤˛ŕ¤ŕ¤Ąŕ¤żŕ¤ŻŕĽ ऍटञŕ¤ŕ¤˛
Comment[hr]=RealAudio datoteka
@@ -1924,8 +1924,8 @@
Comment[ja]=RealAudio ăăĄă¤ăŤ
Index: mimetypes/audio/x-vorbis.desktop
===================================================================
---- mimetypes/audio/x-vorbis.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ mimetypes/audio/x-vorbis.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- mimetypes/audio/x-vorbis.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ mimetypes/audio/x-vorbis.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -31,6 +31,7 @@
Comment[hi]=ŕ¤ŕ¤ ाŕĽŕ¤°ŕĽŕ¤Źŕ¤żŕ¤¸ ŕ¤ŕ¤Ąŕ¤żŕ¤ŻŕĽ
Comment[hr]=Ogg Vorbis zvuk
@@ -1936,8 +1936,8 @@
Comment[ja]=Ogg Vorbis ăŞăźăăŁăŞ
Index: mimetypes/audio/x-flac.desktop
===================================================================
---- mimetypes/audio/x-flac.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 608741)
-+++ mimetypes/audio/x-flac.desktop (.../branches/KDE/3.5/kdelibs) (revision 608741)
+--- mimetypes/audio/x-flac.desktop (.../tags/KDE/3.5.5/kdelibs) (revision 609963)
++++ mimetypes/audio/x-flac.desktop (.../branches/KDE/3.5/kdelibs) (revision 609963)
@@ -28,6 +28,7 @@
Comment[hi]=FLAC ŕ¤ŕ¤Ąŕ¤żŕ¤ŻŕĽ
Comment[hr]=FLAC zvuk
@@ -1948,8 +1948,8 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.45&r2=1.46&f=u
http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.47&r2=1.48&f=u
http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.33&r2=1.34&f=u
http://cvs.pld-linux.org/SOURCES/kdenetwork-branch.diff?r1=1.20&r2=1.21&f=u
More information about the pld-cvs-commit
mailing list