SOURCES: kdelibs-branch.diff, kdebase-branch.diff CVE-2007-4224, C...

Wed Aug 15 18:37:17 CEST 2007

Author: arekm                        Date: Wed Aug 15 16:37:17 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
CVE-2007-4224, CVE-2007-3820, CVE-2007-4225

---- Files affected:
SOURCES:
   kdelibs-branch.diff (1.61 -> 1.62) , kdebase-branch.diff (1.61 -> 1.62) 

---- Diffs:

================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.61 SOURCES/kdelibs-branch.diff:1.62

--- SOURCES/kdelibs-branch.diff:1.61	Sun Aug 12 21:46:39 2007
+++ SOURCES/kdelibs-branch.diff	Wed Aug 15 18:37:11 2007
@@ -1,7 +1,7 @@
 Index: libkscreensaver/main.cpp
 ===================================================================
---- libkscreensaver/main.cpp	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ libkscreensaver/main.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- libkscreensaver/main.cpp	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ libkscreensaver/main.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -113,6 +113,7 @@
      if (args->isSet("setup"))
      {
@@ -27,8 +27,8 @@
  }
 Index: interfaces/kscript/scriptmanager.cpp
 ===================================================================
---- interfaces/kscript/scriptmanager.cpp	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ interfaces/kscript/scriptmanager.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- interfaces/kscript/scriptmanager.cpp	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ interfaces/kscript/scriptmanager.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -17,7 +17,7 @@
  		QString scriptFile;
  		QString scriptMethod;
