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

arekm arekm at pld-linux.org
Fri Jan 5 23:05:44 CET 2007


Author: arekm                        Date: Fri Jan  5 22:05:44 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kdelibs-branch.diff (1.46 -> 1.47) , kdebase-branch.diff (1.48 -> 1.49) , kdepim-branch.diff (1.34 -> 1.35) , kdenetwork-branch.diff (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.46 SOURCES/kdelibs-branch.diff:1.47
--- SOURCES/kdelibs-branch.diff:1.46	Sat Dec  2 23:21:17 2006
+++ SOURCES/kdelibs-branch.diff	Fri Jan  5 23:05:37 2007
@@ -1,7 +1,7 @@
 Index: interfaces/kscript/sample/shellscript.desktop
 ===================================================================
---- 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)
+--- interfaces/kscript/sample/shellscript.desktop	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ interfaces/kscript/sample/shellscript.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -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 609963)
-+++ interfaces/kscript/scriptinterface.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- interfaces/kscript/scriptinterface.desktop	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ interfaces/kscript/scriptinterface.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -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 609963)
-+++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -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 609963)
-+++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -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 609963)
-+++ interfaces/kspeech/kspeech.h	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- interfaces/kspeech/kspeech.h	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ interfaces/kspeech/kspeech.h	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -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 609963)
-+++ interfaces/kspeech/dcoptexttospeech.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- interfaces/kspeech/dcoptexttospeech.desktop	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ interfaces/kspeech/dcoptexttospeech.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -26,6 +26,7 @@
  Comment[hr]=Usluga tekst-u-govor s DCOP sučeljem.
  Comment[hsb]=konwertowanje teksta na rěč z DCOP-interfejsom
@@ -96,9 +96,16 @@
  Comment[ja]=DCOP ă‚¤ăƒłă‚żăƒźăƒ•ă‚§ăƒźă‚šă§ĺ‹•ä˝œă™ă‚‹ăƒ†ă‚­ă‚šăƒˆčŞ­ăżä¸Šă’ă‚ľăƒźăƒ“ă‚š
 Index: interfaces/ktexteditor/ktexteditoreditor.desktop
 ===================================================================
---- 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 @@
+--- interfaces/ktexteditor/ktexteditoreditor.desktop	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ interfaces/ktexteditor/ktexteditoreditor.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
+@@ -14,23 +14,24 @@
+ Comment[cs]=Pohltitelnå komponenta textovÊho editoru (bez oddělení Doc/View)
+ Comment[cy]=Cydran Golygydd Testun Mewnadeiladwy (heb Wahanu Dogfen/Golwg)
+ Comment[da]=Teksteditorkomponent som kan indlejres (uden dok./visning-adskillelse)
+-Comment[de]=Einbettungsfähige Editorkomponente (ohne Text/Ansicht-Aufteilung)
++Comment[de]=Einbettungsfähige Editorkomponente (ohne Text-/Ansicht-Aufteilung)
+ Comment[el]=Î•Î˝ĎƒĎ‰ÎźÎąĎ„ĎŽĎƒÎšÎźÎż ĎƒĎ„ÎżÎšĎ‡ÎľÎŻÎż ÎľĎ€ÎľÎžÎľĎÎłÎąĎƒĎ„ÎŽ κξΚΟένοĎ
 (χωρίς Î´ÎšÎąĎ‡Ď‰ĎÎšĎƒÎźĎŒ Doc/View)
+ Comment[eo]=Interna redaktilo (sen apartigo de dokumento kaj rigardo)
  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)
@@ -107,7 +114,11 @@
  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[ga]=ComhphĂĄirt eagarthĂłireacht tĂŠacs inleabaithe (gan deighilt idir cĂĄipĂŠis agus amharc)
+-Comment[gl]=CompoĂąente incrustĂĄbel de EdizĂłn de Texto (sen SeparazĂłn Doc/Vista)
++Comment[gl]=CompoĂąente incrustĂĄbel de EdiciĂłn de Texto (sen SeparaciĂłn Doc/Vista)
+ Comment[he]=רכיב עורך ×˜×§×Ą×˜ בר ×”×˜×‘×˘×” (בלי הפרדה בין מץמך ×œ×Ş×Ś×•×’×”)
+ Comment[hi]=ŕ¤
ŕ¤‚ŕ¤¤ŕ¤°ŕĽŕ¤¨ŕ¤żŕ¤šŕ¤żŕ¤¤ कियञ ŕ¤œŕ¤ž सकन༇ ाञलञ पञठ संपञऌक (थञक/ŕ¤ľŕĽŕ¤ŻŕĽ‚ स༇पर༇जन क༇ ŕ¤Źŕ¤—ŕĽˆŕ¤°)
  Comment[hr]=Ugradiva komponenta obrade teksta (bez Doc/View razdvajanja)
  Comment[hsb]=Integrujomna komponenta za wobdźěłanje tekstow (bjez doc/view-separacije)
  Comment[hu]=Beågyazható szÜvegszerkesztő (dokumentum/nÊzet modell nÊlkßl)
