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

Tue, 28 Nov 2006 01:51:44 -0800 

Author: arekm                        Date: Tue Nov 28 09:51:03 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up

---- Files affected:
SOURCES:
   kdelibs-branch.diff (1.44 -> 1.45) , kdebase-branch.diff (1.46 -> 1.47) , 
kdepim-branch.diff (1.32 -> 1.33) , kdenetwork-branch.diff (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.44 SOURCES/kdelibs-branch.diff:1.45
--- SOURCES/kdelibs-branch.diff:1.44    Sat Nov 25 01:26:48 2006
+++ SOURCES/kdelibs-branch.diff Tue Nov 28 10:50:57 2006
@@ -1,7 +1,20 @@
+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)
+@@ -15,7 +15,7 @@
+ Name[es]=Ejecutor de script para intĂŠrprete de comandos de bash
+ Name[et]=Bash shelli skripti käivitaja
+ Name[eu]=Bash shell script-aren abiarazlea
+-Name[fa]=اجرا کنندۀ دست‌نوشتۀ پوستۀ bash
++Name[fa]=اجراکنندۀ دست‌نوشتۀ پوستۀ bash
+ Name[fi]=Komentotulkkiohjelmien käynnistäjä
+ Name[fr]=Lanceur de scripts shell Bash
+ Name[fy]=Bash Flues Skript Rinner
 Index: interfaces/kscript/scriptinterface.desktop
 ===================================================================
---- interfaces/kscript/scriptinterface.desktop (.../tags/KDE/3.5.5/kdelibs)    
(revision 607536)
-+++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs)  
(revision 607536)
+--- interfaces/kscript/scriptinterface.desktop (.../tags/KDE/3.5.5/kdelibs)    
(revision 608741)
++++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs)  
(revision 608741)
 @@ -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 +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 607536)
-+++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop 
(.../branches/KDE/3.5/kdelibs)  (revision 607536)
+--- 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)
 @@ -28,6 +28,7 @@
  Comment[hr]=Trenutne poruke s DCOP sučeljem
  Comment[hsb]=Instant Messenger z DCOP-interfejsom
@@ -33,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 607536)
-+++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop 
(.../branches/KDE/3.5/kdelibs)  (revision 607536)
+--- 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)
 @@ -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 +67,8 @@
  
Comment[ja]=インスタントメッセンジャーは個人とグループとの双方向チャットを可能にします。
 Index: interfaces/kspeech/kspeech.h
 ===================================================================
---- interfaces/kspeech/kspeech.h       (.../tags/KDE/3.5.5/kdelibs)    
(revision 607536)
-+++ interfaces/kspeech/kspeech.h       (.../branches/KDE/3.5/kdelibs)  
(revision 607536)
+--- interfaces/kspeech/kspeech.h       (.../tags/KDE/3.5.5/kdelibs)    
(revision 608741)
++++ interfaces/kspeech/kspeech.h       (.../branches/KDE/3.5/kdelibs)  
(revision 608741)
 @@ -371,10 +371,11 @@
   *
   * A Talker Code consists of a series of XML tags and attributes.
@@ -71,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 607536)
-+++ interfaces/kspeech/dcoptexttospeech.desktop        
(.../branches/KDE/3.5/kdelibs)  (revision 607536)
+--- interfaces/kspeech/dcoptexttospeech.desktop        
(.../tags/KDE/3.5.5/kdelibs)    (revision 608741)
++++ interfaces/kspeech/dcoptexttospeech.desktop        
(.../branches/KDE/3.5/kdelibs)  (revision 608741)
 @@ -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 +96,17 @@
  Comment[ja]=DCOP 
インターフェースで動作するテキスト読み上げサービス
 Index: interfaces/ktexteditor/ktexteditoreditor.desktop
 ===================================================================
