SOURCES: kdelibs-branch.diff, kdebase-branch.diff - updated
arekm
arekm at pld-linux.org
Sat Mar 31 00:38:55 CEST 2007
Author: arekm Date: Fri Mar 30 22:38:55 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdelibs-branch.diff (1.50 -> 1.51) , kdebase-branch.diff (1.51 -> 1.52)
---- Diffs:
================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.50 SOURCES/kdelibs-branch.diff:1.51
--- SOURCES/kdelibs-branch.diff:1.50 Sat Feb 24 15:54:33 2007
+++ SOURCES/kdelibs-branch.diff Sat Mar 31 00:38:49 2007
@@ -1,7 +1,7 @@
Index: interfaces/kscript/sample/shellscript.desktop
===================================================================
---- interfaces/kscript/sample/shellscript.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ interfaces/kscript/sample/shellscript.desktop (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- interfaces/kscript/sample/shellscript.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ interfaces/kscript/sample/shellscript.desktop (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -3,6 +3,7 @@
Name=Bash Shell Script Runner
Name[af]=Bash Tolk Skrip Hardloper
@@ -52,8 +52,8 @@
Comment[pa]=ਇੱਕ ਕਾਰਜ ਵਿੱਚ ਬੈਸ਼ ਸ਼ੈਲ ਸਕ੍ਰਿਪਟਾਂ ਚਲਾਉਣ ਲਈ ਸਹਾਇਕ ਹੈ
Index: interfaces/kscript/scriptinterface.desktop
===================================================================
---- interfaces/kscript/scriptinterface.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- interfaces/kscript/scriptinterface.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -6,6 +6,7 @@
Comment[af]=Hierdie is 'n generies toets skrip masjien vir toetsing die skrip koppelvlak.
Comment[ar]=هذه آلة نصوص برمجية اختبارية لاختبار واجهة النص البرمجي.
@@ -82,8 +82,8 @@
Comment[nso]=Ye ke engine ya thswaelo ya teko ya kakaretso yeo e somiswago go leka sefahlego sa tshwaelo.
Index: interfaces/kimproxy/interface/dcopinstantmessenger.desktop
===================================================================
---- interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -4,6 +4,7 @@
X-KDE-ServiceType=DCOP/InstantMessenger
Comment=Instant Messenger with a DCOP interface
@@ -110,8 +110,8 @@
Comment[pa]=ਇੱਕ DCOP ਇੰਟਰਫੇਸ ਲਈ ਇੱਕ ਮੌਕਾ ਸੁਨੇਹਾਕਾਰ
Index: interfaces/kimproxy/interface/kcm_instantmessenger.desktop
===================================================================
---- interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -1,5 +1,6 @@
Name=Instant Messenger
Name[af]=Oombliklike Boodskapper
@@ -166,10 +166,21 @@
Comment[nl]=De instant messenger maakt directe communicatie tussen personen of groepen mogelijk.
Comment[nn]=Eit lynmeldingsprogram som tillèt tovegsprat mellom enkeltpersonar og grupper.
Comment[pa]=ਇਹ ਮੌਕਾ ਸੁਨੇਹਾਕਾਰ ਇੱਕਲੇ ਤੇ ਸਮੂਹ ਵਿਚਕਾਰ ਦੋ ਪਾਸੀ ਗਲਬਾਤ ਲਈ ਸਹਾਇਕ ਹੈ
+@@ -99,8 +106,8 @@
+ Comment[se]=Šleađgadiehtoprográmma gos olbmot ja joavkkut sáhttet buillardallat (chat).
+ Comment[sk]=Instant messenger umožňuje rozhovor medzi rôznymi osobami a skupinami.
+ Comment[sl]=Takojšni sporočilnik omogoča dvosmeren klepet med posamezniki in skupinami.
+-Comment[sr]=Брзи гласник вам омогућава двосмерно ћаскање између индивидуа и група.
+-Comment[sr at Latn]=Brzi glasnik vam omogućava dvosmerno ćaskanje između individua i grupa.
++Comment[sr]=Брзи гласник вам омогућава двосмерно ћаскање између појединаца и група.
++Comment[sr at Latn]=Brzi glasnik vam omogućava dvosmerno ćaskanje između pojedinaca i grupa.
+ Comment[sv]=Direktmeddelanden möjliggör tvåvägschatt mellan individer och grupper.
+ Comment[ta]=உடனடி தகவல் உங்களை இரண்டு வழியில் தனிநபர் மற்றும் குழுக்கள் இடையே அனுமதிக்கும்.
+ Comment[tg]=Клиенти мубодилаи иттилоот барои мубодилаи иттилоот байни одамон ва гурӯҳҳо хизмат мерасонад.
Index: interfaces/kspeech/dcoptexttospeech.desktop
===================================================================
---- interfaces/kspeech/dcoptexttospeech.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ interfaces/kspeech/dcoptexttospeech.desktop (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- interfaces/kspeech/dcoptexttospeech.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ interfaces/kspeech/dcoptexttospeech.desktop (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -4,6 +4,7 @@
X-KDE-ServiceType=DCOP/Text-to-Speech
Comment=Text-to-Speech Service with a DCOP interface
@@ -178,7 +189,15 @@
Comment[bg]=Синтез на глас с интерфейс DCOP
Comment[bn]=ডিকপ (DCOP) ইন্টারফেস সহ টেক্সট-টু-স্পীচ সার্ভিস
Comment[bs]=Servis za izgovaranje teksta sa DCOP interfejsom
-@@ -30,6 +31,7 @@
+@@ -13,6 +14,7 @@
+ Comment[da]=Tekst-til-tale tjeneste med DCOP-grænseflade
+ Comment[de]=Sprachausgabe mit DCOP-Schnittstelle
+ Comment[el]=Υπηρεσία κειμένου-σε-ομιλία με διασύνδεση DCOP
++Comment[eo]=LegitaTeksto (TTS) kun DCOP-interfaco
+ 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
+@@ -30,6 +32,7 @@
Comment[is]=Texti-í-tal þjónusta með DCOP viðmóti
Comment[it]=Servizio di pronuncia con un'interfaccia DCOP
Comment[ja]=DCOP インターフェースで動作するテキスト読み上げサービス
@@ -186,7 +205,7 @@
Comment[km]=សេវា អត្ថបទ-ទៅ-សំដី ដែលមានចំណុចប្រទាក់ DCOP
Comment[lb]=Sproochausgab-Service mat engem DCOP-Interface
Comment[lt]=Teksto vertimo kalba tarnyba su DCOP sąsaja
-@@ -37,6 +39,7 @@
+@@ -37,6 +40,7 @@
Comment[ms]=Servis Teks-ke-Tutur dengan antara muka DCOP
Comment[nb]=Tekst til tale-program med DCOP-grensesnitt
Comment[nds]=Vörleesdeenst mit DCOP-Koppelsteed
@@ -196,8 +215,8 @@
Comment[pa]=ਇੱਕ DCOP ਇੰਟਰਫੇਸ ਨਾਲ ਪਾਠ-ਤੋਂ-ਬੋਲੀ ਸੇਵਾ
Index: interfaces/ktexteditor/ktexteditoreditor.desktop
===================================================================
---- interfaces/ktexteditor/ktexteditoreditor.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ interfaces/ktexteditor/ktexteditoreditor.desktop (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- interfaces/ktexteditor/ktexteditoreditor.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ interfaces/ktexteditor/ktexteditoreditor.desktop (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -7,6 +7,7 @@
Comment[af]=Inlegbare Teks Redigeerder Komponent (sonder om te Dok/Besigtig Seperasie)
Comment[ar]=مكوّن تحرير النصوص القابل للدمج )مع Doc/View Separation(
@@ -224,8 +243,8 @@
Comment[nso]=Seripa seo se Robatsegago sa Mofetosi wa Sengwalwana (kantle le Karogano ya Doc/Bona)
Index: interfaces/ktexteditor/kcm_ktexteditor.desktop
===================================================================
---- interfaces/ktexteditor/kcm_ktexteditor.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ interfaces/ktexteditor/kcm_ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- interfaces/ktexteditor/kcm_ktexteditor.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ interfaces/ktexteditor/kcm_ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -2,6 +2,7 @@
Name[af]=Ingebedde Teks Redigeerder
Name[ar]=محرر نص مدمج
@@ -258,10 +277,12 @@
Comment[bg]=Текстовия редактор, представлява компонент за вграждане в другите програми, който предоставя функционалност за разглеждане и редактиране на текстови файлове.
Comment[bn]=টেক্সট সম্পাদক সার্ভিসটি বিভিন্ন অ্যাপলিকেশন-কে একটি টেক্সট প্রদর্শক এবং সম্পাদক ব্যবহার করার সুযোগ দেয়। কোন কে.ডি.ই. অ্যাপলিকেশন টেক্সট সম্পাদনা করার সুবিধা দিতে চাইলে তার এই সার্ভিসটি ব্যবহার করা উচিত্।
Comment[bs]=Text editor servis pruža aplikacijama preglednik i editor teksta. KDE aplikacije koje imaju mogućnost editovanja teksta bi trebale koristiti ovaj servis.
-@@ -106,6 +110,7 @@
+@@ -105,7 +109,8 @@
+ Comment[id]=Layanan penyuntingan teks memberikan penampil dan penyunting teks untuk aplikasi. Aplikasi KDE yang menyediakan fasilitas penyuntingan teks seharusnya menggunakan layanan ini.
Comment[is]=Ívafni ritillinn færir forritum texta-skoðara og ritil. KDE forrit sem birta ritil til textavinnslu ættu að nota þessa þjónustu.
Comment[it]=Il servizio di editor di testi fornisce alle applicazioni un visualizzatore ed un editor di testi. Le applicazioni KDE che permettono l'elaborazione di testi dovrebbero usare questo servizio.
- Comment[ja]=テキストエディタサービスはアプリケーションにテキストビューアとテキストエディタを提供します。テキスト編集の機能を持つ KDEアプリケーションはこれを使用します。
+-Comment[ja]=テキストエディタサービスはアプリケーションにテキストビューアとテキストエディタを提供します。テキスト編集の機能を持つ KDEアプリケーションはこれを使用します。
++Comment[ja]=テキストエディタサービスはアプリケーションにテキストビューアとテキストエディタを提供します。テキスト編集の機能を持つ KDE アプリケーションはこれを使用します。
+Comment[kk]=Қолданбаларға мәтінді қарау және өңдеу мүмкіншілікті беретін қызмет. Мәтінді өңдеу үшін KDE қолданбалар осы қызметті пайдалану керек.
Comment[km]=សេវាកម្មវិធីនិពន្ធអត្ថបទផ្តល់នូវសំណុំកម្មវិធីរួមមានកម្មវិធីមើលអត្ថបទ និង កម្មវិធីនិពន្ធអត្ថបទ ។ សំណុំកម្មវិធី KDE ដែលផ្តល់មធ្យោបាយនិពន្ធអត្ថបទ គួរប្រើសេវានេះ ។
Comment[ko]=이 글월 편집기 서비스는 응용 프로그램이 글월을 보거나 고칠 수 있는 기능을 제공합니다. 글월을 고칠 수 있는 KDE 응용 프로그램은 이 서비스를 써야 합니다.
@@ -276,8 +297,8 @@
Comment[nso]=Tirelo ya phetoso ya sengwalwana e aba ditshumiso le molebeledi lemofetosi wa sengwalwana. Ditshumiso tsa KDE tseo di abago ditirelo tsaphetoso ya sengwalwana di swanetse go somisa tirelo ye.
Index: interfaces/ktexteditor/templateinterface.cpp
===================================================================
---- interfaces/ktexteditor/templateinterface.cpp (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ interfaces/ktexteditor/templateinterface.cpp (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- interfaces/ktexteditor/templateinterface.cpp (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ interfaces/ktexteditor/templateinterface.cpp (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -20,6 +20,7 @@
#include "document.h"
#include <stdaddressbook.h>
@@ -294,7 +315,7 @@
- KMessageBox::sorry(parentWindow,i18n("The template needs information about you, please set your identity in your addressbook"));\
- return false; \
+ if ( KMessageBox::questionYesNo(parentWindow, \
-+ "This template uses personal data that is stored in the KDE addressbook, but you have not selected a personal entry. You can still use the template without one, but you will have to type personal data. Would you like to select one now?", \
++ i18n( "This template uses personal data that is stored in the KDE addressbook, but you have not selected a personal entry. You can still use the template without one, but you will have to type personal data. Would you like to select one now?" ), \
+ "Personal data requested", \
+ KStdGuiItem::yes(), KStdGuiItem::no(), "select personal data entry") == KMessageBox::Yes ) { \
+ userAddress = KABC::AddresseeDialog::getAddressee(parentWindow); \
@@ -338,8 +359,8 @@
{
Index: interfaces/ktexteditor/ktexteditor.desktop
===================================================================
---- interfaces/ktexteditor/ktexteditor.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ interfaces/ktexteditor/ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- interfaces/ktexteditor/ktexteditor.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ interfaces/ktexteditor/ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -7,6 +7,7 @@
Comment[af]=Inlegbare Teks Redigeerder Komponent (met Dok/Besigtig Seperasie)
Comment[ar]=مكوّن تحرير النصوص القابل للدمج )مع Doc/View Separation(
@@ -366,8 +387,8 @@
Comment[nso]=Seripa seo se Robatsegago sa Mofetosi wa Sengwalwana (le Karogano ya Doc/Bona)
Index: interfaces/ktexteditor/ktexteditorplugin.desktop
===================================================================
---- interfaces/ktexteditor/ktexteditorplugin.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ interfaces/ktexteditor/ktexteditorplugin.desktop (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- interfaces/ktexteditor/ktexteditorplugin.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ interfaces/ktexteditor/ktexteditorplugin.desktop (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -7,7 +7,7 @@
Comment[af]=KTextEditor Inprop Module
Comment[ar]=مساعد برنامج KTextEditor
@@ -395,8 +416,8 @@
Comment[nso]=Tsenyo ya Mofetosi wa Sengwalwana sa K
Index: kmdi/test/Makefile.am
===================================================================
---- kmdi/test/Makefile.am (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ kmdi/test/Makefile.am (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- kmdi/test/Makefile.am (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ kmdi/test/Makefile.am (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -5,5 +5,6 @@
kfourchildren_SOURCES = hello.cpp main.cpp mainwidget.cpp
@@ -407,8 +428,8 @@
Index: kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
===================================================================
---- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -4,6 +4,7 @@
Name[af]=KTextEditor KDataTool Inprop Module
Name[ar]=ملحق KDataTool لـ KTextEditor
@@ -459,8 +480,8 @@
Comment[nso]=Kgontsha dibereka tsa data goswana le thesaurus le tebelelo yamongwalo (ge di tsentswe)
Index: kate/plugins/insertfile/ktexteditor_insertfile.desktop
===================================================================
---- kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -4,7 +4,7 @@
Name[af]=KTextEditor Voeg Lêer Inprop Module
Name[ar]=ملحق إدراج ملف لمحرر النصوص
@@ -494,6 +515,15 @@
Comment[bg]=Вмъкване на файл от мястото на курсора
Comment[bn]=কার্সার অবস্থানে যে কোনো (পাঠযোগ্য) ফাইল অন্তর্ভুক্ত করতে পারে
Comment[bs]=Ubacuje bilo koju čitljivu datoteku na poziciju kursora
+@@ -91,7 +94,7 @@
+ 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[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
@@ -101,6 +104,7 @@
Comment[is]=Setur inn hvaða lesanlegu skrá sem er í stöðu bendilsins
Comment[it]=Inserisce un qualsiasi file leggibile alla posizione del cursore
@@ -512,8 +542,8 @@
Comment[pa]=ਕੋਈ ਪੜਨਯੋਗ ਫਾਇਲ ਕਰਸਰ ਸਥਿਤੀ ਤੇ ਸ਼ਾਮਿਲ ਕਰੋ
Index: kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
===================================================================
---- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -2,7 +2,7 @@
Encoding=UTF-8
Name=KTextEditor Autobookmarker
@@ -523,10 +553,12 @@
Name[bn]=কে-টেক্সট-এডিটর অটো-মুকমার্কার
Name[br]=Sinedoù emgefreek evit KTextEditor
Name[bs]=KTextEditor automatske zabilješke
-@@ -18,6 +18,7 @@
+@@ -17,7 +17,8 @@
+ Name[fa]=چوب الف خودکار KTextEditor
Name[fi]=KTextEditorin automaattinen kirjanmerkkien tekijä
Name[fr]=Signets automatiques KTextEditor
- Name[fy]=Automatyske Blêdwizer foar de KTekstbewurker
+-Name[fy]=Automatyske Blêdwizer foar de KTekstbewurker
++Name[fy]=Automatyske blêdwizer foar de KTekstbewurker
+Name[ga]=Leabharmharcálaí Uathoibríoch KTextEditor
Name[gl]=Auto-marcador de KTextEditor
Name[he]= תוסף סימניות אוטומטיות של KTextEditor
@@ -555,10 +587,12 @@
Comment[gl]=Pon marcadores en liñas que se axusten a un patrón durante a carga de documentos
Comment[he]=קובע סימניות בשורות המתאים לתבנית מסוימת בעת טעינת מסמך
Comment[hi]=जब दस्तावेज़ लोड हों तो किसी पैटर्न से मेल खाती पंक्तियो में पुस्तचिह्न सेट करें
-@@ -85,6 +89,7 @@
+@@ -84,7 +88,8 @@
+ Comment[id]=Set bookmark in baris yang cocok dengan sebuah pola jika dokumen dimuatkan
Comment[is]=Setur bókamerki á línur sem passa ákveðnu mynstri, þegar skjöl eru lesin
Comment[it]=Imposta dei segnalibri sulle righe corrispondenti a uno schema quando si caricano dei documenti
- Comment[ja]=文書が読み込まれた時、パターンにマッチした行にブックマークを設定します
+-Comment[ja]=文書が読み込まれた時、パターンにマッチした行にブックマークを設定します
++Comment[ja]=文書が読み込まれたときに、パターンにマッチした行にブックマークを設定します
+Comment[kk]=Құжатта үлгі бойынша бетбелгілерді кояды
Comment[km]=កំណត់ការចំណាំត្រង់បន្ទាត់ដែលដូចនឹងឃ្លា ពេលឯកសារត្រូវបានផ្ទុក
Comment[lb]=Setzt Lieszeechen op d'Zeilen, déi ee bestëmmtent Muster enthalen, wann d'Dokument geluede gëtt
@@ -573,8 +607,8 @@
Comment[pa]=ਜਦੋਂ ਵੀ ਦਸਤਾਵੇਜ਼ ਨੂੰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਬੁੱਕਮਾਰਕ ਨੂੰ ਸਤਰ-ਮੇਲ ਤਰਤੀਬ ਨਿਰਧਾਰਿਤ ਕਰੋ
Index: kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
===================================================================
---- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -2,6 +2,7 @@
Encoding=UTF-8
Name=KTextEditor Word Completion Plugin
@@ -641,8 +675,8 @@
Comment[pa]=ਦਸਤਾਵੇਜ਼ ਵਿੱਚ ਦਿਸ਼ਾਵੀ ਜਾਂ ਪੋਪਅੱਪ ਆਧਾਰਿਤ ਸ਼ਬਦ ਪੂਰਨ
Index: kate/plugins/wordcompletion/docwordcompletion.cpp
===================================================================
---- kate/plugins/wordcompletion/docwordcompletion.cpp (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ kate/plugins/wordcompletion/docwordcompletion.cpp (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- kate/plugins/wordcompletion/docwordcompletion.cpp (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ kate/plugins/wordcompletion/docwordcompletion.cpp (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -131,7 +131,8 @@
QString lastIns; // latest applied completion
QRegExp re; // hrm
@@ -804,8 +838,8 @@
d->col = fw ? 0 : ln.length();
Index: kate/plugins/isearch/ktexteditor_isearch.desktop
===================================================================
---- kate/plugins/isearch/ktexteditor_isearch.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ kate/plugins/isearch/ktexteditor_isearch.desktop (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- kate/plugins/isearch/ktexteditor_isearch.desktop (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ kate/plugins/isearch/ktexteditor_isearch.desktop (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -4,6 +4,7 @@
Name[af]=KTextEditor Inkrementele Soektog Inprop Module
Name[ar]=ملحق بحث تزايدي لمحرر نصوص كيدي
@@ -856,10 +890,23 @@
Comment[nl]=Ook bekend als "Zoeken terwijl u typt"
Comment[nn]=Òg kjend som søk «etter kvart som du skriv»
Comment[pa]=ਇਸ ਤਰਾਂ ਵੀ ਜਾਣੋ ਕਿ "ਜਿਵੇਂ ਤੁਸੀਂ ਖੋਜ ਲਿਖੀ"
+Index: kate/part/katehighlight.cpp
+===================================================================
+--- kate/part/katehighlight.cpp (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ kate/part/katehighlight.cpp (.../branches/KDE/3.5/kdelibs) (wersja 648290)
+@@ -2410,7 +2410,7 @@
+
+ do
+ {
+- kdDebug(13010)<<"**************** Outter loop in make ContextList"<<endl;
++ kdDebug(13010)<<"**************** Outer loop in make ContextList"<<endl;
+ kdDebug(13010)<<"**************** Hl List count:"<<embeddedHls.count()<<endl;
+ something_changed=false; //assume all "embedded" hls have already been loaded
+ for (KateEmbeddedHlInfos::const_iterator it=embeddedHls.begin(); it!=embeddedHls.end();++it)
Index: kate/part/katesupercursor.cpp
===================================================================
---- kate/part/katesupercursor.cpp (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ kate/part/katesupercursor.cpp (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- kate/part/katesupercursor.cpp (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ kate/part/katesupercursor.cpp (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -184,12 +184,17 @@
void KateSuperCursor::editLineWrapped(uint line, uint col, bool newLine)
@@ -884,8 +931,8 @@
{
Index: kate/part/kateview.h
===================================================================
---- kate/part/kateview.h (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ kate/part/kateview.h (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- kate/part/kateview.h (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ kate/part/kateview.h (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -83,7 +83,7 @@
//
public slots:
@@ -897,8 +944,8 @@
Index: kate/part/katecursor.h
===================================================================
---- kate/part/katecursor.h (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ kate/part/katecursor.h (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- kate/part/katecursor.h (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ kate/part/katecursor.h (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -23,6 +23,7 @@
#define kate_cursor_h
@@ -923,8 +970,8 @@
KateTextCursor tmp = c1;
Index: kate/part/katesearch.cpp
===================================================================
---- kate/part/katesearch.cpp (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ kate/part/katesearch.cpp (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- kate/part/katesearch.cpp (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ kate/part/katesearch.cpp (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -393,7 +393,7 @@
kdDebug()<<"KateSearch::replaceOne(): you don't have "<<ccap<<" backreferences in regexp '"<<m_re.pattern()<<"'"<<endl;
}
@@ -936,8 +983,8 @@
Index: kate/part/kateview.cpp
===================================================================
---- kate/part/kateview.cpp (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ kate/part/kateview.cpp (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- kate/part/kateview.cpp (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ kate/part/kateview.cpp (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -1570,7 +1570,10 @@
void KateView::selectLine( const KateTextCursor& cursor )
@@ -966,8 +1013,8 @@
if (!hasSelection())
Index: kate/part/kateviewinternal.cpp
===================================================================
---- kate/part/kateviewinternal.cpp (.../tags/KDE/3.5.6/kdelibs) (wersja 636868)
-+++ kate/part/kateviewinternal.cpp (.../branches/KDE/3.5/kdelibs) (wersja 636868)
+--- kate/part/kateviewinternal.cpp (.../tags/KDE/3.5.6/kdelibs) (wersja 648290)
++++ kate/part/kateviewinternal.cpp (.../branches/KDE/3.5/kdelibs) (wersja 648290)
@@ -873,7 +873,7 @@
/* Check for hasFocus() to avoid crashes in QXIMInputContext as in bug #131266.
This is only a workaround until somebody can find the real reason of the crash
@@ -1007,14 +1054,41 @@
if ( !m_doc->highlight()->isInWord( l->getChar( c ) ) )
break;
-@@ -2097,23 +2094,13 @@
+@@ -2086,34 +2083,36 @@
+ case Line:
+ if ( newCursor.line() > selStartCached.line() )
+ {
++ if ( newCursor.line()+1 >= m_doc->numLines() )
++ newCursor.setCol( m_doc->textLine( newCursor.line() ).length() );
++ else
++ newCursor.setPos( newCursor.line() + 1, 0 );
++ // Grow to include entire line
+ selectAnchor = selStartCached;
+- newCursor.setCol( m_doc->textLine( newCursor.line() ).length() );
++ selectAnchor.setCol( 0 );
+ }
+ else if ( newCursor.line() < selStartCached.line() )
+ {
++ newCursor.setCol( 0 );
++ // Grow to include entire line
+ selectAnchor = selEndCached;
+- newCursor.setCol( 0 );
++ if ( selectAnchor.col() > 0 )
++ {
++ if ( selectAnchor.line()+1 >= m_doc->numLines() )
++ selectAnchor.setCol( m_doc->textLine( selectAnchor.line() ).length() );
++ else
++ selectAnchor.setPos( selectAnchor.line() + 1, 0 );
++ }
+ }
else // same line, ignore
doSelect = false;
break;
- default: // *allways* keep original selection for mouse
+ default:
{
- if ( selStartCached.line() < 0 ) // invalid
+- if ( selStartCached.line() < 0 ) // invalid
++ if ( selectAnchor.line() < 0 ) // invalid
break;
- if ( newCursor.line() > selEndCached.line() ||
@@ -1029,12 +1103,11 @@
-
- else
- doSelect = false;
-+ selectAnchor = selStartCached;
+ doSelect = true;
}
// break;
}
-@@ -2138,7 +2125,7 @@
+@@ -2138,7 +2137,7 @@
{
if ( !force && (cursor == newCursor) )
{
@@ -1043,7 +1116,7 @@
{
// unfold if required
m_doc->foldingTree()->ensureVisible( newCursor.line() );
-@@ -2158,7 +2145,8 @@
+@@ -2158,7 +2157,8 @@
displayCursor.setPos (m_doc->getVirtualLine(cursor.line()), cursor.col());
cXPos = m_view->renderer()->textWidth( cursor );
@@ -1053,7 +1126,16 @@
updateBracketMarks();
-@@ -2674,6 +2662,7 @@
+@@ -2386,7 +2386,7 @@
+ if( !l )
+ return false;
+
+- int col = m_view->renderer()->textPos( l, p.x() - thisRange.xOffset(), thisRange.startCol, false );
++ int col = m_view->renderer()->textPos( l, startX() + p.x() - thisRange.xOffset(), thisRange.startCol, false );
+
+ return m_view->lineColSelected( thisRange.line, col );
+ }
+@@ -2674,6 +2674,7 @@
selStartCached = m_view->selectStart;
selEndCached = m_view->selectEnd;
@@ -1061,19 +1143,71 @@
e->accept ();
return;
-@@ -2683,6 +2672,7 @@
+@@ -2681,11 +2682,13 @@
+
+ if ( e->state() & Qt::ShiftButton )
{
- selStartCached = m_view->selectStart;
- selEndCached = m_view->selectEnd;
-+ updateCursor( selEndCached );
+- selStartCached = m_view->selectStart;
+- selEndCached = m_view->selectEnd;
++ if (selectAnchor.line() < 0)
++ selectAnchor = cursor;
}
else
++ {
selStartCached.setLine( -1 ); // invalidate
-@@ -2725,23 +2715,33 @@
- selStartCached = m_view->selectStart;
- selEndCached = m_view->selectEnd;
- updateSelection( cursor, true );
-+ updateCursor( selEndCached );
++ }
+
+ if( isTargetSelected( e->pos() ) )
+ {
+@@ -2696,7 +2699,35 @@
+ {
+ dragInfo.state = diNone;
+
+- placeCursor( e->pos(), e->state() & ShiftButton );
++ if ( e->state() & Qt::ShiftButton )
++ {
++ placeCursor( e->pos(), true, false );
++ if ( selStartCached.line() >= 0 )
++ {
++ if ( cursor > selEndCached )
++ {
++ m_view->setSelection( selStartCached, cursor );
++ selectAnchor = selStartCached;
++ }
++ else if ( cursor < selStartCached )
++ {
++ m_view->setSelection( cursor, selEndCached );
++ selectAnchor = selEndCached;
++ }
++ else
++ {
++ m_view->setSelection( selStartCached, cursor );
++ }
++ }
++ else
++ {
++ m_view->setSelection( selectAnchor, cursor );
++ }
++ }
++ else
++ {
++ placeCursor( e->pos() );
++ }
+
+ scrollX = 0;
+ scrollY = 0;
+@@ -2722,26 +2753,36 @@
+
+ if ( e->state() & Qt::ShiftButton )
+ {
+- selStartCached = m_view->selectStart;
+- selEndCached = m_view->selectEnd;
+- updateSelection( cursor, true );
++ // FIXME this is totally broken right now
++// selStartCached = m_view->selectStart;
++// selEndCached = m_view->selectEnd;
++// updateSelection( cursor, true );
++// updateCursor( selEndCached );
}
else
{
@@ -1097,8 +1231,7 @@
- if (!m_view->hasSelection())
+ if (m_view->hasSelection())
+ {
-+ selectAnchor = KateTextCursor (m_view->selEndLine(), m_view->selEndCol());
-+ selStartCached = m_view->selectStart;
++ selectAnchor = selStartCached = m_view->selectStart;
+ selEndCached = m_view->selectEnd;
+ updateCursor( selEndCached );
+ }
@@ -1111,7 +1244,7 @@
}
// Move cursor to end of selected word
-@@ -2753,6 +2753,7 @@
+@@ -2753,6 +2794,7 @@
selStartCached = m_view->selectStart;
selEndCached = m_view->selectEnd;
@@ -1119,20 +1252,20 @@
}
possibleTripleClick = true;
-@@ -2785,6 +2786,12 @@
+@@ -2785,6 +2827,12 @@
QApplication::clipboard()->setSelectionMode( true );
m_view->copy();
QApplication::clipboard()->setSelectionMode( false );
+ // Set cursor to edge of selection... which edge depends on what
+ // "direction" the selection was made in
-+ if ( m_view->selectStart < selStartCached )
++ if ( m_view->selectStart < selectAnchor )
+ updateCursor( m_view->selectStart );
+ else
+ updateCursor( m_view->selectEnd );
m_selChangedByUser = false;
}
-@@ -2834,6 +2841,12 @@
+@@ -2834,6 +2882,12 @@
return;
}
@@ -1145,7 +1278,7 @@
mouseX = e->x();
mouseY = e->y();
-@@ -3087,7 +3100,7 @@
+@@ -3087,7 +3141,7 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.50&r2=1.51&f=u
http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.51&r2=1.52&f=u
More information about the pld-cvs-commit
mailing list