@@ -117,18 +128,23 @@
  Comment[ja]=ĺŸ‹ă‚čžźăżĺŻčƒ˝ăŞăƒ†ă‚­ă‚šăƒˆă‚¨ăƒ‡ă‚Łă‚żă‚łăƒłăƒăƒźăƒăƒłăƒˆ (Doc/View ĺˆ†é›˘ăŞă—)
 Index: interfaces/ktexteditor/kcm_ktexteditor.desktop
 ===================================================================
---- 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 @@
+--- interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
+@@ -90,18 +90,19 @@
  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[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[fy]=De tekstbewurkings-fasiliteit foarsjocht programma's fan een tekstwerjouwer en -ferwurker. KDE-applikaasjes mei tekstferwurkingsmooglikheden kinne hjir gebrĂťk fan meitsje.
+ Comment[ga]=Cuirtear amharcĂĄn tĂŠacs agus eagarthĂłir ar fĂĄil d'fheidhmchlĂĄir trĂ­n seirbhĂ­s eagarthĂłireachta tĂŠacs. Ba cheart d'fheidhmchlĂĄir KDE a sholĂĄthraĂ­onn ĂĄiseanna eagarthĂłireachta an tseirbhĂ­s seo a ĂşsĂĄid.
+-Comment[gl]=O servizo de edizĂłn de texto fornece ĂĄs aplicaciĂłns de visor e editor de textos. Todas as aplicazĂłns de KDE que fornezan facilidades de edizĂłn de textos deberan empregar este servizo.
++Comment[gl]=O servizo de ediciĂłn de texto fornece ĂĄs aplicaciĂłns de visor e editor de textos. Todas as aplicaciĂłns de KDE que fornezan facilidades de ediciĂłn de textos deberan empregar este servizo.
+ Comment[he]=׊ירות עורך ×”×˜×§×Ą×˜ מץפק ליי׊ומים מ׌יג ועורך ×˜×§×Ą×˜. יי׊ומי KDE ×Š×ž×Ą×¤×§×™× ××ž×Ś×˘×™× ×œ×˘×¨×™×›×Ş ×˜×§×Ą×˜ י׊תמ׊ו ב׊ירות ×–×”.
+ Comment[hi]=पञठ संपञऌक स༇ाञ ŕ¤œŕĽ‹ ŕ¤
ŕ¤¨ŕĽŕ¤ŞŕĽŕ¤°ŕ¤ŻŕĽ‹ŕ¤—ŕĽ‹ŕ¤‚ क་ ŕ¤ŕ¤• पञठ ŕ¤Śŕ¤°ŕĽŕ¤śŕ¤• ा ŕ¤ŕ¤• संपञऌक ŕ¤‰ŕ¤Şŕ¤˛ŕ¤ŹŕĽŕ¤˜ करञतༀ ŕ¤šŕĽˆŕĽ¤ ŕ¤•ŕĽ‡ŕ¤ĄŕĽ€ŕ¤ˆ ŕ¤
ŕ¤¨ŕĽŕ¤ŞŕĽŕ¤°ŕ¤ŻŕĽ‹ŕ¤— ŕ¤œŕĽ‹ पञठ संपञऌन स༁ािधञ ŕ¤‰ŕ¤Şŕ¤˛ŕ¤ŹŕĽŕ¤§ करञतༀ ŕ¤šŕĽˆŕ¤‚, ŕ¤‰ŕ¤¨ŕĽŕ¤šŕĽ‡ŕ¤‚ इसकञ ŕ¤ŞŕĽŕ¤°ŕ¤ŻŕĽ‹ŕ¤— करनञ हाहिए।
  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ć.
  Comment[hu]=A szÜvegszerkesztő szolgåltatåson keresztßl az alkalmazåsok szÜvegek megtekintÊsÊt Ês szerkesztÊsÊt vÊgezhetik el. A KDE szÜvegszerkesztő programjai hasznålhatjåk.
@@ -138,9 +154,16 @@
  Comment[ja]=ăƒ†ă‚­ă‚šăƒˆă‚¨ăƒ‡ă‚Łă‚żă‚ľăƒźăƒ“ă‚šăŻă‚˘ăƒ—ăƒŞă‚ąăƒźă‚ˇăƒ§ăƒłăŤăƒ†ă‚­ă‚šăƒˆăƒ“ăƒĽăƒźă‚˘ă¨ăƒ†ă‚­ă‚šăƒˆă‚¨ăƒ‡ă‚Łă‚żă‚’ćäž›ă—ăžă™ă€‚ăƒ†ă‚­ă‚šăƒˆçˇ¨é›†ăŽćŠŸčƒ˝ă‚’ćŒă¤ KDEă‚˘ăƒ—ăƒŞă‚ąăƒźă‚ˇăƒ§ăƒłăŻă“ă‚Œă‚’ä˝żç”¨ă—ăžă™ă€‚
 Index: interfaces/ktexteditor/ktexteditor.desktop
 ===================================================================
---- 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 @@
+--- interfaces/ktexteditor/ktexteditor.desktop	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ interfaces/ktexteditor/ktexteditor.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
+@@ -14,23 +14,24 @@
+ Comment[cs]=Pohltitelnå komponenta textovÊho editoru (s oddělením Doc/View)
+ Comment[cy]=Cydran Golygydd Testun Mewnadeiladwy (wrth Wahanu Dogfen/Golwg)
+ Comment[da]=Teksteditorkomponent som kan indlejres (med dok./visning-adskillelse)
+-Comment[de]=Einbettungsfähige Editorkomponente (mit Text/Ansicht-Aufteilung)
++Comment[de]=Einbettungsfähige Editorkomponente (mit Text-/Ansicht-Aufteilung)
+ Comment[el]=Î•Î˝ĎƒĎ‰ÎźÎąĎ„ĎŽĎƒÎšÎźÎż ĎƒĎ„ÎżÎšĎ‡ÎľÎŻÎż ÎľĎ€ÎľÎžÎľĎÎłÎąĎƒĎ„ÎŽ κξΚΟένοĎ
 (Οξ Î´ÎšÎąĎ‡Ď‰ĎÎšĎƒÎźĎŒ Doc/View)
+ Comment[eo]=Interna redaktilo (kun apartigo de dokumento kaj rigardo)
  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)