---- interfaces/ktexteditor/ktexteditoreditor.desktop   
(.../tags/KDE/3.5.5/kdelibs)    (revision 607536)
-+++ interfaces/ktexteditor/ktexteditoreditor.desktop   
(.../branches/KDE/3.5/kdelibs)  (revision 607536)
+--- interfaces/ktexteditor/ktexteditoreditor.desktop   
(.../tags/KDE/3.5.5/kdelibs)    (revision 608741)
++++ interfaces/ktexteditor/ktexteditoreditor.desktop   
(.../branches/KDE/3.5/kdelibs)  (revision 608741)
+@@ -20,7 +20,7 @@
+ Comment[es]=Componente incrustable de editor de textos (sin separaciĂłn 
Doc/Vista)
+ Comment[et]=PĂľimitav tekstiredaktori komponent
+ Comment[eu]=Testu-editorearen kapsulatutako osagaia (Dok/Ikusi bereizketarik 
gabe)
+-Comment[fa]=مولفۀ ویرایشگرمتن نهفته ) بدون 
سند/نمای مجزا(
++Comment[fa]=مولفۀ ویرایشگر متن نهفته ) بدون 
سند/نمای مجزا(
+ Comment[fi]=Upotettava tekstimuokkauskomponentti (ilman 
Asiakirja/Näkymä-jakoa)
+ Comment[fr]=Composant d'ĂŠdition de texte intĂŠgrable (sans sĂŠparation 
doc / vue)
+ Comment[fy]=Yn te sluten tekstbewurkerkomponint (sĂťnder skieding fan 
tekst/werjefte)
 @@ -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 +117,17 @@
  
Comment[ja]=埋め込み可能なテキストエディタコンポーネント 
(Doc/View 分離なし)
 Index: interfaces/ktexteditor/kcm_ktexteditor.desktop
 ===================================================================
---- 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)
+--- 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)
+@@ -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.
+ Comment[eu]=Testu-editorearen zerbitzuak testu-ikustailea eta editorea duten 
aplikazioak eskaintzen ditu. Testuak editatzeko aukera ematen duten KDE 
aplikazioek erabili beharko lukete zerbitzu hau.
+-Comment[fa]=خدمت ویرایشگر متن، کاربردهایی را 
توسط یک مشاهده‌گر و ویرایشگر متن، فراهم 
می‌کند. کاربردهای KDE که امکانات ویرایش متن 
را فراهم می‌کنند باید از این خدمت استفاده 
نمایند. 
++Comment[fa]=خدمت ویرایشگر متن، کاربردهایی را 
توسط یک مشاهده‌گر و ویرایشگر متن، فراهم 
می‌کند. کاربردهای KDE که امکانات ویرایش متن 
را فراهم می‌کنند باید از این \ خدمت استفاده 
نمایند. 
+ Comment[fi]=Tekstieditoripalvelu tarjoaa sovelluksille tekstinäyttäjän- ja 
muokkaimen. KDE-sovelluksien, jotka tarjoavat tekstinmuokkauspalveluita, tulisi 
käyttää tätä palvelua.
+ Comment[fo]=TekstritiltĂŚnastuni gera forrit Ăşt viĂ° ein tekstvĂ­sari og 
-ritil. KDE-forrit ið geva nýtarin møguleiki fyri at rÌtta tekst eiga at 
nýta hesa tÌnasta.
+ Comment[fr]=Le service d'ĂŠdition de texte fournit des applications 
comportant un afficheur de texte et un ĂŠditeur. Les applications KDE qui 
fournissent des fonctions d'ĂŠdition de texte devraient utiliser ce service.
 @@ -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 +138,17 @@
  
Comment[ja]=テキストエディタサービスはアプリケーションにテキストビューアとテキストエディタを提供します。テキスト編集の機能を持つ
 KDEアプリケーションはこれを使用します。
 Index: interfaces/ktexteditor/ktexteditor.desktop
 ===================================================================
