SOURCES: kdelibs-branch.diff - updated
arekm
arekm at pld-linux.org
Thu Sep 7 16:52:49 CEST 2006
Author: arekm Date: Thu Sep 7 14:52:49 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdelibs-branch.diff (1.28 -> 1.29)
---- Diffs:
================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.28 SOURCES/kdelibs-branch.diff:1.29
--- SOURCES/kdelibs-branch.diff:1.28 Tue Aug 8 08:04:53 2006
+++ SOURCES/kdelibs-branch.diff Thu Sep 7 16:52:43 2006
@@ -1,7 +1,16 @@
Index: interfaces/kscript/sample/shellscript.desktop
===================================================================
---- interfaces/kscript/sample/shellscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 570931)
-+++ interfaces/kscript/sample/shellscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 570931)
+--- interfaces/kscript/sample/shellscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 581793)
++++ interfaces/kscript/sample/shellscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 581793)
+@@ -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]=Ů
ŘŹŘąŰ ŮŮŰŘłŮâŰ ŮžŮستŮâŰ Ř¨Ř´
++Name[fa]=ا؏عا ÚŠŮŮŘŻŰ ŘŻŘłŘŞâŮŮŘ´ŘŞŰ ŮžŮŘłŘŞŰ bash
+ Name[fi]=Komentotulkkiohjelmien käynnistäjä
+ Name[fr]=Lanceur de scripts shell Bash
+ Name[fy]=Bash Flues Skript Rinner
@@ -46,7 +46,7 @@
Name[ro]=Executor scripturi de interpretor
Name[ru]=ĐапŃŃĐş ŃĐşŃипŃОв bash
@@ -11,11 +20,209 @@
Name[sk]=Spustenie Bash shell skriptu
Name[sl]=Zaganjalnik lupinski skriptov
Name[sq]=Egzekutuesi i skriptave tĂŤ GuacĂŤs Bash
+@@ -84,7 +84,7 @@
+ Comment[es]=Ejecuta procedimientos del intĂŠrprete de comandos bash desde dentro de la aplicaciĂłn.
+ Comment[et]=Käivitab bash shelli skripte rakendustes.
+ Comment[eu]=Aplikazioaren baitatik bash-eko shell script-ak abiarazteko.
+-Comment[fa]=ŮŮŰŘłŮââŮŘ§Ű ŮžŮستŮâŰ Ř¨Ř´ عا از دا؎٠ŰÚŠ بعŮاŮ
٠ا؏عا Ů
ŰâÚŠŮŘŻ.
++Comment[fa]=دستâŮŮŘ´ŘŞŮâŮŘ§Ű ŮžŮŘłŘŞŰ bash عا از ŘŻŘąŮ٠ڊاعبعد ا؏عا Ů
ŰâÚŠŮŘŻ.
+ Comment[fi]=Suorittaa Bash-komentotulkkiohjelmia ohjelman sisästä
+ Comment[fr]=ExĂŠcute des scripts shell Bash depuis l'intĂŠrieur de l'application.
+ Comment[fy]=Bash flues skript rint yn de applikaasje.
+@@ -108,7 +108,7 @@
+ Comment[mn]=ĐŃОгŃаП Đ´ĐžŃŃĐžĐžŃ Bash-Shell-ĐĄĐşŃĐ¸ĐżŃ Đ°ĐśĐ¸ĐťĐťŃŃНаŃ
.
+ Comment[ms]=Laksanakan skrip cengkerang bash di dalam aplikasi.
+ Comment[nb]=Kjører bash skallskript fra innsiden av programmet.
+-Comment[nds]=Dor kÜÜnt Programmen mit Bash-Shellskripten utfÜhren.
++Comment[nds]=Dor kÜÜnt Programmen Bash-Konsoolskripten mit utfÜhren.
+ Comment[nl]=Voert Bash-shellscripts uit binnen de toepassing.
+ Comment[nn]=Køyrer Bash-skalskript innanfrü programmet.
+ Comment[pa]=ŕ¨ŕŠąŕ¨ ŕ¨ŕ¨žŕ¨°ŕ¨ ਵਿੱਠਬŕŠŕ¨ś ਜŕŠŕ¨˛ ਸŕ¨ŕŠŕ¨°ŕ¨żŕ¨Şŕ¨ŕ¨žŕ¨ ŕ¨ŕ¨˛ŕ¨žŕ¨ŕ¨Ł ਲਠਸਚਞŕ¨ŕ¨ ਚŕŠ
+Index: interfaces/kscript/scriptinterface.desktop
+===================================================================
+--- interfaces/kscript/scriptinterface.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 581793)
++++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs) (revision 581793)
+@@ -18,7 +18,7 @@
+ Comment[es]=Este es un motor de script genĂŠrico para probar el interfaz de script.
+ Comment[et]=Ăldise skriptimootori testskript liidese testimiseks.
+ Comment[eu]=Hau script motoreen proba generikoa da script-aren interfazea probatzeko.
+-Comment[fa]=اŰŮ Ů
ŮŘŞŮŘą ŮŮŰŘłŮâŰ Ř˘Ř˛Ů
اŰŘ´ ŘšŮ
ŮŮ
Ű Ř¨ŘąŘ§Ű Ř˘Ř˛Ů
اŰŘ´ Ůاسء ŮŮŰس٠است.
++Comment[fa]=اŰŮ ŰÚŠ Ů
ŮŘŞŮŘą دستâŮŮŘ´ŘŞŰ Ř˘Ř˛Ů
ŮŮ ŘšŮ
ŮŮ
Ű Ř¨ŘąŘ§Ű Ř˘Ř˛Ů
اŰŘ´ Ůاسء دستâŮŮŘ´ŘŞŮ Ů
Űâباشد.
+ Comment[fi]=Tämä on yleinen skriptitestimoottori skriptin käyttÜliittymän testaamiseen
+ Comment[fo]=Hetta er ein almen royndarforritsskipan til at nåroyna fjølvisforritsmarkamótið.
+ Comment[fr]=Ceci est un moteur de script de test gĂŠnĂŠrique pour expĂŠrimenter l'interface de script.
+Index: interfaces/kimproxy/interface/dcopinstantmessenger.desktop
+===================================================================
+--- interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 581793)
++++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 581793)
+@@ -17,6 +17,7 @@
+ Comment[es]=Instant Messenger con un interfaz DCOP
+ Comment[et]=Kiirsuhtlemisrakendus DCOP-liidesega
+ Comment[eu]=Berehalako mezularitza DCOP interfazearekin
++Comment[fa]=ŮžŰاŮ
âعسا٠ŮŮŘąŰ Ř¨Ř§ ŰÚŠ Ůاسء DCOP
+ Comment[fi]=Pikaviestiohjelma, jossa on DCOP-rajapinta
+ Comment[fr]=Messagerie instantanĂŠe munie d'une interface DCOP
+ Comment[fy]=Instant Messenger mei in DCOP-interface
+Index: interfaces/kimproxy/interface/kcm_instantmessenger.desktop
+===================================================================
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 581793)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 581793)
+@@ -10,6 +10,7 @@
+ Name[eo]=TujmesaÄilo
+ Name[et]=Kiirsuhtlus
+ Name[eu]=Berehalako mezularitza
++Name[fa]=ŮžŰاŮ
âعسا٠ŮŮŘąŰ
+ Name[fi]=Pikaviestiohjelma
+ Name[fr]=Messagerie instantanĂŠe
+ Name[ga]=ClĂĄr teachtaireachtaĂ meandaracha
+@@ -64,6 +65,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.
+ Comment[eu]=Berehalako mezularitzak banan-banako edo taldeen arteko berriketan aritzeko.
++Comment[fa]=ŮžŰاŮ
âعسا٠ŮŮŘąŰ Ř§Ů
ڊا٠گٞ د٠ءعŮ٠بŰ٠اŮعاد Ů ÚŻŘąŮŮŮا عا Ů
ŰâŘŻŮŘŻ
+ Comment[fi]=Pikaviestiohjelman avulla voidaan keskustella kahden kesken tai ryhmässä.
+ Comment[fr]=La messagerie instantanĂŠe permet un dialogue bidirectionnel entre individus et groupes.
+ Comment[fy]=Mei de instant messenger kinne jo twaspraak hâlde mei in yndividu en groepen.
+Index: interfaces/kspeech/dcoptexttospeech.desktop
+===================================================================
+--- interfaces/kspeech/dcoptexttospeech.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 581793)
++++ interfaces/kspeech/dcoptexttospeech.desktop (.../branches/KDE/3.5/kdelibs) (revision 581793)
+@@ -16,6 +16,7 @@
+ Comment[es]=Texto a servicio de voz con un interfaz DCOP
+ Comment[et]=Teksti kĂľneks muutmise teenus DCOP-liidesega
+ Comment[eu]='Testua-ahoskatzea' zerbitzua DCOP interfazearekin
++Comment[fa]=ŘŽŘŻŮ
ŘŞ Ů
ت٠ب٠س؎٠با ŰÚŠ Ůاسء DCOP
+ Comment[fi]=Teksti-Puheeksi palvelu DCOP-rajapinnalla
+ Comment[fr]=Service de synthèse vocale munie d'une interface DCOP
+ Comment[fy]=tekst-ta-prate mei in DCOP-ynterface
+Index: interfaces/ktexteditor/ktexteditoreditor.desktop
+===================================================================
+--- interfaces/ktexteditor/ktexteditoreditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 581793)
++++ interfaces/ktexteditor/ktexteditoreditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 581793)
+@@ -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)
+Index: interfaces/ktexteditor/kcm_ktexteditor.desktop
+===================================================================
+--- interfaces/ktexteditor/kcm_ktexteditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 581793)
++++ interfaces/ktexteditor/kcm_ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 581793)
+@@ -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.
+Index: interfaces/ktexteditor/ktexteditor.desktop
+===================================================================
+--- interfaces/ktexteditor/ktexteditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 581793)
++++ interfaces/ktexteditor/ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 581793)
+@@ -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)
+Index: interfaces/ktexteditor/ktexteditorplugin.desktop
+===================================================================
+--- interfaces/ktexteditor/ktexteditorplugin.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 581793)
++++ interfaces/ktexteditor/ktexteditorplugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 581793)
+@@ -22,7 +22,7 @@
+ Comment[es]=Plugin de KTextEditor
+ Comment[et]=KTextEditori plugin
+ Comment[eu]=KTextEditor plugin-a
+-Comment[fa]=Ů
ŘŞŘľŮâÚŠŮŮŘŻŮâŰ KTextEditor
++Comment[fa]=ŮŘľŮŰ KTextEditor
+ Comment[fi]=KTextEditor-lisäosa
+ Comment[fr]=Module externe KTextEditor
+ Comment[fy]=KTextFerwurker-plugin
+Index: kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
+===================================================================
+--- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 581793)
++++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../branches/KDE/3.5/kdelibs) (revision 581793)
+@@ -17,7 +17,7 @@
+ Name[es]=Plugin KDataTool de KTextEditor
+ Name[et]=KTextEditori KDataTool plugin
+ Name[eu]=KTextEditor-en KDataTool plugin-a
+-Name[fa]=Ů
ŘŞŘľŮâÚŠŮŮŘŻŮâŰ Ř§Ř¨Ř˛Ř§Řą KData KTextEditor
++Name[fa]=ŮŘľŮŰ Ř§Ř¨Ř˛Ř§Řą KTextEditor KData
+ Name[fi]=KTextEditor KDataTool -lisäosa
+ Name[fr]=Module externe KDataTool pour KTextEditor
+ Name[fy]=KTextEditor-plugin foar KDatatool
+@@ -89,7 +89,7 @@
+ Comment[es]=Activa herramientas como el thesaurus y el corrector ortogrĂĄfico (si instalados)
+ Comment[et]=Andmete tÜÜriistad, näiteks thesaurus ja þigekirja kontroll
+ Comment[eu]=Gaitu thesaurus-a eta ortografia zuzentzailea bezalako tresnak (instalatua badaude)
+-Comment[fa]=ŮؚاŮâŘłŘ§Ř˛Ű Ř§Ř¨Ř˛Ř§Řą اءŮاؚات Ů
اŮŮŘŻ ŘşŮءâŰاب Ů ŮŮ
اŮŮŘŻŰاب (ŘŻŘą ŘľŮعت Ůؾب)
++Comment[fa]=ابزاعŮŘ§Ű ŘŻŘ§ŘŻŮŘ Ů
اŮŮŘŻ ŮاÚŮâŮاŮ
Ů Ů ŘşŮءâÚŻŰŘą عا Ůؚا٠سازŰŘŻ )اگع Ůؾب شد٠باشد(
+ Comment[fi]=Käytä datatyÜkaluja, kuten oikolukua ja sanakirjaa (jos asennettuna)
+ Comment[fr]=Activer les outils de donnĂŠes comme le thĂŠsaurus et la correction orthographique (s'ils sont installĂŠs)
+ Comment[fy]=Aktivearjen fan dataprogramma's, lykas de tesaurus en stavering (wannear't dy ynstallearre binne)
+Index: kate/plugins/insertfile/ktexteditor_insertfile.desktop
+===================================================================
+--- kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 581793)
++++ kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../branches/KDE/3.5/kdelibs) (revision 581793)
+@@ -17,7 +17,7 @@
+ Name[es]=Plugin de inserciĂłn de archivos de KTextEditor
+ Name[et]=KTextEditori faili lisamise plugin
+ Name[eu]=Fitxategiak txertatzeko KTextEditor-en plugin-a
+-Name[fa]=Ů
ŘŞŘľŮâÚŠŮŮŘŻŮâŰ ŮžŘąŮŮŘŻŮâŰ ŮŘąŮŘŻ KTextEditor
++Name[fa]=ŮŘľŮŰ ŮžŘąŮŮŘŻŰ ŘŻŘąŘŹ KTextEditor
+ Name[fi]=KTextEditorin 'Lisää tiedosto'-laajennus
+ Name[fr]=Module externe du fichier d'insertion de KTextEditor
+ Name[fy]=KTextEditor-plugin foar it ynfoegjen fan triemmen
+@@ -88,6 +88,7 @@
+ 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[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
+Index: kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
+===================================================================
+--- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 581793)
++++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../branches/KDE/3.5/kdelibs) (revision 581793)
+@@ -14,6 +14,7 @@
+ Name[es]=Automarcadores de KTextEditor
+ Name[et]=KTextEditori järjehoidjate märkija
+ Name[eu]=KTextEditor-en laster-markatzaile automatikoa
++Name[fa]=ÚŮب اŮŮ ŘŽŮدڊاع KTextEditor
+ Name[fi]=KTextEditorin automaattinen kirjanmerkkien tekijä
+ Name[fr]=Signets automatiques KTextEditor
+ Name[fy]=Automatyske BlĂŞdwizer foar de KTekstbewurker
+@@ -69,6 +70,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[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
Index: kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
===================================================================
---- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 570931)
-+++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../branches/KDE/3.5/kdelibs) (revision 570931)
-@@ -43,7 +43,7 @@
+--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 581793)
++++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../branches/KDE/3.5/kdelibs) (revision 581793)
+@@ -13,6 +13,7 @@
+ 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[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
+@@ -43,7 +44,7 @@
Name[ro]=Modul completare cuvinte pentru KTextEditor
Name[ru]=ĐОдŃĐťŃ Đ°Đ˛ŃĐžĐ´ĐžĐżĐžĐťĐ˝ĐľĐ˝Đ¸Ń ŃНОв KTextEditor
Name[rw]=Icomeka ry'Iyuzuza Jambo rya KMuhinduziUmwandiko
@@ -24,10 +231,558 @@
Name[sk]=Modul pre doplnenie slov pre KTextEditor
Name[sl]=Vstavek KTextEditor za dopolnjevanje besed
Name[sr]=KTextEditor ĐżŃикŃŃŃак Са дОвŃŃаваŃĐľ ŃĐľŃи
+@@ -72,6 +73,7 @@
+ 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
++Comment[fa]=ŘŞÚŠŮ
ŰŮ ŘŹŮŘŞ داعŰا Ů
بŮŰ Ř¨ŘąŘ¨Ř§Ůاٞعاز ÚŠŮŮ
ات Ů
ŮŘŹŮددعسŮŘŻ
+ 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
+Index: kate/plugins/isearch/ktexteditor_isearch.desktop
+===================================================================
+--- kate/plugins/isearch/ktexteditor_isearch.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 581793)
++++ kate/plugins/isearch/ktexteditor_isearch.desktop (.../branches/KDE/3.5/kdelibs) (revision 581793)
+@@ -16,7 +16,7 @@
+ Name[es]=Plugin de bĂşsqueda incremental de KTextEditor
+ Name[et]=KTextEditori täpsustava otsingu plugin
+ Name[eu]=KTextEditor-en bilaketa inkrementalerako plugin-a
+-Name[fa]=Ů
ŘŞŘľŮâÚŠŮŮŘŻŮâŰ Ů
ŮŘŞŮŘą اŮزŮŘŻŮŰ KTextEditor
++Name[fa]=ŮŘľŮŰ ŘŹŘłŘŞŘŹŮŰ ŮŮ
ŮŰ KTextEditor
+ Name[fi]=KTextEditorin tarkentuvan haun laajennus
+ Name[fr]=Module externe de recherche incrĂŠmentale pour KTextEditor
+ Name[fy]=KTextEditor-plugin foar sykaksjes yn meardere stappen
+@@ -85,6 +85,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[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"
+Index: kate/part/kateconfig.h
+===================================================================
+--- kate/part/kateconfig.h (.../tags/KDE/3.5.4/kdelibs) (revision 581793)
++++ kate/part/kateconfig.h (.../branches/KDE/3.5/kdelibs) (revision 581793)
+@@ -178,7 +178,8 @@
+ cfReplaceTabsDyn= 0x2000000,
+ cfRemoveTrailingDyn=0x4000000,
+ cfDoxygenAutoTyping=0x8000000 , // Remove for KDE 4.0 (put in indenters)
+- cfMixedIndent = 0x10000000
++ cfMixedIndent = 0x10000000,
++ cfIndentPastedText = 0x20000000
+ };
+
+ uint configFlags () const;
+Index: kate/part/katedocument.h
+===================================================================
+--- kate/part/katedocument.h (.../tags/KDE/3.5.4/kdelibs) (revision 581793)
++++ kate/part/katedocument.h (.../branches/KDE/3.5/kdelibs) (revision 581793)
+@@ -993,7 +993,12 @@
+ */
+ static bool checkColorValue( QString value, QColor &col );
+
++ /**
++ * helper regex to capture the document variables
++ */
+ static QRegExp kvLine;
++ static QRegExp kvLineWildcard;
++ static QRegExp kvLineMime;
+ static QRegExp kvVar;
+
+ KIO::TransferJob *m_job;
+Index: kate/part/katedocument.cpp
+===================================================================
+--- kate/part/katedocument.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 581793)
++++ kate/part/katedocument.cpp (.../branches/KDE/3.5/kdelibs) (revision 581793)
+@@ -2895,8 +2895,8 @@
+ {
+ QChar end_ch;
+ bool complete = true;
+- QChar prevChar = textLine->getChar(view->cursorColumn()-1);
+- QChar nextChar = textLine->getChar(view->cursorColumn());
++ QChar prevChar = textLine->getChar(view->cursorColumnReal()-1);
++ QChar nextChar = textLine->getChar(view->cursorColumnReal());
+ switch(ch) {
+ case '(': end_ch = ')'; break;
+ case '[': end_ch = ']'; break;
+@@ -3176,7 +3176,8 @@
+ if (view->blockSelectionMode())
+ view->setCursorPositionInternal (line+lines, column);
+
+- if (m_indenter->canProcessLine())
++ if (m_indenter->canProcessLine()
++ && config()->configFlags() & KateDocumentConfig::cfIndentPastedText)
+ {
+ editStart();
+
+@@ -4513,6 +4514,8 @@
+ add view stuff
+ */
+ QRegExp KateDocument::kvLine = QRegExp("kate:(.*)");
++QRegExp KateDocument::kvLineWildcard = QRegExp("kate-wildcard\\((.*)\\):(.*)");
++QRegExp KateDocument::kvLineMime = QRegExp("kate-mimetype\\((.*)\\):(.*)");
+ QRegExp KateDocument::kvVar = QRegExp("([\\w\\-]+)\\s+([^;]+)");
+
+ void KateDocument::readVariables(bool onlyViewAndRenderer)
+@@ -4552,122 +4555,171 @@
+
+ void KateDocument::readVariableLine( QString t, bool onlyViewAndRenderer )
+ {
++ // simple check first, no regex
++ // no kate inside, no vars, simple...
++ if (t.find("kate") < 0)
++ return;
++
++ // found vars, if any
++ QString s;
++
+ if ( kvLine.search( t ) > -1 )
+ {
+- QStringList vvl; // view variable names
+- vvl << "dynamic-word-wrap" << "dynamic-word-wrap-indicators"
+- << "line-numbers" << "icon-border" << "folding-markers"
+- << "bookmark-sorting" << "auto-center-lines"
+- << "icon-bar-color"
+- // renderer
+- << "background-color" << "selection-color"
+- << "current-line-color" << "bracket-highlight-color"
+- << "word-wrap-marker-color"
+- << "font" << "font-size" << "scheme";
+- int p( 0 );
+- QString s = kvLine.cap(1);
+- QString var, val;
+- while ( (p = kvVar.search( s, p )) > -1 )
++ s = kvLine.cap(1);
++
++ kdDebug (13020) << "normal variable line kate: matched: " << s << endl;
++ }
++ else if (kvLineWildcard.search( t ) > -1) // regex given
++ {
++ QStringList wildcards (QStringList::split(';', kvLineWildcard.cap(1)));
++ QString nameOfFile = url().fileName();
++
++ bool found = false;
++ for (int i = 0; !found && i < wildcards.size(); ++i)
+ {
+- p += kvVar.matchedLength();
+- var = kvVar.cap( 1 );
+- val = kvVar.cap( 2 ).stripWhiteSpace();
+- bool state; // store booleans here
+- int n; // store ints here
++ QRegExp wildcard (wildcards[i], true/*Qt::CaseSensitive*/, true/*QRegExp::Wildcard*/);
+
+- // only apply view & renderer config stuff
+- if (onlyViewAndRenderer)
++ found = wildcard.exactMatch (nameOfFile);
++ }
++
++ // nothing usable found...
++ if (!found)
++ return;
++
++ s = kvLineWildcard.cap(2);
++
++ kdDebug (13020) << "guarded variable line kate-wildcard: matched: " << s << endl;
++ }
++ else if (kvLineMime.search( t ) > -1) // mime-type given
++ {
++ QStringList types (QStringList::split(';', kvLineMime.cap(1)));
++
++ // no matching type found
++ if (!types.contains (mimeType ()))
++ return;
++
++ s = kvLineMime.cap(2);
++
++ kdDebug (13020) << "guarded variable line kate-mimetype: matched: " << s << endl;
++ }
++ else // nothing found
++ {
++ return;
++ }
++
++ QStringList vvl; // view variable names
++ vvl << "dynamic-word-wrap" << "dynamic-word-wrap-indicators"
++ << "line-numbers" << "icon-border" << "folding-markers"
++ << "bookmark-sorting" << "auto-center-lines"
++ << "icon-bar-color"
++ // renderer
++ << "background-color" << "selection-color"
++ << "current-line-color" << "bracket-highlight-color"
++ << "word-wrap-marker-color"
++ << "font" << "font-size" << "scheme";
++ int p( 0 );
++
++ QString var, val;
++ while ( (p = kvVar.search( s, p )) > -1 )
++ {
++ p += kvVar.matchedLength();
++ var = kvVar.cap( 1 );
++ val = kvVar.cap( 2 ).stripWhiteSpace();
++ bool state; // store booleans here
++ int n; // store ints here
++
++ // only apply view & renderer config stuff
++ if (onlyViewAndRenderer)
++ {
++ if ( vvl.contains( var ) ) // FIXME define above
++ setViewVariable( var, val );
++ }
++ else
++ {
++ // BOOL SETTINGS
++ if ( var == "word-wrap" && checkBoolValue( val, &state ) )
++ setWordWrap( state ); // ??? FIXME CHECK
++ else if ( var == "block-selection" && checkBoolValue( val, &state ) )
++ setBlockSelectionMode( state );
++ // KateConfig::configFlags
++ // FIXME should this be optimized to only a few calls? how?
++ else if ( var == "backspace-indents" && checkBoolValue( val, &state ) )
++ m_config->setConfigFlags( KateDocumentConfig::cfBackspaceIndents, state );
++ else if ( var == "replace-tabs" && checkBoolValue( val, &state ) )
++ m_config->setConfigFlags( KateDocumentConfig::cfReplaceTabsDyn, state );
++ else if ( var == "remove-trailing-space" && checkBoolValue( val, &state ) )
++ m_config->setConfigFlags( KateDocumentConfig::cfRemoveTrailingDyn, state );
++ else if ( var == "wrap-cursor" && checkBoolValue( val, &state ) )
++ m_config->setConfigFlags( KateDocumentConfig::cfWrapCursor, state );
++ else if ( var == "auto-brackets" && checkBoolValue( val, &state ) )
++ m_config->setConfigFlags( KateDocumentConfig::cfAutoBrackets, state );
++ else if ( var == "overwrite-mode" && checkBoolValue( val, &state ) )
++ m_config->setConfigFlags( KateDocumentConfig::cfOvr, state );
++ else if ( var == "keep-indent-profile" && checkBoolValue( val, &state ) )
++ m_config->setConfigFlags( KateDocumentConfig::cfKeepIndentProfile, state );
++ else if ( var == "keep-extra-spaces" && checkBoolValue( val, &state ) )
++ m_config->setConfigFlags( KateDocumentConfig::cfKeepExtraSpaces, state );
++ else if ( var == "tab-indents" && checkBoolValue( val, &state ) )
++ m_config->setConfigFlags( KateDocumentConfig::cfTabIndents, state );
++ else if ( var == "show-tabs" && checkBoolValue( val, &state ) )
++ m_config->setConfigFlags( KateDocumentConfig::cfShowTabs, state );
++ else if ( var == "space-indent" && checkBoolValue( val, &state ) )
++ m_config->setConfigFlags( KateDocumentConfig::cfSpaceIndent, state );
++ else if ( var == "smart-home" && checkBoolValue( val, &state ) )
++ m_config->setConfigFlags( KateDocumentConfig::cfSmartHome, state );
++ else if ( var == "replace-trailing-space-save" && checkBoolValue( val, &state ) )
++ m_config->setConfigFlags( KateDocumentConfig::cfRemoveSpaces, state );
++ else if ( var == "auto-insert-doxygen" && checkBoolValue( val, &state) )
++ m_config->setConfigFlags( KateDocumentConfig::cfDoxygenAutoTyping, state);
++ else if ( var == "mixed-indent" && checkBoolValue( val, &state ) )
++ m_config->setConfigFlags( KateDocumentConfig::cfMixedIndent, state );
++
++ // INTEGER SETTINGS
++ else if ( var == "tab-width" && checkIntValue( val, &n ) )
++ m_config->setTabWidth( n );
++ else if ( var == "indent-width" && checkIntValue( val, &n ) )
++ m_config->setIndentationWidth( n );
++ else if ( var == "indent-mode" )
+ {
+- if ( vvl.contains( var ) ) // FIXME define above
+- setViewVariable( var, val );
++ if ( checkIntValue( val, &n ) )
++ m_config->setIndentationMode( n );
++ else
++ m_config->setIndentationMode( KateAutoIndent::modeNumber( val) );
+ }
+- else
++ else if ( var == "word-wrap-column" && n > 0 && checkIntValue( val, &n ) ) // uint, but hard word wrap at 0 will be no fun ;)
++ m_config->setWordWrapAt( n );
++ else if ( var == "undo-steps" && n >= 0 && checkIntValue( val, &n ) )
++ setUndoSteps( n );
++
++ // STRING SETTINGS
++ else if ( var == "eol" || var == "end-of-line" )
+ {
+- // BOOL SETTINGS
+- if ( var == "word-wrap" && checkBoolValue( val, &state ) )
+- setWordWrap( state ); // ??? FIXME CHECK
+- else if ( var == "block-selection" && checkBoolValue( val, &state ) )
+- setBlockSelectionMode( state );
+- // KateConfig::configFlags
+- // FIXME should this be optimized to only a few calls? how?
+- else if ( var == "backspace-indents" && checkBoolValue( val, &state ) )
+- m_config->setConfigFlags( KateDocumentConfig::cfBackspaceIndents, state );
+- else if ( var == "replace-tabs" && checkBoolValue( val, &state ) )
+- m_config->setConfigFlags( KateDocumentConfig::cfReplaceTabsDyn, state );
+- else if ( var == "remove-trailing-space" && checkBoolValue( val, &state ) )
+- m_config->setConfigFlags( KateDocumentConfig::cfRemoveTrailingDyn, state );
+- else if ( var == "wrap-cursor" && checkBoolValue( val, &state ) )
+- m_config->setConfigFlags( KateDocumentConfig::cfWrapCursor, state );
+- else if ( var == "auto-brackets" && checkBoolValue( val, &state ) )
+- m_config->setConfigFlags( KateDocumentConfig::cfAutoBrackets, state );
+- else if ( var == "overwrite-mode" && checkBoolValue( val, &state ) )
+- m_config->setConfigFlags( KateDocumentConfig::cfOvr, state );
+- else if ( var == "keep-indent-profile" && checkBoolValue( val, &state ) )
+- m_config->setConfigFlags( KateDocumentConfig::cfKeepIndentProfile, state );
+- else if ( var == "keep-extra-spaces" && checkBoolValue( val, &state ) )
+- m_config->setConfigFlags( KateDocumentConfig::cfKeepExtraSpaces, state );
+- else if ( var == "tab-indents" && checkBoolValue( val, &state ) )
+- m_config->setConfigFlags( KateDocumentConfig::cfTabIndents, state );
+- else if ( var == "show-tabs" && checkBoolValue( val, &state ) )
+- m_config->setConfigFlags( KateDocumentConfig::cfShowTabs, state );
+- else if ( var == "space-indent" && checkBoolValue( val, &state ) )
+- m_config->setConfigFlags( KateDocumentConfig::cfSpaceIndent, state );
+- else if ( var == "smart-home" && checkBoolValue( val, &state ) )
+- m_config->setConfigFlags( KateDocumentConfig::cfSmartHome, state );
+- else if ( var == "replace-trailing-space-save" && checkBoolValue( val, &state ) )
+- m_config->setConfigFlags( KateDocumentConfig::cfRemoveSpaces, state );
+- else if ( var == "auto-insert-doxygen" && checkBoolValue( val, &state) )
+- m_config->setConfigFlags( KateDocumentConfig::cfDoxygenAutoTyping, state);
+- else if ( var == "mixed-indent" && checkBoolValue( val, &state ) )
+- m_config->setConfigFlags( KateDocumentConfig::cfMixedIndent, state );
+-
+- // INTEGER SETTINGS
+- else if ( var == "tab-width" && checkIntValue( val, &n ) )
+- m_config->setTabWidth( n );
+- else if ( var == "indent-width" && checkIntValue( val, &n ) )
+- m_config->setIndentationWidth( n );
+- else if ( var == "indent-mode" )
++ QStringList l;
++ l << "unix" << "dos" << "mac";
++ if ( (n = l.findIndex( val.lower() )) != -1 )
++ m_config->setEol( n );
++ }
++ else if ( var == "encoding" )
++ m_config->setEncoding( val );
++ else if ( var == "syntax" || var == "hl" )
++ {
++ for ( uint i=0; i < hlModeCount(); i++ )
+ {
+- if ( checkIntValue( val, &n ) )
+- m_config->setIndentationMode( n );
+- else
+- m_config->setIndentationMode( KateAutoIndent::modeNumber( val) );
+- }
+- else if ( var == "word-wrap-column" && n > 0 && checkIntValue( val, &n ) ) // uint, but hard word wrap at 0 will be no fun ;)
+- m_config->setWordWrapAt( n );
+- else if ( var == "undo-steps" && n >= 0 && checkIntValue( val, &n ) )
+- setUndoSteps( n );
+-
+- // STRING SETTINGS
+- else if ( var == "eol" || var == "end-of-line" )
+- {
+- QStringList l;
+- l << "unix" << "dos" << "mac";
+- if ( (n = l.findIndex( val.lower() )) != -1 )
+- m_config->setEol( n );
+- }
+- else if ( var == "encoding" )
+- m_config->setEncoding( val );
+- else if ( var == "syntax" || var == "hl" )
+- {
+- for ( uint i=0; i < hlModeCount(); i++ )
++ if ( hlModeName( i ).lower() == val.lower() )
+ {
+- if ( hlModeName( i ).lower() == val.lower() )
+- {
+- setHlMode( i );
+- break;
+- }
++ setHlMode( i );
++ break;
+ }
+ }
++ }
+
+- // VIEW SETTINGS
+- else if ( vvl.contains( var ) )
+- setViewVariable( var, val );
+- else
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.28&r2=1.29&f=u
More information about the pld-cvs-commit
mailing list