@@ -149,7 +172,11 @@
  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[ga]=ComhphĂĄirt eagarthĂłireacht tĂŠacs inleabaithe (le deighilt idir cĂĄipĂŠis agus amharc)
+-Comment[gl]=CompoĂąente incrustĂĄbel de EdizĂłn de Texto (cunha SeparaciĂłn Doc/Vista)
++Comment[gl]=CompoĂąente incrustĂĄbel de EdiciĂłn de Texto (cunha SeparaciĂłn Doc/Vista)
+ Comment[he]=רכיב עורך ×˜×§×Ą×˜ בר ×”×˜×‘×˘×” (עם הפרדה בין מץמך ×œ×Ş×Ś×•×’×”)
+ Comment[hi]=ŕ¤
ŕ¤‚ŕ¤¤ŕ¤°ŕĽŕ¤¨ŕ¤żŕ¤šŕ¤żŕ¤¤ कियञ ŕ¤œŕ¤ž सकन༇ ाञलञ पञठ संपञऌक (थञक/ŕ¤ľŕĽŕ¤ŻŕĽ‚ स༇पर༇जन क༇ सञ़)
  Comment[hr]=Ugradiva komponenta obrade teksta (s Doc/View razdvajanjem)
  Comment[hsb]=Komponenta za integrowane wobdźěłanje teksta
  Comment[hu]=Beågyazható szÜvegszerkesztő (dokumentum/nÊzet modellel)
@@ -157,10 +184,23 @@
  Comment[is]=Ívafinn textaritill (með skjal/sýn aðskilnaði)
  Comment[it]=Componente integrabile per l'elaborazione di testi (con separazione documento/vista)
  Comment[ja]=ĺŸ‹ă‚čžźăżĺŻčƒ˝ăŞăƒ†ă‚­ă‚šăƒˆă‚¨ăƒ‡ă‚Łă‚żă‚łăƒłăƒăƒźăƒăƒłăƒˆ (Doc/View ĺˆ†é›˘)
+Index: interfaces/ktexteditor/ktexteditorplugin.desktop
+===================================================================
+--- interfaces/ktexteditor/ktexteditorplugin.desktop	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ interfaces/ktexteditor/ktexteditorplugin.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
+@@ -16,7 +16,7 @@
+ Comment[cs]=Modul textovĂŠho editoru
+ Comment[cy]=Atodyn KTextEditor
+ Comment[da]=KTextEditor-plugin
+-Comment[de]=KTextEditor-Plugin
++Comment[de]=KTextEditor-Erweiterung
+ Comment[el]=Î ĎĎŒĎƒÎ¸ÎľĎ„Îż KTextEditor
+ Comment[eo]=Tekstredaktilo kromaÄľo
+ Comment[es]=Plugin de KTextEditor
 Index: interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
 ===================================================================
---- 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)
+--- interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -21,8 +21,10 @@
  {
  protected:
@@ -175,8 +215,8 @@
  };
 Index: kmdi/kmdi/mainwindow.h
 ===================================================================
---- kmdi/kmdi/mainwindow.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 609963)
-+++ kmdi/kmdi/mainwindow.h	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- kmdi/kmdi/mainwindow.h	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kmdi/kmdi/mainwindow.h	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -107,6 +107,10 @@
       * as toplevel and stay-on-top on the application's main widget.
       * @param pWnd widget for the toolview