---- interfaces/ktexteditor/ktexteditor.desktop (.../tags/KDE/3.5.5/kdelibs)    
(revision 607536)
-+++ interfaces/ktexteditor/ktexteditor.desktop (.../branches/KDE/3.5/kdelibs)  
(revision 607536)
+--- interfaces/ktexteditor/ktexteditor.desktop (.../tags/KDE/3.5.5/kdelibs)    
(revision 608741)
++++ interfaces/ktexteditor/ktexteditor.desktop (.../branches/KDE/3.5/kdelibs)  
(revision 608741)
+@@ -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)
+ Comment[eu]=Testu-editorearen kapsulatutako osagaia (Dok/Ikusi 
bereizketarekin)
+-Comment[fa]=مولفۀ ویرایشگر متن نهفته )با سند/ 
نمای مجزا(
++Comment[fa]=مولفۀ ویرایشگر متن نهفته )با 
سند/نمای مجزا(
+ Comment[fi]=Upotettava tekstimuokkauskomponentti (Asiakirja/Näkymä-jaolla)
+ Comment[fr]=Composant d'ĂŠdition de texte intĂŠgrable (avec sĂŠparation 
doc / vue)
+ Comment[fy]=Yn te sluten tekstbewurkerkomponint (mei skieding fan 
tekst/werjefte)
 @@ -31,6 +31,7 @@
  Comment[hr]=Ugradiva komponenta obrade teksta (s Doc/View razdvajanjem)
  Comment[hsb]=Komponenta za integrowane wobdźěłanje teksta
@@ -119,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 607536)
-+++ interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp    
(.../branches/KDE/3.5/kdelibs)  (revision 607536)
+--- 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)
 @@ -21,8 +21,10 @@
  {
  protected:
@@ -135,8 +175,8 @@
  };
 Index: kmdi/kmdi/mainwindow.h
 ===================================================================