@@ -40,8 +40,8 @@
  {
 Index: interfaces/kscript/scriptinterface.desktop
 ===================================================================
---- interfaces/kscript/scriptinterface.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ interfaces/kscript/scriptinterface.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- interfaces/kscript/scriptinterface.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ interfaces/kscript/scriptinterface.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -48,7 +48,7 @@
  Comment[mt]=Magna ġenerika biex tittestja l-interfaċċja tal-iskritti
  Comment[nb]=Dette er et generisk testskript for å teste skriptgrensesnitt.
@@ -53,8 +53,8 @@
  Comment[nso]=Ye ke engine ya thswaelo ya teko ya kakaretso yeo e somiswago go leka sefahlego sa tshwaelo.
 Index: interfaces/kimproxy/interface/kcm_instantmessenger.desktop
 ===================================================================
---- interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -69,7 +69,7 @@
  Comment[cy]=Mae'r negesydd chwim yn caniatàu sgwrs dwy-ffordd rhwng unigolion a grwpiau.
  Comment[da]=Instant messenger tillader tovejs chat mellem individer og grupper.
@@ -66,8 +66,8 @@
  Comment[et]=Kiirsuhtlus võimaldab üksikisikute ja gruppide kahepoolset vestlust.
 Index: interfaces/kspeech/dcoptexttospeech.desktop
 ===================================================================
---- interfaces/kspeech/dcoptexttospeech.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ interfaces/kspeech/dcoptexttospeech.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- interfaces/kspeech/dcoptexttospeech.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ interfaces/kspeech/dcoptexttospeech.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -61,6 +61,7 @@
  Comment[te]=డికాప్ ఇంటర్ఫేస్ కల్గిన వాచకం నుంచి మాటలకు మార్చు సేవ
  Comment[tg]=Хизматгузории Мант-ба-Талаффуз бо интерфейси DCOP
@@ -78,8 +78,8 @@
  Comment[vi]=Dịch vụ Văn bản sang Tiếng nói có giao diện DCOP
 Index: interfaces/ktexteditor/selectioninterfaceext.cpp
 ===================================================================
---- interfaces/ktexteditor/selectioninterfaceext.cpp	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ interfaces/ktexteditor/selectioninterfaceext.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- interfaces/ktexteditor/selectioninterfaceext.cpp	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ interfaces/ktexteditor/selectioninterfaceext.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -30,8 +30,8 @@
  //BEGIN KTextEditor::SelectionInterfaceExt
  class KTextEditor::PrivateSelectionInterfaceExt {
@@ -93,8 +93,8 @@
  };
 Index: kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
 ===================================================================
---- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -102,7 +102,7 @@
  Comment[ms]=Tetapkan penanda buku pada baris yang padan dengan paten apabila dokumen dimuatkan
  Comment[nb]=Bestem bokmerke på linjer som passer til et mønster når dokument blir åpnet
@@ -106,8 +106,8 @@
  Comment[pa]=ਜਦੋਂ ਵੀ ਦਸਤਾਵੇਜ਼ ਨੂੰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਬੁੱਕਮਾਰਕ ਨੂੰ ਸਤਰ-ਮੇਲ ਤਰਤੀਬ ਨਿਰਧਾਰਿਤ ਕਰੋ
 Index: kate/plugins/isearch/ISearchPlugin.cpp
 ===================================================================
---- kate/plugins/isearch/ISearchPlugin.cpp	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ kate/plugins/isearch/ISearchPlugin.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- kate/plugins/isearch/ISearchPlugin.cpp	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ kate/plugins/isearch/ISearchPlugin.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -382,14 +382,9 @@
  {
  	if( !text.isNull() && !text.isEmpty() ) {
@@ -125,8 +125,8 @@
  	}
 Index: kate/part/katerenderer.cpp
 ===================================================================
---- kate/part/katerenderer.cpp	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ kate/part/katerenderer.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- kate/part/katerenderer.cpp	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ kate/part/katerenderer.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -798,6 +798,11 @@
      Q_ASSERT(width);
      x += width;
@@ -153,8 +153,8 @@
        if (lastWhiteSpace > -1)
 Index: kate/part/katedocument.h
 ===================================================================
---- kate/part/katedocument.h	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ kate/part/katedocument.h	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- kate/part/katedocument.h	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ kate/part/katedocument.h	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -373,7 +373,9 @@
      // these two variables are for resetting the document to
      // non-modified if all changes have been undone...
@@ -167,8 +167,8 @@
      void updateModified();
 Index: kate/part/kateview.cpp
 ===================================================================
---- kate/part/kateview.cpp	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ kate/part/kateview.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- kate/part/kateview.cpp	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ kate/part/kateview.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -1521,32 +1521,32 @@
        // We have to tag the whole lot if
        // 1) we have a selection, and:
@@ -212,8 +212,8 @@
  
 Index: kate/part/katedocument.cpp
 ===================================================================
---- kate/part/katedocument.cpp	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ kate/part/katedocument.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- kate/part/katedocument.cpp	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ kate/part/katedocument.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -98,7 +98,9 @@
    m_undoDontMerge(false),
    m_undoIgnoreCancel(false),
@@ -362,8 +362,8 @@
  
 Index: kate/part/kateviewinternal.cpp
 ===================================================================
---- kate/part/kateviewinternal.cpp	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ kate/part/kateviewinternal.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- kate/part/kateviewinternal.cpp	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ kate/part/kateviewinternal.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -1653,7 +1653,22 @@
  
    if (maxX && range.wrap) {
@@ -418,8 +418,8 @@
      else
 Index: kate/scripts/jstest.desktop
 ===================================================================
---- kate/scripts/jstest.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ kate/scripts/jstest.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- kate/scripts/jstest.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ kate/scripts/jstest.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -87,7 +87,7 @@
  Comment[ms]=Skrip untuk menguji penskripan bahagian kate
  Comment[nb]=Skript til å teste kate parts skripting
@@ -431,8 +431,8 @@
  Comment[pa]=kate part ਦੀ ਸਕ੍ਰਿਪਟਿੰਗ ਦੀ ਜਾਂਚ ਲਈ ਸਕ੍ਰਿਪਟ
 Index: kate/data/pascal.xml
 ===================================================================
---- kate/data/pascal.xml	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ kate/data/pascal.xml	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- kate/data/pascal.xml	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ kate/data/pascal.xml	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -1,6 +1,6 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE language SYSTEM "language.dtd">
@@ -459,8 +459,8 @@
        <item> Integer </item>
 Index: kate/data/ruby.xml
 ===================================================================
---- kate/data/ruby.xml	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ kate/data/ruby.xml	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- kate/data/ruby.xml	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ kate/data/ruby.xml	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -34,7 +34,7 @@
  -->
  
@@ -472,8 +472,8 @@
  	
 Index: kate/data/rhtml.xml
 ===================================================================
---- kate/data/rhtml.xml	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ kate/data/rhtml.xml	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- kate/data/rhtml.xml	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ kate/data/rhtml.xml	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -44,7 +44,7 @@
  -->
  	
@@ -485,8 +485,8 @@
  	
 Index: libltdl/ltdl.c
 ===================================================================
---- libltdl/ltdl.c	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ libltdl/ltdl.c	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- libltdl/ltdl.c	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ libltdl/ltdl.c	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -2198,29 +2198,33 @@
      /* read the .la file */
      while (!feof(file))
@@ -535,8 +535,8 @@
  	if (strncmp (line, STR_DLNAME, sizeof (STR_DLNAME) - 1) == 0)
 Index: libltdl/ltdl.m4
 ===================================================================
---- libltdl/ltdl.m4	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ libltdl/ltdl.m4	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- libltdl/ltdl.m4	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ libltdl/ltdl.m4	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -97,7 +97,7 @@
  	linux*)
  	  libltdl_cv_sys_dlopen_deplibs=yes
@@ -548,8 +548,8 @@
  	solaris*)
 Index: doc/common/kde-default.css
 ===================================================================
---- doc/common/kde-default.css	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ doc/common/kde-default.css	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- doc/common/kde-default.css	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ doc/common/kde-default.css	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -33,7 +33,7 @@
    background: white none;
    color: black;
@@ -561,8 +561,8 @@
  
 Index: mimetypes/audio/x-pn-realaudio-plugin.desktop
 ===================================================================
---- mimetypes/audio/x-pn-realaudio-plugin.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/audio/x-pn-realaudio-plugin.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/audio/x-pn-realaudio-plugin.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/audio/x-pn-realaudio-plugin.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -14,6 +14,8 @@
  Comment[es]=Archivo de extensión para RealAudio
  Comment[et]=RealAudio plugina fail
@@ -594,8 +594,8 @@
  Comment[zh_TW]=RealAudio 外掛程式檔案
 Index: mimetypes/audio/aac.desktop
 ===================================================================
---- mimetypes/audio/aac.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/audio/aac.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/audio/aac.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/audio/aac.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -39,7 +39,7 @@
  Comment[it]=Suono AAC
  Comment[ja]=ACC サウンド
@@ -607,8 +607,8 @@
  Comment[lt]=AAC garsas
 Index: mimetypes/audio/ac3.desktop
 ===================================================================
---- mimetypes/audio/ac3.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/audio/ac3.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/audio/ac3.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/audio/ac3.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -39,7 +39,7 @@
  Comment[it]=Suono Dolby AC3
  Comment[ja]=ドルビー AC3 サウンド
@@ -620,8 +620,8 @@
  Comment[lt]=Dolby AC3 garsas
 Index: mimetypes/image/x-hdr.desktop
 ===================================================================
---- mimetypes/image/x-hdr.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/image/x-hdr.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/image/x-hdr.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/image/x-hdr.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -52,6 +52,7 @@
  Comment[te]=ఎక్కువ పరిణామశీల వ్యాప్తి కలిగిన ప్రతిబింబం
  Comment[tg]=Тасвир бо андозаи динамикии балад
@@ -632,8 +632,8 @@
  Comment[vi]=Ảnh phạm vị động cao
 Index: mimetypes/image/x-vnd.trolltech.qpicture.desktop
 ===================================================================
---- mimetypes/image/x-vnd.trolltech.qpicture.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/image/x-vnd.trolltech.qpicture.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/image/x-vnd.trolltech.qpicture.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/image/x-vnd.trolltech.qpicture.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -49,7 +49,7 @@
  Comment[ms]=Fail Meta QPicture
  Comment[nb]=QPicture metafil
@@ -645,8 +645,8 @@
  Comment[pa]=QPicture ਮੈਟਾਫਾਇਲ਼
 Index: mimetypes/image/svg+xml.desktop
 ===================================================================
---- mimetypes/image/svg+xml.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/image/svg+xml.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/image/svg+xml.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/image/svg+xml.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -41,7 +41,7 @@
  Comment[mk]=Скалабилна векторска графика
  Comment[mn]=Хувиргаж болох вектор график
@@ -658,8 +658,8 @@
  Comment[nl]=Schaalbare Vector Afbeelding
 Index: mimetypes/image/cgm.desktop
 ===================================================================
---- mimetypes/image/cgm.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/image/cgm.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/image/cgm.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/image/cgm.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -41,7 +41,7 @@
  Comment[mk]=Метадатотека со компјутерска графика
  Comment[mn]=Компьютерын графикын Мита файл
@@ -671,8 +671,8 @@
  Comment[nl]=Computer Graphics-metabestand
 Index: mimetypes/image/x-photo-cd.desktop
 ===================================================================
---- mimetypes/image/x-photo-cd.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/image/x-photo-cd.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/image/x-photo-cd.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/image/x-photo-cd.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -50,7 +50,7 @@
  Comment[mt]=Stampa PhotoCD
  Comment[nb]=PhotoCD-bilde
@@ -684,8 +684,8 @@
  Comment[nso]=Ponagalo ya CD ya Seswantsho
 Index: mimetypes/image/x-raw.desktop
 ===================================================================
---- mimetypes/image/x-raw.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/image/x-raw.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/image/x-raw.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/image/x-raw.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -58,6 +58,7 @@
  Comment[te]=రా కెమెరా ప్రతిబింబం
  Comment[tg]=RAW тасвири фотоаппарат
@@ -696,8 +696,8 @@
  Comment[zh_CN]=RAW 相机图像
 Index: mimetypes/image/fits.desktop
 ===================================================================
---- mimetypes/image/fits.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/image/fits.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/image/fits.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/image/fits.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -60,6 +60,7 @@
  Comment[te]=FITS ప్రతిబింబం
  Comment[tg]=Тасвири FITS
@@ -708,8 +708,8 @@
  Comment[vi]=Ảnh FITS
 Index: mimetypes/application/chm.desktop
 ===================================================================
---- mimetypes/application/chm.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/chm.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/chm.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/chm.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -55,6 +55,7 @@
  Comment[te]=HTML సహాయ పత్రం
  Comment[tg]=Ҳуҷҷати Ёрмандии HTML
@@ -720,8 +720,8 @@
  Comment[vi]=Tài liệu trợ giúp HTML
 Index: mimetypes/application/x-mplayer2.desktop
 ===================================================================
---- mimetypes/application/x-mplayer2.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/x-mplayer2.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/x-mplayer2.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/x-mplayer2.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -52,6 +52,7 @@
  Comment[te]=మైక్రొసాఫ్ట్ మీడియా వీడియో
  Comment[tg]=Андозаи Майкрософт Медиа
@@ -732,8 +732,8 @@
  Comment[zh_CN]=Microsoft 媒体格式
 Index: mimetypes/application/vnd.sun.xml.base.desktop
 ===================================================================
---- mimetypes/application/vnd.sun.xml.base.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/vnd.sun.xml.base.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/vnd.sun.xml.base.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/vnd.sun.xml.base.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -37,7 +37,7 @@
  Comment[ms]=Pangkalan Data OpenOffice.org
  Comment[nb]=OpenOffice.org database
@@ -745,8 +745,8 @@
  Comment[pa]=OpenOffice.org ਡਾਟਾਬੇਸ
 Index: mimetypes/application/x-tbz.desktop
 ===================================================================
---- mimetypes/application/x-tbz.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/x-tbz.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/x-tbz.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/x-tbz.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -55,6 +55,7 @@
  Comment[te]=బిజిప్ చేయబడిన టార్ ఆర్కైవ్
  Comment[tg]=Архиви Tar Bzip2-карда шуд
@@ -757,8 +757,8 @@
  Comment[vi]=Bản Tar đã nén Bzip
 Index: mimetypes/application/vnd.sun.xml.writer.master.desktop
 ===================================================================
---- mimetypes/application/vnd.sun.xml.writer.master.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/vnd.sun.xml.writer.master.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/vnd.sun.xml.writer.master.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/vnd.sun.xml.writer.master.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -40,7 +40,7 @@
  Comment[ms]=OpenOffice.org Dokumen Teks Utama
  Comment[nb]=OpenOffice.org-hovedtekstdokument
@@ -770,8 +770,8 @@
  Comment[pa]=OpenOffice.org ਮਾਸਟਰ ਪਾਠ ਦਸਤਾਵੇਜ਼
 Index: mimetypes/application/vnd.sun.xml.calc.template.desktop
 ===================================================================
---- mimetypes/application/vnd.sun.xml.calc.template.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/vnd.sun.xml.calc.template.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/vnd.sun.xml.calc.template.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/vnd.sun.xml.calc.template.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -42,7 +42,7 @@
  Comment[ms]=OpenOffice.org Templat Lembaran Kerja
  Comment[nb]=OpenOffice.org-regnearkmal
@@ -783,8 +783,8 @@
  Comment[pa]=OpenOffice.org ਸਾਰਣੀਕਾਰ ਨਮੂਨਾ
 Index: mimetypes/application/xml-dtd.desktop
 ===================================================================
---- mimetypes/application/xml-dtd.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/xml-dtd.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/xml-dtd.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/xml-dtd.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -56,6 +56,7 @@
  Comment[te]=XML డిటిడి పత్రం
  Comment[tg]=Ҳуҷҷати XML DTD
@@ -795,8 +795,8 @@
  Comment[vi]=Tài liệu DTD XML
 Index: mimetypes/application/vnd.sun.xml.writer.template.desktop
 ===================================================================
---- mimetypes/application/vnd.sun.xml.writer.template.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/vnd.sun.xml.writer.template.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/vnd.sun.xml.writer.template.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/vnd.sun.xml.writer.template.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -42,7 +42,7 @@
  Comment[ms]=OpenOffice.org Templat Dokumen Teks
  Comment[nb]=OpenOffice.org-tekstdokumentmal
@@ -808,8 +808,8 @@
  Comment[pa]=OpenOffice.org ਪਾਠ ਦਸਤਾਵੇਜ਼ ਨਮੂਨਾ
 Index: mimetypes/application/x-designer.desktop
 ===================================================================
---- mimetypes/application/x-designer.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/x-designer.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/x-designer.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/x-designer.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -69,7 +69,7 @@
  Comment[te]=క్యుటి డిజైనర్ దస్త్రం
  Comment[tg]=Файли Qt Designer
@@ -821,8 +821,8 @@
  Comment[uz]=Qt Designer-файли
 Index: mimetypes/application/vnd.sun.xml.writer.desktop
 ===================================================================
---- mimetypes/application/vnd.sun.xml.writer.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/vnd.sun.xml.writer.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/vnd.sun.xml.writer.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/vnd.sun.xml.writer.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -45,7 +45,7 @@
  Comment[ms]=Dokumen Teks OpenOffice.org
  Comment[nb]=OpenOffice.org tekstdokument
@@ -834,8 +834,8 @@
  Comment[pa]=OpenOffice.org ਪਾਠ ਦਸਤਾਵੇਜ਼
 Index: mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop
 ===================================================================
---- mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -42,7 +42,7 @@
  Comment[lv]=OASIS OpenDocument grafikas šablons
  Comment[mk]=OASIS OpenDocument-образец за графика
@@ -847,8 +847,8 @@
  Comment[nl]=OASIS OpenDocument illustratiesjabloon
 Index: mimetypes/application/vnd.sun.xml.impress.template.desktop
 ===================================================================
---- mimetypes/application/vnd.sun.xml.impress.template.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/vnd.sun.xml.impress.template.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/vnd.sun.xml.impress.template.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/vnd.sun.xml.impress.template.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -42,7 +42,7 @@
  Comment[ms]=OpenOffice.org Templat Persembahan
  Comment[nb]=OpenOffice.org-presentasjonsmal
@@ -860,8 +860,8 @@
  Comment[pa]=OpenOffice.org ਪੇਸ਼ਕਾਰੀ ਨਮੂਨਾ
 Index: mimetypes/application/Makefile.am
 ===================================================================
---- mimetypes/application/Makefile.am	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/Makefile.am	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/Makefile.am	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/Makefile.am	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -3,7 +3,7 @@
  	x-tex-gf.desktop x-gzip.desktop x-pak.desktop \
  	x-object.desktop x-tex-pk.desktop pdf.desktop \
@@ -873,8 +873,8 @@
  	x-gzpostscript.desktop postscript.desktop octet-stream.desktop \
 Index: mimetypes/application/vnd.stardivision.impress.desktop
 ===================================================================
---- mimetypes/application/vnd.stardivision.impress.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/vnd.stardivision.impress.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/vnd.stardivision.impress.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/vnd.stardivision.impress.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -48,7 +48,7 @@
  Comment[ms]=Persembahan StarOffice Impress
  Comment[nb]=StarOffice Impress presentasjon
@@ -886,8 +886,8 @@
  Comment[pa]=ਸਟਾਰਆਫਿਸ Impress ਪੇਸ਼ਕਾਰ
 Index: mimetypes/application/x-sqlite2.desktop
 ===================================================================
---- mimetypes/application/x-sqlite2.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/x-sqlite2.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/x-sqlite2.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/x-sqlite2.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -60,6 +60,7 @@
  Comment[te]=ఎస్క్యూఎల్ ఐట్౨ డెటాబేస్ దస్త్రం
  Comment[tg]=Файли Базаи Маълумотии SQLite2
@@ -898,8 +898,8 @@
  Comment[vi]=Tập tin cơ sở dữ liệu SQLite2
 Index: mimetypes/application/x-sqlite3.desktop
 ===================================================================
---- mimetypes/application/x-sqlite3.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/x-sqlite3.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/x-sqlite3.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/x-sqlite3.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -60,6 +60,7 @@
  Comment[te]=ఎస్క్యూఎల్ ఐట్౩ డెటాబేస్ దస్త్రం
  Comment[tg]=Файли Базаи Маълумотии SQLite3
@@ -910,8 +910,8 @@
  Comment[vi]=Tập tin cơ sở dữ liệu SQLite3
 Index: mimetypes/application/fits.desktop
 ===================================================================
---- mimetypes/application/fits.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/fits.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/fits.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/fits.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -53,6 +53,7 @@
  Comment[te]=FITS దత్తాంసం
  Comment[tg]=Маълумоти FITS
@@ -922,8 +922,8 @@
  Comment[vi]=Dữ liệu FITS
 Index: mimetypes/application/vnd.sun.xml.impress.desktop
 ===================================================================
---- mimetypes/application/vnd.sun.xml.impress.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/vnd.sun.xml.impress.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/vnd.sun.xml.impress.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/vnd.sun.xml.impress.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -45,7 +45,7 @@
  Comment[ms]=Persembahan OpenOffice.org
  Comment[nb]=OpenOffice.org presentasjon
@@ -935,8 +935,8 @@
  Comment[pl]=Prezentacja OpenOffice.org
 Index: mimetypes/application/vnd.oasis.opendocument.graphics.desktop
 ===================================================================
---- mimetypes/application/vnd.oasis.opendocument.graphics.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/vnd.oasis.opendocument.graphics.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/vnd.oasis.opendocument.graphics.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/vnd.oasis.opendocument.graphics.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -42,7 +42,7 @@
  Comment[lv]=OASIS OpenDocument grafika
  Comment[mk]=OASIS OpenDocument-графика
@@ -948,8 +948,8 @@
  Comment[nl]=OASIS OpenDocument illustraties
 Index: mimetypes/application/vnd.stardivision.writer-global.desktop
 ===================================================================
---- mimetypes/application/vnd.stardivision.writer-global.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/vnd.stardivision.writer-global.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/vnd.stardivision.writer-global.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/vnd.stardivision.writer-global.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -43,7 +43,7 @@
  Comment[lt]=StarOffice Writer „master“ dokumentas
  Comment[mk]=StarOffice Writer-главен документ
@@ -961,8 +961,8 @@
  Comment[nl]=StarOffice Writer-hoofddocument
 Index: mimetypes/application/x-applixgraphics.desktop
 ===================================================================
---- mimetypes/application/x-applixgraphics.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/x-applixgraphics.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/x-applixgraphics.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/x-applixgraphics.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -48,7 +48,7 @@
  Comment[mn]=Applix-Graphik-Баримт
  Comment[ms]=Dokumen Grafik Applix
@@ -974,8 +974,8 @@
  Comment[nl]=Applix Graphics-document
 Index: mimetypes/application/vnd.sun.xml.draw.desktop
 ===================================================================
---- mimetypes/application/vnd.sun.xml.draw.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/vnd.sun.xml.draw.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/vnd.sun.xml.draw.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/vnd.sun.xml.draw.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -44,7 +44,7 @@
  Comment[ms]=OpenOffice.org Lukis
  Comment[nb]=OpenOffice.org tegning
@@ -987,8 +987,8 @@
  Comment[pl]=Rysunek OpenOffice.org
 Index: mimetypes/application/vnd.sun.xml.draw.template.desktop
 ===================================================================
---- mimetypes/application/vnd.sun.xml.draw.template.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/vnd.sun.xml.draw.template.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/vnd.sun.xml.draw.template.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/vnd.sun.xml.draw.template.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -42,7 +42,7 @@
  Comment[ms]=OpenOffice.org Templat Lukis
  Comment[nb]=OpenOffice.org-tegnemal
@@ -1000,8 +1000,8 @@
  Comment[pa]=OpenOffice.org ਡਰਾਇੰਗ ਨਮੂਨਾ
 Index: mimetypes/application/mbox.desktop
 ===================================================================
---- mimetypes/application/mbox.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 699343)
-+++ mimetypes/application/mbox.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 699343)
+--- mimetypes/application/mbox.desktop	(.../tags/KDE/3.5.7/kdelibs)	(wersja 700476)
++++ mimetypes/application/mbox.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 700476)
 @@ -58,6 +58,7 @@
  Comment[te]=MBOX తపాలా ఫోల్డర్
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.61&r2=1.62&f=u
    http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.61&r2=1.62&f=u