@@ -190,8 +230,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 609963)
-+++ kmdi/kmdi/dockcontainer.h	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- kmdi/kmdi/dockcontainer.h	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kmdi/kmdi/dockcontainer.h	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -50,7 +50,7 @@
      /**
       * Add a widget to this container.
@@ -212,8 +252,17 @@
      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 609963)
-+++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
+@@ -11,7 +11,7 @@
+ Name[cs]=Modul datovĂŠho nĂĄstroje
+ Name[cy]=Ategyn KErfynData KGolyguTestun
+ Name[da]=KTextEditor KDataTool-plugin
+-Name[de]=KTextEditor-Plugin fĂźr KDataTool
++Name[de]=KTextEditor-Erweiterung fĂźr KDataTool
+ Name[el]=Î ĎĎŒĎƒÎ¸ÎľĎ„Îż KTextEditor KDataTool
+ Name[eo]=KTextEditor KDataTool KromaÄľo
+ Name[es]=Plugin KDataTool de KTextEditor
 @@ -27,6 +27,7 @@
  Name[hi]=क༇-ŕ¤ŸŕĽ‡ŕ¤•ŕĽŕ¤¸ŕĽŕ¤Ÿ-ŕ¤ŕ¤Ąŕ¤żŕ¤Ÿŕ¤° क༇-ŕ¤Ąŕ¤žŕ¤Ÿŕ¤ž-ŕ¤ŸŕĽ‚ŕ¤˛ ŕ¤ŞŕĽŕ¤˛ŕ¤—ŕ¤‡ŕ¤¨
  Name[hr]=KTextEditor dodatak za KDataTool
@@ -232,9 +281,37 @@
  Comment[ja]=ĺŒçžŠčŞžăƒ„ăƒźăƒŤă‚„ă‚šăƒšăƒŤăƒă‚§ăƒƒă‚ŻăŞăŠăŽăƒ‡ăƒźă‚żăƒ„ăƒźăƒŤă‚’ćœ‰ĺŠšăŤă—ăžă™ (ă‚¤ăƒłă‚šăƒˆăƒźăƒŤă•ă‚ŒăŚă„ă‚‹ĺ ´ĺˆ)
 Index: kate/plugins/insertfile/ktexteditor_insertfile.desktop
 ===================================================================
---- 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 @@
+--- kate/plugins/insertfile/ktexteditor_insertfile.desktop	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/plugins/insertfile/ktexteditor_insertfile.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
+@@ -11,7 +11,7 @@
+ Name[cs]=Modul pro vklĂĄdĂĄnĂ­ souborĹŻ
+ Name[cy]=Ategyn Mewnosod Ffeil KTextEditor
+ Name[da]=KTextEditor 'indsĂŚt fil'-plugin
+-Name[de]=KTextEditor-Plugin zum EinfĂźgen von Dateien
++Name[de]=KTextEditor-Erweiterung zum EinfĂźgen von Dateien
+ Name[el]=Î ĎĎŒĎƒÎ¸ÎľĎ„Îż ÎľÎšĎƒÎąÎłĎ‰ÎłÎŽĎ‚ ιρχξίοĎ
 Ď„ÎżĎ
 KTextEditor
+ Name[eo]=KTextEditor Enmetu-Dosieron-kromaÄľo
+ Name[es]=Plugin de inserciĂłn de archivos de KTextEditor
+@@ -22,7 +22,7 @@
+ Name[fr]=Module externe du fichier d'insertion de KTextEditor
+ Name[fy]=KTextEditor-plugin foar it ynfoegjen fan triemmen
+ Name[ga]=BreiseĂĄn KTextEditor chun comhad a ionsĂĄ
+-Name[gl]=Plugin de InserzĂłn de Arquivo de KTextEditor
++Name[gl]=Plugin de InserciĂłn de Ficheiro de KTextEditor
+ Name[he]=תוץף הוץפת קוב׼ ל֞KTextEditor
+ Name[hi]=क༇-ŕ¤ŸŕĽ‡ŕ¤•ŕĽŕ¤¸ŕĽŕ¤Ÿ-ŕ¤ŕ¤Ąŕ¤żŕ¤Ÿŕ¤° ऍटञइल ŕ¤˜ŕĽŕ¤¸ŕ¤žŕ¤¨ŕĽ‡ कञ ŕ¤ŞŕĽŕ¤˛ŕ¤—ŕ¤żŕ¤¨
+ Name[hr]=KTextEditor dodatak za umetanje datoteka
+@@ -88,14 +88,16 @@
+ Comment[es]=Insertar cualquier archivo legible en la posiciĂłn del cursor
+ Comment[et]=Suvalise loetava faili lisamine kursori asukohta
+ Comment[eu]=Kurtsorearen posizioan fitxategi irakurgarri bat txertatzen du
+-Comment[fa]=دع؏ هع ŮžŘąŮˆŮ†ŘŻŰ€ قابل ŘŽŮˆŘ§Ů†ŘŻŮ† ŘŻŘą Ů
ŮˆŮ‚ŘšŰŒŘŞ Ů
ÚŠŘ§Ů†â€ŒŮ†Ů
ا 
++Comment[fa]=دع؏ هع ŮžŘąŮˆŮ†ŘŻŰ€ قابل ŘŽŮˆŘ§Ů†ŘŻŮ† ŘŻŘą Ů
ŮˆŮ‚ŘšŰŒŘŞ Ů
ÚŠŘ§Ů†â€ŒŮ†Ů
ا
+ Comment[fi]=Lisää mikä tahansa luettava tiedosto kursorin kohdalle
+ Comment[fr]=InsĂŠrer tout fichier lisible Ă  la position du curseur
+ Comment[fy]=Els lĂŞsber Triem by it rinnerke ynfoegje
++Comment[gl]=Inserir calquera ficheiro lexĂ­bel na posiciĂłn do cursor
+ Comment[he]=מוץיף כל קוב׼ בר קיראה במיקום ×”×Ą×ž×Ÿ
  Comment[hr]=Na položaju pokazivača umetnite bilo koju čitljivu datoteku
  Comment[hsb]=Zasunje lubowólnu čitajomnu dataju na poziciji cursora
  Comment[hu]=Tetszőleges olvasható fåjl beszúråsa a kurzorpozíciónål
@@ -244,8 +321,8 @@
  Comment[ja]=ă‚Ťăƒźă‚˝ăƒŤä˝ç˝ŽăŤčŞ­ăżčžźăżĺŻčƒ˝ăŞăƒ•ă‚Ąă‚¤ăƒŤă‚’ćŒżĺ
Ľă—ぞす
 Index: kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
 ===================================================================
---- 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)
+--- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -23,6 +23,7 @@
  Name[hi]=क༇-ŕ¤ŸŕĽ‡ŕ¤•ŕĽŕ¤¸ŕĽŕ¤Ÿ-ŕ¤ŕ¤Ąŕ¤żŕ¤Ÿŕ¤° ŕ¤‘ŕ¤ŸŕĽ‹ŕ¤ŹŕĽŕ¤•ŕ¤Žŕ¤žŕ¤°ŕĽŕ¤•ŕ¤°
  Name[hr]=KTextEditor automatske oznake
@@ -254,6 +331,15 @@
  Name[is]=KTextEditor sjĂĄlfvirkur bĂłkamerkjari
  Name[it]=Segnalibri automatici di KTextEditor
  Name[ja]=KTextEditor č‡Şĺ‹•ăƒ–ăƒƒă‚Żăƒžăƒźă‚Ż
+@@ -70,7 +71,7 @@
+ Comment[es]=Pone marcadores en las lĂ­neas que coinciden con un patrĂłn definido al cargar documentos.
+ Comment[et]=Määrab dokumendi avamisel vastavalt mustrile ridadele järjehoidjad
+ Comment[eu]=Eredu batekin bat datozen lerroen laster-markak ezartzen ditu dokumentuak kargatzean
+-Comment[fa]=ŮˆŮ‚ŘŞŰŒ ڊه Ů
ستندات باع Ů
ŰŒâ€ŒŘ´ŮˆŘŻŘŒ Ú†ŮˆŘ¨ الفها عا ŘąŮˆŰŒ ŘŽŘˇŮˆŘˇ Ů
ءابق با Ř§Ů„ÚŻŮˆ ŘŞŮ†Ř¸ŰŒŮ
 ÚŠŮ†ŰŒŘŻ 
++Comment[fa]=ŮˆŮ‚ŘŞŰŒ ڊه Ů
ستندات باع Ů
ŰŒâ€ŒŘ´ŮˆŘŻŘŒ Ú†ŮˆŘ¨ الفها عا ŘąŮˆŰŒ ŘŽŘˇŮˆŘˇ Ů
ءابق با Ř§Ů„ÚŻŮˆ ŘŞŮ†Ř¸ŰŒŮ
 ÚŠŮ†ŰŒŘŻ
+ Comment[fi]=Määrittele kirjanmerkkejä riveille, jotka vastaavat kuviota, kun asiakirjoja avataan
+ Comment[fr]=Positionne des signets sur les lignes qui correspondent Ă  un motif quand les documents sont chargĂŠs
+ Comment[fy]=BlĂŞdwizer ynstelle om by it laden fan dokuminten oerienkomstige patroanen 
 @@ -80,8 +81,9 @@
  Comment[hr]=Pri učitavanju dokumenta postavlja oznake na redovima koji odgovaraju određenom uzorku.
  Comment[hsb]=Staja pĹ™i začitanju dokumenta znamjenja na linki, kiĹž wÄ›stemu mustrej wotpowÄ›duja,
@@ -267,8 +353,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 609963)
-+++ kate/plugins/autobookmarker/autobookmarker.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- kate/plugins/autobookmarker/autobookmarker.cpp	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/plugins/autobookmarker/autobookmarker.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -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,9 +374,28 @@
  //END
 Index: kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
 ===================================================================
---- 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 @@
+--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
+@@ -7,22 +7,23 @@
+ Name[ca]=Endollable de completar paraules del KTextEditor
+ Name[cs]=Modul pro doplĹˆovĂĄnĂ­ slov
+ Name[da]=KTextEditor 'ord-kompletterings'-plugin
+-Name[de]=KTextEditor-Plugin fßr Wortergänzungen
++Name[de]=KTextEditor-Erweiterung fßr Wortergänzungen
+ Name[el]=Î ĎĎŒĎƒÎ¸ÎľĎ„Îż ĎƒĎ
ÎźĎ€ÎťÎŽĎĎ‰ĎƒÎˇĎ‚ ΝέΞξων Ď„ÎżĎ
 KTextEditor
+ Name[eo]=KTextEditor Vortotutiga kromaÄľo
+ Name[es]=Plugin de completado de palabras de KTextEditor
+ Name[et]=KTextEditori sĂľna lĂľpetamise plugin
+ Name[eu]=KTextEditor-en hitzen osaketarako plugin-a
+-Name[fa]=ŮˆŘľŮ„Ű€ ŘŞÚŠŮ
ŰŒŮ„ ŮˆŘ§Ú˜Ű€ KTextEditor 
++Name[fa]=ŮˆŘľŮ„Ű€ ŘŞÚŠŮ
ŰŒŮ„ ŮˆŘ§Ú˜Ű€ KTextEditor
+ Name[fi]=KTextEditorin sanojen täydennyslaajennus
+ Name[fr]=Module externe de complètement des mots de KTextEditor
+ Name[fy]=KTextEditor plugin foar it kompleet meitje fan wurden
+-Name[gl]=Plugin de CompletazĂłn de Palabras de KTextEditor
++Name[gl]=Plugin de Completado de Palabras de KTextEditor
+ Name[he]=תוץף ה׊למה ××•×˜×•×ž×˜×™×Ş ׊ל מילים עבור KTextEditor
+ Name[hi]=क༇-ŕ¤ŸŕĽ‡ŕ¤•ŕĽŕ¤¸ŕĽŕ¤Ÿ-ŕ¤ŕ¤Ąŕ¤żŕ¤Ÿŕ¤° वर्ड ŕ¤•ŕ¤ŽŕĽŕ¤ŞŕĽŕ¤˛ŕĽ€ŕ¤śŕ¤¨ ŕ¤ŞŕĽŕ¤˛ŕ¤—ŕ¤żŕ¤¨
  Name[hr]=KTextEditor dodatak za dopunjavanje riječi
  Name[hsb]=KTextEditor Plugin za wudospołnjenje słowow
  Name[hu]=KTextEditor szókiegÊszítő bővítőmodul
@@ -298,7 +403,14 @@
  Name[is]=KTextEditor Ă­forrit til aĂ° klĂĄra orĂ°
  Name[it]=Plugin completamento parole di KTextEditor
  Name[ja]=KTextEditor ĺ˜čŞžčŁœĺŽŒăƒ—ăƒŠă‚°ă‚¤ăƒł
-@@ -73,7 +74,7 @@
+@@ -67,21 +68,22 @@
+ Comment[ca]=CompleciĂł de paraules del document dirigida o basada en emergents
+ Comment[cs]=PřímĂŠ nebo vyskakovacĂ­ doplĹˆovĂĄnĂ­ slov v dokumentu
+ Comment[da]=Retnings- eller popop-baseret fuldstÌndiggørelse ud fra ord i dokumentet
+-Comment[de]=Richtungs- oder ßber Aufklappfenster gesteuerte automatische Vervollständigung von WÜrtern in Dokumenten
++Comment[de]=Richtungs- oder ßber Aufklappfenstergesteuerte automatische Vervollständigung von WÜrtern in Dokumenten
+ Comment[el]=ΚιτξĎ
θĎ
ντΚκΎ ÎŽ ÎźÎ­ĎƒĎ‰ ινιδĎ
ĎŒÎźÎľÎ˝Ď‰Î˝ μενού ĎƒĎ
ÎźĎ€ÎťÎŽĎĎ‰ĎƒÎˇ ÎąĎ€ĎŒ ΝέΞξΚς ÎźÎ­ĎƒÎą ĎƒĎ„Îż έγγριφο
+ Comment[eo]=Regula aĹ­ ekfenestra tutigo de vortoj en la dokumento
  Comment[es]=Completado de palabras direccional o de menĂş emergente en el documento.
  Comment[et]=LĂľpetamine vastavalt suunale vĂľi hĂźpikvariantide alusel dokumendi sĂľnade pĂľhjal
  Comment[eu]=Dokumentuko hitzen osaketarako plugin-a
@@ -307,7 +419,9 @@
  Comment[fi]=Asiakirjasta lÜytyvillä sanoilla täydentäminen
  Comment[fr]=Complètement basÊ sur la direction ou un menu à partir des mots du document
  Comment[fy]=kompleet meitsje fan wurden yn it dokumint op Direktsjeneel of popup-basearje 
-@@ -82,6 +83,7 @@
+-Comment[gl]=CompletazĂłn direccional ou  baseada en popup a partir de palabras no documento
++Comment[gl]=Completado direccional ou  baseada en popup a partir de palabras no documento
+ Comment[hi]=ŕ¤Ąŕ¤žŕ¤Żŕ¤°ŕĽ‡ŕ¤•ŕĽŕ¤śŕ¤¨ŕ¤˛ यञ प༉पŕ¤
प-आधञरित ŕ¤Śŕ¤¸ŕĽŕ¤¤ŕ¤žŕ¤ľŕĽ‡ŕ¤œŕ¤ź ऎ༇ं शब्द स༇ ŕ¤•ŕ¤ŽŕĽŕ¤Şŕ¤˛ŕĽ€ŕ¤śŕ¤¨.
  Comment[hr]=Usmjereno ili pop-up zasnovano dovršavanje iz riječi u dokumentu
  Comment[hsb]=Direktionalne abo na pop-up bazowace wudospołnjowanje za słowa w dokumenće
  Comment[hu]=IrĂĄny szerinti vagy felbukkanĂł kiegĂŠszĂ­tĂŠs dokumentum szavai alapjĂĄn
@@ -317,8 +431,17 @@
  Comment[ja]=ăƒăƒƒăƒ—ă‚˘ăƒƒăƒ—ăžăŸăŻăƒŚăƒźă‚śăŽćŒ‡ç¤şăŤă‚ˆăŁăŚăƒ‰ă‚­ăƒĽăƒĄăƒłăƒˆăŽĺ˜čŞžă‹ă‚‰čŁœĺŽŒă—ăžă™
 Index: kate/plugins/isearch/ktexteditor_isearch.desktop
 ===================================================================
---- 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)
+--- kate/plugins/isearch/ktexteditor_isearch.desktop	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/plugins/isearch/ktexteditor_isearch.desktop	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
+@@ -10,7 +10,7 @@
+ Name[cs]=Modul pro postupnĂŠ vyhledĂĄvĂĄnĂ­
+ Name[cy]=Ategyn Chwiliad Cynyddol KGolyguTestun
+ Name[da]=KTextEditor inkrementel søgnings-plugin
+-Name[de]=KTextEditor-Plugin zur einengenden Suche
++Name[de]=KTextEditor-Erweiterung zur einengenden Suche
+ Name[el]=Î ĎĎŒĎƒÎ¸ÎľĎ„Îż ÎąĎ
ΞΡτΚκΎς ÎąÎ˝ÎąÎśÎŽĎ„ÎˇĎƒÎˇĎ‚ KTextEditor
+ Name[eo]=KTextEditor Iom-post-Ioma-Serĉo-kromaľo
+ Name[es]=Plugin de bĂşsqueda incremental de KTextEditor
 @@ -27,6 +27,7 @@
  Name[hr]=KTextEditor dodatak za traĹženje u koracima
  Name[hsb]=KTextEditor Plugin za inkrementelne pytanje
@@ -346,8 +469,8 @@
  Comment[ja]="ć‰“ăŁăŸă‚‚ăŽăăŽăžăžć¤œç´˘"ă¨ă—ăŚă‚‚çŸĽă‚‰ă‚ŒăŚă„ăžă™
 Index: kate/part/katecodecompletion.cpp
 ===================================================================
---- kate/part/katecodecompletion.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 609963)
-+++ kate/part/katecodecompletion.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- kate/part/katecodecompletion.cpp	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/part/katecodecompletion.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -56,7 +56,6 @@
    public:
      /**
@@ -358,8 +481,8 @@
      {
 Index: kate/part/katefactory.h
 ===================================================================
---- kate/part/katefactory.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 609963)
-+++ kate/part/katefactory.h	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- kate/part/katefactory.h	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/part/katefactory.h	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -75,6 +75,7 @@
       * @param widgetName widget name
       * @param parent QObject parent
@@ -370,8 +493,8 @@
       */
 Index: kate/part/katefiletype.cpp
 ===================================================================