---- kmdi/kmdi/mainwindow.h     (.../tags/KDE/3.5.5/kdelibs)    (revision 
607536)
-+++ kmdi/kmdi/mainwindow.h     (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- kmdi/kmdi/mainwindow.h     (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ kmdi/kmdi/mainwindow.h     (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -107,6 +107,10 @@
       * as toplevel and stay-on-top on the application's main widget.
       * @param pWnd widget for the toolview
@@ -150,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 
607536)
-+++ kmdi/kmdi/dockcontainer.h  (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- kmdi/kmdi/dockcontainer.h  (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ kmdi/kmdi/dockcontainer.h  (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -50,7 +50,7 @@
      /**
       * Add a widget to this container.
@@ -172,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 607536)
-+++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop       
(.../branches/KDE/3.5/kdelibs)  (revision 607536)
+--- 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)
 @@ -27,6 +27,7 @@
  Name[hi]=के-टेक्स्ट-एडिटर 
के-डाटा-टूल प्लगइन
  Name[hr]=KTextEditor dodatak za KDataTool
@@ -192,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 607536)
-+++ kate/plugins/insertfile/ktexteditor_insertfile.desktop     
(.../branches/KDE/3.5/kdelibs)  (revision 607536)
+--- 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)
 @@ -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 +244,8 @@
  
Comment[ja]=カーソル位置に読み込み可能なファイルを挿入します
 Index: kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
 ===================================================================
---- 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)
+--- 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)
 @@ -23,6 +23,7 @@
  Name[hi]=के-टेक्स्ट-एडिटर 
ऑटोबुकमार्कर
  Name[hr]=KTextEditor automatske oznake
@@ -227,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 607536)
-+++ kate/plugins/autobookmarker/autobookmarker.cpp     
(.../branches/KDE/3.5/kdelibs)  (revision 607536)
+--- 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)
 @@ -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 +288,8 @@
  //END
 Index: kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
 ===================================================================
---- 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)
+--- 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)
 @@ -23,6 +23,7 @@
  Name[hr]=KTextEditor dodatak za dopunjavanje riječi
  Name[hsb]=KTextEditor Plugin za wudospołnjenje słowow
@@ -277,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 607536)
-+++ kate/plugins/isearch/ktexteditor_isearch.desktop   
(.../branches/KDE/3.5/kdelibs)  (revision 607536)
+--- 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)
 @@ -27,6 +27,7 @@
  Name[hr]=KTextEditor dodatak za traĹženje u koracima
  Name[hsb]=KTextEditor Plugin za inkrementelne pytanje
@@ -287,6 +327,15 @@
  Name[is]=KTextEditor Ăžrepaleitar-Ă­forrit
  Name[it]=Plugin ricerca incrementale di KTextEditor
  Name[ja]=KTextEditor インクリメンタル検索プラグイン
+@@ -85,7 +86,7 @@
+ Comment[es]=TambiĂŠn conocido como "BĂşsqueda mientras teclea"
+ Comment[et]=Tuntud ka kui "otsimine vastavalt kirjutamisele"
+ Comment[eu]="Idaztean bilatu" bezala ere ezaguna
+-Comment[fa]=همچنین شناخته شده به عنوان »وقتی که 
جستجو راتحریرمی‌کنید«
++Comment[fa]=همچنین شناخته شده به عنوان »وقتی که 
جستجو را تحریر می‌کنید«
+ Comment[fi]=Tunnetaan myÜs nimellä "Hae kun kirjoitat"
+ Comment[fr]=Aussi connu comme  Recherche pendant la saisie 
+ Comment[fy]=Ek bekend as"Ăťnder it typen sykje"
 @@ -96,6 +97,7 @@
  Comment[hr]=Poznat i kao "As you type search"
  Comment[hsb]=Tež znate jako "pytanje při zapodawanju"
@@ -297,8 +346,8 @@
  
Comment[ja]="打ったものそのまま検索"としても知られています
 Index: kate/part/katecodecompletion.cpp
 ===================================================================
---- kate/part/katecodecompletion.cpp   (.../tags/KDE/3.5.5/kdelibs)    
(revision 607536)
-+++ kate/part/katecodecompletion.cpp   (.../branches/KDE/3.5/kdelibs)  
(revision 607536)
+--- kate/part/katecodecompletion.cpp   (.../tags/KDE/3.5.5/kdelibs)    
(revision 608741)
++++ kate/part/katecodecompletion.cpp   (.../branches/KDE/3.5/kdelibs)  
(revision 608741)
 @@ -56,7 +56,6 @@
    public:
      /**
@@ -309,8 +358,8 @@
      {
 Index: kate/part/katefactory.h
 ===================================================================
---- kate/part/katefactory.h    (.../tags/KDE/3.5.5/kdelibs)    (revision 
607536)
-+++ kate/part/katefactory.h    (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- kate/part/katefactory.h    (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ kate/part/katefactory.h    (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -75,6 +75,7 @@
       * @param widgetName widget name
       * @param parent QObject parent
@@ -321,8 +370,8 @@
       */
 Index: kate/part/katefiletype.cpp
 ===================================================================
---- kate/part/katefiletype.cpp (.../tags/KDE/3.5.5/kdelibs)    (revision 
607536)
-+++ kate/part/katefiletype.cpp (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- kate/part/katefiletype.cpp (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ kate/part/katefiletype.cpp (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -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 +391,8 @@
  //END KateFileTypeConfigTab
 Index: kate/part/katejscript.cpp
 ===================================================================
---- kate/part/katejscript.cpp  (.../tags/KDE/3.5.5/kdelibs)    (revision 
607536)
-+++ kate/part/katejscript.cpp  (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- kate/part/katejscript.cpp  (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ kate/part/katejscript.cpp  (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -99,7 +99,7 @@
  {
    switch (id) {
@@ -382,8 +431,8 @@
  
 Index: kate/part/kateview.h
 ===================================================================
---- kate/part/kateview.h       (.../tags/KDE/3.5.5/kdelibs)    (revision 
607536)
-+++ kate/part/kateview.h       (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- kate/part/kateview.h       (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ kate/part/kateview.h       (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -286,8 +286,8 @@
          { return getDoc()->textLine( cursorLine() ); }
      QString currentWord()
@@ -405,8 +454,8 @@
      void findPrev()               { findAgain( true );           }
 Index: kate/part/katedocument.h
 ===================================================================
---- kate/part/katedocument.h   (.../tags/KDE/3.5.5/kdelibs)    (revision 
607536)
-+++ kate/part/katedocument.h   (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- kate/part/katedocument.h   (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ kate/part/katedocument.h   (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -264,6 +264,7 @@
       * @p removeLine is true, @p length is ignored (eg not needed).
       * @param line line number
@@ -426,8 +475,8 @@
  
 Index: kate/part/katedocument.cpp
 ===================================================================
---- kate/part/katedocument.cpp (.../tags/KDE/3.5.5/kdelibs)    (revision 
607536)
-+++ kate/part/katedocument.cpp (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- kate/part/katedocument.cpp (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ kate/part/katedocument.cpp (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -3671,10 +3671,7 @@
      removeText (sl, sc, sl, sc + startCommentLen);
  
@@ -472,8 +521,8 @@
        // STRING SETTINGS
 Index: kate/part/kateautoindent.h
 ===================================================================
---- kate/part/kateautoindent.h (.../tags/KDE/3.5.5/kdelibs)    (revision 
607536)
-+++ kate/part/kateautoindent.h (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- kate/part/kateautoindent.h (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ kate/part/kateautoindent.h (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -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
@@ -531,8 +580,8 @@
      virtual void processLine (KateDocCursor &line);
 Index: kate/part/kateviewhelpers.cpp
 ===================================================================
---- kate/part/kateviewhelpers.cpp      (.../tags/KDE/3.5.5/kdelibs)    
(revision 607536)
-+++ kate/part/kateviewhelpers.cpp      (.../branches/KDE/3.5/kdelibs)  
(revision 607536)
+--- kate/part/kateviewhelpers.cpp      (.../tags/KDE/3.5.5/kdelibs)    
(revision 608741)
++++ kate/part/kateviewhelpers.cpp      (.../branches/KDE/3.5/kdelibs)  
(revision 608741)
 @@ -277,7 +277,7 @@
    public:
      KateCmdLineFlagCompletion() {;}
@@ -544,8 +593,8 @@
      }
 Index: kate/part/katefactory.cpp
 ===================================================================
---- kate/part/katefactory.cpp  (.../tags/KDE/3.5.5/kdelibs)    (revision 
607536)
-+++ kate/part/katefactory.cpp  (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- kate/part/katefactory.cpp  (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ kate/part/katefactory.cpp  (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -52,6 +52,7 @@
       * @param widgetName widget name
       * @param parent QObject parent
@@ -556,8 +605,8 @@
       */
 Index: kate/part/katesearch.h
 ===================================================================
---- kate/part/katesearch.h     (.../tags/KDE/3.5.5/kdelibs)    (revision 
607536)
-+++ kate/part/katesearch.h     (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- kate/part/katesearch.h     (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ kate/part/katesearch.h     (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -223,7 +223,7 @@
      bool help(class Kate::View *, const QString &, QString &);
      QStringList cmds();
@@ -569,8 +618,8 @@
      /**
 Index: kate/part/kateautoindent.cpp
 ===================================================================
---- kate/part/kateautoindent.cpp       (.../tags/KDE/3.5.5/kdelibs)    
(revision 607536)
-+++ kate/part/kateautoindent.cpp       (.../branches/KDE/3.5/kdelibs)  
(revision 607536)
+--- kate/part/kateautoindent.cpp       (.../tags/KDE/3.5.5/kdelibs)    
(revision 608741)
++++ kate/part/kateautoindent.cpp       (.../branches/KDE/3.5/kdelibs)  
(revision 608741)
 @@ -215,6 +215,8 @@
    normalAttrib = 255;
    extensionAttrib = 255;
@@ -732,8 +781,8 @@
    if (!found)
 Index: kate/part/katedialogs.cpp
 ===================================================================
---- kate/part/katedialogs.cpp  (.../tags/KDE/3.5.5/kdelibs)    (revision 
607536)
-+++ kate/part/katedialogs.cpp  (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- kate/part/katedialogs.cpp  (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ kate/part/katedialogs.cpp  (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -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() );
@@ -754,8 +803,8 @@
  //END KateHlConfigPage
 Index: kate/scripts/jstest.desktop
 ===================================================================
---- kate/scripts/jstest.desktop        (.../tags/KDE/3.5.5/kdelibs)    
(revision 607536)
-+++ kate/scripts/jstest.desktop        (.../branches/KDE/3.5/kdelibs)  
(revision 607536)
+--- kate/scripts/jstest.desktop        (.../tags/KDE/3.5.5/kdelibs)    
(revision 608741)
++++ kate/scripts/jstest.desktop        (.../branches/KDE/3.5/kdelibs)  
(revision 608741)
 @@ -9,7 +9,7 @@
  Name[es]=Prueba JavaScript de Kate Part
  Name[et]=Kate komponendi JavaScripti test
@@ -783,8 +832,8 @@
  Comment[ja]=kate part 
のスクリプトをテストするためのスクリプト
 Index: kate/data/css.xml
 ===================================================================
---- kate/data/css.xml  (.../tags/KDE/3.5.5/kdelibs)    (revision 607536)
-+++ kate/data/css.xml  (.../branches/KDE/3.5/kdelibs)  (revision 607536)
+--- kate/data/css.xml  (.../tags/KDE/3.5.5/kdelibs)    (revision 608741)
++++ kate/data/css.xml  (.../branches/KDE/3.5/kdelibs)  (revision 608741)
 @@ -1,6 +1,6 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE language SYSTEM "language.dtd">
@@ -815,8 +864,8 @@
      <contexts>
 Index: kate/data/Makefile.am
 ===================================================================
---- kate/data/Makefile.am      (.../tags/KDE/3.5.5/kdelibs)    (revision 
607536)
-+++ kate/data/Makefile.am      (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- kate/data/Makefile.am      (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ kate/data/Makefile.am      (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -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 \
@@ -829,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 
607536)
++++ kate/data/actionscript.xml (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -0,0 +1,334 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE language SYSTEM "language.dtd">
@@ -1167,8 +1216,8 @@
 +</language>
 Index: kate/data/php.xml
 ===================================================================
---- kate/data/php.xml  (.../tags/KDE/3.5.5/kdelibs)    (revision 607536)
-+++ kate/data/php.xml  (.../branches/KDE/3.5/kdelibs)  (revision 607536)
+--- kate/data/php.xml  (.../tags/KDE/3.5.5/kdelibs)    (revision 608741)
++++ kate/data/php.xml  (.../branches/KDE/3.5/kdelibs)  (revision 608741)
 @@ -1,12 +1,24 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <!--
@@ -1251,10 +1300,35 @@
        <itemData name="Decimal" defStyleNum="dsDecVal" />
        <itemData name="Octal" defStyleNum="dsBaseN" />
        <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)
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="Java" version="1.15" kateversion="2.4" section="Sources" 
extensions="*.java" mimetype="text/x-java" license="LGPL" author="Alfredo Luiz 
Foltran Fialho ([EMAIL PROTECTED])">
++<language name="Java" version="1.16" kateversion="2.4" section="Sources" 
extensions="*.java" mimetype="text/x-java" license="LGPL" author="Alfredo Luiz 
Foltran Fialho ([EMAIL PROTECTED])">
+       <highlighting>
+               <list name="java15">
+                       <item> ACTIVE </item>
+@@ -3388,10 +3388,10 @@
+                               <RegExpr attribute="Function" context="#pop" 
String="\b[_a-zA-Z]\w*(?=[\s]*)" />
+                       </context>
+                       <context attribute="Normal Text" lineEndContext="#pop" 
name="StaticImports">
+-                              <RegExpr attribute="StaticImports" 
context="#pop" String="\s*.*$" />
++                              <RegExpr attribute="StaticImports" 
context="#pop" String="\s*.*;" />
+                       </context>
+                       <context attribute="Normal Text" lineEndContext="#pop" 
name="Imports">
+-                              <RegExpr attribute="Imports" context="#pop" 
String="\s*.*$" />
++                              <RegExpr attribute="Imports" context="#pop" 
String="\s*.*;" />
+                       </context>
+                       <context attribute="Comment" lineEndContext="#pop" 
name="Commentar 1"/>
+                       <context attribute="Comment" lineEndContext="#stay" 
name="Commentar 2">
 Index: kab/qconfigDB.h
 ===================================================================
---- kab/qconfigDB.h    (.../tags/KDE/3.5.5/kdelibs)    (revision 607536)
-+++ kab/qconfigDB.h    (.../branches/KDE/3.5/kdelibs)  (revision 607536)
+--- kab/qconfigDB.h    (.../tags/KDE/3.5.5/kdelibs)    (revision 608741)
++++ kab/qconfigDB.h    (.../branches/KDE/3.5/kdelibs)  (revision 608741)
 @@ -199,7 +199,7 @@
    bool save(QTextStream& file, int count); 
    /**
@@ -1374,8 +1448,8 @@
     */
 Index: kab/addressbook.h
 ===================================================================
---- kab/addressbook.h  (.../tags/KDE/3.5.5/kdelibs)    (revision 607536)
-+++ kab/addressbook.h  (.../branches/KDE/3.5/kdelibs)  (revision 607536)
+--- kab/addressbook.h  (.../tags/KDE/3.5.5/kdelibs)    (revision 608741)
++++ kab/addressbook.h  (.../branches/KDE/3.5/kdelibs)  (revision 608741)
 @@ -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
@@ -1478,8 +1552,8 @@
     **/
 Index: kab/kabapi.h
 ===================================================================
---- kab/kabapi.h       (.../tags/KDE/3.5.5/kdelibs)    (revision 607536)
-+++ kab/kabapi.h       (.../branches/KDE/3.5/kdelibs)  (revision 607536)
+--- kab/kabapi.h       (.../tags/KDE/3.5.5/kdelibs)    (revision 608741)
++++ kab/kabapi.h       (.../branches/KDE/3.5/kdelibs)  (revision 608741)
 @@ -77,6 +77,7 @@
     * without failures. Thus you have to call init before you can
     * use the database.
@@ -1497,10 +1571,23 @@
     * @param entries Reference to a list of entries where matches are stored.
     * @param max Maximum number of returned entries.
     * @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)
+@@ -45,7 +45,7 @@
+   <div id="footer_left">
+     Maintained by <a 
href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;groo&#116;&#64;kde&#46;or&#x67;">Adriaan
 de Groot</a>
+ and
+-<a 
href="&#109;a&#105;&#108;&#116;&#111;&#58;w&#105;nter&#116;&#64;kde&#46;or&#x67">Allen
 Winter</a>.
++<a 
href="&#109;a&#105;&#108;&#116;&#111;&#58;w&#105;nter&#64;kde&#46;or&#x67">Allen
 Winter</a>.
+ <br/>
+     KDE and K Desktop Environment are trademarks of <a 
href="http://www.kde.org/areas/kde-ev/"; title="Homepage of the KDE non-profit 
Organization">KDE e.V.</a> |
+     <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 
607536)
-+++ arts/kde/kplayobject.h     (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- arts/kde/kplayobject.h     (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ arts/kde/kplayobject.h     (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -37,7 +37,7 @@
  
        /**
@@ -1512,8 +1599,8 @@
        
 Index: arts/knotify/knotify.cpp
 ===================================================================
---- arts/knotify/knotify.cpp   (.../tags/KDE/3.5.5/kdelibs)    (revision 
607536)
-+++ arts/knotify/knotify.cpp   (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- arts/knotify/knotify.cpp   (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ arts/knotify/knotify.cpp   (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -26,24 +26,29 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -1725,8 +1812,8 @@
  void KNotify::sessionReady()
 Index: arts/knotify/Makefile.am
 ===================================================================
---- arts/knotify/Makefile.am   (.../tags/KDE/3.5.5/kdelibs)    (revision 
607536)
-+++ arts/knotify/Makefile.am   (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- arts/knotify/Makefile.am   (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ arts/knotify/Makefile.am   (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -6,7 +6,9 @@
  kde_module_LTLIBRARIES = knotify.la
  
@@ -1739,8 +1826,8 @@
  
 Index: arts/knotify/knotify.h
 ===================================================================
---- arts/knotify/knotify.h     (.../tags/KDE/3.5.5/kdelibs)    (revision 
607536)
-+++ arts/knotify/knotify.h     (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- arts/knotify/knotify.h     (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ arts/knotify/knotify.h     (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -23,7 +23,6 @@
  #include <qobject.h>
  #include <knotifyclient.h>
@@ -1751,8 +1838,8 @@
  class KProcess;
 Index: arts/knotify/knotify.desktop
 ===================================================================
---- arts/knotify/knotify.desktop       (.../tags/KDE/3.5.5/kdelibs)    
(revision 607536)
-+++ arts/knotify/knotify.desktop       (.../branches/KDE/3.5/kdelibs)  
(revision 607536)
+--- arts/knotify/knotify.desktop       (.../tags/KDE/3.5.5/kdelibs)    
(revision 608741)
++++ arts/knotify/knotify.desktop       (.../branches/KDE/3.5/kdelibs)  
(revision 608741)
 @@ -68,7 +68,7 @@
  Comment[ms]=Daemon Pemberitahuan KDE
  Comment[mt]=Daemon tan-notifika KDE
@@ -1764,8 +1851,8 @@
  Comment[nso]=Daemon ya Tsebiso ya KDE
 Index: arts/Makefile.am
 ===================================================================
---- arts/Makefile.am   (.../tags/KDE/3.5.5/kdelibs)    (revision 607536)
-+++ arts/Makefile.am   (.../branches/KDE/3.5/kdelibs)  (revision 607536)
+--- arts/Makefile.am   (.../tags/KDE/3.5.5/kdelibs)    (revision 608741)
++++ arts/Makefile.am   (.../branches/KDE/3.5/kdelibs)  (revision 608741)
 @@ -1,4 +1,8 @@
 +if include_ARTS
  SUBDIRS = kde knotify message
@@ -1777,8 +1864,8 @@
  include ../admin/Doxyfile.am
 Index: arts/configure.in.in
 ===================================================================
---- arts/configure.in.in       (.../tags/KDE/3.5.5/kdelibs)    (revision 
607536)
-+++ arts/configure.in.in       (.../branches/KDE/3.5/kdelibs)  (revision 
607536)
+--- arts/configure.in.in       (.../tags/KDE/3.5.5/kdelibs)    (revision 
608741)
++++ arts/configure.in.in       (.../branches/KDE/3.5/kdelibs)  (revision 
608741)
 @@ -22,7 +22,6 @@
  ARTS_OK=no
  
@@ -1789,8 +1876,8 @@
  
<<Diff was trimmed, longer than 597 lines>>

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

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to