---- runtime/solid-device-automounter/kcm/device_automounter_kcm.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/solid-device-automounter/kcm/device_automounter_kcm.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -94,7 +94,7 @@
- Comment[pt]=Configurar o tratamento automático dos dispositivos removíveis de armazenamento
- Comment[pt_BR]=Configurar tratamento automático de dispositivos de armazenamento removíveis
- Comment[ro]=Configurează manipularea automată a mediilor de stocare amovibile
--Comment[ru]=Настройки автоматического подключения внешних носителей информации
-+Comment[ru]=Настройка автоматического подключения внешних носителей информации
- Comment[sk]=Nastavenie automatického zaobchádzania s vymeniteľnými médiami
- Comment[sl]=Nastavitve samodejnega rokovanja z odstranljivimi nosilci za shranjevanje
- Comment[sr]=Подешавање аутоматског руковања уклоњивим складишним медијумима
---- runtime/localization/currency/brl.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/brl.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -24,6 +24,7 @@
- Name[hr]=Brazilski real
- Name[hu]=Brazil real
- Name[id]=Real Brazil
-+Name[is]=Brasilískur real
- Name[it]=Real brasiliano
- Name[ja]=ブラジル・レアル
- Name[kk]=Бразилия риалы
---- runtime/localization/currency/tnd.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/tnd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -21,6 +21,7 @@
- Name[he]=דינר תוניסאי
- Name[hi]=ट्यूनीशियाई दिनार
- Name[hr]=Tuniski dinar
-+Name[hu]=Tunéziai dínár
- Name[id]=Dinar Tunisia
- Name[is]=Túnískur dínar
- Name[it]=Dinaro tunisino
---- runtime/localization/currency/shp.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/shp.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -21,6 +21,7 @@
- Name[he]=פאונד של סנט הלנה
- Name[hi]=सेंट हेलेना पोंड
- Name[hr]=Funta Svete Helene
-+Name[hu]=Szent Heléna-i font
- Name[id]=Pound Saint Helena
- Name[it]=Sterlina di Sant'Elena
- Name[ja]=セントヘレナ・ポンド
---- runtime/localization/currency/bsd.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/bsd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -24,6 +24,7 @@
- Name[hr]=Bahamski dolar
- Name[hu]=Bahamai dollár
- Name[id]=Dollar Bahamia
-+Name[is]=Bahama dollari
- Name[it]=Dollaro bahamense
- Name[ja]=バハマ・ドル
- Name[kk]=Багам доллары
---- runtime/localization/currency/sar.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/sar.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -21,6 +21,7 @@
- Name[he]=ריאל סעודי
- Name[hi]=सऊदी रियाल
- Name[hr]=Saudijski rijal
-+Name[hu]=Szaúdi riál
- Name[id]=Riyal Saudi
- Name[is]=Sádi-Arabískur ríal
- Name[it]=Riyal saudita
---- runtime/localization/currency/rsd.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/rsd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -21,6 +21,7 @@
- Name[he]=דינר סרבי
- Name[hi]=सर्बियाई दिनार
- Name[hr]=Srpski dinar
-+Name[hu]=Szerb dínár
- Name[id]=Dinar Serbia
- Name[is]=Serbneskur dínar
- Name[it]=Dinaro serbo
---- runtime/localization/currency/xof.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/xof.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[csb]=Zôpadno Afrikańsczi Frank
- Name[da]=Vestafrikansk CFA franc
- Name[de]=CFA-Franc BCEAO
-+Name[el]=Φράγκο Δημοκρατίας Κεντρικής Αφρικής
- Name[en_GB]=West African CFA Franc
- Name[eo]=Okcidenta afrika CFA franko
- Name[es]=Franco CFA de África Occidental
---- runtime/localization/currency/sit.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/sit.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -21,6 +21,7 @@
- Name[he]=טולר סלובני
- Name[hi]=स्लोवेनियाई तोलार
- Name[hr]=Slovenski tolar
-+Name[hu]=Szlovén tolár
- Name[id]=Tolar Slovenia
- Name[it]=Tallero sloveno
- Name[ja]=スロベニア・トラール
---- runtime/localization/currency/yer.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/yer.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[csb]=Jemeńsczi Rial
- Name[da]=Yemenitisk rial
- Name[de]=Jemen-Rial
-+Name[el]=Ριάλ Υεμένης
- Name[en_GB]=Yemeni Rial
- Name[es]=Rial yemení
- Name[et]=Jeemeni riaal
---- runtime/localization/currency/top.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/top.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -17,6 +17,7 @@
- Name[fr]=Pa'anga des Tonga
- Name[fy]=Tonganeeske pa'anga
- Name[hr]=Tonganska pa'anga
-+Name[hu]=Tongai pa'anga
- Name[id]=Pa'anga Tonga
- Name[it]=Paʻanga tongano
- Name[ja]=トンガ・パ・アンガ
---- runtime/localization/currency/sbd.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/sbd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -21,6 +21,7 @@
- Name[he]=דולר של איי שלמה
- Name[hi]=सोलोमन आइलैंड डॉलर
- Name[hr]=Dolar solomonskih otoka
-+Name[hu]=Salamon-szigeteki dollár
- Name[id]=Dollar Kepulauan Solomon
- Name[is]=Salómonseyjadollari
- Name[it]=Dollaro delle Isole Salomone
---- runtime/localization/currency/bdt.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/bdt.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -23,6 +23,7 @@
- Name[hr]=Bangladeška taka
- Name[hu]=Bangladesi taka
- Name[id]=Taka Bangladesh
-+Name[is]=Bangladeskt taka
- Name[it]=Taka bengalese
- Name[ja]=バングラデシュ・タカ
- Name[kk]=Бангладеш такасы
---- runtime/localization/currency/yum.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/yum.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[csb]=Jugòsłowiańsczi Dinar
- Name[da]=Jugoslavisk Dinar
- Name[de]=Jugoslawischer Dinar
-+Name[el]=Δηνάριο Γιουγκοσλαβίας
- Name[en_GB]=Yugoslav Dinar
- Name[es]=Dinar yugoslavo
- Name[et]=Jugoslaavia dinaar
---- runtime/localization/currency/syp.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/syp.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -21,6 +21,7 @@
- Name[he]=לירה סורית
- Name[hi]=सिरियाई पोंड
- Name[hr]=Sirijska funta
-+Name[hu]=Szír font
- Name[id]=Pound Suriah
- Name[is]=Sýrlenskt pund
- Name[it]=Lira siriana
---- runtime/localization/currency/thb.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/thb.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -20,6 +20,7 @@
- Name[gu]=થાઈ બાહ્ત
- Name[hi]=थाई भत
- Name[hr]=Tajlansdski baht
-+Name[hu]=Thai baht
- Name[id]=Baht Thailand
- Name[is]=Tælenskt baht
- Name[it]=Baht thailandese
---- runtime/localization/currency/srd.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/srd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -21,6 +21,7 @@
- Name[he]=דולר סורינאמי
- Name[hi]=सूरीनाम डॉलर
- Name[hr]=Surinamski dolar
-+Name[hu]=Suriname-i dollár
- Name[id]=Dolar Suriname
- Name[it]=Dollaro surinamese
- Name[ja]=スリナム・ドル
---- runtime/localization/currency/xpd.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/xpd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[csb]=Pallad
- Name[da]=Palladium
- Name[de]=Palladium
-+Name[el]=Παλλάδιο
- Name[en_GB]=Palladium
- Name[es]=Paladio
- Name[et]=Pallaadium
---- runtime/localization/currency/srg.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/srg.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -19,6 +19,7 @@
- Name[gu]=સુરિનામ ગિલ્ડર
- Name[he]=גיולדר סורינאמי
- Name[hr]=Surinamski gulden
-+Name[hu]=Suriname-i guilden
- Name[id]=Guilder Suriname
- Name[is]=Súrínamgyllini
- Name[it]=Fiorino surinamese
---- runtime/localization/currency/xpf.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/xpf.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[csb]=CFP Frank
- Name[da]=CFP-franc
- Name[de]=CFP Franc
-+Name[el]=Φράγκο CFP
- Name[en_GB]=CFP Franc
- Name[eo]=CFP franko
- Name[es]=Franco CFP
---- runtime/localization/currency/szl.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/szl.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -19,6 +19,7 @@
- Name[gu]=સ્વાઝિ લિલાન્ગેની
- Name[he]=לילאנגני של סוואזילנד
- Name[hr]=Svazski lilangeni
-+Name[hu]=Szváziföldi lilangeni
- Name[id]=Lilangeni Swaziland
- Name[it]=Lilangeni dello Swaziland
- Name[ja]=スワジランド・リランゲニ
---- runtime/localization/currency/veb.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/veb.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[csb]=Wenezuelsczi Bolívar Fuerte
- Name[da]=Venezuelansk bolivar fuerte
- Name[de]=Venezolanischer Bolívar
-+Name[el]=Μπολιβάρ φουέρτε Βενεζουέλας
- Name[en_GB]=Venezuelan Bolívar Fuerte
- Name[es]=Bolívar Fuerte venezolano
- Name[et]=Venezuela Bolívar Fuerte
---- runtime/localization/currency/xaf.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/xaf.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[csb]=Westrzódno Afrikańsczi Frank
- Name[da]=Centralafrikansk CFA-franc
- Name[de]=CFA-Franc BEAC
-+Name[el]=Φράγκο Δημοκρατίας Κεντρικής Αφρικής
- Name[en_GB]=Central African CFA Franc
- Name[eo]=centrafrika CFA franko
- Name[es]=Franco CFA de la República Centroafricana
---- runtime/localization/currency/xag.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/xag.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[csb]=Strzébro
- Name[da]=Sølv
- Name[de]=Silber
-+Name[el]=Ασήμι
- Name[en_GB]=Silver
- Name[eo]=Arĝento
- Name[es]=Plata
---- runtime/localization/currency/scr.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/scr.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -21,6 +21,7 @@
- Name[he]=רופיה של איי סיישל
- Name[hi]=शेसेल्स रुपया
- Name[hr]=Sejšelska rupija
-+Name[hu]=Seychelles-i rúpia
- Name[id]=Rupee Seychelles
- Name[it]=Rupia delle Seychelles
- Name[ja]=セーシェル・ルピー
---- runtime/localization/currency/skk.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/skk.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -21,6 +21,7 @@
- Name[he]=קורונה סלובקית
- Name[hi]=स्लोवाकिया कोरुना
- Name[hr]=Slovačka kruna
-+Name[hu]=Szlovák korona
- Name[id]=Koruna Slovakia
- Name[it]=Corona slovacca
- Name[ja]=スロバキア・コルナ
---- runtime/localization/currency/rub.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/rub.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -22,6 +22,7 @@
- Name[he]=רובל רוסי
- Name[hi]=रुसी रुबल
- Name[hr]=Ruski rubalj
-+Name[hu]=Orosz rubel
- Name[id]=Ruble Rusia
- Name[is]=Rússnesk rúbla
- Name[it]=Rublo russo
---- runtime/localization/currency/cdf.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/cdf.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -7,6 +7,7 @@
- Name[ca@valencia]=Franc congolés
- Name[da]=Congolesisk franc
- Name[de]=Kongo-Franc
-+Name[el]=Φράγκο κογκολέζικο
- Name[en_GB]=Congolese Franc
- Name[es]=Franco congolés
- Name[et]=Kongo frank
---- runtime/localization/currency/xau.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/xau.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[csb]=Złoto
- Name[da]=Guld
- Name[de]=Gold
-+Name[el]=Χρυσός
- Name[en_GB]=Gold
- Name[eo]=Oro
- Name[es]=Oro
---- runtime/localization/currency/zmk.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/zmk.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[csb]=Zambijskô Kwacha
- Name[da]=Zambisk kwacha
- Name[de]=Sambischer Kwacha
-+Name[el]=Κουάτσα Ζάμπιας
- Name[en_GB]=Zambian Kwacha
- Name[es]=Kwacha zambiano
- Name[et]=Sambia kwacha
---- runtime/localization/currency/rur.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/rur.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -21,6 +21,7 @@
- Name[he]=רובל רוסי (אחרי 1997)
- Name[hi]=रुसी रुबल A/97
- Name[hr]=Ruski rubalj A/97
-+Name[hu]=Orosz rubel A/97
- Name[id]=Ruble A/97 Rusia
- Name[is]=Rússnesk rúbla A/97
- Name[it]=Rublo russo A/97
---- runtime/localization/currency/sdd.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/sdd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -21,6 +21,7 @@
- Name[he]=דינר סודני
- Name[hi]=सूदानी दिनार
- Name[hr]=Sudanski dinar
-+Name[hu]=Szudáni dínár
- Name[id]=Dinar Sudan
- Name[it]=Dinaro sudanese
- Name[ja]=スーダン・ディナール
---- runtime/localization/currency/wst.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/wst.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[csb]=Samoańskô Tala
- Name[da]=Samoansk tala
- Name[de]=Samoanischer Tala
-+Name[el]=Τάλα Σαμόας
- Name[en_GB]=Samoan Tala
- Name[es]=Tala de Samoa
- Name[et]=Samoa tala
---- runtime/localization/currency/sdg.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/sdg.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -22,6 +22,7 @@
- Name[he]=לירה סודנית
- Name[hi]=सूदानी पोंड
- Name[hr]=Sudanska funta
-+Name[hu]=Szudáni font
- Name[id]=Pound Sudan
- Name[it]=Sterlina sudanese
- Name[ja]=スーダン・ポンド
---- runtime/localization/currency/vuv.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/vuv.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[csb]=Vanuatu Vatu
- Name[da]=Vanuatisk vatu
- Name[de]=Vatu
-+Name[el]=Βάτου Βανουάτου
- Name[en_GB]=Vanuatu Vatu
- Name[es]=Vatu de Vanuatu
- Name[et]=Vanuatu vatu
---- runtime/localization/currency/vnd.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/vnd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[csb]=Wietnamsczo Dong
- Name[da]=Vietnamesisk dong
- Name[de]=Đồng
-+Name[el]=Ντονγκ Βιετνάμ
- Name[en_GB]=Vietnamese Dong
- Name[es]=Dong vietnamita
- Name[et]=Vietnami dong
---- runtime/localization/currency/std.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/std.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -20,6 +20,7 @@
- Name[he]=דוברה של סאו טומה ופרינסיפה
- Name[hi]=साओ टोम तथा प्रिंसिपी
- Name[hr]=Dobra Sv. Tome i Principa
-+Name[hu]=Sao Tome és Principe-i dobra
- Name[id]=Dobra São Tomé dan Príncipe
- Name[it]=Dobra di São Tomé e Príncipe
- Name[ja]=サントメ・プリンシペ・ドブラ
---- runtime/localization/currency/sll.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/sll.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -19,6 +19,7 @@
- Name[gu]=સિએરા લિઓન લેવન
- Name[he]=לאון של סיירה לאון
- Name[hr]=Sijeraleonski leone
-+Name[hu]=Sierra Leone-i leone
- Name[id]=Leone Sierra Leone
- Name[it]=Leone della Sierra Leone
- Name[ja]=シエラレオネ・レオン
---- runtime/localization/currency/tjs.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/tjs.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -20,6 +20,7 @@
- Name[he]=סומוני טג'יקיסטני
- Name[hi]=ताजिकिस्तान सोमोनी
- Name[hr]=Tadžikistanski somoni
-+Name[hu]=Tádzsik szomoni
- Name[id]=Somoni Tajikistan
- Name[it]=Somoni tagico
- Name[ja]=タジキスタン・ソモニ
---- runtime/localization/currency/bgl.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/bgl.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -22,6 +22,7 @@
- Name[hr]=Bugarski Lev A/99
- Name[hu]=Bolgár régi leva
- Name[id]=Lev A/99 Bulgaria
-+Name[is]=Búlgarskur lev A/99
- Name[it]=Lev bulgaro A/99
- Name[ja]=旧ブルガリア・レフ
- Name[kk]=Болгария леві (99-ға дейінгі)
---- runtime/localization/currency/bgn.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/bgn.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -24,6 +24,7 @@
- Name[hr]=Bugarski lev
- Name[hu]=Bolgár új leva
- Name[id]=Lev Bulgaria
-+Name[is]=Búlgarskur lev
- Name[it]=Lev bulgaro
- Name[ja]=ブルガリア・レフ
- Name[kk]=Болгария леві
---- runtime/localization/currency/xcd.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/xcd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[csb]=Karajibsczi Dolar
- Name[da]=Østcaribisk dollar
- Name[de]=Ostkaribischer Dollar
-+Name[el]=Δολάριο ανατολικής Καραϊβικής
- Name[en_GB]=East Caribbean Dollar
- Name[eo]=Orienta Kariba dolaro
- Name[es]=Dólar del Caribe Oriental
---- runtime/localization/currency/sek.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/sek.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -22,6 +22,7 @@
- Name[he]=קורונה שוודית
- Name[hi]=स्विदी क्रोन
- Name[hr]=Švedska kruna
-+Name[hu]=Svéd korona
- Name[id]=Krona Swedia
- Name[is]=Sænsk króna
- Name[it]=Corona svedese
---- runtime/localization/currency/bov.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/bov.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -22,6 +22,7 @@
- Name[hr]=Bolivijski mvdol
- Name[hu]=Bolíviai mvdol
- Name[id]=Mvdol Bolivia
-+Name[is]=Bólivískur mvdol
- Name[it]=Mvdol boliviano
- Name[kk]=Боливияның Mvdol-ы
- Name[km]=បូលីវី Mvdol
---- runtime/localization/currency/rwf.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/rwf.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -22,6 +22,7 @@
- Name[he]=פרנק רואנדי
- Name[hi]=रवांडा फ्रांक
- Name[hr]=Ruandski frank
-+Name[hu]=Ruandai frank
- Name[id]=Franc Rwanda
- Name[is]=Rúandafranki
- Name[it]=Franco ruandese
---- runtime/localization/currency/cve.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/cve.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -49,7 +49,7 @@
- Name[sr@latin]=zelenortski eskudo
- Name[sv]=Kapverdiska escudo
- Name[tg]=Кабо-Верде
--Name[uk]=Ескудо Кабо Верде
-+Name[uk]=Ескудо Кабо-Верде
- Name[x-test]=xxCape Verde Escudoxx
- Name[zh_CN]=佛得角埃斯库多
- Name[zh_TW]=維德角─埃斯庫多（Escudo）
---- runtime/localization/currency/svc.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/svc.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -18,6 +18,7 @@
- Name[fy]=Salvadoraaske colon
- Name[he]=קולון סלוואדורי
- Name[hr]=Salvadorski kolon
-+Name[hu]=Salvadori colon
- Name[id]=Colon Salvador
- Name[it]=Colón salvadoregno
- Name[ja]=エルサルバドル・コロン
---- runtime/localization/currency/sgd.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/sgd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -22,6 +22,7 @@
- Name[he]=דולר סינגפורי
- Name[hi]=सिंगापोर डॉलर
- Name[hr]=Singapurški dolar
-+Name[hu]=Szingapúri dollár
- Name[id]=Dollar Singapura
- Name[it]=Dollaro di Singapore
- Name[ja]=シンガポール・ドル
-@@ -50,7 +51,7 @@
- Name[sr@latin]=singapurski dolar
- Name[sv]=Singaporianska dollar
- Name[tg]=Сингапур
--Name[uk]=Сингапурський долар
-+Name[uk]=Сінгапурський долар
- Name[x-test]=xxSingapore Dollarxx
- Name[zh_CN]=新加坡元
- Name[zh_TW]=新加坡─元（Dollar）
---- runtime/localization/currency/pen.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/pen.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -7,12 +7,14 @@
- Name[ca@valencia]=Nuevo Sol de Perú
- Name[da]=Peruviansk nuevo sol
- Name[de]=Peruanischer Sol
-+Name[el]=Νέο σολ Περουβιανό
- Name[en_GB]=Peruvian Nuevo Sol
- Name[es]=Nuevo sol peruano
- Name[et]=Peruu Nuevo Sol
- Name[eu]=Peruko nuevo sol
- Name[fr]=Nouveau sol péruvien
- Name[hr]=Peruanski novi sol
-+Name[hu]=Perui új sol
- Name[id]=Sol Nuevo Peru
- Name[it]=Nuevo sol peruviano
- Name[kk]=Перудың жаңа солі
---- runtime/localization/currency/bbd.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/bbd.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -24,6 +24,7 @@
- Name[hr]=Barbadoski dolar
- Name[hu]=Barbadosi dollár
- Name[id]=Dollar Barbados
-+Name[is]=Barbados dollari
- Name[it]=Dollaro di Barbados
- Name[ja]=バルバドス・ドル
- Name[kk]=Барбадос доллары
---- runtime/localization/currency/zar.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/zar.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -8,6 +8,7 @@
- Name[csb]=Pôłniowò Afrikańsczi Rand
- Name[da]=Sydafrikansk rand
- Name[de]=Südafrikanischer Rand
-+Name[el]=Νότια Αφρική ραντ
- Name[en_GB]=South African Rand
- Name[es]=Rand sudafricano
- Name[et]=LAV rand
---- runtime/localization/currency/tmm.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/tmm.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -19,6 +19,7 @@
- Name[he]=מאנאט ישן של טורקמניסטן
- Name[hi]=तुर्कमेनिस्तान पुराना मनत
- Name[hr]=Turkmenistanski stari manat
-+Name[hu]=Türkmén régi manat
- Name[id]=Manat Lama Turkmenistan
- Name[it]=Vecchio manat turkmeno
- Name[ja]=旧トルクメニスタン・マナト
---- runtime/localization/currency/sos.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/sos.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -21,6 +21,7 @@
- Name[he]=שילינג סומאלי
- Name[hi]=सोमाली शिल्लिंग
- Name[hr]=Somalijski šiling
-+Name[hu]=Szomáliai schilling
- Name[id]=Shilling Somalia
- Name[it]=Scellino somalo
- Name[ja]=ソマリア・シリング
---- runtime/localization/currency/tmt.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/localization/currency/tmt.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -19,6 +19,7 @@
- Name[he]=מאנאט של טורקמניסטן
- Name[hi]=तुर्कमेनिस्तानी मनत
- Name[hr]=Turkmenistanski manat
-+Name[hu]=Türkmén manat
- Name[id]=Manat Turkmenistan
- Name[it]=Manat turkmeno
- Name[ja]=トルクメニスタン・マナト
---- runtime/khelpcenter/plugins/faq.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/khelpcenter/plugins/faq.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -54,7 +54,7 @@
- Name[nb]=Ofte stilte KDE-spørsmål
- Name[nds]=Dat KDE-FAQ
- Name[ne]=KDE FAQ
--Name[nl]=Veel voorkomde vragen over KDE
-+Name[nl]=Veel voorkomende vragen over KDE
- Name[nn]=Ofte stilte KDE-spørsmål
- Name[or]=KDE FAQ
- Name[pa]=KDE ਸਵਾਲ-ਜਵਾਬ
---- runtime/doc/knetattach/index.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/doc/knetattach/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -34,12 +34,12 @@
- </copyright>
- <legalnotice>&FDLNotice;</legalnotice>
-
--<date>2005-02-09</date>
--<releaseinfo>1.01.00</releaseinfo>
-+<date>2010-01-18</date>
-+<releaseinfo>&kde; 4.4</releaseinfo>
-
- <abstract>
- <para>
--&knetattach; is an application which makes it easier to integrate your
-+&knetattach; is a wizard which makes it easier to integrate your
- network resources with your &kde; Desktop.
- </para>
- </abstract>
-@@ -59,11 +59,18 @@
-
- </bookinfo>
-
-+<!--
-+in kde 4 no application any more.
-+
-+konqueror/dolphin/gwenview enter "remote:/" in location bar or click Network in Places
-+"Add Network Folder" click opens the wizard
-+-->
-+
- <chapter id="introduction">
- <title>Introduction</title>
-
- <para>
--The &knetattach; program, affectionately and hereafter known as the
-+The &knetattach; wizard, affectionately and hereafter known as the
- Network Folder Wizard, allows easy addition and integration of various
- network folders with your &kde; desktop. Please report any problems or
- feature requests for it to the &kde; bugs website.
-@@ -75,10 +82,9 @@
-
- <para>
- As you will see in the screenshot below, the Network Folder Wizard currently
--allows
--you to add four types of network folders: WebDav, &FTP;,
--&Microsoft; &Windows; (Samba) network drives and
--SSH.
-+allows you to add four types of network folders: WebDav, &FTP;,
-+&Microsoft; &Windows; (Samba) network drives and SSH.
-+Additionally you can select a recent connection for the list box.
-
- <screenshot>
- <screeninfo>Here's a screenshot of &knetattach;</screeninfo>
-@@ -101,10 +107,11 @@
- <title>Adding network folders</title>
-
- <para>
--Network folders show up in a special location of &konqueror; called a
--<emphasis>virtual folder</emphasis>.
-+Network folders show up in a special location of &konqueror; and &dolphin;
-+called a <emphasis>virtual folder</emphasis>.
- This virtual folder is accessed by typing <userinput>remote:/</userinput> in
--&konqueror; <interface>Location bar</interface>. You will then be able to see
-+the location bar or by selecting <guilabel>Network</guilabel> from the
-+<guilabel>Places</guilabel> panel. You will then be able to see
- any folders which have been previously added and you also will be able to use
- the wizard to add new ones.
- <screenshot>
-@@ -133,8 +140,8 @@
- <para>
- Below is a list of the information needed by the wizard to create the network
- folders. If an option is not
--available for a particular folder it does not have to be entered. ⪚. The Samba
--folders do not require a <guilabel>Port</guilabel> entry.
-+available for a particular folder it does not have to be entered. The Samba
-+folders ⪚ do not require a <guilabel>Port</guilabel> entry.
- </para>
-
- <para>
-@@ -149,9 +156,17 @@
- </listitem>
- </varlistentry>
- <varlistentry>
--<term>Server:</term>
-+<term><guilabel>User:</guilabel></term>
- <listitem>
- <para>
-+This is the username that will be used to establish the connection.
-+</para>
-+</listitem>
-+</varlistentry>
-+<varlistentry>
-+<term><guilabel>Server:</guilabel></term>
-+<listitem>
-+<para>
- This is the address of the server you are attempting to add. It can be an
- IP address or domain name.
- </para>
-@@ -180,6 +195,14 @@
- </listitem>
- </varlistentry>
- <varlistentry>
-+<term><guilabel>Encoding:</guilabel></term>
-+<listitem>
-+<para>
-+Use the items in this list box to select an encoding for &FTP; and ssh connections.
-+</para>
-+</listitem>
-+</varlistentry>
-+<varlistentry>
- <term><guilabel>Create an icon for this remote folder</guilabel></term>
- <listitem>
- <para>
-@@ -289,7 +312,8 @@
- <para>
- To get back to our network folders all that is necessary is typing
- <action>remote:/</action>
--in the <guilabel>Location:</guilabel> bar of &konqueror;.
-+in the location bar of &konqueror; or &dolphin; or
-+select <guilabel>Network</guilabel> from the <guilabel>Places</guilabel> panel.
- </para>
-
- <para>
---- runtime/doc/faq/contrib.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/doc/faq/contrib.docbook (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -138,16 +138,6 @@
-
- <qandaentry>
- <question>
--<para>Are there any <acronym>SVN</acronym> mirror sites for &kde;?</para>
--</question>
--<answer>
--<para>No, there are currently no anonymous <acronym>SVN</acronym> mirror sites for &kde;. If you're interested in setting one up, please contact <email>sysadmin@kde.org</email>
--</para>
--</answer>
--</qandaentry>
--
--<qandaentry>
--<question>
- <para>How do I go about translating &kde; programs into my native
- language?</para>
- </question>
---- runtime/doc/kcontrol/paths/index.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/doc/kcontrol/paths/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -70,7 +70,7 @@
- </varlistentry>
- <varlistentry>
- <term><guilabel>Download path:</guilabel></term>
--<listitem><para>This folder will be used by default to your downloaded items.</para></listitem>
-+<listitem><para>This folder will be used by default to save your downloaded items.</para></listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Movies path:</guilabel></term>
---- runtime/doc/kcontrol/language/index.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/doc/kcontrol/language/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -53,7 +53,7 @@
- to use.</para>
-
- <para>When you click on <guilabel>change</guilabel>,
--a menu pops up showing major groups of countries. You can select
-+a dialog pops up showing major groups of countries. You can select
- one of these regions and see a list of the countries that are
- available for that region.</para>
-
-@@ -69,7 +69,7 @@
-
- <para>Click on the <guilabel>Add Language</guilabel> drop down box to add a
- language to the list. If the language is already in the
--list, the old one will be moved instead.</para>
-+list, it will be moved up to the first place in the list instead.</para>
-
- <para>If only US English is available, no translations have been installed.
- </para>
---- runtime/doc/kcontrol/solid-device-automounter/index.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/doc/kcontrol/solid-device-automounter/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -32,7 +32,7 @@
- recently plugged in device.
- </para>
-
--<para>On the bottom of the dialog you find the global settings, which can be overridden
-+<para>At the top of the dialog you find the global settings, which can be overridden
- for each single device in the <guilabel>Device Overrides</guilabel> list.
- For a single-user desktop it is recommended to have all the
- check boxes above the overrides list enabled.
---- runtime/doc/kcontrol/khtml-general/index.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/doc/kcontrol/khtml-general/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -119,8 +119,7 @@
- <term><guilabel>Confirm when closing windows with multiple tabs</guilabel></term>
- <listitem><para>If you close a window in &konqueror; that has multiple tabs
- open, &konqueror; will ask you if you're sure that you meant to close
--it. You can toggle on and off this behavior with the
--<guilabel>Confirm when closing windows with multiple tabs</guilabel>
-+it. You can toggle on and off this behavior with this
- check box.</para></listitem>
- </varlistentry>
-
---- runtime/doc/kcontrol/ebrowsing/index.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/doc/kcontrol/ebrowsing/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -67,8 +67,7 @@
- shortcuts wherever you would normally use
- &URI;s. Shortcuts for several search engines should
- already be configured on your system, but you can add new keywords, and
--change or delete existing ones in the enhanced browsing control
--module. </para>
-+change or delete existing ones in this module. </para>
-
- </sect2>
-
-@@ -163,4 +162,4 @@
-
- </sect1>
-
--</article>
-\ No newline at end of file
-+</article>
---- runtime/doc/kcontrol/filetypes/index.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/doc/kcontrol/filetypes/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -279,6 +279,29 @@
- type. Click <guibutton>OK</guibutton> when you are done, and the
- application will be added to the current list.</para>
-
-+<para>To change the options of an application for a particular &MIME; type
-+select it in the list and then press the <guibutton>Edit...</guibutton> button.
-+This opens a new dialog with <guilabel>General</guilabel>,
-+<guilabel>Permissions</guilabel>, <guilabel>Applications</guilabel> and
-+<guilabel>Preview</guilabel> tabs.
-+On the <guilabel>Applications</guilabel> tab you can edit <guilabel>Name</guilabel>,
-+<guilabel>Description</guilabel> and <guilabel>Comment</guilabel>.
-+In the <guilabel>Command</guilabel> field you can have several place holders
-+following the command, which will be replaced with the actual values
-+when the actual program is run:</para>
-+<itemizedlist>
-+<listitem><para>%f - a single file name</para></listitem>
-+<listitem><para>%F - a list of files; use for applications that can open several local files
-+at once</para></listitem>
-+<listitem><para>%u - a single URL</para></listitem>
-+<listitem><para>%U - a list of URLs</para></listitem>
-+<listitem><para>%d - the folder of the file to open</para></listitem>
-+<listitem><para>%D - a list of folders</para></listitem>
-+<listitem><para>%i - the icon</para></listitem>
-+<listitem><para>%m - the mini-icon</para></listitem>
-+<listitem><para>%c - the caption</para></listitem>
-+</itemizedlist>
-+
- <para>You can remove an application (thereby ensuring that the
- application will never run with this &MIME; type by clicking once on the
- name of the application, and clicking the <guibutton>Remove</guibutton>
---- runtime/doc/kcontrol/kded/index.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/doc/kcontrol/kded/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -45,12 +45,18 @@
- <varlistentry>
- <term><guilabel>Startup Services</guilabel></term>
- <listitem><para>
--This shows all &kde; services that can be loaded on &kde; startup. Checked
--services will be invoked on next startup.</para>
-+This shows all &kde; services that can be loaded on &kde; startup.
-+Services checked in the <guilabel>Use</guilabel> column will be invoked on next startup.</para>
- <para>Be careful with deactivation of
- unknown services: some services are vital for &kde;; do
- not deactivate services if you do not know what you are doing.
--</para></listitem>
-+</para>
-+<para>To change the <guilabel>Status</guilabel> of a service, select it in the list.
-+Then you can use the <guibutton>Start</guibutton> and <guibutton>Stop</guibutton>
-+to change the status of a service from <guilabel>Not running</guilabel> to <guilabel>Running</guilabel>
-+and vice versa.
-+</para>
-+</listitem>
- </varlistentry>
-
- </variablelist>
---- runtime/doc/kcontrol/khtml-behavior/index.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/doc/kcontrol/khtml-behavior/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -47,7 +47,7 @@
- in forms for you with the answers you previously used.</para>
-
- <para>You can configure the number of form items &konqueror; remembers
--with the slider below labelled <guilabel>Maximum
-+with the spin box labelled <guilabel>Maximum
- completions</guilabel></para>
-
- <note><para>Of course, anything &konqueror; fills in a form with, you
-@@ -78,7 +78,7 @@
- new website. However, such features can be confusing, or annoying,
- when misused, and so you may wish to disable it.</para>
-
--<para><guilabel>Enable Access Key activation with Ctrl key</guilabel>:
-+<para><guilabel>Enable Access Key activation with &Ctrl; key</guilabel>:
- Pressing the &Ctrl; key when viewing web pages activates Access Keys.
- Unchecking this box will disable this accessibility feature. &konqueror;
- needs to be restarted for this change to take effect.</para>
---- runtime/doc/kcontrol/CMakeLists.txt (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/doc/kcontrol/CMakeLists.txt (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -24,7 +24,6 @@
- add_subdirectory(kcmcss)
- add_subdirectory(kcmlaunch)
- add_subdirectory(kcmnotify)
--add_subdirectory(kdm)
- add_subdirectory(language)
- add_subdirectory(netpref)
- add_subdirectory(paths)
---- runtime/doc/kcontrol/khtml-java-js/index.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/doc/kcontrol/khtml-java-js/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -98,8 +98,7 @@
- <para>Despite the name, JavaScript is not related at all to
- &Java;.</para>
-
--<para>The first part of this tab works the same as the &Java; page
--settings.</para>
-+<para>The first part of this tab works the same as the &Java; settings.</para>
-
- <para>The checkbox <guilabel>Enable JavaScript globally</guilabel> allows
- you to turn JavaScript support on for all web sites by default. You
---- runtime/doc/kcontrol/spellchecking/index.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/doc/kcontrol/spellchecking/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1091891)
+--- runtime/knotify/kde.notifyrc (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/knotify/kde.notifyrc (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -803,7 +803,7 @@
+ Comment[et]=Tekkis tõsine viga, mis sundis programmi tööd lõpetama
+ Comment[eu]=Errore larria egon da programa ateraraziz
+ Comment[fi]=Vakava virhe aiheutti ohjelman keskeytymisen
+-Comment[fr]=Une erreur sérieuse a entraîné la fin le programme
++Comment[fr]=Une erreur sérieuse a entraîné la fin du programme
+ Comment[fy]=Der wie in serieuse flater wertroch it programma sluten is
+ Comment[ga]=Tharla earráid thromchúiseach a thug ar an gclár éirí as
+ Comment[gl]=Aconteceu un erro grave que fixo que o programa se pechase inesperadamente
+@@ -2617,7 +2617,7 @@
+ Comment[et]=Esitatakse küsimus
+ Comment[eu]=Galdera bat egiten ari da
+ Comment[fi]=Esitetään kysymys
+-Comment[fr]=une question vous est posée
++Comment[fr]=Une question vous est posée
+ Comment[fy]=In fraach wurdt stelt
+ Comment[ga]=Ceist á fiafraí
+ Comment[gl]=Está a facerse unha pregunta
+--- runtime/solid-device-automounter/kcm/device_automounter_kcm.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/solid-device-automounter/kcm/device_automounter_kcm.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -88,7 +88,7 @@
+ Comment[et]=Eemaldatavate andmekandjate automaatse käitlemise seadistamine
+ Comment[eu]=Biltegiratzeko euskarri aldagarrien maneiu automatikoaren konfiguraketa
+ Comment[fi]=Muokkaa irrotettavan tallennusmedian automaattista käsittelyä
+-Comment[fr]=Configure la prise en charge automatique des média de stockage amovible
++Comment[fr]=Configure la prise en charge automatique des médias de stockage amovibles
+ Comment[fy]=IT automatysk ôfhanneljen fan útnimbere opslach media ynstelle
+ Comment[ga]=Cumraigh láimhseáil uathoibríoch meán inbhainte stórála
+ Comment[he]=הגדרת תפעול אוטומטי להתקני אחסון נשלפים.
+--- runtime/localization/currency/khr.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/khr.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
@@ -17,7 +17,7 @@
- </authorgroup>
-
- <date>2009-11-18</date>
--<releaseinfo>4.4</releaseinfo>
-+<releaseinfo>&kde; 4.4</releaseinfo>
-
- <keywordset>
- <keyword>KDE</keyword>
-@@ -41,13 +41,22 @@
- <para>In the drop down box <guilabel>Default language</guilabel> choose from the
- available dictionaries, which one to use for &sonnet;. </para>
-
-+<!-- in case of missing language in the list which apps to install?
-+sonnet has pluins HSpell enchant hspell hunspell ??
-+<para>(If you do not have <application>Ispell</application> installed
-+you can obtain it from the <ulink
-+url="http://fmg-www.cs.ucla.edu/geoff/ispell.html">International
-+ISpell home page</ulink>. <application>ASpell</application> is available from the <ulink
-+url="http://aspell.sourceforge.net/">ASpell home page</ulink>.)
-+</para>
-+-->
- <sect2 id="spell-options">
- <title>Spell Options</title>
-
- <variablelist>
-
- <varlistentry>
--<term><guilabel>Auto spell check enabled by default</guilabel></term>
-+<term><guilabel>Automatic spell checking enabled by default</guilabel></term>
- <listitem>
- <para>If a mark is placed in this checkbox, the spelling of words will be check in your document
- as you type them. Misspelled will have a red line drawn under them.
-@@ -80,6 +89,7 @@
-
- </variablelist>
- </sect2>
-+<!-- from koffice/kword/opt.docbook 1.6.2-->
- <sect2><title>Ignoring words</title>
- <para>The bottom half of the dialog box allows you to designate specific words (they may be specialized terminology, proper names, &etc;) which
- should be ignored by the spelling program.</para>
---- runtime/doc/kioslave/man/index.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/doc/kioslave/man/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -33,28 +33,28 @@
- </listitem>
- </varlistentry>
- <varlistentry>
--<term><userinput><command>man:</command><replaceable>fopen</replaceable></userinput></term>
-+<term><userinput><command>man:/</command><replaceable>fopen</replaceable></userinput></term>
- <listitem>
- <para>See the man page of <command>fopen</command>.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
--<term><userinput><command>man:</command><replaceable>fopen(3)</replaceable></userinput></term>
-+<term><userinput><command>man:/</command><replaceable>fopen(3)</replaceable></userinput></term>
- <listitem>
- <para>See the man page of <command>fopen</command> in section 3.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
--<term><userinput><command>man:</command><replaceable>(3)</replaceable></userinput></term>
-+<term><userinput><command>man:/</command><replaceable>(3)</replaceable></userinput></term>
- <listitem>
- <para>See the index of section 3.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
--<term><userinput><command>man:</command>intro<replaceable>(3)</replaceable></userinput></term>
-+<term><userinput><command>man:/</command>intro<replaceable>(3)</replaceable></userinput></term>
- <listitem>
- <para>See the introduction of section 3.
- </para>
-@@ -81,7 +81,7 @@
-
- <para>
- As with any other &kde; ioslave, it is possible to enter a &URL;, like
--<userinput><command>man:socket</command></userinput> in <emphasis>any</emphasis>
-+<userinput><command>man:/socket</command></userinput> in <emphasis>any</emphasis>
- &kde; application. Try it in &kwrite; and you will see the man page in
- &HTML; format.
- </para>
---- runtime/kioslave/thumbnail/windowsimagecreator.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/kioslave/thumbnail/windowsimagecreator.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -31,11 +31,8 @@
-
- bool WindowsImageCreator::create(const QString &path, int width, int height, QImage &img) {
-
-- QTemporaryFile icoTempFile, pngTempFile;
-+ QTemporaryFile pngTempFile;
-
-- if ( ! icoTempFile.open() )
-- return false;
+ Name[es]=Riel camboyano
+ Name[et]=Kambodža riel
+ Name[eu]=Kanbodiako riel
+-Name[fi]=Kambodzan riel
++Name[fi]=Kambodžan riel
+ Name[fr]=Riel cambodgien
+ Name[fy]=Cambodjaanske riel
+ Name[ga]=Riel na Cambóide
+--- runtime/localization/currency/ats.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/ats.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -13,7 +13,7 @@
+ Name[csb]=Aùstrëjacczi Sziling
+ Name[da]=Østrigsk schilling
+ Name[de]=Österreichischer Schilling
+-Name[el]=Αυστρία σκίλινγκ
++Name[el]=Σελίνι Αυστρίας
+ Name[en_GB]=Austrian Schilling
+ Name[eo]=Aŭstra ŝilingo
+ Name[es]=Chelín austriaco
+--- runtime/localization/currency/eek.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/eek.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -13,7 +13,7 @@
+ Name[csb]=Estóńskô Kòróna
+ Name[da]=Estisk kroon
+ Name[de]=Estnische Krone
+-Name[el]=Εσθονική κορώνα
++Name[el]=Εσθονική κορόνα
+ Name[en_GB]=Estonian Kroon
+ Name[eo]=Estona krono
+ Name[es]=Corona estonia
+--- runtime/localization/currency/fkp.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/fkp.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -17,7 +17,7 @@
+ Name[es]=Libra malvinense
+ Name[et]=Falklandi saarte nael
+ Name[eu]=Malvinak Uharteetako (Falkland islands) libra
+-Name[fi]=Falklandin saarten (Malvinassaarten) punta
++Name[fi]=Falklandinsaarten (Malvinassaarten) punta
+ Name[fr]=Livre des Îles Falkland
+ Name[fy]=Falklânske pûn
+ Name[ga]=Punt na nOileán Fáclainne
+--- runtime/localization/currency/kyd.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/kyd.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -17,7 +17,7 @@
+ Name[es]=Dólar de las Islas Caimán
+ Name[et]=Kaimanisaarte dollar
+ Name[eu]=Kaiman Uharteetako dolar
+-Name[fi]=Cayman-saarien dollari
++Name[fi]=Caymansaarten dollari
+ Name[fr]=Dollar des Îles Caïman
+ Name[fy]=Kayman eilânske dollar
+ Name[ga]=Dollar na nOileáin Cayman
+--- runtime/localization/currency/thb.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/thb.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -12,7 +12,7 @@
+ Name[csb]=Tajsczi Baht
+ Name[da]=Thailandsk baht
+ Name[de]=Baht
+-Name[el]=Μπαχτ Ταϊλανδίας
++Name[el]=Μπατ Ταϊλάνδης
+ Name[en_GB]=Thai Baht
+ Name[eo]=Tajlanda bahto
+ Name[es]=Baht tailandés
+--- runtime/localization/currency/mgf.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/mgf.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -12,7 +12,7 @@
+ Name[csb]=Madagarsczi Frank
+ Name[da]=Malagassisk franc
+ Name[de]=Madagaskar-Franc
+-Name[el]=Φράγκο Μαλγασίκας
++Name[el]=Φράγκο Μαδαγασκάρης
+ Name[en_GB]=Malagasy Franc
+ Name[eo]=Madagaskara franko
+ Name[es]=Franco malgache
+--- runtime/localization/currency/tjs.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/tjs.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -17,7 +17,7 @@
+ Name[es]=Somoni tayiko
+ Name[et]=Tadžikistani somoni
+ Name[eu]=Tadjikistaneko somoni
+-Name[fi]=Tajikistanin somoni
++Name[fi]=Tadžikistanin somoni
+ Name[fr]=Somoni tadjik
+ Name[fy]=Tadjikistaanske somoni
+ Name[ga]=Somoni na Táidsíceastáine
+--- runtime/localization/currency/azm.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/azm.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -18,7 +18,7 @@
+ Name[es]=Manat azerí
+ Name[et]=Aserbaidžaani manat
+ Name[eu]=Azerbaijan Manat
+-Name[fi]=Azerbaidzanin manat
++Name[fi]=Azerbaidžanin manat
+ Name[fr]=Manat d'Azerbaïjan
+ Name[fy]=Azerbeidjaanske manat
+ Name[ga]=Manat na hAsarbainseáine
+--- runtime/localization/currency/azn.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/azn.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -18,7 +18,7 @@
+ Name[es]=Manat azerí
+ Name[et]=Aserbaidžaani manat
+ Name[eu]=Azerbaijan Manat
+-Name[fi]=Azerbaidzanin manat
++Name[fi]=Azerbaidžanin manat
+ Name[fr]=Manat d'Azerbaïjan
+ Name[fy]=Azerbeidjaanske manat
+ Name[ga]=Manat na hAsarbainseáine
+--- runtime/localization/currency/bam.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/bam.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -18,7 +18,7 @@
+ Name[es]=Marco convertible de Bosnia y Herzegovina
+ Name[et]=Bosnia ja Hertsegovina konverteeritav mark
+ Name[eu]=Bosnia eta Herzegovinako marko aldagarria
+-Name[fi]=Bosnia ja Herzegovinan vaihdettava markka
++Name[fi]=Bosnia ja Hertsegovinan vaihdettava markka
+ Name[fr]=Mark convertible de Bosnie-Herzégovine
+ Name[fy]=Bosnië en Herzegovina convertible mark
+ Name[ga]=Marc insóinseáilte Bhoisnia agus Heirseagaivéin
+--- runtime/localization/currency/sgd.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/sgd.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -13,7 +13,7 @@
+ Name[csb]=Singapùrsczi Dolar
+ Name[da]=Singaporeansk dollar
+ Name[de]=Singapur-Dollar
+-Name[el]=Δολάριο Σινγκαπούρης
++Name[el]=Δολάριο Σιγκαπούρης
+ Name[en_GB]=Singapore Dollar
+ Name[eo]=Singapura dolaro
+ Name[es]=Dólar de Singapur
+--- runtime/localization/currency/isk.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/isk.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -13,7 +13,7 @@
+ Name[csb]=Islandkô Kòróna
+ Name[da]=Islandsk krone
+ Name[de]=Isländische Krone
+-Name[el]=Ισλανδική κορώνα
++Name[el]=Ισλανδική κορόνα
+ Name[en_GB]=Icelandic Krona
+ Name[eo]=Islanda krono
+ Name[es]=Corona islandesa
+--- runtime/localization/currency/byr.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/localization/currency/byr.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -19,7 +19,7 @@
+ Name[es]=Rublo bielorruso
+ Name[et]=Valgevene rubla
+ Name[eu]=Belorrusiako Errubloa
+-Name[fi]=Valkovenäjän rupla
++Name[fi]=Valko-Venäjän rupla
+ Name[fr]=Rouble biélorusse
+ Name[fy]=Wyt-Russyske rubbel
+ Name[ga]=Rúbal na Bealarúise
+--- runtime/kcontrol/locale/language.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kcontrol/locale/language.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -36,7 +36,7 @@
+ Name[eu]=Herrialdea/eskualdea eta hizkuntza
+ Name[fa]=کشور/منطقه و زبان
+ Name[fi]=Alue ja kieli
+-Name[fr]=Pays & langue
++Name[fr]=Pays / Région & langue
+ Name[fy]=Lân/regio en taal
+ Name[ga]=Tír/Réigiún agus Teanga
+ Name[gl]=País/Rexión e lingua
+--- runtime/kcontrol/componentchooser/componentservices/kcm_kemail.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_kemail.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -84,7 +84,7 @@
+ Comment[cy]=Mae'r gwasanaeth ymayn gadael i chi ffurfweddu eich dibynnydd ebost cyffredinol. Dylai bob raglen KDE sydd angen cyrchiad i ddibynnydd ebost ddefnyddio'r gosodiad yma.
+ Comment[da]=Denne service tillader dig at indstille din e-mail-klient. Alle KDE-programmer der behøver adgang til en e-mail-klient skulle respektere denne indstilling.
+ Comment[de]=Hier können Sie Ihr E-Mail-Programm einrichten. Alle KDE-Anwendungen, die Zugriff auf ein solches Programm benötigen, sollten diese Einstellungen verwenden.
+-Comment[el]=Αυτή η υπηρεσία σας επιτρέπει να ρυθμίσετε τον προκαθορισμένο πελάτη email σας. Όλες οι εφαρμογές του KDE που χρειάζονται πρόσβαση σε μια εφαρμογή πελάτη email θα πρέπει να χρησιμοποιούν αυτή τη ρύθμιση.
++Comment[el]=Αυτή η υπηρεσία σας επιτρέπει να ρυθμίσετε τον προκαθορισμένο πελάτη της ηλ. αλληλογραφίας σας. Όλες οι εφαρμογές του KDE που χρειάζονται πρόσβαση σε μια εφαρμογή πελάτη ηλ. αλληλογραφίας θα πρέπει να χρησιμοποιούν αυτή τη ρύθμιση.
+ Comment[en_GB]=This service allows you to configure your default email client. All KDE applications which need access to an email client application should honour this setting.
+ Comment[eo]=Tiu servo ebligas, ke vi elektas vian defaŭltan retpoŝtilon. Ĉiuj KDEaj aplikoj, kiuj bezonas retpoŝtilon, uzos tiun agordon.
+ Comment[es]=Este servicio le permite configurar su cliente de correo predeterminado. Todas las aplicaciones KDE que precisen acceso a una aplicación de cliente de correo deberían reconocer esta opción.
+--- runtime/kcontrol/componentchooser/componentservices/kcm_wm.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_wm.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -19,7 +19,7 @@
+ Name[et]=Aknahaldur
+ Name[eu]=Leiho kudeatzailea
+ Name[fi]=Ikkunahallinta
+-Name[fr]=Gestionnaire de fenêtre
++Name[fr]=Gestionnaire de fenêtres
+ Name[fy]=Finsterbehearder
+ Name[ga]=Bainisteoir Fuinneog
+ Name[gl]=Xestor de fiestras
+@@ -87,7 +87,7 @@
+ Comment[et]=Siin saab valida KDE seansis kasutatava aknahalduri.
+ Comment[eu]=Hemen zure KDE saioan erabili nahi duzun leiho kudeatzailea hautatu dezakezu.
+ Comment[fi]=Tästä voit valita KDE-työpöydän käyttämän ikkunaohjelman.
+-Comment[fr]=Vous pouvez choisir ici le gestionnaire de fenêtre que vous souhaitez utiliser dans votre session KDE.
++Comment[fr]=Vous pouvez choisir ici le gestionnaire de fenêtres que vous souhaitez utiliser dans votre session KDE.
+ Comment[fy]=Hjir kinne jo de finstersbehearder dy jo yn jo KDE-sesje brûke wolle selektearje.
+ Comment[ga]=Anseo is féidir leat an bainisteoir fuinneog a rithfear i do sheisiún KDE.
+ Comment[gl]=Aquí pode escoller o xestor de fiestras que desexe executar na sesión de KDE.
+--- runtime/kcontrol/componentchooser/componentservices/kcm_filemanager.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kcontrol/componentchooser/componentservices/kcm_filemanager.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -87,7 +87,7 @@
+ Comment[et]=Siin saab seadistada vaikimisi kasutatavat failihaldurit. Kõik KDE rakendused, kus saab avada katalooge, peaksid siinsete seadistustega arvestama.
+ Comment[eu]=Hemen zure web arakatzaile lehenetsia konfigura dezakezu. K menuk eta KDE aplikazioek hau erabiliko dute karpetak irekitzerakoan
+ Comment[fi]=Tässä voit muokata käytettävää oletustiedostonhallintaohjelmaa. Kaikki KDE-sovellukset käyttävät tätä tiedostonhallintaohjelmaa.
+-Comment[fr]=Vous pouvez configurer ici votre gestionnaire de fichiers par défaut. Les entrées du menu K et toutes les applications KDE avec lesquels vous pouvez ouvrir des dossiers, utiliseront ce gestionnaire de fichiers.
++Comment[fr]=Vous pouvez configurer ici votre gestionnaire de fichiers par défaut. Les entrées du menu K et toutes les applications KDE avec lesquelles vous pouvez ouvrir des dossiers, utiliseront ce gestionnaire de fichiers.
+ Comment[fy]=Hjir kinne jo de standert triembehearder ynstelle. Alle ynfieren yn it K menu en alle KDE applikaasjes wêryn jo mappen iepenje kinne sille dizze triembehearder brûke.
+ Comment[ga]=Anseo is féidir leat bainisteoir comhad réamhshocraithe a chumrú. Úsáidfidh iontrálacha sa roghchlár K an bainisteoir comhad seo, chomh maith le gach feidhmchlár KDE is féidir fillteáin a oscailt.
+ Comment[gl]=Aquí pode configurar o xestor de ficheiros predeterminado. As entradas no menú K e todos os programas de KDE nos que poida abrir cartafoles han empregar este xestor de ficheiros.
+--- runtime/phonon/platform_kde/phononbackend.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/phonon/platform_kde/phononbackend.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -21,7 +21,7 @@
+ Name[et]=KDE multimeedia taustaprogramm
+ Name[eu]=KDE multimedia interfazea
+ Name[fi]=KDE-multimediataustaosa
+-Name[fr]=Moteur de traitement multimédia de KDE
++Name[fr]=Module multimédia de KDE
+ Name[fy]=KDE Multymedia efterein
+ Name[ga]=Inneall Ilmheán KDE
+ Name[gl]=Infraestrutura multimedia de KDE
+--- runtime/kpasswdserver/kpasswdserver.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kpasswdserver/kpasswdserver.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -75,7 +75,7 @@
+ Comment[et]=Ajutine parooli puhverdamine
+ Comment[eu]=Pasahitzen aldiuneko cachea
+ Comment[fi]=Väliaikainen salasanavälimuisti
+-Comment[fr]=Masquage du mot de passe temporaire
++Comment[fr]=Masquage temporaire du mot de passe
+ Comment[ga]=Taisce Shealadach Focal Faire
+ Comment[gu]=કામચલાઉ પાસવર્ડ કેશીંગ
+ Comment[he]=שמירה זמנית של סיסמאות בזיכרון מטמון
+--- runtime/platforms/win/kwinstartmenu/winstartmenu.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/platforms/win/kwinstartmenu/winstartmenu.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -19,7 +19,7 @@
+ Name[et]=KDED Windowsi startmenüü moodul
+ Name[eu]=KDED leiho abiorako menuaren modulua
+ Name[fi]=KDED Windows-aloitusvalikkomoduuli
+-Name[fr]=Module KDED de lancement de fenêtres
++Name[fr]=Module KDED de lancement Windows
+ Name[fy]=KDED Windows Start Menu Module
+ Name[ga]=Modúl Roghchláir Tosaithe Windows KDED
+ Name[gl]=Módulo de menú de inicio de Windows de KDED
+--- runtime/kwalletd/kwalletd.notifyrc (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kwalletd/kwalletd.notifyrc (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -215,7 +215,7 @@
+ Comment[et]=KDE turvalaeka deemon nõuab parooli
+ Comment[eu]=KDE diruzorroaren deabruak pasahitza eskatzen du
+ Comment[fi]=KDE:n Lompakkotaustaprosessi pyytää salasanaa
+-Comment[fr]=Le démon du porte-feuille de KDE requiers un mot de passe
++Comment[fr]=Le démon du portefeuille de KDE requiert un mot de passe
+ Comment[fy]=The KDE slûf daemon fereasket in wachtwurd
+ Comment[ga]=Tá Deamhan Sparáin KDE ag iarraidh focal faire
+ Comment[gl]=O Daemon de carteiras de KDE pide un contrasinal
+--- runtime/kioslave/thumbnail/desktopthumbnail.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kioslave/thumbnail/desktopthumbnail.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -18,7 +18,7 @@
+ Name[et]=Töölauafailid
+ Name[eu]=Mahaigain fitxategiak
+ Name[fi]=Työpöytätiedostot
+-Name[fr]=Fichier du bureau
++Name[fr]=Fichiers du bureau
+ Name[fy]=Buroblêd triemmen
+ Name[ga]=Comhaid Deisce
+ Name[gl]=Ficheiros do escritorio
+--- runtime/kioslave/remote/kdedmodule/remotedirnotify.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kioslave/remote/kdedmodule/remotedirnotify.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -15,7 +15,7 @@
+ Name[et]=Mujalasuva URL-i muutumise teadustaja
+ Name[eu]=Urruneko URL aldaketa jakinarazlea
+ Name[fi]=Etäverkko-osoitteiden muutosten huomautin
+-Name[fr]=Notifieur de changement d'URL distante
++Name[fr]=Notificateur de changement d'URL distante
+ Name[gu]=દૂરસ્થ URL ફેરફાર નોંધણી
+ Name[he]=שירות הודעות על שינוי כתובות מרוחקות
+ Name[hi]=रिमोट आधारित यूआरएल नोटिफ़ायर
+--- runtime/nepomuk/services/strigi/nepomukstrigiservice.notifyrc (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/nepomuk/services/strigi/nepomukstrigiservice.notifyrc (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -291,7 +291,7 @@
+ Comment[et]=Lõpetati kohalike failide esimene indekseerimine kiire töölauaotsingu võimaldamiseks.
+ Comment[eu]=Bilaketa azkarretarako fitxategi lokalen hasierako indexaketata osatu da.
+ Comment[fi]=Paikallisten tiedostojen alustava indeksointi työpöydän pikahakua varten on valmis.
+-Comment[fr]=L'indexation initiale des fichiers locaux pour des recherches rapides est terminé.
++Comment[fr]=L'indexation initiale des fichiers locaux pour des recherches rapides est terminée.
+ Comment[fy]=De earste yndeksearring fan lokale triemmen foar flugge buroblêd-sykopdrachten is foltôge.
+ Comment[ga]=Tá an chéad innéacsú de chomhaid logánta críochnaithe.
+ Comment[gl]=Completouse a indexación inicial dos ficheiros locais para facer procuras rápidas no escritorio.
+--- runtime/nepomuk/services/backupsync/service/identificationset.cpp (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/nepomuk/services/backupsync/service/identificationset.cpp (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -97,10 +97,10 @@
+ while( iter.hasNext() ) {
+ const QUrl & uri = iter.next();
+ done.insert( uri );
++
++ uris.append( Soprano::Node::resourceToN3( uri ) );
++
+ iter.remove();
-
- if ( ! pngTempFile.open() )
- return false;
-
---- runtime/kioslave/thumbnail/icoutils.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/kioslave/thumbnail/icoutils.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -19,6 +19,7 @@
-
- #include <QString>
- #include <QStringList>
-+#include <QFile>
- #include <QRegExp>
- #include <QProcess>
- #include <QPair>
-@@ -124,10 +125,13 @@
- if ( index == -1 )
- return false;
-
-+ QFile(outputPath).resize(0);
-+
- icotool.start("icotool", QStringList() << "-x" << "-i" << QString::number(index) << inputPath << "-o" << outputPath);
- icotool.waitForFinished();
-
-- if ( icotool.exitCode() != 0 )
-+ //For some windows icon files icotool return 1 and show warning message "compressed image data not supported", but it extract correct icon - so check if output file is not null
-+ if ( icotool.exitCode() != 0 && QFile(outputPath).size() == 0 )
- return false;
-
- return true;
---- runtime/kioslave/network/ioslave/networkslave.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/kioslave/network/ioslave/networkslave.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -303,7 +303,8 @@
- {
- entry->insert( KIO::UDSEntry::UDS_NAME, serviceData.name()+'.'+serviceData.type() );
- entry->insert( KIO::UDSEntry::UDS_DISPLAY_NAME, serviceData.name() );
-- entry->insert( KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR );
-+ entry->insert( KIO::UDSEntry::UDS_FILE_TYPE, S_IFLNK );
-+ entry->insert( KIO::UDSEntry::UDS_ACCESS, S_IRWXU|S_IRWXG|S_IRWXO );
- // entry->insert( KIO::UDSEntry::UDS_ICON_NAME, serviceData.iconName() );
- entry->insert( KIO::UDSEntry::UDS_MIME_TYPE, Mimetypes::mimetypeForServiceType(serviceData.type()) );
- if( !serviceData.url().isEmpty() )
---- runtime/kioslave/network/network/builder/dnssd/dnssdnetworkbuilder.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/kioslave/network/network/builder/dnssd/dnssdnetworkbuilder.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -212,8 +212,6 @@
+- uris.append( Soprano::Node::resourceToN3( uri ) );
+-
+ if( uris.size() == maxIterationSize )
+ break;
+ }
+--- runtime/nepomuk/services/backupsync/lib/CMakeLists.txt (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/nepomuk/services/backupsync/lib/CMakeLists.txt (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -46,10 +46,10 @@
+
+ install(TARGETS nepomuksync EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+-install(FILES
+- resourceidentifier.h
+- resourcemerger.h
+- simpleresource.h
+- nepomuksync_export.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/nepomuk COMPONENT Devel
+-)
++#install(FILES
++# resourceidentifier.h
++# resourcemerger.h
++# simpleresource.h
++# nepomuksync_export.h
++# DESTINATION ${INCLUDE_INSTALL_DIR}/nepomuk COMPONENT Devel
++#)
+--- runtime/nepomuk/services/storage/nepomukstorage.notifyrc (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/nepomuk/services/storage/nepomukstorage.notifyrc (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -15,7 +15,7 @@
+ Name[et]=Semantiline andmesalvesti
+ Name[eu]=Datu semantikoen biltegiratzea
+ Name[fi]=Semanttinen tietovarasto
+-Name[fr]=Stockage de données sémantique
++Name[fr]=Stockage de données sémantiques
+ Name[ga]=Stóráil Sonraí Séimeantacha
+ Name[gu]=નેપોમુક માહિતી સંગ્રહ
+ Name[he]=אחסון מידע סמנטי
+--- runtime/kurifilter-plugins/ikws/searchproviders/imdb.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kurifilter-plugins/ikws/searchproviders/imdb.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -26,7 +26,7 @@
+ Name[eu]=Interneteko filmeen datu-basea
+ Name[fa]=دادگان فیلم اینترنت
+ Name[fi]=Internet Movie Database
+-Name[fr]=Base de données vidéo sur Internet
++Name[fr]=Base de données de films sur Internet
+ Name[fy]=Ynternetfilm-databank
+ Name[ga]=Internet Movie Database
+ Name[gl]=Base de datos de filmes de Internet
+--- runtime/kurifilter-plugins/ikws/searchproviders/identica_groups.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kurifilter-plugins/ikws/searchproviders/identica_groups.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -18,7 +18,7 @@
+ Name[et]=Identi.ca grupid
+ Name[eu]=Identi.ca Taldeak
+ Name[fi]=Identi.ca Ryhmät
+-Name[fr]=Groupes Icenti.ca
++Name[fr]=Groupes Identi.ca
+ Name[ga]=Grúpaí Identi.ca
+ Name[gu]=આઈડેન્ટિ.કા સમૂહો
+ Name[he]=Identi.ca Groups
+--- runtime/kurifilter-plugins/ikws/searchproviders/rae.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kurifilter-plugins/ikws/searchproviders/rae.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -28,7 +28,7 @@
+ Name[eu]=Gazteleraren Akademiaren hiztegia (RAE)
+ Name[fa]=واژهنامه فرهنگستان اسپانیایی (RAE)
+ Name[fi]=Espanjan Akatemian sanakirja (RAE)
+-Name[fr]=Dictionnaire de l'Académie Espagnole (RAE)
++Name[fr]=Dictionnaire de l'Académie Espagnole (RAE)Dictionnaire de l'Académie Espagnole (RAE)
+ Name[fy]=Wurdboek fan de Spaanske akademy (RAE)
+ Name[ga]=Diccionario de la lengua española (RAE)
+ Name[gl]=Dicionario da real academia española (RAE)
+--- runtime/kurifilter-plugins/ikws/searchproviders/kde_apps.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kurifilter-plugins/ikws/searchproviders/kde_apps.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -25,7 +25,7 @@
+ Name[eu]=KDEren aplikazio bilaketa
+ Name[fa]=جستجوی کاربرد KDE
+ Name[fi]=KDE-sovellusten haku
+-Name[fr]=Application de recherche de KDE
++Name[fr]=Chercher dans les applications de KDE
+ Name[fy]=Programma's sykje
+ Name[ga]=Cuardach Feidhmchláir KDE
+ Name[gl]=Programas de KDE
+--- runtime/kglobalaccel/kglobalaccel.notifyrc (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/kglobalaccel/kglobalaccel.notifyrc (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -492,7 +492,7 @@
+ Comment[et]=Kasutaja kasutas globaalset kiirklahvi
+ Comment[eu]=Erabiltzaileak laster-tekla global bat abiarazi du
+ Comment[fi]=Käyttäjän liipaisema yleispikanäppäin
+-Comment[fr]=L'utilisateur a déclenché un raccourcis global
++Comment[fr]=L'utilisateur a déclenché un raccourci global
+ Comment[fy]=De brûker hat in globale fluchtoets aktivearre
+ Comment[ga]=Ghníomhachtaigh an t-úsáideoir aicearra comhchoiteann
+ Comment[gl]=O usuario iniciou un atallo global
+--- runtime/attica/kcm/kcm_attica.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/attica/kcm/kcm_attica.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -86,7 +86,7 @@
+ Comment[et]=Sotsiaalse töölaua pakkujate haldamine
+ Comment[eu]=Kudeatu Gizarte Mahaigain Hornitzaileak
+ Comment[fi]=Hallinnoi sosiaalisen työpöydän tarjoajia
+-Comment[fr]=Gérer les fournisseurs de bureaux sociaux
++Comment[fr]=Gérer les fournisseurs de bureau social
+ Comment[ga]=Bainistigh Soláthraithe na Deisce Shóisialta
+ Comment[he]=משמש לניהול ספקי שולחן עבודה חברתי
+ Comment[hr]=Upravljanje pružateljima društvene radne površine
+--- runtime/l10n/kg/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/kg/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Kõrgõzstan
+ Name[eu]=Kirgizistan
+ Name[fa]=قرقیزستان
+-Name[fi]=Kyrgyzstan
++Name[fi]=Kirgisia
+ Name[fr]=Kirghizistan
+ Name[fy]=Kyrgyzstan
+ Name[ga]=An Chirgeastáin
+--- runtime/l10n/kh/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/kh/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Kambodža
+ Name[eu]=Kanbodia
+ Name[fa]=کامبوج
+-Name[fi]=Kambodza
++Name[fi]=Kambodža
+ Name[fr]=Cambodge
+ Name[fy]=Cambodja
+ Name[ga]=An Chambóid
+--- runtime/l10n/ky/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/ky/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Kaimanisaared
+ Name[eu]=Kaiman Uharteak
+ Name[fa]=جزایر کایمن
+-Name[fi]=Cayman-saaret
++Name[fi]=Caymansaaret
+ Name[fr]=Îles Caïman
+ Name[fy]=Kaaiman Eilannen
+ Name[ga]=Oileáin na gCadhman
+--- runtime/l10n/ne/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/ne/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Niger
+ Name[eu]=Niger
+ Name[fa]=نیجر
+-Name[fi]=Nigeria
++Name[fi]=Niger
+ Name[fr]=Niger
+ Name[fy]=Niger
+ Name[ga]=An Nígir
+--- runtime/l10n/ni/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/ni/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Nikaraagua
+ Name[eu]=Nikaragua
+ Name[fa]=نیکاراگوئه
+-Name[fi]=Nikaragua
++Name[fi]=Nicaragua
+ Name[fr]=Nicaragua
+ Name[fy]=Nicaragua
+ Name[ga]=Nicearagua
+--- runtime/l10n/nl/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/nl/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -43,7 +43,7 @@
+ Name[it]=Paesi Bassi
+ Name[ja]=オランダ
+ Name[ka]=ჰოლანდია
+-Name[kk]=Нидерланды
++Name[kk]=Нидерландия
+ Name[km]=ហុល្លង់
+ Name[kn]=ನೆದರ್ಲ್ಯಾಂಡ್ಸ್
+ Name[ko]=네덜란드
+--- runtime/l10n/ae/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/ae/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -25,7 +25,7 @@
+ Name[eu]=Arabiar Emirerri Batuak
+ Name[fa]=امارات متحده عربی
+ Name[fi]=Yhdistyneet Arabiemiraatit
+-Name[fr]=Émirats arabes unis
++Name[fr]=Émirats Arabes Unis
+ Name[fy]=Ferienigde Arabyske Emiraten
+ Name[ga]=Aontas na nÉimíríochtaí Arabacha
+ Name[gl]=Emiratos Árabes Unidos
+--- runtime/l10n/ag/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/ag/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Antigua ja Barbuda
+ Name[eu]=Antigua eta Barbuda
+ Name[fa]=آنتیگوا و باربودا
+-Name[fi]=Antigua ja Barbados
++Name[fi]=Antigua ja Barbuda
+ Name[fr]=Antigua-et-Barbuda
+ Name[fy]=Antigua en Barbuda
+ Name[ga]=Antigua agus Barbúda
+--- runtime/l10n/az/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/az/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Aserbaidžaan
+ Name[eu]=Azerbaijan
+ Name[fa]=آذربایجان
+-Name[fi]=Azerbaidzan
++Name[fi]=Azerbaidžan
+ Name[fr]=Azerbaïjan
+ Name[fy]=Azerbeidjan
+ Name[ga]=An Asarbaiseáin
+--- runtime/l10n/ba/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/ba/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Bosnia ja Hertsegovina
+ Name[eu]=Bosnia-Herzegovina
+ Name[fa]=بوسنی و هرزگوین
+-Name[fi]=Bosnia ja Herzegovina
++Name[fi]=Bosnia ja Hertsegovina
+ Name[fr]=Bosnie-Herzégovine
+ Name[fy]=Bosnië en Herzegovina
+ Name[ga]=An Bhoisnia-Heirseagaivéin
+--- runtime/l10n/by/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/by/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -25,7 +25,7 @@
+ Name[et]=Valgevene
+ Name[eu]=Bielorrusia
+ Name[fa]=بلوروس
+-Name[fi]=Valkovenäjä
++Name[fi]=Valko-Venäjä
+ Name[fr]=Biélorussie
+ Name[fy]=Wyt-Rusland
+ Name[ga]=An Bhílearúis
+--- runtime/l10n/cc/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/cc/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Kookossaared
+ Name[eu]=Cocos (Keeling) Uharteak
+ Name[fa]=جزایر کوکوس )کیلینگ(
+-Name[fi]=Cookinsaaret
++Name[fi]=Kookossaaret
+ Name[fr]=Îles Cocos
+ Name[fy]=Cocos (Keeling) Islands
+ Name[ga]=Oileán na gCócónna (Keeling)
+--- runtime/l10n/ck/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/ck/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Cooki saared
+ Name[eu]=Cook Uharteak
+ Name[fa]=جزایر کوک
+-Name[fi]=Cooksaaret
++Name[fi]=Cookinsaaret
+ Name[fr]=Îles Cook
+ Name[fy]=Cook islands
+ Name[ga]=Oileáin Chook
+--- runtime/l10n/sb/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/sb/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Saalomoni saared
+ Name[eu]=Solomon Uharteak
+ Name[fa]=جزایر سلیمان
+-Name[fi]=Salomon-saaret
++Name[fi]=Salomonsaaret
+ Name[fr]=Îles Salomon
+ Name[fy]=Solomon Eilannen
+ Name[ga]=Oileáin Sholamón
+--- runtime/l10n/sg/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/sg/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -17,7 +17,7 @@
+ Name[cy]=Singap?r
+ Name[da]=Singapore
+ Name[de]=Singapur
+-Name[el]=Σινγκαπούρη
++Name[el]=Σιγκαπούρη
+ Name[en_GB]=Singapore
+ Name[eo]=Singapuro
+ Name[es]=Singapur
+--- runtime/l10n/sn/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/sn/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Senegal
+ Name[eu]=Senegal
+ Name[fa]=سنگال
+-Name[fi]=Senegali
++Name[fi]=Senegal
+ Name[fr]=Sénégal
+ Name[fy]=Senegal
+ Name[ga]=An tSeineagáil
+--- runtime/l10n/tc/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/tc/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -23,7 +23,7 @@
+ Name[et]=Turks ja Caicos
+ Name[eu]=Turk eta Caicoak Uharteak
+ Name[fa]=جزایر ترکها و کایکوها
+-Name[fi]=Turks- ja Caicos-saaret
++Name[fi]=Turks- ja Caicossaaret
+ Name[fr]=Îles Turques-et-Caïques
+ Name[fy]=Turks en Caicos Eilânen
+ Name[ga]=Oileáin Turks agus Caicos
+--- runtime/l10n/tj/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/tj/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Tadžikistan
+ Name[eu]=Tadjikistan
+ Name[fa]=تاجیکستان
+-Name[fi]=Tajikistan
++Name[fi]=Tadžikistan
+ Name[fr]=Tadjikistan
+ Name[fy]=Tajikistan
+ Name[ga]=An Táidsíceastáin
+--- runtime/l10n/ee/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/ee/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Eesti
+ Name[eu]=Estonia
+ Name[fa]=استونی
+-Name[fi]=Eesti
++Name[fi]=Viro
+ Name[fr]=Estonie
+ Name[fy]=Estland
+ Name[ga]=An Eastóin
+--- runtime/l10n/fj/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/fj/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Fidži
+ Name[eu]=Fiji
+ Name[fa]=فیجی
+-Name[fi]=Fiji
++Name[fi]=Fidži
+ Name[fr]=Fidji
+ Name[fy]=Fiji
+ Name[ga]=Fidsí
+--- runtime/l10n/fk/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/fk/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -24,7 +24,7 @@
+ Name[et]=Falklandi saared (Malviinid)
+ Name[eu]=Malvinak Uharteak (Falkland Uharteak)
+ Name[fa]=جزایر فالکلند )مالویناس(
+-Name[fi]=Falklandin saaret (Malvinassaaret)
++Name[fi]=Falklandinsaaret (Malvinassaaret)
+ Name[fr]=Îles Falkland (Malvinas)
+ Name[fy]=Falkland Eilannen (Malvinas)
+ Name[ga]=Oileáin Fháclainne (Malvinas)
+--- runtime/l10n/vg/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/vg/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -23,7 +23,7 @@
+ Name[et]=Briti Neitsisaared
+ Name[eu]=Birjinak Uharteak, Britainiarrak
+ Name[fa]=جزایر ویرجین انگلیس
+-Name[fi]=Brittien Neitsytsaaret
++Name[fi]=Brittiläiset Neitsytsaaret
+ Name[fr]=Îles Vierges britanniques
+ Name[fy]=Virgin Eilannen, Britse
+ Name[ga]=Oileáin Bhriotanacha na Maighdean
+--- runtime/l10n/vi/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/vi/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -23,7 +23,7 @@
+ Name[et]=USA Neitsisaared
+ Name[eu]=Birjinak Uharteak, AEB
+ Name[fa]=جزایر ویرجین آمریکا
+-Name[fi]=USA:n Neitsytsaaret
++Name[fi]=Yhdysvaltain Neitsytsaaret
+ Name[fr]=Îles Vierges américaines
+ Name[fy]=Virgin Eilannen, U.S.
+ Name[ga]=Oileáin na Maighdean S.A.M.
+--- runtime/l10n/gf/entry.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/l10n/gf/entry.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -14,7 +14,7 @@
+ Name[es]=Guyana Francesa
+ Name[et]=Prantsuse Guajaana
+ Name[eu]=Frantziar Guyana
+-Name[fi]=Ranskan Guiana
++Name[fi]=Ranskan Guyana
+ Name[fr]=Guyane française
+ Name[fy]=Frânsk Guiana
+ Name[ga]=Guáin na Fraince
+--- runtime/plasma/declarativeimports/core/datamodel.h (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/declarativeimports/core/datamodel.h (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -132,6 +132,7 @@
+ QMap<QString, QVector<QVariant> > m_items;
+ QHash<int, QByteArray> m_roleNames;
+ QHash<QString, int> m_roleIds;
++ int m_maxRoleId;
+ };
+
+ int DataModel::countItems() const
+--- runtime/plasma/declarativeimports/core/datamodel.cpp (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/declarativeimports/core/datamodel.cpp (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -125,7 +125,8 @@
+
+ DataModel::DataModel(QObject* parent)
+ : QAbstractItemModel(parent),
+- m_dataSource(0)
++ m_dataSource(0),
++ m_maxRoleId(Qt::UserRole)
{
- QList<NetDevice>& deviceList = mNetworkPrivate->deviceList();
-
-- service->resolve();
+ setObjectName("DataModel");
+ connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+@@ -217,21 +218,21 @@
+ m_items[sourceName] = list.toVector();
+
+ if (!list.isEmpty()) {
+- int role = Qt::UserRole;
+- m_roleNames.clear();
+- m_roleIds.clear();
-
- const QString hostName = service->hostName();
-
- // device
---- runtime/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -19,6 +19,7 @@
- Name[hr]=Nepomukov modul za pretraživanje
- Name[id]=Modul Pencarian Nepomuk
- Name[it]=Modulo di ricerca di Nepomuk
-+Name[ja]=Nepomuk 検索モジュール
- Name[kk]=Nepomuk іздеу модулі
- Name[km]=ម៉ូឌុលស្វែងរករបស់ Nepomuk
- Name[mk]=Модул на Непомук за пребарување
---- runtime/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/nepomuk/kioslaves/nepomuk/kio_nepomuk.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -250,7 +250,11 @@
- QString filename;
- Nepomuk::Resource res = splitNepomukUrl( url, filename );
-
-- if ( res.hasType( Soprano::Vocabulary::NAO::Tag() ) ) {
-+ if ( res.hasType( Nepomuk::Vocabulary::NFO::Folder() ) ) {
-+ redirection( res.property( Nepomuk::Vocabulary::NIE::url() ).toUrl() );
-+ finished();
-+ }
-+ else if ( res.hasType( Soprano::Vocabulary::NAO::Tag() ) ) {
- Query::ComparisonTerm term( Soprano::Vocabulary::NAO::hasTag(), Query::ResourceTerm( res ), Query::ComparisonTerm::Equal );
- redirection( Query::Query( term ).toSearchUrl().url() );
- finished();
---- runtime/nepomuk/services/removablestorage/removablestorageservice.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/nepomuk/services/removablestorage/removablestorageservice.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -1,5 +1,5 @@
- /* This file is part of the KDE Project
-- Copyright (c) 2009 Sebastian Trueg <trueg@kde.org>
-+ Copyright (c) 2009-2010 Sebastian Trueg <trueg@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
-@@ -263,13 +263,18 @@
- // The Strigi service cannot handle this since it does not support filex:/ URLs when updating folders.
- //
- QString query = QString::fromLatin1( "select ?url ?r where { "
-- "?r a nfo:FileDataObject . "
-- "?r nie:isPartOf ?fs . "
-- "?r nie:url ?url . "
-- "?fs a nfo:Filesystem . "
-- "?fs nao:identifier %1 . "
-+ "?r a %1 . "
-+ "?r %2 ?fs . "
-+ "?r %3 ?url . "
-+ "?fs a %4 . "
-+ "?fs %5 %6 . "
- "}" )
-- .arg( Soprano::Node::literalToN3( entry.m_uuid ) );
-+ .arg( Soprano::Node::resourceToN3( Nepomuk::Vocabulary::NFO::FileDataObject() ),
-+ Soprano::Node::resourceToN3( Nepomuk::Vocabulary::NIE::isPartOf() ),
-+ Soprano::Node::resourceToN3( Nepomuk::Vocabulary::NIE::url() ),
-+ Soprano::Node::resourceToN3( Nepomuk::Vocabulary::NFO::Filesystem() ),
-+ Soprano::Node::resourceToN3( Soprano::Vocabulary::NAO::identifier() ),
-+ Soprano::Node::literalToN3( entry.m_uuid ) );
- Soprano::QueryResultIterator it = mainModel()->executeQuery( query, Soprano::Query::QueryLanguageSparql );
- while ( it.next() ) {
- QString path = entry.constructLocalPath( it["url"].uri() );
-@@ -332,7 +337,9 @@
- // the mount point is no longer the parent folder of the top level files on the removable device
- // We need to delete those relations seperately
- //
-- mainModel()->removeAllStatements( Soprano::Node(), Nepomuk::Vocabulary::NIE::isPartOf(), Resource( KUrl( entry.m_lastMountPath ) ).resourceUri() );
-+ QUrl parentUrl = Resource( KUrl( entry.m_lastMountPath ) ).resourceUri();
-+ if( parentUrl.isValid() )
-+ mainModel()->removeAllStatements( Soprano::Node(), Nepomuk::Vocabulary::NIE::isPartOf(), parentUrl );
- }
- kDebug() << "done";
- }
---- runtime/nepomuk/services/strigi/filesystemwatcher.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/nepomuk/services/strigi/filesystemwatcher.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -196,10 +196,17 @@
- emit q->dirty( dirIt.filePath() );
+ if (list.first().canConvert<QVariantHash>()) {
+ foreach (const QString& roleName, list.first().value<QVariantHash>().keys()) {
+- ++role;
+- m_roleNames[role] = roleName.toLatin1();
+- m_roleIds[roleName] = role;
++ if (!m_roleIds.contains(roleName)) {
++ ++m_maxRoleId;
++ m_roleNames[m_maxRoleId] = roleName.toLatin1();
++ m_roleIds[roleName] = m_maxRoleId;
++ }
+ }
+ } else {
+ foreach (const QString& roleName, list.first().value<QVariantMap>().keys()) {
+- ++role;
+- m_roleNames[role] = roleName.toLatin1();
+- m_roleIds[roleName] = role;
++ if (!m_roleIds.contains(roleName)) {
++ ++m_maxRoleId;
++ m_roleNames[m_maxRoleId] = roleName.toLatin1();
++ m_roleIds[roleName] = m_maxRoleId;
++ }
}
}
-+
-+ // check if we have been stopped
-+ if ( !continueChecking() )
-+ return;
- }
-
- for( QHash<QString, FolderEntry>::iterator it = parentEntry.children.begin();
- it != parentEntry.children.end(); ++it ) {
-+ // check if we have been stopped
-+ if ( !continueChecking() )
-+ return;
- updateChildrenCache( parentPath + '/' + it.key(), it.value(), signalNewEntries );
- }
- }
---- runtime/nepomuk/services/strigi/indexscheduler.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/nepomuk/services/strigi/indexscheduler.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -57,8 +57,8 @@
-
-
- namespace {
-- const int s_reducedSpeedDelay = 50; // ms
-- const int s_snailPaceDelay = 200; // ms
-+ const int s_reducedSpeedDelay = 200; // ms
-+ const int s_snailPaceDelay = 1000; // ms
- }
-
-@@ -535,6 +535,7 @@
-
- void Nepomuk::IndexScheduler::removeOldAndUnwantedEntries()
+--- runtime/plasma/containments/newspaper/appletsview.cpp (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/containments/newspaper/appletsview.cpp (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -42,6 +42,7 @@
+ m_dragTimeout(1000)
{
-+ kDebug();
- //
- // Get all folders that are stored as parent folders of indexed files
- //
-@@ -607,6 +608,7 @@
- ResourceManager::instance()->mainModel()->removeContext( g );
- }
- }
-+ kDebug() << "done";
- }
+ m_dragCountdown = new DragCountdown(this);
++ setAlignment(Qt::AlignCenter);
+ connect(m_dragCountdown, SIGNAL(dragRequested()), this, SLOT(appletDragRequested()));
---- runtime/nepomuk/services/strigi/statuswidget.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/nepomuk/services/strigi/statuswidget.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -91,7 +91,8 @@
- // ========================================
- Soprano::Util::AsyncQuery* query
- = Soprano::Util::AsyncQuery::executeQuery( m_model,
-- QLatin1String( "select count(distinct ?r) where { ?r a nfo:FileDataObject . }" ),
-+ QString::fromLatin1( "select count(distinct ?r) where { ?r a %1 . }" )
-+ .arg( Soprano::Node::resourceToN3( Nepomuk::Vocabulary::NFO::FileDataObject() ) ),
- Soprano::Query::QueryLanguageSparql );
- connect( query, SIGNAL( nextReady(Soprano::Util::AsyncQuery*) ), this, SLOT( slotFileCountFinished(Soprano::Util::AsyncQuery*) ) );
+@@ -187,6 +188,12 @@
}
---- runtime/nepomuk/services/storage/repository.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/nepomuk/services/storage/repository.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -328,6 +328,9 @@
- // alwyays index literals
- settings << Soprano::BackendSetting( "fulltextindex", "sync" );
-
-+ // Always force the start, ie. kill previously started Virtuoso instances
-+ settings << Soprano::BackendSetting( "forcedstart", true );
-+
- return settings;
- }
-
---- runtime/nepomuk/kcm/nepomukserverkcm.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/nepomuk/kcm/nepomukserverkcm.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -115,6 +115,8 @@
- this, SLOT( changed() ) );
- connect( m_sliderMemoryUsage, SIGNAL( valueChanged(int) ),
- this, SLOT( changed() ) );
-+ connect( m_checkIndexRemovableMedia, SIGNAL( toggled(bool) ),
-+ this, SLOT( changed() ) );
- connect( m_checkShowHiddenFolders, SIGNAL( toggled( bool ) ),
- m_folderModel, SLOT( setHiddenFoldersShown( bool ) ) );
-
---- runtime/kstyles/oxygen/oxygen.h (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/kstyles/oxygen/oxygen.h (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -136,6 +136,7 @@
- virtual bool drawGroupBoxComplexControl( const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget) const;
- virtual bool drawDialComplexControl( const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget) const;
- virtual bool drawToolButtonComplexControl( const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget) const;
-+ virtual void drawSliderTickmarks( const QStyleOptionSlider* option, QPainter *painter, const QWidget *widget) const;
- //@}
-
- //!@name dedicated primitive drawing
-@@ -303,12 +304,12 @@
- //! returns true if compositing is active
- bool compositingActive( void ) const;
-
-- /*!
-+ /*!
- returns first widget in parent chain that sets autoFillBackground to true,
- or NULL if none
- */
- const QWidget* checkAutoFillBackground( const QWidget* ) const;
--
-+
- protected Q_SLOTS:
-
- //! standard icons
---- runtime/kstyles/oxygen/oxygen.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/kstyles/oxygen/oxygen.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -270,6 +270,28 @@
- if( drawToolButtonComplexControl( option, painter, widget) ) return;
- else break;
-
-+ case CC_Slider:
-+ {
-+ if (const QStyleOptionSlider *slider = qstyleoption_cast<const QStyleOptionSlider *>(option))
-+ {
-+
-+ // if tickmarks are not requested, fall back to default
-+ if( !(slider->subControls & SC_SliderTickmarks) || slider->tickPosition == QSlider::NoTicks ) break;
-+
-+ // draw oxygen custom tickmarks
-+ drawSliderTickmarks( slider, painter, widget );
-+
-+ // disable tickmarks drawing and draw using default
-+ // this is necessary because by default kstyle does not allow style
-+ // to customize tickmarks painting
-+ QStyleOptionSlider local( *slider );
-+ local.subControls &= ~SC_SliderTickmarks;
-+ KStyle::drawComplexControl(control,&local,painter,widget);
-+ return;
-+
-+ } else break;
-+ }
-+
- default: break;
-
- }
-@@ -784,19 +806,40 @@
- if( bOpt && ( bOpt->features & QStyleOptionButton::Flat ) )
- {
-
-- // hover rect
-- QRect slitRect = r;
-
-- if( enabled && hoverAnimated )
-+ QRect slitRect(r);
-+ if( !( opts & Sunken) )
- {
-+ // hover rect
-+ if( enabled && hoverAnimated )
-+ {
-
-- QColor glow( _helper.alphaColor( _viewFocusBrush.brush(QPalette::Active).color(), hoverOpacity ) );
-- _helper.slitFocused( glow )->render(slitRect, p);
-+ QColor glow( _helper.alphaColor( _viewFocusBrush.brush(QPalette::Active).color(), hoverOpacity ) );
-+ _helper.slitFocused( glow )->render(slitRect, p);
-
-- } else if( mouseOver) {
-+ } else if( mouseOver) {
-
-- _helper.slitFocused(_viewFocusBrush.brush(QPalette::Active).color())->render(slitRect, p);
-+ _helper.slitFocused(_viewFocusBrush.brush(QPalette::Active).color())->render(slitRect, p);
-
-+ }
-+
-+ } else {
-+
-+ slitRect.adjust( 0, 0, 0, -1 );
-+
-+ // flat pressed-down buttons do not get focus effect,
-+ // consistently with tool buttons
-+ if( enabled && hoverAnimated )
-+ {
-+
-+ renderHole(p, pal.color(QPalette::Window), slitRect, false, mouseOver, hoverOpacity, Oxygen::AnimationHover, TileSet::Ring );
-+
-+ } else {
-+
-+ renderHole(p, pal.color(QPalette::Window), slitRect, false, mouseOver);
-+
-+ }
-+
- }
-
- } else {
-@@ -2244,6 +2287,76 @@
}
- //_________________________________________________________
-+void OxygenStyle::drawSliderTickmarks(
-+ const QStyleOptionSlider* opt,
-+ QPainter* p,
-+ const QWidget* widget ) const
++void AppletsView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
++ Plasma::ScrollWidget::mouseReleaseEvent(event);
++ m_appletsContainer->setCurrentApplet(0);
++}
+
-+ int ticks = opt->tickPosition;
-+ int available = pixelMetric(PM_SliderSpaceAvailable, opt, widget);
-+ int interval = opt->tickInterval;
-+ if( interval < 1 ) interval = opt->pageStep;
-+ if( interval < 1 ) return;
-+
-+ QRect r( widget->rect() );
-+ QPalette pal( widget->palette() );
-+
-+ const int len = pixelMetric(PM_SliderLength, opt, widget);
-+ const int fudge = len / 2;
-+ int current( opt->minimum );
-+
-+ // Since there is no subrect for tickmarks do a translation here.
-+ p->save();
-+ p->translate(r.x(), r.y());
-+
-+ if( opt->orientation == Qt::Horizontal )
-+ {
-+ QColor base( _helper.backgroundColor( pal.color( QPalette::Window ), widget, r.center() ) );
-+ p->setPen( _helper.calcDarkColor( base ) );
-+ }
-+
-+ int tickSize( opt->orientation == Qt::Horizontal ? r.height()/3:r.width()/3 );
-+
-+ while( current <= opt->maximum )
-+ {
-+
-+ int position( sliderPositionFromValue(opt->minimum, opt->maximum, current, available) + fudge );
-+
-+ // calculate positions
-+ if( opt->orientation == Qt::Horizontal )
-+ {
-+ if( ticks == QSlider::TicksAbove ) p->drawLine( position, 0, position, tickSize );
-+ else if( ticks == QSlider::TicksBelow ) p->drawLine( position, r.height()-tickSize, position, r.height() );
-+ else {
-+ p->drawLine( position, 0, position, tickSize );
-+ p->drawLine( position, r.height()-tickSize, position, r.height() );
+ void AppletsView::appletDragRequested()
+ {
+ if (!m_appletMoved) {
+--- runtime/plasma/containments/newspaper/appletsview.h (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/containments/newspaper/appletsview.h (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -54,6 +54,7 @@
+ void manageMouseMoveEvent(QGraphicsSceneMouseEvent *event);
+ void manageMouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+ void showSpacer(const QPointF &pos);
++ void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+
+ protected Q_SLOTS:
+ void appletDragRequested();
+--- runtime/plasma/containments/newspaper/appletscontainer.cpp (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/containments/newspaper/appletscontainer.cpp (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -107,7 +107,26 @@
+ const int margin = 4 + (m_mainLayout->count() - 1) * m_mainLayout->spacing();
+
+ QSizeF viewportSize = m_scrollWidget->viewportGeometry().size();
++ QSizeF maxSize;
+
++ //try to figure out the column size from the applets size hints
++ if (m_orientation == Qt::Vertical && m_containment) {
++ foreach (Plasma::Applet *applet, m_containment->applets()) {
++ QSizeF appletSize = applet->effectiveSizeHint(Qt::PreferredSize);
++ if (appletSize.width() > maxSize.width()) {
++ maxSize.setWidth(appletSize.width());
+ }
-+
-+ } else {
-+
-+ QColor base( _helper.backgroundColor( pal.color( QPalette::Window ), widget, QPoint( r.center().x(), position ) ) );
-+ p->setPen( _helper.calcDarkColor( base ) );
-+
-+ if( ticks == QSlider::TicksAbove ) p->drawLine( 0, position, tickSize, position );
-+ else if( ticks == QSlider::TicksBelow ) p->drawLine( r.width()-tickSize, position, r.width(), position );
-+ else {
-+ p->drawLine( 0, position, tickSize, position );
-+ p->drawLine( r.width()-tickSize, position, r.width(), position );
++ if (appletSize.height() > maxSize.height()) {
++ maxSize.setHeight(appletSize.height());
+ }
+ }
-+
-+ // go to next position
-+ int next( current + interval );
-+ if( next < current ) break;
-+ current = next;
-+
++ const QSizeF sizeFromHints = maxSize * m_mainLayout->count();
++ //a bit of snap to avoid contents just too large
++ if (qAbs(sizeFromHints.width() - viewportSize.width()) > 128) {
++ viewportSize = sizeFromHints;
++ }
+ }
+
-+ p->restore();
-+}
-+
-+//_________________________________________________________
- bool OxygenStyle::drawSliderPrimitive(
- int primitive,
- const QStyleOption* opt,
-@@ -3527,6 +3640,19 @@
-
- if( !scrollArea ) return;
+ for (int i = 0; i < m_mainLayout->count(); ++i) {
+ QGraphicsLinearLayout *lay = dynamic_cast<QGraphicsLinearLayout *>(m_mainLayout->itemAt(i));
+
+--- runtime/plasma/scriptengines/javascript/simplebindings/size.cpp (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/scriptengines/javascript/simplebindings/size.cpp (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -52,7 +52,7 @@
+ DECLARE_SELF(QSizeF, height);
+ if (ctx->argumentCount() > 0) {
+ qreal height = ctx->argument(0).toNumber();
+- self->setWidth(height);
++ self->setHeight(height);
+ }
-+ // HACK: add exception for KPIM transactionItemView, which is an overlay widget
-+ // and must have filled background. This is a temporary workaround until a more
-+ // robust solution is found.
-+ if( scrollArea->inherits( "KPIM::TransactionItemView" ) )
-+ {
-+ // also need to make the scrollarea background plain (using autofill background)
-+ // so that optional vertical scrollbar background is not transparent either.
-+ // TODO: possibly add an event filter to use the "normal" window background
-+ // instead of something flat.
-+ scrollArea->setAutoFillBackground( true );
-+ return;
-+ }
-+
- // check frame style and background role
- if( scrollArea->frameShape() != QFrame::NoFrame ) return;
- if( scrollArea->backgroundRole() != QPalette::Window ) return;
-@@ -3866,18 +3992,22 @@
+ return QScriptValue(eng, self->height());
+--- runtime/plasma/scriptengines/javascript/simplebindings/rect.cpp (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/scriptengines/javascript/simplebindings/rect.cpp (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -149,7 +149,7 @@
+ {
+ DECLARE_SELF(QRectF, moveLeft);
+ qreal left = ctx->argument(0).toNumber();
+- self->moveBottom(left);
++ self->moveLeft(left);
+ return QScriptValue();
}
- //___________________________________________________________________________________
--void OxygenStyle::renderDialSlab( QPainter *painter, QRect rect, const QColor &color, const QStyleOption *option, StyleOptions opts, qreal opacity, Oxygen::AnimationMode mode) const
-+void OxygenStyle::renderDialSlab( QPainter *painter, QRect r, const QColor &color, const QStyleOption *option, StyleOptions opts, qreal opacity, Oxygen::AnimationMode mode) const
+@@ -157,7 +157,7 @@
{
-
- // cast option
- const QStyleOptionSlider* sliderOption( qstyleoption_cast<const QStyleOptionSlider*>( option ) );
- if( !sliderOption ) return;
-
-+ // adjust rect to be square, and centered
-+ int dimension(qMin( r.width(), r.height() ));
-+ QRect rect( r.topLeft() + QPoint( (r.width()-dimension)/2, (r.height()-dimension)/2 ), QSize( dimension, dimension ) );
-+
- // calculate glow color
- QColor glow = slabShadowColor( color, opts, opacity, mode );
-
- // get main slab
-- QPixmap pix( glow.isValid() ? _helper.dialSlabFocused( color, glow, 0.0, rect.width()) : _helper.dialSlab( color, 0.0, rect.width() ));
-+ QPixmap pix( glow.isValid() ? _helper.dialSlabFocused( color, glow, 0.0, dimension ) : _helper.dialSlab( color, 0.0, dimension ));
- const qreal baseOffset = 3.5;
-
- QColor light = _helper.calcLightColor(color);
-@@ -3889,7 +4019,6 @@
-
- // indicator
- // might use cache here
--
- // angle calculation from qcommonstyle.cpp (c) Trolltech 1992-2007, ASA.
- qreal angle(0);
- if( sliderOption->maximum == sliderOption->minimum ) angle = M_PI / 2;
-@@ -3900,9 +4029,9 @@
- else angle = (M_PI*8 - fraction*10*M_PI)/6;
- }
-
-- QPointF center = rect.center();
-- const int sliderWidth = qMin( 2*rect.width()/5, 18 );
-- const qreal radius( 0.5*( rect.width() - 2*sliderWidth ) );
-+ QPointF center( pix.rect().center() );
-+ const int sliderWidth = dimension/6;
-+ const qreal radius( 0.5*( dimension - 2*sliderWidth ) );
- center += QPointF( radius*cos(angle), -radius*sin(angle));
-
- QRectF sliderRect( 0, 0, sliderWidth, sliderWidth );
-@@ -3933,6 +4062,7 @@
- p.end();
-
- painter->drawPixmap( rect.topLeft(), pix );
-+
- return;
-
+ DECLARE_SELF(QRectF, moveRight);
+ qreal right = ctx->argument(0).toNumber();
+- self->moveBottom(right);
++ self->moveRight(right);
+ return QScriptValue();
}
---- runtime/kstyles/oxygen/transitions/oxygencomboboxdata.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/kstyles/oxygen/transitions/oxygencomboboxdata.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -73,7 +73,7 @@
- break;
- case QEvent::Resize:
-- if( !recursiveCheck() )
-+ if( !recursiveCheck() && target_.data()->isVisible() )
- { timer_.start( 0, this ); }
- break;
+--- runtime/plasma/scriptengines/javascript/plasmoid/appletinterface.cpp (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/scriptengines/javascript/plasmoid/appletinterface.cpp (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -124,25 +124,21 @@
+ m_appletScriptEngine->setConfigurationRequired(needsConfiguring, reason);
+ }
---- runtime/kurifilter-plugins/fixhost/fixhosturifilter.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/kurifilter-plugins/fixhost/fixhosturifilter.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -65,7 +65,7 @@
+-#ifdef USE_JS_SCRIPTENGINE
+-
+-void AppletInterface::update(const QRectF &rect)
++void JsAppletInterface::update(const QRectF &rect)
{
- KResolver resolver( url.host());
- resolver.setFamily( KResolver::InetFamily );
-- return( resolver.start() && resolver.wait( 5000 ) && resolver.error() == KResolver::NoError );
-+ return( resolver.start() && resolver.wait( 1000 ) && resolver.error() == KResolver::NoError );
+ applet()->update(rect);
}
- K_PLUGIN_FACTORY(FixHostUriFilterFactory, registerPlugin<FixHostUriFilter>();)
---- runtime/attica/kcm/kcm_attica.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/attica/kcm/kcm_attica.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -51,7 +51,7 @@
- Name[sv]=Hantering av leverantörer av öppna samarbetstjänster
- Name[uk]=Керування наданням послуг службами Open Collaboration
- Name[x-test]=xxOpen Collaboration Services provider managementxx
--Name[zh_CN]=打开协作服务器的管理服务
-+Name[zh_CN]=开放式协作服务管理
- Name[zh_TW]=開放協同服務提供者管理
- Comment=Manage Open Collaboration Services providers
- Comment[ca]=Gestiona els proveïdors de serveis «Open Collaboration»
-@@ -85,7 +85,7 @@
- Comment[pt]=Faz a gestão de fornecedores dos Serviços Abertos de Colaboração
- Comment[pt_BR]=Gerencia os fornecedores dos Serviços de Colaboração Abertos
- Comment[ro]=Gestionează furnizorii de colaborare deschisă
--Comment[ru]=Настройки работы с операторами услуг Open Collaboration
-+Comment[ru]=Настройка работы с операторами услуг Open Collaboration
- Comment[sk]=Správa poskytovateľov služieb otvorenej spolupráce
- Comment[sl]=Upravljajte s ponudniki storitev Open Collaboration Services
- Comment[sr]=Управљајте добављачима сервиса отворене сарадње
-@@ -95,5 +95,5 @@
- Comment[sv]=Hantera leverantörer av öppna samarbetstjänster
- Comment[uk]=Керування наданням послуг службами Open Collaboration
- Comment[x-test]=xxManage Open Collaboration Services providersxx
--Comment[zh_CN]=管理已打开的协作服务
-+Comment[zh_CN]=管理开放式协作服务的提供方
- Comment[zh_TW]=管理開放協同服務提供者
---- runtime/drkonqi/data/mappings (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/drkonqi/data/mappings (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -55,7 +55,6 @@
- knotificationicontest=plasma|widget-systemtray
- lancelot=plasma|widget-lancelot
- plasma-netbook=plasma|plasma-netbook
--kscreenlocker=krunner|kscreenlocker
- #KDE Plasma Desktop (KWin)
- kwin_killer_helper=kwin|general
- kwin_rules_dialog=kwin|general
-@@ -116,6 +115,10 @@
- krandrtray=krandr|krandrtray
- kmymoney=kmymoney4|general
- kdevdesigner=kdevelop|Qt Designer Integration
-+kdevelop.bin=kdevelop|general
-+kscreenlocker=kscreensaver|locker
-+gwenview_importer=gwenview|general
-+kdmgreet=kdm|general
-
- #---
- #This section relates a product groupt to a product
-@@ -164,4 +167,4 @@
- imaging=digikam|digikamimageplugins|kipiplugins
- networkmanager=knetworkmanager|Network Management|solid
- scanner=libksane
--filemanagement=konqueror|dolphin
-+filemanagement=konqueror|dolphin|nepomuk
---- runtime/l10n/yt/entry.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/l10n/yt/entry.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -16,6 +16,7 @@
- Name[hi]=मायोटे
- Name[hr]=Mayotte
- Name[id]=Mayotte
-+Name[is]=Mayotte
- Name[it]=Mayotte
- Name[ja]=マヨット
- Name[kk]=Майотта
---- runtime/l10n/re/entry.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/l10n/re/entry.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -15,6 +15,7 @@
- Name[fy]=Réunion
- Name[hr]=Réunion
- Name[id]=Réunion
-+Name[is]=Réunion
- Name[it]=Riunione
- Name[ja]=レユニオン
- Name[kk]=Реюньион
---- runtime/l10n/cf/entry.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/l10n/cf/entry.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -78,7 +78,7 @@
- Name[tg]=Ҷумҳурии Африкаи Марказӣ
- Name[th]=สาธารณรัฐแอฟริกากลาง
- Name[tr]=Orta Afrika Cumhuriyeti
--Name[uk]=Центральна африканська республіка
-+Name[uk]=Центральноафриканська Республіка
- Name[uz]=Markaziy Afrika Respublikasi
- Name[uz@cyrillic]=Марказий Африка Республикаси
- Name[vi]=Cộng hoà Trung Phi
---- runtime/l10n/sg/entry.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/l10n/sg/entry.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -79,7 +79,7 @@
- Name[tg]=Сингапур
- Name[th]=สิงคโปร์
- Name[tr]=Singapur
--Name[uk]=Сингапур
-+Name[uk]=Сінгапур
- Name[uz]=Singapur
- Name[uz@cyrillic]=Сингапур
- Name[vi]=Xin-ga-poa
---- runtime/l10n/sv/entry.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/l10n/sv/entry.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -79,7 +79,7 @@
- Name[tg]=Салвадор
- Name[th]=เอลซัลวาดอร์
- Name[tr]=El Salvador
--Name[uk]=Ель-Сальвадор
-+Name[uk]=Сальвадор
- Name[uz]=Salvador
- Name[uz@cyrillic]=Салвадор
- Name[vi]=En Xan-va-đoa
---- runtime/l10n/sz/entry.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/l10n/sz/entry.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -79,7 +79,7 @@
- Name[tg]=Свазиленд
- Name[th]=สวาซิแลนด์
- Name[tr]=Swaziland
--Name[uk]=Свазиленд
-+Name[uk]=Свазіленд
- Name[uz]=Svazilend
- Name[uz@cyrillic]=Свазиленд
- Name[vi]=Xuoă-xi-lan
---- runtime/l10n/tz/entry.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/l10n/tz/entry.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -78,7 +78,7 @@
- Name[tg]=Танзания, Ҷумҳурии
- Name[th]=สาธารณรัฐแทนซาเนีย
- Name[tr]=Tanzanya
--Name[uk]=Танзанія, об'єднана республіка
-+Name[uk]=Об’єднана Республіка Танзанія
- Name[uz]=Tanzaniya Birlashgan Respublikasi
- Name[uz@cyrillic]=Танзания Бирлашган Республикаси
- Name[vi]=Cộng hoà Thống nhất Thanh-xa-ni-a
---- runtime/l10n/gf/entry.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/l10n/gf/entry.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -16,6 +16,7 @@
- Name[hr]=Francuska Gvajana
- Name[hu]=Francia Guyana
- Name[id]=Guyana Perancis
-+Name[is]=Franska Gínea
- Name[it]=Guyana Francese
- Name[ja]=仏領ギアナ
- Name[kk]=Францияның Гвианасы
---- runtime/plasma/scriptengines/javascript/simplebindings/qscriptbookkeeping.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/plasma/scriptengines/javascript/simplebindings/qscriptbookkeeping.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -185,6 +185,42 @@
- extender = static_cast<Plasma::Extender *>(obj);
+-QGraphicsLayout *AppletInterface::layout() const
++QGraphicsLayout *JsAppletInterface::layout() const
+ {
+ return applet()->layout();
}
-+typedef Plasma::Service *ServicePtr;
-+QScriptValue qScriptValueFromService(QScriptEngine *engine, const ServicePtr &service)
-+{
-+ return engine->newQObject(const_cast<Plasma::Service *>(service), QScriptEngine::AutoOwnership, QScriptEngine::PreferExistingWrapperObject);
-+}
-+
-+void serviceFromQScriptValue(const QScriptValue &scriptValue, ServicePtr &service)
-+{
-+ QObject *obj = scriptValue.toQObject();
-+ service = static_cast<Plasma::Service *>(obj);
-+}
-+
-+typedef Plasma::DataEngine *DataEnginePtr;
-+QScriptValue qScriptValueFromDataEngine(QScriptEngine *engine, const DataEnginePtr &dataEngine)
-+{
-+ return engine->newQObject(const_cast<Plasma::DataEngine *>(dataEngine), QScriptEngine::AutoOwnership, QScriptEngine::PreferExistingWrapperObject);
-+}
-+
-+void dataEngineFromQScriptValue(const QScriptValue &scriptValue, DataEnginePtr &dataEngine)
-+{
-+ QObject *obj = scriptValue.toQObject();
-+ dataEngine = static_cast<Plasma::DataEngine *>(obj);
-+}
-+
-+typedef Plasma::ServiceJob *ServiceJobPtr;
-+QScriptValue qScriptValueFromServiceJob(QScriptEngine *engine, const ServiceJobPtr &serviceJob)
-+{
-+ return engine->newQObject(const_cast<Plasma::ServiceJob *>(serviceJob), QScriptEngine::AutoOwnership, QScriptEngine::PreferExistingWrapperObject);
-+}
-+
-+void serviceJobFromQScriptValue(const QScriptValue &scriptValue, ServiceJobPtr &serviceJob)
-+{
-+ QObject *obj = scriptValue.toQObject();
-+ serviceJob = static_cast<Plasma::ServiceJob *>(obj);
-+}
-+
- void registerSimpleAppletMetaTypes(QScriptEngine *engine)
+-void AppletInterface::setLayout(QGraphicsLayout *layout)
++void JsAppletInterface::setLayout(QGraphicsLayout *layout)
{
- qScriptRegisterMetaType<QGraphicsWidget*>(engine, qScriptValueFromQGraphicsWidget, qGraphicsWidgetFromQScriptValue);
-@@ -194,9 +230,12 @@
- qScriptRegisterMetaType<KIO::Job *>(engine, qScriptValueFromKIOJob, qKIOJobFromQScriptValue);
-
- qScriptRegisterMetaType<Plasma::Animation *>(engine, qScriptValueFromAnimation, abstractAnimationFromQScriptValue);
-+ qScriptRegisterMetaType<Plasma::Extender *>(engine, qScriptValueFromExtender , extenderFromQScriptValue);
-+ qScriptRegisterMetaType<Plasma::VideoWidget::Controls>(engine, qScriptValueFromControls, controlsFromScriptValue, QScriptValue());
- qRegisterMetaType<DataEngine::Data>("Plasma::DataEngine::Data");
- qRegisterMetaType<DataEngine::Data>("DataEngine::Data");
- qScriptRegisterMapMetaType<DataEngine::Data>(engine);
-- qScriptRegisterMetaType<Plasma::Extender *>(engine, qScriptValueFromExtender , extenderFromQScriptValue);
-- qScriptRegisterMetaType<Plasma::VideoWidget::Controls>(engine, qScriptValueFromControls, controlsFromScriptValue, QScriptValue());
-+ qScriptRegisterMetaType<Plasma::Service *>(engine, qScriptValueFromService, serviceFromQScriptValue);
-+ qScriptRegisterMetaType<Plasma::DataEngine *>(engine, qScriptValueFromDataEngine, dataEngineFromQScriptValue);
-+ qScriptRegisterMetaType<Plasma::ServiceJob *>(engine, qScriptValueFromServiceJob, serviceJobFromQScriptValue);
+ applet()->setLayout(layout);
}
---- runtime/plasma/scriptengines/javascript/simplebindings/appletinterface.h (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/plasma/scriptengines/javascript/simplebindings/appletinterface.h (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -69,6 +69,8 @@
- Q_PROPERTY(QGraphicsLayout *layout WRITE setLayout READ layout)
- Q_PROPERTY(bool immutable READ immutable)
- Q_PROPERTY(int apiVersion READ apiVersion)
-+ Q_PROPERTY(QRectF rect READ rect)
-+ Q_PROPERTY(QSizeF size READ size)
- Q_PROPERTY(QObject *sender READ sender)
-
- public:
---- runtime/plasma/scriptengines/javascript/simplebindings/pixmap.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/plasma/scriptengines/javascript/simplebindings/pixmap.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -69,7 +69,7 @@
- QScriptValue::PropertyFlags setter = QScriptValue::PropertySetter;
- proto.setProperty("null", eng->newFunction(null), getter);
- proto.setProperty("rect", eng->newFunction(rect), getter);
-- proto.setProperty("scaled", eng->newFunction(scaled), getter);
-+ proto.setProperty("scaled", eng->newFunction(scaled));
- eng->setDefaultPrototype(qMetaTypeId<QPixmap>(), proto);
- eng->setDefaultPrototype(qMetaTypeId<QPixmap*>(), proto);
---- runtime/plasma/scriptengines/javascript/simplebindings/rect.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/plasma/scriptengines/javascript/simplebindings/rect.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -297,7 +297,7 @@
- QScriptValue::PropertyFlags setter = QScriptValue::PropertySetter;
+-#endif
+-
+ QString AppletInterface::activeConfig() const
+ {
+ return m_currentConfig.isEmpty() ? "main" : m_currentConfig;
+@@ -379,7 +375,7 @@
- proto.setProperty("adjust", eng->newFunction(adjust));
-- proto.setProperty("adjusted", eng->newFunction(adjusted), getter);
-+ proto.setProperty("adjusted", eng->newFunction(adjusted));
- proto.setProperty("translate", eng->newFunction(translate));
- proto.setProperty("setCoords", eng->newFunction(setCoords));
- proto.setProperty("setRect", eng->newFunction(setRect));
---- runtime/plasma/scriptengines/javascript/simplejavascriptapplet.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091891)
-+++ runtime/plasma/scriptengines/javascript/simplejavascriptapplet.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091891)
-@@ -140,6 +140,7 @@
- kDebug() << failureMsg;
- }
-+ kDebug() << "Error in " << engine->uncaughtException().property("fileName").toString() << "on line" << engine->uncaughtExceptionLineNumber();
- kDebug() << engine->uncaughtExceptionBacktrace();
+ PopupAppletInterface::PopupAppletInterface(AbstractJsAppletScript *parent)
+- : AppletInterface(parent)
++ : POPUPAPPLETSUPERCLASS(parent)
+ {
}
-@@ -215,7 +216,7 @@
- QScriptValueList args;
- args << m_engine->toScriptValue(p);
- args << m_engine->toScriptValue(const_cast<QStyleOptionGraphicsItem*>(option));
-- args << m_engine->toScriptValue(contentsRect);
-+ args << m_engine->toScriptValue(QRectF(contentsRect));
+--- runtime/plasma/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -55,6 +55,8 @@
+ #include <Plasma/Svg>
+ #include <Plasma/VideoWidget>
+
++#define USE_JS_SCRIPTENGINE
++
+ #include "appletauthorization.h"
+ #include "appletinterface.h"
+ #include "scriptenv.h"
+@@ -511,8 +513,8 @@
+
+ // Expose applet interface
+ const bool isPopupApplet = qobject_cast<Plasma::PopupApplet *>(applet());
+- m_interface = isPopupApplet ? new PopupAppletInterface(this) : new AppletInterface(this);
+- m_self = m_engine->newQObject(m_interface);
++ m_interface = isPopupApplet ? new PopupAppletInterface(this) : new JsAppletInterface(this);
++ m_self = m_engine->newQObject(m_interface, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater);
+ m_env->addMainObjectProperties(m_self);
+ m_self.setScope(global);
+ global.setProperty("plasmoid", m_self);
+--- runtime/plasma/scriptengines/javascript/plasmoid/appletinterface.h (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/scriptengines/javascript/plasmoid/appletinterface.h (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -76,10 +76,6 @@
+ Q_PROPERTY(int apiVersion READ apiVersion CONSTANT)
+ Q_PROPERTY(QRectF rect READ rect)
+ Q_PROPERTY(QSizeF size READ size)
+-#ifdef USE_JS_SCRIPTENGINE
+- Q_PROPERTY(QGraphicsLayout *layout WRITE setLayout READ layout)
+- Q_PROPERTY(QObject *sender READ sender)
+-#endif
- QScriptContext *ctx = m_engine->pushContext();
- ctx->setActivationObject(m_self);
-@@ -534,13 +535,6 @@
- global.setProperty("AnimationGroup", m_engine->newFunction(SimpleJavaScriptApplet::animationGroup));
- global.setProperty("ParallelAnimationGroup", m_engine->newFunction(SimpleJavaScriptApplet::parallelAnimationGroup));
+ public:
+ AppletInterface(AbstractJsAppletScript *parent);
+@@ -276,12 +272,6 @@
-- // Bindings for data engine
-- m_engine->setDefaultPrototype(qMetaTypeId<DataEngine*>(), m_engine->newQObject(new DataEngine(), QScriptEngine::ScriptOwnership));
-- m_engine->setDefaultPrototype(qMetaTypeId<Service*>(), m_engine->newQObject(new DummyService(), QScriptEngine::ScriptOwnership));
-- m_engine->setDefaultPrototype(qMetaTypeId<ServiceJob*>(),
-- m_engine->newQObject(new ServiceJob(QString(), QString(), QMap<QString, QVariant>()),
-- QScriptEngine::ScriptOwnership ));
--
- bindI18N(m_engine);
- global.setProperty("dataEngine", m_engine->newFunction(SimpleJavaScriptApplet::dataEngine));
- global.setProperty("service", m_engine->newFunction(SimpleJavaScriptApplet::service));
-@@ -570,7 +564,7 @@
- fun = m_engine->newFunction(SimpleJavaScriptApplet::print);
- global.setProperty("print", fun);
- fun = m_engine->newFunction(SimpleJavaScriptApplet::debug);
-- global.setProperty("print", debug);
-+ global.setProperty("debug", fun);
+ Q_INVOKABLE Plasma::Extender *extender() const;
- // Work around bug in 4.3.0
- qMetaTypeId<QVariant>();
-@@ -684,7 +678,9 @@
- anim->setTargetWidget(parent);
- }
+-#ifdef USE_JS_SCRIPTENGINE
+- Q_INVOKABLE void update(const QRectF &rect = QRectF());
+- QGraphicsLayout *layout() const;
+- void setLayout(QGraphicsLayout *);
+-#endif
+-
+ Plasma::DataEngine *dataEngine(const QString &name);
-- return engine->newQObject(anim);
-+ QScriptValue value = engine->newQObject(anim);
-+ registerEnums(engine, value, *anim->metaObject());
-+ return value;
- }
- }
+ QList<QAction*> contextualActions() const;
+@@ -311,9 +301,31 @@
+ QMap<QString, Plasma::ConfigLoader*> m_configs;
+ };
+-class PopupAppletInterface : public AppletInterface
++class JsAppletInterface : public AppletInterface
+ {
+ Q_OBJECT
++ Q_PROPERTY(QGraphicsLayout *layout WRITE setLayout READ layout)
++ Q_PROPERTY(QObject *sender READ sender)
++
++public:
++ JsAppletInterface(AbstractJsAppletScript *parent)
++ : AppletInterface(parent)
++ {
++ }
++
++ Q_INVOKABLE void update(const QRectF &rect = QRectF());
++ QGraphicsLayout *layout() const;
++ void setLayout(QGraphicsLayout *);
++};
++
++#ifdef USE_JS_SCRIPTENGINE
++#define POPUPAPPLETSUPERCLASS JsAppletInterface
++#else
++#define POPUPAPPLETSUPERCLASS AppletInterface
++#endif
++class PopupAppletInterface : public POPUPAPPLETSUPERCLASS
++{
++ Q_OBJECT
+ Q_PROPERTY(QIcon popupIcon READ popupIcon WRITE setPopupIcon)
+ Q_PROPERTY(bool passivePopup READ isPassivePopup WRITE setPassivePopup)
+ Q_PROPERTY(QGraphicsWidget *popupWidget READ popupWidget WRITE setPopupWidget)
+--- runtime/plasma/scriptengines/javascript/data/plasma-scriptengine-dataengine-javascript.desktop (.../tags/KDE/4.6.0/kdebase) (wersja 1218981)
++++ runtime/plasma/scriptengines/javascript/data/plasma-scriptengine-dataengine-javascript.desktop (.../branches/KDE/4.6/kdebase) (wersja 1218981)
+@@ -15,7 +15,7 @@
+ Name[et]=JavaScripti andmemootor
+ Name[eu]=JavaScript datu-motorea
+ Name[fi]=JavaScript-datakone
+-Name[fr]=Moteur de donnée JavaScript
++Name[fr]=Moteur de données JavaScript
+ Name[fy]=JavaSkript gegevens motor
+ Name[ga]=Inneall Sonraí JavaScript
+ Name[gl]=Motor de datos de JavaScript
projects / packages / kde4-kdebase-runtime.git / blobdiff