---- kate/part/katefiletype.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 609963)
-+++ kate/part/katefiletype.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- kate/part/katefiletype.cpp	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/part/katefiletype.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -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 +514,8 @@
  //END KateFileTypeConfigTab
 Index: kate/part/katejscript.cpp
 ===================================================================
---- kate/part/katejscript.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 609963)
-+++ kate/part/katejscript.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- kate/part/katejscript.cpp	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/part/katejscript.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -99,7 +99,7 @@
  {
    switch (id) {
@@ -431,8 +554,8 @@
  
 Index: kate/part/kateview.h
 ===================================================================
---- kate/part/kateview.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 609963)
-+++ kate/part/kateview.h	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- kate/part/kateview.h	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/part/kateview.h	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -286,8 +286,8 @@
          { return getDoc()->textLine( cursorLine() ); }
      QString currentWord()
@@ -454,8 +577,8 @@
      void findPrev()               { findAgain( true );           }
 Index: kate/part/katedocument.h
 ===================================================================
---- kate/part/katedocument.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 609963)
-+++ kate/part/katedocument.h	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- kate/part/katedocument.h	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/part/katedocument.h	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -264,6 +264,7 @@
       * @p removeLine is true, @p length is ignored (eg not needed).
       * @param line line number
@@ -473,11 +596,46 @@
  
      void setModified( bool m );
  
+Index: kate/part/katesearch.cpp
+===================================================================
+--- kate/part/katesearch.cpp	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/part/katesearch.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
+@@ -635,6 +635,13 @@
+             {
+               break;
+             }
++            else if ( backward && foundCol == 0 ) // we are done on this line and want to avoid endless loops like in #137312
++            {
++              if ( line == 0 ) // we are completely done...
++                break;
++              else
++                line--;
++            }
+             else
+             {
+               line = foundLine;
 Index: kate/part/katedocument.cpp
 ===================================================================
---- 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 @@
+--- kate/part/katedocument.cpp	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/part/katedocument.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
+@@ -68,6 +68,7 @@
+ #include <kencodingfiledialog.h>
+ #include <ktempfile.h>
+ #include <kmdcodec.h>
++#include <kstandarddirs.h>
+ 
+ #include <qtimer.h>
+ #include <qfile.h>
+@@ -1889,6 +1890,8 @@
+ 
+ void KateDocument::writeSessionConfig(KConfig *kconfig)
+ {
++  if ( m_url.isLocalFile() && !KGlobal::dirs()->relativeLocation("tmp", m_url.path()).startsWith("/"))
++       return;
+   // save url
+   kconfig->writeEntry("URL", m_url.prettyURL() );
+ 
+@@ -3671,10 +3674,7 @@
      removeText (sl, sc, sl, sc + startCommentLen);
  
      editEnd ();
@@ -489,7 +647,7 @@
    }
  
    return remove;
-@@ -3737,16 +3734,7 @@
+@@ -3737,16 +3737,7 @@
    }
  
    editEnd();
@@ -507,7 +665,7 @@
    return removed;
  }
  
-@@ -4688,9 +4676,9 @@
+@@ -4688,9 +4679,9 @@
          else
            m_config->setIndentationMode( KateAutoIndent::modeNumber( val) );
        }
@@ -521,8 +679,8 @@
        // STRING SETTINGS
 Index: kate/part/kateautoindent.h
 ===================================================================
---- kate/part/kateautoindent.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 609963)
-+++ kate/part/kateautoindent.h	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- kate/part/kateautoindent.h	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/part/kateautoindent.h	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -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 +738,8 @@
      virtual void processLine (KateDocCursor &line);
 Index: kate/part/kateviewhelpers.cpp
 ===================================================================
---- kate/part/kateviewhelpers.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 609963)
-+++ kate/part/kateviewhelpers.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- kate/part/kateviewhelpers.cpp	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/part/kateviewhelpers.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -277,7 +277,7 @@
    public:
      KateCmdLineFlagCompletion() {;}
@@ -593,8 +751,8 @@
      }
 Index: kate/part/katefactory.cpp
 ===================================================================
---- kate/part/katefactory.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 609963)
-+++ kate/part/katefactory.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- kate/part/katefactory.cpp	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/part/katefactory.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -52,6 +52,7 @@
       * @param widgetName widget name
       * @param parent QObject parent
@@ -605,8 +763,8 @@
       */
 Index: kate/part/katesearch.h
 ===================================================================
---- kate/part/katesearch.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 609963)
-+++ kate/part/katesearch.h	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- kate/part/katesearch.h	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/part/katesearch.h	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -223,7 +223,7 @@
      bool help(class Kate::View *, const QString &, QString &);
      QStringList cmds();
@@ -618,8 +776,8 @@
      /**
 Index: kate/part/kateautoindent.cpp
 ===================================================================
---- kate/part/kateautoindent.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 609963)
-+++ kate/part/kateautoindent.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 609963)
+--- kate/part/kateautoindent.cpp	(.../tags/KDE/3.5.5/kdelibs)	(wersja 620385)
++++ kate/part/kateautoindent.cpp	(.../branches/KDE/3.5/kdelibs)	(wersja 620385)
 @@ -215,6 +215,8 @@
    normalAttrib = 255;
    extensionAttrib = 255;
@@ -654,22 +812,31 @@
    }
  
    return (atLeastOne) ? false : true;
-@@ -653,6 +664,45 @@
+@@ -653,6 +664,56 @@
    }
  }
  
 +/**
 + * Returns true when the given attribute matches any "colon influence immune"
 + * attribute
++ * @param indenter indenter
++ * @param attr1 attribute of previous char
++ * @param attr2 attribute of char preceding previous char
++ * @param prev1 previous character (0 if none)
++ * @param prev2 character preceding previous character (0 if none)
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.46&r2=1.47&f=u
    http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.48&r2=1.49&f=u
    http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.34&r2=1.35&f=u
    http://cvs.pld-linux.org/SOURCES/kdenetwork-branch.diff?r1=1.21&r2=1.22&f=u



More information about the pld-cvs-commit mailing list