rev 7541 - in branches/kde4/packages/kdebase/debian: . patches
Fathi Boudra
fboudra-guest at alioth.debian.org
Thu Oct 18 21:35:03 UTC 2007
Author: fboudra-guest
Date: 2007-10-18 21:35:03 +0000 (Thu, 18 Oct 2007)
New Revision: 7541
Added:
branches/kde4/packages/kdebase/debian/patches/01_kdebase_branch_r726783.diff
Removed:
branches/kde4/packages/kdebase/debian/patches/01_pull_r726655_r725907_r725662_r725652_r725648_r725642.diff
Modified:
branches/kde4/packages/kdebase/debian/changelog
branches/kde4/packages/kdebase/debian/patches/series
Log:
* svn branch pull to r726783.
Modified: branches/kde4/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase/debian/changelog 2007-10-18 21:18:28 UTC (rev 7540)
+++ branches/kde4/packages/kdebase/debian/changelog 2007-10-18 21:35:03 UTC (rev 7541)
@@ -1,13 +1,15 @@
kdebase (4:3.94.0-2) experimental; urgency=low
+ * svn branch pull to r726783.
+
+ +++ Changes by Armin Berres:
+
* Add debug package.
* Split the Oxygen icons into a seperate package kde-icons-oxygen. This way
KDE4 applications can be used when running KDE3.
- * Cherry pick some patches from upstream which are needed for
- co-installability of kde4base and kde3libs and a correct search path for
- kdm. Namely r726655, r725907, r725662, r725652, r725648 and r725642.
- -- Armin Berres <trigger+debian at space-based.de> Thu, 18 Oct 2007 19:50:52 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 18 Oct 2007 23:32:51 +0200
+
kdebase (4:3.94.0-1) experimental; urgency=low
* KDE4 beta3.
Added: branches/kde4/packages/kdebase/debian/patches/01_kdebase_branch_r726783.diff
===================================================================
--- branches/kde4/packages/kdebase/debian/patches/01_kdebase_branch_r726783.diff (rev 0)
+++ branches/kde4/packages/kdebase/debian/patches/01_kdebase_branch_r726783.diff 2007-10-18 21:35:03 UTC (rev 7541)
@@ -0,0 +1,18929 @@
+--- a/apps/nsplugins/pluginscan.cpp
++++ b/apps/nsplugins/pluginscan.cpp
+@@ -203,8 +203,8 @@
+ int num = cg.readEntry( "number", 0 );
+ cg.writeEntry( "number", num+1 );
+
++ cg = KConfigGroup(infoConfig,QString::number(num));
+ // create plugin info
+- cg.changeGroup( QString::number(num) );
+ cg.writeEntry( "name", name );
+ cg.writeEntry( "description", description );
+ cg.writeEntry( "file", file );
+--- a/apps/nsplugins/khtml_plugins.desktop
++++ b/apps/nsplugins/khtml_plugins.desktop
+@@ -4,7 +4,7 @@
+ ServiceTypes=KCModule,KCModuleInit
+ DocPath=kcontrol/khtml/index.html#kbrowse-plugins
+ Icon=konqueror
+-Exec=kcmshell khtml_plugins
++Exec=kcmshell4 khtml_plugins
+
+ X-KDE-Library=kcm_konqhtml
+ X-KDE-PluginKeyword=khtml_plugins
+@@ -88,7 +88,7 @@
+ Comment[el]=Ρυθμίστε τα πρόσθετα του περιηγητή
+ Comment[eo]=Agordu la foliumilajn kromaĵojn
+ Comment[es]=Configuración de los complementos del navegador
+-Comment[et]=Veebilehitseja pluginate seadistamine
++Comment[et]=Brauseri pluginate seadistamine
+ Comment[eu]=Konfiguratu arakatzailearen pluginak
+ Comment[fa]=پیکربندی وصلههای مرورگر
+ Comment[fi]=Muokkaa selaimen liitännäisasetuksia
+@@ -151,7 +151,7 @@
+ Keywords[el]=konqueror,kfm,περιηγητής,html,ιστός,www,γραμματοσειρές,πρόσθετα
+ Keywords[eo]=Konkeranto,Kfm,TTT,HTML,WWW,tiparo,koloro,Javo,Javoskripto,kursoro, kursilo,ligo,referenco,bildo,signaro,kodo
+ Keywords[es]=konqueror,kfm,navegador,html,web,www,tipos de letra,complementos
+-Keywords[et]=konqueror,kfm,veebilehitseja,html,veeb,www,fondid,pluginad
++Keywords[et]=konqueror,kfm,veebilehitseja,brauser,html,veeb,www,fondid,pluginad
+ Keywords[eu]=konqueror,kfm,arakatzailea,html,web,www,letra-tipoak,pluginak
+ Keywords[fa]=konqueror، kfm، مرورگر، html، وب، www، قلمها، وصلهها
+ Keywords[fi]=konqueror,kfm,selain,html,web,www,kirjasimet,liitännäiset
+@@ -165,7 +165,7 @@
+ Keywords[is]=konqueror,kfm,flakkari,html,web,www,letur,íforrit,vefur
+ Keywords[it]=konqueror,kfm,browser,html,web,www,caratteri,plugin
+ Keywords[ja]=konqueror,kfm,ブラウザ,html,web,ウェブ,www,フォント,プラグイン
+-Keywords[km]=konqueror,kfm,កម្មវិធីរុករក,html,បណ្ដាញ,វើលវ៉ាយវេប,ពុម្ពអក្សរ,កម្មវិធីជំនួយ
++Keywords[km]=konqueror kfm កម្មវិធីរុករក html បណ្ដាញ វើលវ៉ាយវេប ពុម្ពអក្សរ កម្មវិធីជំនួយ
+ Keywords[ko]=konqueror,브라우저,html,웹,글꼴,플러그인
+ Keywords[lt]=konqueror,kfm,browser,html,web,www,fonts,plugins. naršyklė,tinklalapiai,šriftai,priedai
+ Keywords[lv]=iekarotājs,kfm,pārlūks,html,web,www,fonti,spraudņi
+--- a/apps/kappfinder/apps/System/xosview.desktop
++++ b/apps/kappfinder/apps/System/xosview.desktop
+@@ -30,7 +30,7 @@
+ GenericName[el]=Επόπτης συστήματος
+ GenericName[eo]=Sistemstato-programo
+ GenericName[es]=Monitor del sistema
+-GenericName[et]=Süsteemi monitor
++GenericName[et]=Süsteemi jälgija
+ GenericName[eu]=Sistemaren monitorea
+ GenericName[fa]=نمایشگر سیستم
+ GenericName[fi]=Järjestelmänvalvontaohjelma
+--- a/apps/kappfinder/apps/Internet/mozilla.desktop
++++ b/apps/kappfinder/apps/Internet/mozilla.desktop
+@@ -27,7 +27,7 @@
+ GenericName[el]=Περιηγητής ιστού
+ GenericName[eo]=TTT-legilo
+ GenericName[es]=Navegador web
+-GenericName[et]=Veebilehitseja
++GenericName[et]=Veebibrauser
+ GenericName[eu]=Web arakatzailea
+ GenericName[fa]=مرورگر وب
+ GenericName[fi]=WWW-selain
+--- a/apps/kappfinder/apps/Internet/arena.desktop
++++ b/apps/kappfinder/apps/Internet/arena.desktop
+@@ -28,7 +28,7 @@
+ GenericName[el]=Περιηγητής ιστού
+ GenericName[eo]=TTT-legilo
+ GenericName[es]=Navegador web
+-GenericName[et]=Veebilehitseja
++GenericName[et]=Veebibrauser
+ GenericName[eu]=Web arakatzailea
+ GenericName[fa]=مرورگر وب
+ GenericName[fi]=WWW-selain
+--- a/apps/kappfinder/apps/Internet/netscape6.desktop
++++ b/apps/kappfinder/apps/Internet/netscape6.desktop
+@@ -36,7 +36,7 @@
+ GenericName[el]=Περιηγητής ιστού
+ GenericName[eo]=TTT-legilo
+ GenericName[es]=Navegador web
+-GenericName[et]=Veebilehitseja
++GenericName[et]=Veebibrauser
+ GenericName[eu]=Web arakatzailea
+ GenericName[fa]=مرورگر وب
+ GenericName[fi]=WWW-selain
+--- a/apps/kappfinder/apps/Internet/xbiff.desktop
++++ b/apps/kappfinder/apps/Internet/xbiff.desktop
+@@ -30,7 +30,7 @@
+ GenericName[el]=Ειδοποίηση για mail
+ GenericName[eo]=Retpoŝtavertilo
+ GenericName[es]=Alerta de correo
+-GenericName[et]=Kirjde monitor
++GenericName[et]=Kirjade jälgija
+ GenericName[eu]=Mail jakinarazpena
+ GenericName[fa]=هشدار نامه
+ GenericName[fi]=Sähköpostivaroitus
+--- a/apps/kappfinder/apps/Internet/coolmail.desktop
++++ b/apps/kappfinder/apps/Internet/coolmail.desktop
+@@ -26,7 +26,7 @@
+ GenericName[el]=Ειδοποίηση για mail
+ GenericName[eo]=Retpoŝtavertilo
+ GenericName[es]=Alerta de correo
+-GenericName[et]=Kirjde monitor
++GenericName[et]=Kirjade jälgija
+ GenericName[eu]=Mail jakinarazpena
+ GenericName[fa]=هشدار نامه
+ GenericName[fi]=Sähköpostivaroitus
+--- a/apps/kappfinder/apps/Internet/Galeon.desktop
++++ b/apps/kappfinder/apps/Internet/Galeon.desktop
+@@ -24,7 +24,7 @@
+ GenericName[el]=Περιηγητής ιστού
+ GenericName[eo]=TTT-legilo
+ GenericName[es]=Navegador web
+-GenericName[et]=Veebilehitseja
++GenericName[et]=Veebibrauser
+ GenericName[eu]=Web arakatzailea
+ GenericName[fa]=مرورگر وب
+ GenericName[fi]=WWW-selain
+--- a/apps/kappfinder/apps/Internet/opera.desktop
++++ b/apps/kappfinder/apps/Internet/opera.desktop
+@@ -25,7 +25,7 @@
+ GenericName[el]=Περιηγητής ιστού
+ GenericName[eo]=TTT-legilo
+ GenericName[es]=Navegador web
+-GenericName[et]=Veebilehitseja
++GenericName[et]=Veebibrauser
+ GenericName[eu]=Web arakatzailea
+ GenericName[fa]=مرورگر وب
+ GenericName[fi]=WWW-selain
+--- a/apps/kappfinder/apps/Internet/mozilla-firefox.desktop
++++ b/apps/kappfinder/apps/Internet/mozilla-firefox.desktop
+@@ -28,7 +28,7 @@
+ GenericName[el]=Περιηγητής ιστού
+ GenericName[eo]=TTT-legilo
+ GenericName[es]=Navegador web
+-GenericName[et]=Veebilehitseja
++GenericName[et]=Veebibrauser
+ GenericName[eu]=Web arakatzailea
+ GenericName[fa]=مرورگر وب
+ GenericName[fi]=WWW-selain
+--- a/apps/kappfinder/apps/Internet/epiphany.desktop
++++ b/apps/kappfinder/apps/Internet/epiphany.desktop
+@@ -25,7 +25,7 @@
+ GenericName[el]=Περιηγητής ιστού
+ GenericName[eo]=TTT-legilo
+ GenericName[es]=Navegador web
+-GenericName[et]=Veebilehitseja
++GenericName[et]=Veebibrauser
+ GenericName[eu]=Web arakatzailea
+ GenericName[fa]=مرورگر وب
+ GenericName[fi]=WWW-selain
+--- a/apps/kappfinder/apps/Internet/Faces.desktop
++++ b/apps/kappfinder/apps/Internet/Faces.desktop
+@@ -35,7 +35,7 @@
+ GenericName[el]=Ειδοποίηση για mail
+ GenericName[eo]=Retpoŝtavertilo
+ GenericName[es]=Alerta de correo
+-GenericName[et]=Kirjde monitor
++GenericName[et]=Kirjade jälgija
+ GenericName[eu]=Mail jakinarazpena
+ GenericName[fa]=هشدار نامه
+ GenericName[fi]=Sähköpostivaroitus
+--- a/apps/kappfinder/apps/Internet/netscape.desktop
++++ b/apps/kappfinder/apps/Internet/netscape.desktop
+@@ -27,7 +27,7 @@
+ GenericName[el]=Περιηγητής ιστού
+ GenericName[eo]=TTT-legilo
+ GenericName[es]=Navegador web
+-GenericName[et]=Veebilehitseja
++GenericName[et]=Veebibrauser
+ GenericName[eu]=Web arakatzailea
+ GenericName[fa]=مرورگر وب
+ GenericName[fi]=WWW-selain
+--- a/apps/kappfinder/apps/Internet/Terminal/Lynx.desktop
++++ b/apps/kappfinder/apps/Internet/Terminal/Lynx.desktop
+@@ -21,7 +21,7 @@
+ GenericName[el]=Περιηγητής ιστού
+ GenericName[eo]=TTT-legilo
+ GenericName[es]=Navegador web
+-GenericName[et]=Veebilehitseja
++GenericName[et]=Veebibrauser
+ GenericName[eu]=Web arakatzailea
+ GenericName[fa]=مرورگر وب
+ GenericName[fi]=WWW-selain
+--- a/apps/kappfinder/apps/Internet/Terminal/Links.desktop
++++ b/apps/kappfinder/apps/Internet/Terminal/Links.desktop
+@@ -31,7 +31,7 @@
+ GenericName[el]=Περιηγητής ιστού
+ GenericName[eo]=TTT-legilo
+ GenericName[es]=Navegador web
+-GenericName[et]=Veebilehitseja
++GenericName[et]=Veebibrauser
+ GenericName[eu]=Web arakatzailea
+ GenericName[fa]=مرورگر وب
+ GenericName[fi]=WWW-selain
+--- a/apps/kappfinder/apps/Internet/Terminal/w3m.desktop
++++ b/apps/kappfinder/apps/Internet/Terminal/w3m.desktop
+@@ -20,7 +20,7 @@
+ GenericName[el]=Περιηγητής ιστού
+ GenericName[eo]=TTT-legilo
+ GenericName[es]=Navegador web
+-GenericName[et]=Veebilehitseja
++GenericName[et]=Veebibrauser
+ GenericName[eu]=Web arakatzailea
+ GenericName[fa]=مرورگر وب
+ GenericName[fi]=WWW-selain
+--- a/apps/kappfinder/apps/Multimedia/muse.desktop
++++ b/apps/kappfinder/apps/Multimedia/muse.desktop
+@@ -12,6 +12,7 @@
+ GenericName[de]=Musik-Sequencer
+ GenericName[el]=Sequencer μουσικής
+ GenericName[es]=Secuenciador de música
++GenericName[et]=Muusika sekventsija
+ GenericName[fa]=ترتیبسنج موسیقی
+ GenericName[ga]=Seicheamhóir Ceoil
+ GenericName[it]=Sequencer musicale
+--- a/apps/kappfinder/apps/Multimedia/mplayer.desktop
++++ b/apps/kappfinder/apps/Multimedia/mplayer.desktop
+@@ -15,7 +15,7 @@
+ GenericName[el]=Αναπαραγωγέας βίντεο
+ GenericName[eo]=Ludilo por videofilmoj
+ GenericName[es]=Reproductor de vídeo
+-GenericName[et]=Videofailide mängimine
++GenericName[et]=Videomängija
+ GenericName[eu]=Bideo erreproduzigailua
+ GenericName[fa]=پخشکنندۀ ویدیو
+ GenericName[fi]=Videosoitin
+--- a/apps/kappfinder/apps/Multimedia/freebirth.desktop
++++ b/apps/kappfinder/apps/Multimedia/freebirth.desktop
+@@ -10,6 +10,7 @@
+ GenericName[bg]=Барабани
+ GenericName[de]=Rythmus-Synthesizer
+ GenericName[el]=Μηχανή κρουστών
++GenericName[et]=Trummimasin
+ GenericName[ga]=Meaisín Drumadóireachta
+ GenericName[he]=מכונת תופים
+ GenericName[ja]=ドラムマシン
+--- a/apps/kappfinder/apps/Multimedia/galan.desktop
++++ b/apps/kappfinder/apps/Multimedia/galan.desktop
+@@ -9,6 +9,7 @@
+ GenericName[de]=Modularer Synthesizer
+ GenericName[el]=Αρθρωτός συνθέτης
+ GenericName[es]=Sintetizador modular
++GenericName[et]=Modulaarsüntesaator
+ GenericName[ga]=Sintéiseoir Modúlach
+ GenericName[it]=Sintetizzatore modulare
+ GenericName[ja]=モジュラーシンセ
+--- a/apps/kappfinder/apps/Multimedia/Aumix.desktop
++++ b/apps/kappfinder/apps/Multimedia/Aumix.desktop
+@@ -20,7 +20,7 @@
+ GenericName[el]=Μείκτης ήχου
+ GenericName[eo]=Miksilo por sonoroj
+ GenericName[es]=Mezclador audio
+-GenericName[et]=Audiomikser
++GenericName[et]=Helimikser
+ GenericName[eu]=Audio nahasgailua
+ GenericName[fa]=مخلوطکن خودکار
+ GenericName[fi]=Äänimikseri
+--- a/apps/kappfinder/apps/Multimedia/rezound.desktop
++++ b/apps/kappfinder/apps/Multimedia/rezound.desktop
+@@ -22,7 +22,7 @@
+ GenericName[el]=Επεξεργαστής ήχου
+ GenericName[eo]=Sonora redaktilo
+ GenericName[es]=Editor de audio
+-GenericName[et]=Audioredaktor
++GenericName[et]=Heliredaktor
+ GenericName[eu]=Audio editorea
+ GenericName[fa]=ویرایشگر صوتی
+ GenericName[fi]=Äänieditori
+--- a/apps/kappfinder/apps/Multimedia/meterbridge.desktop
++++ b/apps/kappfinder/apps/Multimedia/meterbridge.desktop
+@@ -10,6 +10,7 @@
+ GenericName[bg]=Двуканален VU-метър
+ GenericName[de]=Zweikanal VU-Meter
+ GenericName[el]=VU-Meter δύο καναλιών
++GenericName[et]=Kahekanaline VU-meeter
+ GenericName[ga]=Méadar VU le dhá chainéal
+ GenericName[ja]=デュアルチャンネル VU メーター
+ GenericName[kk]=Қос арналы деңгей индикаторы
+--- a/apps/kappfinder/apps/Multimedia/ardour.desktop
++++ b/apps/kappfinder/apps/Multimedia/ardour.desktop
+@@ -9,6 +9,7 @@
+ GenericName[de]=Mehrspur-Audio-Studio
+ GenericName[el]=Στούντιο ήχου πολλαπλών κομματιών
+ GenericName[es]=Estudio de sonido multipista
++GenericName[et]=Mitmerealine helistuudio
+ GenericName[ga]=Stiúideo Fuaime Ilrian
+ GenericName[he]=סטודיו שמע מרובה רצועות
+ GenericName[it]=Studio audio multitraccia
+--- a/apps/kappfinder/apps/Multimedia/bcast2000.desktop
++++ b/apps/kappfinder/apps/Multimedia/bcast2000.desktop
+@@ -24,7 +24,7 @@
+ GenericName[el]=IDE Ήχου και Βίντεο
+ GenericName[eo]=Redaktilo por sonoro kaj filmo
+ GenericName[es]=IDE de audio y video
+-GenericName[et]=Audio ja video arenduskeskkond
++GenericName[et]=Heli ja video arenduskeskkond
+ GenericName[eu]=Audio eta bideo IDEa
+ GenericName[fa]=آی دی ای صوتی و ویدیویی
+ GenericName[fi]=Ääni ja Video IDE
+--- a/apps/kappfinder/apps/Multimedia/gtv.desktop
++++ b/apps/kappfinder/apps/Multimedia/gtv.desktop
+@@ -15,7 +15,7 @@
+ GenericName[el]=Αναπαραγωγέας MPEG
+ GenericName[eo]=Ludilo por MPEG-dosieroj
+ GenericName[es]=Reproductor MPEG
+-GenericName[et]=MPEG videofailide mängimine
++GenericName[et]=MPEG videofailide mängija
+ GenericName[eu]=MPEG erreproduzigailua
+ GenericName[fa]=پخشکنندۀ MPEG
+ GenericName[fi]=MPEG-soitin
+--- a/apps/kappfinder/apps/Multimedia/realplayer.desktop
++++ b/apps/kappfinder/apps/Multimedia/realplayer.desktop
+@@ -15,7 +15,7 @@
+ GenericName[el]=Αναπαραγωγέας βίντεο
+ GenericName[eo]=Ludilo por videofilmoj
+ GenericName[es]=Reproductor de vídeo
+-GenericName[et]=Videofailide mängimine
++GenericName[et]=Videomängija
+ GenericName[eu]=Bideo erreproduzigailua
+ GenericName[fa]=پخشکنندۀ ویدیو
+ GenericName[fi]=Videosoitin
+--- a/apps/kappfinder/apps/Multimedia/audacity.desktop
++++ b/apps/kappfinder/apps/Multimedia/audacity.desktop
+@@ -23,7 +23,7 @@
+ GenericName[el]=Επεξεργαστής ήχου
+ GenericName[eo]=Sonora redaktilo
+ GenericName[es]=Editor de audio
+-GenericName[et]=Audioredaktor
++GenericName[et]=Heliredaktor
+ GenericName[eu]=Audio editorea
+ GenericName[fa]=ویرایشگر صوتی
+ GenericName[fi]=Äänieditori
+--- a/apps/kappfinder/apps/Multimedia/aviplay.desktop
++++ b/apps/kappfinder/apps/Multimedia/aviplay.desktop
+@@ -15,7 +15,7 @@
+ GenericName[el]=Αναπαραγωγέας βίντεο AVI
+ GenericName[eo]=Ludilo por AVI-videofilmoj
+ GenericName[es]=Reproductor de vídeo AVI
+-GenericName[et]=AVI videofailide mängimine
++GenericName[et]=AVI videofailide mängija
+ GenericName[eu]=AVI bideo erreproduzigailua
+ GenericName[fa]=پخشکنندۀ ویدیویی AVI
+ GenericName[fi]=AVI-videosoitin
+--- a/apps/kappfinder/apps/Multimedia/mtv.desktop
++++ b/apps/kappfinder/apps/Multimedia/mtv.desktop
+@@ -15,7 +15,7 @@
+ GenericName[el]=Αναπαραγωγέας βίντεο
+ GenericName[eo]=Ludilo por videofilmoj
+ GenericName[es]=Reproductor de vídeo
+-GenericName[et]=Videofailide mängimine
++GenericName[et]=Videomängija
+ GenericName[eu]=Bideo erreproduzigailua
+ GenericName[fa]=پخشکنندۀ ویدیو
+ GenericName[fi]=Videosoitin
+--- a/apps/kappfinder/apps/Multimedia/XMovie.desktop
++++ b/apps/kappfinder/apps/Multimedia/XMovie.desktop
+@@ -23,7 +23,7 @@
+ GenericName[el]=Αναπαραγωγέας βίντεο
+ GenericName[eo]=Ludilo por videofilmoj
+ GenericName[es]=Reproductor de vídeo
+-GenericName[et]=Videofailide mängimine
++GenericName[et]=Videomängija
+ GenericName[eu]=Bideo erreproduzigailua
+ GenericName[fa]=پخشکنندۀ ویدیو
+ GenericName[fi]=Videosoitin
+--- a/apps/kappfinder/apps/Multimedia/mixxx.desktop
++++ b/apps/kappfinder/apps/Multimedia/mixxx.desktop
+@@ -10,6 +10,7 @@
+ GenericName[de]=DJ-Mixer und -Wiedergabe
+ GenericName[el]=Μείκτης DJ και αναπαραγωγέας
+ GenericName[es]=Reproductor y mezclador de DJ
++GenericName[et]=DJ mikser ja mängija
+ GenericName[fa]=ترکیبکننده و پخشکننده DJ
+ GenericName[ga]=Meascthóir DJ agus Seinnteoir
+ GenericName[he]=מערבל ונגן
+--- a/apps/kappfinder/apps/Multimedia/hydrogen.desktop
++++ b/apps/kappfinder/apps/Multimedia/hydrogen.desktop
+@@ -10,6 +10,7 @@
+ GenericName[bg]=Барабани
+ GenericName[de]=Rythmus-Synthesizer
+ GenericName[el]=Μηχανή κρουστών
++GenericName[et]=Trummimasin
+ GenericName[ga]=Meaisín Drumadóireachta
+ GenericName[he]=מכונת תופים
+ GenericName[ja]=ドラムマシン
+--- a/apps/kappfinder/apps/Multimedia/ams.desktop
++++ b/apps/kappfinder/apps/Multimedia/ams.desktop
+@@ -9,6 +9,7 @@
+ GenericName[de]=Modularer Alsa-Synthesizer
+ GenericName[el]=Αρθρωτός συνθέτης Alsa
+ GenericName[es]=Sintetizador Modular Alsa
++GenericName[et]=Alsa modulaarsüntesaator
+ GenericName[he]=סינתסייזר מודולרי ל־ALSA
+ GenericName[ja]=ALSA モジュラーシンセサイザ
+ GenericName[kk]=Alsa модульді синтезаторы
+--- a/apps/kappfinder/apps/Multimedia/djplay.desktop
++++ b/apps/kappfinder/apps/Multimedia/djplay.desktop
+@@ -12,6 +12,7 @@
+ GenericName[de]=DJ-Mixer und -Wiedergabe
+ GenericName[el]=Μείκτης DJ και αναπαραγωγέας
+ GenericName[es]=Reproductor y mezclador de DJ
++GenericName[et]=DJ mikser ja mängija
+ GenericName[fa]=ترکیبکننده و پخشکننده DJ
+ GenericName[ga]=Meascthóir DJ agus Seinnteoir
+ GenericName[he]=מערבל ונגן
+--- a/apps/kappfinder/apps/Multimedia/sweep.desktop
++++ b/apps/kappfinder/apps/Multimedia/sweep.desktop
+@@ -28,7 +28,7 @@
+ GenericName[el]=Επεξεργαστής ήχου
+ GenericName[eo]=Sonora redaktilo
+ GenericName[es]=Editor de audio
+-GenericName[et]=Audioredaktor
++GenericName[et]=Heliredaktor
+ GenericName[eu]=Audio editorea
+ GenericName[fa]=ویرایشگر صوتی
+ GenericName[fi]=Äänieditori
+--- a/apps/kappfinder/apps/Multimedia/vkeybd.desktop
++++ b/apps/kappfinder/apps/Multimedia/vkeybd.desktop
+@@ -10,6 +10,7 @@
+ GenericName[de]=Virtuelle MIDI-Klaviatur
+ GenericName[el]=Εικονικό πληκτρολόγιο MIDI
+ GenericName[es]=Teclado MIDI virtual
++GenericName[et]=Virtuaalne MIDI klaviatuur
+ GenericName[ga]=Méarchlár Fíorúil MIDI
+ GenericName[it]=Tastiera MIDI virtuale
+ GenericName[ja]=仮想 MIDI キーボード
+--- a/apps/kappfinder/apps/Multimedia/qsynth.desktop
++++ b/apps/kappfinder/apps/Multimedia/qsynth.desktop
+@@ -10,6 +10,7 @@
+ GenericName[de]=Steuerung für FluidSynth
+ GenericName[el]=Έλεγχος για το FluidSynth
+ GenericName[es]=Control de FluidSynth
++GenericName[et]=FluidSynthi juhtimine
+ GenericName[ga]=Rialtán le haghaidh FluidSynth
+ GenericName[it]=Controllo per FluidSynth
+ GenericName[ja]=FluidSynth のコントロール
+--- a/apps/kappfinder/apps/Multimedia/freqtweak.desktop
++++ b/apps/kappfinder/apps/Multimedia/freqtweak.desktop
+@@ -11,6 +11,7 @@
+ GenericName[de]=Effekte für Jack
+ GenericName[el]=Εφέ για το Jack
+ GenericName[es]=Efectos para Jack
++GenericName[et]=JACKi efektid
+ GenericName[ga]=Maisíochtaí Jack
+ GenericName[it]=Effetti per Jack
+ GenericName[ja]=Jack のエフェクト
+--- a/apps/kappfinder/apps/Multimedia/qjackctl.desktop
++++ b/apps/kappfinder/apps/Multimedia/qjackctl.desktop
+@@ -10,6 +10,7 @@
+ GenericName[de]=Steuerung für Jack
+ GenericName[el]=Έλεγχος για το Jack
+ GenericName[es]=Control de Jack
++GenericName[et]=JACKi juhtimine
+ GenericName[ga]=Rialtán le haghaidh Jack
+ GenericName[it]=Controllo per Jack
+ GenericName[ja]=Jack のコントロール
+--- a/apps/kappfinder/apps/Multimedia/enjoympeg.desktop
++++ b/apps/kappfinder/apps/Multimedia/enjoympeg.desktop
+@@ -22,7 +22,7 @@
+ GenericName[el]=Αναπαραγωγέας MPEG
+ GenericName[eo]=Ludilo por MPEG-dosieroj
+ GenericName[es]=Reproductor MPEG
+-GenericName[et]=MPEG videofailide mängimine
++GenericName[et]=MPEG videofailide mängija
+ GenericName[eu]=MPEG erreproduzigailua
+ GenericName[fa]=پخشکنندۀ MPEG
+ GenericName[fi]=MPEG-soitin
+--- a/apps/kappfinder/apps/Multimedia/xine.desktop
++++ b/apps/kappfinder/apps/Multimedia/xine.desktop
+@@ -15,7 +15,7 @@
+ GenericName[el]=Αναπαραγωγέας βίντεο
+ GenericName[eo]=Ludilo por videofilmoj
+ GenericName[es]=Reproductor de vídeo
+-GenericName[et]=Videofailide mängimine
++GenericName[et]=Videomängija
+ GenericName[eu]=Bideo erreproduzigailua
+ GenericName[fa]=پخشکنندۀ ویدیو
+ GenericName[fi]=Videosoitin
+--- a/apps/kappfinder/apps/Office/XsLite.desktop
++++ b/apps/kappfinder/apps/Office/XsLite.desktop
+@@ -27,7 +27,7 @@
+ GenericName[el]=Λογιστικό φύλλο
+ GenericName[eo]=Tabelkalkulilo
+ GenericName[es]=Hoja de cálculo
+-GenericName[et]=Tabeltöötlus
++GenericName[et]=Tabelarvutus
+ GenericName[eu]=Kalkulu orria
+ GenericName[fa]=صفحه گسترده
+ GenericName[fi]=Taulukkolaskentaohjelma
+--- a/apps/kappfinder/apps/Office/Gnumeric.desktop
++++ b/apps/kappfinder/apps/Office/Gnumeric.desktop
+@@ -20,7 +20,7 @@
+ GenericName[el]=Λογιστικό φύλλο
+ GenericName[eo]=Tabelkalkulilo
+ GenericName[es]=Hoja de cálculo
+-GenericName[et]=Tabeltöötlus
++GenericName[et]=Tabelarvutus
+ GenericName[eu]=Kalkulu orria
+ GenericName[fa]=صفحه گسترده
+ GenericName[fi]=Taulukkolaskentaohjelma
+--- a/apps/kappfinder/apps/Office/acroread.desktop
++++ b/apps/kappfinder/apps/Office/acroread.desktop
+@@ -39,7 +39,7 @@
+ GenericName[el]=Προβολέας PDF
+ GenericName[eo]=PDF-rigardilo
+ GenericName[es]=Visor de documentos PDF
+-GenericName[et]=PDF failide vaatamine
++GenericName[et]=PDF-failide näitaja
+ GenericName[eu]=PDF ikustailua
+ GenericName[fa]=مشاهدهگر PDF
+ GenericName[fi]=PDF-näytin
+--- a/apps/kappfinder/apps/Office/Guppi.desktop
++++ b/apps/kappfinder/apps/Office/Guppi.desktop
+@@ -22,7 +22,7 @@
+ GenericName[el]=Πρόγραμμα για διαγράμματα
+ GenericName[eo]=Programo por fari diagramojn
+ GenericName[es]=Generador de diagramas
+-GenericName[et]=Diagrammide joonistamine
++GenericName[et]=Skeemide joonistamine
+ GenericName[eu]=Diagrametarako programa
+ GenericName[fa]=برنامه برای نمودارها
+ GenericName[fi]=Kaavioidenpiirto-ohjelma
+--- a/apps/kappfinder/apps/Office/Dia.desktop
++++ b/apps/kappfinder/apps/Office/Dia.desktop
+@@ -22,7 +22,7 @@
+ GenericName[el]=Πρόγραμμα για διαγράμματα
+ GenericName[eo]=Programo por fari diagramojn
+ GenericName[es]=Generador de diagramas
+-GenericName[et]=Diagrammide joonistamine
++GenericName[et]=Skeemide joonistamine
+ GenericName[eu]=Diagrametarako programa
+ GenericName[fa]=برنامه برای نمودارها
+ GenericName[fi]=Kaavioidenpiirto-ohjelma
+--- a/apps/kappfinder/apps/Office/xpdf.desktop
++++ b/apps/kappfinder/apps/Office/xpdf.desktop
+@@ -24,7 +24,7 @@
+ GenericName[el]=Προβολέας PDF
+ GenericName[eo]=PDF-rigardilo
+ GenericName[es]=Visor de documentos PDF
+-GenericName[et]=PDF failide vaatamine
++GenericName[et]=PDF-failide näitaja
+ GenericName[eu]=PDF ikustailua
+ GenericName[fa]=مشاهدهگر PDF
+ GenericName[fi]=PDF-näytin
+--- a/apps/kappfinder/apps/Utilities/SystemLogViewer.desktop
++++ b/apps/kappfinder/apps/Utilities/SystemLogViewer.desktop
+@@ -14,7 +14,7 @@
+ Name[el]=Προβολέας αρχείων καταγραφής
+ Name[eo]=Sistemprotokol-rigardilo
+ Name[es]=Visor de registro del sistema
+-Name[et]=Süsteemi logide monitor
++Name[et]=Süsteemi logide jälgija
+ Name[eu]=Sistemaren log ikustailua
+ Name[fa]=مشاهدهگر ثبت سیستم
+ Name[fi]=Järjestelmälokien näytin
+--- a/apps/kappfinder/apps/Utilities/xutils/xclipboard.desktop
++++ b/apps/kappfinder/apps/Utilities/xutils/xclipboard.desktop
+@@ -60,7 +60,7 @@
+ GenericName[el]=Προβολέας πρόχειρου
+ GenericName[eo]=Rigardilo por la X-poŝenhavo
+ GenericName[es]=Visor del portapapeles
+-GenericName[et]=Lõikepuhvri vaatamine
++GenericName[et]=Lõikepuhvri näitaja
+ GenericName[eu]=Arbelaren ikustailua
+ GenericName[fa]=مشاهدهگر تخته یادداشت
+ GenericName[fi]=Leikepöydän näytin
+--- a/apps/kappfinder/apps/Utilities/xutils/xload.desktop
++++ b/apps/kappfinder/apps/Utilities/xutils/xload.desktop
+@@ -55,7 +55,7 @@
+ GenericName[el]=Εποπτεία φόρτου του συστήματος
+ GenericName[eo]=Montras la sistemŝarĝon
+ GenericName[es]=Monitoriza la carga del sistema
+-GenericName[et]=Süsteemi koormuse monitor
++GenericName[et]=Süsteemi koormuse jälgija
+ GenericName[eu]=Sistemaren zama monitorizatzen du
+ GenericName[fa]=بارگذاری سیستم نمایشگرها
+ GenericName[fi]=Seuraa järjestelmän kuormaa
+--- a/apps/kappfinder/apps/Utilities/xutils/xconsole.desktop
++++ b/apps/kappfinder/apps/Utilities/xutils/xconsole.desktop
+@@ -59,7 +59,7 @@
+ GenericName[el]=Προβολέας μηνυμάτων κονσόλας
+ GenericName[eo]=Rigardilo por Konzolo-mesaĝoj
+ GenericName[es]=Visor de mensajes de consola
+-GenericName[et]=Konsooliteadete vaatamine
++GenericName[et]=Konsooliteadete näitaja
+ GenericName[eu]=Konsolako mezu ikustailua
+ GenericName[fa]=مشاهدهگر پیام پیشانه
+ GenericName[fi]=Konsoliviestien näytin
+--- a/apps/kappfinder/apps/Utilities/xutils/Xtraceroute.desktop
++++ b/apps/kappfinder/apps/Utilities/xutils/Xtraceroute.desktop
+@@ -26,7 +26,7 @@
+ GenericName[el]=Εργαλείο δικτύου
+ GenericName[eo]=Retanalizilo
+ GenericName[es]=Herramienta de redes
+-GenericName[et]=Võrguutiliit
++GenericName[et]=Võrgutööriist
+ GenericName[eu]=Sare tresna
+ GenericName[fa]=ابزار شبکه
+ GenericName[fi]=Verkkotyökalu
+--- a/apps/konqueror/konqbrowser.desktop
++++ b/apps/konqueror/konqbrowser.desktop
+@@ -29,7 +29,7 @@
+ GenericName[el]=Περιηγητής ιστού
+ GenericName[eo]=TTT-legilo
+ GenericName[es]=Navegador web
+-GenericName[et]=Veebilehitseja
++GenericName[et]=Veebibrauser
+ GenericName[eu]=Web arakatzailea
+ GenericName[fa]=مرورگر وب
+ GenericName[fi]=WWW-selain
+--- a/apps/konqueror/src/konqmainwindow.cpp
++++ b/apps/konqueror/src/konqmainwindow.cpp
+@@ -838,11 +838,14 @@
+ QString suggestedFilename;
+
+ KonqRun* run = childView->run();
+- if (run)
++ int attachment = 0;
++ if (run) {
+ suggestedFilename = run->suggestedFileName();
++ attachment = (run->serverSuggestsSave()) ? KParts::BrowserRun::AttachmentDisposition : KParts::BrowserRun::InlineDisposition;
++ }
+
+ KParts::BrowserRun::AskSaveResult res = KParts::BrowserRun::askEmbedOrSave(
+- url, mimeType, suggestedFilename );
++ url, mimeType, suggestedFilename, attachment );
+ if ( res == KParts::BrowserRun::Open )
+ forceAutoEmbed = true;
+ else if ( res == KParts::BrowserRun::Cancel )
+@@ -3758,7 +3761,7 @@
+
+ // Go menu
+ m_paUp = new KToolBarPopupAction( KIcon("go-up"), i18n( "&Up" ), this );
+- actionCollection()->addAction( "up", m_paUp );
++ actionCollection()->addAction( "go_up", m_paUp );
+ m_paUp->setShortcuts( KStandardShortcut::shortcut(KStandardShortcut::Up) );
+ connect( m_paUp, SIGNAL( triggered( Qt::MouseButtons, Qt::KeyboardModifiers) ), this,
+ SLOT( slotUp(Qt::MouseButtons, Qt::KeyboardModifiers) ) );
+@@ -3768,7 +3771,7 @@
+ QPair< KGuiItem, KGuiItem > backForward = KStandardGuiItem::backAndForward();
+
+ m_paBack = new KToolBarPopupAction( KIcon(backForward.first.iconName()), backForward.first.text(), this );
+- actionCollection()->addAction( "back", m_paBack );
++ actionCollection()->addAction( "go_back", m_paBack );
+ m_paBack->setShortcuts( KStandardShortcut::shortcut(KStandardShortcut::Back) );
+ connect( m_paBack, SIGNAL( triggered( Qt::MouseButtons, Qt::KeyboardModifiers) ), this,
+ SLOT( slotBack(Qt::MouseButtons, Qt::KeyboardModifiers) ) );
+@@ -3776,7 +3779,7 @@
+ connect( m_paBack->menu(), SIGNAL( activated( int ) ), this, SLOT( slotBackActivated( int ) ) );
+
+ m_paForward = new KToolBarPopupAction( KIcon(backForward.second.iconName()), backForward.second.text(), this );
+- actionCollection()->addAction( "forward", m_paForward );
++ actionCollection()->addAction( "go_forward", m_paForward );
+ m_paForward->setShortcuts( KStandardShortcut::shortcut(KStandardShortcut::Forward) );
+ connect( m_paForward, SIGNAL( triggered( Qt::MouseButtons, Qt::KeyboardModifiers) ), this,
+ SLOT( slotForward(Qt::MouseButtons, Qt::KeyboardModifiers) ) );
+@@ -3788,11 +3791,8 @@
+ connect( m_paHistory, SIGNAL( menuAboutToShow() ), this, SLOT( slotGoMenuAboutToShow() ) );
+ connect( m_paHistory, SIGNAL( step( int ) ), this, SLOT( slotGoHistoryActivated( int ) ) );
+
+- m_paHome = actionCollection()->addAction("home");
+- m_paHome->setIcon(KIcon("go-home"));
+- m_paHome->setText(i18n( "Home" ));
++ m_paHome = actionCollection()->addAction( KStandardAction::Home );
+ m_paHome->setEnabled( true );
+- m_paHome->setShortcuts(KStandardShortcut::shortcut(KStandardShortcut::Home));
+ connect( m_paHome, SIGNAL( triggered( Qt::MouseButtons, Qt::KeyboardModifiers) ), this,
+ SLOT( slotHome(Qt::MouseButtons, Qt::KeyboardModifiers) ) );
+
+@@ -3866,10 +3866,10 @@
+ m_paConfigureExtensions = actionCollection()->addAction("options_configure_extensions");
+ m_paConfigureExtensions->setText( i18n("Configure Extensions...") );
+ connect(m_paConfigureExtensions, SIGNAL(triggered(bool) ), SLOT( slotConfigureExtensions()));
+- m_paConfigureSpellChecking = actionCollection()->addAction("configurespellcheck");
+- m_paConfigureSpellChecking->setIcon(KIcon("tools-check-spelling"));
+- m_paConfigureSpellChecking->setText(i18n("Configure Spell Checking..."));
+- connect(m_paConfigureSpellChecking, SIGNAL(triggered(bool)), SLOT( slotConfigureSpellChecking()));
++ //m_paConfigureSpellChecking = actionCollection()->addAction("configurespellcheck");
++ //m_paConfigureSpellChecking->setIcon(KIcon("tools-check-spelling"));
++ //m_paConfigureSpellChecking->setText(i18n("Configure Spell Checking..."));
++ //connect(m_paConfigureSpellChecking, SIGNAL(triggered(bool)), SLOT( slotConfigureSpellChecking()));
+
+ // Window menu
+ m_paSplitViewHor = actionCollection()->addAction("splitviewh");
+@@ -4098,8 +4098,8 @@
+ m_paForward->setToolTip( i18n( "Move forward one step in the browsing history" ) );
+
+ m_paHome->setWhatsThis( i18n( "Navigate to your 'Home Location'<br /><br />"
+- "You can configure the location this button takes you to in the "
+- "<b>KDE Control Center</b>, under <b>File Manager</b>/<b>Behavior</b>." ) );
++ "You can configure the location this button takes you to "
++ "under <b>Settings -> Configure Konqueror -> General</b>." ) );
+ m_paHome->setToolTip( i18n( "Navigate to your 'Home Location'" ) );
+
+ m_paReload->setWhatsThis( i18n( "Reload the currently displayed document<br /><br />"
+@@ -4740,9 +4740,9 @@
+ // It has to be a KActionCollection instead of a KActionPtrList because we need
+ // the actionStatusText signal...
+ KActionCollection popupMenuCollection( (QWidget*)0 );
+- popupMenuCollection.addAction( "back", m_paBack );
+- popupMenuCollection.addAction( "forward", m_paForward );
+- popupMenuCollection.addAction( "up", m_paUp );
++ popupMenuCollection.addAction( "go_back", m_paBack );
++ popupMenuCollection.addAction( "go_forward", m_paForward );
++ popupMenuCollection.addAction( "go_up", m_paUp );
+ popupMenuCollection.addAction( "reload", m_paReload );
+
+ #if 0
+--- a/apps/konqueror/src/konq-webbrowsing.rc
++++ b/apps/konqueror/src/konq-webbrowsing.rc
+@@ -1,6 +1,6 @@
+ <?xml version="1.0"?>
+ <!DOCTYPE gui SYSTEM "kpartgui.dtd">
+-<gui name="Konqueror" version="59">
++<gui name="Konqueror" version="60">
+ <MenuBar>
+ <Menu name="file" noMerge="1"><text>&File</text>
+ <Action name="new_window"/>
+@@ -47,11 +47,11 @@
+ <WeakSeparator/>
+ <Merge/>
+ </Menu>
+- <Menu name="go"><text>&Go</text>
+- <Action name="back"/>
+- <Action name="forward"/>
+- <!--<Action name="up"/>-->
+- <Action name="home"/>
++ <Menu name="go_web" noMerge="1"><text>&Go</text>
++ <!--<Action name="go_up"/>-->
++ <Action name="go_back"/>
++ <Action name="go_forward"/>
++ <Action name="go_home"/>
+ <Separator/>
+ <Action name="go_system"/>
+ <Action name="go_applications"/>
+@@ -119,12 +119,12 @@
+ <Merge/>
+ </MenuBar>
+ <ToolBar iconText="icononly" name="mainToolBar" newline="true"><text>Main Toolbar</text>
+- <Action name="back"/>
+- <Action name="forward"/>
+- <Action name="up"/>
++ <Action name="go_back"/>
++ <Action name="go_forward"/>
++ <Action name="go_up"/>
+ <Action name="reload"/>
+ <Action name="stop"/>
+- <Action name="home"/>
++ <Action name="go_home"/>
+ <WeakSeparator/>
+ <Merge/>
+ </ToolBar>
+--- a/apps/konqueror/src/konqrun.cpp
++++ b/apps/konqueror/src/konqrun.cpp
+@@ -87,11 +87,9 @@
+
+ bool tryEmbed = true;
+ // One case where we shouldn't try to embed, is when the server asks us to save
+- // ####### only if content-disposition doesn't say inline
+-#if 0
+- if ( !m_suggestedFilename.isEmpty() )
+- tryEmbed = false;
+-#endif
++ if ( serverSuggestsSave() )
++ tryEmbed = false;
++
+ if ( KonqMainWindow::isMimeTypeAssociatedWithSelf( mimeType ) )
+ m_req.forceAutoEmbed = true;
+
+@@ -114,6 +112,8 @@
+ if ( res == KParts::BrowserRun::Delayed )
+ return;
+ setFinished( res == KParts::BrowserRun::Handled );
++ if (!hasFinished() && !tryEmbed) // Open selected for a serverSuggestsSave() file
++ setFinished( m_pMainWindow->openView( mimeType, KRun::url(), m_pView, m_req ) );
+ }
+
+ // make Konqueror think there was an error, in order to stop the spinning wheel
+--- a/apps/konqueror/src/konq-filemanagement.rc
++++ b/apps/konqueror/src/konq-filemanagement.rc
+@@ -1,6 +1,6 @@
+ <?xml version="1.0"?>
+ <!DOCTYPE gui SYSTEM "kpartgui.dtd">
+-<gui name="Konqueror" version="59">
++<gui name="Konqueror" version="60">
+ <MenuBar>
+ <Menu name="file" noMerge="1"><text>&File</text>
+ <Action name="new_window"/>
+@@ -47,12 +47,8 @@
+ <WeakSeparator/>
+ <Merge/>
+ </Menu>
+- <Menu name="go"><text>&Go</text>
+- <Action name="back"/>
+- <Action name="forward"/>
+- <!--<Action name="up"/>-->
+- <Action name="home"/>
+- <Separator/>
++ <Menu name="go_web"><text>Go</text>
++ <!-- go_up, go_back, go_forward, go_home: coming from ui_standards.rc -->
+ <Action name="go_system"/>
+ <Action name="go_applications"/>
+ <Action name="go_network_folders"/>
+@@ -119,12 +115,12 @@
+ <Merge/>
+ </MenuBar>
+ <ToolBar fullWidth="true" name="mainToolBar" newline="true"><text>Main Toolbar</text>
+- <Action name="back"/>
+- <Action name="forward"/>
+- <Action name="up"/>
++ <Action name="go_back"/>
++ <Action name="go_forward"/>
++ <Action name="go_up"/>
++ <Separator/>
++ <Action name="go_home"/>
+ <Separator/>
+- <Action name="home"/>
+- <Action name="print"/>
+ </ToolBar>
+ <ToolBar hidden="true" name="extraToolBar" newline="false" index="1"><text>Extra Toolbar</text>
+ <Action name="konq_sidebartng" />
+--- a/apps/konqueror/src/konqueror.rc
++++ b/apps/konqueror/src/konqueror.rc
+@@ -1,6 +1,6 @@
+ <?xml version="1.0"?>
+ <!DOCTYPE gui SYSTEM "kpartgui.dtd">
+-<gui name="Konqueror" version="59">
++<gui name="Konqueror" version="60">
+ <MenuBar>
+ <Menu name="file" noMerge="1"><text>&File</text>
+ <Action name="new_window"/>
+@@ -47,12 +47,8 @@
+ <WeakSeparator/>
+ <Merge/>
+ </Menu>
+- <Menu name="go"><text>&Go</text>
+- <Action name="back"/>
+- <Action name="forward"/>
+- <Action name="up"/>
+- <Action name="home"/>
+- <Separator/>
++ <Menu name="go_web"><text>&Go</text>
++ <!-- go_up, go_back, go_forward, go_home: coming from ui_standards.rc -->
+ <Action name="go_system"/>
+ <Action name="go_applications"/>
+ <Action name="go_network_folders"/>
+@@ -116,10 +112,10 @@
+ <Merge/>
+ </MenuBar>
+ <ToolBar fullWidth="true" name="mainToolBar" newline="true"><text>Main Toolbar</text>
+- <Action name="back"/>
+- <Action name="forward"/>
+- <Action name="up"/>
+- <Action name="home"/>
++ <Action name="go_back"/>
++ <Action name="go_forward"/>
++ <Action name="go_up"/>
++ <Action name="go_home"/>
+ <Separator/>
+ <Action name="reload"/>
+ <Action name="stop"/>
+--- a/apps/konqueror/src/konqmainwindow.h
++++ b/apps/konqueror/src/konqmainwindow.h
+@@ -646,7 +646,7 @@
+ QAction *m_paMoveTabRight;
+
+ QAction *m_paConfigureExtensions;
+- QAction *m_paConfigureSpellChecking;
++ //QAction *m_paConfigureSpellChecking;
+
+ KAnimatedButton *m_paAnimatedLogo;
+
+--- a/apps/konqueror/src/konq-simplebrowser.rc
++++ b/apps/konqueror/src/konq-simplebrowser.rc
+@@ -1,4 +1,5 @@
+ <?xml version = '1.0'?>
++<!-- This file is used by the simplebrowser profile -->
+ <!DOCTYPE gui SYSTEM "kpartgui.dtd">
+ <gui version="52" name="Konqueror" >
+ <MenuBar>
+@@ -77,10 +78,10 @@
+ </ToolBar>
+ <ToolBar newline="true" noMerge="1" name="locationToolBar" fullWidth="true" >
+ <text>Location Toolbar</text>
+- <Action name="back" />
+- <Action name="forward" />
+- <Action name="up" />
+- <Action name="home" />
++ <Action name="go_back" />
++ <Action name="go_forward" />
++ <Action name="go_up" />
++ <Action name="go_home" />
+ <Action name="reload" />
+ <Action name="stop" />
+ <Action name="security" />
+--- a/apps/konqueror/settings/ebrowsing/ebrowsing.desktop
++++ b/apps/konqueror/settings/ebrowsing/ebrowsing.desktop
+@@ -4,7 +4,7 @@
+ ServiceTypes=KCModule
+ DocPath=kcontrol/ebrowsing/index.html
+ Icon=enhanced_browsing
+-Exec=kcmshell ebrowsing
++Exec=kcmshell4 ebrowsing
+
+ X-KDE-Library=kcm_kurifilt
+ X-KDE-ParentApp=kcontrol
+--- a/apps/konqueror/settings/performance/kcmperformance.desktop
++++ b/apps/konqueror/settings/performance/kcmperformance.desktop
+@@ -3,7 +3,7 @@
+ Icon=launch
+ Type=Service
+ ServiceTypes=KCModule
+-Exec=kcmshell kcmperformance
++Exec=kcmshell4 kcmperformance
+
+ X-KDE-Library=kcm_performance
+ X-KDE-PluginKeyword=performance
+@@ -87,7 +87,7 @@
+ Comment[el]=Αλλάξτε ρυθμίσεις που μπορεί να βελτιώσουν την απόδοση του KDE
+ Comment[eo]=Agordo de plibonigo de la KDEa potenco
+ Comment[es]=Configurar las preferencias que pueden mejorar el rendimiento de KDE
+-Comment[et]=Siin saad seadistada, kuidas KDE kõigega paremini toime tuleks
++Comment[et]=Siin saab seadistada, kuidas KDE kõigega paremini toime tuleks
+ Comment[eu]=Konfiguratu Konquerorren performantzia hobe dezaketen ezarpenak
+ Comment[fa]=پیکربندی تنظیماتی که کارایی KDE را بهبود میبخشد
+ Comment[fi]=Muokkaa KDE:n suorituskykyyn liittyviä asetuksia
+--- a/apps/konqueror/settings/performance/kcmkonqyperformance.desktop
++++ b/apps/konqueror/settings/performance/kcmkonqyperformance.desktop
+@@ -3,7 +3,7 @@
+ Icon=launch
+ Type=Service
+ ServiceTypes=KCModule
+-Exec=kcmshell kcmkonqyperformance
++Exec=kcmshell4 kcmkonqyperformance
+
+ X-KDE-Library=kcm_performance
+ X-KDE-PluginKeyword=konqueror
+@@ -85,7 +85,7 @@
+ Comment[el]=Αλλάξτε ρυθμίσεις που μπορεί να βελτιώσουν την απόδοση του Konqueror
+ Comment[eo]=Agordo de Konkeranto por plibonigi la potencon
+ Comment[es]=Configurar las preferencias que pueden mejorar el rendimiento de Konqueror
+-Comment[et]=Siin saad seadistada, kuidas Konqueror kõigega paremini toime tuleks
++Comment[et]=Siin saab seadistada, kuidas Konqueror kõigega paremini toime tuleks
+ Comment[eu]=Konfiguratu Konquerorren performantzia hobe dezaketen ezarpenak
+ Comment[fa]=پیکربندی تنظیماتی که کارایی Konqueror را بهبود میبخشد.
+ Comment[fi]=Muokkaa Konquerorin suorituskykyyn liittyviä asetuksia
+--- a/apps/konqueror/settings/kio/cache.ui
++++ b/apps/konqueror/settings/kio/cache.ui
+@@ -6,7 +6,7 @@
+ <x>0</x>
+ <y>0</y>
+ <width>424</width>
+- <height>279</height>
++ <height>204</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" >
+@@ -21,95 +21,103 @@
+ </widget>
+ </item>
+ <item>
+- <widget class="QGroupBox" name="bgCachePolicy" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- <property name="title" >
+- <string>Policy</string>
+- </property>
+- <layout class="QVBoxLayout" >
+- <item>
+- <widget class="QRadioButton" name="rbVerifyCache" >
+- <property name="whatsThis" >
+- <string>Verify whether the cached web page is valid before attempting to fetch the web page again.</string>
+- </property>
+- <property name="text" >
+- <string>&Keep cache in sync</string>
+- </property>
+- </widget>
+- </item>
+- <item>
+- <widget class="QRadioButton" name="rbCacheIfPossible" >
+- <property name="whatsThis" >
+- <string>Always use documents from the cache when available. You can still use the reload button to synchronize the cache with the remote host.</string>
+- </property>
+- <property name="text" >
+- <string>Use cache whenever &possible</string>
+- </property>
+- </widget>
+- </item>
+- <item>
+- <widget class="QRadioButton" name="rbOfflineMode" >
+- <property name="whatsThis" >
+- <string>Do not fetch web pages that are not already stored in the cache. Offline mode prevents you from viewing pages that you have not previously visited.</string>
+- </property>
+- <property name="text" >
+- <string>O&ffline browsing mode</string>
+- </property>
+- </widget>
+- </item>
+- </layout>
+- </widget>
+- </item>
+- <item>
+ <layout class="QHBoxLayout" >
+ <item>
+- <widget class="QLabel" name="lbMaxCacheSize" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- <property name="text" >
+- <string>Disk cache &size:</string>
+- </property>
+- <property name="buddy" >
+- <cstring>sbMaxCacheSize</cstring>
+- </property>
+- </widget>
+- </item>
+- <item>
+- <widget class="KIntNumInput" name="sbMaxCacheSize" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- </widget>
+- </item>
+- <item>
+- <widget class="QPushButton" name="pbClearCache" >
+- <property name="enabled" >
+- <bool>false</bool>
+- </property>
+- <property name="text" >
+- <string>C&lear Cache</string>
+- </property>
+- </widget>
+- </item>
+- <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType" >
+- <enum>QSizePolicy::MinimumExpanding</enum>
++ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+- <width>0</width>
+- <height>21</height>
++ <width>16</width>
++ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
++ <item>
++ <layout class="QVBoxLayout" >
++ <item>
++ <widget class="QGroupBox" name="bgCachePolicy" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ <property name="title" >
++ <string>Policy</string>
++ </property>
++ <layout class="QVBoxLayout" >
++ <item>
++ <widget class="QRadioButton" name="rbVerifyCache" >
++ <property name="whatsThis" >
++ <string>Verify whether the cached web page is valid before attempting to fetch the web page again.</string>
++ </property>
++ <property name="text" >
++ <string>&Keep cache in sync</string>
++ </property>
++ </widget>
++ </item>
++ <item>
++ <widget class="QRadioButton" name="rbCacheIfPossible" >
++ <property name="whatsThis" >
++ <string>Always use documents from the cache when available. You can still use the reload button to synchronize the cache with the remote host.</string>
++ </property>
++ <property name="text" >
++ <string>Use cache whenever &possible</string>
++ </property>
++ </widget>
++ </item>
++ <item>
++ <widget class="QRadioButton" name="rbOfflineMode" >
++ <property name="whatsThis" >
++ <string>Do not fetch web pages that are not already stored in the cache. Offline mode prevents you from viewing pages that you have not previously visited.</string>
++ </property>
++ <property name="text" >
++ <string>O&ffline browsing mode</string>
++ </property>
++ </widget>
++ </item>
++ </layout>
++ </widget>
++ </item>
++ <item>
++ <layout class="QHBoxLayout" >
++ <item>
++ <widget class="QLabel" name="lbMaxCacheSize" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ <property name="text" >
++ <string>Disk cache &size:</string>
++ </property>
++ <property name="buddy" >
++ <cstring>sbMaxCacheSize</cstring>
++ </property>
++ </widget>
++ </item>
++ <item>
++ <widget class="KIntNumInput" name="sbMaxCacheSize" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ </widget>
++ </item>
++ <item>
++ <widget class="QPushButton" name="pbClearCache" >
++ <property name="enabled" >
++ <bool>false</bool>
++ </property>
++ <property name="text" >
++ <string>C&lear Cache</string>
++ </property>
++ </widget>
++ </item>
++ </layout>
++ </item>
++ </layout>
++ </item>
+ </layout>
+ </item>
+ <item>
+@@ -120,7 +128,7 @@
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+- <height>40</height>
++ <height>10</height>
+ </size>
+ </property>
+ </spacer>
+--- a/apps/konqueror/settings/kio/cache.cpp
++++ b/apps/konqueror/settings/kio/cache.cpp
+@@ -47,16 +47,17 @@
+ KCacheConfigDialog::KCacheConfigDialog(QWidget *parent, const QVariantList &)
+ : KCModule(KioConfigFactory::componentData(), parent)
+ {
+- QVBoxLayout* mainLayout = new QVBoxLayout(this);
+- mainLayout->setMargin(0);
+- mainLayout->setSpacing(0);
+- m_dlg = new CacheDlgUI(this);
+- mainLayout->addWidget(m_dlg);
+- mainLayout->addStretch();
++ m_dlg = new Ui::CacheDlgUI();
++ m_dlg->setupUi(this);
+
+ load();
+ }
+
++KCacheConfigDialog::~KCacheConfigDialog()
++{
++ delete m_dlg;
++}
++
+ void KCacheConfigDialog::load()
+ {
+ m_dlg->cbUseCache->setChecked(KProtocolManager::useCache());
+--- a/apps/konqueror/settings/kio/kcookiesmanagement.cpp
++++ b/apps/konqueror/settings/kio/kcookiesmanagement.cpp
+@@ -291,10 +291,12 @@
+ if ( ckd->cookiesLoaded() )
+ return;
+
+- QList<QVariant> fields;
+- fields << QVariant(0) << QVariant(1) << QVariant(2) << QVariant(3);
++ QList<int> fields;
++ fields << 0 << 1 << 2 << 3;
+ QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBusConnection::sessionBus());
+- QDBusReply<QStringList> reply = kded.call( "findCookies", fields, ckd->domain(),
++ QDBusReply<QStringList> reply = kded.call( "findCookies",
++ QVariant::fromValue( fields ),
++ ckd->domain(),
+ QString(),
+ QString(),
+ QString() );
+@@ -321,11 +323,12 @@
+
+ bool KCookiesManagement::cookieDetails(CookieProp *cookie)
+ {
+- QList<QVariant> fields;
+- fields << QVariant(4) << QVariant(5) << QVariant(7);
++ QList<int> fields;
++ fields << 4 << 5 << 7;
+
+ QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBusConnection::sessionBus());
+- QDBusReply<QStringList> reply = kded.call( "findCookies", fields,
++ QDBusReply<QStringList> reply = kded.call( "findCookies",
++ QVariant::fromValue( fields ),
+ cookie->domain,
+ cookie->host,
+ cookie->path,
+--- a/apps/konqueror/settings/kio/lanbrowser.desktop
++++ b/apps/konqueror/settings/kio/lanbrowser.desktop
+@@ -3,7 +3,7 @@
+ Type=Service
+ ServiceTypes=KCModule
+ Icon=preferences-system-network-share
+-Exec=kcmshell lanbrowser
++Exec=kcmshell4 lanbrowser
+
+ X-KDE-Library=kcm_kio
+ X-KDE-PluginKeyword=lanbrowser
+--- a/apps/konqueror/settings/kio/proxy.desktop
++++ b/apps/konqueror/settings/kio/proxy.desktop
+@@ -4,7 +4,7 @@
+ ServiceTypes=KCModule
+ DocPath=kcontrol/proxy/index.html
+ Icon=preferences-system-network-proxy
+-Exec=kcmshell proxy
++Exec=kcmshell4 proxy
+
+ X-KDE-Library=kcm_kio
+ X-KDE-PluginKeyword=proxy
+@@ -23,6 +23,7 @@
+ Name[cy]=Dirprwy
+ Name[el]=Διαμεσολαβητής
+ Name[eo]=Prokuriloj
++Name[et]=Puhverserver
+ Name[eu]=Proxya
+ Name[fa]=پیشکار
+ Name[fi]=Välityspalvelin
+@@ -77,7 +78,7 @@
+ Comment[el]=Ρυθμίστε τους διαμεσολαβητές που χρησιμοποιούνται
+ Comment[eo]=Agordo de prokurilo
+ Comment[es]=Configuración de los servidores Proxy usados
+-Comment[et]=Kasutatavate proxy serverite seadistamine
++Comment[et]=Kasutatavate puhverserverite seadistamine
+ Comment[eu]=Konfiguratu erabilitako proxy zerbitzariak
+ Comment[fa]=پیکربندی پیشکارهای استفادهشده
+ Comment[fi]=Käytettävät välityspalvelimet
+@@ -139,7 +140,7 @@
+ Keywords[el]=Διαμεσολαβητής,Διαμεσολαβητής,Firewall,Squid,διαμεσολαβητής
+ Keywords[eo]=Prokurilo,Prokuro-servo,Fajroŝirmilo,Squid
+ Keywords[es]=Proxy,servidor Proxy,Cortafuegos,Squid,proxy
+-Keywords[et]=proxy,proxy server,tulemüür,squid
++Keywords[et]=proxy,puhver,puhverserver,tulemüür,squid
+ Keywords[eu]=Proxya,Proxy zerbitzaria,Firewalla,Squid,proxya
+ Keywords[fa]=پیشکار، پیشکاری، دیوارۀ آتش، Squid،پیشکار
+ Keywords[fi]=Välityspalvelin,Palomuuri,Squid
+--- a/apps/konqueror/settings/kio/cookies.desktop
++++ b/apps/konqueror/settings/kio/cookies.desktop
+@@ -4,7 +4,7 @@
+ ServiceTypes=KCModule
+ DocPath=kcontrol/cookies/index.html
+ Icon=cookie
+-Exec=kcmshell cookies
++Exec=kcmshell4 cookies
+
+ X-KDE-Library=kcm_kio
+ X-KDE-PluginKeyword=cookie
+--- a/apps/konqueror/settings/kio/useragent.desktop
++++ b/apps/konqueror/settings/kio/useragent.desktop
+@@ -3,7 +3,7 @@
+ Type=Service
+ ServiceTypes=KCModule
+ Icon=agent
+-Exec=kcmshell useragent
++Exec=kcmshell4 useragent
+ DocPath=kcontrol/useragent/index.html
+
+ X-KDE-Library=kcm_kio
+@@ -25,7 +25,7 @@
+ Name[el]=Ταυτοποίηση περιηγητή
+ Name[eo]=TTT-legila identeco
+ Name[es]=Identificación del navegador
+-Name[et]=Veebilehitseja identifikaator
++Name[et]=Brauseri identifikaator
+ Name[eu]=Arakatzailearen identifikazioa
+ Name[fa]=شناسایی مرورگر
+ Name[fi]=Selaimen tunnistus
+@@ -89,7 +89,7 @@
+ Comment[el]=Ρυθμίστε τον τρόπο με τον οποίο αναφέρεται το Konqueror
+ Comment[eo]=Agordo de Konkeranto-"user agent"
+ Comment[es]=Configuración del modo de autoidentificación de Konqueror
+-Comment[et]=Viisi, kuidas Konqueror endast teada annab, seadistamine
++Comment[et]=Selle seadistamine, kuidas Konqueror endast teada annab
+ Comment[eu]=Konfiguratu nola azaltzen duen Konquerorrek bere burua
+ Comment[fa]=پیکربندی روشی که Konqueror گزارش خود را میدهد.
+ Comment[fi]=Vaihda Konquerorin esittäytymistapaa
+--- a/apps/konqueror/settings/kio/cache.desktop
++++ b/apps/konqueror/settings/kio/cache.desktop
+@@ -4,7 +4,7 @@
+ ServiceTypes=KCModule
+ DocPath=kcontrol/cache/index.html
+ Icon=cache
+-Exec=kcmshell cache
++Exec=kcmshell4 cache
+
+ X-KDE-Library=kcm_kio
+ X-KDE-PluginKeyword=cache
+@@ -21,6 +21,7 @@
+ Name[el]=Λανθάνουσα μνήμη
+ Name[eo]=Tenejo
+ Name[es]=Caché
++Name[et]=Puhver
+ Name[eu]=Katxea
+ Name[fa]=نهانگاه
+ Name[fi]=Välimuisti
+--- a/apps/konqueror/settings/kio/uasproviders/op85oncurrent.desktop
++++ b/apps/konqueror/settings/kio/uasproviders/op85oncurrent.desktop
+@@ -7,6 +7,7 @@
+ Name[de]=Browserkennung (Opera 8.5 unter aktuellem Betriebssystem)
+ Name[el]=Περιγραφή UA (Opera 8.5 στο τρέχον σύστημα)
+ Name[es]=UADescription (Opera 8.5 en actual)
++Name[et]=UADescription (Selles masinas töötav Opera 8.5)
+ Name[fa]=UADescription (Opera ۸.۵ در حال حاضر)
+ Name[ga]=UADescription (Opera 8.5 ar an gcóras reatha)
+ Name[he]=UADescription (Opera 8.05 על המחשב הנוכחי)
+--- a/apps/konqueror/settings/kio/cache.h
++++ b/apps/konqueror/settings/kio/cache.h
+@@ -23,18 +23,10 @@
+ #define CACHE_H
+
+ #include <kcmodule.h>
+-#include "ui_cache.h"
+-
+-class CacheDlgUI : public QWidget, public Ui::CacheDlgUI
+-{
+- public:
+- CacheDlgUI(QWidget *parent = 0)
+- : QWidget(parent)
+- {
+- setupUi(this);
+- }
+-};
+
++namespace Ui {
++class CacheDlgUI;
++}
+
+ class KCacheConfigDialog : public KCModule
+ {
+@@ -42,7 +34,7 @@
+
+ public:
+ KCacheConfigDialog(QWidget *parent, const QVariantList &args);
+- ~KCacheConfigDialog() {}
++ ~KCacheConfigDialog();
+
+ virtual void load();
+ virtual void save();
+@@ -54,7 +46,7 @@
+ void slotClearCache();
+
+ private:
+- CacheDlgUI* m_dlg;
++ Ui::CacheDlgUI* m_dlg;
+ };
+
+ #endif // CACHE_H
+--- a/apps/konqueror/settings/kio/smb.desktop
++++ b/apps/konqueror/settings/kio/smb.desktop
+@@ -4,7 +4,7 @@
+ ServiceTypes=KCModule
+ DocPath=kcontrol/smb/index.html
+ Icon=preferences-system-network-share-windows
+-Exec=kcmshell smb
++Exec=kcmshell4 smb
+
+ X-KDE-Library=kcm_kio
+ X-KDE-PluginKeyword=smb
+--- a/apps/konqueror/settings/kio/netpref.desktop
++++ b/apps/konqueror/settings/kio/netpref.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Exec=kcmshell netpref
++Exec=kcmshell4 netpref
+ Icon=preferences-system-network-connection
+ Type=Service
+ ServiceTypes=KCModule
+--- a/apps/konqueror/settings/filetypes/filetypes.desktop
++++ b/apps/konqueror/settings/filetypes/filetypes.desktop
+@@ -3,7 +3,7 @@
+ Icon=filetypes
+ Type=Service
+ ServiceTypes=KCModule
+-Exec=kcmshell filetypes
++Exec=kcmshell4 filetypes
+ DocPath=kcontrol/filetypes/index.html
+
+ X-KDE-Library=kcm_filetypes
+--- a/apps/konqueror/settings/css/kcmcss.desktop
++++ b/apps/konqueror/settings/css/kcmcss.desktop
+@@ -3,7 +3,7 @@
+ Icon=stylesheet
+ Type=Service
+ ServiceTypes=KCModule
+-Exec=kcmshell kcmcss
++Exec=kcmshell4 kcmcss
+ DocPath=kcontrol/kcmcss/index.html
+
+
+--- a/apps/konqueror/settings/konq/previews.cpp
++++ b/apps/konqueror/settings/konq/previews.cpp
+@@ -67,9 +67,10 @@
+ {
+ QVBoxLayout *lay = new QVBoxLayout(this);
+ lay->setSpacing(KDialog::spacingHint());
+-
+- lay->addWidget( new QLabel( i18n("<p>Allow previews, \"Folder Icons Reflect Contents\", and "
+- "retrieval of meta-data on protocols:</p>"), this ) );
++ QLabel *label = new QLabel( i18n("<p>Allow previews, \"Folder Icons Reflect Contents\", and "
++ "retrieval of meta-data on protocols:</p>"), this );
++ label->setWordWrap(true);
++ lay->addWidget(label);
+
+ setQuickHelp( i18n("<h1>Preview Options</h1> Here you can modify the behavior "
+ "of Konqueror when it shows the files in a folder."
+@@ -128,7 +129,7 @@
+ "In the list of protocols that appear, select which ones are fast "
+ "enough for you to allow previews to be generated.") );
+
+- QLabel *label = new QLabel( i18n( "&Maximum file size:" ), this );
++ label = new QLabel( i18n( "&Maximum file size:" ), this );
+ lay->addWidget( label );
+
+ m_maxSize = new KDoubleNumInput( this );
+--- a/apps/konqueror/settings/konq/desktoppath.desktop
++++ b/apps/konqueror/settings/konq/desktoppath.desktop
+@@ -4,7 +4,7 @@
+ ServiceTypes=KCModule
+ DocPath=kcontrol/desktop/index.html#desktop-desktop-path
+ Icon=kfm
+-Exec=kcmshell desktoppath
++Exec=kcmshell4 desktoppath
+
+ X-KDE-Library=kcm_konq
+ X-KDE-PluginKeyword=dpath
+--- a/apps/konqueror/settings/konq/desktopbehavior.desktop
++++ b/apps/konqueror/settings/konq/desktopbehavior.desktop
+@@ -4,7 +4,7 @@
+ ServiceType=KCModule
+ DocPath=kcontrol/desktopbehavior/index.html
+ Icon=desktop
+-Exec=kcmshell desktopbehavior
++Exec=kcmshell4 desktopbehavior
+
+ X-KDE-Library=kcm_konq
+ X-KDE-PluginKeyword=dbehavior
+@@ -93,7 +93,7 @@
+ Comment[el]=Εδώ μπορείτε να ρυθμίσετε τη συμπεριφορά της επιφάνειας εργασίας
+ Comment[eo]=Vi povas agordi kiel la tabulo kondutas.
+ Comment[es]=Configuración del modo de comportamiento del escritorio
+-Comment[et]=Siin saad seadistada töölaua käitumist
++Comment[et]=Siin saab seadistada töölaua käitumist
+ Comment[eu]=Mahaigainen portaera konfigura dezakezu hemen
+ Comment[fa]=میتوانید چگونگی رفتار رومیزی را در اینجا پیکربندی کنید.
+ Comment[fi]=Tässä kohdassa voit määritellä työpöydän asetuksia
+--- a/apps/konqueror/settings/konq/webbehavior.desktop
++++ b/apps/konqueror/settings/konq/webbehavior.desktop
+@@ -4,7 +4,7 @@
+ ServiceTypes=KCModule
+ DocPath=kcontrol/filemanager/index.html
+ Icon=kfm
+-Exec=kcmshell filebehavior
++Exec=kcmshell4 filebehavior
+
+ X-KDE-Library=kcm_konq
+ X-KDE-PluginKeyword=behavior
+--- a/apps/konqueror/settings/konq/filebehavior.desktop
++++ b/apps/konqueror/settings/konq/filebehavior.desktop
+@@ -4,7 +4,7 @@
+ ServiceTypes=KCModule
+ DocPath=kcontrol/filemanager/index.html
+ Icon=kfm
+-Exec=kcmshell filebehavior
++Exec=kcmshell4 filebehavior
+
+ X-KDE-Library=kcm_konq
+ X-KDE-PluginKeyword=behavior
+--- a/apps/konqueror/settings/konq/desktop.desktop
++++ b/apps/konqueror/settings/konq/desktop.desktop
+@@ -4,7 +4,7 @@
+ ServiceTypes=KCModule
+ DocPath=kcontrol/desktop/index.html#desktop-number
+ Icon=desktop
+-Exec=kcmshell desktop
++Exec=kcmshell4 desktop
+
+ X-KDE-Library=kcm_konq
+ X-KDE-PluginKeyword=ddesktop
+--- a/apps/konqueror/settings/konq/filebrowser.desktop
++++ b/apps/konqueror/settings/konq/filebrowser.desktop
+@@ -4,7 +4,7 @@
+ ServiceTypes=KCModule
+ DocPath=kcontrol/filemanager/index.html
+ Icon=kfm
+-Exec=kcmshell filebrowser
++Exec=kcmshell4 filebrowser
+
+ X-KDE-Library=kcm_konq
+ X-KDE-PluginKeyword=browser
+--- a/apps/konqueror/settings/konq/webappearance.desktop
++++ b/apps/konqueror/settings/konq/webappearance.desktop
+@@ -4,7 +4,7 @@
+ ServiceTypes=KCModule
+ DocPath=kcontrol/filemanager/index.html
+ Icon=kfm
+-Exec=kcmshell fileappearance
++Exec=kcmshell4 fileappearance
+
+ X-KDE-Library=kcm_konq
+ X-KDE-PluginKeyword=appearance
+--- a/apps/konqueror/settings/konq/fileappearance.desktop
++++ b/apps/konqueror/settings/konq/fileappearance.desktop
+@@ -4,7 +4,7 @@
+ ServiceTypes=KCModule
+ DocPath=kcontrol/filemanager/index.html
+ Icon=kfm
+-Exec=kcmshell fileappearance
++Exec=kcmshell4 fileappearance
+
+ X-KDE-Library=kcm_konq
+ X-KDE-PluginKeyword=appearance
+--- a/apps/konqueror/settings/konq/filepreviews.desktop
++++ b/apps/konqueror/settings/konq/filepreviews.desktop
+@@ -4,7 +4,7 @@
+ ServiceTypes=KCModule
+ DocPath=kcontrol/filemanager/index.html
+ Icon=kfm
+-Exec=kcmshell filepreviews
++Exec=kcmshell4 filepreviews
+
+ X-KDE-Library=kcm_konq
+ X-KDE-PluginKeyword=previews
+--- a/apps/konqueror/settings/konqhtml/appearance.cpp
++++ b/apps/konqueror/settings/konqhtml/appearance.cpp
+@@ -289,7 +289,7 @@
+ KConfigGroup khtmlrc(KSharedConfig::openConfig("khtmlrc", KConfig::NoGlobals),
+ QByteArray(""));
+ KConfigGroup cg(m_pConfig, QByteArray(""));
+-#define SET_GROUP(x) cg.changeGroup(x); khtmlrc.changeGroup(x)
++#define SET_GROUP(x) cg = KConfigGroup(m_pConfig,x); khtmlrc = KConfigGroup(KSharedConfig::openConfig("khtmlrc", KConfig::NoGlobals),x)
+ #define READ_NUM(x,y) cg.readEntry(x, khtmlrc.readEntry(x, y))
+ #define READ_ENTRY(x,y) cg.readEntry(x, khtmlrc.readEntry(x, y))
+ #define READ_LIST(x) cg.readEntry(x, khtmlrc.readEntry(x, QStringList() ))
+--- a/apps/konqueror/settings/konqhtml/khtml_general.desktop
++++ b/apps/konqueror/settings/konqhtml/khtml_general.desktop
+@@ -4,7 +4,7 @@
+ ServiceTypes=KCModule
+ DocPath=kcontrol/khtml/index.html#kbrowse-html
+ Icon=konqueror
+-Exec=kcmshell khtml_general
++Exec=kcmshell4 khtml_general
+ X-KDE-ParentApp=kcontrol
+
+ X-KDE-Library=kcm_konqhtml
+@@ -17,6 +17,7 @@
+ Name[csb]=Spòdlowé
+ Name[de]=Allgemein
+ Name[el]=Γενικά
++Name[et]=Üldine
+ Name[fa]=عمومی
+ Name[ga]=Ginearálta
+ Name[he]=כללי
+@@ -49,6 +50,7 @@
+ Comment[de]=Allgemeines Verhalten von Konqueror festlegen
+ Comment[el]=Ρυθμίστε τη γενική συμπεριφορά του περιηγητή
+ Comment[es]=Configurar el comportamiento general de konqueror
++Comment[et]=Konquerori üldise käitumise seadistamine
+ Comment[fa]=پیکربندی رفتار عمومی konqueror
+ Comment[ga]=Cumraigh oibriú ginearálta konqueror
+ Comment[he]=שינוי הגדרות כלליות הקשורות לפעולת Konqueror
+@@ -79,6 +81,7 @@
+ Keywords[de]=konqueror,unterfenster
+ Keywords[el]=Konqueror,καρτέλες
+ Keywords[es]=konqueror,solapas
++Keywords[et]=konqueror,kaardid
+ Keywords[fa]=konqueror، تبها
+ Keywords[ga]=Konqueror,cluaisíní
+ Keywords[he]=konqueror,לשוניות
+--- a/apps/konqueror/settings/konqhtml/khtml_filter.desktop
++++ b/apps/konqueror/settings/konqhtml/khtml_filter.desktop
+@@ -5,7 +5,7 @@
+
+ DocPath=kcontrol/khtml/index.html#khtml-adblock
+ Icon=filter
+-Exec=kcmshell khtml_filter
++Exec=kcmshell4 khtml_filter
+
+ X-KDE-Library=kcm_konqhtml
+ X-KDE-PluginKeyword=khtml_filter
+--- a/apps/konqueror/settings/konqhtml/khtml_fonts.desktop
++++ b/apps/konqueror/settings/konqhtml/khtml_fonts.desktop
+@@ -5,7 +5,7 @@
+
+ DocPath=kcontrol/khtml/index.html#kbrowse-appearance
+ Icon=preferences-desktop-font
+-Exec=kcmshell khtml_fonts
++Exec=kcmshell4 khtml_fonts
+ X-KDE-ParentApp=kcontrol
+
+ X-KDE-Library=kcm_konqhtml
+--- a/apps/konqueror/settings/konqhtml/generalopts.cpp
++++ b/apps/konqueror/settings/konqhtml/generalopts.cpp
+@@ -90,9 +90,8 @@
+
+ void KKonqGeneralOptions::load()
+ {
+- KConfigGroup cg(m_pConfig, QByteArray(""));
+-
+- cg.changeGroup("FMSettings");
++ KConfigGroup cg(m_pConfig, "FMSettings");
++
+ homeURL->setUrl(cg.readEntry("HomeURL", "~"));
+ tabOptions->m_pShowMMBInTabs->setChecked( cg.readEntry( "MMBOpensTab", false ) );
+ tabOptions->m_pDynamicTabbarHide->setChecked( ! (cg.readEntry( "AlwaysTabbedMode", false )) );
+@@ -104,7 +103,7 @@
+ tabOptions->m_pPopupsWithinTabs->setChecked( cg.readEntry( "PopupsWithinTabs", false) );
+ tabOptions->m_pTabCloseActivatePrevious->setChecked( cg.readEntry( "TabCloseActivatePrevious", false) );
+
+- cg.changeGroup("Notification Messages");
++ cg = KConfigGroup(m_pConfig, "Notification Messages");
+ tabOptions->m_pTabConfirm->setChecked( !cg.hasKey("MultipleTabConfirm") );
+
+ }
+@@ -136,7 +135,7 @@
+ cg.sync();
+
+ // It only matters wether the key is present, its value has no meaning
+- cg.changeGroup("Notification Messages");
++ cg = KConfigGroup(m_pConfig,"Notification Messages");
+ if ( tabOptions->m_pTabConfirm->isChecked() )
+ cg.deleteEntry( "MultipleTabConfirm" );
+ else
+--- a/apps/konqueror/settings/konqhtml/khtml_behavior.desktop
++++ b/apps/konqueror/settings/konqhtml/khtml_behavior.desktop
+@@ -4,7 +4,7 @@
+ ServiceTypes=KCModule
+ DocPath=kcontrol/khtml/index.html#kbrowse-html
+ Icon=konqueror
+-Exec=kcmshell khtml_behavior
++Exec=kcmshell4 khtml_behavior
+ X-KDE-ParentApp=kcontrol
+
+ X-KDE-Library=kcm_konqhtml
+@@ -26,7 +26,7 @@
+ Name[en_GB]=Web Behaviour
+ Name[eo]=TTT-Konduto
+ Name[es]=Comportamiento
+-Name[et]=Veebilehitseja käitumine
++Name[et]=Brauseri käitumine
+ Name[eu]=Web portaera
+ Name[fa]=رفتار وب
+ Name[fi]=Verkkokäyttäytyminen
+@@ -92,7 +92,7 @@
+ Comment[en_GB]=Configure the browser behaviour
+ Comment[eo]=Agordas la konduton de la TTT-legilo
+ Comment[es]=Configuración del comportamiento del navegador
+-Comment[et]=Konquerori veebilehitseja käitumine
++Comment[et]=Konquerori brauseri käitumine
+ Comment[eu]=Konfiguratu arakatzailearen portaera
+ Comment[fa]=پیکربندی رفتار مرورگر
+ Comment[fi]=Selaimen asetukset
+@@ -155,7 +155,7 @@
+ Keywords[en_GB]=konqueror,kfm,browser,html,web,www,fonts,colours,java,javascript,cursor,links,images,charsets,character sets,encoding
+ Keywords[eo]=Konkeranto,Kfm,TTT,HTML,WWW,tiparo,koloro,Javo,Javoskripto,kursoro,kursilo,ligo,referenco,bildo,signaro,kodo
+ Keywords[es]=konqueror,kfm,navegador,html,web,www,tipos de letra,colores,java,javascript,cursor,enlaces,imágenes,mapas de caracteres,codificación
+-Keywords[et]=konqueror,kfm,veebilehitseja,html,veeb,www,fondid,värvid,java,javascript,kursor,viidad,lingid,pildid,kooditabel,kodeering
++Keywords[et]=konqueror,kfm,veebilehitseja,brauser,html,veeb,www,fondid,värvid,java,javascript,kursor,viidad,lingid,pildid,kooditabel,kodeering
+ Keywords[eu]=konqueror,kfm,arakatzailea,html,web,www,letra-tipoak,koloreak,java,javascript,kurtsorea,linkak,irudiak,karaktere-multzoak,karaktereen hobespenak,kodeketa
+ Keywords[fa]=konqueror، kfm، مرورگر، زنگام، وب، www، قلمها، رنگها، رنگها، جاوا، جاوااسکریپت، مکاننما، پیوندها، تصاویر، نوسهگان، نویسهگان، کدبندی
+ Keywords[fi]=konqueror,kfm,selain,html,web,www,kirjasimet,värit,java,javascript,osoitin,linkit,kuvat,merkistöt,koodaus
+--- a/apps/konqueror/settings/konqhtml/khtml_java_js.desktop
++++ b/apps/konqueror/settings/konqhtml/khtml_java_js.desktop
+@@ -4,7 +4,7 @@
+ ServiceTypes=KCModule
+ DocPath=kcontrol/khtml/index.html#kbrowse-java
+ Icon=konqueror
+-Exec=kcmshell khtml_java_js
++Exec=kcmshell4 khtml_java_js
+ X-KDE-ParentApp=kcontrol
+
+ X-KDE-Library=kcm_konqhtml
+@@ -139,7 +139,7 @@
+ Keywords[el]=konqueror,kfm,περιηγητής,html,ιστός,www,java,javascript
+ Keywords[eo]=Konkeranto,Kfm,TTT,HTML,WWW,tiparo,koloro,Javo,Javoskripto,kursoro,kursilo,ligo,referenco,bildo,signaro,kodo
+ Keywords[es]=konqueror,kfm,navegador,html,web,wwwjava,javascript
+-Keywords[et]=konqueror,kfm,veebilehitseja,html,veeb,www,java,javascript
++Keywords[et]=konqueror,kfm,veebilehitseja,brauser,html,veeb,www,java,javascript
+ Keywords[eu]=konqueror,kfm,arakatzailea,html,web,www,java,javascript
+ Keywords[fa]=konqueror، kfm، مرورگر، زنگام، وب، www، جاوا، جاوااسکریپت
+ Keywords[fi]=konqueror,kfm,selain,html,web,www,java,javascript
+--- a/apps/konqueror/settings/konqhtml/htmlopts.cpp
++++ b/apps/konqueror/settings/konqhtml/htmlopts.cpp
+@@ -229,7 +229,7 @@
+ KConfigGroup khtmlrc(KSharedConfig::openConfig("khtmlrc", KConfig::NoGlobals),
+ QByteArray(""));
+ KConfigGroup cg(m_pConfig, QByteArray(""));
+-#define SET_GROUP(x) cg.changeGroup(x); khtmlrc.changeGroup(x)
++#define SET_GROUP(x) cg = KConfigGroup(m_pConfig, x); khtmlrc = KConfigGroup(KSharedConfig::openConfig("khtmlrc", KConfig::NoGlobals),x)
+ #define READ_BOOL(x,y) cg.readEntry(x, khtmlrc.readEntry(x, y))
+ #define READ_ENTRY(x) cg.readEntry(x, khtmlrc.readEntry(x))
+
+@@ -307,7 +307,7 @@
+ KConfigGroup cg(m_pConfig, "MainView Settings");
+ cg.writeEntry( "OpenMiddleClick", m_pOpenMiddleClick->isChecked() );
+ cg.writeEntry( "BackRightClick", m_pBackRightClick->isChecked() );
+- cg.changeGroup( "HTML Settings" );
++ cg = KConfigGroup(m_pConfig, "HTML Settings" );
+ cg.writeEntry( "ChangeCursor", m_cbCursor->isChecked() );
+ cg.writeEntry( "AutoLoadImages", m_pAutoLoadImagesCheckBox->isChecked() );
+ cg.writeEntry( "UnfinishedImageFrame", m_pUnfinishedImageFrameCheckBox->isChecked() );
+--- a/apps/konqueror/settings/konqhtml/filteropts.cpp
++++ b/apps/konqueror/settings/konqhtml/filteropts.cpp
+@@ -237,6 +237,8 @@
+ void KCMFilter::defaults()
+ {
+ mListBox->clear();
++ mEnableCheck->setChecked(false);
++ mKillCheck->setChecked(false);
+ updateButton();
+ }
+
+@@ -244,7 +246,7 @@
+ {
+ KConfigGroup cg(mConfig, mGroupname);
+ cg.deleteGroup();
+- cg.changeGroup(mGroupname);
++ cg = KConfigGroup(mConfig, mGroupname);
+
+ cg.writeEntry("Enabled",mEnableCheck->isChecked());
+ cg.writeEntry("Shrink",mKillCheck->isChecked());
+@@ -309,7 +311,7 @@
+ {
+ for( int i = mListBox->count(); i >= 0; --i )
+ {
+- if (mListBox->item(i)->isSelected())
++ if (mListBox->item(i) && mListBox->item(i)->isSelected())
+ delete mListBox->takeItem(i);
+ }
+ emit changed( true );
+--- a/apps/konqueror/quickprint/text-tex-print.desktop
++++ b/apps/konqueror/quickprint/text-tex-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/x-tex
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-xml-print.desktop
++++ b/apps/konqueror/quickprint/text-xml-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/x-xml
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-print.desktop
++++ b/apps/konqueror/quickprint/text-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/plain
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-perl-print.desktop
++++ b/apps/konqueror/quickprint/text-perl-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/x-perl
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-html-print.desktop
++++ b/apps/konqueror/quickprint/text-html-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/html
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-diff-print.desktop
++++ b/apps/konqueror/quickprint/text-diff-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/x-patch
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-c++-print.desktop
++++ b/apps/konqueror/quickprint/text-c++-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/x-c++src
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-makefile-print.desktop
++++ b/apps/konqueror/quickprint/text-makefile-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/x-makefile
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-c++h-print.desktop
++++ b/apps/konqueror/quickprint/text-c++h-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/x-c++hdr
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-log-print.desktop
++++ b/apps/konqueror/quickprint/text-log-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/x-log
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-java-print.desktop
++++ b/apps/konqueror/quickprint/text-java-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/x-java
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-python-print.desktop
++++ b/apps/konqueror/quickprint/text-python-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/x-python
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-c-print.desktop
++++ b/apps/konqueror/quickprint/text-c-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/x-csrc
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-tcl-print.desktop
++++ b/apps/konqueror/quickprint/text-tcl-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/x-tcl
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-pas-print.desktop
++++ b/apps/konqueror/quickprint/text-pas-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/x-pascal
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-ada-print.desktop
++++ b/apps/konqueror/quickprint/text-ada-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/x-adasrc
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-css-print.desktop
++++ b/apps/konqueror/quickprint/text-css-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/css
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-ch-print.desktop
++++ b/apps/konqueror/quickprint/text-ch-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=text/x-chdr
+ Actions=Print;
+
+--- a/apps/konqueror/quickprint/text-xslt-print.desktop
++++ b/apps/konqueror/quickprint/text-xslt-print.desktop
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
++Type=Service
+ ServiceTypes=application/xslt+xml
+ Actions=Print;
+
+--- a/apps/konqueror/konqueror.desktop
++++ b/apps/konqueror/konqueror.desktop
+@@ -27,7 +27,7 @@
+ Comment[el]=Διαχειριστής αρχείων & Περιηγητής ιστού του KDE
+ Comment[eo]=KDE-dosieradministrilo kaj TTT-legilo
+ Comment[es]=Gestor de ficheros y navegador web de KDE
+-Comment[et]=KDE failihaldur & veebilehitseja
++Comment[et]=KDE failihaldur & veebibrauser
+ Comment[eu]=KDE fitxategi kudeatzailea eta Web arakatzailea
+ Comment[fa]=مدیر پرونده و مرورگر وب KDE
+ Comment[fi]=KDE:n tiedostonhallinta ja WWW-selain
+--- a/apps/konqueror/kttsplugin/khtmlkttsd.desktop
++++ b/apps/konqueror/kttsplugin/khtmlkttsd.desktop
+@@ -18,6 +18,7 @@
+ Name[de]=Sprachausgabe
+ Name[el]=Κείμενο-σε-ομιλία
+ Name[es]=Texto-a-Voz
++Name[et]=Tekst kõneks
+ Name[fa]=متن به گفتار
+ Name[ga]=Téacs-go-Caint
+ Name[he]=טקסט לדיבור
+@@ -47,6 +48,7 @@
+ Comment[de]=Erzeugt Sprachausgabe für Text der aktuellen Seite
+ Comment[el]=Εκφωνεί το κείμενο της τρέχουσας σελίδας
+ Comment[es]=Produce audio del texto de la página actual
++Comment[et]=Aktiivse lehekülje teksti kõnelemine
+ Comment[fa]=خروجی صوتی را برای متن در صفحه جاری تولید میکند
+ Comment[he]=הקראת הטקסט בדף הנוכחי
+ Comment[it]=Produce una riproduzione vocale del testo della pagina attuale
+--- a/apps/konqueror/sidebar/trees/init/system.desktop
++++ /dev/null
+@@ -1,98 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Link
+-URL=system:/
+-Icon=system
+-Name=System
+-Name[af]=Stelsel
+-Name[ar]=النظام
+-Name[be]=Сістэма
+-Name[bg]=Система
+-Name[br]=Reizhiad
+-Name[ca]=Sistema
+-Name[cs]=Systém
+-Name[csb]=Systema
+-Name[cy]=Cysawd
+-Name[el]=Σύστημα
+-Name[eo]=Sistemo
+-Name[es]=Sistema
+-Name[et]=Süsteem
+-Name[eu]=Sistema
+-Name[fa]=سیستم
+-Name[fi]=Järjestelmä
+-Name[fr]=Système
+-Name[fy]=Systeem
+-Name[ga]=Córas
+-Name[gl]=Sistema
+-Name[he]=מערכת
+-Name[hr]=Sustav
+-Name[hu]=Rendszer
+-Name[is]=Kerfi
+-Name[it]=Sistema
+-Name[ja]=システム
+-Name[ka]=სისტემა
+-Name[kk]=Жүйелік
+-Name[km]=ប្រព័ន្ធ
+-Name[ko]=시스템
+-Name[lt]=Sistema
+-Name[lv]=Sistēma
+-Name[mk]=Систем
+-Name[ms]=Sistem
+-Name[nds]=Systeem
+-Name[ne]=प्रणाली
+-Name[nl]=Systeem
+-Name[pa]=ਸਿਸਟਮ
+-Name[pt]=Sistema
+-Name[pt_BR]=Sistema
+-Name[ro]=Sistem
+-Name[ru]=Система
+-Name[se]=Vuogádat
+-Name[sl]=Sistem
+-Name[sr]=Систем
+-Name[sr at latin]=Sistem
+-Name[ta]=அமைப்பு
+-Name[te]=వ్యవస్థ
+-Name[tg]=Система
+-Name[th]=ระบบ
+-Name[tr]=Sistem
+-Name[uk]=Система
+-Name[uz]=Тизим
+-Name[vi]=Hệ thống
+-Name[wa]=Sistinme
+-Name[x-test]=xxSystemxx
+-Name[xh]=Indlela esestyenziswayo
+-Name[zh_CN]=系统
+-Name[zh_TW]=系統
+-Comment=This folder allows to access common places in your computer
+-Comment[be]=Гэтая тэчка дазваляе атрымаць хуткі доступ да розных важных месцаў на вашым камп'ютэры
+-Comment[bg]=Директория за достъп до често използваните места в компютъра
+-Comment[csb]=Nen katalog dôwô mòżnotã przëstãpù do nôczãsczi brëkòwónëch placów w twòjim kòmpùtrze
+-Comment[de]=Dieser Ordner ermöglicht den Zugriff auf gebräuchliche Systembereiche Ihres Rechners
+-Comment[el]=Αυτός ο φάκελος σας επιτρέπει την πρόσβαση σε τυπικές τοποθεσίες του συστήματός σας
+-Comment[es]=Esta carpeta permite acceder a lugares usuales en su equipo
+-Comment[fa]=این پوشه اجازۀ دستیابی به جاهای مشترک در رایانۀ شما را میدهد
+-Comment[ga]=Ceadaíonn an fillteán seo duit áiteanna coitianta a rochtain ar do ríomhaire
+-Comment[he]=תיקייה זו מאפשרת לך לגשת למקומות נפוצים במחשב שלך
+-Comment[it]=Questa cartella permette di accedere ai percorsi comuni del tuo computer
+-Comment[ja]=このフォルダからコンピュータのよく使われる場所にアクセスできます
+-Comment[kk]=Бұл қапшық компьютердегі ортақ орындарға қатынауға мүмкіндік береді
+-Comment[km]=ថតនេះអនុញ្ញាតឲ្យចូលដំណើរការកន្លែងទូទៅនៅក្នុងកុំព្យូទ័ររបស់អ្នក
+-Comment[ko]=컴퓨터에서 자주 사용되는 장소에 접근하게 해 줍니다
+-Comment[nb]=Denne mappa gir deg tilgang til vanlige steder på din datamaskin
+-Comment[nds]=Mit dissen Orner kannst Du op en Reeg faken bruukte Öörd togriepen
+-Comment[ne]=यो फोल्डरले तपाईँलाई कम्प्युटरको साझा स्थानहरूमा पहुँच अनुमति दिन्छ
+-Comment[nl]=Deze map geeft toegang tot algemene plekken op uw computer
+-Comment[nn]=Denne mappa gir deg tilgang til nokre vanlege stader på datamaskina
+-Comment[pa]=ਇਹ ਫੋਲਡਰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ 'ਚ ਆਮ ਥਾਵਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ
+-Comment[pt]=Esta pasta permite aceder a alguns locais comuns no seu computador
+-Comment[pt_BR]=Esta pasta permite acessar lugares comuns em seu computador
+-Comment[sv]=Den här katalogen gör det möjligt att komma åt vanliga platser på din dator
+-Comment[th]=โฟลเดอร์นี้อนุญาตให้คุณเข้าถึงสถานที่ทั่วๆ ไปในเครื่องคอมพิวเตอร์ของคุณ
+-Comment[vi]=Thư mục này cho bạn có khả năng truy cập vào các nơi thông dụng của máy tính
+-Comment[wa]=Ci ridant chal dene èn accès a sacwantès cmonès plaeces di vosse copiutrece
+-Comment[x-test]=xxThis folder allows to access common places in your computerxx
+-Comment[zh_CN]=这个文件夹允许您访问计算机中的公共位置
+-Comment[zh_TW]=這個資料夾允許存取您電腦上的共同空間
+-Open=true
+-X-KDE-TreeModule=Directory
+-X-KDE-KonqSidebarModule=konqsidebar_tree
+--- a/apps/konqueror/sidebar/trees/init/home.desktop
++++ b/apps/konqueror/sidebar/trees/init/home.desktop
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Type=Link
+ URL=file:$HOME
+-Icon=folder_home
++Icon=go-home
+ Name=Home Folder
+ Name[af]=Tuis Gids
+ Name[ar]=المجلد المنزلي
+--- a/apps/konqueror/sidebar/trees/init/services/media.desktop
++++ /dev/null
+@@ -1,69 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Type=Link
+-URL=media:/
+-Icon=system
+-Name=Storage Media
+-Name[af]=Stoor Media
+-Name[ar]=وسائط التخزين
+-Name[be]=Носьбіт
+-Name[bg]=Съхраняващи устройства
+-Name[ca]=Suports d'emmagatzematge
+-Name[cs]=Úložná zařízení
+-Name[csb]=Zôpisowné media
+-Name[da]=Opbevaringsmedie
+-Name[de]=Speichermedien
+-Name[el]=Συσκευές αποθήκευσης
+-Name[eo]=Konservejo
+-Name[es]=Dispositivos de almacenamiento
+-Name[et]=Andmekandjad
+-Name[eu]=Biltegiratze-euskarria
+-Name[fa]=رسانۀ ذخیرهگاه
+-Name[fi]=Tallennusmedia
+-Name[fr]=Support de stockage
+-Name[fy]=Opslachapparaten
+-Name[ga]=Meán Stórais
+-Name[gl]=Medios de armacenaxe
+-Name[he]=התקני אחסון
+-Name[hr]=Mediji za pohranjivanje
+-Name[hu]=Tárolóeszközök
+-Name[is]=Geymslumiðlar
+-Name[it]=Dispositivi di archiviazione
+-Name[ja]=記憶メディア
+-Name[ka]=მონაცემთა შენახვის მოწყობილობები
+-Name[kk]=Жинақтаушы құрылғылар
+-Name[km]=ឧបករណ៍ផ្ទុក
+-Name[ko]=저장소 미디어
+-Name[lt]=Saugojimo įrenginiai
+-Name[lv]=Datu nesējs
+-Name[mk]=Медиуми за податоци
+-Name[ms]=Media Storan
+-Name[nb]=Lagringsenheter
+-Name[nds]=Spiekermedien
+-Name[ne]=भण्डारण मिडिया
+-Name[nl]=Opslagapparaten
+-Name[nn]=Lagringsmedium
+-Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ
+-Name[pl]=Urządzenia przechowywania danych
+-Name[pt]=Dispositivos de Armazenamento
+-Name[pt_BR]=Mídia de Armazenamento
+-Name[ro]=Mediu de stocare
+-Name[ru]=Устройства хранения данных
+-Name[se]=Vurkenmedia
+-Name[sl]=Nosilci za shranjevanje
+-Name[sr]=Складишни медијуми
+-Name[sr at latin]=Skladišni medijumi
+-Name[sv]=Lagringsmedia
+-Name[ta]=சேகரிப்பு ஊடகம்
+-Name[th]=สื่อเก็บข้อมูล
+-Name[tr]=Depolama Ortamı
+-Name[uk]=Пристрої зберігання інформації
+-Name[uz]=Сақлаш ускуналари
+-Name[vi]=Vật chứa
+-Name[wa]=Sopoirts di wårdaedje
+-Name[x-test]=xxStorage Mediaxx
+-Name[zh_CN]=存储介质
+-Name[zh_TW]=儲存媒體
+-Open=false
+-X-KDE-TreeModule=Directory
+-X-KDE-KonqSidebarModule=konqsidebar_tree
+--- a/apps/konqueror/sidebar/trees/init/services/audiocd.desktop
++++ b/apps/konqueror/sidebar/trees/init/services/audiocd.desktop
+@@ -18,7 +18,7 @@
+ Name[el]=Περιηγητής CD ήχου
+ Name[eo]=Rigardilo por muzikaj lumdiskoj
+ Name[es]=Navegador de CD-Audio
+-Name[et]=Audio CD sirvija
++Name[et]=Audio-CD sirvija
+ Name[eu]=Audio CD arakatzailea
+ Name[fa]=مرورگر دیسک فشردۀ صوتی
+ Name[fi]=Audio CD:n selain
+--- a/apps/konqueror/sidebar/trees/init/services/CMakeLists.txt
++++ b/apps/konqueror/sidebar/trees/init/services/CMakeLists.txt
+@@ -1,3 +1,3 @@
+
+-install( FILES .directory audiocd.desktop printsystem.desktop media.desktop settings.desktop applications.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/services )
++install( FILES .directory audiocd.desktop printsystem.desktop settings.desktop applications.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/services )
+
+--- a/apps/konqueror/sidebar/trees/init/remote/ftp/.directory
++++ b/apps/konqueror/sidebar/trees/init/remote/ftp/.directory
+@@ -7,6 +7,7 @@
+ Name[de]=FTP-Archive
+ Name[el]=Αρχειοθήκες FTP
+ Name[es]=Archivos FTP
++Name[et]=FTP arhiivid
+ Name[fa]=بایگانیهای FTP
+ Name[ga]=Cartlanna FTP
+ Name[he]=ארכיוני FTP
+--- a/apps/konqueror/sidebar/trees/init/remote/ftp/kde_ftp.desktop
++++ b/apps/konqueror/sidebar/trees/init/remote/ftp/kde_ftp.desktop
+@@ -34,7 +34,7 @@
+ Name[ja]=KDE 公式 FTP
+ Name[ka]=KDE-ს ძირითადი FTP სერვერი
+ Name[kk]=Негізгі KDE FTP сервері
+-Name[km]=KDE មាន FTP ជាផ្លូវការ
++Name[km]=FTP ជាផ្លូវការរបស់ KDE
+ Name[ko]=KDE 공식 FTP
+ Name[lt]=KDE oficialus FTP
+ Name[lv]=KDE Oficiālais FTP
+--- a/apps/konqueror/sidebar/trees/init/remote/web/.directory
++++ b/apps/konqueror/sidebar/trees/init/remote/web/.directory
+@@ -7,6 +7,7 @@
+ Name[de]=Webseiten
+ Name[el]=Ιστοσελίδες
+ Name[es]=Sitios web
++Name[et]=Veebileheküljed
+ Name[fa]=پایگاههای وب
+ Name[ga]=Suímh Ghréasáin
+ Name[he]=אתרי אינטרנט
+--- a/apps/konqueror/sidebar/trees/init/remote/web/kde_web.desktop
++++ b/apps/konqueror/sidebar/trees/init/remote/web/kde_web.desktop
+@@ -33,7 +33,7 @@
+ Name[ja]=KDE ホームページ
+ Name[ka]=KDE-ს ვებ გვერდი
+ Name[kk]=KDE веб-сайты
+-Name[km]=គេហទំព័រ KDE
++Name[km]=គេហទំព័ររបស់ KDE
+ Name[ko]=KDE 홈페이지
+ Name[lt]=KDE namų puslapis
+ Name[lv]=KDE Mājas Lapa
+--- a/apps/konqueror/sidebar/trees/init/root.desktop
++++ b/apps/konqueror/sidebar/trees/init/root.desktop
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Type=Link
+ URL=file:/
+-Icon=folder_red
++Icon=folder
+ Name=Root Folder
+ Name[af]=Basis Gids
+ Name[ar]=مجلد الجذر
+--- a/apps/konqueror/sidebar/trees/init/CMakeLists.txt
++++ b/apps/konqueror/sidebar/trees/init/CMakeLists.txt
+@@ -6,5 +6,5 @@
+ install( FILES home.desktop root.desktop history.desktop bookmarks.desktop services.desktop remote.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/kicker_entries )
+ install( FILES history_module.desktop dirtree_module.desktop bookmarks_module.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/dirtree )
+ install( FILES virtualfolderadd.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/add )
+-install( FILES home.desktop root.desktop history.desktop bookmarks.desktop services.desktop remote.desktop system.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/entries )
++install( FILES home.desktop root.desktop history.desktop bookmarks.desktop services.desktop remote.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/entries )
+
+--- a/apps/konqueror/sidebar/trees/history_module/kcmhistory.desktop
++++ b/apps/konqueror/sidebar/trees/history_module/kcmhistory.desktop
+@@ -3,7 +3,7 @@
+ Icon=history
+ Type=Service
+ ServiceTypes=KCModule
+-Exec=kcmshell kcmhistory
++Exec=kcmshell4 kcmhistory
+
+ X-KDE-Library=kcm_history
+ X-KDE-ParentApp=kcontrol
+--- a/apps/konqueror/sidebar/trees/history_module/history_module.cpp
++++ b/apps/konqueror/sidebar/trees/history_module/history_module.cpp
+@@ -299,7 +299,7 @@
+ void KonqSidebarHistoryModule::slotPreferences()
+ {
+ // Run the history sidebar settings.
+- KRun::run( "kcmshell kcmhistory", KUrl::List(), tree());
++ KRun::run( "kcmshell4 kcmhistory", KUrl::List(), tree());
+ }
+
+ void KonqSidebarHistoryModule::slotSortByName()
+--- a/apps/konqueror/sidebar/konq_sidebartng.desktop
++++ b/apps/konqueror/sidebar/konq_sidebartng.desktop
+@@ -17,7 +17,7 @@
+ Name[el]=Πλαίσιο πλοήγησης
+ Name[eo]=Navigila panelo
+ Name[es]=Panel de navegación
+-Name[et]=Liikumise paneel
++Name[et]=Liikumispaneel
+ Name[eu]=Arakaketa panela
+ Name[fa]=تابلوی ناوش
+ Name[fi]=Navigointipaneeli
+--- a/apps/konqueror/sidebar/sidebar_widget.cpp
++++ b/apps/konqueror/sidebar/sidebar_widget.cpp
+@@ -1142,8 +1142,8 @@
+ if (doEnableActions()) {
+ KParts::OpenUrlArguments args;
+ args.setMimeType(mimeType);
+- getExtension()->popupMenu(global,url,mode, args);
+- }
++ getExtension()->popupMenu(global,url,mode, args);
++ }
+ }
+
+ void Sidebar_Widget::connectModule(QObject *mod)
+@@ -1165,7 +1165,7 @@
+ if (mod->metaObject()->indexOfSignal("popupMenu(QPoint,KUrl,QString,mode_t)") != -1) {
+ connect(mod,SIGNAL(popupMenu( const QPoint &,
+ const KUrl &,const QString &, mode_t)),this,
+- SLOT(popupMenu( KXMLGUIClient *, const QPoint &,
++ SLOT(popupMenu( const QPoint &,
+ const KUrl &,const QString &, mode_t)));
+ }
+
+--- a/apps/konqueror/sidebar/konqsidebarplugin.h
++++ b/apps/konqueror/sidebar/konqsidebarplugin.h
+@@ -90,13 +90,7 @@
+
+ void enableAction( const char * name, bool enabled );
+
+- void popupMenu( const QPoint &global, const KFileItemList &items );
+- void popupMenu( KXMLGUIClient *client, const QPoint &global, const KFileItemList &items );
+- void popupMenu( const QPoint &global, const KUrl &url,
+- const QString &mimeType, mode_t mode = (mode_t)-1 );
+- void popupMenu( KXMLGUIClient *client,
+- const QPoint &global, const KUrl &url,
+- const QString &mimeType, mode_t mode = (mode_t)-1 );
++ void popupMenu( ... );
+
+ void showError(QString &); //for later extension
+ void showMessage(QString &); //for later extension
+--- a/apps/konqueror/about/tips.html
++++ b/apps/konqueror/about/tips.html
+@@ -108,11 +108,9 @@
+ <!--Advanced users will appreciate the konsole which you can embed into
+ konqueror (Window -> Show Terminal Emulator).--></li>
+
+- <li>%22
+- <!--Thanks to DCOP you can have full control over Konqueror using a script.--></li>
+ </ul>
+
+- <p id="nextlink"><a href="specs.html">%23 %24
++ <p id="nextlink"><a href="specs.html">%22 %23
+ <!-- Continue --></a></p>
+ </div>
+ </div>
+--- a/apps/konqueror/about/konq_aboutpage.cc
++++ b/apps/konqueror/about/konq_aboutpage.cc
+@@ -256,12 +256,12 @@
+ .arg( i18n("<A HREF=\"%1\">Cascading Style Sheets</A> (CSS 1, partially CSS 2)", QString("http://www.w3.org/Style/CSS/")) )
+ .arg( i18n("built-in") )
+ .arg( i18n("<A HREF=\"%1\">ECMA-262</A> Edition 3 (roughly equals JavaScript 1.5)", QString("http://www.ecma.ch/ecma1/STAND/ECMA-262.HTM")) )
+- .arg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.", QString("exec:/kcmshell khtml_java_js")) )
+- .arg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.", QString("exec:/kcmshell khtml_java_js")) ) // leave the double backslashes here, they are necessary for javascript !
++ .arg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.", QString("exec:/kcmshell4 khtml_java_js")) )
++ .arg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.", QString("exec:/kcmshell4 khtml_java_js")) ) // leave the double backslashes here, they are necessary for javascript !
+ .arg( i18n("Secure <A HREF=\"%1\">Java</A><SUP>®</SUP> support", QString("http://java.sun.com")) )
+ .arg( i18n("JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2\">IBM</A> or <A HREF=\"%3\">Sun</A>)",
+ QString("http://www.blackdown.org"), QString("http://www.ibm.com"), QString("http://java.sun.com")) )
+- .arg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.", QString("exec:/kcmshell khtml_java_js")) ) // TODO Maybe test if Java is enabled ?
++ .arg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.", QString("exec:/kcmshell4 khtml_java_js")) ) // TODO Maybe test if Java is enabled ?
+ .arg( i18n("Netscape Communicator<SUP>®</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>®</SUP></A>, <A HREF=\"%2\">Real<SUP>®</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>®</SUP></A>Video, etc.)",
+ QString("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"),
+ QString("http://www.real.com"), QString("http://www.real.com"),
+@@ -281,7 +281,7 @@
+ .arg( i18n("Transfer protocols") )
+ .arg( i18n("HTTP 1.1 (including gzip/bzip2 compression)") )
+ .arg( i18n("FTP") )
+- .arg( i18n("and <A HREF=\"%1\">many more...</A>", QString("exec:/kcmshell ioslaveinfo")) )
++ .arg( i18n("and <A HREF=\"%1\">many more...</A>", QString("exec:/kcmshell4 ioslaveinfo")) )
+ .arg( i18n("URL-Completion") )
+ .arg( i18n("Manual"))
+ .arg( i18n("Popup"))
+@@ -341,7 +341,7 @@
+ "using Google, for the search phrase \"KDE\". There are a lot of "
+ "Web-Shortcuts predefined to make searching for software or looking "
+ "up certain words in an encyclopedia a breeze. You can even "
+- "<a href=\"%1\">create your own</a> Web-Shortcuts." , QString("exec:/kcmshell ebrowsing")) )
++ "<a href=\"%1\">create your own</a> Web-Shortcuts." , QString("exec:/kcmshell4 ebrowsing")) )
+ .arg( i18n( "Use the magnifier button <img width='16' height='16' src=\"%1\"></img> in the"
+ " toolbar to increase the font size on your web page.", viewmag_icon_path) )
+ .arg( i18n( "When you want to paste a new address into the Location toolbar you might want to "
+@@ -361,16 +361,14 @@
+ ", or create your own ones." , view_left_right_icon_path))
+ .arg( i18n( "Use the <a href=\"%1\">user-agent</a> feature if the website you are visiting "
+ "asks you to use a different browser "
+- "(and do not forget to send a complaint to the webmaster!)" , QString("exec:/kcmshell useragent")) )
++ "(and do not forget to send a complaint to the webmaster!)" , QString("exec:/kcmshell4 useragent")) )
+ .arg( i18n( "The <img width='16' height='16' src=\"%1\"></img> History in your SideBar ensures "
+ "that you can keep track of the pages you have visited recently.", history_icon_path) )
+ .arg( i18n( "Use a caching <a href=\"%1\">proxy</a> to speed up your"
+- " Internet connection.", QString("exec:/kcmshell proxy")) )
++ " Internet connection.", QString("exec:/kcmshell4 proxy")) )
+ .arg( i18n( "Advanced users will appreciate the Konsole which you can embed into "
+ "Konqueror (Window -> <img width='16' height='16' SRC=\"%1\"></img> Show "
+ "Terminal Emulator).", openterm_icon_path))
+- .arg( i18n( "Thanks to <a href=\"%1\">DCOP</a> you can have full control over Konqueror using a script."
+-, QString("exec:/kdcop")) )
+ .arg( i18n( "<img width='16' height='16' src=\"%1\"></img>" , continue_icon_path ) )
+ .arg( i18n( "Next: Specifications" ) )
+ ;
+--- a/apps/konqueror/shellcmdplugin/CMakeLists.txt
++++ b/apps/konqueror/shellcmdplugin/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ kde4_add_plugin(konq_shellcmdplugin ${konq_shellcmdplugin_PART_SRCS})
+
+
+-target_link_libraries(konq_shellcmdplugin konq ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDESU_LIBS})
++target_link_libraries(konq_shellcmdplugin konq ${KDE4_KDEUI_LIBS} ${KDE4_KDESU_LIBS} ${QT_QT3SUPPORT_LIBRARY})
+
+ install(TARGETS konq_shellcmdplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- a/apps/konqueror/client/CMakeLists.txt
++++ b/apps/konqueror/client/CMakeLists.txt
+@@ -10,7 +10,7 @@
+
+ kde4_add_kdeinit_executable( kfmclient NOGUI ${kfmclient_SRCS})
+
+-target_link_libraries(kdeinit_kfmclient ${KDE4_KDE3SUPPORT_LIBS} )
++target_link_libraries(kdeinit_kfmclient ${KDE4_KIO_LIBS} )
+
+ install(TARGETS kdeinit_kfmclient DESTINATION ${LIB_INSTALL_DIR} )
+
+--- a/apps/kdepasswd/kcm/kcm_useraccount.desktop
++++ b/apps/kdepasswd/kcm/kcm_useraccount.desktop
+@@ -9,7 +9,7 @@
+ Type=Service
+ ServiceTypes=KCModule
+
+-Exec=kcmshell kcm_useraccount
++Exec=kcmshell4 kcm_useraccount
+ Name=Password & User Account
+ Name[af]=Gebruiker rekening en Wagwoord
+ Name[ar]=كلمة السر و حساب المستخدم
+@@ -83,6 +83,7 @@
+ Keywords[de]=Passwort,E-Mail,Name,Organisation,Tatsächlicher Name,Login,Anmeldebild,Bild,Echomodus
+ Keywords[el]=κωδικός πρόσβασης;email;όνομα;οργανισμός;πραγματικό όνομα;εικόνα σύνδεσης;πρόσωπο; τρόπος εμφάνισης
+ Keywords[es]=contraseña;correo electrónico;nombre;organización;nombre real;imagen de acceso;cara;modo de eco;
++Keywords[et]=parool;email;e-kiri;nimi;organisatsioon;pärisnimi;kasutaja pilt;nägu; echo režiim;
+ Keywords[fa]=اسم رمز؛ رایانامه؛ نام؛ سازمان؛ نام واقعی؛ تصویر ورود؛ چهره؛ حالت پژواک؛
+ Keywords[ga]=focal faire;ríomhphost;ainm;eagras;fíorainm;íomhá logála isteach;aghaidh;mód macalla;
+ Keywords[he]=סיסמה;דוא"ל;שם;אירגון;שם משתמש;תמונה;פרצוף;password;email;name;organization;realname;login image;face; echo mode;
+--- a/apps/dolphin/src/statusbarspaceinfo.h
++++ b/apps/dolphin/src/statusbarspaceinfo.h
+@@ -22,9 +22,10 @@
+
+ #include <kurl.h>
+
+-#include <QtGui/QColor>
+-#include <QtGui/QKeyEvent>
+-#include <QtGui/QWidget>
++#include <QColor>
++#include <QKeyEvent>
++#include <QProgressBar>
++#include <QString>
+
+ class KDiskFreeSp;
+
+@@ -32,7 +33,7 @@
+ * @short Shows the available space for the volume represented
+ * by the given URL as part of the status bar.
+ */
+-class StatusBarSpaceInfo : public QWidget
++class StatusBarSpaceInfo : public QProgressBar
+ {
+ Q_OBJECT
+
+@@ -41,38 +42,31 @@
+ virtual ~StatusBarSpaceInfo();
+
+ void setUrl(const KUrl& url);
+- const KUrl& url() const
+- {
+- return m_url;
+- }
+-
+-protected:
+- /** @see QWidget::paintEvent() */
+- virtual void paintEvent(QPaintEvent* event);
++ const KUrl& url() const;
++
++ /** @see QProgressBar::text() */
++ virtual QString text() const;
+
+ private slots:
+ void slotFoundMountPoint(const QString& mountPoint,
+ quint64 kBSize,
+ quint64 kBUsed,
+ quint64 kBAvailable);
+- void showResult();
+
+ /** Refreshes the space information for the current set URL. */
+ void refresh();
+
+-private:
+- /**
+- * Returns a color for the progress bar by respecting
+- * the given background color \a bgColor. It is assured
+- * that enough contrast is given to have a visual indication.
+- */
+- QColor progressColor(const QColor& bgColor) const;
++ void showGettingSizeInfo();
+
+ private:
+- KUrl m_url;
+ bool m_gettingSize;
+- quint64 m_kBSize;
+- quint64 m_kBAvailable;
++ KUrl m_url;
++ QString m_text;
+ };
+
++inline const KUrl& StatusBarSpaceInfo::url() const
++{
++ return m_url;
++}
++
+ #endif
+--- a/apps/dolphin/src/dolphincontroller.h
++++ b/apps/dolphin/src/dolphincontroller.h
+@@ -49,6 +49,7 @@
+ * The communication of the view implementations to the abstract view is done by:
+ * - triggerContextMenuRequest()
+ * - requestActivation()
++ * - triggerUrlChangeRequest()
+ * - indicateDroppedUrls()
+ * - indicateSortingChange()
+ * - indicateSortOrderChanged()
+@@ -59,6 +60,7 @@
+ * - emitViewportEntered()
+ *
+ * The communication of the abstract view to the view implementations is done by:
++ * - setUrl()
+ * - setShowHiddenFiles()
+ * - setShowPreview()
+ * - setAdditionalInfoCount()
+@@ -74,11 +76,26 @@
+ explicit DolphinController(QObject* parent);
+ virtual ~DolphinController();
+
+- /** Sets the URL to \a url and emits the signal urlChanged(). */
++ /**
++ * Sets the URL to \a url and emits the signal urlChanged() if
++ * \a url is different for the current URL. This method should
++ * be invoked by the abstract Dolphin view whenever the current
++ * URL has been changed.
++ */
+ void setUrl(const KUrl& url);
+ const KUrl& url() const;
+
+ /**
++ * Allows a view implementation to request an URL change to \a url.
++ * The signal requestUrlChange() is emitted and the abstract Dolphin view
++ * will assure that the URL of the Dolphin Controller will be updated
++ * later. Invoking this method makes only sense if the view implementation
++ * shows a hierarchy of URLs and allows to change the URL within
++ * the view (e. g. this is the case in the column view).
++ */
++ void triggerUrlChangeRequest(const KUrl& url);
++
++ /**
+ * Requests a context menu for the position \a pos. This method
+ * should be invoked by the view implementation when a context
+ * menu should be opened. The abstract Dolphin view itself
+@@ -216,6 +233,12 @@
+ void urlChanged(const KUrl& url);
+
+ /**
++ * Is emitted if the view implementation requests a changing of the current
++ * URL to \a url (see triggerUrlChangeRequest()).
++ */
++ void requestUrlChange(const KUrl& url);
++
++ /**
+ * Is emitted if a context menu should be opened (see triggerContextMenuRequest()).
+ * The abstract Dolphin view connects to this signal and will open the context menu.
+ * @param pos Position relative to the view widget where the
+--- a/apps/dolphin/src/dolphincolumnview.cpp
++++ b/apps/dolphin/src/dolphincolumnview.cpp
+@@ -47,6 +47,7 @@
+ m_index(-1),
+ m_contentX(0),
+ m_columns(),
++ m_emptyViewport(0),
+ m_animation(0)
+ {
+ Q_ASSERT(controller != 0);
+@@ -55,6 +56,8 @@
+ setDragDropMode(QAbstractItemView::DragDrop);
+ setDropIndicatorShown(false);
+ setSelectionMode(ExtendedSelection);
++ setFocusPolicy(Qt::NoFocus);
++ setFrameShape(QFrame::NoFrame);
+
+ connect(this, SIGNAL(entered(const QModelIndex&)),
+ controller, SLOT(emitItemEntered(const QModelIndex&)));
+@@ -81,6 +84,9 @@
+ m_columns.append(column);
+ setActiveColumnIndex(0);
+
++ m_emptyViewport = new QFrame(viewport());
++ m_emptyViewport->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
++
+ updateDecorationSize();
+ updateColumnsBackground(true);
+ }
+@@ -139,6 +145,18 @@
+ m_columns[0]->setUrl(url);
+ }
+
++void DolphinColumnView::setNameFilter(const QString& nameFilter)
++{
++ foreach (DolphinColumnWidget* column, m_columns) {
++ column->setNameFilter(nameFilter);
++ }
++}
++
++QString DolphinColumnView::nameFilter() const
++{
++ return activeColumn()->nameFilter();
++}
++
+ KUrl DolphinColumnView::rootUrl() const
+ {
+ return m_columns[0]->url();
+@@ -208,6 +226,10 @@
+ columnIndex++;
+
+ DolphinColumnWidget* column = new DolphinColumnWidget(viewport(), this, childUrl);
++ const QString filter = nameFilter();
++ if (!filter.isEmpty()) {
++ column->setNameFilter(filter);
++ }
+ column->setActive(false);
+
+ m_columns.append(column);
+@@ -263,12 +285,14 @@
+ case MoveLeft:
+ if (m_index > 0) {
+ setActiveColumnIndex(m_index - 1);
++ m_controller->triggerUrlChangeRequest(activeColumn()->url());
+ }
+ break;
+
+ case MoveRight:
+ if (m_index < m_columns.count() - 1) {
+ setActiveColumnIndex(m_index + 1);
++ m_controller->triggerUrlChangeRequest(m_columns[m_index]->url());
+ }
+ break;
+
+@@ -374,11 +398,8 @@
+ m_active = active;
+
+ // dim the background of the viewport
+- QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
+- color.setAlpha(150);
+-
+ QPalette palette;
+- palette.setColor(viewport()->backgroundRole(), color);
++ palette.setColor(viewport()->backgroundRole(), QColor(0, 0, 0, 0));
+ viewport()->setPalette(palette);
+
+ foreach (DolphinColumnWidget* column, m_columns) {
+@@ -426,36 +447,45 @@
+ m_index = index;
+ m_columns[m_index]->setActive(true);
+
+- m_controller->setUrl(m_columns[m_index]->url());
+-
+ assureVisibleActiveColumn();
+ }
+
+ void DolphinColumnView::layoutColumns()
+ {
++ const int gap = 4;
++
+ ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
+ const int columnWidth = settings->columnWidth();
++
++ QRect emptyViewportRect;
+ if (isRightToLeft()) {
+ int x = viewport()->width() - columnWidth + m_contentX;
+ foreach (DolphinColumnWidget* column, m_columns) {
+- column->setGeometry(QRect(x, 0, columnWidth, viewport()->height()));
++ column->setGeometry(QRect(x, 0, columnWidth - gap, viewport()->height()));
+ x -= columnWidth;
+ }
++ emptyViewportRect = QRect(0, 0, x + columnWidth - gap, viewport()->height());
+ } else {
+ int x = m_contentX;
+ foreach (DolphinColumnWidget* column, m_columns) {
+- column->setGeometry(QRect(x, 0, columnWidth, viewport()->height()));
++ column->setGeometry(QRect(x, 0, columnWidth - gap, viewport()->height()));
+ x += columnWidth;
+ }
++ emptyViewportRect = QRect(x, 0, viewport()->width() - x - gap, viewport()->height());
++ }
++
++ if (emptyViewportRect.isValid()) {
++ m_emptyViewport->show();
++ m_emptyViewport->setGeometry(emptyViewportRect);
++ } else {
++ m_emptyViewport->hide();
+ }
+ }
+
+ void DolphinColumnView::updateScrollBar()
+ {
+- int contentWidth = 0;
+- foreach (DolphinColumnWidget* column, m_columns) {
+- contentWidth += column->width();
+- }
++ ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
++ const int contentWidth = m_columns.count() * settings->columnWidth();
+
+ horizontalScrollBar()->setPageStep(contentWidth);
+ horizontalScrollBar()->setRange(0, contentWidth - viewport()->width());
+@@ -465,7 +495,10 @@
+ {
+ const int viewportWidth = viewport()->width();
+ const int x = activeColumn()->x();
+- const int width = activeColumn()->width();
++
++ ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
++ const int width = settings->columnWidth();
++
+ if (x + width > viewportWidth) {
+ const int newContentX = m_contentX - x - width + viewportWidth;
+ if (isRightToLeft()) {
+--- a/apps/dolphin/src/dolphinpart.cpp
++++ b/apps/dolphin/src/dolphinpart.cpp
+@@ -18,6 +18,9 @@
+ */
+
+ #include "dolphinpart.h"
++#include <kactioncollection.h>
++#include <ktoggleaction.h>
++#include <QActionGroup>
+ #include "dolphinsortfilterproxymodel.h"
+ #include "dolphinview.h"
+ #include "dolphinmodel.h"
+@@ -67,6 +70,8 @@
+ m_proxyModel);
+ setWidget(m_view);
+
++ setXMLFile("dolphinpart.rc");
++
+ connect(m_view, SIGNAL(infoMessage(QString)),
+ this, SLOT(slotInfoMessage(QString)));
+ connect(m_view, SIGNAL(errorMessage(QString)),
+@@ -81,7 +86,11 @@
+ connect(m_view, SIGNAL(requestItemInfo(KFileItem)),
+ this, SLOT(slotRequestItemInfo(KFileItem)));
+
+- // TODO provide a way to switch from iconview to listview (and others)
++ createActions();
++ updateViewActions();
++
++ // TODO provide these actions in the menu, merged with the existing view-mode-actions somehow
++ // [Q_PROPERTY introspection?]
+
+ // TODO connect to urlsDropped
+
+@@ -102,6 +111,24 @@
+ delete m_dirLister;
+ }
+
++void DolphinPart::createActions()
++{
++ QActionGroup* viewModeActions = new QActionGroup(this);
++ viewModeActions->addAction(DolphinView::iconsModeAction(actionCollection()));
++ viewModeActions->addAction(DolphinView::detailsModeAction(actionCollection()));
++ viewModeActions->addAction(DolphinView::columnsModeAction(actionCollection()));
++ connect(viewModeActions, SIGNAL(triggered(QAction*)), this, SLOT(slotViewModeActionTriggered(QAction*)));
++}
++
++void DolphinPart::updateViewActions()
++{
++ QAction* action = actionCollection()->action(m_view->currentViewModeActionName());
++ if (action != 0) {
++ KToggleAction* toggleAction = static_cast<KToggleAction*>(action);
++ toggleAction->setChecked(true);
++ }
++}
++
+ KAboutData* DolphinPart::createAboutData()
+ {
+ return new KAboutData("dolphinpart", 0, ki18nc("@title", "Dolphin Part"), "0.1");
+@@ -191,4 +218,10 @@
+ emit m_extension->popupMenu( QCursor::pos(), items, KParts::OpenUrlArguments(), KParts::BrowserArguments(), popupFlags );
+ }
+
++void DolphinPart::slotViewModeActionTriggered(QAction* action)
++{
++ const DolphinView::Mode mode = action->data().value<DolphinView::Mode>();
++ m_view->setMode(mode);
++}
++
+ #include "dolphinpart.moc"
+--- a/apps/dolphin/src/dolphincontextmenu.cpp
++++ b/apps/dolphin/src/dolphincontextmenu.cpp
+@@ -277,8 +277,7 @@
+ popup->addAction(renameAction);
+
+ // insert 'Move to Trash' and (optionally) 'Delete'
+- const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
+- const KConfigGroup kdeConfig(globalConfig, "KDE");
++ KConfigGroup kdeConfig(KGlobal::config(), "KDE");
+ bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
+ const KUrl& url = m_mainWindow->activeViewContainer()->url();
+ if (url.isLocalFile()) {
+--- a/apps/dolphin/src/dolphinmainwindow.cpp
++++ b/apps/dolphin/src/dolphinmainwindow.cpp
+@@ -236,7 +236,6 @@
+ updateViewActions();
+ updateGoActions();
+ setCaption(url.fileName());
+- emit urlChanged(url);
+ }
+ }
+
+@@ -698,19 +697,11 @@
+ clearStatusBar();
+ m_activeViewContainer->view()->invertSelection();
+ }
+-void DolphinMainWindow::setIconsView()
+-{
+- m_activeViewContainer->view()->setMode(DolphinView::IconsView);
+-}
+
+-void DolphinMainWindow::setDetailsView()
++void DolphinMainWindow::setViewMode(QAction* action)
+ {
+- m_activeViewContainer->view()->setMode(DolphinView::DetailsView);
+-}
+-
+-void DolphinMainWindow::setColumnView()
+-{
+- m_activeViewContainer->view()->setMode(DolphinView::ColumnView);
++ const DolphinView::Mode mode = action->data().value<DolphinView::Mode>();
++ m_activeViewContainer->view()->setMode(mode);
+ }
+
+ void DolphinMainWindow::sortByName()
+@@ -1149,28 +1140,16 @@
+ SLOT(zoomOut()),
+ actionCollection());
+
+- KToggleAction* iconsView = actionCollection()->add<KToggleAction>("icons");
+- iconsView->setText(i18nc("@action:inmenu View Mode", "Icons"));
+- iconsView->setShortcut(Qt::CTRL | Qt::Key_1);
+- iconsView->setIcon(KIcon("fileview-icon"));
+- connect(iconsView, SIGNAL(triggered()), this, SLOT(setIconsView()));
+-
+- KToggleAction* detailsView = actionCollection()->add<KToggleAction>("details");
+- detailsView->setText(i18nc("@action:inmenu View Mode", "Details"));
+- detailsView->setShortcut(Qt::CTRL | Qt::Key_2);
+- detailsView->setIcon(KIcon("fileview-detailed"));
+- connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView()));
+-
+- KToggleAction* columnView = actionCollection()->add<KToggleAction>("columns");
+- columnView->setText(i18nc("@action:inmenu View Mode", "Columns"));
+- columnView->setShortcut(Qt::CTRL | Qt::Key_3);
+- columnView->setIcon(KIcon("fileview-column"));
+- connect(columnView, SIGNAL(triggered()), this, SLOT(setColumnView()));
++
++ KToggleAction* iconsView = DolphinView::iconsModeAction(actionCollection());
++ KToggleAction* detailsView = DolphinView::detailsModeAction(actionCollection());
++ KToggleAction* columnView = DolphinView::columnsModeAction(actionCollection());
+
+ QActionGroup* viewModeGroup = new QActionGroup(this);
+ viewModeGroup->addAction(iconsView);
+ viewModeGroup->addAction(detailsView);
+ viewModeGroup->addAction(columnView);
++ connect(viewModeGroup, SIGNAL(triggered(QAction*)), this, SLOT(setViewMode(QAction*)));
+
+ KToggleAction* sortByName = actionCollection()->add<KToggleAction>("sort_by_name");
+ sortByName->setText(i18nc("@action:inmenu Sort By", "Name"));
+@@ -1469,21 +1448,7 @@
+ zoomOutAction->setEnabled(view->isZoomOutPossible());
+ }
+
+- QAction* action = 0;
+- switch (view->mode()) {
+- case DolphinView::IconsView:
+- action = actionCollection()->action("icons");
+- break;
+- case DolphinView::DetailsView:
+- action = actionCollection()->action("details");
+- break;
+- case DolphinView::ColumnView:
+- action = actionCollection()->action("columns");
+- break;
+- default:
+- break;
+- }
+-
++ QAction* action = actionCollection()->action(view->currentViewModeActionName());
+ if (action != 0) {
+ KToggleAction* toggleAction = static_cast<KToggleAction*>(action);
+ toggleAction->setChecked(true);
+--- a/apps/dolphin/src/kcategorizedview_p.h
++++ b/apps/dolphin/src/kcategorizedview_p.h
+@@ -112,6 +112,8 @@
+ */
+ void drawDraggedItems();
+
++ void layoutChanged(bool forceItemReload = false);
++
+
+ // Attributes
+
+@@ -149,6 +151,11 @@
+ QModelIndexList intersectedIndexes;
+ QRect lastDraggedItemsRect;
+ QRect lastSelectionRect;
++ int modelSortRole;
++ int modelSortColumn;
++ int modelLastRowCount;
++ bool modelCategorized;
++ Qt::SortOrder modelSortOrder;
+
+ // Attributes for speed reasons
+ KCategorizedSortFilterProxyModel *proxyModel;
+--- a/apps/dolphin/src/dolphindetailsview.cpp
++++ b/apps/dolphin/src/dolphindetailsview.cpp
+@@ -120,6 +120,8 @@
+ #endif
+
+ updateDecorationSize();
++
++ setFocus();
+ }
+
+ DolphinDetailsView::~DolphinDetailsView()
+--- a/apps/dolphin/src/dolphinviewcontainer.h
++++ b/apps/dolphin/src/dolphinviewcontainer.h
+@@ -145,10 +145,10 @@
+ void updateProgress(int percent);
+
+ /**
+- * Updates the number of items (= number of directories + number of files)
+- * and shows this information in the statusbar.
++ * Assures that the viewport position is restored and updates the
++ * statusbar to reflect the current content.
+ */
+- void updateItemCount();
++ void slotDirListerCompleted();
+
+ /**
+ * Handles clicking on an item
+@@ -173,7 +173,7 @@
+ * Filters the currently shown items by \a nameFilter. All items
+ * which contain the given filter string will be shown.
+ */
+- void changeNameFilter(const QString& nameFilter);
++ void setNameFilter(const QString& nameFilter);
+
+ /**
+ * Opens the context menu on the current mouse position.
+@@ -229,10 +229,6 @@
+ private:
+ bool m_showProgress;
+
+- int m_iconSize;
+- int m_folderCount;
+- int m_fileCount;
+-
+ DolphinMainWindow* m_mainWindow;
+ QVBoxLayout* m_topLayout;
+ KUrlNavigator* m_urlNavigator;
+--- a/apps/dolphin/src/dolphincontroller.cpp
++++ b/apps/dolphin/src/dolphincontroller.cpp
+@@ -44,6 +44,13 @@
+ }
+ }
+
++void DolphinController::triggerUrlChangeRequest(const KUrl& url)
++{
++ if (m_url != url) {
++ emit requestUrlChange(url);
++ }
++}
++
+ void DolphinController::triggerContextMenuRequest(const QPoint& pos)
+ {
+ emit activated();
+--- a/apps/dolphin/src/dolphinpart.desktop
++++ b/apps/dolphin/src/dolphinpart.desktop
+@@ -8,6 +8,7 @@
+ Name[de]=Dolphin-Komponente
+ Name[el]=Τμήμα Dolphin
+ Name[es]=Part Dolphin
++Name[et]=Dolphini komponent
+ Name[ga]=Comhpháirt Dolphin
+ Name[he]=רכיב Dolphin
+ Name[it]=Componente Dolphin
+--- a/apps/dolphin/src/dolphincolumnview.h
++++ b/apps/dolphin/src/dolphincolumnview.h
+@@ -24,12 +24,14 @@
+
+ #include <QAbstractItemView>
+ #include <QList>
++#include <QString>
+ #include <QStyleOption>
+
+ class DolphinColumnWidget;
+ class DolphinController;
+ class DolphinModel;
+ class QAbstractProxyModel;
++class QFrame;
+ class QTimeLine;
+
+ /**
+@@ -69,6 +71,18 @@
+ /** Returns the URL of the first column. */
+ KUrl rootUrl() const;
+
++ /**
++ * Filters the currently shown items by \a nameFilter. All items
++ * which contain the given filter string will be shown.
++ */
++ void setNameFilter(const QString& nameFilter);
++
++ /**
++ * Returns the currently used name filter. All items
++ * which contain the name filter will be shown.
++ */
++ QString nameFilter() const;
++
+ public slots:
+ /**
+ * Shows the column which represents the URL \a url. If the column
+@@ -156,6 +170,7 @@
+ int m_index;
+ int m_contentX;
+ QList<DolphinColumnWidget*> m_columns;
++ QFrame* m_emptyViewport;
+ QTimeLine* m_animation;
+
+ friend class DolphinColumnWidget;
+--- a/apps/dolphin/src/dolphinui.rc
++++ b/apps/dolphin/src/dolphinui.rc
+@@ -121,6 +121,6 @@
+ <Action name="split_view" />
+ </ToolBar>
+ <ActionProperties>
+- <Action shortcut="Backspace;XF86Back" name="go_back" />
++ <Action shortcut="Backspace; XF86Back" name="go_back" />
+ </ActionProperties>
+ </kpartgui>
+--- a/apps/dolphin/src/infosidebarpage.cpp
++++ b/apps/dolphin/src/infosidebarpage.cpp
+@@ -77,8 +77,9 @@
+
+ // general information
+ m_infoLabel = new QLabel(this);
+- m_infoLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
++ m_infoLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+ m_infoLabel->setTextFormat(Qt::RichText);
++ m_infoLabel->setWordWrap(true);
+
+ if (MetaDataWidget::metaDataAvailable()) {
+ m_metadataWidget = new MetaDataWidget(this);
+--- a/apps/dolphin/src/dolphiniconsview.cpp
++++ b/apps/dolphin/src/dolphiniconsview.cpp
+@@ -99,6 +99,8 @@
+
+ m_categoryDrawer = new DolphinCategoryDrawer();
+ setCategoryDrawer(m_categoryDrawer);
++
++ setFocus();
+ }
+
+ DolphinIconsView::~DolphinIconsView()
+--- a/apps/dolphin/src/treeviewcontextmenu.cpp
++++ b/apps/dolphin/src/treeviewcontextmenu.cpp
+@@ -75,8 +75,7 @@
+ popup->addAction(renameAction);
+
+ // insert 'Move to Trash' and (optionally) 'Delete'
+- const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
+- const KConfigGroup kdeConfig(globalConfig, "KDE");
++ KConfigGroup kdeConfig(KGlobal::config(), "KDE");
+ bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
+ const KUrl& url = m_fileInfo.url();
+ if (url.isLocalFile()) {
+--- a/apps/dolphin/src/dolphinview.cpp
++++ b/apps/dolphin/src/dolphinview.cpp
+@@ -19,6 +19,8 @@
+ ***************************************************************************/
+
+ #include "dolphinview.h"
++#include <ktoggleaction.h>
++#include <kactioncollection.h>
+
+ #include <QApplication>
+ #include <QClipboard>
+@@ -88,8 +90,16 @@
+
+ m_controller = new DolphinController(this);
+ m_controller->setUrl(url);
++
++ // Receiver of the DolphinView signal 'urlChanged()' don't need
++ // to care whether the internal controller changed the URL already or whether
++ // the controller just requested an URL change and will be updated later.
++ // In both cases the URL has been changed:
+ connect(m_controller, SIGNAL(urlChanged(const KUrl&)),
+ this, SIGNAL(urlChanged(const KUrl&)));
++ connect(m_controller, SIGNAL(requestUrlChange(const KUrl&)),
++ this, SIGNAL(urlChanged(const KUrl&)));
++
+ connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)),
+ this, SLOT(openContextMenu(const QPoint&)));
+ connect(m_controller, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&, const QModelIndex&, QWidget*)),
+@@ -194,7 +204,6 @@
+ const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
+ if (categorized != m_proxyModel->isCategorizedModel()) {
+ m_proxyModel->setCategorizedModel(categorized);
+- m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder());
+ emit categorizedSortingChanged();
+ }
+
+@@ -263,7 +272,6 @@
+
+ m_storedCategorizedSorting = categorized;
+ m_proxyModel->setCategorizedModel(categorized);
+- m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder());
+
+ emit categorizedSortingChanged();
+ }
+@@ -466,18 +474,11 @@
+ return;
+ }
+
+- const bool restoreColumnView = !rootUrl.isEmpty()
+- && !rootUrl.equals(url, KUrl::CompareWithoutTrailingSlash)
+- && rootUrl.isParentOf(url);
+-
+ m_controller->setUrl(url); // emits urlChanged, which we forward
+
+- if (restoreColumnView) {
++ if (!rootUrl.isEmpty() && rootUrl.isParentOf(url)) {
+ applyViewProperties(rootUrl);
+ loadDirectory(rootUrl);
+- // Restoring the column view relies on the URL-history. It might be possible
+- // that the view properties have been changed or deleted in the meantime, so
+- // it cannot be asserted that really a column view has been created:
+ if (itemView() == m_columnView) {
+ m_columnView->setRootUrl(rootUrl);
+ m_columnView->showColumn(url);
+@@ -487,11 +488,41 @@
+ loadDirectory(url);
+ }
+
+- itemView()->setFocus();
+-
+ emit startedPathLoading(url);
+ }
+
++void DolphinView::setNameFilter(const QString& nameFilter)
++{
++ // The name filter of KDirLister does a 'hard' filtering, which
++ // means that only the items are shown where the names match
++ // exactly the filter. This is non-transparent for the user, which
++ // just wants to have a 'soft' filtering: does the name contain
++ // the filter string?
++ QString adjustedFilter(nameFilter);
++ adjustedFilter.insert(0, '*');
++ adjustedFilter.append('*');
++
++ m_dirLister->setNameFilter(adjustedFilter);
++ m_dirLister->emitChanges();
++
++ if (isColumnViewActive()) {
++ // adjusting the directory lister is not enough in the case of the
++ // column view, as each column has its own directory lister internally...
++ m_columnView->setNameFilter(nameFilter);
++ }
++}
++
++void DolphinView::calculateItemCount(int& fileCount, int& folderCount)
++{
++ foreach (KFileItem item, m_dirLister->items()) {
++ if (item.isDir()) {
++ ++folderCount;
++ } else {
++ ++fileCount;
++ }
++ }
++}
++
+ void DolphinView::setUrl(const KUrl& url)
+ {
+ updateView(url, KUrl());
+@@ -631,7 +662,6 @@
+ const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
+ if (categorized != m_proxyModel->isCategorizedModel()) {
+ m_proxyModel->setCategorizedModel(categorized);
+- m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder());
+ emit categorizedSortingChanged();
+ }
+
+@@ -854,7 +884,6 @@
+ this, SLOT(emitContentsMoved()));
+ connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
+ this, SLOT(emitContentsMoved()));
+- view->setFocus();
+ }
+
+ QAbstractItemView* DolphinView::itemView() const
+@@ -927,4 +956,47 @@
+ }
+ }
+
++KToggleAction* DolphinView::iconsModeAction(KActionCollection* actionCollection)
++{
++ KToggleAction* iconsView = actionCollection->add<KToggleAction>("icons");
++ iconsView->setText(i18nc("@action:inmenu View Mode", "Icons"));
++ iconsView->setShortcut(Qt::CTRL | Qt::Key_1);
++ iconsView->setIcon(KIcon("fileview-icon"));
++ iconsView->setData(QVariant::fromValue(IconsView));
++ return iconsView;
++}
++
++KToggleAction* DolphinView::detailsModeAction(KActionCollection* actionCollection)
++{
++ KToggleAction* detailsView = actionCollection->add<KToggleAction>("details");
++ detailsView->setText(i18nc("@action:inmenu View Mode", "Details"));
++ detailsView->setShortcut(Qt::CTRL | Qt::Key_2);
++ detailsView->setIcon(KIcon("fileview-detailed"));
++ detailsView->setData(QVariant::fromValue(DetailsView));
++ return detailsView;
++}
++
++KToggleAction* DolphinView::columnsModeAction(KActionCollection* actionCollection)
++{
++ KToggleAction* columnView = actionCollection->add<KToggleAction>("columns");
++ columnView->setText(i18nc("@action:inmenu View Mode", "Columns"));
++ columnView->setShortcut(Qt::CTRL | Qt::Key_3);
++ columnView->setIcon(KIcon("fileview-column"));
++ columnView->setData(QVariant::fromValue(ColumnView));
++ return columnView;
++}
++
++QString DolphinView::currentViewModeActionName() const
++{
++ switch (m_mode) {
++ case DolphinView::IconsView:
++ return "icons";
++ case DolphinView::DetailsView:
++ return "details";
++ case DolphinView::ColumnView:
++ return "columns";
++ }
++ return QString(); // can't happen
++}
++
+ #include "dolphinview.moc"
+--- a/apps/dolphin/src/dolphinpart.h
++++ b/apps/dolphin/src/dolphinpart.h
+@@ -67,6 +67,14 @@
+ * @url URL which contains \a item.
+ */
+ void slotOpenContextMenu(const KFileItem& item, const KUrl& url);
++ /**
++ * Emitted when the user requested a change of view mode
++ */
++ void slotViewModeActionTriggered(QAction*);
++
++private:
++ void createActions();
++ void updateViewActions();
+
+ private:
+ DolphinView* m_view;
+--- a/apps/dolphin/src/dolphinviewcontainer.cpp
++++ b/apps/dolphin/src/dolphinviewcontainer.cpp
+@@ -62,8 +62,6 @@
+ const KUrl& url) :
+ QWidget(parent),
+ m_showProgress(false),
+- m_folderCount(0),
+- m_fileCount(0),
+ m_mainWindow(mainWindow),
+ m_topLayout(0),
+ m_urlNavigator(0),
+@@ -108,7 +106,7 @@
+ connect(m_dirLister, SIGNAL(deleteItem(const KFileItem&)),
+ this, SLOT(updateStatusBar()));
+ connect(m_dirLister, SIGNAL(completed()),
+- this, SLOT(updateItemCount()));
++ this, SLOT(slotDirListerCompleted()));
+ connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
+ this, SLOT(showInfoMessage(const QString&)));
+ connect(m_dirLister, SIGNAL(errorMessage(const QString&)),
+@@ -148,7 +146,7 @@
+ m_filterBar = new FilterBar(this);
+ m_filterBar->setVisible(settings->filterBar());
+ connect(m_filterBar, SIGNAL(filterChanged(const QString&)),
+- this, SLOT(changeNameFilter(const QString&)));
++ this, SLOT(setNameFilter(const QString&)));
+ connect(m_filterBar, SIGNAL(closeRequest()),
+ this, SLOT(closeFilterBar()));
+
+@@ -292,7 +290,7 @@
+ }
+ }
+
+-void DolphinViewContainer::updateItemCount()
++void DolphinViewContainer::slotDirListerCompleted()
+ {
+ if (m_showProgress) {
+ m_statusBar->setProgressText(QString());
+@@ -300,23 +298,6 @@
+ m_showProgress = false;
+ }
+
+- KFileItemList items(m_dirLister->items());
+- KFileItemList::const_iterator it = items.begin();
+- const KFileItemList::const_iterator end = items.end();
+-
+- m_fileCount = 0;
+- m_folderCount = 0;
+-
+- while (it != end) {
+- const KFileItem item = *it;
+- if (item.isDir()) {
+- ++m_folderCount;
+- } else {
+- ++m_fileCount;
+- }
+- ++it;
+- }
+-
+ updateStatusBar();
+
+ QTimer::singleShot(100, this, SLOT(restoreContentsPos()));
+@@ -349,24 +330,12 @@
+
+ QString DolphinViewContainer::defaultStatusBarText() const
+ {
+- int m_fileCount = 0;
+- int m_folderCount = 0;
+-
+- for (int i = 0; i < m_proxyModel->rowCount(); i++)
+- {
+- if (m_dolphinModel->itemForIndex(m_proxyModel->mapToSource(m_proxyModel->index(i, m_proxyModel->sortColumn()))).isDir())
+- {
+- m_folderCount++;
+- }
+- else
+- {
+- m_fileCount++;
+- }
+- }
+-
+- return KIO::itemsSummaryString(m_fileCount + m_folderCount,
+- m_fileCount,
+- m_folderCount,
++ int folderCount = 0;
++ int fileCount = 0;
++ m_view->calculateItemCount(fileCount, folderCount);
++ return KIO::itemsSummaryString(fileCount + folderCount,
++ fileCount,
++ folderCount,
+ 0, false);
+ }
+
+@@ -440,20 +409,9 @@
+ }
+ }
+
+-void DolphinViewContainer::changeNameFilter(const QString& nameFilter)
++void DolphinViewContainer::setNameFilter(const QString& nameFilter)
+ {
+- // The name filter of KDirLister does a 'hard' filtering, which
+- // means that only the items are shown where the names match
+- // exactly the filter. This is non-transparent for the user, which
+- // just wants to have a 'soft' filtering: does the name contain
+- // the filter string?
+- QString adjustedFilter(nameFilter);
+- adjustedFilter.insert(0, '*');
+- adjustedFilter.append('*');
+-
+- m_dirLister->setNameFilter(adjustedFilter);
+- m_dirLister->emitChanges();
+-
++ m_view->setNameFilter(nameFilter);
+ updateStatusBar();
+ }
+
+--- a/apps/dolphin/src/dolphinmainwindow.h
++++ b/apps/dolphin/src/dolphinmainwindow.h
+@@ -251,14 +251,8 @@
+ */
+ void invertSelection();
+
+- /** The current active view is switched to the icons mode. */
+- void setIconsView();
+-
+- /** The current active view is switched to the details mode. */
+- void setDetailsView();
+-
+- /** The current active view is switched to the column mode. */
+- void setColumnView();
++ /** The current active view is switched to a new view mode. */
++ void setViewMode(QAction *);
+
+ /** The sorting of the current view should be done by the name. */
+ void sortByName();
+--- a/apps/dolphin/src/dolphinpart.rc
++++ b/apps/dolphin/src/dolphinpart.rc
+@@ -1 +1,58 @@
+-
++<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
++<kpartgui version="2" name="dolphinpart" >
++ <MenuBar>
++ <Menu name="edit">
++ <Action name="select_all" />
++ <Action name="invert_selection" />
++ </Menu>
++ <Menu name="view">
++ <Menu name="sort">
++ <text context="@title:menu">Sort by</text>
++ <Action name="sort_by_name" />
++ <Action name="sort_by_size" />
++ <Action name="sort_by_date" />
++ <Action name="sort_by_permissions" />
++ <Action name="sort_by_owner" />
++ <Action name="sort_by_group" />
++ <Action name="sort_by_type" />
++ <Action name="sort_by_rating" />
++ <Action name="sort_by_tags" />
++ <Separator/>
++ <Action name="descending" />
++ </Menu>
++ <Menu name="additional_info">
++ <text context="@title:menu">Additional Information</text>
++ <Action name="show_mime_info" />
++ <Action name="show_size_info" />
++ <Action name="show_date_info" />
++ </Menu>
++ <Action name="show_preview" />
++ <Action name="show_in_groups" />
++ <Action name="show_hidden_files" />
++ <Menu name="panels">
++ <text context="@title:menu">Panels</text>
++ <Action name="show_places_panel" />
++ <Action name="show_info_panel" />
++ <Action name="show_folders_panel" />
++ <Action name="show_terminal_panel" />
++ </Menu>
++ <Menu name="navigation_bar">
++ <text context="@title:menu">Navigation Bar</text>
++ <Action name="editable_location" />
++ <Action name="edit_location" />
++ </Menu>
++ <Separator/>
++ <Action name="view_properties" />
++ </Menu>
++ <Menu name="tools">
++ <Action name="find_file" />
++ <Action name="show_filter_bar" />
++ <Action name="compare_files" />
++ </Menu>
++</MenuBar>
++<ToolBar name="mainToolBar"><text context="@title:menu">Dolphin Toolbar</text>
++ <Action name="icons" />
++ <Action name="details" />
++ <Action name="columns" />
++</ToolBar>
++</kpartgui>
+--- a/apps/dolphin/src/kcategorizedview.cpp
++++ b/apps/dolphin/src/kcategorizedview.cpp
+@@ -414,6 +414,36 @@
+ }
+ }
+
++void KCategorizedView::Private::layoutChanged(bool forceItemReload)
++{
++ if ((listView->viewMode() == KCategorizedView::IconMode) && proxyModel &&
++ categoryDrawer && proxyModel->isCategorizedModel() &&
++ ((forceItemReload ||
++ (modelSortRole != proxyModel->sortRole()) ||
++ (modelSortColumn != proxyModel->sortColumn()) ||
++ (modelSortOrder != proxyModel->sortOrder()) ||
++ (modelLastRowCount != proxyModel->rowCount()) ||
++ (modelCategorized != proxyModel->isCategorizedModel()))))
++ {
++ // Force the view to update all elements
++ listView->rowsInsertedArtifficial(QModelIndex(), 0, proxyModel->rowCount() - 1);
++
++ if (!forceItemReload)
++ {
++ modelSortRole = proxyModel->sortRole();
++ modelSortColumn = proxyModel->sortColumn();
++ modelSortOrder = proxyModel->sortOrder();
++ modelLastRowCount = proxyModel->rowCount();
++ modelCategorized = proxyModel->isCategorizedModel();
++ }
++ }
++ else if ((listView->viewMode() == KCategorizedView::IconMode) && proxyModel &&
++ categoryDrawer && proxyModel->isCategorizedModel())
++ {
++ updateScrollbars();
++ }
++}
++
+ void KCategorizedView::Private::drawDraggedItems()
+ {
+ QRect rectToUpdate;
+@@ -456,7 +486,7 @@
+ {
+ QListView::setGridSize(size);
+
+- slotLayoutChanged();
++ d->layoutChanged(true);
+ }
+
+ void KCategorizedView::setModel(QAbstractItemModel *model)
+@@ -483,6 +513,10 @@
+ QObject::disconnect(d->proxyModel,
+ SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ this, SLOT(slotLayoutChanged()));
++
++ QObject::disconnect(d->proxyModel,
++ SIGNAL(rowsRemoved(QModelIndex,int,int)),
++ this, SLOT(rowsRemoved(QModelIndex,int,int)));
+ }
+
+ QListView::setModel(model);
+@@ -491,6 +525,12 @@
+
+ if (d->proxyModel)
+ {
++ d->modelSortRole = d->proxyModel->sortRole();
++ d->modelSortColumn = d->proxyModel->sortColumn();
++ d->modelSortOrder = d->proxyModel->sortOrder();
++ d->modelLastRowCount = d->proxyModel->rowCount();
++ d->modelCategorized = d->proxyModel->isCategorizedModel();
++
+ QObject::connect(d->proxyModel,
+ SIGNAL(layoutChanged()),
+ this, SLOT(slotLayoutChanged()));
+@@ -498,6 +538,19 @@
+ QObject::connect(d->proxyModel,
+ SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ this, SLOT(slotLayoutChanged()));
++
++ QObject::connect(d->proxyModel,
++ SIGNAL(rowsRemoved(QModelIndex,int,int)),
++ this, SLOT(rowsRemoved(QModelIndex,int,int)));
++
++ if (d->proxyModel->rowCount())
++ {
++ d->layoutChanged(true);
++ }
++ }
++ else
++ {
++ d->modelCategorized = false;
+ }
+ }
+
+@@ -546,6 +599,10 @@
+ QObject::disconnect(d->proxyModel,
+ SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ this, SLOT(slotLayoutChanged()));
++
++ QObject::disconnect(d->proxyModel,
++ SIGNAL(rowsRemoved(QModelIndex,int,int)),
++ this, SLOT(rowsRemoved(QModelIndex,int,int)));
+ }
+ else if (categoryDrawer && d->proxyModel)
+ {
+@@ -556,6 +613,10 @@
+ QObject::connect(d->proxyModel,
+ SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ this, SLOT(slotLayoutChanged()));
++
++ QObject::connect(d->proxyModel,
++ SIGNAL(rowsRemoved(QModelIndex,int,int)),
++ this, SLOT(rowsRemoved(QModelIndex,int,int)));
+ }
+
+ d->categoryDrawer = categoryDrawer;
+@@ -564,7 +625,10 @@
+ {
+ if (d->proxyModel)
+ {
+- rowsInserted(QModelIndex(), 0, d->proxyModel->rowCount() - 1);
++ if (d->proxyModel->rowCount())
++ {
++ d->layoutChanged(true);
++ }
+ }
+ }
+ else
+@@ -682,6 +746,7 @@
+
+ // Redraw categories
+ QStyleOptionViewItem otherOption;
++ bool intersectedInThePast = false;
+ foreach (const QString &category, d->categories)
+ {
+ otherOption = option;
+@@ -690,11 +755,18 @@
+
+ if (otherOption.rect.intersects(area))
+ {
++ intersectedInThePast = true;
++
+ QModelIndex indexToDraw = d->proxyModel->index(d->categoriesIndexes[category][0].row(), d->proxyModel->sortColumn());
+
+ d->drawNewCategory(indexToDraw,
+ d->proxyModel->sortRole(), otherOption, &painter);
+ }
++ else if (intersectedInThePast)
++ {
++ break; // the visible area has been finished, we don't need to keep asking, the rest won't intersect
++ // this is doable because we know that categories are correctly ordered on the list
++ }
+ }
+
+ if (d->mouseButtonPressed && !d->isDragging)
+@@ -1176,8 +1248,8 @@
+ }
+
+ void KCategorizedView::rowsInserted(const QModelIndex &parent,
+- int start,
+- int end)
++ int start,
++ int end)
+ {
+ QListView::rowsInserted(parent, start, end);
+
+@@ -1205,8 +1277,8 @@
+ }
+
+ void KCategorizedView::rowsInsertedArtifficial(const QModelIndex &parent,
+- int start,
+- int end)
++ int start,
++ int end)
+ {
+ Q_UNUSED(parent);
+
+@@ -1229,25 +1301,24 @@
+ return;
+ }
+
+- // Add all elements mapped to the source model
+- for (int k = 0; k < d->proxyModel->rowCount(); k++)
+- {
+- d->biggestItemSize = QSize(qMax(sizeHintForIndex(d->proxyModel->index(k, 0)).width(),
+- d->biggestItemSize.width()),
+- qMax(sizeHintForIndex(d->proxyModel->index(k, 0)).height(),
+- d->biggestItemSize.height()));
+-
+- d->modelIndexList << d->proxyModel->index(k, d->proxyModel->sortColumn());
+- }
+-
+- // Explore categories
+- QString prevCategory = d->proxyModel->data(d->modelIndexList[0], KCategorizedSortFilterProxyModel::CategoryRole).toString();
++ // Add all elements mapped to the source model and explore categories
++ QString prevCategory = d->proxyModel->data(d->proxyModel->index(0, d->proxyModel->sortColumn()), KCategorizedSortFilterProxyModel::CategoryRole).toString();
+ QString lastCategory = prevCategory;
+ QModelIndexList modelIndexList;
+ struct Private::ElementInfo elementInfo;
+ int offset = -1;
+- foreach (const QModelIndex &index, d->modelIndexList)
++ for (int k = 0; k < d->proxyModel->rowCount(); ++k)
+ {
++ QModelIndex index = d->proxyModel->index(k, d->proxyModel->sortColumn());
++ QModelIndex indexSize = d->proxyModel->index(k, 0);
++
++ d->biggestItemSize = QSize(qMax(sizeHintForIndex(indexSize).width(),
++ d->biggestItemSize.width()),
++ qMax(sizeHintForIndex(indexSize).height(),
++ d->biggestItemSize.height()));
++
++ d->modelIndexList << index;
++
+ lastCategory = d->proxyModel->data(index, KCategorizedSortFilterProxyModel::CategoryRole).toString();
+
+ elementInfo.category = lastCategory;
+@@ -1279,14 +1350,14 @@
+ }
+
+ void KCategorizedView::rowsRemoved(const QModelIndex &parent,
+- int start,
+- int end)
++ int start,
++ int end)
+ {
+ if ((viewMode() == KCategorizedView::IconMode) && d->proxyModel &&
+ d->categoryDrawer && d->proxyModel->isCategorizedModel())
+ {
+ // Force the view to update all elements
+- rowsInsertedArtifficial(parent, start, end);
++ rowsInsertedArtifficial(QModelIndex(), 0, d->proxyModel->rowCount() - 1);
+ }
+ }
+
+@@ -1306,12 +1377,7 @@
+
+ void KCategorizedView::slotLayoutChanged()
+ {
+- if ((viewMode() == KCategorizedView::IconMode) && d->proxyModel &&
+- d->categoryDrawer && d->proxyModel->isCategorizedModel())
+- {
+- // Force the view to update all elements
+- rowsInsertedArtifficial(QModelIndex(), 0, d->proxyModel->rowCount() - 1);
+- }
++ d->layoutChanged();
+ }
+
+ #include "kcategorizedview.moc"
+--- a/apps/dolphin/src/pics/16x16/CMakeLists.txt
++++ b/apps/dolphin/src/pics/16x16/CMakeLists.txt
+@@ -1 +1 @@
+-install( FILES preview.png editurl.png DESTINATION ${DATA_INSTALL_DIR}/dolphin/icons/hicolor/16x16/actions )
++install( FILES preview.png DESTINATION ${DATA_INSTALL_DIR}/dolphin/icons/hicolor/16x16/actions )
+--- a/apps/dolphin/src/statusbarmessagelabel.h
++++ b/apps/dolphin/src/statusbarmessagelabel.h
+@@ -51,30 +51,16 @@
+
+ void setMessage(const QString& text, DolphinStatusBar::Type type);
+
+- DolphinStatusBar::Type type() const
+- {
+- return m_type;
+- }
+- const QString& text() const
+- {
+- return m_text;
+- }
++ DolphinStatusBar::Type type() const;
+
+- void setDefaultText(const QString& text)
+- {
+- m_defaultText = text;
+- }
+- const QString& defaultText() const
+- {
+- return m_defaultText;
+- }
++ const QString& text() const;
++
++ void setDefaultText(const QString& text);
++ const QString& defaultText() const;
+
+ // TODO: maybe a better approach is possible with the size hint
+ void setMinimumTextHeight(int min);
+- int minimumTextHeight() const
+- {
+- return m_minTextHeight;
+- }
++ int minimumTextHeight() const;
+
+ /**
+ * Returns the gap of the width of the current set text to the
+@@ -139,10 +125,8 @@
+ Desaturate
+ };
+
+- enum
+- {
+- GeometryTimeout = 100
+- };
++ enum { GeometryTimeout = 100 };
++ enum { BorderGap = 2 };
+
+ DolphinStatusBar::Type m_type;
+ State m_state;
+@@ -154,11 +138,31 @@
+ QList<QString> m_pendingMessages;
+ QPixmap m_pixmap;
+ QPushButton* m_closeButton;
+-
+- int borderGap() const
+- {
+- return 2;
+- }
+ };
+
++inline DolphinStatusBar::Type StatusBarMessageLabel::type() const
++{
++ return m_type;
++}
++
++inline const QString& StatusBarMessageLabel::text() const
++{
++ return m_text;
++}
++
++inline void StatusBarMessageLabel::setDefaultText(const QString& text)
++{
++ m_defaultText = text;
++}
++
++inline const QString& StatusBarMessageLabel::defaultText() const
++{
++ return m_defaultText;
++}
++
++inline int StatusBarMessageLabel::minimumTextHeight() const
++{
++ return m_minTextHeight;
++}
++
+ #endif
+--- a/apps/dolphin/src/dolphincolumnwidget.h
++++ b/apps/dolphin/src/dolphincolumnwidget.h
+@@ -84,6 +84,19 @@
+ */
+ void updateBackground();
+
++ /**
++ * Filters the currently shown items by \a nameFilter. All items
++ * which contain the given filter string will be shown.
++ */
++ void setNameFilter(const QString& nameFilter);
++
++ /**
++ * Returns the currently used name filter. All items
++ * which contain the name filter will be shown.
++ */
++ QString nameFilter() const;
++
++
+ protected:
+ virtual QStyleOptionViewItem viewOptions() const;
+ virtual void dragEnterEvent(QDragEnterEvent* event);
+--- a/apps/dolphin/src/generalviewsettingspage.cpp
++++ b/apps/dolphin/src/generalviewsettingspage.cpp
+@@ -25,8 +25,9 @@
+
+ #include "dolphin_generalsettings.h"
+
+-#include <QLabel>
++#include <QCheckBox>
+ #include <QGroupBox>
++#include <QLabel>
+ #include <QRadioButton>
+ #include <QSlider>
+ #include <QSpinBox>
+@@ -45,7 +46,8 @@
+ m_localProps(0),
+ m_globalProps(0),
+ m_maxPreviewSize(0),
+- m_spinBox(0)
++ m_spinBox(0),
++ m_useFileThumbnails(0)
+ {
+ const int spacing = KDialog::spacingHint();
+ const int margin = KDialog::marginHint();
+@@ -66,10 +68,10 @@
+ // create 'File Previews' box
+ QGroupBox* previewBox = new QGroupBox(i18nc("@title:group", "File Previews"), this);
+
+- QLabel* maxFileSize = new QLabel(i18nc("@label:slider", "Maximum file size:"), previewBox);
+-
+ KHBox* vBox = new KHBox(previewBox);
+ vBox->setSpacing(spacing);
++
++ QLabel* maxFileSize = new QLabel(i18nc("@label:slider", "Maximum file size:"), vBox);
+ m_maxPreviewSize = new QSlider(Qt::Horizontal, vBox);
+
+ m_spinBox = new QSpinBox(vBox);
+@@ -79,9 +81,11 @@
+ connect(m_spinBox, SIGNAL(valueChanged(int)),
+ m_maxPreviewSize, SLOT(setValue(int)));
+
++ m_useFileThumbnails = new QCheckBox(i18n("Use thumbnails embedded in files"), previewBox);
++
+ QVBoxLayout* previewBoxLayout = new QVBoxLayout(previewBox);
+- previewBoxLayout->addWidget(maxFileSize);
+ previewBoxLayout->addWidget(vBox);
++ previewBoxLayout->addWidget(m_useFileThumbnails);
+
+ // Add a dummy widget with no restriction regarding
+ // a vertical resizing. This assures that the dialog layout
+@@ -120,6 +124,9 @@
+ globalConfig.writeEntry("MaximumSize",
+ byteCount,
+ KConfigBase::Normal | KConfigBase::Global);
++ globalConfig.writeEntry("UseFileThumbnails",
++ m_useFileThumbnails->isChecked(),
++ KConfigBase::Normal | KConfigBase::Global);
+ globalConfig.sync();
+ }
+
+@@ -161,6 +168,9 @@
+
+ m_maxPreviewSize->setValue(maxMByteSize);
+ m_spinBox->setValue(m_maxPreviewSize->value());
++
++ const bool useFileThumbnails = globalConfig.readEntry("UseFileThumbnails", true);
++ m_useFileThumbnails->setChecked(useFileThumbnails);
+ }
+
+ #include "generalviewsettingspage.moc"
+--- a/apps/dolphin/src/CMakeLists.txt
++++ b/apps/dolphin/src/CMakeLists.txt
+@@ -1,6 +1,5 @@
+
+ add_subdirectory( pics )
+-add_subdirectory( servicemenus )
+ add_subdirectory( tests )
+
+ include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${BLITZ_INCLUDES} )
+--- a/apps/dolphin/src/dolphinview.h
++++ b/apps/dolphin/src/dolphinview.h
+@@ -37,6 +37,7 @@
+ #include <QListView>
+ #include <QWidget>
+
++class KToggleAction;
+ class DolphinController;
+ class KDirLister;
+ class KFileItemDelegate;
+@@ -304,6 +305,44 @@
+ */
+ void updateView(const KUrl& url, const KUrl& rootUrl);
+
++ /**
++ * Filters the currently shown items by \a nameFilter. All items
++ * which contain the given filter string will be shown.
++ */
++ void setNameFilter(const QString& nameFilter);
++
++ /**
++ * Calculates the number of currently shown files into
++ * \a fileCount and the number of folders into \a folderCount.
++ * It is recommend using this method instead of asking the
++ * directory lister or the model directly, as it takes
++ * filtering and hierarchical previews into account.
++ */
++ void calculateItemCount(int& fileCount, int& folderCount);
++
++ /**
++ * Returns the "switch to icons mode" action.
++ * This code is here to share it between the mainwindow and the part
++ */
++ static KToggleAction* iconsModeAction(KActionCollection* collection);
++
++ /**
++ * Returns the "switch to details mode" action.
++ * This code is here to share it between the mainwindow and the part
++ */
++ static KToggleAction* detailsModeAction(KActionCollection* collection);
++
++ /**
++ * Returns the "switch to columns mode" action.
++ * This code is here to share it between the mainwindow and the part
++ */
++ static KToggleAction* columnsModeAction(KActionCollection* collection);
++
++ /**
++ * Returns the action name corresponding to the current view mode
++ */
++ QString currentViewModeActionName() const;
++
+ public slots:
+ /**
+ * Changes the directory to \a url. If the current directory is equal to
+@@ -319,6 +358,7 @@
+ */
+ void changeSelection(const KFileItemList& selection);
+
++
+ signals:
+ /**
+ * Is emitted if the view has been activated by e. g. a mouse click.
+@@ -587,4 +627,7 @@
+ KUrl m_rootUrl;
+ };
+
++/// Allow using DolphinView::Mode in QVariant
++Q_DECLARE_METATYPE(DolphinView::Mode)
++
+ #endif // DOLPHINVIEW_H
+--- a/apps/dolphin/src/statusbarspaceinfo.cpp
++++ b/apps/dolphin/src/statusbarspaceinfo.cpp
+@@ -20,27 +20,23 @@
+
+ #include "statusbarspaceinfo.h"
+
+-#include <kcolorscheme.h>
+ #include <kdiskfreespace.h>
+ #include <kmountpoint.h>
+ #include <klocale.h>
+ #include <kio/job.h>
+
+ #include <QTimer>
+-#include <QPainter>
+ #include <QKeyEvent>
+
+ StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
+- QWidget(parent),
++ QProgressBar(parent),
+ m_gettingSize(false),
+- m_kBSize(0),
+- m_kBAvailable(0)
++ m_text()
+ {
+- setMinimumWidth(200);
++ setMinimum(0);
++ setMaximum(0);
+
+- QPalette palette;
+- palette.setColor(QPalette::Background, Qt::transparent);
+- setPalette(palette);
++ setMaximumWidth(200);
+
+ // Update the space information each 10 seconds. Polling is useful
+ // here, as files can be deleted/added outside the scope of Dolphin.
+@@ -57,96 +53,44 @@
+ {
+ m_url = url;
+ refresh();
+- QTimer::singleShot(300, this, SLOT(update()));
+ }
+
+-void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
++QString StatusBarSpaceInfo::text() const
+ {
+- QPainter painter(this);
+- const int barWidth = width();
+- const int barTop = 1;
+- const int barHeight = height() - 5;
+-
+- QString text;
+-
+- const int widthDec = 3; // visual decrement for the available width
+-
+- QColor frameColor = palette().brush(QPalette::Background).color();
+- frameColor.setAlpha(128);
+- painter.setPen(frameColor);
+-
+- const QColor backgrColor = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
+- painter.setBrush(backgrColor);
+-
+- painter.drawRect(QRect(0, barTop + 1 , barWidth - widthDec, barHeight));
+-
+- if ((m_kBSize > 0) && (m_kBAvailable > 0)) {
+- // draw 'used size' bar
+- painter.setPen(Qt::NoPen);
+- painter.setBrush(progressColor(backgrColor));
+- int usedWidth = barWidth - static_cast<int>((m_kBAvailable *
+- static_cast<float>(barWidth)) / m_kBSize);
+- const int left = 1;
+- int right = usedWidth - widthDec;
+- if (right < left) {
+- right = left;
+- }
+- painter.drawRect(QRect(left, barTop + 2, right, barHeight - 1));
+-
+- text = i18nc("@info:status", "%1 free", KIO::convertSizeFromKiB(m_kBAvailable));
+- } else {
+- if (m_gettingSize) {
+- text = i18nc("@info:status", "Getting size...");
+- } else {
+- text = QString();
+- QMetaObject::invokeMethod(this, "hide", Qt::QueuedConnection);
+- }
+- }
+-
+- // draw text
+- painter.setPen(KColorScheme(QPalette::Active, KColorScheme::View).foreground().color());
+- painter.drawText(QRect(1, 1, barWidth - 2, barHeight + 6),
+- Qt::AlignCenter | Qt::TextWordWrap,
+- text);
++ return m_text;
+ }
+
+-
+ void StatusBarSpaceInfo::slotFoundMountPoint(const QString& mountPoint,
+ quint64 kBSize,
+ quint64 kBUsed,
+ quint64 kBAvailable)
+ {
+- Q_UNUSED(kBUsed);
++ Q_UNUSED(kBSize);
+ Q_UNUSED(mountPoint);
+
+ m_gettingSize = false;
+- m_kBSize = kBSize;
+- m_kBAvailable = kBAvailable;
+-
+- update();
+-}
+-
+-void StatusBarSpaceInfo::showResult()
+-{
+- m_gettingSize = false;
+- update();
++ const bool valuesChanged = (kBUsed != static_cast<quint64>(value())) ||
++ (kBAvailable != static_cast<quint64>(maximum()));
++ if (valuesChanged) {
++ setMaximum(kBAvailable);
++ setValue(kBUsed);
++ m_text = i18nc("@info:status", "%1 free", KIO::convertSizeFromKiB(kBAvailable));
++ }
+ }
+
+ void StatusBarSpaceInfo::refresh()
+ {
+- m_kBSize = 0;
+- m_kBAvailable = 0;
+-
+ // KDiskFreeSpace is for local paths only
+ if (!m_url.isLocalFile()) {
+ return;
+ }
+
+- m_gettingSize = true;
+ KMountPoint::Ptr mp = KMountPoint::currentMountPoints().findByPath(m_url.path());
+- if (!mp)
++ if (!mp) {
+ return;
++ }
+
++ m_gettingSize = true;
+ KDiskFreeSpace* job = new KDiskFreeSpace(this);
+ connect(job, SIGNAL(foundMountPoint(const QString&,
+ quint64,
+@@ -156,35 +100,23 @@
+ quint64,
+ quint64,
+ quint64)));
+- connect(job, SIGNAL(done()),
+- this, SLOT(showResult()));
+
+ job->readDF(mp->mountPoint());
+-}
+
+-QColor StatusBarSpaceInfo::progressColor(const QColor& bgColor) const
+-{
+- QColor color = KColorScheme(QPalette::Active, KColorScheme::Button).background().color();
++ // refresh() is invoked for each directory change. Usually getting
++ // the size information can be done very fast, so to prevent any
++ // flickering the "Getting size..." indication is only shown if
++ // at least 300 ms have been passed.
++ QTimer::singleShot(300, this, SLOT(showGettingSizeInfo()));
++}
+
+- // assure that enough contrast is given between the background color
+- // and the progressbar color
+- int bgRed = bgColor.red();
+- int bgGreen = bgColor.green();
+- int bgBlue = bgColor.blue();
+-
+- const int backgrBrightness = qGray(bgRed, bgGreen, bgBlue);
+- const int progressBrightness = qGray(color.red(), color.green(), color.blue());
+-
+- const int limit = 32;
+- const int diff = backgrBrightness - progressBrightness;
+- bool adjustColor = ((diff >= 0) && (diff < limit)) ||
+- ((diff < 0) && (diff > -limit));
+- if (adjustColor) {
+- const int inc = (backgrBrightness < 2 * limit) ? (2 * limit) : -limit;
+- color = QColor(bgRed + inc, bgGreen + inc, bgBlue + inc);
++void StatusBarSpaceInfo::showGettingSizeInfo()
++{
++ if (m_gettingSize) {
++ m_text = i18nc("@info:status", "Getting size...");
++ setMinimum(0);
++ setMaximum(0);
+ }
+-
+- return color;
+ }
+
+ #include "statusbarspaceinfo.moc"
+--- a/apps/dolphin/src/statusbarmessagelabel.cpp
++++ b/apps/dolphin/src/statusbarmessagelabel.cpp
+@@ -59,7 +59,8 @@
+ }
+
+ StatusBarMessageLabel::~StatusBarMessageLabel()
+-{}
++{
++}
+
+ void StatusBarMessageLabel::setMessage(const QString& text,
+ DolphinStatusBar::Type type)
+@@ -122,7 +123,9 @@
+ if (min != m_minTextHeight) {
+ m_minTextHeight = min;
+ setMinimumHeight(min);
+- m_closeButton->setFixedHeight(min - borderGap() * 2);
++ if (m_closeButton->height() > min) {
++ m_closeButton->setFixedHeight(min);
++ }
+ }
+ }
+
+@@ -152,12 +155,12 @@
+ painter.drawRect(QRect(0, 0, width(), height()));
+
+ // draw pixmap
+- int x = borderGap();
++ int x = BorderGap;
+ int y = (m_minTextHeight - m_pixmap.height()) / 2;
+
+ if (!m_pixmap.isNull()) {
+ painter.drawPixmap(x, y, m_pixmap);
+- x += m_pixmap.width() + borderGap();
++ x += m_pixmap.width() + BorderGap;
+ }
+
+ // draw text
+@@ -265,14 +268,14 @@
+ int StatusBarMessageLabel::availableTextWidth() const
+ {
+ const int buttonWidth = (m_type == DolphinStatusBar::Error) ?
+- m_closeButton->width() + borderGap() : 0;
+- return width() - m_pixmap.width() - (borderGap() * 4) - buttonWidth;
++ m_closeButton->width() + BorderGap : 0;
++ return width() - m_pixmap.width() - (BorderGap * 4) - buttonWidth;
+ }
+
+ void StatusBarMessageLabel::updateCloseButtonPosition()
+ {
+- const int x = width() - m_closeButton->width() - borderGap();
+- const int y = height() - m_closeButton->height() - borderGap();
++ const int x = width() - m_closeButton->width() - BorderGap;
++ const int y = (height() - m_closeButton->height()) / 2;
+ m_closeButton->move(x, y);
+ }
+
+--- a/apps/dolphin/src/dolphincolumnwidget.cpp
++++ b/apps/dolphin/src/dolphincolumnwidget.cpp
+@@ -69,7 +69,6 @@
+ setSelectionMode(QAbstractItemView::ExtendedSelection);
+ setDragDropMode(QAbstractItemView::DragDrop);
+ setDropIndicatorShown(false);
+- setFocusPolicy(Qt::NoFocus);
+
+ // TODO: Remove this check when 4.3.2 is released and KDE requires it... this
+ // check avoids a division by zero happening on versions before 4.3.1.
+@@ -181,7 +180,7 @@
+ {
+ QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
+ if (!m_active || !m_view->m_active) {
+- color.setAlpha(0);
++ color.setAlpha(150);
+ }
+ QPalette palette = viewport()->palette();
+ palette.setColor(viewport()->backgroundRole(), color);
+@@ -190,6 +189,26 @@
+ update();
+ }
+
++void DolphinColumnWidget::setNameFilter(const QString& nameFilter)
++{
++ // The name filter of KDirLister does a 'hard' filtering, which
++ // means that only the items are shown where the names match
++ // exactly the filter. This is non-transparent for the user, which
++ // just wants to have a 'soft' filtering: does the name contain
++ // the filter string?
++ QString adjustedFilter(nameFilter);
++ adjustedFilter.insert(0, '*');
++ adjustedFilter.append('*');
++
++ m_dirLister->setNameFilter(adjustedFilter);
++ m_dirLister->emitChanges();
++}
++
++QString DolphinColumnWidget::nameFilter() const
++{
++ return m_dirLister->nameFilter();
++}
++
+ void DolphinColumnWidget::dragEnterEvent(QDragEnterEvent* event)
+ {
+ if (event->mimeData()->hasUrls()) {
+@@ -268,6 +287,7 @@
+ m_view->m_controller->requestActivation();
+ if (!m_active) {
+ m_view->requestActivation(this);
++ m_view->m_controller->triggerUrlChangeRequest(m_url);
+ }
+
+ QListView::mousePressEvent(event);
+@@ -291,6 +311,7 @@
+ {
+ if (!m_active) {
+ m_view->requestActivation(this);
++ m_view->m_controller->triggerUrlChangeRequest(m_url);
+ }
+
+ QListView::contextMenuEvent(event);
+@@ -364,10 +385,7 @@
+
+ void DolphinColumnWidget::activate()
+ {
+- if (m_view->hasFocus()) {
+- setFocus(Qt::OtherFocusReason);
+- }
+- m_view->setFocusProxy(this);
++ setFocus(Qt::OtherFocusReason);
+
+ // TODO: Connecting to the signal 'activated()' is not possible, as kstyle
+ // does not forward the single vs. doubleclick to it yet (KDE 4.1?). Hence it is
+@@ -393,6 +411,8 @@
+
+ void DolphinColumnWidget::deactivate()
+ {
++ clearFocus();
++
+ // TODO: Connecting to the signal 'activated()' is not possible, as kstyle
+ // does not forward the single vs. doubleclick to it yet (KDE 4.1?). Hence it is
+ // necessary connecting the signal 'singleClick()' or 'doubleClick'.
+--- a/apps/dolphin/src/dolphin.desktop
++++ b/apps/dolphin/src/dolphin.desktop
+@@ -22,6 +22,7 @@
+ GenericName[de]=Dateimanager
+ GenericName[el]=Διαχειριστής αρχείων
+ GenericName[es]=Gestor de ficheros
++GenericName[et]=Failihaldur
+ GenericName[fa]=مدیر پرونده
+ GenericName[ga]=Bainisteoir Comhad
+ GenericName[he]=מנהל קבצים
+--- a/apps/dolphin/src/dolphinstatusbar.cpp
++++ b/apps/dolphin/src/dolphinstatusbar.cpp
+@@ -51,18 +51,20 @@
+ m_progressBar = new QProgressBar(this);
+ m_progressBar->hide();
+
+- const QSize size(m_progressBar->sizeHint());
+- const int barHeight = size.height();
++ const int contentHeight = QFontMetrics(m_messageLabel->font()).height();
++ const int barHeight = contentHeight + 8;
+
+- m_progressBar->setMaximumWidth(200);
+ setMinimumHeight(barHeight);
+ m_messageLabel->setMinimumTextHeight(barHeight);
+- m_spaceInfo->setFixedHeight(barHeight);
++ m_spaceInfo->setFixedHeight(contentHeight);
++ m_progressBar->setFixedHeight(contentHeight);
++ m_progressBar->setMaximumWidth(200);
+ }
+
+
+ DolphinStatusBar::~DolphinStatusBar()
+-{}
++{
++}
+
+ void DolphinStatusBar::setMessage(const QString& msg,
+ Type type)
+@@ -180,7 +182,6 @@
+ // The space information is shown currently. Hide it
+ // if the progress bar is visible or if the status bar
+ // text does not fit into the available width.
+- const QSize size(m_progressBar->sizeHint());
+ if (isProgressBarVisible || (widthGap > 0)) {
+ m_spaceInfo->hide();
+ }
+--- a/apps/dolphin/src/generalsettingspage.cpp
++++ b/apps/dolphin/src/generalsettingspage.cpp
+@@ -96,18 +96,11 @@
+ startBoxLayout->addWidget(m_filterBar);
+
+ // create 'Ask Confirmation For' group
+- KSharedConfig::Ptr konqConfig = KSharedConfig::openConfig("konquerorrc", KConfig::IncludeGlobals);
+- const KConfigGroup trashConfig(konqConfig, "Trash");
+-
+ QGroupBox* confirmBox = new QGroupBox(i18nc("@title:group", "Ask For Confirmation When"), vBox);
+-
+ m_confirmMoveToTrash = new QCheckBox(i18nc("@option:check Ask for Confirmation When",
+ "Moving files or folders to trash"), confirmBox);
+- m_confirmMoveToTrash->setChecked(trashConfig.readEntry("ConfirmTrash", false));
+-
+ m_confirmDelete = new QCheckBox(i18nc("@option:check Ask for Confirmation When",
+ "Deleting files or folders"), confirmBox);
+- m_confirmDelete->setChecked(trashConfig.readEntry("ConfirmDelete", true));
+
+ QVBoxLayout* confirmBoxLayout = new QVBoxLayout(confirmBox);
+ confirmBoxLayout->addWidget(m_confirmMoveToTrash);
+@@ -115,9 +108,6 @@
+
+ // create 'Show the command 'Delete' in context menu' checkbox
+ m_showDeleteCommand = new QCheckBox(i18nc("@option:check", "Show 'Delete' command in context menu"), vBox);
+- const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
+- const KConfigGroup kdeConfig(globalConfig, "KDE");
+- m_showDeleteCommand->setChecked(kdeConfig.readEntry("ShowDeleteCommand", false));
+
+ // Add a dummy widget with no restriction regarding
+ // a vertical resizing. This assures that the dialog layout
+@@ -147,13 +137,12 @@
+ settings->setEditableUrl(m_editableUrl->isChecked());
+ settings->setFilterBar(m_filterBar->isChecked());
+
+- KSharedConfig::Ptr konqConfig = KSharedConfig::openConfig("konquerorrc", KConfig::IncludeGlobals);
+- KConfigGroup trashConfig(konqConfig, "Trash");
++ KConfigGroup trashConfig(KGlobal::config(), "Trash");
+ trashConfig.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked());
+ trashConfig.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());
++ trashConfig.sync();
+
+- KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
+- KConfigGroup kdeConfig(globalConfig, "KDE");
++ KConfigGroup kdeConfig(KGlobal::config(), "KDE");
+ kdeConfig.writeEntry("ShowDeleteCommand", m_showDeleteCommand->isChecked());
+ kdeConfig.sync();
+ }
+@@ -164,10 +153,6 @@
+ settings->setDefaults();
+
+ // TODO: reset default settings for trash and show delete command...
+- //KSharedConfig::Ptr konqConfig = KSharedConfig::openConfig("konquerorrc", KConfig::IncludeGlobals);
+- //KConfigGroup trashConfig(konqConfig, "Trash");
+- //KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
+- //KConfigGroup kdeConfig(globalConfig, "KDE");
+
+ loadSettings();
+ }
+@@ -199,6 +184,13 @@
+ m_splitView->setChecked(settings->splitView());
+ m_editableUrl->setChecked(settings->editableUrl());
+ m_filterBar->setChecked(settings->filterBar());
++
++ const KConfigGroup trashConfig(KGlobal::config(), "Trash");
++ m_confirmMoveToTrash->setChecked(trashConfig.readEntry("ConfirmTrash", false));
++ m_confirmDelete->setChecked(trashConfig.readEntry("ConfirmDelete", true));
++
++ const KConfigGroup kdeConfig(KGlobal::config(), "KDE");
++ m_showDeleteCommand->setChecked(kdeConfig.readEntry("ShowDeleteCommand", false));
+ }
+
+ #include "generalsettingspage.moc"
+--- a/apps/dolphin/src/generalviewsettingspage.h
++++ b/apps/dolphin/src/generalviewsettingspage.h
+@@ -23,6 +23,7 @@
+ #include <kvbox.h>
+
+ class DolphinMainWindow;
++class QCheckBox;
+ class QRadioButton;
+ class QSlider;
+ class QSpinBox;
+@@ -58,6 +59,7 @@
+ QRadioButton* m_globalProps;
+ QSlider* m_maxPreviewSize;
+ QSpinBox* m_spinBox;
++ QCheckBox* m_useFileThumbnails;
+ };
+
+ #endif
+--- a/apps/kwrite/kwritemain.cpp
++++ b/apps/kwrite/kwritemain.cpp
+@@ -182,7 +182,7 @@
+ a= actionCollection()->addAction( KStandardAction::KeyBindings, this, SLOT(editKeys()) );
+ a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
+
+- a = actionCollection()->addAction( KStandardAction::ConfigureToolbars, "set_configure_toolbars",
++ a = actionCollection()->addAction( KStandardAction::ConfigureToolbars, "options_configure_toolbars",
+ this, SLOT(editToolbars()) );
+ a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
+
+@@ -210,7 +210,7 @@
+ m_selectModeLabel = new QLabel( i18n(" LINE "), statusBar() );
+ statusBar()->addWidget( m_selectModeLabel, 0 );
+ m_selectModeLabel->setAlignment( Qt::AlignCenter );
+-
++
+ m_modeLabel = new QLabel( QString(), statusBar() );
+ statusBar()->addWidget( m_modeLabel, 0 );
+ m_modeLabel->setAlignment( Qt::AlignCenter );
+--- a/apps/doc/dolphin/index.docbook
++++ b/apps/doc/dolphin/index.docbook
+@@ -229,7 +229,7 @@
+ </para>
+
+ <para>
+-If this option is enabled then the workspace will split apart. Two seperate workspace areas will be available for use, along with two seperate location bars. Clicking on either workspace will make it the active workspace. If the user toggles the split workspace mode off, then the currently active workspace will remain, while the inactive workspace will close.
++If this option is enabled then the workspace will split apart. Two separate workspace areas will be available for use, along with two separate location bars. Clicking on either workspace will make it the active workspace. If the user toggles the split workspace mode off, then the currently active workspace will remain, while the inactive workspace will close.
+ </para>
+
+ <para>
+--- a/apps/lib/konq/konq_menuactions_p.h
++++ b/apps/lib/konq/konq_menuactions_p.h
+@@ -24,9 +24,9 @@
+ #include <kactioncollection.h>
+ #include <QActionGroup>
+ #include <QObject>
+-#include <kdesktopfileactions.h>
++#include <kserviceaction.h>
+
+-typedef QList<KDesktopFileActions::Service> ServiceList;
++typedef QList<KServiceAction> ServiceList;
+
+ class KonqMenuActionsPrivate : public QObject
+ {
+@@ -50,7 +50,7 @@
+ bool m_readOnly;
+
+ // TODO try action->setData(QVariant::fromValue(service))
+- QMap<QAction *, KDesktopFileActions::Service> m_mapPopupServices;
++ QMap<QAction *, KServiceAction> m_mapPopupServices;
+ QActionGroup m_executeServiceActionGroup;
+ KActionCollection m_ownActions; // TODO connect to statusbar for help on actions
+ };
+--- a/apps/lib/konq/konq_popupmenu.cpp
++++ b/apps/lib/konq/konq_popupmenu.cpp
+@@ -377,9 +377,9 @@
+ if (m_itemFlags & KParts::BrowserExtension::ShowNavigationItems)
+ {
+ if (m_itemFlags & KParts::BrowserExtension::ShowUp)
+- addNamedAction( "up" );
+- addNamedAction( "back" );
+- addNamedAction( "forward" );
++ addNamedAction( "go_up" );
++ addNamedAction( "go_back" );
++ addNamedAction( "go_forward" );
+ if (m_itemFlags & KParts::BrowserExtension::ShowReload)
+ addNamedAction( "reload" );
+ q->addSeparator();
+--- a/apps/lib/konq/tests/konqpopupmenutest.cpp
++++ b/apps/lib/konq/tests/konqpopupmenutest.cpp
+@@ -41,6 +41,7 @@
+ if (action->isSeparator()) {
+ ret.append("separator");
+ } else if (action->objectName().isEmpty()) {
++ //qDebug() << action->metaObject()->className();
+ Q_ASSERT(action->menu());
+ ret.append("submenu");
+ } else {
+@@ -66,11 +67,11 @@
+ m_pasteTo = KStandardAction::paste(0, 0, this);
+ m_actionCollection.addAction("pasteto", m_pasteTo);
+ m_back = new QAction(this);
+- m_actionCollection.addAction("back", m_back);
++ m_actionCollection.addAction("go_back", m_back);
+ m_forward = new QAction(this);
+- m_actionCollection.addAction("forward", m_forward);
++ m_actionCollection.addAction("go_forward", m_forward);
+ m_up = new QAction(this);
+- m_actionCollection.addAction("up", m_up);
++ m_actionCollection.addAction("go_up", m_up);
+ m_reload = new QAction(this);
+ m_actionCollection.addAction("reload", m_reload);
+ m_properties = new QAction(this);
+@@ -122,7 +123,7 @@
+ subMenu->addAction(m_up);
+ QStringList actions = extractActionNames(popup);
+ kDebug() << actions;
+- QCOMPARE(actions, QStringList() << "back" << "submenu");
++ QCOMPARE(actions, QStringList() << "go_back" << "submenu");
+ }
+
+ void KonqPopupMenuTest::testFile()
+@@ -237,7 +238,7 @@
+ actions.replaceInStrings("openwith", "openWith_submenu");
+ QCOMPARE(actions, QStringList()
+ << "newmenu" << "separator"
+- << "up" << "back" << "forward" << "separator"
++ << "go_up" << "go_back" << "go_forward" << "separator"
+ << "paste" << "separator"
+ << "openWith_submenu"
+ << "preview_submenu"
+@@ -307,7 +308,7 @@
+ QStringList actions = extractActionNames(popup);
+ kDebug() << actions;
+ QCOMPARE(actions, QStringList()
+- << "back" << "forward" << "reload" << "separator"
++ << "go_back" << "go_forward" << "reload" << "separator"
+ << "bookmark_add"
+ << "separator"
+ << "openWith_submenu"
+--- a/apps/lib/konq/konq_menuactions.cpp
++++ b/apps/lib/konq/konq_menuactions.cpp
+@@ -19,6 +19,7 @@
+
+ #include "konq_menuactions.h"
+ #include "konq_menuactions_p.h"
++#include <kdesktopfileactions.h>
+ #include <kmenu.h>
+ #include <klocale.h>
+ #include <kauthorized.h>
+@@ -118,7 +119,7 @@
+ int count = 0;
+ ServiceList::const_iterator it = list.begin();
+ for( ; it != list.end(); ++it ) {
+- if ((*it).isEmpty()) {
++ if ((*it).isSeparator()) {
+ const QList<QAction*> actions = menu->actions();
+ if (!actions.isEmpty() && !actions.last()->isSeparator()) {
+ menu->addSeparator();
+@@ -126,13 +127,13 @@
+ continue;
+ }
+
+- if (isBuiltin || (*it).m_display == true) {
++ if (isBuiltin || !(*it).noDisplay()) {
+ QAction* act = new QAction(&m_ownActions);
+- QString text = (*it).m_strName;
++ QString text = (*it).text();
+ text.replace('&',"&&");
+ act->setText( text );
+- if ( !(*it).m_strIcon.isEmpty() ) {
+- act->setIcon( KIcon((*it).m_strIcon) );
++ if ( !(*it).icon().isEmpty() ) {
++ act->setIcon( KIcon((*it).icon()) );
+ }
+ // act->setData(...);
+ m_executeServiceActionGroup.addAction(act);
+@@ -149,7 +150,7 @@
+
+ void KonqMenuActionsPrivate::slotExecuteService(QAction* act)
+ {
+- QMap<QAction *,KDesktopFileActions::Service>::Iterator it = m_mapPopupServices.find(act);
++ QMap<QAction *,KServiceAction>::Iterator it = m_mapPopupServices.find(act);
+ Q_ASSERT(it != m_mapPopupServices.end());
+ if (it != m_mapPopupServices.end()) {
+ KDesktopFileActions::executeService(m_urlList, it.value());
+--- a/apps/lib/konq/konq_popupmenu.h
++++ b/apps/lib/konq/konq_popupmenu.h
+@@ -75,7 +75,7 @@
+ * @param partFlags flags from the BrowserExtension enum, set by the calling part
+ *
+ * The actions to pass in include :
+- * showmenubar, back, forward, up, cut, copy, paste, pasteto, trash, rename, del
++ * showmenubar, go_back, go_forward, go_up, cut, copy, paste, pasteto, trash, rename, del
+ * The others items are automatically inserted.
+ *
+ * @todo that list is probably not be up-to-date
+--- a/apps/lib/konq/favicons/favicons.desktop
++++ b/apps/lib/konq/favicons/favicons.desktop
+@@ -90,7 +90,7 @@
+ Comment[ja]=ショートカットアイコンサポート
+ Comment[ka]=მალმხმობი ხატულების მხარდაჭერა
+ Comment[kk]=Жарлықтарды қолдау
+-Comment[km]=គាំទ្ររូបតំណាងផ្លូវកាត់
++Comment[km]=ការគាំទ្ររូបតំណាងផ្លូវកាត់
+ Comment[ko]=단축 아이콘 지원
+ Comment[lt]=Nuorodų ženkliukų palaikymas
+ Comment[lv]=Īsinājumikonu atbalsts
+--- a/apps/konsole/src/Part.cpp
++++ b/apps/konsole/src/Part.cpp
+@@ -84,6 +84,7 @@
+ _viewManager->widget()->setParent(parentWidget);
+
+ setWidget(_viewManager->widget());
++ actionCollection()->setAssociatedWidget(_viewManager->widget());
+
+ // create basic session
+ createSession(QString());
+--- a/apps/konsole/src/EditProfileDialog.cpp
++++ b/apps/konsole/src/EditProfileDialog.cpp
+@@ -402,6 +402,7 @@
+ const QFont& font = info->font();
+ updateFontPreviewLabel(font);
+ _ui->fontSizeSlider->setValue( font.pointSize() );
++ _ui->fontSizeSlider->setMinimum( KGlobalSettings::smallestReadableFont().pointSize() );
+
+ connect( _ui->fontSizeSlider , SIGNAL(valueChanged(int)) , this ,
+ SLOT(setFontSize(int)) );
+--- a/apps/konsole/src/ViewManager.cpp
++++ b/apps/konsole/src/ViewManager.cpp
+@@ -121,19 +121,19 @@
+ if ( collection )
+ {
+ KAction* splitLeftRightAction = new KAction( KIcon("view-left-right"),
+- i18n("Split View Left/Right"),
++ i18nc("@action:inmenu", "Split View Left/Right"),
+ this );
+ splitLeftRightAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_L) );
+ collection->addAction("split-view-left-right",splitLeftRightAction);
+ connect( splitLeftRightAction , SIGNAL(triggered()) , this , SLOT(splitLeftRight()) );
+
+ KAction* splitTopBottomAction = new KAction( KIcon("view-top-bottom") ,
+- i18n("Split View Top/Bottom"),this);
++ i18nc("@action:inmenu", "Split View Top/Bottom"),this);
+ splitTopBottomAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_T) );
+ collection->addAction("split-view-top-bottom",splitTopBottomAction);
+ connect( splitTopBottomAction , SIGNAL(triggered()) , this , SLOT(splitTopBottom()));
+
+- KAction* closeActiveAction = new KAction( i18n("Close Active") , this );
++ KAction* closeActiveAction = new KAction( i18nc("@action:inmenu Close Active View", "Close Active") , this );
+ closeActiveAction->setIcon(KIcon("view-remove"));
+ closeActiveAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_S) );
+ closeActiveAction->setEnabled(false);
+@@ -142,7 +142,7 @@
+
+ multiViewOnlyActions << closeActiveAction;
+
+- KAction* closeOtherAction = new KAction( i18n("Close Others") , this );
++ KAction* closeOtherAction = new KAction( i18nc("@action:inmenu Close Other Views", "Close Others") , this );
+ closeOtherAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_O) );
+ closeOtherAction->setEnabled(false);
+ collection->addAction("close-other-views",closeOtherAction);
+@@ -162,14 +162,14 @@
+ connect( detachViewAction , SIGNAL(triggered()) , this , SLOT(detachActiveView()) );
+
+ // Expand & Shrink Active View
+- KAction* expandActiveAction = new KAction( i18n("Expand View") , this );
++ KAction* expandActiveAction = new KAction( i18nc("@action:inmenu", "Expand View") , this );
+ expandActiveAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_BracketRight) );
+ collection->addAction("expand-active-view",expandActiveAction);
+ connect( expandActiveAction , SIGNAL(triggered()) , this , SLOT(expandActiveView()) );
+
+ multiViewOnlyActions << expandActiveAction;
+
+- KAction* shrinkActiveAction = new KAction( i18n("Shrink View") , this );
++ KAction* shrinkActiveAction = new KAction( i18nc("@action:inmenu", "Shrink View") , this );
+ shrinkActiveAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_BracketLeft) );
+ collection->addAction("shrink-active-view",shrinkActiveAction);
+ connect( shrinkActiveAction , SIGNAL(triggered()) , this , SLOT(shrinkActiveView()) );
+--- a/apps/konsole/src/Filter.cpp
++++ b/apps/konsole/src/Filter.cpp
+@@ -487,8 +487,8 @@
+
+ //regexp matches:
+ // full url:
+-// protocolname:// or www. followed by numbers, letters dots and dashes or the '@' character.
+-const QRegExp UrlFilter::FullUrlRegExp("([a-z]+://|www\\.)[^\\s]+");
++// protocolname:// or www. followed by anything other than whitespaces, >, ' or ", and ends before whitespaces, >, ), ', ", ] and . (dot)
++const QRegExp UrlFilter::FullUrlRegExp("(www\\.(?!\\.)|[a-z][a-z0-9+.-]*://)[^\\s>'\"]+[^\\.\\s>\\)'\"\\]]");
+ // email address:
+ // [word chars, dots or dashes]@[word chars, dots or dashes].[word chars]
+ const QRegExp UrlFilter::EmailAddressRegExp("(\\w|\\.|-)+@(\\w|\\.|-)+\\.\\w+");
+--- a/apps/konsole/desktop/kwrited.desktop
++++ b/apps/konsole/desktop/kwrited.desktop
+@@ -30,7 +30,7 @@
+ Name[ja]=KDE Write デーモン
+ Name[ka]=KDE Writed გუშაგი
+ Name[kk]=KDE Write қызметі
+-Name[km]=KDE សរសេរដេមិន
++Name[km]=ដេមិនសរសេររបស់ KDE
+ Name[ko]=KDE Write 데몬
+ Name[lt]=KDE Write tarnyba
+ Name[lv]=KDE Write Dēmons
+@@ -89,7 +89,7 @@
+ Comment[ja]= write(1) か wall(1) でローカルユーザから送信されたメッセージを監視
+ Comment[ka]=ბრძანება write(1) ან wall(1)-ით ლოკალური მომხმარებლებისგან გაგზავნილ შეტყობინებებს იღებს
+ Comment[kk]=Жергілікті пайдаланушылардан write(1) және wall(1) командалармен жіберілген хабарларды қабылдайды
+-Comment[km]=មើលសារពីអ្នកប្រើក្នុងមូលដ្ឋានដែលបានផ្ញើដោយប្រើ write(1) ឬ wall(1)
++Comment[km]=មើលសារពីអ្នកប្រើមូលដ្ឋានដែលបានផ្ញើដោយប្រើ write(1) ឬ wall(1)
+ Comment[ko]=write(1)이나 wall(1)을 통해 사용자가 보낸 메시지 감시
+ Comment[lt]=Stebėti vietinių naudotojų išsiųstus laiškus su write(1) arba wall(1)
+ Comment[lv]=Novēro ziņojumus no lokālajiem lietotājiem, kuri sūtīti izmantojot write(1) vai wall(1)
+--- a/apps/konsole/desktop/konsole.notifyrc
++++ b/apps/konsole/desktop/konsole.notifyrc
+@@ -6,6 +6,7 @@
+ Comment[et]=Konsool
+ Comment[hr]=Konzola
+ Comment[ka]=კონსოლი
++Comment[kk]=Терминал
+ Comment[km]=កុងសូល
+ Comment[lt]=Konsolė
+ Comment[mk]=Конзола
+@@ -38,7 +39,7 @@
+ Name[it]=Campanella in sessione visibile
+ Name[ja]=可視セッションのベル
+ Name[ka]=ხილული სესიისას ხმოვანი სიგნალი
+-Name[km]=កណ្ដឹងក្នុងសម័យដែលមើលឃើញ
++Name[km]=កណ្ដឹងនៅក្នុងសម័យដែលមើលឃើញ
+ Name[lt]=Skambutis matomose sesijose
+ Name[lv]=Zvans redzamā sesijā
+ Name[mk]=Ѕвонче во видлива сесија
+@@ -79,6 +80,7 @@
+ Comment[it]=Campanella suonata all'interno di una sessione visibile
+ Comment[ja]=可視セッションでベルが鳴りました
+ Comment[ka]=ხილულმა სესიისამ ხმოვანი სიგნალი გამოსცა
++Comment[km]=កណ្ដឹងដែលបានលុបនៅក្នុងសម័យដែលមើលឃើញ
+ Comment[lt]=Matomos sesijos metu skambutis neveiks
+ Comment[lv]=Zvans, kas zvanīts redzamā sesijā
+ Comment[mk]=Емитувано е ѕвонче внатре во видливата сесија
+@@ -163,6 +165,7 @@
+ Comment[it]=Campanella emessa all'interno di una sessione non visibile
+ Comment[ja]=不可視セッションでベルが鳴りました
+ Comment[ka]=უხილავმა სესიისამ ხმოვანი სიგნალი გამოსცა
++Comment[km]=កណ្ដឹងដែលបានលុបក្នុងសម័យដែលមើលមិនឃើញ
+ Comment[lt]=Nematomos sesijos metu skambutis neveiks
+ Comment[lv]=Zvans, kas zvanīts neredzamā sesijā
+ Comment[mk]=Емитувано е ѕвонче внатре во невидливата сесија
+@@ -205,7 +208,7 @@
+ Name[is]=Virkni í setunni sem fylgst er með
+ Name[it]=Attività in sessione sorvegliata
+ Name[ja]=監視中のセッションの活動
+-Name[km]=សកម្មភាពក្នុងសម័យដែមបានត្រួតពិនិត្យ
++Name[km]=សកម្មភាពក្នុងសម័យដែលបានត្រួតពិនិត្យ
+ Name[lt]=Stebimos sesijos veikla
+ Name[lv]=Aktivitāte monitorētā sesijā
+ Name[mk]=Активност во следената сесија
+@@ -370,7 +373,7 @@
+ Name[it]=Sessione completata con stato diverso da zero
+ Name[ja]=ゼロでないステータスでセッションが終了
+ Name[ka]=სეანსი დასრულდა ნულოვანი რეზულტატით
+-Name[km]=សម័យដែលបានបញ្ចប់ជាមួយស្ថានភាពមិនសូន្យ
++Name[km]=សម័យដែលបានបញ្ចប់ដោយស្ថានភាពមិនសូន្យ
+ Name[lt]=Sesija baigta ne nuliniu statusu
+ Name[lv]=Sesija beidzās ar nenulles statusu
+ Name[mk]=Сесијата заврши со ненулти статус
+@@ -410,7 +413,7 @@
+ Comment[it]=È terminata una sessione con un valore di stato diverso da zero
+ Comment[ja]=ゼロでないステータスでセッションが終了しました
+ Comment[ka]=სეანსი დასრულდა არანულოვანი რეზულტატით
+-Comment[km]=សម័យបានបិទជាមួយស្ថានភាពមិនសូន្យ
++Comment[km]=សម័យបានបិទដោយស្ថានភាពមិនសូន្យ
+ Comment[lt]=Sesija baigė darbą su nenuliniu rėžimu
+ Comment[lv]=Sesija beidzās ar nenulles statusu
+ Comment[mk]=Сесијата излезе со ненулти статус
+--- a/apps/konsole/desktop/konsolehere.desktop
++++ b/apps/konsole/desktop/konsolehere.desktop
+@@ -1,37 +1,10 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Type=Application
++Type=Service
+ ServiceTypes=inode/directory
+ Actions=openTerminalHere;
+ X-KDE-AuthorizeAction=shell_access
+
+-Name=Konsole
+-Name[bg]=Конзола
+-Name[ca]=Consola
+-Name[csb]=Kònsola
+-Name[el]=Κονσόλα
+-Name[eo]=Konzolo
+-Name[et]=Konsool
+-Name[eu]=Kontsola
+-Name[hr]=Konzola
+-Name[is]=Skjáhermir
+-Name[ka]=კონსოლი
+-Name[km]=កុងសូល
+-Name[mk]=Конзола
+-Name[nb]=Konsoll
+-Name[ne]=कन्सोल
+-Name[nn]=Konsoll
+-Name[pa]=ਕੰਨਸੋਲ
+-Name[pl]=Konsola
+-Name[ro]=Consolă
+-Name[ru]=Консоль
+-Name[se]=Konsolla
+-Name[sl]=Konzola
+-Name[ta]=கான்சோல்
+-Name[te]=కాన్సోల్
+-Name[tg]=Консол
+-Name[x-test]=xxKonsolexx
+-
+ [Desktop Action openTerminalHere]
+ Name=Open Terminal Here
+ Name[af]=Maak Terminaal Hier Oop
+--- a/apps/konsole/desktop/quick-access-konsole.desktop
++++ b/apps/konsole/desktop/quick-access-konsole.desktop
+@@ -16,6 +16,7 @@
+ Name[de]=Schnellzugrif auf Terminal
+ Name[el]=Τερματικό γρήγορης πρόσβασης
+ Name[es]=Terminal de acceso rápido
++Name[et]=Terminali kiirkasutamine
+ Name[fa]=پایانه دستیابی سریع
+ Name[he]=מסוף לגישה מהירה
+ Name[it]=Terminale ad accesso rapido
+--- a/apps/config-apps.h.cmake
++++ b/apps/config-apps.h.cmake
+@@ -70,13 +70,13 @@
+ #cmakedefine HAVE_VSNPRINTF 1
+
+ /* KDE's binaries directory */
+-#define KDE_BINDIR "${CMAKE_INSTALL_PREFIX}/bin"
++#define KDE_BINDIR "${BIN_INSTALL_DIR}"
+
+ /* KDE's configuration directory */
+-#define KDE_CONFDIR "${CMAKE_INSTALL_PREFIX}/share/config"
++#define KDE_CONFDIR "${CONFIG_INSTALL_DIR}"
+
+ /* KDE's static data directory */
+-#define KDE_DATADIR "${CMAKE_INSTALL_PREFIX}/share/apps"
++#define KDE_DATADIR "${DATA_INSTALL_DIR}"
+
+ /* Define where your java executable is */
+ #undef PATH_JAVA
+--- a/runtime/kuiserver/kuiserver.desktop
++++ b/runtime/kuiserver/kuiserver.desktop
+@@ -11,6 +11,7 @@
+ Comment[bg]=Сървър за интерфейса на KDE
+ Comment[de]=KDE-Dienst zur Fortschrittsanzeige
+ Comment[el]=Εξυπηρετητής πληροφοριών διεργασιών του KDE
++Comment[et]=KDE edenemisinfo graafiline server
+ Comment[fa]=کارساز واسط کاربر اطلاعات پیشرفت KDE
+ Comment[he]=שרת ממשק משתמש של KDE למידע לגבי התקדמות
+ Comment[ja]=KDE 進捗情報 UI サーバ
+--- a/runtime/knotify/knotify4.desktop
++++ b/runtime/knotify/knotify4.desktop
+@@ -16,13 +16,14 @@
+ Comment[de]=KDE Benachrichtigungsdienst
+ Comment[el]=Δαίμονας ειδοποιήσεων του KDE
+ Comment[es]=Servicio de notificaciones de KDE
++Comment[et]=KDE märguannete deemon
+ Comment[fa]=شبح اخطار KDE
+ Comment[ga]=Deamhan Fógartha KDE
+ Comment[he]=שירות ההודעות של KDE
+ Comment[it]=Demone delle notifiche di KDE
+ Comment[ja]=KDE 通知デーモン
+ Comment[kk]=KDE құлақтандыру қызметі
+-Comment[km]=ដេមិនការជូនដំណឹងរបស់ KDE
++Comment[km]=ដេមិនជូនដំណឹងរបស់ KDE
+ Comment[ko]=KDE 알림 데몬
+ Comment[nb]=KDEs varslingsnisse
+ Comment[nds]=KDE-Dämoon för Bescheden
+--- a/runtime/knotify/kde.notifyrc
++++ b/runtime/knotify/kde.notifyrc
+@@ -3,10 +3,12 @@
+ Comment=KDE System Notifications
+ Comment[be]=Сістэмныя абвяшчэнні KDE
+ Comment[el]=Ειδοποιήσεις συστήματος KDE
++Comment[et]=KDE süsteemsed märguanded
+ Comment[ga]=Fógairt an Chórais KDE
+ Comment[it]=Avvisi di sistema di KDE
+ Comment[ja]=KDE システム通知
+-Comment[km]=ការជូនដំណឹងប្រព័ន្ធ KDE
++Comment[kk]=KDE жүйелік құлақтандырулар
++Comment[km]=ការជូនដំណឹងប្រព័ន្ធរបស់ KDE
+ Comment[nb]=KDE systemvarsler
+ Comment[nds]=KDE-Systeembescheden
+ Comment[nl]=Systeemnotificaties (KDE)
+@@ -22,10 +24,11 @@
+ [Event/Trash: emptied]
+ Name=Trash: emptied
+ Name[el]=Απορρίμματα: άδειασαν
++Name[et]=Prügikast: tühjendatud
+ Name[ga]=Bruscar: folamh
+ Name[it]=Cestino: svuotato
+ Name[ja]=ごみ箱: 空
+-Name[km]=ធុងសំរាម ៖ សម្អាត
++Name[km]=ធុងសំរាម ៖ បានសម្អាត
+ Name[lt]=Šiukšliadėžė: ištuštinta
+ Name[nb]=Papirkurven tømt
+ Name[nds]=Affalltünn leddig maakt
+@@ -40,6 +43,7 @@
+ Name[zh_TW]=資源回收筒：已清空
+ Comment=The trash has been emptied
+ Comment[el]=Τα απορρίμματα άδειασαν
++Comment[et]=Prügikast on tühjendatud
+ Comment[ga]=Folmhaíodh an bruscar
+ Comment[it]=Il cestino è stato svuotato
+ Comment[ja]=ごみ箱を空にしました
+@@ -62,6 +66,7 @@
+ [Event/Textcompletion: rotation]
+ Name=Textcompletion: rotation
+ Name[el]=Συμπλήρωση κειμένου: περιστροφή
++Name[et]=Tekstilõpetus: rotatsioon
+ Name[it]=Completamento del testo: rotazione
+ Name[ja]=テキスト補完: 繰り返し
+ Name[km]=ការបំពេញអត្ថបទ ៖ ការបង្វិល
+@@ -79,9 +84,10 @@
+ Name[zh_TW]=文字補完：循環
+ Comment=The end of the list of matches has been reached
+ Comment[el]=Άφιξη στο τέλος της λίστας των ταιριασμάτων
++Comment[et]=Jõuti sobivuste nimekirja lõppu
+ Comment[it]=La fine della lista delle corrispondenze è stata raggiunta
+ Comment[ja]=マッチリストの終端に達しました
+-Comment[km]=បានទៅដល់ចុងបញ្ចប់នៃបញ្ជីនៃដំណូច
++Comment[km]=បានទៅដល់ចុងបញ្ជីនៃដំណូច
+ Comment[lt]=Pasiektas atitikmenų sąrašo galas
+ Comment[nb]=Kom til slutten av lista over treff
+ Comment[nds]=Bi't Enn vun list mit Drepers anlangt
+@@ -100,6 +106,7 @@
+ [Event/Textcompletion: no match]
+ Name=Textcompletion: no match
+ Name[el]=Συμπλήρωση κειμένου: κανένα ταίριασμα
++Name[et]=Tekstilõpetus: sobivused puuduvad
+ Name[it]=Completamento del testo: nessuna corrispondenza
+ Name[ja]=テキスト補完: マッチなし
+ Name[km]=ការបំពេញអត្ថបទ ៖ គ្មានដំណូច
+@@ -117,6 +124,7 @@
+ Name[zh_TW]=文字補完：沒有符合
+ Comment=No matching completion was found
+ Comment[el]=Δε βρέθηκε ταίριασμα για τη συμπλήρωση
++Comment[et]=Ühtegi sobivat lõpetust ei leitud
+ Comment[it]=Non è stata trovato nessun completamento corrispondente
+ Comment[ja]=マッチする補完は見つかりませんでした
+ Comment[km]=រកមិនឃើញការបំពេញដែលផ្គូផ្គង
+@@ -138,9 +146,10 @@
+ [Event/Textcompletion: partial match]
+ Name=Textcompletion: partial match
+ Name[el]=Συμπλήρωση κειμένου: μερικό ταίριασμα
++Name[et]=Tekstilõpetus: osaline sobivus
+ Name[it]=Completamento del testo: corrispondenza parziale
+ Name[ja]=テキスト補完: 部分的にマッチ
+-Name[km]=ការបំពេញអត្ថបទ ៖ ដំណូចផ្នែកខ្លះ
++Name[km]=ការបំពេញអត្ថបទ ៖ ដំណូចដោយផ្នែក
+ Name[lt]=Textcompletion: tinka dalinai
+ Name[nb]=Tekstfullføring:delvis treff
+ Name[nds]=Textkompletteren: Deeldreper
+@@ -154,9 +163,10 @@
+ Name[zh_TW]=文字補完：部份符合
+ Comment=There is more than one possible match
+ Comment[el]=Υπάρχει παραπάνω από ένα πιθανό ταίριασμα
++Comment[et]=Võimalikke sobivusi on enam kui üks
+ Comment[it]=C'è più di una corrispondenza possibile
+ Comment[ja]=マッチするものが複数あります
+-Comment[km]=មានដំណូចច្រើនជាងមួយដែលអាច
++Comment[km]=មានដំណូចច្រើនជាងមួយដែលអាចប្រើបាន
+ Comment[lt]=Yra daugiau negu vienas galimas atitikmuo
+ Comment[nb]=Det er mer enn ett mulig treff
+ Comment[nds]=Dat gifft mehr as een mööglichen Dreper
+@@ -175,8 +185,10 @@
+ Name=Fatal Error
+ Name[be]=Зруйнавальная памылка
+ Name[el]=Κρίσιμο σφάλμα
++Name[et]=Saatuslik viga
+ Name[it]=Errore fatale
+ Name[ja]=致命的なエラー
++Name[kk]=Түзелмейтін қате
+ Name[km]=កំហុសធ្ងន់ធ្ងរ
+ Name[lt]=Lemtinga klaida
+ Name[nb]=Kritisk feil
+@@ -192,9 +204,10 @@
+ Name[zh_TW]=嚴重錯誤
+ Comment=There was a serious error causing the program to exit
+ Comment[el]=Υπήρξε ένα σοβαρό σφάλμα που είχε σαν αποτέλεσμα τον τερματισμό του προγράμματος
++Comment[et]=Tekkis tõsine viga, mis sundis programmi tööd lõpetama
+ Comment[it]=C'è stato un errore serio che ha fatto terminare il programma
+ Comment[ja]=プログラムを終了させる深刻なエラーが発生しました
+-Comment[km]=មានកំហុសធ្ងន់ធ្ងរដែលបង្កឲ្យកម្មវិធីបិទ
++Comment[km]=មានកំហុសធ្ងន់ធ្ងរមួយដែលបង្កឲ្យកម្មវិធីបិទ
+ Comment[lt]=Įvyko rimta klaida, privertusi programą užbaigti darbą
+ Comment[nb]=Det oppsto em alvorlig feil som gjorde at programmet avsluttet
+ Comment[nds]=Dat geev en swoor Fehler, dat Programm is utstegen
+@@ -215,9 +228,11 @@
+ Name=Notification
+ Name[be]=Абвяшчэнні
+ Name[el]=Ειδοποίηση
++Name[et]=Märguanne
+ Name[ga]=Fógairt
+ Name[it]=Avvisi
+ Name[ja]=通知
++Name[kk]=Құлақтандыру
+ Name[km]=សេចក្តីជូនដំណឹង
+ Name[nb]=Varsling
+ Name[nds]=Bescheed
+@@ -232,9 +247,10 @@
+ Name[zh_TW]=通知
+ Comment=Something special happened in the program
+ Comment[el]=Εμφάνιση κάποιου ειδικού γεγονότος στο πρόγραμμα
++Comment[et]=Programmis juhtus midagi erilist
+ Comment[it]=È successo qualcosa di particolare nel programma
+ Comment[ja]=何か特別なことがプログラムに起こりました
+-Comment[km]=អ្វីពិសេសបានកើតឡើងក្នុងកម្មវិធី
++Comment[km]=មានអ្វីពិសេសបានកើតឡើងក្នុងកម្មវិធី
+ Comment[lt]=Kažkoks specialus įvykis programoje
+ Comment[nb]=Det hendte noe spesielt i programmet
+ Comment[nds]=Dat geev en afsünnerlich Begeefnis binnen dat Programm
+@@ -254,9 +270,11 @@
+ Name=Warning
+ Name[be]=Папярэджанне
+ Name[el]=Προειδοποίηση
++Name[et]=Hoiatus
+ Name[ga]=Rabhadh
+ Name[it]=Attenzione
+ Name[ja]=警告
++Name[kk]=Ескерту
+ Name[km]=ការព្រមាន
+ Name[lt]=Dėmesio
+ Name[nb]=Advarsel
+@@ -272,6 +290,7 @@
+ Name[zh_TW]=警告
+ Comment=There was an error in the program which may cause problems
+ Comment[el]=Υπήρξε ένα σφάλμα στο πρόγραμμα το οποίο μπορεί να προκαλέσει προβλήματα
++Comment[et]=Programmis tekkis viga, mis võib tekitada probleeme
+ Comment[it]=C'è stato un errore nel programma che potrebbe causare problemi
+ Comment[ja]=問題を引き起こす可能性のあるエラーがプログラムに発生しました
+ Comment[km]=មានកំហុសក្នុងកម្មវិធីដែលអាចបង្កបញ្ហា
+@@ -294,6 +313,7 @@
+ Name=Catastrophe
+ Name[be]=Катастрофа
+ Name[el]=Καταστροφή
++Name[et]=Katastroof
+ Name[ga]=Tubaiste
+ Name[it]=Catastrofe
+ Name[ja]=大惨事
+@@ -311,9 +331,10 @@
+ Name[zh_TW]=發生大災難
+ Comment=A very serious error occurred, at least causing the program to exit
+ Comment[el]=Συνέβη ένα πολύ σοβαρό σφάλμα, με αρχικό αποτέλεσμα την κατάρρευση του προγράμματος
++Comment[et]=Tekkis väga tõsine viga, mis sundis programmi tööd lõpetama
+ Comment[it]=Si è verificato un errore molto serio, che ha causato almeno l'uscita del programma
+ Comment[ja]=少なくともプログラムを終了させる非常に重大なエラーが発生しました
+-Comment[km]=កំហុសធ្ងន់ធ្ងរបំផុតបានកើតឡើង យ៉ាងហោចណាស់ វាបង្កឲ្យកម្មវិធីបិទ
++Comment[km]=កំហុសធ្ងន់ធ្ងរបំផុតបានកើតឡើង យ៉ាងហោចណាស់វាបង្កឲ្យកម្មវិធីបិទ
+ Comment[lt]=Įvyko labai rimta klaida, privertusi programą bent jau baigti darbą.
+ Comment[nb]=Det oppsto en meget alvorlig feil, som minst gjorde at programmet stoppet
+ Comment[nds]=Dat geev en groot Malöör, tominnst dat Programm is utstegen
+@@ -334,6 +355,7 @@
+ Name=Login
+ Name[be]=Уваход
+ Name[el]=Σύνδεση
++Name[et]=Sisselogimine
+ Name[ga]=Logáil Isteach
+ Name[ja]=ログイン
+ Name[km]=ចូល
+@@ -350,6 +372,7 @@
+ Comment=KDE is starting up
+ Comment[be]=KDE запускаецца
+ Comment[el]=Το KDE εκκινεί
++Comment[et]=KDE käivitumine
+ Comment[it]=KDE sta partendo
+ Comment[ja]=KDE 起動中
+ Comment[km]=KDE កំពុងចាប់ផ្ដើម
+@@ -371,6 +394,7 @@
+ Name=Logout
+ Name[be]=Выйсці
+ Name[el]=Αποσύνδεση
++Name[et]=Väljalogimine
+ Name[ga]=Logáil Amach
+ Name[ja]=ログアウト
+ Name[km]=ចេញ
+@@ -387,6 +411,7 @@
+ Comment=KDE is exiting
+ Comment[be]=Выхад з KDE
+ Comment[el]=Έξοδος από το KDE
++Comment[et]=KDE sulgemine
+ Comment[it]=KDE sta terminando
+ Comment[ja]=KDE 終了中
+ Comment[km]=KDE កំពុងបិទ
+@@ -407,6 +432,7 @@
+ [Event/cancellogout]
+ Name=Logout Canceled
+ Name[el]=Ακύρωση αποσύνδεσης
++Name[et]=Väljalogimine katkestatud
+ Name[ja]=ログアウトのキャンセル
+ Name[km]=បោះបង់ការចេញ
+ Name[nb]=Utlogging avbrutt
+@@ -422,6 +448,7 @@
+ Name[zh_TW]=登出已取消
+ Comment=KDE logout was canceled
+ Comment[el]=Η αποσύνδεση από το KDE ακυρώθηκε
++Comment[et]=KDEst väljalogimine katkestati
+ Comment[ja]=KDE からのログアウトがキャンセルされました
+ Comment[km]=ការចេញពី KDE ត្រូវបានបោះបង់
+ Comment[lt]=Išsiregistravimas iš KDE buvo nutrauktas
+@@ -442,6 +469,7 @@
+ Name=Print Error
+ Name[be]=Памылка друку
+ Name[el]=Σφάλμα εκτύπωσης
++Name[et]=Trükkimise viga
+ Name[ga]=Earráid Priontála
+ Name[it]=Errore di stampa
+ Name[ja]=印刷エラー
+@@ -459,6 +487,7 @@
+ Name[zh_TW]=列印錯誤
+ Comment=A print error has occurred
+ Comment[el]=Συνέβη ένα σφάλμα κατά την εκτύπωση
++Comment[et]=Trükkimisel tekkis viga
+ Comment[ga]=Tharla earráid priontála
+ Comment[it]=È capitato un errore di stampa
+ Comment[ja]=印刷エラーが発生しました
+@@ -482,6 +511,7 @@
+ Name=Information Message
+ Name[be]=Інфармацыйнае паведамленне
+ Name[el]=Μήνυμα πληροφοριών
++Name[et]=Info
+ Name[ga]=Teachtaireacht
+ Name[it]=Messaggio informativo
+ Name[ja]=情報メッセージ
+@@ -500,6 +530,7 @@
+ Name[zh_TW]=資訊訊息
+ Comment=An information message is being shown
+ Comment[el]=Εμφάνιση ενός μηνύματος πληροφοριών
++Comment[et]=Näidatakse infot
+ Comment[ga]=Teachtaireacht á taispeáint
+ Comment[it]=È stato mostrato un messaggio informativo
+ Comment[ja]=情報メッセージが表示されています
+@@ -524,6 +555,7 @@
+ Name=Warning Message
+ Name[be]=Паведамленне папярэджэння
+ Name[el]=Μήνυμα προειδοποίησης
++Name[et]=Hoiatus
+ Name[ga]=Rabhadh
+ Name[it]=Messaggio di attenzione
+ Name[ja]=警告メッセージ
+@@ -542,6 +574,7 @@
+ Name[zh_TW]=警告訊息
+ Comment=A warning message is being shown
+ Comment[el]=Εμφάνιση ενός μηνύματος προειδοποίησης
++Comment[et]=Näidatakse hoiatus
+ Comment[ga]=Rabhadh á thaispeáint
+ Comment[it]=È stato mostrato un messaggio di attenzione
+ Comment[ja]=警告メッセージが表示されています
+@@ -565,6 +598,7 @@
+ [Event/messageCritical]
+ Name=Critical Message
+ Name[el]=Κρίσιμο μήνυμα
++Name[et]=Kriitiline
+ Name[it]=Messaggio critico
+ Name[ja]=重大なメッセージ
+ Name[km]=សារសំខាន់បំផុត
+@@ -582,6 +616,7 @@
+ Name[zh_TW]=嚴重訊息
+ Comment=A critical message is being shown
+ Comment[el]=Εμφάνιση ενός κρίσιμου μηνύματος
++Comment[et]=Näidatakse kriitilist teadet
+ Comment[it]=È stato mostrato un messaggio critico
+ Comment[ja]=重大なメッセージが表示されています
+ Comment[km]=សារសំខាន់បំផុតកំពុងត្រូវបានបង្ហាញ
+@@ -605,6 +640,7 @@
+ Name=Question
+ Name[be]=Пытанне
+ Name[el]=Ερώτηση
++Name[et]=Küsimus
+ Name[ga]=Ceist
+ Name[it]=Domanda
+ Name[ja]=質問
+@@ -623,6 +659,7 @@
+ Name[zh_TW]=詢問
+ Comment=A question is being asked
+ Comment[el]=Γίνεται κάποια ερώτηση
++Comment[et]=Esitatakse küsimus
+ Comment[it]=È stata posta una domanda
+ Comment[ja]=質問が出されています
+ Comment[km]=សំណួរកំពុងត្រូវបានសួរ
+@@ -646,6 +683,7 @@
+ Name=Beep
+ Name[be]=Гукавы сігнал
+ Name[el]=Ηχητικό σήμα
++Name[et]=Piiks
+ Name[ga]=Bíp
+ Name[it]=Bip
+ Name[ja]=ビープ
+@@ -664,9 +702,10 @@
+ Comment=Sound bell
+ Comment[be]=Гукавы званок
+ Comment[el]=Κουδούνισμα
++Comment[et]=Kellaheli
+ Comment[it]=Campanella udibile
+ Comment[ja]=サウンドベル
+-Comment[km]=សំលេងកណ្ដឹង
++Comment[km]=សំឡេងកណ្ដឹង
+ Comment[nb]=Lydsignal
+ Comment[nds]=Klangpingel
+ Comment[nl]=Geluidssignaal
+--- a/runtime/kfile/CMakeLists.txt
++++ b/runtime/kfile/CMakeLists.txt
+@@ -1,19 +1,11 @@
+-
+-########### next target ###############
++########### kfile4 ###############
++# Named this way to fix conflict with kdelibs3.
++# Distros can add a kfile symlink if kdelibs3 isn't installed.
+
+ set(kfile_SRCS fileprops.cpp )
+
++kde4_add_executable(kfile4 NOGUI ${kfile_SRCS})
+
+-kde4_add_executable(kfile NOGUI ${kfile_SRCS})
+-
+-target_link_libraries(kfile ${KDE4_KIO_LIBS} )
+-
+-install(TARGETS kfile DESTINATION ${BIN_INSTALL_DIR} )
+-
+-
+-########### install files ###############
+-
+-
+-
+-
++target_link_libraries(kfile4 ${KDE4_KIO_LIBS} )
+
++install(TARGETS kfile4 DESTINATION ${BIN_INSTALL_DIR} )
+--- a/runtime/kcontrol/locale/language.desktop
++++ b/runtime/kcontrol/locale/language.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Exec=kcmshell language
++Exec=kcmshell4 language
+ Icon=preferences-desktop-locale
+ Type=Service
+ ServiceTypes=KCModule
+@@ -107,7 +107,7 @@
+ Comment[ja]=地域特有の言語と数値や日付書式を設定
+ Comment[ka]=თქვენი რეგიონისთვის ენის, თარიღის და ციფრული ფორმატის კონფიგურაცია
+ Comment[kk]=Өлкеңіздің тіл, сан және уақыт пішімін орнату
+-Comment[km]=ការកំណត់ភាសា, លេខ, និងពេលវេលាសម្រាប់តំបន់ពិសេសរបស់អ្នក
++Comment[km]=ការកំណត់ភាសា លេខ និងពេលវេលាសម្រាប់តំបន់ពិសេសរបស់អ្នក
+ Comment[ko]=살고 있는 지역의 언어, 수, 시간 설정
+ Comment[lt]=Kalba, skaitiniai ir laiko nustatymai Jūsų individualiam regionui
+ Comment[lv]=Valodas, numuru, un laika uzstādījumi jūsu konkrētajam reģionam
+@@ -167,7 +167,7 @@
+ Keywords[is]=tungumál,þýðing,númer,gjaldeyrir,klukka,tími,dagsetning,staðværar stillingar,locale,land,stafatöflur,stafróf,jákvætt,neikvætt, jákvæð,neiðkvæð,brot,tugabrot,vika,helgi,vikudagur,vikudagar
+ Keywords[it]=lingua,traduzione,formato numeri,moneta,valuta,ora,data,formati,impostazioni nazionali,paese,charset,insieme di caratteri,virgola,separatore migliaia,simbolo,separatore,segno,più,meno,cifre decimali,settimana,inizio settimana
+ Keywords[ja]=言語,翻訳,数値の書式,通貨,時刻,日付,フォーマット,地域,国,文字コード,文字セット,小数点,1000での区切り,記号,区切り文字,符号,正数,負数,小数桁数,週,週初
+-Keywords[km]=ភាសា,ការបកប្រែ,ទ្រង់ទ្រាយលេខ,រូបិយប័ណ្ណ,ពេលវេលា,កាលបរិច្ឆេទ,ទ្រង់ទ្រាយ,មូលដ្ឋាន,ប្រទេស,សំណុំតួអក្សរ,សំណុំតួអក្សរ,និមិត្តសញ្ញាគោលដប់,ឧបករណ៍បំបែកខ្ទង់ពាន់,និមិត្តសញ្ញា,ឧបករណ៍បំបែក,សញ្ញា,វិជ្ជមាន,អវិជ្ជមាន,តួលេខប្រភាគ,សប្ដាហ៍,សប្ដាហ៍ចាប់ផ្ដើម
++Keywords[km]=ភាសា ការបកប្រែ ទ្រង់ទ្រាយលេខ រូបិយប័ណ្ណ ពេលវេលា កាលបរិច្ឆេទ ទ្រង់ទ្រាយ មូលដ្ឋាន ប្រទេស តួអក្សរ សំណុំតួអតួអក្ស និមិត្តសញ្ញាគ លដប់,ឧបករណ៍បំបែកខ្ទង់ ពាន់,និមិត្ត ញ្ញា,ឧបករណ៍ ំបែក, ញ្ញា,វិជ មាន,អវិជ ជមាន,តួលេខប រភាគ,សប ដាហ៍,សប្ដាហ៍ចាប់ផ្ដើម
+ Keywords[ko]=언어,번역,숫자 형식,통화,돈,시간,날짜,로케일,국가,문자, 천 단위 구분자, 소수점 기호,구분자,부호,주,주 시작
+ Keywords[lt]=language,translation,number format,currency,time,date,formats,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,week,week start,kalba,vertimas,skaičių formatas,valiuta,laikas,data,formatai,lokalė,Šalis,koduotės,kodavimai,Dešimtainis simbolis,Tūkstančių skirtukas,simbolis,skirtukas,požymis,teigiamas,neigiamas,trupmenų skaitmenys,savaitė,savaitės pradžia
+ Keywords[lv]=valoda,tulkojums,numuru formāts,valūta,laiks,datums,formāts,lokāle,Valsts,čārsets,simbolu komplekts,Decimāl simbols,Tūkstošu atdalītājs,simbols,atdalītājs,zīme,pozitīvs,negatīvs,frakciju cipari,nedēļa,nedēļa sākas
+--- a/runtime/kcontrol/knotify/knotify.cpp
++++ b/runtime/kcontrol/knotify/knotify.cpp
+@@ -79,6 +79,7 @@
+ m_appCombo = new KComboBox( false, app_tab );
+ m_appCombo->setObjectName( "app combo" );
+ QHBoxLayout *hbox = new QHBoxLayout();
++ hbox->setSpacing( KDialog::spacingHint() );
+ app_layout->addItem( hbox );
+ hbox->addWidget( label );
+ hbox->addWidget( m_appCombo, 10 );
+@@ -113,7 +114,7 @@
+
+ load();
+
+-
++ m_notifyWidget->setApplication( m_appCombo->currentText() );
+ }
+
+ KCMKNotify::~KCMKNotify()
+--- a/runtime/kcontrol/knotify/kcmnotify.desktop
++++ b/runtime/kcontrol/knotify/kcmnotify.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Exec=kcmshell kcmnotify
++Exec=kcmshell4 kcmnotify
+ Icon=preferences-desktop-notification
+ Type=Service
+ ServiceTypes=KCModule
+@@ -170,7 +170,7 @@
+ Keywords[it]=Suoni di sistema,Audio,Suono,Notifica,Avvisi,Messaggi
+ Keywords[ja]=システムサウンド,オーディオ,サウンド,通知, アラート,通知
+ Keywords[ka]=სისტემის ხმები,აუდიო,ხმა,შეტყობინება,განგაში,შეტყობინება
+-Keywords[km]=សំឡេងប្រព័ន្ធ,អូឌីយ៉ូ,សំឡេង,ជូនដំណឹង,ជូនដំណឹង,ការជូនដំណឹង
++Keywords[km]=សំឡេងប្រព័ន្ធ អូឌីយ៉ូ សំឡេង ជូនដំណឹង ជូនដំណឹង ការជូនដំណឹង
+ Keywords[ko]=시스템 소리,오디오,알림,경고
+ Keywords[lt]=Sistemos garsai,Audio,Garsas,Pranešimas,Perspėjimai
+ Keywords[lv]=Sistēmas skaņas,Audio,Skaņa,Paziņo,Brīdinājumi,Paziņošana
+--- a/runtime/kcontrol/samba/smbstatus.desktop
++++ b/runtime/kcontrol/samba/smbstatus.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Exec=kcmshell smbstatus
++Exec=kcmshell4 smbstatus
+ Icon=preferences-system-network-share-windows-status
+ Type=Service
+ ServiceTypes=KCModule
+@@ -166,7 +166,7 @@
+ Keywords[is]=Netdrif,windows net,kerfi,upplýsingar
+ Keywords[it]=SMB,SAMBA,Rete Windows,LAN,Rete locale,Informazioni sul sistema
+ Keywords[ja]=SMB,SAMBA,Windowsネットワーク,LAN,システムの情報
+-Keywords[km]=SMB,SAMBA,បណ្ដាញវីនដូ,LAN,ព័ត៌មានប្រព័ន្ធ
++Keywords[km]=SMB SAMBA បណ្ដាញវីនដូ LAN ព័ត៌មានប្រព័ន្ធ
+ Keywords[ko]=SMB,윈도 네트워크,LAN,시스템 정보
+ Keywords[lt]=SMB,SAMBA,Windows tinklas,LAN,Sistemos Informacija
+ Keywords[lv]=SMB,SAMBA,Windows tīkls,LAN,Sistēmas Informācija
+--- a/runtime/kcontrol/componentchooser/componentchooser.desktop
++++ b/runtime/kcontrol/componentchooser/componentchooser.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Exec=kcmshell componentchooser
++Exec=kcmshell4 componentchooser
+ Icon=preferences-desktop-default-applications
+ Type=Service
+ ServiceTypes=KCModule
+@@ -17,6 +17,7 @@
+ Name[de]=Standard-Komponenten
+ Name[el]=Προκαθορισμένες εφαρμογές
+ Name[es]=Aplicaciones predefinidas
++Name[et]=Vaikimisi rakendused
+ Name[fa]=کاربردهای پیشفرض
+ Name[ga]=Feidhmchláir Réamhshocraithe
+ Name[he]=תוכניות ברירת מחדל
+@@ -111,12 +112,13 @@
+ Keywords[de]=Komponenten,Ressourcen,E-Mail,E-Mail-Programm,Terminal-Emulation,Programme,Anwendungen
+ Keywords[el]=συστατικά,επιλογέας συστατικών,πόροι, πελάτης email, email,προσομοιωτής τερματικού,εφαρμογές
+ Keywords[es]=componentes,selector de componentes,recursos,correo electrónico,cliente de correo,emulador de terminal,aplicaciones
++Keywords[et]=komponendid,komponentide valija,ressursid,e-post,e-posti klient,terminaliemulaator,rakendused
+ Keywords[fa]=مؤلفهها، انتخابگر مؤلفه، منابع، رایانامه، کارخواه رایانامه، مقلد رایانه، کاربردها
+ Keywords[ga]=comhpháirteanna,roghnóir comhpháirte,acmhainní,ríomhphost,cliant ríomhphoist,aithriseoir teirminéil
+ Keywords[he]=רכיבים,בוחר הרכיבים,משאבים,תוכנית דוא"ל ,הדמיית מסוף,components,component chooser, resources, email client, terminal emulator
+ Keywords[it]=componenti,scelta componenti,risorse,email,client di posta,posta elettronica,terminale,emulatore di terminale,applicazioni
+ Keywords[ja]=コンポーネント,選択,リソース,Eメール,クライアント,ターミナルエミュレータ,アプリケーション
+-Keywords[km]=សមាសភាគ,កម្មវិធីជ្រើសសមាសភាគ,ធនធាន,អ៊ីមែល,កម្មវិធីអ៊ីមែល,កម្មវិធីត្រាប់តាមស្ថានីយ,កម្មវិធី
++Keywords[km]=សមាសភាគ កម្មវិធីជ្រើសសមាសភាគ ធនធាន អ៊ីមែល កម្មវិធីអ៊ីមែល កម្មវិធីត្រាប់តាមស្ថានីយ កម្មវិធី
+ Keywords[ko]=컴포넌트,구성 요소,리소스,전자우편,터미널 에뮬레이터,프로그램
+ Keywords[nb]=komponenter,komponentvelger,ressurser,e-post,e-postprogram,terminalemulator, programmer
+ Keywords[nds]=Komponenten,Komponenten utsöken,Ressourcen,E-Mail-Client,Nettpost-Programm,Terminalemulater,Programmen
+--- a/runtime/kcontrol/componentchooser/EXAMPLE.desktop
++++ b/runtime/kcontrol/componentchooser/EXAMPLE.desktop
+@@ -27,7 +27,7 @@
+ Name[ja]=あなたのインターフェースに素敵な名前を付けてください
+ Name[ka]=მშვენიერი სახელია ინტერფეისისთვის
+ Name[kk]=Интерфейсіңізге таңдаған атауыңыз
+-Name[km]=ឈ្មោះដ៏ល្អមួយ ដែលអ្នកបានជ្រើសសម្រាប់ចំណុចប្រទាក់របស់អ្នក
++Name[km]=ឈ្មោះដ៏ល្អមួយដែលអ្នកបានជ្រើសសម្រាប់ចំណុចប្រទាក់របស់អ្នក
+ Name[ko]=인터페이스에 지정할 이름
+ Name[lt]=Gražus vardas, kurį Jūs pasirinkote savo sąsajai
+ Name[lv]=Jauks nosaukums, ko Jūs izvelējāties savam interfeisam
+--- a/runtime/kcontrol/componentchooser/componentservices/kcm_kemail.desktop
++++ b/runtime/kcontrol/componentchooser/componentservices/kcm_kemail.desktop
+@@ -93,7 +93,7 @@
+ Comment[ja]=ここで標準のメールクライアントを設定します。メールクライアントを必要とするすべての KDE アプリケーションは、この設定に従います。
+ Comment[ka]=აქ შეიძლება სტანდარტული საფოსტო კლიენტის დაკონფიგურირება. KDE-ს ყველა პროგრამა, ვისაც სჭირდება ფოსტა, გაითვალისწინებენ ამ პარამეტრს
+ Comment[kk]=Мұнда Сіз әдетті эл.пошта клиентін таңдай аласыз. Бүкіл KDE қолданбаларда эл.пошта керек болғанда осы таңдау қолданылады.
+-Comment[km]=សេវានេះអនុញ្ញាតឲ្យអ្នកកំណត់រចនាសម្ព័ន្ធកម្មវិធីអ៊ីមែលលំនាំដើមរបស់អ្នក ។ កម្មវិធី KDE ទាំងអស់ដែលតម្រូវឲ្យចូលដំណើរការទៅកាន់កម្មវិធីអ៊ីមែលគួរគោរពតាមការកំណត់នេះ ។
++Comment[km]=សេវានេះអនុញ្ញាតឲ្យអ្នកកំណត់រចនាសម្ព័ន្ធកម្មវិធីអ៊ីមែលលំនាំដើមរបស់អ្នក ។ កម្មវិធី KDE ទាំងអស់ដែលតម្រូវឲ្យចូលដំណើរការទៅកាន់កម្មវិធីអ៊ីមែលគួរគោរពតាមការកំណត់នេះ ។
+ Comment[lt]=Ši tarnyba leidžia jums nustatyti Jūsų numatytą pašto klientą. Visos KDE programos, kurioms reikia e. pašto kliento programos, turėtų atsižvelgti į šį nustatymą.
+ Comment[lv]=Šis servis ļauj Jums konfigurēt noklusējuma epasta klientu. Visas KDE aplikācijas, kurām ir nepieciešams epasts, izmantos šo parametru.
+ Comment[mk]=Овој сервис ви овозможува да го конфигурирате вашиот стандарден клиент за електронска пошта. Сите KDE-апликации на кои им е потребен пристап до електронска пошта ќе ги почитуваат овие поставувања.
+--- a/runtime/kcontrol/componentchooser/componentservices/kcm_browser.desktop
++++ b/runtime/kcontrol/componentchooser/componentservices/kcm_browser.desktop
+@@ -13,7 +13,7 @@
+ Name[el]=Περιηγητής ιστού
+ Name[eo]=TTT-legilo
+ Name[es]=Navegador Web
+-Name[et]=Veebilehitseja
++Name[et]=Veebibrauser
+ Name[eu]=Web arakatzailea
+ Name[fa]=مرورگر وب
+ Name[fi]=WWW-selain
+@@ -78,7 +78,7 @@
+ Comment[en_GB]=Here you can configure your default web browser. All KDE applications in which you can select hyperlinks should honour this setting.
+ Comment[eo]=Tiu servo ebligas, ke vi elektas vian norman vidigilon. Ĉiuj KDEa aplikaĵoj, kiuj necesas vidigilon, uzos tiun agordon.
+ Comment[es]=Este servicio le permite configurar su navegador de Internet predeterminado. Todas las aplicaciones KDE que precisan acceso a hiperenlaces deberían reconocer esta opción.
+-Comment[et]=Siin saab seadistada vaikimisi kasutatavat veebilehitsejat. Kõik KDE rakendused, kus saab valida hüperlinke, peaksid siinsete seadistustega arvestama.
++Comment[et]=Siin saab seadistada vaikimisi kasutatavat brauserit. Kõik KDE rakendused, kus saab valida hüperlinke, peaksid siinsete seadistustega arvestama.
+ Comment[eu]=Hemen zure web arakatzaile lehenetsia konfigura dezakezu. Aukera honek estekak darabiltzaten KDEren aplikazio guztiei eragin behar die.
+ Comment[fa]=در اینجا میتوانید مرورگر وب پیشفرض خود را پیکربندی کنید. همۀ کاربردهای KDE که میتوانید ابرپیوندها را در آن گزینش کنید، باید این تنظیمات را قبول کنند.
+ Comment[fi]=Tämän palvelun avulla voit määritellä oletusselaimen. Kaikki selainta käyttävät KDE-sovellukset huomioivat tämän asetuksen.
+@@ -93,7 +93,7 @@
+ Comment[ja]=ここで標準のウェブブラウザを設定します。ハイパーリンクの選択が可能なすべての KDE アプリケーションは、この設定に従います。
+ Comment[ka]=აქ შეიძლება სტანდარტული ვებ ბრაუზერის დაკონფიგურირება. KDE-ს ყველა პროგრამა, ვისაც შეუძლია ბმულების გამოძახება, გაითვალისწინებენ ამ პარამეტრს
+ Comment[kk]=Мұнда Сіз әдетті веб-шолғышыңызды таңдай аласыз. Бүкіл KDE қолданбаларда гиперсілтемелерді түрткенде осы таңдау қолданылады.
+-Comment[km]=នៅទីនេះ អ្នកអាចកំណត់រចនាសម្ព័ន្ធកម្មវិធីរុករកបណ្ដាញលំនាំដើមរបស់អ្នក ។ កម្មវិធី KDE ទាំងអស់ដែលអ្នកអាចជ្រើសតំណខ្ពស់ គួរតែគោរពតាមការកំណត់នេះ ។
++Comment[km]=នៅទីនេះ អ្នកអាចកំណត់រចនាសម្ព័ន្ធកម្មវិធីរុករកបណ្ដាញលំនាំដើមរបស់អ្នក ។ កម្មវិធី KDE ទាំងអស់ដែលអ្នកអាចជ្រើសតំណខ្ពស់ គួរតែគោរពតាមការកំណត់នេះ ។
+ Comment[ko]=여기에서 기본 웹 브라우저를 설정할 수 있습니다. 모든 KDE 프로그램에서 하이퍼링크를 처리하려면 이 설정을 따라야 합니다.
+ Comment[lt]=Ši tarnyba leidžia jums nustatyti Jūsų numatytą žiniatinklio naršyklę. Visos KDE programos, kuriose galima spragtelėti hipersaitus, turi atsižvelgti į šį nustatymą.
+ Comment[lv]=Šeit Jūs varat konfigurēt noklusējuma tīmekļa pārlūkprogrammu. Visas KDE aplikācijas, kurās Jūs varat klikšķināt uz hipersaitēm, izmantos šo parametru.
+--- a/runtime/kcontrol/kded/kcmkded.cpp
++++ b/runtime/kcontrol/kded/kcmkded.cpp
+@@ -17,28 +17,26 @@
+ Boston, MA 02110-1301, USA.
+ */
+
+-#include <Qt3Support/Q3GroupBox>
+-#include <Qt3Support/Q3Header>
++#include "kcmkded.h"
+
+ #include <QByteArray>
+ #include <QtDBus/QtDBus>
+-#include <QLayout>
++#include <QGroupBox>
++#include <QHeaderView>
+ #include <QPushButton>
+ #include <QTimer>
++#include <QTreeWidget>
+ #include <QVBoxLayout>
+
+ #include <kaboutdata.h>
+-#include <kapplication.h>
+ #include <kdialogbuttonbox.h>
+ #include <kdebug.h>
+ #include <kdesktopfile.h>
+ #include <kdialog.h>
+-#include <k3listview.h>
+ #include <kmessagebox.h>
+ #include <kservice.h>
+ #include <kstandarddirs.h>
+
+-#include "kcmkded.h"
+ #include <KPluginFactory>
+ #include <KPluginLoader>
+ #include "kcmkded.moc"
+@@ -48,6 +46,7 @@
+ )
+ K_EXPORT_PLUGIN(KDEDFactory("kcmkded"))
+
++static const int LibraryRole = Qt::UserRole + 1;
+
+ KDEDConfig::KDEDConfig(QWidget* parent, const QVariantList &) :
+ KCModule( KDEDFactory::componentData(), parent )
+@@ -74,43 +73,57 @@
+ lay->setMargin( 0 );
+ lay->setSpacing( KDialog::spacingHint() );
+
+- Q3GroupBox *gb = new Q3GroupBox(1, Qt::Vertical, i18n("Load-on-Demand Services"), this );
++ QGroupBox *gb = new QGroupBox( i18n("Load-on-Demand Services"), this );
+ gb->setWhatsThis( i18n("This is a list of available KDE services which will "
+ "be started on demand. They are only listed for convenience, as you "
+ "cannot manipulate these services."));
+ lay->addWidget( gb );
+
+- _lvLoD = new K3ListView( gb );
+- _lvLoD->addColumn(i18n("Service"));
+- _lvLoD->addColumn(i18n("Description"));
+- _lvLoD->addColumn(i18n("Status"));
++ QVBoxLayout *gblay = new QVBoxLayout( gb );
++
++ _lvLoD = new QTreeWidget( gb );
++ QStringList cols;
++ cols.append( i18n("Service") );
++ cols.append( i18n("Description") );
++ cols.append( i18n("Status") );
++ _lvLoD->setHeaderLabels( cols );
+ _lvLoD->setAllColumnsShowFocus(true);
+- _lvLoD->header()->setStretchEnabled(true, 1);
++ _lvLoD->setRootIsDecorated( false );
++ //_lvLoD->header()->setStretchEnabled(true, 1);
++ gblay->addWidget( _lvLoD );
+
+- gb = new Q3GroupBox(1, Qt::Horizontal, i18n("Startup Services"), this );
++ gb = new QGroupBox( i18n("Startup Services"), this );
+ gb->setWhatsThis( i18n("This shows all KDE services that can be loaded "
+ "on KDE startup. Checked services will be invoked on next startup. "
+ "Be careful with deactivation of unknown services."));
+ lay->addWidget( gb );
+
+- _lvStartup = new K3ListView( gb );
+- _lvStartup->addColumn(i18n("Use"));
+- _lvStartup->addColumn(i18n("Service"));
+- _lvStartup->addColumn(i18n("Description"));
+- _lvStartup->addColumn(i18n("Status"));
++ gblay = new QVBoxLayout( gb );
++
++ _lvStartup = new QTreeWidget( gb );
++ cols.clear();
++ cols.append( i18n("Use") );
++ cols.append( i18n("Service") );
++ cols.append( i18n("Description") );
++ cols.append( i18n("Status") );
++ _lvStartup->setHeaderLabels( cols );
+ _lvStartup->setAllColumnsShowFocus(true);
+- _lvStartup->header()->setStretchEnabled(true, 2);
++ _lvStartup->setRootIsDecorated( false );
++ //_lvStartup->header()->setStretchEnabled(true, 2);
++ gblay->addWidget( _lvStartup );
+
+ KDialogButtonBox *buttonBox = new KDialogButtonBox( gb, Qt::Horizontal);
+ _pbStart = buttonBox->addButton( i18n("Start") , QDialogButtonBox::ActionRole );
+ _pbStop = buttonBox->addButton( i18n("Stop") , QDialogButtonBox::ActionRole );
++ gblay->addWidget( buttonBox );
+
+ _pbStart->setEnabled( false );
+ _pbStop->setEnabled( false );
+
+ connect(_pbStart, SIGNAL(clicked()), SLOT(slotStartService()));
+ connect(_pbStop, SIGNAL(clicked()), SLOT(slotStopService()));
+- connect(_lvStartup, SIGNAL(selectionChanged(Q3ListViewItem*)), SLOT(slotEvalItem(Q3ListViewItem*)) );
++ connect(_lvStartup, SIGNAL(itemClicked(QTreeWidgetItem*, int)), SLOT(slotEvalItem(QTreeWidgetItem*)) );
++ connect(_lvStartup, SIGNAL(itemChanged(QTreeWidgetItem*, int)), SLOT(slotItemChecked(QTreeWidgetItem*)) );
+
+ load();
+ }
+@@ -152,38 +165,39 @@
+ KStandardDirs::Recursive | KStandardDirs::NoDuplicates,
+ files );
+
+- Q3ListViewItem* item = 0L;
+- CheckListItem* clitem;
++ QTreeWidgetItem* treeitem = 0L;
+ for ( QStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) {
+
+ if ( KDesktopFile::isDesktopFile( *it ) ) {
+ KDesktopFile file( "services", *it );
+
+ if ( file.desktopGroup().readEntry("X-KDE-Kded-autoload", false) ) {
+- clitem = new CheckListItem(_lvStartup, QString());
+- connect(clitem, SIGNAL(changed(Q3CheckListItem*)), SLOT(slotItemChecked(Q3CheckListItem*)));
+- clitem->setOn(autoloadEnabled(&kdedrc, *it));
+- item = clitem;
+- item->setText(1, file.readName());
+- item->setText(2, file.readComment());
+- item->setText(3, NOT_RUNNING);
+- item->setText(4, file.desktopGroup().readEntry("X-KDE-Library"));
++ treeitem = new QTreeWidgetItem();
++ treeitem->setCheckState( 0, autoloadEnabled(&kdedrc, *it) ? Qt::Checked : Qt::Unchecked );
++ treeitem->setText( 1, file.readName() );
++ treeitem->setText( 2, file.readComment() );
++ treeitem->setText( 3, NOT_RUNNING );
++ treeitem->setData( 1, LibraryRole, file.desktopGroup().readEntry("X-KDE-Library") );
++ _lvStartup->addTopLevelItem( treeitem );
+ }
+ else if ( file.desktopGroup().readEntry("X-KDE-Kded-load-on-demand", false) ) {
+- item = new Q3ListViewItem(_lvLoD, file.readName());
+- item->setText(1, file.readComment());
+- item->setText(2, NOT_RUNNING);
+- item->setText(4, file.desktopGroup().readEntry("X-KDE-Library"));
++ treeitem = new QTreeWidgetItem();
++ treeitem->setText( 0, file.readName() );
++ treeitem->setText( 1, file.readComment() );
++ treeitem->setText( 2, NOT_RUNNING );
++ treeitem->setData( 0, LibraryRole, file.desktopGroup().readEntry( "X-KDE-Library" ) );
++ _lvLoD->addTopLevelItem( treeitem );
+ }
+ }
+ }
++ _lvStartup->resizeColumnToContents( 0 );
++ _lvStartup->resizeColumnToContents( 1 );
++ _lvLoD->resizeColumnToContents( 0 );
+
+ getServiceStatus();
+ }
+
+ void KDEDConfig::save() {
+- Q3CheckListItem* item = 0L;
+-
+ QStringList files;
+ KGlobal::dirs()->findAllResources( "services",
+ QLatin1String( "kded/*.desktop" ),
+@@ -201,10 +215,17 @@
+
+ if (file.readEntry("X-KDE-Kded-autoload", false)){
+
+- item = static_cast<Q3CheckListItem *>(_lvStartup->findItem(file.readEntry("X-KDE-Library"),4));
+- if (item) {
+- // we found a match, now compare and see what changed
+- setAutoloadEnabled(&kdedrc, *it, item->isOn());
++ QString libraryName = file.readEntry( "X-KDE-Library" );
++ int count = _lvStartup->topLevelItemCount();
++ for( int i = 0; i < count; ++i )
++ {
++ QTreeWidgetItem *treeitem = _lvStartup->topLevelItem( i );
++ if ( treeitem->data( 1, LibraryRole ).toString() == libraryName )
++ {
++ // we found a match, now compare and see what changed
++ setAutoloadEnabled( &kdedrc, *it, treeitem->checkState( 0 ) == Qt::Checked);
++ break;
++ }
+ }
+ }
+ }
+@@ -219,13 +240,10 @@
+
+ void KDEDConfig::defaults()
+ {
+- Q3ListViewItemIterator it( _lvStartup);
+- while ( it.current() != 0 ) {
+- if (it.current()->rtti()==1) {
+- Q3CheckListItem *item = static_cast<Q3CheckListItem *>(it.current());
+- item->setOn(false);
+- }
+- ++it;
++ int count = _lvStartup->topLevelItemCount();
++ for( int i = 0; i < count; ++i )
++ {
++ _lvStartup->topLevelItem( i )->setCheckState( 0, Qt::Unchecked );
+ }
+
+ getServiceStatus();
+@@ -248,36 +266,60 @@
+ return;
+ }
+
+- for( Q3ListViewItemIterator it( _lvLoD); it.current() != 0; ++it )
+- it.current()->setText(2, NOT_RUNNING);
+- for( Q3ListViewItemIterator it( _lvStartup); it.current() != 0; ++it )
+- it.current()->setText(3, NOT_RUNNING);
++ int count = _lvLoD->topLevelItemCount();
++ for( int i = 0; i < count; ++i )
++ _lvLoD->topLevelItem( i )->setText( 2, NOT_RUNNING );
++ count = _lvStartup->topLevelItemCount();
++ for( int i = 0; i < count; ++i )
++ _lvStartup->topLevelItem( i )->setText( 3, NOT_RUNNING );
+ foreach( const QString& module, modules )
+ {
+- Q3ListViewItem *item = _lvLoD->findItem(module, 4);
+- if ( item )
++ count = _lvLoD->topLevelItemCount();
++ for( int i = 0; i < count; ++i )
+ {
+- item->setText(2, RUNNING);
++ QTreeWidgetItem *treeitem = _lvLoD->topLevelItem( i );
++ if ( treeitem->data( 0, LibraryRole ).toString() == module )
++ {
++ treeitem->setText( 2, RUNNING );
++ break;
++ }
+ }
+
+- item = _lvStartup->findItem(module, 4);
+- if ( item )
++ count = _lvStartup->topLevelItemCount();
++ for( int i = 0; i < count; ++i )
+ {
+- item->setText(3, RUNNING);
++ QTreeWidgetItem *treeitem = _lvStartup->topLevelItem( i );
++ if ( treeitem->data( 1, LibraryRole ).toString() == module )
++ {
++ treeitem->setText( 3, RUNNING );
++ break;
++ }
+ }
+ }
+ }
+
+ void KDEDConfig::slotReload()
+ {
+- QString current = _lvStartup->currentItem()->text(4);
++ QString current;
++ if ( _lvStartup->currentItem() )
++ current = _lvStartup->currentItem()->data( 1, LibraryRole ).toString();
+ load();
+- Q3ListViewItem *item = _lvStartup->findItem(current, 4);
+- if (item)
+- _lvStartup->setCurrentItem(item);
++ if ( !current.isEmpty() )
++ {
++ int count = _lvStartup->topLevelItemCount();
++ for( int i = 0; !i < count; ++i )
++ {
++ QTreeWidgetItem *treeitem = _lvStartup->topLevelItem( i );
++ if ( treeitem->data( 1, LibraryRole ).toString() == current )
++ {
++ _lvStartup->setCurrentItem( treeitem );
++ break;
++ }
++ }
++ }
+ }
+
+-void KDEDConfig::slotEvalItem(Q3ListViewItem * item)
++void KDEDConfig::slotEvalItem(QTreeWidgetItem * item)
+ {
+ if (!item)
+ return;
+@@ -307,7 +349,7 @@
+
+ void KDEDConfig::slotStartService()
+ {
+- QString service = _lvStartup->currentItem()->text(4);
++ QString service = _lvStartup->currentItem()->data( 1, LibraryRole ).toString();
+
+ QDBusInterface kdedInterface( "org.kde.kded", "/kded","org.kde.kded" );
+ QDBusReply<bool> reply = kdedInterface.call( "loadModule", service );
+@@ -326,7 +368,7 @@
+
+ void KDEDConfig::slotStopService()
+ {
+- QString service = _lvStartup->currentItem()->text(4);
++ QString service = _lvStartup->currentItem()->data( 1, LibraryRole ).toString();
+ kDebug() << "Stopping: " << service;
+
+ QDBusInterface kdedInterface( "org.kde.kded", "/kded", "org.kde.kded" );
+@@ -344,18 +386,8 @@
+ }
+ }
+
+-void KDEDConfig::slotItemChecked(Q3CheckListItem*)
++void KDEDConfig::slotItemChecked(QTreeWidgetItem*)
+ {
+ emit changed(true);
+ }
+
+-CheckListItem::CheckListItem(Q3ListView *parent, const QString &text)
+- : QObject(parent),
+- Q3CheckListItem(parent, text, CheckBox)
+-{ }
+-
+-void CheckListItem::stateChange(bool on)
+-{
+- Q3CheckListItem::stateChange(on);
+- emit changed(this);
+-}
+--- a/runtime/kcontrol/kded/kcmkded.h
++++ b/runtime/kcontrol/kded/kcmkded.h
+@@ -19,14 +19,12 @@
+ #ifndef KCMKDED_H
+ #define KCMKDED_H
+
+-#include <QListView>
+-
+-#define KDE3_SUPPORT
+ #include <kcmodule.h>
+-#undef KDE3_SUPPORT
+
+-class K3ListView;
+ class QPushButton;
++class QTreeWidget;
++class QTreeWidgetItem;
++class KConfig;
+
+ class KDEDConfig : public KCModule
+ {
+@@ -44,16 +42,16 @@
+ void slotStartService();
+ void slotStopService();
+ void slotServiceRunningToggled();
+- void slotEvalItem(Q3ListViewItem *item);
+- void slotItemChecked(Q3CheckListItem *item);
++ void slotEvalItem(QTreeWidgetItem *item);
++ void slotItemChecked(QTreeWidgetItem *item);
+ void getServiceStatus();
+
+ bool autoloadEnabled(KConfig *config, const QString &filename);
+ void setAutoloadEnabled(KConfig *config, const QString &filename, bool b);
+
+ private:
+- K3ListView *_lvLoD;
+- K3ListView *_lvStartup;
++ QTreeWidget *_lvLoD;
++ QTreeWidget *_lvStartup;
+ QPushButton *_pbStart;
+ QPushButton *_pbStop;
+
+@@ -61,17 +59,5 @@
+ QString NOT_RUNNING;
+ };
+
+-class CheckListItem : public QObject, public Q3CheckListItem
+-{
+- Q_OBJECT
+-public:
+- CheckListItem(Q3ListView* parent, const QString &text);
+- ~CheckListItem() { }
+-Q_SIGNALS:
+- void changed(Q3CheckListItem*);
+-protected:
+- virtual void stateChange(bool);
+-};
+-
+ #endif // KCMKDED_H
+
+--- a/runtime/kcontrol/kded/kcmkded.desktop
++++ b/runtime/kcontrol/kded/kcmkded.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Exec=kcmshell kcmkded
++Exec=kcmshell4 kcmkded
+ Icon=preferences-system-session-services
+ Type=Service
+ ServiceTypes=KCModule
+@@ -83,13 +83,14 @@
+ Comment[de]=Einrichtung von KDE-Systemdiensten
+ Comment[el]=Ρύθμιση των υπηρεσιών συστήματος
+ Comment[es]=Configuración de los servicios de KDE
++Comment[et]=KDE teenuste seadistamine
+ Comment[fa]=پیکربندی خدمات KDE
+ Comment[ga]=Cumraíocht Seirbhísí KDE
+ Comment[he]=שינוי הגדרות שירותי המערכת
+ Comment[it]=Configurazione dei servizi di KDE
+ Comment[ja]=KDE サービスの設定
+ Comment[kk]=KDE қызметтерін баптау
+-Comment[km]=ការកំណត់រចនាសម្ព័ន្ធសេវា KDE
++Comment[km]=ការកំណត់រចនាសម្ព័ន្ធសេវារបស់ KDE
+ Comment[ko]=KDE 서비스 설정
+ Comment[nb]=KDEs tjenesteinstillinger
+ Comment[nds]=KDE-Systeemdeensten instellen
+@@ -133,7 +134,7 @@
+ Keywords[is]=KDED,þjónn,Þjónustur,púki,þræll
+ Keywords[it]=KDED,demone,servizi
+ Keywords[ja]=KDED,デーモン,サービス
+-Keywords[km]=KDED,ដេមិន,សេវា
++Keywords[km]=KDED ដេមិន សេវា
+ Keywords[ko]=KDED,데몬,서비스
+ Keywords[lt]=KDED,Daemon,Services, demonas,tarnybos
+ Keywords[lv]=KDED,Dēmoni,Servisi
+--- a/runtime/kcontrol/kded/CMakeLists.txt
++++ b/runtime/kcontrol/kded/CMakeLists.txt
+@@ -9,7 +9,7 @@
+ kde4_add_plugin(kcm_kded ${kcm_kded_PART_SRCS})
+
+
+-target_link_libraries(kcm_kded ${KDE4_KDE3SUPPORT_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTGUI_LIBRARY} )
++target_link_libraries(kcm_kded ${KDE4_KDEUI_LIBS})
+
+ install(TARGETS kcm_kded DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- a/runtime/kcontrol/menus/kde-settings-system.directory
++++ b/runtime/kcontrol/menus/kde-settings-system.directory
+@@ -16,7 +16,7 @@
+ Name[el]=Διαχείριση συστήματος
+ Name[eo]=Sistemadministrado
+ Name[es]=Administración del sistema
+-Name[et]=Süsteemi administreerimine
++Name[et]=Süsteemi haldamine
+ Name[eu]=Sistemaren kudeaketa
+ Name[fa]=سرپرستی سیستم
+ Name[fi]=Järjestelmänhallinta
+--- a/runtime/kcontrol/menus/kde-settings-webbrowsing.directory
++++ b/runtime/kcontrol/menus/kde-settings-webbrowsing.directory
+@@ -16,7 +16,7 @@
+ Name[el]=Περιηγητής ιστού
+ Name[eo]=TTT-legilo
+ Name[es]=Navegador Web
+-Name[et]=Veebilehitseja
++Name[et]=Veebibrauser
+ Name[eu]=Web arakatzailea
+ Name[fa]=مرورگر وب
+ Name[fi]=WWW-selain
+--- a/runtime/kcontrol/menus/kde-settings.directory
++++ b/runtime/kcontrol/menus/kde-settings.directory
+@@ -32,7 +32,7 @@
+ Name[ja]=設定モジュール
+ Name[ka]=მოდულები
+ Name[kk]=Модульдер
+-Name[km]=ការកំណត់ម៉ូឌុល
++Name[km]=ការកំណត់-ម៉ូឌុល
+ Name[ko]=설정-모듈
+ Name[lt]=Parinkčių moduliai
+ Name[lv]=Parametru moduļi
+--- a/runtime/kcontrol/dnssd/kcm_kdnssd.desktop
++++ b/runtime/kcontrol/dnssd/kcm_kdnssd.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Exec=kcmshell kcm_kdnssd
++Exec=kcmshell4 kcm_kdnssd
+ GenericName=
+ Icon=preferences-system-network-discovery
+ MimeType=
+@@ -96,7 +96,7 @@
+ Comment[ja]=サービスディスカバリの設定
+ Comment[ka]=სერვისის არმოჩენის კონფიგურირება
+ Comment[kk]=Қызыметтерді байқауды баптау
+-Comment[km]=កំណត់រចនាសម្ព័ន្ធការរកឃើញសេវា
++Comment[km]=កំណត់រចនាសម្ព័ន្ធការរកឃើញសេវា
+ Comment[ko]=서비스 발견 설정
+ Comment[lt]=Konfigūruoti tarnybų radimą
+ Comment[lv]=Konfigurē servisu atrašanu
+--- a/runtime/kcontrol/icons/icons.desktop
++++ b/runtime/kcontrol/icons/icons.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Exec=kcmshell icons
++Exec=kcmshell4 icons
+ Icon=preferences-desktop-icons
+ Type=Service
+ ServiceTypes=KCModule
+@@ -109,7 +109,7 @@
+ Comment[ja]=KDE アイコンをカスタマイズ
+ Comment[ka]=KDE–ს ხატულების კონფიგურაცია
+ Comment[kk]=KDE таңбашаларын баптау
+-Comment[km]=ប្ដូររូបតំណាង KDE តាមបំណង
++Comment[km]=ប្ដូររូបតំណាងរបស់ KDE តាមបំណង
+ Comment[ko]=KDE 아이콘 사용자 정의
+ Comment[lt]=KDE ženkliukų derinimas
+ Comment[lv]=Pielāgot KDE Ikonas
+@@ -173,7 +173,7 @@
+ Keywords[it]=icone,effetti,dimensione,molti colori,pochi colori
+ Keywords[ja]=アイコン,効果,サイズ,ハイカラー,ローカラー
+ Keywords[ka]=ხატულები,ეფექტები,ზომა,მაღალი გარჩევადობა,დაბალი გარჩევადობა
+-Keywords[km]=រូបតំណាង,បែបផែន,ទំហំ,ពណ៌ខ្ពស់,ពណ៌ទាប
++Keywords[km]=រូបតំណាង បែបផែន ទំហំ ពណ៌ខ្ពស់ ពណ៌ទាប
+ Keywords[ko]=icons,effects,size,hicolor,locolor,아이콘,쪽그림,효과,크기,많은 색깔,적은 색깔,하이 컬러,로우 컬러
+ Keywords[lt]=ženkliukai,piktogramos,efektai,dydis,hispalva,lospalva
+ Keywords[lv]=ikonas,efekti,lielums,hicolor,locolor
+--- a/runtime/kcontrol/kcontrol/kinfocenter.desktop
++++ b/runtime/kcontrol/kcontrol/kinfocenter.desktop
+@@ -63,7 +63,7 @@
+ GenericName[ja]=インフォセンター
+ GenericName[ka]=საინფორმაციო ცენტრი
+ GenericName[kk]=Мәлімет орталығы
+-GenericName[km]=មជ្ឈមណ្ឌលព័ត៌មាន
++GenericName[km]=មជ្ឈមណ្ឌលព័ត៌មាន
+ GenericName[ko]=정보 센터
+ GenericName[lt]=Info centras
+ GenericName[mk]=Информативен центар
+--- a/runtime/kcontrol/kcontrol/KControl_NoDisplay.desktop
++++ b/runtime/kcontrol/kcontrol/KControl_NoDisplay.desktop
+@@ -38,7 +38,7 @@
+ Name[ja]=コントロールセンター
+ Name[ka]=საკონტროლო ცენტრი
+ Name[kk]=Басқару орталығы
+-Name[km]=មជ្ឈមណ្ឌលបញ្ជា
++Name[km]=មជ្ឈមណ្ឌលបញ្ជា
+ Name[ko]=KDE 제어판
+ Name[lt]=Valdymo centras
+ Name[lv]=Vadības Centrs
+--- a/runtime/kcontrol/kcontrol/modules.cpp
++++ b/runtime/kcontrol/kcontrol/modules.cpp
+@@ -144,7 +144,7 @@
+ delete _embedLayout;
+
+ // create an embed widget that will embed the
+- // kcmshell running as root
++ // kcmshell4 running as root
+ _embedLayout = new QVBoxLayout(_module->parentWidget());
+ _embedFrame = new KVBox( _module->parentWidget() );
+ #ifdef __GNUC__
+@@ -171,7 +171,7 @@
+ _busy->setGeometry(0,0, _module->width(), _module->height());
+ _busy->show();
+
+- // prepare the process to run the kcmshell
++ // prepare the process to run the kcmshell4
+ QString cmd = service()->exec().trimmed();
+ bool kdeshell = false;
+ if (cmd.left(5) == "kdesu")
+@@ -185,7 +185,7 @@
+ }
+ }
+
+- if (cmd.left(8) == "kcmshell")
++ if (cmd.left(8) == "kcmshell4")
+ {
+ cmd = cmd.remove(0,8).trimmed();
+ kdeshell = true;
+@@ -207,7 +207,7 @@
+ // We also don't have a way to close the module in that case.
+ *_rootProcess << "--n"; // Don't keep password.
+ if (kdeshell) {
+- *_rootProcess << QString("kcmshell %1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg(KGlobal::locale()->language());
++ *_rootProcess << QString("kcmshell4 %1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg(KGlobal::locale()->language());
+ }
+ else {
+ *_rootProcess << QString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( KGlobal::locale()->language() );
+--- a/runtime/kcontrol/infocenter/ioslaveinfo/kcmioslaveinfo.h
++++ b/runtime/kcontrol/infocenter/ioslaveinfo/kcmioslaveinfo.h
+@@ -24,8 +24,6 @@
+ #ifndef kcmioslaveinfo_h_included
+ #define kcmioslaveinfo_h_included
+
+-#include <Qt3Support/Q3ListBox>
+-
+ //Added by qt3to4:
+ #include <QByteArray>
+
+@@ -51,7 +49,7 @@
+ protected Q_SLOTS:
+
+ void showInfo(const QString& protocol);
+- void showInfo(QListWidgetItem *item);
++ void showInfo();
+ void slaveHelp( KIO::Job *, const QByteArray &data);
+ void slotResult( KJob * );
+
+--- a/runtime/kcontrol/infocenter/ioslaveinfo/ioslaveinfo.desktop
++++ b/runtime/kcontrol/infocenter/ioslaveinfo/ioslaveinfo.desktop
+@@ -14,7 +14,7 @@
+ Comment[el]=Πληροφορίες για τα διαθέσιμα πρωτόκολλα
+ Comment[eo]=Informo pri la uzeblaj protokoloj
+ Comment[es]=Información sobre los protocolos disponibles
+-Comment[et]=Olemasolevate IO moodulite (ioslave) info
++Comment[et]=Olemasolevate IO-moodulite (ioslave) info
+ Comment[eu]=Produktu eskuragarriei buruzko informazioa
+ Comment[fa]=اطلاعاتی دربارۀ قراردادهای قابل دسترس
+ Comment[fi]=Tietoja saatavilla olevista yhteyskäytännöistä
+@@ -65,7 +65,7 @@
+ Comment[zh_CN]=可用协议的信息
+ Comment[zh_TW]=可用協定的資訊
+ DocPath=kinfocenter/protocols/index.html
+-Exec=kcmshell ioslaveinfo
++Exec=kcmshell4 ioslaveinfo
+ Icon=history
+ Keywords=Protocol,IO slaves,Slaves,Network,Information,Timeout
+ Keywords[be]=Пратакол,Сетка,Звесткі,Тэрмін чакання,Protocol,IO slaves,Slaves,Network,Information,Timeout
+@@ -79,7 +79,7 @@
+ Keywords[el]=Πρωτόκολλο,slaves ΕΕ,Slaves,Δίκτυο,Πληροφορίες,Χρονικό όριο
+ Keywords[eo]=Protokolo,Enel-sklavoj,sklavoj,reto,informo,tempolimo
+ Keywords[es]=Protocolo,Slaves de E/S,Slaves,Red,Información,Tiempo límite
+-Keywords[et]=protokoll,IO moodulid,moodulid,võrk,info,taimaut,aegumine
++Keywords[et]=protokoll,IO-moodulid,moodulid,võrk,info,taimaut,aegumine
+ Keywords[eu]=Protocol,IO morroiak,Morroiak,Sarea,Informazioa,Denbora-muga
+ Keywords[fa]=قرارداد، IO slaves، Slaves، شبکه، اطلاعات، اتمام وقت
+ Keywords[fi]=Protokolla,Yhteyskäytäntö,KIO,KIO-palvelu,Verkko,Aikavalvonta,aikakatkaisu
+@@ -92,7 +92,7 @@
+ Keywords[is]=Samskiptareglur,IO þrælar,þrælar,staðarnet,net,upplýsingar,útrunninn tími
+ Keywords[it]=protocollo,IO slave,slave,rete,informazioni,tempo massimo
+ Keywords[ja]=プロトコル,IO,スレイブ,スレーブ,ネットワーク,情報,タイムアウト
+-Keywords[km]=ពិធីការ,IO slaves,Slaves,បណ្ដាញ,ព័ត៌មាន,អស់ពេល
++Keywords[km]=ពិធីការ IO slaves Slaves បណ្ដាញ ព័ត៌មាន អស់ពេល
+ Keywords[ko]=Protocol,IO slaves,Slaves,Network,Information,Timeout,프로토콜,슬레이브,입출력,네트워크,네트웍,정보,시간초과
+ Keywords[lt]=Protocol,IO slaves,Slaves,Network,Information,Timeout,protokolas,tinklas,informacija,laiko pasibaigimas
+ Keywords[lv]=Protokols,IO vergi,Vergi,Tīkls,Informācija,Noildze
+@@ -137,7 +137,7 @@
+ Name[el]=Πρωτόκολλα
+ Name[eo]=Protokoloj
+ Name[es]=Protocolos
+-Name[et]=IO moodulid
++Name[et]=IO-moodulid
+ Name[eu]=Protokoloak
+ Name[fa]=قراردادها
+ Name[fi]=Yhteyskäytännöt
+--- a/runtime/kcontrol/infocenter/ioslaveinfo/kcmioslaveinfo.cpp
++++ b/runtime/kcontrol/infocenter/ioslaveinfo/kcmioslaveinfo.cpp
+@@ -66,7 +66,7 @@
+ m_ioslavesLb=new KListWidget(hbox);
+ m_ioslavesLb->setMinimumSize(fontMetrics().width("blahfaselwhatever----"),10);
+ hboxLayout1->addWidget( m_ioslavesLb );
+- connect( m_ioslavesLb, SIGNAL( selectionChanged( QListWidgetItem * ) ), SLOT( showInfo( QListWidgetItem * ) ) );
++ connect( m_ioslavesLb, SIGNAL(itemSelectionChanged() ), SLOT( showInfo() ) );
+ //TODO make something useful after 2.1 is released
+ m_info=new KTextBrowser(hbox);
+ hboxLayout1->setSpacing(KDialog::spacingHint());
+@@ -81,11 +81,10 @@
+ for (QStringList::Iterator it=protocols.begin(); it!=protocols.end(); ++it)
+ {
+ QString proto = *it;
+- m_ioslavesLb->insertItem( SmallIcon( KProtocolInfo::icon( proto )),
+- proto );
++ m_ioslavesLb->addItem( new QListWidgetItem ( SmallIcon( KProtocolInfo::icon( proto )), proto, m_ioslavesLb));
+ };
+- m_ioslavesLb->sort();
+- m_ioslavesLb->setSelected(0, true);
++ //m_ioslavesLb->sort();
++ //m_ioslavesLb->setSelected(0, true);
+
+ setButtons(KCModule::Help);
+
+@@ -144,8 +143,9 @@
+ m_info->setPlainText(i18n("Some info about protocol %1:/ ...", protocol));
+ }
+
+-void KCMIOSlaveInfo::showInfo(QListWidgetItem *item)
++void KCMIOSlaveInfo::showInfo()
+ {
++ QListWidgetItem *item = m_ioslavesLb->currentItem();
+ if (item==0)
+ return;
+ showInfo( item->text() );
+--- a/runtime/kcontrol/infocenter/ioslaveinfo/CMakeLists.txt
++++ b/runtime/kcontrol/infocenter/ioslaveinfo/CMakeLists.txt
+@@ -9,7 +9,7 @@
+ kde4_add_plugin(kcm_ioslaveinfo ${kcm_ioslaveinfo_PART_SRCS})
+
+
+-target_link_libraries(kcm_ioslaveinfo ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY})
++target_link_libraries(kcm_ioslaveinfo ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY})
+
+ install(TARGETS kcm_ioslaveinfo DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- a/runtime/kcontrol/CMakeLists.txt
++++ b/runtime/kcontrol/CMakeLists.txt
+@@ -9,6 +9,7 @@
+ add_subdirectory( componentchooser )
+ add_subdirectory( menus )
+ add_subdirectory( dnssd )
++add_subdirectory(infocenter)
+ if(NOT WIN32)
+ add_subdirectory( samba )
+ endif(NOT WIN32)
+--- a/runtime/pics/hicolor/index.theme
++++ b/runtime/pics/hicolor/index.theme
+@@ -18,6 +18,7 @@
+ Comment[bg]=Тема по подразбиране
+ Comment[de]=Ausweich-Symbolset
+ Comment[el]=Αναπληρωματικό θέμα εικονιδίων
++Comment[et]=Ikooniteema varuvariant
+ Comment[he]=ערכת סמלים לגיבוי
+ Comment[it]=Tema di icone di ripiego
+ Comment[ja]=フォールバック用のアイコンテーマ
+--- a/runtime/pics/emoticons/CMakeLists.txt
++++ b/runtime/pics/emoticons/CMakeLists.txt
+@@ -1,7 +1,7 @@
+
+ ########### install files ###############
+
+-install( FILES angry.png bat.png beer.png biggrin.png cake.png camera.png cat.png clock.png cocktail.png confused.png cry.png cup.png dog.png email.png embarassed.png emoticons.xml film.png kiss.png lightbulb.png love.png note.png oh.png omg.png phone.png present.png rose.png sad.png shade.png sleep.png smile.png star.png teeth.png thumbs_down.png thumbs_up.png tongue.png unhappy.png unlove.png wilted_rose.png wink.png foot_in_mouth.png innocent.png undecided.png DESTINATION ${SHARE_INSTALL_PREFIX}/emoticons/Default)
++install( FILES angry.png bat.png beer.png biggrin.png cake.png camera.png cat.png clock.png cocktail.png confused.png cry.png cup.png dog.png email.png embarassed.png emoticons.xml film.png kiss.png lightbulb.png love.png note.png oh.png omg.png phone.png present.png rose.png sad.png shade.png sleep.png smile.png star.png teeth.png thumbs_down.png thumbs_up.png tongue.png unhappy.png unlove.png wilted_rose.png wink.png foot_in_mouth.png innocent.png undecided.png DESTINATION ${SHARE_INSTALL_PREFIX}/emoticons/kde4)
+
+
+
+--- /dev/null
++++ b/runtime/pics/oxygen/scalable/actions/games-hint.svg
+@@ -0,0 +1,9862 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Inkscape (http://www.inkscape.org/) -->
++<svg
++ xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
++ xmlns:dc="http://purl.org/dc/elements/1.1/"
++ xmlns:cc="http://web.resource.org/cc/"
++ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++ xmlns:svg="http://www.w3.org/2000/svg"
++ xmlns="http://www.w3.org/2000/svg"
++ xmlns:xlink="http://www.w3.org/1999/xlink"
++ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
++ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
++ width="128"
++ height="128"
++ id="svg16261"
++ sodipodi:version="0.32"
++ inkscape:version="0.45.1"
++ sodipodi:docbase="/home/kdedev/kde/src/KDE/kdebase/runtime/pics/oxygen/scalable/actions"
++ sodipodi:docname="games-hint.svg"
++ inkscape:export-filename="/home/me/KDE_SVN/trunk/playground/artwork/Oxygen/ruphy/idea-gray2.png"
++ inkscape:export-xdpi="180"
++ inkscape:export-ydpi="180"
++ version="1.0"
++ inkscape:output_extension="org.inkscape.output.svg.inkscape">
++ <defs
++ id="defs16263">
++ <linearGradient
++ id="linearGradient24442">
++ <stop
++ id="stop24444"
++ offset="0"
++ style="stop-color:#000000;stop-opacity:0;" />
++ <stop
++ id="stop24446"
++ offset="1"
++ style="stop-color:#000000;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient20677">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop20679" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0;"
++ offset="1"
++ id="stop20681" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient20600">
++ <stop
++ offset="0.0000000"
++ style="stop-color:#ffffff;stop-opacity:1.0000000;"
++ id="stop20602" />
++ <stop
++ offset="1.0000000"
++ style="stop-color:#a9a9bb;stop-opacity:0"
++ id="stop20604" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient18819">
++ <stop
++ style="stop-color:#a4c0e4;stop-opacity:1;"
++ offset="0"
++ id="stop18821" />
++ <stop
++ style="stop-color:#a4c0e4;stop-opacity:0;"
++ offset="1"
++ id="stop18823" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient15505">
++ <stop
++ style="stop-color:#fff2f2;stop-opacity:0;"
++ offset="0"
++ id="stop15507" />
++ <stop
++ id="stop15511"
++ offset="0.5"
++ style="stop-color:#ffffff;stop-opacity:1;" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0;"
++ offset="1"
++ id="stop15509" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient10464">
++ <stop
++ style="stop-color:#000000;stop-opacity:1;"
++ offset="0"
++ id="stop10466" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="1"
++ id="stop10468" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient34523">
++ <stop
++ style="stop-color:#eeeeec;stop-opacity:1;"
++ offset="0"
++ id="stop34525" />
++ <stop
++ style="stop-color:#eeeeec;stop-opacity:0;"
++ offset="1"
++ id="stop34527" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient32284">
++ <stop
++ style="stop-color:#000000;stop-opacity:0;"
++ offset="0"
++ id="stop32286" />
++ <stop
++ id="stop32292"
++ offset="0.5"
++ style="stop-color:#000000;stop-opacity:1;" />
++ <stop
++ style="stop-color:#000000;stop-opacity:0;"
++ offset="1"
++ id="stop32288" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient31957">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop31959" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0;"
++ offset="1"
++ id="stop31961" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient31919">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop31921" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0;"
++ offset="1"
++ id="stop31923" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient31903">
++ <stop
++ style="stop-color:#000000;stop-opacity:1;"
++ offset="0"
++ id="stop31905" />
++ <stop
++ id="stop31915"
++ offset="0.1632653"
++ style="stop-color:#000000;stop-opacity:0.49803922;" />
++ <stop
++ id="stop31911"
++ offset="0.5"
++ style="stop-color:#000000;stop-opacity:0;" />
++ <stop
++ style="stop-color:#000000;stop-opacity:0.49803922;"
++ offset="0.80612242"
++ id="stop31913" />
++ <stop
++ style="stop-color:#000000;stop-opacity:1;"
++ offset="1"
++ id="stop31907" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient31833">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1"
++ offset="0.0000000"
++ id="stop31835" />
++ <stop
++ style="stop-color:#000000;stop-opacity:0.27916667;"
++ offset="0.50000000"
++ id="stop31837" />
++ <stop
++ style="stop-color:#000000;stop-opacity:0.0000000;"
++ offset="1.0000000"
++ id="stop31839" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient31819">
++ <stop
++ id="stop31821"
++ offset="0"
++ style="stop-color:#ffffff;stop-opacity:1;" />
++ <stop
++ id="stop31823"
++ offset="1"
++ style="stop-color:#ffffff;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient31811">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop31813" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0;"
++ offset="1"
++ id="stop31815" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient28210">
++ <stop
++ style="stop-color:#000000;stop-opacity:0.26666668;"
++ offset="0"
++ id="stop28212" />
++ <stop
++ style="stop-color:#000000;stop-opacity:0;"
++ offset="1"
++ id="stop28214" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient28194">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0;"
++ offset="0"
++ id="stop28196" />
++ <stop
++ id="stop28200"
++ offset="0.5"
++ style="stop-color:#ffffff;stop-opacity:1;" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0.0000000;"
++ offset="1.0000000"
++ id="stop28198" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient2334">
++ <stop
++ style="stop-color:#323232;stop-opacity:1;"
++ offset="0"
++ id="stop6098" />
++ <stop
++ id="stop2346"
++ offset="0.07692308"
++ style="stop-color:#dfe1e1;stop-opacity:1;" />
++ <stop
++ id="stop2342"
++ offset="0.5"
++ style="stop-color:#e2dcdc;stop-opacity:1;" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0.78201604"
++ id="stop2348" />
++ <stop
++ style="stop-color:#dfd9df;stop-opacity:1;"
++ offset="0.9005897"
++ id="stop2344" />
++ <stop
++ style="stop-color:#3a3a3a;stop-opacity:1;"
++ offset="1"
++ id="stop6104" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient2334"
++ id="linearGradient27692"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="translate(0,-0.707107)"
++ x1="-55.327003"
++ y1="104.95406"
++ x2="-82"
++ y2="104.95406" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient6250"
++ id="linearGradient27690"
++ gradientUnits="userSpaceOnUse"
++ x1="-77.403809"
++ y1="22.222563"
++ x2="-62.398071"
++ y2="131.117" />
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient6250">
++ <stop
++ style="stop-color:black;stop-opacity:1;"
++ offset="0"
++ id="stop6252" />
++ <stop
++ style="stop-color:black;stop-opacity:0;"
++ offset="1"
++ id="stop6254" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient15112">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop15118" />
++ <stop
++ id="stop15116"
++ offset="1"
++ style="stop-color:#ffff49;stop-opacity:0.08247422;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient15096">
++ <stop
++ style="stop-color:#000000;stop-opacity:1;"
++ offset="0"
++ id="stop15098" />
++ <stop
++ style="stop-color:#000000;stop-opacity:0;"
++ offset="1"
++ id="stop15100" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient12261">
++ <stop
++ id="stop12263"
++ offset="0"
++ style="stop-color:#f8baba;stop-opacity:1;" />
++ <stop
++ id="stop12265"
++ offset="1"
++ style="stop-color:#bc2c2c;stop-opacity:0.98979592;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient12185">
++ <stop
++ id="stop12187"
++ offset="0"
++ style="stop-color:#ffffff;stop-opacity:0;" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0.2857143"
++ id="stop14228" />
++ <stop
++ id="stop12189"
++ offset="1"
++ style="stop-color:#ffffff;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient12153">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop12155" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0;"
++ offset="1"
++ id="stop12157" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient10992">
++ <stop
++ style="stop-color:#babdb6;stop-opacity:1;"
++ offset="0"
++ id="stop10994" />
++ <stop
++ style="stop-color:#555753;stop-opacity:1;"
++ offset="1"
++ id="stop10996" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient10974">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop10976" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0;"
++ offset="1"
++ id="stop10978" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient10690">
++ <stop
++ style="stop-color:#555753;stop-opacity:1;"
++ offset="0"
++ id="stop10692" />
++ <stop
++ id="stop10698"
++ offset="0.5"
++ style="stop-color:#555753;stop-opacity:1;" />
++ <stop
++ style="stop-color:#555753;stop-opacity:1;"
++ offset="1"
++ id="stop10694" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient9636">
++ <stop
++ style="stop-color:#000000;stop-opacity:1.0000000"
++ offset="0.0000000"
++ id="stop9638" />
++ <stop
++ id="stop9647"
++ offset="0.29987505"
++ style="stop-color:#000000;stop-opacity:0.74901961;" />
++ <stop
++ id="stop9645"
++ offset="0.48979592"
++ style="stop-color:#000000;stop-opacity:0.49803922;" />
++ <stop
++ style="stop-color:#000000;stop-opacity:0.24705882;"
++ offset="0.62515616"
++ id="stop9649" />
++ <stop
++ style="stop-color:#000000;stop-opacity:0.0000000"
++ offset="1.0000000"
++ id="stop9640" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient8576">
++ <stop
++ style="stop-color:#000000;stop-opacity:1;"
++ offset="0"
++ id="stop8578" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0.0000000;"
++ offset="1.0000000"
++ id="stop8580" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient8564">
++ <stop
++ style="stop-color:#000000;stop-opacity:0;"
++ offset="0"
++ id="stop8566" />
++ <stop
++ id="stop8588"
++ offset="0.1138044"
++ style="stop-color:#040600;stop-opacity:0.49803922;" />
++ <stop
++ id="stop8572"
++ offset="0.17329179"
++ style="stop-color:#080d00;stop-opacity:1;" />
++ <stop
++ style="stop-color:#060900;stop-opacity:0.62352941;"
++ offset="0.30275691"
++ id="stop8590" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0.79325098"
++ id="stop8574" />
++ <stop
++ id="stop8592"
++ offset="1"
++ style="stop-color:#020300;stop-opacity:0;" />
++ <stop
++ style="stop-color:#000000;stop-opacity:0;"
++ offset="1"
++ id="stop8568" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3395">
++ <stop
++ style="stop-color:#000000;stop-opacity:0;"
++ offset="0"
++ id="stop3397" />
++ <stop
++ id="stop9618"
++ offset="0.60220575"
++ style="stop-color:#000000;stop-opacity:0.25510204;" />
++ <stop
++ id="stop3411"
++ offset="0.79751569"
++ style="stop-color:#000000;stop-opacity:0.49803922;" />
++ <stop
++ style="stop-color:#000000;stop-opacity:0.62352941;"
++ offset="0.82998157"
++ id="stop4424" />
++ <stop
++ id="stop4426"
++ offset="1"
++ style="stop-color:#000000;stop-opacity:0.68627451;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3324">
++ <stop
++ style="stop-color:#ffda00;stop-opacity:1;"
++ offset="0"
++ id="stop3326" />
++ <stop
++ style="stop-color:#ffbf00;stop-opacity:1;"
++ offset="1"
++ id="stop3328" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient14750">
++ <stop
++ id="stop14752"
++ offset="0.0000000"
++ style="stop-color:#000000;stop-opacity:1.0000000" />
++ <stop
++ id="stop14754"
++ offset="1.0000000"
++ style="stop-color:#000000;stop-opacity:0.0000000" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient8777">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop8779" />
++ <stop
++ style="stop-color:#ffff49;stop-opacity:0;"
++ offset="1"
++ id="stop8781" />
++ </linearGradient>
++ <linearGradient
++ id="light100to0">
++ <stop
++ id="stop2764"
++ offset="0.0000000"
++ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
++ <stop
++ id="stop2765"
++ offset="1.0000000"
++ style="stop-color:#ffffff;stop-opacity:0.0000000;" />
++ </linearGradient>
++ <linearGradient
++ id="shadow25to25w">
++ <stop
++ id="stop3433"
++ offset="0.0000000"
++ style="stop-color:#000000;stop-opacity:0.25416666;" />
++ <stop
++ id="stop3434"
++ offset="1.0000000"
++ style="stop-color:#ffffff;stop-opacity:0.26274511;" />
++ </linearGradient>
++ <linearGradient
++ id="sadow75to0w">
++ <stop
++ id="stop3429"
++ offset="0.0000000"
++ style="stop-color:#000000;stop-opacity:0.72941178;" />
++ <stop
++ id="stop3430"
++ offset="1.0000000"
++ style="stop-color:#ffffff;stop-opacity:0.0000000;" />
++ </linearGradient>
++ <linearGradient
++ id="shadow0wto25to0">
++ <stop
++ id="stop3437"
++ offset="0.0000000"
++ style="stop-color:#ffffff;stop-opacity:0.0000000;" />
++ <stop
++ id="stop3438"
++ offset="0.50000000"
++ style="stop-color:#000000;stop-opacity:0.27916667;" />
++ <stop
++ id="stop3439"
++ offset="1.0000000"
++ style="stop-color:#000000;stop-opacity:0.0000000;" />
++ </linearGradient>
++ <linearGradient
++ id="light90to0">
++ <stop
++ id="stop1890"
++ offset="0.0000000"
++ style="stop-color:#ffffff;stop-opacity:0.90833336;" />
++ <stop
++ id="stop1892"
++ offset="1.0000000"
++ style="stop-color:#ffffff;stop-opacity:0.0000000;" />
++ </linearGradient>
++ <linearGradient
++ id="orangemoretoyelow">
++ <stop
++ id="stop2671"
++ offset="0.0000000"
++ style="stop-color:#ff7d00;stop-opacity:1.0000000;" />
++ <stop
++ id="stop2679"
++ offset="0.71942449"
++ style="stop-color:#ffbe00;stop-opacity:1.0000000;" />
++ <stop
++ id="stop2672"
++ offset="1.0000000"
++ style="stop-color:#ffff00;stop-opacity:1.0000000;" />
++ </linearGradient>
++ <linearGradient
++ id="orangelesstoyelow">
++ <stop
++ id="stop2689"
++ offset="0"
++ style="stop-color:#ff7e00;stop-opacity:1;" />
++ <stop
++ id="stop2690"
++ offset="0.25899279"
++ style="stop-color:#ffbf00;stop-opacity:1;" />
++ <stop
++ id="stop2691"
++ offset="1"
++ style="stop-color:#ffff00;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient8767">
++ <stop
++ id="stop8769"
++ style="stop-color:#ffffff;stop-opacity:1.0000000;"
++ offset="0.0000000" />
++ <stop
++ id="stop8768"
++ style="stop-color:#a9a9bb;stop-opacity:1.0000000;"
++ offset="1.0000000" />
++ </linearGradient>
++ <linearGradient
++ id="blacktowhite">
++ <stop
++ id="stop2476"
++ offset="0.0000000"
++ style="stop-color:#000000;stop-opacity:1.0000000;" />
++ <stop
++ id="stop2475"
++ offset="1.0000000"
++ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
++ </linearGradient>
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient14750"
++ id="radialGradient18403"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(2.214095,0,0,0.387181,-19.04295,18.96624)"
++ cx="15.827027"
++ cy="29.643244"
++ fx="15.913514"
++ fy="32.225368"
++ r="4.1273646" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient8777"
++ id="radialGradient18460"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(-0.546713,0.584885,-0.335232,-0.336836,22.5915,5.430056)"
++ cx="8.5236788"
++ cy="14.238245"
++ fx="8.0471926"
++ fy="20.605503"
++ r="8.5019808" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient8777"
++ id="linearGradient18463"
++ gradientUnits="userSpaceOnUse"
++ x1="22.342566"
++ y1="-2.9714472"
++ x2="15.696384"
++ y2="10.261116"
++ gradientTransform="translate(-3.954001e-4,6.558882e-4)" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#light100to0"
++ id="linearGradient18466"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.224193,0,0,0.72028,1.446079,-1.778436)"
++ x1="33.74147"
++ y1="32.894489"
++ x2="104.24393"
++ y2="36.050159" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#shadow25to25w"
++ id="linearGradient18469"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.519558,0,0,3.491484e-2,-6.863658,-7.477052)"
++ spreadMethod="pad"
++ x1="46.954712"
++ y1="961.31982"
++ x2="46.474281"
++ y2="1011.7612" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#shadow25to25w"
++ id="linearGradient18472"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.519558,0,0,3.491484e-2,-6.863658,-8.817767)"
++ spreadMethod="pad"
++ x1="46.954712"
++ y1="961.31982"
++ x2="46.474281"
++ y2="1011.7612" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#shadow25to25w"
++ id="linearGradient18475"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.519558,0,0,3.491484e-2,-6.863658,-10.15848)"
++ spreadMethod="pad"
++ x1="46.954712"
++ y1="961.31982"
++ x2="46.474281"
++ y2="1011.7612" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#shadow25to25w"
++ id="linearGradient18478"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.519558,0,0,3.491484e-2,-6.863658,-11.49918)"
++ spreadMethod="pad"
++ x1="46.954712"
++ y1="961.31982"
++ x2="46.474281"
++ y2="1011.7612" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#sadow75to0w"
++ id="linearGradient18481"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.519558,0,0,3.491484e-2,-6.784184,-12.83797)"
++ spreadMethod="pad"
++ x1="46.954712"
++ y1="961.31982"
++ x2="46.474281"
++ y2="1011.7612" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#shadow0wto25to0"
++ id="linearGradient18484"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.269427,0,0,6.994582e-2,-6.784184,-13.29775)"
++ spreadMethod="reflect"
++ x1="103.79901"
++ y1="592.67804"
++ x2="72.151993"
++ y2="585.89062" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient8767"
++ id="linearGradient18487"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.369743,0,0,6.52287e-2,-13.01761,-8.815835)"
++ x1="85.301796"
++ y1="524.79736"
++ x2="74.148415"
++ y2="547.57916" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient8767"
++ id="linearGradient18490"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.369743,0,0,6.52287e-2,-13.01761,-10.15654)"
++ x1="85.301796"
++ y1="524.79736"
++ x2="74.148415"
++ y2="547.57916" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient8767"
++ id="linearGradient18493"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.369743,0,0,6.52287e-2,-13.01761,-11.49725)"
++ x1="85.301796"
++ y1="524.79736"
++ x2="74.148415"
++ y2="547.57916" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient8767"
++ id="linearGradient18496"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.369743,0,0,6.52287e-2,-13.01761,-12.83797)"
++ x1="85.301796"
++ y1="524.79736"
++ x2="74.148415"
++ y2="547.57916" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#light90to0"
++ id="linearGradient18499"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.18024,0,0,0.104624,-6.801539,-13.29775)"
++ x1="139.01785"
++ y1="255.21283"
++ x2="135.35895"
++ y2="311.42966" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#orangemoretoyelow"
++ id="linearGradient18504"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.122848,0,0,0.145477,-6.685584,-11.61801)"
++ x1="206.84116"
++ y1="226.42189"
++ x2="106.77563"
++ y2="-19.566389" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient8767"
++ id="linearGradient18507"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.132013,0,0,0.133371,-6.218259,-12.66489)"
++ spreadMethod="reflect"
++ x1="141.73227"
++ y1="277.55908"
++ x2="180.55458"
++ y2="277.63657" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#blacktowhite"
++ id="radialGradient18510"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.17769,0,0,5.916509e-2,-4.328134,1.855189)"
++ cx="110.41666"
++ cy="462.75165"
++ fx="110.41666"
++ fy="462.75165"
++ r="14.917136" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#light90to0"
++ id="linearGradient20292"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(-0.18024,0,0,0.104624,38.82745,-14.00011)"
++ x1="139.01785"
++ y1="255.21283"
++ x2="135.35895"
++ y2="311.42966" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#sadow75to0w"
++ id="linearGradient20294"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(-0.519558,0,0,3.491484e-2,38.81526,-13.54033)"
++ spreadMethod="pad"
++ x1="46.954712"
++ y1="961.31982"
++ x2="46.474281"
++ y2="1011.7612" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#orangelesstoyelow"
++ id="linearGradient21303"
++ x1="4.108108"
++ y1="-8.6486483"
++ x2="30.962162"
++ y2="-8.2162161"
++ gradientUnits="userSpaceOnUse" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient14750"
++ id="radialGradient2262"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(8.8563889,0,0,1.5487255,-76.17036,75.318466)"
++ cx="15.827027"
++ cy="29.643244"
++ fx="15.827027"
++ fy="29.643244"
++ r="4.1273646" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient14750"
++ id="linearGradient8509"
++ x1="-63.713371"
++ y1="19.251026"
++ x2="-49.503231"
++ y2="35.437008"
++ gradientUnits="userSpaceOnUse" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient8777"
++ id="linearGradient8552"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(3.9038755,0,0,3.9038755,1.5380016,6.793589)"
++ x1="22.342566"
++ y1="-2.9714472"
++ x2="15.696384"
++ y2="10.261116" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#light100to0"
++ id="linearGradient8560"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.8752215,0,0,2.8118835,7.1848577,-0.1517647)"
++ x1="33.74147"
++ y1="32.894489"
++ x2="104.24393"
++ y2="36.050159" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient8564"
++ id="linearGradient8570"
++ x1="-31.288321"
++ y1="77.049606"
++ x2="-12.072402"
++ y2="77.049605"
++ gradientUnits="userSpaceOnUse" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient8576"
++ id="linearGradient8606"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.7036345,0,0,0.4084391,-25.012817,-45.121733)"
++ x1="165.73846"
++ y1="161.4637"
++ x2="108.53249"
++ y2="354.50296" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12185"
++ id="linearGradient12213"
++ x1="-71.427475"
++ y1="92.003586"
++ x2="-63.28709"
++ y2="92.003586"
++ gradientUnits="userSpaceOnUse" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12261"
++ id="linearGradient12259"
++ x1="-77.314102"
++ y1="94.081215"
++ x2="-44.761532"
++ y2="94.081215"
++ gradientUnits="userSpaceOnUse" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12261"
++ id="linearGradient14315"
++ gradientUnits="userSpaceOnUse"
++ x1="-77.314102"
++ y1="94.081215"
++ x2="-44.761532"
++ y2="94.081215" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12261"
++ id="linearGradient14319"
++ gradientUnits="userSpaceOnUse"
++ x1="-77.314102"
++ y1="94.081215"
++ x2="-44.761532"
++ y2="94.081215" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12261"
++ id="linearGradient14321"
++ gradientUnits="userSpaceOnUse"
++ x1="-77.314102"
++ y1="94.081215"
++ x2="-44.761532"
++ y2="94.081215" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12261"
++ id="linearGradient14323"
++ gradientUnits="userSpaceOnUse"
++ x1="-77.314102"
++ y1="94.081215"
++ x2="-44.761532"
++ y2="94.081215" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12261"
++ id="linearGradient14908"
++ gradientUnits="userSpaceOnUse"
++ x1="-77.314102"
++ y1="94.081215"
++ x2="-44.761532"
++ y2="94.081215" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12261"
++ id="linearGradient14912"
++ gradientUnits="userSpaceOnUse"
++ x1="-77.314102"
++ y1="94.081215"
++ x2="-44.761532"
++ y2="94.081215" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12261"
++ id="linearGradient14914"
++ gradientUnits="userSpaceOnUse"
++ x1="-77.314102"
++ y1="94.081215"
++ x2="-44.761532"
++ y2="94.081215" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12261"
++ id="linearGradient14916"
++ gradientUnits="userSpaceOnUse"
++ x1="-77.314102"
++ y1="94.081215"
++ x2="-44.761532"
++ y2="94.081215" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12261"
++ id="linearGradient14980"
++ gradientUnits="userSpaceOnUse"
++ x1="-77.314102"
++ y1="94.081215"
++ x2="-44.761532"
++ y2="94.081215" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12261"
++ id="linearGradient14984"
++ gradientUnits="userSpaceOnUse"
++ x1="-77.314102"
++ y1="94.081215"
++ x2="-44.761532"
++ y2="94.081215" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12261"
++ id="linearGradient14986"
++ gradientUnits="userSpaceOnUse"
++ x1="-77.314102"
++ y1="94.081215"
++ x2="-44.761532"
++ y2="94.081215" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12261"
++ id="linearGradient14988"
++ gradientUnits="userSpaceOnUse"
++ x1="-77.314102"
++ y1="94.081215"
++ x2="-44.761532"
++ y2="94.081215" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient15112"
++ id="radialGradient15120"
++ cx="-59.22633"
++ cy="43.650795"
++ fx="-59.22633"
++ fy="43.650795"
++ r="11.17115"
++ gradientTransform="matrix(4.1952794,0.1017607,-3.14048e-2,1.2947246,190.61551,-6.8380488)"
++ gradientUnits="userSpaceOnUse" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient8777"
++ id="radialGradient15350"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(-2.1342995,2.2833183,-1.308704,-1.3149658,89.733951,27.989291)"
++ cx="8.5236788"
++ cy="14.238245"
++ fx="8.0471926"
++ fy="20.605503"
++ r="8.5019808" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12153"
++ id="linearGradient15472"
++ x1="-129.86575"
++ y1="17.95953"
++ x2="-121.59036"
++ y2="17.95953"
++ gradientUnits="userSpaceOnUse" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12261"
++ id="linearGradient15484"
++ gradientUnits="userSpaceOnUse"
++ x1="-77.314102"
++ y1="94.081215"
++ x2="-44.761532"
++ y2="94.081215" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12185"
++ id="linearGradient15486"
++ gradientUnits="userSpaceOnUse"
++ spreadMethod="pad"
++ x1="-76.78125"
++ y1="110.40625"
++ x2="-44.25"
++ y2="110.40625" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12261"
++ id="linearGradient15488"
++ gradientUnits="userSpaceOnUse"
++ x1="-77.314102"
++ y1="94.081215"
++ x2="-44.761532"
++ y2="94.081215" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12261"
++ id="linearGradient15490"
++ gradientUnits="userSpaceOnUse"
++ x1="-77.314102"
++ y1="94.081215"
++ x2="-44.761532"
++ y2="94.081215" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient12261"
++ id="linearGradient15492"
++ gradientUnits="userSpaceOnUse"
++ x1="-77.314102"
++ y1="94.081215"
++ x2="-44.761532"
++ y2="94.081215" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10992"
++ id="linearGradient15494"
++ gradientUnits="userSpaceOnUse"
++ x1="-126.48004"
++ y1="34.368671"
++ x2="-230.98253"
++ y2="54.572239" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10992"
++ id="linearGradient15496"
++ gradientUnits="userSpaceOnUse"
++ x1="-220.36673"
++ y1="74.339188"
++ x2="-136.88835"
++ y2="14.933865" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10992"
++ id="linearGradient15498"
++ gradientUnits="userSpaceOnUse"
++ x1="-207.79321"
++ y1="59.456745"
++ x2="-133.70074"
++ y2="21.014977" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10992"
++ id="linearGradient15500"
++ gradientUnits="userSpaceOnUse"
++ x1="-202.87128"
++ y1="61.550606"
++ x2="-141.9189"
++ y2="12.906281" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#shadow0wto25to0"
++ id="linearGradient27995"
++ gradientUnits="userSpaceOnUse"
++ x1="-140.30359"
++ y1="178.72038"
++ x2="-100.32568"
++ y2="178.72038" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#shadow0wto25to0"
++ id="linearGradient28007"
++ gradientUnits="userSpaceOnUse"
++ x1="-154.41652"
++ y1="218.20486"
++ x2="-130.27448"
++ y2="229.6974" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient28182"
++ x1="-185.3772"
++ y1="152.21613"
++ x2="-131.1246"
++ y2="152.78021"
++ gradientUnits="userSpaceOnUse" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient28184"
++ x1="-185.3772"
++ y1="160.71132"
++ x2="-131.1246"
++ y2="161.27541"
++ gradientUnits="userSpaceOnUse" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient28186"
++ x1="-185.3772"
++ y1="169.39098"
++ x2="-131.1246"
++ y2="169.95506"
++ gradientUnits="userSpaceOnUse" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient28188"
++ x1="-185.3772"
++ y1="178.07065"
++ x2="-131.1246"
++ y2="178.63474"
++ gradientUnits="userSpaceOnUse" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient28190"
++ x1="-185.3772"
++ y1="186.86761"
++ x2="-131.1246"
++ y2="187.43169"
++ gradientUnits="userSpaceOnUse" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient28192"
++ x1="-185.3772"
++ y1="195.66457"
++ x2="-131.1246"
++ y2="196.22865"
++ gradientUnits="userSpaceOnUse" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28210"
++ id="linearGradient28216"
++ x1="-71.148843"
++ y1="84.090602"
++ x2="-66.947067"
++ y2="83.933075"
++ gradientUnits="userSpaceOnUse" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient3395"
++ id="radialGradient31889"
++ cx="-159.78151"
++ cy="-7.6226759"
++ fx="-159.78151"
++ fy="-7.6226759"
++ r="13.829039"
++ gradientTransform="matrix(1,0,0,0.3132534,0,-5.2348468)"
++ gradientUnits="userSpaceOnUse" />
++ <filter
++ inkscape:collect="always"
++ x="-0.10202196"
++ width="1.2040439"
++ y="-0.22889513"
++ height="1.4577903"
++ id="filter32106">
++ <feGaussianBlur
++ inkscape:collect="always"
++ stdDeviation="2.0296202"
++ id="feGaussianBlur32108" />
++ </filter>
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#shadow0wto25to0"
++ id="linearGradient33431"
++ gradientUnits="userSpaceOnUse"
++ x1="-140.30359"
++ y1="178.72038"
++ x2="-100.32568"
++ y2="178.72038" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28210"
++ id="linearGradient33435"
++ gradientUnits="userSpaceOnUse"
++ x1="-71.148843"
++ y1="84.090602"
++ x2="-66.947067"
++ y2="83.933075" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient33437"
++ gradientUnits="userSpaceOnUse"
++ x1="-185.3772"
++ y1="186.86761"
++ x2="-131.1246"
++ y2="187.43169" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient33439"
++ gradientUnits="userSpaceOnUse"
++ x1="-185.3772"
++ y1="178.07065"
++ x2="-131.1246"
++ y2="178.63474" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient33441"
++ gradientUnits="userSpaceOnUse"
++ x1="-185.3772"
++ y1="169.39098"
++ x2="-131.1246"
++ y2="169.95506" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient33443"
++ gradientUnits="userSpaceOnUse"
++ x1="-185.3772"
++ y1="160.71132"
++ x2="-131.1246"
++ y2="161.27541" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient33445"
++ gradientUnits="userSpaceOnUse"
++ x1="-185.3772"
++ y1="195.66457"
++ x2="-131.1246"
++ y2="196.22865" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient33447"
++ gradientUnits="userSpaceOnUse"
++ x1="-185.3772"
++ y1="152.21613"
++ x2="-131.1246"
++ y2="152.78021" />
++ <filter
++ inkscape:collect="always"
++ x="-0.13573864"
++ width="1.2714773"
++ y="-0.34610328"
++ height="1.6922066"
++ id="filter34654">
++ <feGaussianBlur
++ inkscape:collect="always"
++ stdDeviation="2.9302413"
++ id="feGaussianBlur34656" />
++ </filter>
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient32284"
++ id="linearGradient3516"
++ x1="-52.992828"
++ y1="13.177234"
++ x2="-82.824852"
++ y2="45.428825"
++ gradientUnits="userSpaceOnUse" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient3546"
++ gradientUnits="userSpaceOnUse"
++ x1="-185.3772"
++ y1="195.66457"
++ x2="-131.1246"
++ y2="196.22865" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient3553"
++ gradientUnits="userSpaceOnUse"
++ x1="-185.3772"
++ y1="178.07065"
++ x2="-131.1246"
++ y2="178.63474" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient3564"
++ gradientUnits="userSpaceOnUse"
++ x1="-185.3772"
++ y1="169.39098"
++ x2="-131.1246"
++ y2="169.95506" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient3572"
++ gradientUnits="userSpaceOnUse"
++ x1="-185.3772"
++ y1="160.71132"
++ x2="-131.1246"
++ y2="161.27541" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28210"
++ id="linearGradient3574"
++ gradientUnits="userSpaceOnUse"
++ x1="-71.148843"
++ y1="84.090602"
++ x2="-66.947067"
++ y2="83.933075" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient3588"
++ gradientUnits="userSpaceOnUse"
++ x1="-185.3772"
++ y1="186.86761"
++ x2="-131.1246"
++ y2="187.43169" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient3598"
++ gradientUnits="userSpaceOnUse"
++ x1="-185.3772"
++ y1="169.39098"
++ x2="-131.1246"
++ y2="169.95506" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient3608"
++ gradientUnits="userSpaceOnUse"
++ x1="-185.3772"
++ y1="169.39098"
++ x2="-131.1246"
++ y2="169.95506" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient3614"
++ gradientUnits="userSpaceOnUse"
++ x1="-185.3772"
++ y1="152.21613"
++ x2="-131.1246"
++ y2="152.78021" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#shadow0wto25to0"
++ id="linearGradient6575"
++ gradientUnits="userSpaceOnUse"
++ x1="-154.41652"
++ y1="218.20486"
++ x2="-130.27448"
++ y2="229.6974" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient32284"
++ id="linearGradient12538"
++ x1="-105.41486"
++ y1="118.65549"
++ x2="-86.040016"
++ y2="118.65549"
++ gradientUnits="userSpaceOnUse" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient32284"
++ id="linearGradient14520"
++ x1="-90.014755"
++ y1="76.406967"
++ x2="-72.663399"
++ y2="89.16198"
++ gradientUnits="userSpaceOnUse" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient15515"
++ gradientUnits="userSpaceOnUse"
++ x1="-97.206985"
++ y1="118.65549"
++ x2="-82.63166"
++ y2="118.65549" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient32284"
++ id="linearGradient15549"
++ gradientUnits="userSpaceOnUse"
++ x1="-90.014755"
++ y1="76.406967"
++ x2="-72.663399"
++ y2="89.16198" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient3395"
++ id="radialGradient17808"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.4867537,5.7487858e-3,-7.4711098e-3,1.9321869,-30.811272,-45.165205)"
++ cx="63.98336"
++ cy="48.737503"
++ fx="56.043652"
++ fy="38.565166"
++ r="34.071758" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9636"
++ id="linearGradient17810"
++ gradientUnits="userSpaceOnUse"
++ x1="-21.526762"
++ y1="188.43985"
++ x2="-32.293846"
++ y2="50.451321" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient31903"
++ id="linearGradient17812"
++ gradientUnits="userSpaceOnUse"
++ x1="-79.523529"
++ y1="66.419617"
++ x2="-37.961349"
++ y2="66.419617" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10974"
++ id="linearGradient17814"
++ gradientUnits="userSpaceOnUse"
++ x1="-60.55378"
++ y1="3.6018081"
++ x2="-60.55378"
++ y2="18.972223" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient3395"
++ id="radialGradient17816"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.1403505,3.999897e-8,0,0.377193,20.858665,-13.152623)"
++ cx="-148.61847"
++ cy="-21.118305"
++ fx="-148.61847"
++ fy="-21.118305"
++ r="18.993839" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient31903"
++ id="linearGradient17818"
++ gradientUnits="userSpaceOnUse"
++ x1="-131.28012"
++ y1="-61.197832"
++ x2="-103.60833"
++ y2="-61.197832" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient31919"
++ id="linearGradient17820"
++ gradientUnits="userSpaceOnUse"
++ x1="-62.178917"
++ y1="48.41544"
++ x2="-62.178917"
++ y2="69.447769" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient31957"
++ id="linearGradient17822"
++ gradientUnits="userSpaceOnUse"
++ x1="-58.925537"
++ y1="42.37336"
++ x2="-58.925537"
++ y2="48.842659" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient15112"
++ id="radialGradient17824"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(3.765676,-4.0483607e-7,1.1827774e-7,0.8342809,165.68721,7.2337479)"
++ cx="-59.908398"
++ cy="43.650806"
++ fx="-59.908398"
++ fy="43.650806"
++ r="19.893955" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient15112"
++ id="radialGradient17826"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(3.765676,-4.0483607e-7,1.1827774e-7,0.8342809,165.68721,7.2337479)"
++ cx="-59.908398"
++ cy="43.650806"
++ fx="-59.908398"
++ fy="43.650806"
++ r="19.893955" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient15112"
++ id="radialGradient17828"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(6.0111709,-1.9949852e-8,-1.1362011e-7,0.8342809,300.21122,7.233771)"
++ cx="-59.908398"
++ cy="43.650806"
++ fx="-59.908398"
++ fy="43.650806"
++ r="19.893955" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient31919"
++ id="linearGradient17830"
++ gradientUnits="userSpaceOnUse"
++ x1="-58.687675"
++ y1="60.045853"
++ x2="-58.687675"
++ y2="64.740868" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient31919"
++ id="linearGradient17832"
++ gradientUnits="userSpaceOnUse"
++ x1="-62.178917"
++ y1="48.41544"
++ x2="-62.178917"
++ y2="69.447769" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient34523"
++ id="linearGradient17834"
++ gradientUnits="userSpaceOnUse"
++ x1="-58.769135"
++ y1="72.520035"
++ x2="-58.769135"
++ y2="70" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient32284"
++ id="linearGradient19599"
++ gradientUnits="userSpaceOnUse"
++ x1="-90.014755"
++ y1="76.406967"
++ x2="-72.663399"
++ y2="89.16198" />
++ <filter
++ inkscape:collect="always"
++ x="-0.18703985"
++ width="1.3740797"
++ y="-0.13929709"
++ height="1.2785942"
++ id="filter20847">
++ <feGaussianBlur
++ inkscape:collect="always"
++ stdDeviation="1.969256"
++ id="feGaussianBlur20849" />
++ </filter>
++ <filter
++ inkscape:collect="always"
++ x="-0.43134999"
++ width="1.8627"
++ y="-0.3042558"
++ height="1.6085116"
++ id="filter20973">
++ <feGaussianBlur
++ inkscape:collect="always"
++ stdDeviation="2.5781749"
++ id="feGaussianBlur20975" />
++ </filter>
++ <filter
++ inkscape:collect="always"
++ x="-0.38593284"
++ width="1.7718657"
++ y="-0.27222049"
++ height="1.544441"
++ id="filter21059">
++ <feGaussianBlur
++ inkscape:collect="always"
++ stdDeviation="2.306717"
++ id="feGaussianBlur21061" />
++ </filter>
++ <filter
++ inkscape:collect="always"
++ id="filter21075">
++ <feGaussianBlur
++ inkscape:collect="always"
++ stdDeviation="0.63678634"
++ id="feGaussianBlur21077" />
++ </filter>
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient32284"
++ id="linearGradient21371"
++ gradientUnits="userSpaceOnUse"
++ x1="-90.014755"
++ y1="76.406967"
++ x2="-72.663399"
++ y2="89.16198" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient3395"
++ id="radialGradient21395"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.1403505,3.999897e-8,0,0.377193,20.858665,-13.152623)"
++ cx="-148.61847"
++ cy="-21.118305"
++ fx="-148.61847"
++ fy="-21.118305"
++ r="18.993839" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient15112"
++ id="radialGradient21399"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(3.765676,-4.0483607e-7,1.1827774e-7,0.8342809,165.68721,7.2337479)"
++ cx="-59.908398"
++ cy="43.650806"
++ fx="-59.908398"
++ fy="43.650806"
++ r="19.893955" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient15112"
++ id="radialGradient21401"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(3.765676,-4.0483607e-7,1.1827774e-7,0.8342809,165.68721,7.2337479)"
++ cx="-59.908398"
++ cy="43.650806"
++ fx="-59.908398"
++ fy="43.650806"
++ r="19.893955" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient15112"
++ id="radialGradient21403"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(6.0111709,-1.9949852e-8,-1.1362011e-7,0.8342809,300.21122,7.233771)"
++ cx="-59.908398"
++ cy="43.650806"
++ fx="-59.908398"
++ fy="43.650806"
++ r="19.893955" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9636"
++ id="linearGradient21405"
++ gradientUnits="userSpaceOnUse"
++ x1="-21.526762"
++ y1="188.43985"
++ x2="-32.293846"
++ y2="50.451321" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient14750"
++ id="linearGradient21407"
++ gradientUnits="userSpaceOnUse"
++ x1="-94.79586"
++ y1="-18.852774"
++ x2="57.757927"
++ y2="39.568371" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient18819"
++ id="linearGradient21409"
++ gradientUnits="userSpaceOnUse"
++ x1="-61.503834"
++ y1="48.314587"
++ x2="-110.37608"
++ y2="20.652327" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient18819"
++ id="linearGradient21411"
++ gradientUnits="userSpaceOnUse"
++ x1="-78.935661"
++ y1="26.213943"
++ x2="-111.06066"
++ y2="83.062027" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient18819"
++ id="radialGradient21413"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.55,0,-50.394389)"
++ cx="-143.44777"
++ cy="-111.98753"
++ fx="-143.44777"
++ fy="-111.98753"
++ r="30.263245" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient20677"
++ id="radialGradient21415"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.4177215,0,-16.554858)"
++ cx="-75.885086"
++ cy="39.631329"
++ fx="-75.885086"
++ fy="39.631329"
++ r="5.9769907" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient18819"
++ id="radialGradient21417"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.55,0,-50.394389)"
++ cx="-143.44777"
++ cy="-111.98753"
++ fx="-143.44777"
++ fy="-111.98753"
++ r="30.263245" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient20677"
++ id="radialGradient21419"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.4177215,0,-16.554858)"
++ cx="-75.885086"
++ cy="39.631329"
++ fx="-75.885086"
++ fy="39.631329"
++ r="5.9769907" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10464"
++ id="linearGradient22444"
++ gradientUnits="userSpaceOnUse"
++ x1="-100"
++ y1="108"
++ x2="-100"
++ y2="113" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10464"
++ id="linearGradient22446"
++ gradientUnits="userSpaceOnUse"
++ x1="-100"
++ y1="108"
++ x2="-100"
++ y2="112.71053" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10464"
++ id="linearGradient22448"
++ gradientUnits="userSpaceOnUse"
++ x1="-100"
++ y1="108"
++ x2="-100"
++ y2="113" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10464"
++ id="linearGradient22450"
++ gradientUnits="userSpaceOnUse"
++ x1="-100"
++ y1="108"
++ x2="-100"
++ y2="112.71053" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10464"
++ id="linearGradient22452"
++ gradientUnits="userSpaceOnUse"
++ x1="-100"
++ y1="108"
++ x2="-100"
++ y2="113" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10464"
++ id="linearGradient22454"
++ gradientUnits="userSpaceOnUse"
++ x1="-100"
++ y1="108"
++ x2="-100"
++ y2="112.71053" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10464"
++ id="linearGradient22456"
++ gradientUnits="userSpaceOnUse"
++ x1="-100"
++ y1="108"
++ x2="-100"
++ y2="113" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10464"
++ id="linearGradient22458"
++ gradientUnits="userSpaceOnUse"
++ x1="-100"
++ y1="108"
++ x2="-100"
++ y2="112.71053" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient32284"
++ id="linearGradient22460"
++ gradientUnits="userSpaceOnUse"
++ x1="-90.014755"
++ y1="76.406967"
++ x2="-72.663399"
++ y2="89.16198" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient15505"
++ id="linearGradient22462"
++ gradientUnits="userSpaceOnUse"
++ x1="-110.5908"
++ y1="117.97756"
++ x2="-97.550461"
++ y2="117.97756" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient15505"
++ id="linearGradient22464"
++ gradientUnits="userSpaceOnUse"
++ x1="-110.5908"
++ y1="113.00001"
++ x2="-97.550461"
++ y2="113" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient15505"
++ id="linearGradient22466"
++ gradientUnits="userSpaceOnUse"
++ x1="-110.5908"
++ y1="108.02245"
++ x2="-97.550461"
++ y2="108.02245" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient15505"
++ id="linearGradient22468"
++ gradientUnits="userSpaceOnUse"
++ x1="-110.5908"
++ y1="103.0449"
++ x2="-97.550461"
++ y2="103.04489" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient32284"
++ id="linearGradient22470"
++ gradientUnits="userSpaceOnUse"
++ x1="-106.66008"
++ y1="118.65549"
++ x2="-87.621452"
++ y2="118.65549" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient22472"
++ gradientUnits="userSpaceOnUse"
++ x1="-97.684525"
++ y1="118.65549"
++ x2="-85.221687"
++ y2="118.65549" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient15505"
++ id="linearGradient22474"
++ gradientUnits="userSpaceOnUse"
++ x1="-72.90873"
++ y1="112.38817"
++ x2="-48.1325"
++ y2="106.06841" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient15505"
++ id="linearGradient22476"
++ gradientUnits="userSpaceOnUse"
++ x1="-72.90873"
++ y1="112.38817"
++ x2="-48.1325"
++ y2="106.06841" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient8767"
++ id="linearGradient22478"
++ gradientUnits="userSpaceOnUse"
++ x1="-62"
++ y1="103.20095"
++ x2="-56.23745"
++ y2="103.20095" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient28194"
++ id="linearGradient22480"
++ gradientUnits="userSpaceOnUse"
++ x1="-109.37981"
++ y1="118.65549"
++ x2="-102.99949"
++ y2="118.65549" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient31903"
++ id="linearGradient23457"
++ gradientUnits="userSpaceOnUse"
++ x1="-75.318855"
++ y1="66.556168"
++ x2="-42.257492"
++ y2="66.556168" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient31903"
++ id="linearGradient23459"
++ gradientUnits="userSpaceOnUse"
++ x1="-141.14285"
++ y1="-60.934483"
++ x2="-94.238739"
++ y2="-60.934483" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9636"
++ id="linearGradient24448"
++ x1="64.916145"
++ y1="6.524128"
++ x2="61.831184"
++ y2="27.209581"
++ gradientUnits="userSpaceOnUse" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient31903"
++ id="linearGradient2765"
++ gradientUnits="userSpaceOnUse"
++ x1="-75.318855"
++ y1="66.556168"
++ x2="-42.257492"
++ y2="66.556168" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient3395"
++ id="radialGradient2767"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.1403505,3.999897e-8,0,0.377193,20.858665,-13.152623)"
++ cx="-148.61847"
++ cy="-21.118305"
++ fx="-148.61847"
++ fy="-21.118305"
++ r="18.993839" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient31903"
++ id="linearGradient2769"
++ gradientUnits="userSpaceOnUse"
++ x1="-141.14285"
++ y1="-60.934483"
++ x2="-94.238739"
++ y2="-60.934483" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient31903"
++ id="linearGradient2795"
++ gradientUnits="userSpaceOnUse"
++ x1="-141.14285"
++ y1="-60.934483"
++ x2="-94.238739"
++ y2="-60.934483" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient3395"
++ id="radialGradient2797"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.1403505,3.999897e-8,0,0.377193,20.858665,-13.152623)"
++ cx="-148.61847"
++ cy="-21.118305"
++ fx="-148.61847"
++ fy="-21.118305"
++ r="18.993839" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient31903"
++ id="linearGradient2799"
++ gradientUnits="userSpaceOnUse"
++ x1="-75.318855"
++ y1="66.556168"
++ x2="-42.257492"
++ y2="66.556168" />
++ <filter
++ inkscape:collect="always"
++ x="-0.067734746"
++ width="1.1354695"
++ y="-0.39150529"
++ height="1.7830106"
++ id="filter6206">
++ <feGaussianBlur
++ inkscape:collect="always"
++ stdDeviation="2.4384535"
++ id="feGaussianBlur6208" />
++ </filter>
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient15112"
++ id="radialGradient6282"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(6.0111709,-1.9949852e-8,-1.1362011e-7,0.8342809,300.21122,7.233771)"
++ cx="-59.908398"
++ cy="43.650806"
++ fx="-59.908398"
++ fy="43.650806"
++ r="19.893955" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient15112"
++ id="radialGradient6284"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(3.765676,-4.0483607e-7,1.1827774e-7,0.8342809,165.68721,7.2337479)"
++ cx="-59.908398"
++ cy="43.650806"
++ fx="-59.908398"
++ fy="43.650806"
++ r="19.893955" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient15112"
++ id="radialGradient6286"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(3.765676,-4.0483607e-7,1.1827774e-7,0.8342809,165.68721,7.2337479)"
++ cx="-59.908398"
++ cy="43.650806"
++ fx="-59.908398"
++ fy="43.650806"
++ r="19.893955" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient18819"
++ id="radialGradient6294"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.55,0,-50.394389)"
++ cx="-143.44777"
++ cy="-111.98753"
++ fx="-143.44777"
++ fy="-111.98753"
++ r="30.263245" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient20677"
++ id="radialGradient6300"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.4177215,0,-16.554858)"
++ cx="-75.885086"
++ cy="39.631329"
++ fx="-75.885086"
++ fy="39.631329"
++ r="5.9769907" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient20677"
++ id="radialGradient6304"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.4177215,0,-16.554858)"
++ cx="-75.885086"
++ cy="39.631329"
++ fx="-75.885086"
++ fy="39.631329"
++ r="5.9769907" />
++ <filter
++ inkscape:collect="always"
++ x="-0.24040009"
++ width="1.4808002"
++ y="-0.17289726"
++ height="1.3457945"
++ id="filter6318">
++ <feGaussianBlur
++ inkscape:collect="always"
++ stdDeviation="1.4558076"
++ id="feGaussianBlur6320" />
++ </filter>
++ <filter
++ inkscape:collect="always"
++ x="-0.37313573"
++ width="1.7462715"
++ y="-0.27272112"
++ height="1.5454422"
++ id="filter7221">
++ <feGaussianBlur
++ inkscape:collect="always"
++ stdDeviation="2.2826918"
++ id="feGaussianBlur7223" />
++ </filter>
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient20677"
++ id="radialGradient8013"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.4177215,0,-16.554858)"
++ cx="-75.885086"
++ cy="39.631329"
++ fx="-75.885086"
++ fy="39.631329"
++ r="5.9769907" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient20677"
++ id="radialGradient8015"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.4177215,0,-16.554858)"
++ cx="-75.885086"
++ cy="39.631329"
++ fx="-75.885086"
++ fy="39.631329"
++ r="5.9769907" />
++ <filter
++ inkscape:collect="always"
++ x="-0.17955652"
++ width="1.359113"
++ y="-0.10027765"
++ height="1.2005553"
++ id="filter8053">
++ <feGaussianBlur
++ inkscape:collect="always"
++ stdDeviation="2.145194"
++ id="feGaussianBlur8055" />
++ </filter>
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient20677"
++ id="radialGradient8059"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.4177215,0,-16.554858)"
++ cx="-75.885086"
++ cy="39.631329"
++ fx="-75.885086"
++ fy="39.631329"
++ r="5.9769907" />
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient11109">
++ <stop
++ style="stop-color:#ff7f2a;stop-opacity:1;"
++ offset="0"
++ id="stop11111" />
++ <stop
++ style="stop-color:#ff7f2a;stop-opacity:0;"
++ offset="1"
++ id="stop11113" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient11101">
++ <stop
++ style="stop-color:#ff6600;stop-opacity:1;"
++ offset="0"
++ id="stop11103" />
++ <stop
++ style="stop-color:#ff6600;stop-opacity:0;"
++ offset="1"
++ id="stop11105" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient10112">
++ <stop
++ style="stop-color:#000000;stop-opacity:1;"
++ offset="0"
++ id="stop10114" />
++ <stop
++ style="stop-color:#000000;stop-opacity:0;"
++ offset="1"
++ id="stop10116" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient9272">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop9274" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0;"
++ offset="1"
++ id="stop5909" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient6146">
++ <stop
++ style="stop-color:#a5490f;stop-opacity:1;"
++ offset="0"
++ id="stop6148" />
++ <stop
++ style="stop-color:#a5490f;stop-opacity:0;"
++ offset="1"
++ id="stop6150" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient5093">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop5095" />
++ <stop
++ id="stop6140"
++ offset="0.53424901"
++ style="stop-color:#ffffff;stop-opacity:0.74901962;" />
++ <stop
++ id="stop6138"
++ offset="0.79475379"
++ style="stop-color:#ff6d00;stop-opacity:0.19387755;" />
++ <stop
++ style="stop-color:#fff3eb;stop-opacity:0.43877551;"
++ offset="0.89737689"
++ id="stop6142" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0;"
++ offset="1"
++ id="stop5097" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5093"
++ id="linearGradient11294"
++ gradientUnits="userSpaceOnUse"
++ x1="386.14459"
++ y1="115.35861"
++ x2="413.19955"
++ y2="140.15959" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5093"
++ id="linearGradient11296"
++ gradientUnits="userSpaceOnUse"
++ x1="380.01404"
++ y1="106.72007"
++ x2="406.92963"
++ y2="130.4884" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="radialGradient18449"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.262677,0,344.2845)"
++ cx="194.91234"
++ cy="466.93869"
++ fx="194.91234"
++ fy="466.93869"
++ r="30.869989" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="radialGradient18553"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.262677,0,344.2845)"
++ cx="194.91234"
++ cy="466.93869"
++ fx="194.91234"
++ fy="466.93869"
++ r="30.869989" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="radialGradient24623"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.336283,0,147.1439)"
++ cx="-86.366577"
++ cy="221.69688"
++ fx="-86.366577"
++ fy="221.69688"
++ r="25.615286" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="radialGradient29552"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.336283,0,147.144)"
++ cx="-86.366577"
++ cy="221.69688"
++ fx="-86.366577"
++ fy="221.69688"
++ r="25.615286" />
++ <linearGradient
++ id="linearGradient7913">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop7915" />
++ <stop
++ style="stop-color:#000000;stop-opacity:0;"
++ offset="1"
++ id="stop7917" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient3354">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop3356" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0;"
++ offset="1"
++ id="stop3358" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3281">
++ <stop
++ id="stop3283"
++ offset="0"
++ style="stop-color:#ffffff;stop-opacity:0.53597122;" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0.49803922;"
++ offset="0.12041885"
++ id="stop3285" />
++ <stop
++ id="stop3287"
++ offset="1"
++ style="stop-color:#ffffff;stop-opacity:0;" />
++ </linearGradient>
++ <radialGradient
++ r="77.78125"
++ fy="37.536674"
++ fx="-419.27335"
++ cy="37.536674"
++ cx="-419.27335"
++ gradientTransform="matrix(3.813189,0.198478,-7.743124e-2,1.118624,1648.681,240.1841)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient30183"
++ xlink:href="#linearGradient9274"
++ inkscape:collect="always" />
++ <radialGradient
++ r="77.78125"
++ fy="37.536674"
++ fx="-419.27335"
++ cy="37.536674"
++ cx="-419.27335"
++ gradientTransform="matrix(3.813189,0.206677,-7.743124e-2,1.164834,1648.681,242.6353)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient30181"
++ xlink:href="#linearGradient9274"
++ inkscape:collect="always" />
++ <radialGradient
++ r="77.784615"
++ fy="188.62517"
++ fx="-431.58975"
++ cy="188.62517"
++ cx="-431.58975"
++ gradientTransform="matrix(2.416974,1.22759e-2,-8.505055e-3,1.270535,1037.489,126.0437)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient30179"
++ xlink:href="#linearGradient2315"
++ inkscape:collect="always" />
++ <linearGradient
++ id="linearGradient2315">
++ <stop
++ id="stop2317"
++ offset="0"
++ style="stop-color:#e0e0e0;stop-opacity:1;" />
++ <stop
++ id="stop2319"
++ offset="1"
++ style="stop-color:#545454;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient9274">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop9276" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0;"
++ offset="1"
++ id="stop9278" />
++ </linearGradient>
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="103.7354"
++ x2="-7.8838911"
++ y1="107.13062"
++ x1="-4.5150189"
++ id="linearGradient3803"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ id="linearGradient3792"
++ gradientTransform="scale(4.5472461,0.2199133)"
++ x1="-0.78039103"
++ y1="149.69525"
++ x2="19.68073"
++ y2="149.69525"
++ gradientUnits="userSpaceOnUse">
++ <stop
++ style="stop-color:#000000;stop-opacity:0.25416666;"
++ offset="0.0000000"
++ id="stop3794" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0.26274511;"
++ offset="1.0000000"
++ id="stop3796" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4550">
++ <stop
++ id="stop4552"
++ offset="0"
++ style="stop-color:white;stop-opacity:0;" />
++ <stop
++ style="stop-color:black;stop-opacity:0;"
++ offset="0.5"
++ id="stop4558" />
++ <stop
++ id="stop4554"
++ offset="1"
++ style="stop-color:black;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient2370">
++ <stop
++ id="stop2378"
++ offset="0"
++ style="stop-color:#000000;stop-opacity:1;" />
++ <stop
++ style="stop-color:#2a2a2a;stop-opacity:1;"
++ offset="1"
++ id="stop2374" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient8846"
++ inkscape:collect="always">
++ <stop
++ id="stop8848"
++ offset="0"
++ style="stop-color:#ffffff;stop-opacity:1;" />
++ <stop
++ id="stop8850"
++ offset="1"
++ style="stop-color:#ffffff;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient10610"
++ inkscape:collect="always">
++ <stop
++ id="stop10612"
++ offset="0"
++ style="stop-color:#fff6f6;stop-opacity:1;" />
++ <stop
++ id="stop10614"
++ offset="1"
++ style="stop-color:#fff6f6;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient17612"
++ inkscape:collect="always">
++ <stop
++ id="stop17614"
++ offset="0"
++ style="stop-color:#000000;stop-opacity:1;" />
++ <stop
++ id="stop17616"
++ offset="1"
++ style="stop-color:#000000;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient2783">
++ <stop
++ style="stop-color:#323232;stop-opacity:1;"
++ offset="0"
++ id="stop2785" />
++ <stop
++ id="stop2787"
++ offset="0.07692308"
++ style="stop-color:#dfe1e1;stop-opacity:1;" />
++ <stop
++ style="stop-color:#b6b1b1;stop-opacity:1;"
++ offset="0.26289096"
++ id="stop2799" />
++ <stop
++ id="stop2789"
++ offset="0.5"
++ style="stop-color:#8d8282;stop-opacity:1;" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0.78201604"
++ id="stop2791" />
++ <stop
++ style="stop-color:#dfd9df;stop-opacity:1;"
++ offset="0.9005897"
++ id="stop2793" />
++ <stop
++ style="stop-color:#3a3a3a;stop-opacity:1;"
++ offset="1"
++ id="stop2795" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient3115">
++ <stop
++ style="stop-color:white;stop-opacity:1;"
++ offset="0"
++ id="stop3117" />
++ <stop
++ style="stop-color:white;stop-opacity:0;"
++ offset="1"
++ id="stop3119" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient2972">
++ <stop
++ style="stop-color:white;stop-opacity:1;"
++ offset="0"
++ id="stop2974" />
++ <stop
++ style="stop-color:white;stop-opacity:0;"
++ offset="1"
++ id="stop2976" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient2948">
++ <stop
++ style="stop-color:white;stop-opacity:1;"
++ offset="0"
++ id="stop2950" />
++ <stop
++ style="stop-color:white;stop-opacity:0;"
++ offset="1"
++ id="stop2952" />
++ </linearGradient>
++ <linearGradient
++ id="XMLID_12_"
++ gradientUnits="userSpaceOnUse"
++ x1="497.81451"
++ y1="732.4082"
++ x2="497.81451"
++ y2="736.62341"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)">
++ <stop
++ offset="0"
++ style="stop-color:#094422"
++ id="stop68" />
++ <stop
++ offset="1"
++ style="stop-color:#9ED676"
++ id="stop70" />
++ </linearGradient>
++ <linearGradient
++ id="XMLID_11_"
++ gradientUnits="userSpaceOnUse"
++ x1="579.72852"
++ y1="732.41022"
++ x2="579.72852"
++ y2="736.55688"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)">
++ <stop
++ offset="0"
++ style="stop-color:#094422"
++ id="stop61" />
++ <stop
++ offset="1"
++ style="stop-color:#9ED676"
++ id="stop63" />
++ </linearGradient>
++ <radialGradient
++ cx="265.3931"
++ cy="-6078.353"
++ r="253.01871"
++ fx="267.36481"
++ fy="-6071.0229"
++ id="path2295_1_"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.244472,0,0,-1.859374e-2,-10.10742,1.2728)">
++ <stop
++ style="stop-color:#000000;stop-opacity:1"
++ offset="0"
++ id="stop8" />
++ <stop
++ style="stop-color:black;stop-opacity:0;"
++ offset="1"
++ id="stop10" />
++ <a:midPointStop
++ style="stop-color:#000000"
++ offset="0" />
++ <a:midPointStop
++ style="stop-color:#000000"
++ offset="0.5" />
++ <a:midPointStop
++ style="stop-color:#FFFFFF"
++ offset="1" />
++ </radialGradient>
++ <linearGradient
++ id="linearGradient33711"
++ inkscape:collect="always">
++ <stop
++ id="stop33713"
++ offset="0"
++ style="stop-color:black;stop-opacity:1;" />
++ <stop
++ id="stop33715"
++ offset="1"
++ style="stop-color:black;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient9846">
++ <stop
++ style="stop-color:white;stop-opacity:0;"
++ offset="0"
++ id="stop9848" />
++ <stop
++ id="stop9850"
++ offset="0.5"
++ style="stop-color:white;stop-opacity:0;" />
++ <stop
++ style="stop-color:white;stop-opacity:1;"
++ offset="1"
++ id="stop9852" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient5806">
++ <stop
++ id="stop5808"
++ offset="0"
++ style="stop-color:#99c3f5;stop-opacity:1;" />
++ <stop
++ id="stop5810"
++ offset="0.5"
++ style="stop-color:#2c72c7;stop-opacity:1;" />
++ <stop
++ style="stop-color:#2d8afc;stop-opacity:1;"
++ offset="0.70029485"
++ id="stop5818" />
++ <stop
++ style="stop-color:#0c376c;stop-opacity:1;"
++ offset="0.9005897"
++ id="stop5814" />
++ <stop
++ style="stop-color:#101656;stop-opacity:1;"
++ offset="1"
++ id="stop5816" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient5922"
++ inkscape:collect="always">
++ <stop
++ id="stop5924"
++ offset="0"
++ style="stop-color:black;stop-opacity:1;" />
++ <stop
++ id="stop5926"
++ offset="1"
++ style="stop-color:black;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient5931"
++ inkscape:collect="always">
++ <stop
++ id="stop5933"
++ offset="0"
++ style="stop-color:black;stop-opacity:1;" />
++ <stop
++ id="stop5935"
++ offset="1"
++ style="stop-color:black;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient5939"
++ inkscape:collect="always">
++ <stop
++ id="stop5941"
++ offset="0"
++ style="stop-color:black;stop-opacity:1;" />
++ <stop
++ id="stop5943"
++ offset="1"
++ style="stop-color:black;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient5947"
++ inkscape:collect="always">
++ <stop
++ id="stop5949"
++ offset="0"
++ style="stop-color:black;stop-opacity:1;" />
++ <stop
++ id="stop5951"
++ offset="1"
++ style="stop-color:black;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient5974"
++ inkscape:collect="always">
++ <stop
++ id="stop5976"
++ offset="0"
++ style="stop-color:black;stop-opacity:1;" />
++ <stop
++ id="stop5978"
++ offset="1"
++ style="stop-color:black;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient5983"
++ inkscape:collect="always">
++ <stop
++ id="stop5985"
++ offset="0"
++ style="stop-color:black;stop-opacity:1;" />
++ <stop
++ id="stop5987"
++ offset="1"
++ style="stop-color:black;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient5991"
++ inkscape:collect="always">
++ <stop
++ id="stop5993"
++ offset="0"
++ style="stop-color:black;stop-opacity:1;" />
++ <stop
++ id="stop5995"
++ offset="1"
++ style="stop-color:black;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient8307">
++ <stop
++ style="stop-color:#9ef599;stop-opacity:1;"
++ offset="0"
++ id="stop8309" />
++ <stop
++ style="stop-color:#2cc735;stop-opacity:1;"
++ offset="0.5"
++ id="stop8311" />
++ <stop
++ id="stop8313"
++ offset="0.70029485"
++ style="stop-color:#33fc2d;stop-opacity:1;" />
++ <stop
++ id="stop8315"
++ offset="0.9005897"
++ style="stop-color:#136c0c;stop-opacity:1;" />
++ <stop
++ id="stop8317"
++ offset="1"
++ style="stop-color:#145610;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient8319">
++ <stop
++ style="stop-color:#f59999;stop-opacity:1;"
++ offset="0"
++ id="stop8321" />
++ <stop
++ style="stop-color:#c7302c;stop-opacity:1;"
++ offset="0.5"
++ id="stop8323" />
++ <stop
++ id="stop8325"
++ offset="0.70029485"
++ style="stop-color:#fc2d30;stop-opacity:1;" />
++ <stop
++ id="stop8327"
++ offset="0.9005897"
++ style="stop-color:#6c0c0c;stop-opacity:1;" />
++ <stop
++ id="stop8329"
++ offset="1"
++ style="stop-color:#561110;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient8331">
++ <stop
++ style="stop-color:#f5e199;stop-opacity:1;"
++ offset="0"
++ id="stop8333" />
++ <stop
++ style="stop-color:#c7a92c;stop-opacity:1;"
++ offset="0.5"
++ id="stop8335" />
++ <stop
++ id="stop8337"
++ offset="0.70029485"
++ style="stop-color:#fce92d;stop-opacity:1;" />
++ <stop
++ id="stop8339"
++ offset="0.9005897"
++ style="stop-color:#6c610c;stop-opacity:1;" />
++ <stop
++ id="stop8341"
++ offset="1"
++ style="stop-color:#565510;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient8343">
++ <stop
++ style="stop-color:#f599bd;stop-opacity:1;"
++ offset="0"
++ id="stop8345" />
++ <stop
++ style="stop-color:#c72c74;stop-opacity:1;"
++ offset="0.5"
++ id="stop8347" />
++ <stop
++ id="stop8349"
++ offset="0.70029485"
++ style="stop-color:#fc2d92;stop-opacity:1;" />
++ <stop
++ id="stop8351"
++ offset="0.9005897"
++ style="stop-color:#6c0c37;stop-opacity:1;" />
++ <stop
++ id="stop8353"
++ offset="1"
++ style="stop-color:#561030;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient8355">
++ <stop
++ style="stop-color:#c7c7c7;stop-opacity:1;"
++ offset="0"
++ id="stop8357" />
++ <stop
++ style="stop-color:#797979;stop-opacity:1;"
++ offset="0.5"
++ id="stop8359" />
++ <stop
++ id="stop8361"
++ offset="0.70029485"
++ style="stop-color:#959595;stop-opacity:1;" />
++ <stop
++ id="stop8363"
++ offset="0.9005897"
++ style="stop-color:#3c3c3c;stop-opacity:1;" />
++ <stop
++ id="stop8365"
++ offset="1"
++ style="stop-color:#333;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient8367">
++ <stop
++ style="stop-color:#f5c799;stop-opacity:1;"
++ offset="0"
++ id="stop8369" />
++ <stop
++ style="stop-color:#c7662c;stop-opacity:1;"
++ offset="0.5"
++ id="stop8371" />
++ <stop
++ id="stop8373"
++ offset="0.70029485"
++ style="stop-color:#fc962d;stop-opacity:1;" />
++ <stop
++ id="stop8375"
++ offset="0.9005897"
++ style="stop-color:#6c3a0c;stop-opacity:1;" />
++ <stop
++ id="stop8377"
++ offset="1"
++ style="stop-color:#562e10;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient8379">
++ <stop
++ style="stop-color:#f5cf99;stop-opacity:1;"
++ offset="0"
++ id="stop8381" />
++ <stop
++ style="stop-color:#c7742c;stop-opacity:1;"
++ offset="0.5"
++ id="stop8383" />
++ <stop
++ id="stop8385"
++ offset="0.70029485"
++ style="stop-color:#fc9d2d;stop-opacity:1;" />
++ <stop
++ id="stop8387"
++ offset="0.9005897"
++ style="stop-color:#6c450c;stop-opacity:1;" />
++ <stop
++ id="stop8389"
++ offset="1"
++ style="stop-color:#563910;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient9287"
++ inkscape:collect="always">
++ <stop
++ id="stop9289"
++ offset="0"
++ style="stop-color:black;stop-opacity:1;" />
++ <stop
++ id="stop9291"
++ offset="1"
++ style="stop-color:black;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient33782"
++ inkscape:collect="always">
++ <stop
++ id="stop33784"
++ offset="0"
++ style="stop-color:#552200;stop-opacity:1;" />
++ <stop
++ id="stop33786"
++ offset="1"
++ style="stop-color:#552200;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9636"
++ id="linearGradient4658"
++ gradientUnits="userSpaceOnUse"
++ x1="64.916145"
++ y1="6.524128"
++ x2="61.831184"
++ y2="27.209581" />
++ <linearGradient
++ y2="130.4884"
++ x2="406.92963"
++ y1="106.72007"
++ x1="380.01404"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient5081"
++ xlink:href="#linearGradient5093"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="140.15959"
++ x2="413.19955"
++ y1="115.35861"
++ x1="386.14459"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient5079"
++ xlink:href="#linearGradient5093"
++ inkscape:collect="always" />
++ <radialGradient
++ r="30.869989"
++ fy="466.93869"
++ fx="194.91234"
++ cy="466.93869"
++ cx="194.91234"
++ gradientTransform="matrix(0.376082,0,0,9.8788092e-2,120.462,471.3956)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient5077"
++ xlink:href="#linearGradient10112"
++ inkscape:collect="always" />
++ <radialGradient
++ r="25.615286"
++ fy="221.69688"
++ fx="-86.366577"
++ cy="221.69688"
++ cx="-86.366577"
++ gradientTransform="matrix(1.004465,0,0,0.1991549,-51.54828,434.19795)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient5075"
++ xlink:href="#linearGradient10112"
++ inkscape:collect="always" />
++ <radialGradient
++ r="30.869989"
++ fy="466.93869"
++ fx="194.91234"
++ cy="466.93869"
++ cx="194.91234"
++ gradientTransform="matrix(0.376082,0,0,9.8788092e-2,120.462,471.3956)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient5073"
++ xlink:href="#linearGradient10112"
++ inkscape:collect="always" />
++ <radialGradient
++ r="25.615286"
++ fy="221.69688"
++ fx="-86.366577"
++ cy="221.69688"
++ cx="-86.366577"
++ gradientTransform="matrix(1.004465,0,0,0.1991549,-51.54828,434.19801)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient5071"
++ xlink:href="#linearGradient10112"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="649.67863"
++ x2="384.45596"
++ y1="649.67863"
++ x1="344.97817"
++ id="linearGradient5069"
++ xlink:href="#linearGradient33782"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="524.64142"
++ x2="390.85745"
++ y1="524.64142"
++ x1="344.52829"
++ id="linearGradient5067"
++ xlink:href="#linearGradient33782"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="1011.7612"
++ x2="46.474281"
++ y1="961.31982"
++ x1="46.954712"
++ spreadMethod="pad"
++ gradientTransform="matrix(0.519558,0,0,3.491484e-2,-6.863658,-7.477052)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient5065"
++ xlink:href="#shadow25to25w"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="511.39896"
++ x2="188.60104"
++ y1="505.95853"
++ x1="182.77399"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient5063"
++ xlink:href="#linearGradient9272"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="511.39896"
++ x2="188.60104"
++ y1="505.95853"
++ x1="182.77399"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient5061"
++ xlink:href="#linearGradient9272"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="511.39896"
++ x2="188.60104"
++ y1="505.95853"
++ x1="182.77399"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient5059"
++ xlink:href="#linearGradient9272"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="511.39896"
++ x2="188.60104"
++ y1="505.95853"
++ x1="182.77399"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient5057"
++ xlink:href="#linearGradient9272"
++ inkscape:collect="always" />
++ <radialGradient
++ r="25.615286"
++ fy="221.69688"
++ fx="-86.366577"
++ cy="221.69688"
++ cx="-86.366577"
++ gradientTransform="matrix(1.004465,0,0,0.1991549,-51.54828,434.19801)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient5055"
++ xlink:href="#linearGradient10112"
++ inkscape:collect="always" />
++ <radialGradient
++ r="20.006395"
++ fy="165.37859"
++ fx="435.82858"
++ cy="165.37859"
++ cx="435.82858"
++ gradientTransform="matrix(1,0,0,1.069643,0,-11.51754)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient5053"
++ xlink:href="#linearGradient5093"
++ inkscape:collect="always" />
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,4.7187499,0,-1377.5419)"
++ r="9.4754658"
++ fy="370.43146"
++ fx="408.62946"
++ cy="370.43146"
++ cx="408.62946"
++ id="radialGradient5051"
++ xlink:href="#linearGradient3354"
++ inkscape:collect="always" />
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ r="31.68359"
++ fy="209.64467"
++ fx="492.13199"
++ cy="209.64467"
++ cx="492.13199"
++ id="radialGradient5049"
++ xlink:href="#linearGradient9272"
++ inkscape:collect="always" />
++ <linearGradient
++ id="linearGradient5007">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop5009" />
++ <stop
++ id="stop5011"
++ offset="0.53424901"
++ style="stop-color:#ffffff;stop-opacity:0.74901962;" />
++ <stop
++ id="stop5013"
++ offset="0.79475379"
++ style="stop-color:#ff6d00;stop-opacity:0.19387755;" />
++ <stop
++ style="stop-color:#fff3eb;stop-opacity:0.43877551;"
++ offset="0.89737689"
++ id="stop5015" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0;"
++ offset="1"
++ id="stop5017" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5093"
++ id="linearGradient5005"
++ gradientUnits="userSpaceOnUse"
++ x1="124.34831"
++ y1="255.53125"
++ x2="154.3125"
++ y2="255.53125" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient6130"
++ id="radialGradient5003"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(3.018153,-0.198338,0.999999,15.2172,-573.1514,-3660.366)"
++ cx="154.3125"
++ cy="261.72546"
++ fx="154.3125"
++ fy="261.72546"
++ r="9.6875" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5093"
++ id="linearGradient5001"
++ gradientUnits="userSpaceOnUse"
++ x1="197.33527"
++ y1="173.57684"
++ x2="204.04497"
++ y2="190.32561" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5093"
++ id="linearGradient4999"
++ gradientUnits="userSpaceOnUse"
++ x1="193.79219"
++ y1="161.88548"
++ x2="210.38727"
++ y2="193.21553" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5093"
++ id="linearGradient4997"
++ gradientUnits="userSpaceOnUse"
++ x1="201.27988"
++ y1="164.44705"
++ x2="241.52028"
++ y2="201.49139" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5093"
++ id="radialGradient4995"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.252421,0,139.8933)"
++ cx="236.85098"
++ cy="187.12843"
++ fx="236.85098"
++ fy="187.12843"
++ r="17.656097" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient6146"
++ id="radialGradient4993"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.949879,1.261556,-1.394773,2.15578,432.7053,-499.3546)"
++ cx="208.16347"
++ cy="207.82416"
++ fx="208.16347"
++ fy="207.82416"
++ r="6.6381311" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient6146"
++ id="radialGradient4991"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.868056,0,21.14057)"
++ cx="232.96208"
++ cy="160.22333"
++ fx="226.87378"
++ fy="167.60678"
++ r="20.063719" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5093"
++ id="linearGradient4989"
++ gradientUnits="userSpaceOnUse"
++ x1="386.14459"
++ y1="115.35861"
++ x2="413.19955"
++ y2="140.15959" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5093"
++ id="linearGradient4987"
++ gradientUnits="userSpaceOnUse"
++ x1="380.01404"
++ y1="106.72007"
++ x2="406.92963"
++ y2="130.4884" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient6146"
++ id="radialGradient4985"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(2.883515,2.54802,-0.812868,0.919898,376.3124,-265.8717)"
++ cx="103.18236"
++ cy="289.65045"
++ fx="103.18236"
++ fy="289.65045"
++ r="33.737816" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4983"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.23378,0,-73.99077)"
++ cx="496.83994"
++ cy="316.49789"
++ fx="496.83994"
++ fy="316.49789"
++ r="19.29122" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient6146"
++ id="radialGradient4981"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.97507,-0.26012,1.029164,3.857866,116.2489,-596.921)"
++ cx="68.912399"
++ cy="195.74823"
++ fx="68.912399"
++ fy="195.74823"
++ r="26.2547" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4979"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.980518,0,3.800999)"
++ cx="393.86404"
++ cy="195.10658"
++ fx="393.86404"
++ fy="195.10658"
++ r="19.291225" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient6146"
++ id="linearGradient4977"
++ x1="57.125317"
++ y1="441.09116"
++ x2="413.245"
++ y2="441.09116"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="translate(-21.04617,64.64181)" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4975"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,6.527352e-3,0,520.7029)"
++ cx="182.6507"
++ cy="522.61084"
++ fx="182.6507"
++ fy="522.61084"
++ r="153.08473" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4973"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,6.527352e-3,0,660.7029)"
++ cx="182.6507"
++ cy="522.61084"
++ fx="182.6507"
++ fy="522.61084"
++ r="153.08473" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient6146"
++ id="linearGradient4971"
++ x1="33.955959"
++ y1="631.08807"
++ x2="361.38083"
++ y2="631.08807"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="translate(-5.440414,2.266839)" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="radialGradient4969"
++ cx="182.65625"
++ cy="545.74918"
++ fx="182.65625"
++ fy="545.74918"
++ r="152.59375"
++ gradientTransform="matrix(1,0,0,9.016261e-3,0,542.1109)"
++ gradientUnits="userSpaceOnUse" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="radialGradient4967"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,9.016261e-3,0,682.1109)"
++ cx="182.65625"
++ cy="545.74918"
++ fx="182.65625"
++ fy="545.74918"
++ r="152.59375" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient11101"
++ id="linearGradient4965"
++ x1="29.92228"
++ y1="646.95596"
++ x2="312.82383"
++ y2="646.95596"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="translate(0,-2.564636)" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient11109"
++ id="linearGradient4963"
++ x1="30.829016"
++ y1="518.2798"
++ x2="315.54404"
++ y2="518.2798"
++ gradientUnits="userSpaceOnUse" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient11109"
++ id="radialGradient4961"
++ cx="287.23923"
++ cy="237.72437"
++ fx="287.23923"
++ fy="237.72437"
++ r="261.59286"
++ gradientTransform="matrix(1,0,0,0.654412,0,82.15474)"
++ gradientUnits="userSpaceOnUse" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient11101"
++ id="radialGradient4959"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(-0.886431,-1.917923,1.380589,-0.638087,204.7547,2079.809)"
++ cx="993.13391"
++ cy="346.05869"
++ fx="993.13391"
++ fy="346.05869"
++ r="350" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="radialGradient4957"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.193182,0,376.7346)"
++ cx="194.91234"
++ cy="466.93869"
++ fx="194.91234"
++ fy="466.93869"
++ r="28.210997" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="radialGradient4955"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.262677,0,344.2845)"
++ cx="194.91234"
++ cy="466.93869"
++ fx="194.91234"
++ fy="466.93869"
++ r="30.869989" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="linearGradient4953"
++ gradientUnits="userSpaceOnUse"
++ x1="200.76781"
++ y1="533.32452"
++ x2="197.27606"
++ y2="492.97479" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5093"
++ id="linearGradient4951"
++ gradientUnits="userSpaceOnUse"
++ x1="181.49075"
++ y1="517.13098"
++ x2="223.12334"
++ y2="466.93869" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4949"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.700244,0.981636,-1.242151,2.151469,501.8008,-776.2419)"
++ cx="191.02414"
++ cy="512.33752"
++ fx="191.02414"
++ fy="512.33752"
++ r="2.1534975" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4947"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.700244,0.981636,-1.242151,2.151469,501.8008,-776.2419)"
++ cx="191.02414"
++ cy="512.33752"
++ fx="191.02414"
++ fy="512.33752"
++ r="2.1534975" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4945"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.700244,0.981636,-1.242151,2.151469,501.8008,-776.2419)"
++ cx="191.02414"
++ cy="512.33752"
++ fx="191.02414"
++ fy="512.33752"
++ r="2.1534975" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4943"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.700244,0.981636,-1.242151,2.151469,501.8008,-776.2419)"
++ cx="191.02414"
++ cy="512.33752"
++ fx="191.02414"
++ fy="512.33752"
++ r="2.1534975" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4941"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.700244,0.981636,-1.242151,2.151469,501.8008,-776.2419)"
++ cx="191.02414"
++ cy="512.33752"
++ fx="191.02414"
++ fy="512.33752"
++ r="2.1534975" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4939"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.700244,0.981636,-1.242151,2.151469,501.8008,-776.2419)"
++ cx="191.02414"
++ cy="512.33752"
++ fx="191.02414"
++ fy="512.33752"
++ r="2.1534975" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4937"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.220802,-0.32058,359.0289)"
++ cx="194.91234"
++ cy="466.93869"
++ fx="194.91234"
++ fy="466.93869"
++ r="29.210997" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4935"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.193182,-0.32058,371.9259)"
++ cx="194.91234"
++ cy="480.21454"
++ fx="194.91234"
++ fy="480.21454"
++ r="28.210997" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="linearGradient4933"
++ gradientUnits="userSpaceOnUse"
++ x1="155.96193"
++ y1="460.30829"
++ x2="168.11174"
++ y2="468.72351" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="linearGradient4931"
++ gradientUnits="userSpaceOnUse"
++ x1="149.6114"
++ y1="487.14859"
++ x2="175.19263"
++ y2="483.80591" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="radialGradient4929"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.193182,0,376.7346)"
++ cx="194.91234"
++ cy="466.93869"
++ fx="194.91234"
++ fy="466.93869"
++ r="28.210997" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="radialGradient4927"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.262677,0,344.2845)"
++ cx="194.91234"
++ cy="466.93869"
++ fx="194.91234"
++ fy="466.93869"
++ r="30.869989" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="linearGradient4925"
++ gradientUnits="userSpaceOnUse"
++ x1="200.76781"
++ y1="533.32452"
++ x2="197.27606"
++ y2="492.97479" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5093"
++ id="linearGradient4923"
++ gradientUnits="userSpaceOnUse"
++ x1="181.49075"
++ y1="517.13098"
++ x2="223.12334"
++ y2="466.93869" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4921"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.146536,-0.32058,393.7064)"
++ cx="194.91234"
++ cy="466.93869"
++ fx="194.91234"
++ fy="466.93869"
++ r="29.210997" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4919"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.140346,-0.32058,396.5968)"
++ cx="194.91234"
++ cy="480.21454"
++ fx="194.91234"
++ fy="480.21454"
++ r="28.210997" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="linearGradient4917"
++ gradientUnits="userSpaceOnUse"
++ x1="155.96193"
++ y1="460.30829"
++ x2="168.11174"
++ y2="468.72351" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="linearGradient4915"
++ gradientUnits="userSpaceOnUse"
++ x1="149.6114"
++ y1="487.14859"
++ x2="175.19263"
++ y2="483.80591" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4913"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(2.757763,8.668189e-5,-3.377087e-4,10.74412,-314.9406,-4801.67)"
++ cx="177.26756"
++ cy="492.77451"
++ fx="177.26756"
++ fy="492.77451"
++ r="2.1208501" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="radialGradient4911"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.336283,0,147.1439)"
++ cx="-86.366577"
++ cy="221.69688"
++ fx="-86.366577"
++ fy="221.69688"
++ r="25.615286" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="radialGradient4909"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.336283,0,147.1439)"
++ cx="-86.366577"
++ cy="221.69688"
++ fx="-86.366577"
++ fy="221.69688"
++ r="25.615286" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4907"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.004465,0,0,0.218092,-52.18944,242.7779)"
++ cx="-86.366577"
++ cy="221.69688"
++ fx="-86.366577"
++ fy="221.69688"
++ r="26.911839" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4905"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.004465,0,0,0.218092,-52.18944,242.7779)"
++ cx="-86.366577"
++ cy="249.67316"
++ fx="-86.366577"
++ fy="249.67316"
++ r="26.911839" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5093"
++ id="linearGradient4903"
++ gradientUnits="userSpaceOnUse"
++ x1="-127.9455"
++ y1="272.58051"
++ x2="-60.751289"
++ y2="221.69688" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="linearGradient4901"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="translate(-228.2526,1.282318)"
++ x1="-46.077526"
++ y1="374.72781"
++ x2="75.345665"
++ y2="390.18799" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="linearGradient4899"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="translate(-223.1233,1.282318)"
++ x1="-74.861534"
++ y1="324.60141"
++ x2="94.185738"
++ y2="362.42978" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="radialGradient4897"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.336283,0,147.1439)"
++ cx="-86.366577"
++ cy="221.69688"
++ fx="-86.366577"
++ fy="221.69688"
++ r="25.615286" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4895"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.004465,0,0,0.163844,-52.18944,253.3438)"
++ cx="-86.366577"
++ cy="221.69688"
++ fx="-86.366577"
++ fy="221.69688"
++ r="26.911839" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4893"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.004465,0,0,0.152844,-52.18944,255.6026)"
++ cx="-86.366577"
++ cy="249.67316"
++ fx="-86.366577"
++ fy="249.67316"
++ r="26.911839" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5093"
++ id="linearGradient4891"
++ gradientUnits="userSpaceOnUse"
++ x1="-127.9455"
++ y1="272.58051"
++ x2="-60.751289"
++ y2="221.69688" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="linearGradient4889"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="translate(-228.2526,1.282318)"
++ x1="-46.077526"
++ y1="374.72781"
++ x2="75.345665"
++ y2="390.18799" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="linearGradient4887"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="translate(-223.1233,1.282318)"
++ x1="-74.861534"
++ y1="324.60141"
++ x2="94.185738"
++ y2="362.42978" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient11101"
++ id="radialGradient4885"
++ cx="284.15237"
++ cy="491.51865"
++ fx="284.15237"
++ fy="491.51865"
++ r="12.698357"
++ gradientTransform="matrix(1.55378,-8.717502e-3,7.222429e-3,1.287303,-160.908,-139.5149)"
++ gradientUnits="userSpaceOnUse" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="radialGradient4883"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.336283,0,147.144)"
++ cx="-86.366577"
++ cy="221.69688"
++ fx="-86.366577"
++ fy="221.69688"
++ r="25.615286" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="radialGradient4881"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,0.336283,0,147.144)"
++ cx="-86.366577"
++ cy="221.69688"
++ fx="-86.366577"
++ fy="221.69688"
++ r="25.615286" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4879"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.004465,0,0,0.163844,-52.18944,253.3438)"
++ cx="-86.366577"
++ cy="221.69688"
++ fx="-86.366577"
++ fy="221.69688"
++ r="26.911839" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4877"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1.004465,0,0,0.152844,-52.18944,255.6026)"
++ cx="-86.366577"
++ cy="249.67316"
++ fx="-86.366577"
++ fy="249.67316"
++ r="26.911839" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient5093"
++ id="linearGradient4875"
++ gradientUnits="userSpaceOnUse"
++ x1="-127.9455"
++ y1="272.58051"
++ x2="-60.751289"
++ y2="221.69688" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="linearGradient4873"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="translate(-228.2526,1.282318)"
++ x1="-46.077526"
++ y1="374.72781"
++ x2="75.345665"
++ y2="390.18799" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="linearGradient4871"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="translate(-223.1233,1.282318)"
++ x1="-74.861534"
++ y1="324.60141"
++ x2="94.185738"
++ y2="362.42978" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4869"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4867"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4865"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4863"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4861"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4859"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4857"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4855"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4853"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4851"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4849"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4847"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4845"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4843"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4841"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4839"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4837"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4835"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4833"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4831"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4829"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4827"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4825"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4823"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4821"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4819"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4817"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4815"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4813"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4811"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4809"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4807"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4805"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4803"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4801"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4799"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4797"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4795"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4793"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4791"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4789"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4787"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4785"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4783"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4781"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4779"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4777"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4775"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4773"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4771"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4769"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4767"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4765"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4763"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4761"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4759"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4757"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4753"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4751"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4749"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4747"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4745"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4743"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4741"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4739"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4737"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4735"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4731"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4729"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4727"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4725"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4723"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4721"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4719"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4717"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(1,0,0,1.208333,0,-130.8156)"
++ cx="170.91969"
++ cy="627.91449"
++ fx="170.91969"
++ fy="627.91449"
++ r="10.880829" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient10112"
++ id="linearGradient4715"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.735727,0,0,0.735727,183.7693,16.41499)"
++ x1="303.90433"
++ y1="310.9277"
++ x2="314.71951"
++ y2="215.07443" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="radialGradient4713"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(2.757763,8.668189e-5,-3.377087e-4,10.74412,-314.9406,-4801.67)"
++ cx="177.26756"
++ cy="492.77451"
++ fx="177.26756"
++ fy="492.77451"
++ r="2.1208501" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient9272"
++ id="linearGradient4711"
++ gradientUnits="userSpaceOnUse"
++ x1="182.77399"
++ y1="505.95853"
++ x2="188.60104"
++ y2="511.39896" />
++ <linearGradient
++ y2="85.402336"
++ x2="70.694374"
++ y1="145.98552"
++ x1="70.486649"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4709"
++ xlink:href="#linearGradient17612"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="-54.08176"
++ x2="117.99558"
++ y1="-77.97773"
++ x1="116.80498"
++ gradientTransform="translate(-24.39196,-5.46689)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4707"
++ xlink:href="#linearGradient9287"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="71.6651"
++ fx="44.221386"
++ cy="71.6651"
++ cx="44.221386"
++ gradientTransform="matrix(2.581835,0,0,1.68706,-69.95093,-40.78883)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4705"
++ xlink:href="#linearGradient9846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="57.59289"
++ fy="4.6364532"
++ fx="10.086207"
++ cy="4.6364532"
++ cx="10.086207"
++ gradientTransform="matrix(3.007576e-3,0.389009,-0.199508,1.56243e-3,-143.1257,20.42107)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4703"
++ xlink:href="#linearGradient8846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="26.794287"
++ fx="58.162739"
++ cy="26.794287"
++ cx="58.162739"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4701"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="35.990936"
++ fx="61.995689"
++ cy="35.990936"
++ cx="61.995689"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4699"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="61.249998"
++ fy="16.655472"
++ fx="14.010381"
++ cy="16.655472"
++ cx="14.010381"
++ gradientTransform="matrix(-8.76757e-2,-6.141617e-4,2.972922e-3,-0.429896,108.5198,-24.82264)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4697"
++ xlink:href="#linearGradient10610"
++ inkscape:collect="always" />
++ <radialGradient
++ r="65.839737"
++ fy="71.316048"
++ fx="73.557213"
++ cy="71.316048"
++ cx="73.557213"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4695"
++ xlink:href="#linearGradient8355"
++ inkscape:collect="always" />
++ <radialGradient
++ r="61.249998"
++ fy="16.655472"
++ fx="14.010381"
++ cy="16.655472"
++ cx="14.010381"
++ gradientTransform="matrix(-8.76757e-2,-6.141617e-4,2.972922e-3,-0.429896,200.7449,-83.74686)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4693"
++ xlink:href="#linearGradient10610"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="85.402336"
++ x2="70.694374"
++ y1="145.98552"
++ x1="70.486649"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4691"
++ xlink:href="#linearGradient17612"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="-16.963799"
++ x2="206.38153"
++ y1="-38.652508"
++ x1="206.69643"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4689"
++ xlink:href="#linearGradient5991"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="26.794287"
++ fx="58.162739"
++ cy="26.794287"
++ cx="58.162739"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4687"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="35.990936"
++ fx="61.995689"
++ cy="35.990936"
++ cx="61.995689"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4685"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="71.6651"
++ fx="44.221386"
++ cy="71.6651"
++ cx="44.221386"
++ gradientTransform="matrix(2.581835,0,0,1.68706,-69.95093,-40.78883)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4683"
++ xlink:href="#linearGradient9846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="57.59289"
++ fy="4.6364532"
++ fx="10.086207"
++ cy="4.6364532"
++ cx="10.086207"
++ gradientTransform="matrix(3.007576e-3,0.389009,-0.199508,1.56243e-3,-143.1257,20.42107)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4681"
++ xlink:href="#linearGradient8846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="65.839737"
++ fy="71.316048"
++ fx="73.557213"
++ cy="71.316048"
++ cx="73.557213"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4679"
++ xlink:href="#linearGradient8379"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="35.990936"
++ fx="61.995689"
++ cy="35.990936"
++ cx="61.995689"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4677"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="85.402336"
++ x2="70.694374"
++ y1="145.98552"
++ x1="70.486649"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4675"
++ xlink:href="#linearGradient17612"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="-19.767857"
++ x2="148.20409"
++ y1="-44.047695"
++ x1="147.17545"
++ gradientTransform="translate(-1.247581,-11.51613)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4673"
++ xlink:href="#linearGradient5974"
++ inkscape:collect="always" />
++ <radialGradient
++ r="61.249998"
++ fy="16.655472"
++ fx="14.010381"
++ cy="16.655472"
++ cx="14.010381"
++ gradientTransform="matrix(-8.76757e-2,-6.141617e-4,2.972922e-3,-0.429896,141.6288,-85.57016)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4671"
++ xlink:href="#linearGradient10610"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="26.794287"
++ fx="58.162739"
++ cy="26.794287"
++ cx="58.162739"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4669"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="71.6651"
++ fx="44.221386"
++ cy="71.6651"
++ cx="44.221386"
++ gradientTransform="matrix(2.581835,0,0,1.68706,-69.95093,-40.78883)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4667"
++ xlink:href="#linearGradient9846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="57.59289"
++ fy="4.6364532"
++ fx="10.086207"
++ cy="4.6364532"
++ cx="10.086207"
++ gradientTransform="matrix(3.007576e-3,0.389009,-0.199508,1.56243e-3,-143.1257,20.42107)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4665"
++ xlink:href="#linearGradient8846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="65.839737"
++ fy="71.316048"
++ fx="73.557213"
++ cy="71.316048"
++ cx="73.557213"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4663"
++ xlink:href="#linearGradient8367"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="-26.581564"
++ x2="174.3703"
++ y1="-48.462208"
++ x1="175.38997"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4661"
++ xlink:href="#linearGradient5983"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="71.6651"
++ fx="44.221386"
++ cy="71.6651"
++ cx="44.221386"
++ gradientTransform="matrix(2.581835,0,0,1.68706,-69.95093,-40.78883)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4659"
++ xlink:href="#linearGradient9846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="57.59289"
++ fy="4.6364532"
++ fx="10.086207"
++ cy="4.6364532"
++ cx="10.086207"
++ gradientTransform="matrix(3.007576e-3,0.389009,-0.199508,1.56243e-3,-143.1257,20.42107)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4657"
++ xlink:href="#linearGradient8846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="26.794287"
++ fx="58.162739"
++ cy="26.794287"
++ cx="58.162739"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4655"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="35.990936"
++ fx="61.995689"
++ cy="35.990936"
++ cx="61.995689"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4653"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="61.249998"
++ fy="16.655472"
++ fx="14.010381"
++ cy="16.655472"
++ cx="14.010381"
++ gradientTransform="matrix(-8.76757e-2,-6.141617e-4,2.972922e-3,-0.429896,172.8182,-83.65089)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4651"
++ xlink:href="#linearGradient10610"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="85.402336"
++ x2="70.694374"
++ y1="145.98552"
++ x1="70.486649"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4649"
++ xlink:href="#linearGradient17612"
++ inkscape:collect="always" />
++ <radialGradient
++ r="65.839737"
++ fy="71.316048"
++ fx="73.557213"
++ cy="71.316048"
++ cx="73.557213"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4647"
++ xlink:href="#linearGradient5806"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="85.402336"
++ x2="70.694374"
++ y1="145.98552"
++ x1="70.486649"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4645"
++ xlink:href="#linearGradient17612"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="-26.759861"
++ x2="77.520386"
++ y1="-51.807442"
++ x1="79.397758"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4643"
++ xlink:href="#linearGradient5947"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="26.794287"
++ fx="58.162739"
++ cy="26.794287"
++ cx="58.162739"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4641"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="35.990936"
++ fx="61.995689"
++ cy="35.990936"
++ cx="61.995689"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4639"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="71.6651"
++ fx="44.221386"
++ cy="71.6651"
++ cx="44.221386"
++ gradientTransform="matrix(2.581835,0,0,1.68706,-69.95093,-40.78883)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4637"
++ xlink:href="#linearGradient9846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="57.59289"
++ fy="4.6364532"
++ fx="10.086207"
++ cy="4.6364532"
++ cx="10.086207"
++ gradientTransform="matrix(3.007576e-3,0.389009,-0.199508,1.56243e-3,-143.1257,20.42107)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4635"
++ xlink:href="#linearGradient8846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="61.249998"
++ fy="16.655472"
++ fx="14.010381"
++ cy="16.655472"
++ cx="14.010381"
++ gradientTransform="matrix(-8.76757e-2,-6.141617e-4,2.972922e-3,-0.429896,78.76988,-81.44356)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4633"
++ xlink:href="#linearGradient10610"
++ inkscape:collect="always" />
++ <radialGradient
++ r="65.839737"
++ fy="71.316048"
++ fx="73.557213"
++ cy="71.316048"
++ cx="73.557213"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4631"
++ xlink:href="#linearGradient8343"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="85.402336"
++ x2="70.694374"
++ y1="145.98552"
++ x1="70.486649"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4629"
++ xlink:href="#linearGradient17612"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="-28.100063"
++ x2="50.928333"
++ y1="-52.475868"
++ x1="51.549122"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4627"
++ xlink:href="#linearGradient5939"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="26.794287"
++ fx="58.162739"
++ cy="26.794287"
++ cx="58.162739"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4625"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="35.990936"
++ fx="61.995689"
++ cy="35.990936"
++ cx="61.995689"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4623"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="71.6651"
++ fx="44.221386"
++ cy="71.6651"
++ cx="44.221386"
++ gradientTransform="matrix(2.581835,0,0,1.68706,-69.95093,-40.78883)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4621"
++ xlink:href="#linearGradient9846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="57.59289"
++ fy="4.6364532"
++ fx="10.086207"
++ cy="4.6364532"
++ cx="10.086207"
++ gradientTransform="matrix(3.007576e-3,0.389009,-0.199508,1.56243e-3,-143.1257,20.42107)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4619"
++ xlink:href="#linearGradient8846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="61.249998"
++ fy="16.655472"
++ fx="14.010381"
++ cy="16.655472"
++ cx="14.010381"
++ gradientTransform="matrix(-8.76757e-2,-6.141617e-4,2.972922e-3,-0.429896,53.33843,-84.22663)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4617"
++ xlink:href="#linearGradient10610"
++ inkscape:collect="always" />
++ <radialGradient
++ r="65.839737"
++ fy="71.316048"
++ fx="73.557213"
++ cy="71.316048"
++ cx="73.557213"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4615"
++ xlink:href="#linearGradient5806"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="35.990936"
++ fx="61.995689"
++ cy="35.990936"
++ cx="61.995689"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4613"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="85.402336"
++ x2="70.694374"
++ y1="145.98552"
++ x1="70.486649"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4611"
++ xlink:href="#linearGradient17612"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="-31.19932"
++ x2="23.999256"
++ y1="-53.655769"
++ x1="23.999256"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4609"
++ xlink:href="#linearGradient5931"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="71.6651"
++ fx="44.221386"
++ cy="71.6651"
++ cx="44.221386"
++ gradientTransform="matrix(2.581835,0,0,1.68706,-69.95093,-40.78883)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4607"
++ xlink:href="#linearGradient9846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="57.59289"
++ fy="4.6364532"
++ fx="10.086207"
++ cy="4.6364532"
++ cx="10.086207"
++ gradientTransform="matrix(3.007576e-3,0.389009,-0.199508,1.56243e-3,-143.1257,20.42107)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4605"
++ xlink:href="#linearGradient8846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="61.249998"
++ fy="16.655472"
++ fx="14.010381"
++ cy="16.655472"
++ cx="14.010381"
++ gradientTransform="matrix(-8.76757e-2,-6.141617e-4,2.972922e-3,-0.429896,24.35617,-85.47419)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4603"
++ xlink:href="#linearGradient10610"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="26.794287"
++ fx="58.162739"
++ cy="26.794287"
++ cx="58.162739"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4601"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="65.839737"
++ fy="71.316048"
++ fx="73.557213"
++ cy="71.316048"
++ cx="73.557213"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4599"
++ xlink:href="#linearGradient8331"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="-31.43964"
++ x2="-2.8536587"
++ y1="-54.088028"
++ x1="-2.9076407"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4597"
++ xlink:href="#linearGradient5922"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="85.402336"
++ x2="70.694374"
++ y1="145.98552"
++ x1="70.486649"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4595"
++ xlink:href="#linearGradient17612"
++ inkscape:collect="always" />
++ <radialGradient
++ r="61.249998"
++ fy="16.655472"
++ fx="14.010381"
++ cy="16.655472"
++ cx="14.010381"
++ gradientTransform="matrix(-8.76757e-2,-6.141617e-4,2.972922e-3,-0.429896,-2.898668,-86.52993)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4593"
++ xlink:href="#linearGradient10610"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="71.6651"
++ fx="44.221386"
++ cy="71.6651"
++ cx="44.221386"
++ gradientTransform="matrix(2.581835,0,0,1.68706,-69.95093,-40.78883)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4591"
++ xlink:href="#linearGradient9846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="57.59289"
++ fy="4.6364532"
++ fx="10.086207"
++ cy="4.6364532"
++ cx="10.086207"
++ gradientTransform="matrix(3.007576e-3,0.389009,-0.199508,1.56243e-3,-143.1257,20.42107)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4589"
++ xlink:href="#linearGradient8846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="26.794287"
++ fx="58.162739"
++ cy="26.794287"
++ cx="58.162739"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4587"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="35.990936"
++ fx="61.995689"
++ cy="35.990936"
++ cx="61.995689"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4585"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="65.839737"
++ fy="71.316048"
++ fx="73.557213"
++ cy="71.316048"
++ cx="73.557213"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4583"
++ xlink:href="#linearGradient8319"
++ inkscape:collect="always" />
++ <radialGradient
++ r="61.249998"
++ fy="16.655472"
++ fx="14.010381"
++ cy="16.655472"
++ cx="14.010381"
++ gradientTransform="matrix(-8.76757e-2,-6.141617e-4,2.972922e-3,-0.429896,-31.19069,-86.56333)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4581"
++ xlink:href="#linearGradient10610"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="85.402336"
++ x2="70.694374"
++ y1="145.98552"
++ x1="70.486649"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4579"
++ xlink:href="#linearGradient17612"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="-31.083054"
++ x2="-27.024004"
++ y1="-51.716118"
++ x1="-27.641796"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4577"
++ xlink:href="#linearGradient33711"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="35.990936"
++ fx="61.995689"
++ cy="35.990936"
++ cx="61.995689"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4575"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="71.6651"
++ fx="44.221386"
++ cy="71.6651"
++ cx="44.221386"
++ gradientTransform="matrix(2.581835,0,0,1.68706,-69.95093,-40.78883)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4573"
++ xlink:href="#linearGradient9846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="57.59289"
++ fy="4.6364532"
++ fx="10.086207"
++ cy="4.6364532"
++ cx="10.086207"
++ gradientTransform="matrix(3.007576e-3,0.389009,-0.199508,1.56243e-3,-143.1257,20.42107)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4571"
++ xlink:href="#linearGradient8846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="26.794287"
++ fx="58.162739"
++ cy="26.794287"
++ cx="58.162739"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4569"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="65.839737"
++ fy="71.316048"
++ fx="73.557213"
++ cy="71.316048"
++ cx="73.557213"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4567"
++ xlink:href="#linearGradient5806"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="85.402336"
++ x2="70.694374"
++ y1="145.98552"
++ x1="70.486649"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4565"
++ xlink:href="#linearGradient17612"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="71.6651"
++ fx="44.221386"
++ cy="71.6651"
++ cx="44.221386"
++ gradientTransform="matrix(2.581835,0,0,1.68706,-69.95093,-40.78883)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4563"
++ xlink:href="#linearGradient9846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="57.59289"
++ fy="4.6364532"
++ fx="10.086207"
++ cy="4.6364532"
++ cx="10.086207"
++ gradientTransform="matrix(3.007576e-3,0.389009,-0.199508,1.56243e-3,-143.1257,20.42107)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4561"
++ xlink:href="#linearGradient8846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="26.794287"
++ fx="58.162739"
++ cy="26.794287"
++ cx="58.162739"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4559"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="35.990936"
++ fx="61.995689"
++ cy="35.990936"
++ cx="61.995689"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4557"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="61.249998"
++ fy="16.655472"
++ fx="14.010381"
++ cy="16.655472"
++ cx="14.010381"
++ gradientTransform="matrix(-8.76757e-2,-6.141617e-4,2.972922e-3,-0.429896,-104.8164,-90.32065)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4555"
++ xlink:href="#linearGradient10610"
++ inkscape:collect="always" />
++ <radialGradient
++ r="65.839737"
++ fy="71.316048"
++ fx="73.557213"
++ cy="71.316048"
++ cx="73.557213"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4553"
++ xlink:href="#linearGradient5806"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="24.313786"
++ x2="-65.374992"
++ y1="6.6024723"
++ x1="-63.154465"
++ gradientTransform="translate(13.6534,-40.30465)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4551"
++ xlink:href="#linearGradient33711"
++ inkscape:collect="always" />
++ <radialGradient
++ r="65.839737"
++ fy="71.316048"
++ fx="73.557213"
++ cy="71.316048"
++ cx="73.557213"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4548"
++ xlink:href="#linearGradient8307"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="71.6651"
++ fx="44.221386"
++ cy="71.6651"
++ cx="44.221386"
++ gradientTransform="matrix(2.581835,0,0,1.68706,-69.95093,-40.78883)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4546"
++ xlink:href="#linearGradient9846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="57.59289"
++ fy="4.6364532"
++ fx="10.086207"
++ cy="4.6364532"
++ cx="10.086207"
++ gradientTransform="matrix(3.007576e-3,0.389009,-0.199508,1.56243e-3,-143.1257,20.42107)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4544"
++ xlink:href="#linearGradient8846"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="35.990936"
++ fx="61.995689"
++ cy="35.990936"
++ cx="61.995689"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4542"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51"
++ fy="26.794287"
++ fx="58.162739"
++ cy="26.794287"
++ cx="58.162739"
++ gradientTransform="matrix(1.849967,4.182099e-3,-3.801905e-3,1.681784,-53.49728,-24.82817)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4540"
++ xlink:href="#linearGradient4550"
++ inkscape:collect="always" />
++ <radialGradient
++ r="61.249998"
++ fy="16.655472"
++ fx="14.010381"
++ cy="16.655472"
++ cx="14.010381"
++ gradientTransform="matrix(-8.76757e-2,-6.141617e-4,2.972922e-3,-0.429896,-64.8569,-88.95775)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4538"
++ xlink:href="#linearGradient10610"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="85.402336"
++ x2="70.694374"
++ y1="145.98552"
++ x1="70.486649"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4536"
++ xlink:href="#linearGradient17612"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="97.664841"
++ x2="47.422745"
++ y1="131.50879"
++ x1="47.422745"
++ gradientTransform="matrix(1.609622,0,0,1.551764,97.45629,-104.8575)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4534"
++ xlink:href="#linearGradient7913"
++ inkscape:collect="always" />
++ <radialGradient
++ r="52.84375"
++ fy="-6.0566635"
++ fx="63.644966"
++ cy="44.872078"
++ cx="63.644768"
++ gradientTransform="matrix(0.472239,5.177249e-3,-6.813391e-3,0.573648,138.8043,57.2803)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4532"
++ xlink:href="#linearGradient3281"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="9.4765663"
++ x2="67.814407"
++ y1="-2.0914545"
++ x1="67.829178"
++ gradientTransform="matrix(1.121658,-7.738375e-4,1.431995e-3,0.630886,102.2365,58.01755)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4530"
++ xlink:href="#linearGradient3354"
++ inkscape:collect="always" />
++ <linearGradient
++ id="linearGradient4524">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop4526" />
++ <stop
++ style="stop-color:#000000;stop-opacity:0;"
++ offset="1"
++ id="stop4528" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4510">
++ <stop
++ id="stop4512"
++ offset="0"
++ style="stop-color:#ffffff;stop-opacity:0.53597122;" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0.49803922;"
++ offset="0.12041885"
++ id="stop4514" />
++ <stop
++ id="stop4516"
++ offset="1"
++ style="stop-color:#ffffff;stop-opacity:0;" />
++ </linearGradient>
++ <radialGradient
++ r="77.78125"
++ fy="37.536674"
++ fx="-419.27335"
++ cy="37.536674"
++ cx="-419.27335"
++ gradientTransform="matrix(3.813189,0.198478,-7.743124e-2,1.118624,1648.681,240.1841)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4508"
++ xlink:href="#linearGradient9274"
++ inkscape:collect="always" />
++ <radialGradient
++ r="77.78125"
++ fy="37.536674"
++ fx="-419.27335"
++ cy="37.536674"
++ cx="-419.27335"
++ gradientTransform="matrix(3.813189,0.206677,-7.743124e-2,1.164834,1648.681,242.6353)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4506"
++ xlink:href="#linearGradient9274"
++ inkscape:collect="always" />
++ <radialGradient
++ r="77.784615"
++ fy="188.62517"
++ fx="-431.58975"
++ cy="188.62517"
++ cx="-431.58975"
++ gradientTransform="matrix(2.416974,1.22759e-2,-8.505055e-3,1.270535,1037.489,126.0437)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4504"
++ xlink:href="#linearGradient2315"
++ inkscape:collect="always" />
++ <linearGradient
++ id="linearGradient4498">
++ <stop
++ id="stop4500"
++ offset="0"
++ style="stop-color:#e0e0e0;stop-opacity:1;" />
++ <stop
++ id="stop4502"
++ offset="1"
++ style="stop-color:#545454;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ y2="61.680031"
++ x2="57.196442"
++ y1="61.612171"
++ x1="52.221569"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4490"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="62.833641"
++ x2="63.166294"
++ y1="62.833641"
++ x1="58.191418"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4488"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="86.019257"
++ x2="122.77711"
++ y1="86.019257"
++ x1="117.80224"
++ id="linearGradient4480"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="32.1106"
++ x2="-25.965248"
++ y1="35.814762"
++ x1="-22.312037"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4478"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="77.897507"
++ x2="132.14175"
++ y1="82.85598"
++ x1="132.11458"
++ id="linearGradient4476"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="65.997185"
++ x2="131.39529"
++ y1="70.95565"
++ x1="131.43597"
++ id="linearGradient4474"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="65.996964"
++ x2="97.862511"
++ y1="70.955429"
++ x1="97.874748"
++ id="linearGradient4468"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="77.897285"
++ x2="97.478645"
++ y1="82.855759"
++ x1="97.490875"
++ id="linearGradient4466"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="103.7354"
++ x2="-7.8838911"
++ y1="107.13062"
++ x1="-4.5150189"
++ id="linearGradient4464"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="87.084579"
++ x2="0.48287305"
++ y1="87.084579"
++ x1="-4.492002"
++ id="linearGradient4462"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="87.084579"
++ x2="-5.4869771"
++ y1="87.084579"
++ x1="-10.461852"
++ id="linearGradient4460"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="61.768291"
++ x2="-65.185501"
++ y1="61.768291"
++ x1="-70.16037"
++ id="linearGradient4458"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="61.768291"
++ x2="-59.215649"
++ y1="61.768291"
++ x1="-64.190521"
++ id="linearGradient4456"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="32.645241"
++ x2="135.88933"
++ y1="36.173931"
++ x1="132.31792"
++ id="linearGradient4454"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ id="linearGradient4448">
++ <stop
++ style="stop-color:#000000;stop-opacity:0.25416666;"
++ offset="0.0000000"
++ id="stop4450" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0.26274511;"
++ offset="1.0000000"
++ id="stop4452" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4440">
++ <stop
++ id="stop4442"
++ offset="0"
++ style="stop-color:white;stop-opacity:0;" />
++ <stop
++ style="stop-color:black;stop-opacity:0;"
++ offset="0.5"
++ id="stop4444" />
++ <stop
++ id="stop4446"
++ offset="1"
++ style="stop-color:black;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="54.182575"
++ x2="71.483681"
++ y1="57.779125"
++ x1="74.994522"
++ id="linearGradient4438"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="53.99168"
++ x2="37.748604"
++ y1="57.52037"
++ x1="34.177197"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4436"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="100.85838"
++ x2="55.013832"
++ y1="104.42464"
++ x1="51.446335"
++ id="linearGradient4434"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="57.892357"
++ x2="57.196362"
++ y1="57.892357"
++ x1="52.221489"
++ id="linearGradient4432"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="104.17727"
++ x2="27.346661"
++ y1="104.17727"
++ x1="22.37178"
++ id="linearGradient4430"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="31.458843"
++ x2="-62.200558"
++ y1="31.458843"
++ x1="-67.17543"
++ id="linearGradient4428"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="68.97197"
++ x2="11.494289"
++ y1="73.930443"
++ x1="11.532239"
++ id="linearGradient4426"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="74.922134"
++ x2="12.207617"
++ y1="79.880608"
++ x1="12.207617"
++ id="linearGradient4424"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ id="linearGradient4418">
++ <stop
++ id="stop4420"
++ offset="0"
++ style="stop-color:#000000;stop-opacity:1;" />
++ <stop
++ style="stop-color:#2a2a2a;stop-opacity:1;"
++ offset="1"
++ id="stop4422" />
++ </linearGradient>
++ <radialGradient
++ r="1.4498374"
++ fy="83.803413"
++ fx="-67.047073"
++ cy="84.213043"
++ cx="-67.615143"
++ gradientTransform="matrix(1,0,0,0.636364,0,30.62293)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4416"
++ xlink:href="#linearGradient5093"
++ inkscape:collect="always" />
++ <radialGradient
++ r="1.4498374"
++ fy="83.803413"
++ fx="-67.047073"
++ cy="84.213043"
++ cx="-67.615143"
++ gradientTransform="matrix(1,0,0,0.636364,0,30.62293)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4414"
++ xlink:href="#linearGradient2370"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="66.080238"
++ x2="51.330795"
++ y1="11.17368"
++ x1="51.330795"
++ gradientTransform="translate(0,0.418338)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4394"
++ xlink:href="#linearGradient2972"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="66.080238"
++ x2="51.330795"
++ y1="11.17368"
++ x1="51.330795"
++ gradientTransform="translate(128.3814,0)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4392"
++ xlink:href="#linearGradient2972"
++ inkscape:collect="always" />
++ <radialGradient
++ r="51.470882"
++ fy="100.6598"
++ fx="11.83884"
++ cy="100.6598"
++ cx="11.83884"
++ gradientTransform="matrix(1,0,0,1.149425e-2,0,99.50279)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4390"
++ xlink:href="#linearGradient2948"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="83.417892"
++ x2="51.477333"
++ y1="-2.2780347"
++ x1="51.477333"
++ gradientTransform="translate(128.3814,0)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4388"
++ xlink:href="#XMLID_15_"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="789.12207"
++ x2="538.77338"
++ y1="677.87701"
++ x1="538.77338"
++ gradientTransform="matrix(-1.064774,0,0,-1.069314,756.8277,870.9448)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4386"
++ xlink:href="#XMLID_14_"
++ inkscape:collect="always" />
++ <radialGradient
++ r="121.5466"
++ fy="734.34766"
++ fx="538.77216"
++ cy="734.34766"
++ cx="538.77216"
++ gradientTransform="matrix(-2.632086,0,0,-0.961931,1601.251,792.0882)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4384"
++ xlink:href="#XMLID_13_"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="889.8454"
++ x2="540.99591"
++ y1="721.8396"
++ x1="540.99591"
++ gradientTransform="matrix(-1.064774,0,0,-1.069314,756.8278,870.9447)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4382"
++ xlink:href="#XMLID_9_"
++ inkscape:collect="always" />
++ <radialGradient
++ r="253.01871"
++ fy="-6071.0229"
++ fx="267.36481"
++ cy="-6078.353"
++ cx="265.3931"
++ gradientTransform="matrix(0.244472,0,0,-1.859374e-2,-10.10742,1.2728)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4380"
++ xlink:href="#path2295_1_"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="74.922462"
++ x2="-21.474886"
++ y1="79.880928"
++ x1="-21.44516"
++ id="linearGradient4378"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="68.972298"
++ x2="-21.474886"
++ y1="73.930763"
++ x1="-21.44516"
++ id="linearGradient4376"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientTransform="translate(0.203578,0)"
++ gradientUnits="userSpaceOnUse"
++ y2="42.196445"
++ x2="101.05125"
++ y1="47.154915"
++ x1="101.05125"
++ id="linearGradient4374"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="101.69806"
++ x2="-33.507175"
++ y1="106.65653"
++ x1="-33.516823"
++ id="linearGradient4372"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ id="linearGradient4356">
++ <stop
++ style="stop-color:#323232;stop-opacity:1;"
++ offset="0"
++ id="stop4358" />
++ <stop
++ id="stop4360"
++ offset="0.07692308"
++ style="stop-color:#dfe1e1;stop-opacity:1;" />
++ <stop
++ style="stop-color:#b6b1b1;stop-opacity:1;"
++ offset="0.26289096"
++ id="stop4362" />
++ <stop
++ id="stop4364"
++ offset="0.5"
++ style="stop-color:#8d8282;stop-opacity:1;" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0.78201604"
++ id="stop4366" />
++ <stop
++ style="stop-color:#dfd9df;stop-opacity:1;"
++ offset="0.9005897"
++ id="stop4368" />
++ <stop
++ style="stop-color:#3a3a3a;stop-opacity:1;"
++ offset="1"
++ id="stop4370" />
++ </linearGradient>
++ <linearGradient
++ gradientUnits="userSpaceOnUse"
++ y2="42.196377"
++ x2="8.3667393"
++ y1="47.154846"
++ x1="8.3667393"
++ id="linearGradient4354"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#path2295_1_"
++ id="radialGradient4352"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.170706,0,0,-1.360102e-2,3.426686,31.62039)"
++ cx="265.3931"
++ cy="-6078.353"
++ fx="369.5242"
++ fy="-6078.353"
++ r="253.01871" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#XMLID_9_"
++ id="linearGradient4350"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0,1.035607,-1.040022,0,836.7803,-501.2228)"
++ x1="600.92871"
++ y1="751.39087"
++ x2="364.56064"
++ y2="743.43958" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient3115"
++ id="linearGradient4348"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.98666,0,0,1,236.366,5.834322)"
++ x1="-170.70047"
++ y1="-39.182831"
++ x2="-180.69461"
++ y2="24.089455" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient3115"
++ id="linearGradient4346"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.98666,0,0,1,236.366,5.834322)"
++ x1="-170.70047"
++ y1="-39.182831"
++ x2="-180.69461"
++ y2="24.089455" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#XMLID_13_"
++ id="radialGradient4344"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0,0.755614,-1.040022,0,836.7803,-336.2847)"
++ cx="589.07928"
++ cy="739.42639"
++ fx="589.07928"
++ fy="739.42639"
++ r="121.5466" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#XMLID_14_"
++ id="linearGradient4342"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0,1.035607,-1.040022,0,836.7804,-501.2227)"
++ x1="482.60889"
++ y1="734.46405"
++ x2="595.60168"
++ y2="734.46405" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#XMLID_15_"
++ id="radialGradient4340"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0,1.035607,-1.040022,0,836.7803,-501.2228)"
++ cx="447.07568"
++ cy="769.36194"
++ fx="447.07568"
++ fy="769.36194"
++ r="126.0234" />
++ <linearGradient
++ y2="24.089455"
++ x2="-180.69461"
++ y1="-39.182831"
++ x1="-170.70047"
++ gradientTransform="matrix(0.98666,0,0,1,236.366,5.834322)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4338"
++ xlink:href="#linearGradient3115"
++ inkscape:collect="always" />
++ <radialGradient
++ r="253.01871"
++ fy="-6071.0229"
++ fx="267.36481"
++ cy="-6078.353"
++ cx="265.3931"
++ gradientTransform="matrix(0.244472,0,0,-1.859374e-2,-10.10742,1.2728)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4336"
++ xlink:href="#path2295_1_"
++ inkscape:collect="always" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#XMLID_15_"
++ id="radialGradient4316"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0,1.035607,-1.040022,0,836.7803,-501.2228)"
++ cx="447.07568"
++ cy="769.36194"
++ fx="447.07568"
++ fy="769.36194"
++ r="126.0234" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#XMLID_14_"
++ id="linearGradient4314"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0,1.035607,-1.040022,0,836.7804,-501.2227)"
++ x1="482.60889"
++ y1="734.46405"
++ x2="595.60168"
++ y2="734.46405" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#XMLID_13_"
++ id="radialGradient4312"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0,0.755614,-1.040022,0,836.7803,-336.2847)"
++ cx="589.07928"
++ cy="739.42639"
++ r="121.5466"
++ fx="589.07928"
++ fy="739.42639" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#XMLID_9_"
++ id="linearGradient4310"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0,1.035607,-1.040022,0,836.7803,-501.2228)"
++ x1="600.92871"
++ y1="751.39087"
++ x2="364.56064"
++ y2="743.43958" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient3115"
++ id="linearGradient4308"
++ x1="-170.70047"
++ y1="-39.182831"
++ x2="-180.69461"
++ y2="24.089455"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.98666,0,0,1,236.366,5.834322)" />
++ <radialGradient
++ r="253.01871"
++ fy="-6071.0229"
++ fx="267.36481"
++ cy="-6078.353"
++ cx="265.3931"
++ gradientTransform="matrix(0.244472,0,0,-1.859374e-2,-10.10742,1.2728)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4306"
++ xlink:href="#path2295_1_"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="674"
++ x2="538.77338"
++ y1="793"
++ x1="538.77338"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4303"
++ xlink:href="#XMLID_9_"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="736.55688"
++ x2="579.72852"
++ y1="732.41022"
++ x1="579.72852"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4301"
++ xlink:href="#XMLID_11_"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="736.62341"
++ x2="497.81451"
++ y1="732.4082"
++ x1="497.81451"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4299"
++ xlink:href="#XMLID_12_"
++ inkscape:collect="always" />
++ <radialGradient
++ r="121.5466"
++ cy="792.99609"
++ cx="538.77252"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4297"
++ xlink:href="#XMLID_13_"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="789.12207"
++ x2="538.77338"
++ y1="677.87701"
++ x1="538.77338"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8993,-752.5038)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient4295"
++ xlink:href="#XMLID_14_"
++ inkscape:collect="always" />
++ <radialGradient
++ r="126.0234"
++ cy="651.10352"
++ cx="538.77338"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient4293"
++ xlink:href="#XMLID_15_"
++ inkscape:collect="always" />
++ <linearGradient
++ id="linearGradient4287"
++ gradientUnits="userSpaceOnUse"
++ x1="497.81451"
++ y1="732.4082"
++ x2="497.81451"
++ y2="736.62341"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)">
++ <stop
++ offset="0"
++ style="stop-color:#094422"
++ id="stop4289" />
++ <stop
++ offset="1"
++ style="stop-color:#9ED676"
++ id="stop4291" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4281"
++ gradientUnits="userSpaceOnUse"
++ x1="579.72852"
++ y1="732.41022"
++ x2="579.72852"
++ y2="736.55688"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)">
++ <stop
++ offset="0"
++ style="stop-color:#094422"
++ id="stop4283" />
++ <stop
++ offset="1"
++ style="stop-color:#9ED676"
++ id="stop4285" />
++ </linearGradient>
++ <radialGradient
++ cx="265.3931"
++ cy="-6078.353"
++ r="253.01871"
++ fx="267.36481"
++ fy="-6071.0229"
++ id="radialGradient4275"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.244472,0,0,-1.859374e-2,-10.10742,1.2728)">
++ <stop
++ style="stop-color:#000000;stop-opacity:1"
++ offset="0"
++ id="stop4277" />
++ <stop
++ style="stop-color:black;stop-opacity:0;"
++ offset="1"
++ id="stop4279" />
++ <a:midPointStop
++ style="stop-color:#000000"
++ offset="0" />
++ <a:midPointStop
++ style="stop-color:#000000"
++ offset="0.5" />
++ <a:midPointStop
++ style="stop-color:#FFFFFF"
++ offset="1" />
++ </radialGradient>
++ <linearGradient
++ id="linearGradient4261">
++ <stop
++ style="stop-color:white;stop-opacity:0;"
++ offset="0"
++ id="stop4263" />
++ <stop
++ id="stop4265"
++ offset="0.5"
++ style="stop-color:white;stop-opacity:0;" />
++ <stop
++ style="stop-color:white;stop-opacity:1;"
++ offset="1"
++ id="stop4267" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4249">
++ <stop
++ id="stop4251"
++ offset="0"
++ style="stop-color:#99c3f5;stop-opacity:1;" />
++ <stop
++ id="stop4253"
++ offset="0.5"
++ style="stop-color:#2c72c7;stop-opacity:1;" />
++ <stop
++ style="stop-color:#2d8afc;stop-opacity:1;"
++ offset="0.70029485"
++ id="stop4255" />
++ <stop
++ style="stop-color:#0c376c;stop-opacity:1;"
++ offset="0.9005897"
++ id="stop4257" />
++ <stop
++ style="stop-color:#101656;stop-opacity:1;"
++ offset="1"
++ id="stop4259" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4195">
++ <stop
++ style="stop-color:#9ef599;stop-opacity:1;"
++ offset="0"
++ id="stop4197" />
++ <stop
++ style="stop-color:#2cc735;stop-opacity:1;"
++ offset="0.5"
++ id="stop4199" />
++ <stop
++ id="stop4201"
++ offset="0.70029485"
++ style="stop-color:#33fc2d;stop-opacity:1;" />
++ <stop
++ id="stop4203"
++ offset="0.9005897"
++ style="stop-color:#136c0c;stop-opacity:1;" />
++ <stop
++ id="stop4205"
++ offset="1"
++ style="stop-color:#145610;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4183">
++ <stop
++ style="stop-color:#f59999;stop-opacity:1;"
++ offset="0"
++ id="stop4185" />
++ <stop
++ style="stop-color:#c7302c;stop-opacity:1;"
++ offset="0.5"
++ id="stop4187" />
++ <stop
++ id="stop4189"
++ offset="0.70029485"
++ style="stop-color:#fc2d30;stop-opacity:1;" />
++ <stop
++ id="stop4191"
++ offset="0.9005897"
++ style="stop-color:#6c0c0c;stop-opacity:1;" />
++ <stop
++ id="stop4193"
++ offset="1"
++ style="stop-color:#561110;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4170">
++ <stop
++ style="stop-color:#f5e199;stop-opacity:1;"
++ offset="0"
++ id="stop4172" />
++ <stop
++ style="stop-color:#c7a92c;stop-opacity:1;"
++ offset="0.5"
++ id="stop4174" />
++ <stop
++ id="stop4176"
++ offset="0.70029485"
++ style="stop-color:#fce92d;stop-opacity:1;" />
++ <stop
++ id="stop4178"
++ offset="0.9005897"
++ style="stop-color:#6c610c;stop-opacity:1;" />
++ <stop
++ id="stop4180"
++ offset="1"
++ style="stop-color:#565510;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4158">
++ <stop
++ style="stop-color:#f599bd;stop-opacity:1;"
++ offset="0"
++ id="stop4160" />
++ <stop
++ style="stop-color:#c72c74;stop-opacity:1;"
++ offset="0.5"
++ id="stop4162" />
++ <stop
++ id="stop4164"
++ offset="0.70029485"
++ style="stop-color:#fc2d92;stop-opacity:1;" />
++ <stop
++ id="stop4166"
++ offset="0.9005897"
++ style="stop-color:#6c0c37;stop-opacity:1;" />
++ <stop
++ id="stop4168"
++ offset="1"
++ style="stop-color:#561030;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4146">
++ <stop
++ style="stop-color:#c7c7c7;stop-opacity:1;"
++ offset="0"
++ id="stop4148" />
++ <stop
++ style="stop-color:#797979;stop-opacity:1;"
++ offset="0.5"
++ id="stop4150" />
++ <stop
++ id="stop4152"
++ offset="0.70029485"
++ style="stop-color:#959595;stop-opacity:1;" />
++ <stop
++ id="stop4154"
++ offset="0.9005897"
++ style="stop-color:#3c3c3c;stop-opacity:1;" />
++ <stop
++ id="stop4156"
++ offset="1"
++ style="stop-color:#333;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4134">
++ <stop
++ style="stop-color:#f5c799;stop-opacity:1;"
++ offset="0"
++ id="stop4136" />
++ <stop
++ style="stop-color:#c7662c;stop-opacity:1;"
++ offset="0.5"
++ id="stop4138" />
++ <stop
++ id="stop4140"
++ offset="0.70029485"
++ style="stop-color:#fc962d;stop-opacity:1;" />
++ <stop
++ id="stop4142"
++ offset="0.9005897"
++ style="stop-color:#6c3a0c;stop-opacity:1;" />
++ <stop
++ id="stop4144"
++ offset="1"
++ style="stop-color:#562e10;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4122">
++ <stop
++ style="stop-color:#f5cf99;stop-opacity:1;"
++ offset="0"
++ id="stop4124" />
++ <stop
++ style="stop-color:#c7742c;stop-opacity:1;"
++ offset="0.5"
++ id="stop4126" />
++ <stop
++ id="stop4128"
++ offset="0.70029485"
++ style="stop-color:#fc9d2d;stop-opacity:1;" />
++ <stop
++ id="stop4130"
++ offset="0.9005897"
++ style="stop-color:#6c450c;stop-opacity:1;" />
++ <stop
++ id="stop4132"
++ offset="1"
++ style="stop-color:#563910;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ y2="23.527531"
++ x2="424.99982"
++ y1="221.74335"
++ x1="453.03625"
++ gradientTransform="matrix(1.0156803,0,0,1.1590336,-112.31214,399.97445)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient6231"
++ xlink:href="#linearGradient18125"
++ inkscape:collect="always" />
++ <radialGradient
++ r="61.097305"
++ fy="355.35553"
++ fx="467.92316"
++ cy="355.35553"
++ cx="467.92316"
++ gradientTransform="matrix(-0.1783824,-0.1952669,0.1178978,-0.1077032,513.9622,168.51917)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient6224"
++ xlink:href="#linearGradient7248"
++ inkscape:collect="always" />
++ <radialGradient
++ r="61.097305"
++ fy="355.35553"
++ fx="467.92316"
++ cy="355.35553"
++ cx="467.92316"
++ gradientTransform="matrix(-0.1783824,-0.1952669,0.1178978,-0.1077032,408.37325,574.65764)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient6220"
++ xlink:href="#linearGradient7248"
++ inkscape:collect="always" />
++ <radialGradient
++ r="61.097305"
++ fy="355.35553"
++ fx="467.92316"
++ cy="355.35553"
++ cx="467.92316"
++ gradientTransform="matrix(-0.1783824,-0.1952669,0.1178978,-0.1077032,513.9622,168.51917)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient6216"
++ xlink:href="#linearGradient7248"
++ inkscape:collect="always" />
++ <radialGradient
++ r="61.097305"
++ fy="53.71022"
++ fx="338.5314"
++ cy="53.71022"
++ cx="338.5314"
++ gradientTransform="matrix(0.3215139,-0.2064182,7.1953877e-2,0.1120743,277.88879,99.799696)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient6212"
++ xlink:href="#linearGradient7248"
++ inkscape:collect="always" />
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.4013701,-8.5410647e-2,5.4678582e-2,0.2569512,251.78282,51.053487)"
++ r="61.097305"
++ fy="89.41761"
++ fx="428.76587"
++ cy="89.41761"
++ cx="428.76587"
++ id="radialGradient6208"
++ xlink:href="#linearGradient7248"
++ inkscape:collect="always" />
++ <radialGradient
++ r="56.407795"
++ fy="38.637981"
++ fx="428.76584"
++ cy="38.637981"
++ cx="428.76584"
++ gradientTransform="matrix(1,8.1884413e-6,-2.0169116e-7,2.4631203e-2,7.8073135e-6,16.731389)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient6197"
++ xlink:href="#XMLID_37_"
++ inkscape:collect="always" />
++ <radialGradient
++ r="47.595197"
++ fy="7.4622769"
++ fx="34.677639"
++ cy="7.4622769"
++ cx="34.677639"
++ gradientTransform="matrix(0.999914,-7.841646e-3,5.666079e-4,2.048306e-2,-1.242234e-3,7.581357)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient10361"
++ xlink:href="#linearGradient3303"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="-323.53064"
++ x2="802.31427"
++ y1="-333.35208"
++ x1="802.32861"
++ gradientTransform="matrix(0.362753,0,0,0.230068,273.73106,187.13659)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient12677"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="-323.53064"
++ x2="802.31427"
++ y1="-333.35208"
++ x1="802.32861"
++ gradientTransform="matrix(0.362753,0,0,0.230068,273.73113,191.40599)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient12674"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <linearGradient
++ gradientTransform="translate(231.61793,99.823979)"
++ gradientUnits="userSpaceOnUse"
++ y2="161.3949"
++ x2="94.607964"
++ y1="204.88196"
++ x1="92.816071"
++ id="linearGradient41388"
++ xlink:href="#linearGradient41382"
++ inkscape:collect="always" />
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient7248">
++ <stop
++ style="stop-color:#5fa0d3;stop-opacity:1;"
++ offset="0"
++ id="stop7250" />
++ <stop
++ style="stop-color:#5fa0d3;stop-opacity:0;"
++ offset="1"
++ id="stop7252" />
++ </linearGradient>
++ <linearGradient
++ y2="89.742996"
++ x2="58.321999"
++ y1="-21.6523"
++ x1="68.067902"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_74_">
++ <stop
++ id="stop20897"
++ style="stop-color:#888A85"
++ offset="0" />
++ <stop
++ id="stop20899"
++ style="stop-color:#555753"
++ offset="0.4675" />
++ <stop
++ id="stop20901"
++ style="stop-color:#2E3436"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ y2="49.8755"
++ x2="77.521004"
++ y1="116.6792"
++ x1="59.494598"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_76_">
++ <stop
++ id="stop20920"
++ style="stop-color:#EEEEEC"
++ offset="0" />
++ <stop
++ id="stop20922"
++ style="stop-color:#DBDCD8"
++ offset="0.2903" />
++ <stop
++ id="stop20924"
++ style="stop-color:#C3C5BF"
++ offset="0.7315" />
++ <stop
++ id="stop20926"
++ style="stop-color:#BABDB6"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ y2="41.080601"
++ x2="63.351601"
++ y1="142.0806"
++ x1="63.351601"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_77_">
++ <stop
++ id="stop66"
++ style="stop-color:#FFFFFF"
++ offset="0" />
++ <stop
++ id="stop20930"
++ style="stop-color:#555555"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ y2="103.689"
++ x2="63"
++ y1="107.2202"
++ x1="63"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_80_">
++ <stop
++ id="stop101"
++ style="stop-color:#FFFFFF"
++ offset="0" />
++ <stop
++ id="stop103"
++ style="stop-color:#FBFBFB"
++ offset="0.0396" />
++ <stop
++ id="stop105"
++ style="stop-color:#F0F0F0"
++ offset="0.0763" />
++ <stop
++ id="stop107"
++ style="stop-color:#DDDDDD"
++ offset="0.1118" />
++ <stop
++ id="stop109"
++ style="stop-color:#DDDDDD"
++ offset="0.1124" />
++ <stop
++ id="stop111"
++ style="stop-color:#C4C4C4"
++ offset="0.2558" />
++ <stop
++ id="stop113"
++ style="stop-color:#BBBBBB"
++ offset="0.3432" />
++ <stop
++ id="stop115"
++ style="stop-color:#DDDDDD"
++ offset="0.5089" />
++ <stop
++ id="stop117"
++ style="stop-color:#F6F6F6"
++ offset="0.8141" />
++ <stop
++ id="stop119"
++ style="stop-color:#FFFFFF"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ y2="110.7534"
++ x2="62.9995"
++ y1="107.2202"
++ x1="62.9995"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_81_">
++ <stop
++ id="stop124"
++ style="stop-color:#555555"
++ offset="0" />
++ <stop
++ id="stop126"
++ style="stop-color:#676866"
++ offset="0.0348" />
++ <stop
++ id="stop128"
++ style="stop-color:#7F817D"
++ offset="0.0904" />
++ <stop
++ id="stop130"
++ style="stop-color:#888A85"
++ offset="0.1243" />
++ <stop
++ id="stop132"
++ style="stop-color:#777974"
++ offset="0.3514" />
++ <stop
++ id="stop134"
++ style="stop-color:#5E605C"
++ offset="0.7547" />
++ <stop
++ id="stop136"
++ style="stop-color:#555753"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ y2="79.355003"
++ x2="62.683601"
++ y1="91.784698"
++ x1="62.683601"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_84_">
++ <stop
++ id="stop165"
++ style="stop-color:#FFFFFF"
++ offset="0" />
++ <stop
++ id="stop167"
++ style="stop-color:#D8D8D8"
++ offset="0.1771" />
++ <stop
++ id="stop169"
++ style="stop-color:#A0A0A0"
++ offset="0.4561" />
++ <stop
++ id="stop171"
++ style="stop-color:#777777"
++ offset="0.6963" />
++ <stop
++ id="stop173"
++ style="stop-color:#5E5E5E"
++ offset="0.8854" />
++ <stop
++ id="stop175"
++ style="stop-color:#555555"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ y2="85.242699"
++ x2="107.0981"
++ y1="85.242699"
++ x1="18.2686"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_85_">
++ <stop
++ id="stop180"
++ style="stop-color:#888888"
++ offset="0" />
++ <stop
++ id="stop182"
++ style="stop-color:#777777"
++ offset="0.2594" />
++ <stop
++ id="stop184"
++ style="stop-color:#5E5E5E"
++ offset="0.7198" />
++ <stop
++ id="stop186"
++ style="stop-color:#555555"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ y2="97.605003"
++ x2="77.694801"
++ y1="97.605003"
++ x1="48.304699"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_86_">
++ <stop
++ id="stop193"
++ style="stop-color:#EEEEEE"
++ offset="0" />
++ <stop
++ id="stop195"
++ style="stop-color:#F6F6F6"
++ offset="0.367" />
++ <stop
++ id="stop197"
++ style="stop-color:#FFFFFF"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ y2="108.4212"
++ x2="57.168201"
++ y1="86.824699"
++ x1="69.766098"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_87_">
++ <stop
++ id="stop202"
++ style="stop-color:#625555"
++ offset="0" />
++ <stop
++ id="stop204"
++ style="stop-color:#544B4B"
++ offset="0.2253" />
++ <stop
++ id="stop206"
++ style="stop-color:#3B3939"
++ offset="0.707" />
++ <stop
++ id="stop208"
++ style="stop-color:#323232"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ y2="107.0806"
++ x2="62.9995"
++ y1="93.080597"
++ x1="62.9995"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_88_">
++ <stop
++ id="stop213"
++ style="stop-color:#FFFFFF"
++ offset="0" />
++ <stop
++ id="stop215"
++ style="stop-color:#E6E6E6"
++ offset="0.6214" />
++ <stop
++ id="stop217"
++ style="stop-color:#DDDDDD"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ y2="81.1772"
++ x2="62.683102"
++ y1="81.747597"
++ x1="62.683102"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_93_">
++ <stop
++ id="stop268"
++ style="stop-color:#888888"
++ offset="0" />
++ <stop
++ id="stop270"
++ style="stop-color:#AEAEAE"
++ offset="0.4336" />
++ <stop
++ id="stop272"
++ style="stop-color:#DDDDDD"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ y2="79.317902"
++ x2="62.683601"
++ y1="79.888199"
++ x1="62.683601"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_94_">
++ <stop
++ id="stop277"
++ style="stop-color:#888888"
++ offset="0" />
++ <stop
++ id="stop279"
++ style="stop-color:#AEAEAE"
++ offset="0.4336" />
++ <stop
++ id="stop281"
++ style="stop-color:#DDDDDD"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ y2="86.210403"
++ x2="62.683601"
++ y1="86.7808"
++ x1="62.683601"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_95_">
++ <stop
++ id="stop286"
++ style="stop-color:#888888"
++ offset="0" />
++ <stop
++ id="stop288"
++ style="stop-color:#AEAEAE"
++ offset="0.4336" />
++ <stop
++ id="stop290"
++ style="stop-color:#DDDDDD"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ y2="88.794403"
++ x2="62.683601"
++ y1="89.3647"
++ x1="62.683601"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_96_">
++ <stop
++ id="stop295"
++ style="stop-color:#888888"
++ offset="0" />
++ <stop
++ id="stop297"
++ style="stop-color:#AEAEAE"
++ offset="0.4336" />
++ <stop
++ id="stop299"
++ style="stop-color:#DDDDDD"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ y2="88.9077"
++ x2="62.683601"
++ y1="91.0112"
++ x1="62.683601"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_97_">
++ <stop
++ id="stop304"
++ style="stop-color:#888888"
++ offset="0" />
++ <stop
++ id="stop306"
++ style="stop-color:#777777"
++ offset="0.2594" />
++ <stop
++ id="stop308"
++ style="stop-color:#5E5E5E"
++ offset="0.7198" />
++ <stop
++ id="stop310"
++ style="stop-color:#555555"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ y2="83.806198"
++ x2="62.683601"
++ y1="84.376503"
++ x1="62.683601"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_128_">
++ <stop
++ id="stop677"
++ style="stop-color:#888888"
++ offset="0" />
++ <stop
++ id="stop679"
++ style="stop-color:#AEAEAE"
++ offset="0.4336" />
++ <stop
++ id="stop681"
++ style="stop-color:#DDDDDD"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ y2="71.050301"
++ x2="64.249496"
++ y1="65.829597"
++ x1="64.249496"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_144_">
++ <stop
++ id="stop867"
++ style="stop-color:#000000"
++ offset="0" />
++ <stop
++ id="stop869"
++ style="stop-color:#2E3436"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ y2="74.704399"
++ x2="64.249496"
++ y1="66.829597"
++ x1="64.249496"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_145_">
++ <stop
++ id="stop874"
++ style="stop-color:#BABDB6"
++ offset="0" />
++ <stop
++ id="stop876"
++ style="stop-color:#CACCC7"
++ offset="0.1561" />
++ <stop
++ id="stop878"
++ style="stop-color:#EEEEEC"
++ offset="0.426" />
++ <stop
++ id="stop880"
++ style="stop-color:#EAEAE8"
++ offset="0.4937" />
++ <stop
++ id="stop882"
++ style="stop-color:#DEDEDD"
++ offset="0.5604" />
++ <stop
++ id="stop884"
++ style="stop-color:#CACAC9"
++ offset="0.6266" />
++ <stop
++ id="stop886"
++ style="stop-color:#AFAFAE"
++ offset="0.6925" />
++ <stop
++ id="stop888"
++ style="stop-color:#8B8B8B"
++ offset="0.7578" />
++ <stop
++ id="stop890"
++ style="stop-color:#888888"
++ offset="0.7633" />
++ <stop
++ id="stop892"
++ style="stop-color:#BABDB6"
++ offset="0.929" />
++ </linearGradient>
++ <linearGradient
++ y2="74.450699"
++ x2="63"
++ y1="76.950699"
++ x1="63"
++ gradientUnits="userSpaceOnUse"
++ id="XMLID_146_">
++ <stop
++ id="stop897"
++ style="stop-color:#2E3436"
++ offset="0" />
++ <stop
++ id="stop899"
++ style="stop-color:#000000"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4132">
++ <stop
++ style="stop-color:#bababa;stop-opacity:1;"
++ offset="0"
++ id="stop4134" />
++ <stop
++ id="stop9431"
++ offset="0.07881773"
++ style="stop-color:#e7e7e7;stop-opacity:1;" />
++ <stop
++ style="stop-color:#bababa;stop-opacity:1;"
++ offset="1"
++ id="stop9433" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4033">
++ <stop
++ style="stop-color:#000000;stop-opacity:1;"
++ offset="0"
++ id="stop4035" />
++ <stop
++ style="stop-color:#707070;stop-opacity:1;"
++ offset="1"
++ id="stop4037" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3724">
++ <stop
++ style="stop-color:#ebebeb;stop-opacity:1;"
++ offset="0"
++ id="stop3726" />
++ <stop
++ style="stop-color:#cfcfcf;stop-opacity:1"
++ offset="1"
++ id="stop3728" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient3609">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop3611" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0;"
++ offset="1"
++ id="stop3613" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient3368">
++ <stop
++ style="stop-color:#000000;stop-opacity:1;"
++ offset="0"
++ id="stop3370" />
++ <stop
++ style="stop-color:#000000;stop-opacity:0;"
++ offset="1"
++ id="stop3372" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3174">
++ <stop
++ style="stop-color:#929292;stop-opacity:1;"
++ offset="0"
++ id="stop3176" />
++ <stop
++ id="stop20117"
++ offset="0.5"
++ style="stop-color:#cfcfcf;stop-opacity:1;" />
++ <stop
++ style="stop-color:#ededed;stop-opacity:1;"
++ offset="1"
++ id="stop3178" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient4464"
++ id="linearGradient9402"
++ x1="55.583"
++ y1="-21.655199"
++ x2="57.817451"
++ y2="134.06604"
++ gradientUnits="userSpaceOnUse" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient3368"
++ id="linearGradient9400"
++ gradientUnits="userSpaceOnUse"
++ x1="678.97717"
++ y1="469.88528"
++ x2="660.93494"
++ y2="178.31888" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient3609"
++ id="linearGradient9396"
++ gradientUnits="userSpaceOnUse"
++ x1="648.69159"
++ y1="360.4375"
++ x2="629.51672"
++ y2="427.24884" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient3451"
++ id="linearGradient9394"
++ gradientUnits="userSpaceOnUse"
++ x1="665.60358"
++ y1="417.89856"
++ x2="741.18127"
++ y2="349.14856" />
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient3609"
++ id="linearGradient9392"
++ gradientUnits="userSpaceOnUse"
++ x1="715.67871"
++ y1="359.76755"
++ x2="745.875"
++ y2="372.26755" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient4033"
++ id="radialGradient9388"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.36212,6.269062e-8,0,0.989404,-128.1721,-267.8061)"
++ cx="534.98535"
++ cy="300.16165"
++ fx="534.98535"
++ fy="305.79822"
++ r="8.984375" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#linearGradient3174"
++ id="radialGradient9384"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.892703,0.267203,-0.538726,1.247851,-343.4704,-559.4011)"
++ spreadMethod="reflect"
++ cx="662.27393"
++ cy="362.62781"
++ fx="654.18811"
++ fy="358.18716"
++ r="41.154457" />
++ <linearGradient
++ id="linearGradient8514">
++ <stop
++ style="stop-color:#ff0000;stop-opacity:1;"
++ offset="0"
++ id="stop8516" />
++ <stop
++ style="stop-color:#ff7d7d;stop-opacity:0;"
++ offset="1"
++ id="stop8518" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3469">
++ <stop
++ style="stop-color:#e8e8e8;stop-opacity:1;"
++ offset="0"
++ id="stop3471" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="1"
++ id="stop3473" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3459">
++ <stop
++ style="stop-color:#bebebe;stop-opacity:1;"
++ offset="0"
++ id="stop19486" />
++ <stop
++ style="stop-color:#ededed;stop-opacity:1;"
++ offset="1"
++ id="stop3463" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ id="linearGradient3451">
++ <stop
++ style="stop-color:#000000;stop-opacity:1;"
++ offset="0"
++ id="stop19490" />
++ <stop
++ style="stop-color:#000000;stop-opacity:0;"
++ offset="1"
++ id="stop19492" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3413">
++ <stop
++ style="stop-color:#515151;stop-opacity:1;"
++ offset="0"
++ id="stop19495" />
++ <stop
++ style="stop-color:#515151;stop-opacity:0;"
++ offset="1"
++ id="stop3417" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3164">
++ <stop
++ id="stop3166"
++ offset="0"
++ style="stop-color:#dedee0;stop-opacity:1;" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0.2957755"
++ id="stop3168" />
++ <stop
++ id="stop3170"
++ offset="0.58108109"
++ style="stop-color:#f5f5f6;stop-opacity:1;" />
++ <stop
++ id="stop3172"
++ offset="1"
++ style="stop-color:#e5e5e7;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3144">
++ <stop
++ style="stop-color:#dedee0;stop-opacity:1;"
++ offset="0"
++ id="stop3146" />
++ <stop
++ id="stop3152"
++ offset="0.16216215"
++ style="stop-color:#efefef;stop-opacity:1;" />
++ <stop
++ style="stop-color:#d9d9db;stop-opacity:1;"
++ offset="0.58108109"
++ id="stop3154" />
++ <stop
++ style="stop-color:#b3b3b8;stop-opacity:1;"
++ offset="1"
++ id="stop3148" />
++ </linearGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.8303,0.5574,-0.5574,0.8303,23.5409,-23.4065)"
++ fy="27.666901"
++ fx="50.021099"
++ r="5.5998998"
++ cy="30.584"
++ cx="47.582001"
++ id="XMLID_72_">
++ <stop
++ id="stop3765"
++ style="stop-color:#FFFFFF"
++ offset="0" />
++ <stop
++ id="stop3767"
++ style="stop-color:white;stop-opacity:0;"
++ offset="1" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ r="84.580902"
++ cy="39.059101"
++ cx="63.792999"
++ id="XMLID_37_">
++ <stop
++ id="stop3332"
++ style="stop-color:#103961"
++ offset="0" />
++ <stop
++ id="stop3334"
++ style="stop-color:#227AD1"
++ offset="0.6746" />
++ <stop
++ id="stop3336"
++ style="stop-color:#00438A"
++ offset="0.929" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,0,0,0.953,2.5914,2.6856)"
++ r="84.581299"
++ cy="39.420898"
++ cx="63.4492"
++ id="XMLID_38_">
++ <stop
++ id="stop3341"
++ style="stop-color:#BFD9FF"
++ offset="0" />
++ <stop
++ id="stop3343"
++ style="stop-color:#B4D1FA"
++ offset="0.0569" />
++ <stop
++ id="stop3345"
++ style="stop-color:#98BCEB"
++ offset="0.1558" />
++ <stop
++ id="stop18699"
++ style="stop-color:#6A9AD4"
++ offset="0.284" />
++ <stop
++ id="stop18701"
++ style="stop-color:#6193CF"
++ offset="0.3077" />
++ <stop
++ id="stop3351"
++ style="stop-color:#588DCC"
++ offset="0.3445" />
++ <stop
++ id="stop3353"
++ style="stop-color:#407EC4"
++ offset="0.4045" />
++ <stop
++ id="stop3355"
++ style="stop-color:#1866B6"
++ offset="0.4798" />
++ <stop
++ id="stop3357"
++ style="stop-color:#0057AE"
++ offset="0.5207" />
++ <stop
++ id="stop3359"
++ style="stop-color:#80B3FF"
++ offset="0.7515" />
++ <stop
++ id="stop3361"
++ style="stop-color:#77ACF9"
++ offset="0.7765" />
++ <stop
++ id="stop3363"
++ style="stop-color:#5F99E9"
++ offset="0.8173" />
++ <stop
++ id="stop3365"
++ style="stop-color:#377BCF"
++ offset="0.8685" />
++ <stop
++ id="stop3367"
++ style="stop-color:#2C72C7"
++ offset="0.8817" />
++ <stop
++ id="stop3369"
++ style="stop-color:#0057AE"
++ offset="1" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,0,0,0.953,2.5914,2.6856)"
++ r="57.310902"
++ cy="60.973598"
++ cx="43.959"
++ id="XMLID_39_">
++ <stop
++ id="stop3374"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3376"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3378"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,4.2e-3,-4.2e-3,0.953,8.8966,-30.8642)"
++ r="57.305401"
++ cy="76.441399"
++ cx="41.0298"
++ id="XMLID_40_">
++ <stop
++ id="stop3383"
++ style="stop-color:#BFD9FF"
++ offset="0.5207" />
++ <stop
++ id="stop3385"
++ style="stop-color:#80B3FF"
++ offset="0.7515" />
++ <stop
++ id="stop3387"
++ style="stop-color:#80B3FF"
++ offset="0.858" />
++ <stop
++ id="stop3389"
++ style="stop-color:#7AB0FA"
++ offset="0.8995" />
++ <stop
++ id="stop3391"
++ style="stop-color:#68A8EC"
++ offset="0.9563" />
++ <stop
++ id="stop3393"
++ style="stop-color:#56A0DE"
++ offset="1" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,0,0,0.953,2.5914,2.6856)"
++ r="57.312801"
++ cy="60.973598"
++ cx="43.960899"
++ id="XMLID_41_">
++ <stop
++ id="stop3398"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3400"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3402"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,4.2e-3,-4.2e-3,0.953,8.8966,-30.8642)"
++ r="57.304501"
++ cy="76.441399"
++ cx="41.0298"
++ id="XMLID_42_">
++ <stop
++ id="stop3407"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3409"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop9304"
++ style="stop-color:#7AC3FF"
++ offset="0.7515" />
++ <stop
++ id="stop3413"
++ style="stop-color:#63B8FF"
++ offset="0.858" />
++ <stop
++ id="stop3415"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,0,0,0.953,2.5914,2.6856)"
++ r="57.304199"
++ cy="60.965801"
++ cx="43.959"
++ id="XMLID_43_">
++ <stop
++ id="stop3420"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3422"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3424"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,4.2e-3,-4.2e-3,0.953,8.8966,-30.8642)"
++ r="57.309101"
++ cy="76.444298"
++ cx="41.028801"
++ id="XMLID_44_">
++ <stop
++ id="stop9286"
++ style="stop-color:#BFD9FF"
++ offset="0.5207" />
++ <stop
++ id="stop3431"
++ style="stop-color:#80B3FF"
++ offset="0.7515" />
++ <stop
++ id="stop9290"
++ style="stop-color:#80B3FF"
++ offset="0.858" />
++ <stop
++ id="stop3435"
++ style="stop-color:#7AB0FA"
++ offset="0.8995" />
++ <stop
++ id="stop9293"
++ style="stop-color:#68A8EC"
++ offset="0.9563" />
++ <stop
++ id="stop9295"
++ style="stop-color:#56A0DE"
++ offset="1" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,0,0,0.953,2.5914,2.6856)"
++ r="57.311901"
++ cy="60.973598"
++ cx="43.959"
++ id="XMLID_45_">
++ <stop
++ id="stop3444"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3446"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3448"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,4.2e-3,-4.2e-3,0.953,8.8966,-30.8642)"
++ r="57.264801"
++ cy="76.421898"
++ cx="41.050301"
++ id="XMLID_46_">
++ <stop
++ id="stop3453"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3455"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3457"
++ style="stop-color:#7AC3FF"
++ offset="0.7515" />
++ <stop
++ id="stop3459"
++ style="stop-color:#63B8FF"
++ offset="0.858" />
++ <stop
++ id="stop3461"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,0,0,0.953,2.5914,2.6856)"
++ fy="60.575199"
++ fx="80.556396"
++ r="71.870102"
++ cy="53.120098"
++ cx="39.9678"
++ id="XMLID_47_">
++ <stop
++ id="stop3466"
++ style="stop-color:#FFFFFF"
++ offset="0" />
++ <stop
++ id="stop3468"
++ style="stop-color:#F5FAFE"
++ offset="0.0669" />
++ <stop
++ id="stop3470"
++ style="stop-color:#DBEBFB"
++ offset="0.1789" />
++ <stop
++ id="stop3472"
++ style="stop-color:#B1D4F6"
++ offset="0.3223" />
++ <stop
++ id="stop3474"
++ style="stop-color:#77B4F0"
++ offset="0.4916" />
++ <stop
++ id="stop3476"
++ style="stop-color:#2D8BE8"
++ offset="0.6803" />
++ <stop
++ id="stop3478"
++ style="stop-color:#0072E3"
++ offset="0.787" />
++ <stop
++ id="stop3480"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.948,-9.81e-2,9.81e-2,0.948,-2.0096,9.2425)"
++ r="57.3041"
++ cy="39.725101"
++ cx="48.304699"
++ id="XMLID_48_">
++ <stop
++ id="stop3485"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3487"
++ style="stop-color:#BFD9FF"
++ offset="0.5207" />
++ <stop
++ id="stop3489"
++ style="stop-color:#80B3FF"
++ offset="0.7515" />
++ <stop
++ id="stop3491"
++ style="stop-color:#6193CF"
++ offset="0.858" />
++ <stop
++ id="stop3493"
++ style="stop-color:#80B3FF"
++ offset="1" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,0,0,0.953,2.5914,2.6856)"
++ r="57.310001"
++ cy="60.973598"
++ cx="43.959"
++ id="XMLID_49_">
++ <stop
++ id="stop3498"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3500"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3502"
++ style="stop-color:#058EFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,4.2e-3,-4.2e-3,0.953,8.8966,-30.8642)"
++ r="57.307499"
++ cy="76.441399"
++ cx="41.0298"
++ id="XMLID_50_">
++ <stop
++ id="stop3507"
++ style="stop-color:#BFD9FF"
++ offset="0.5207" />
++ <stop
++ id="stop3509"
++ style="stop-color:#80B3FF"
++ offset="0.7515" />
++ <stop
++ id="stop3511"
++ style="stop-color:#80B3FF"
++ offset="0.858" />
++ <stop
++ id="stop3513"
++ style="stop-color:#7AB0FA"
++ offset="0.8995" />
++ <stop
++ id="stop3515"
++ style="stop-color:#68A8EC"
++ offset="0.9563" />
++ <stop
++ id="stop3517"
++ style="stop-color:#56A0DE"
++ offset="1" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,0,0,0.953,2.5914,2.6856)"
++ r="57.306"
++ cy="60.963902"
++ cx="43.9482"
++ id="XMLID_51_">
++ <stop
++ id="stop3522"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3524"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3526"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,4.2e-3,-4.2e-3,0.953,8.8966,-30.8642)"
++ r="57.312199"
++ cy="76.427696"
++ cx="41.021"
++ id="XMLID_52_">
++ <stop
++ id="stop3531"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3533"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3535"
++ style="stop-color:#7AC3FF"
++ offset="0.7515" />
++ <stop
++ id="stop3537"
++ style="stop-color:#63B8FF"
++ offset="0.858" />
++ <stop
++ id="stop3539"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,0,0,0.953,2.5914,2.6856)"
++ r="46.678699"
++ cy="76.084"
++ cx="52.2803"
++ id="XMLID_53_">
++ <stop
++ id="stop3544"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3546"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3548"
++ style="stop-color:#C3EAFF"
++ offset="0.6268" />
++ <stop
++ id="stop3550"
++ style="stop-color:#B8E4FF"
++ offset="0.7285" />
++ <stop
++ id="stop3552"
++ style="stop-color:#A4DAFF"
++ offset="0.8283" />
++ <stop
++ id="stop3554"
++ style="stop-color:#89CBFF"
++ offset="0.9263" />
++ <stop
++ id="stop3556"
++ style="stop-color:#70BEFF"
++ offset="1" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,4.2e-3,-4.2e-3,0.953,8.8966,-30.8642)"
++ r="57.307098"
++ cy="76.444298"
++ cx="41.0298"
++ id="XMLID_54_">
++ <stop
++ id="stop3561"
++ style="stop-color:#BFD9FF"
++ offset="0.5207" />
++ <stop
++ id="stop3563"
++ style="stop-color:#80B3FF"
++ offset="0.7515" />
++ <stop
++ id="stop3565"
++ style="stop-color:#80B3FF"
++ offset="0.858" />
++ <stop
++ id="stop3567"
++ style="stop-color:#7AB0FA"
++ offset="0.8995" />
++ <stop
++ id="stop3569"
++ style="stop-color:#68A8EC"
++ offset="0.9563" />
++ <stop
++ id="stop3571"
++ style="stop-color:#56A0DE"
++ offset="1" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,4.2e-3,-4.2e-3,0.953,8.8966,-30.8642)"
++ r="57.266102"
++ cy="76.470703"
++ cx="41.074699"
++ id="XMLID_55_">
++ <stop
++ id="stop3576"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3578"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3580"
++ style="stop-color:#7AC3FF"
++ offset="0.7515" />
++ <stop
++ id="stop3582"
++ style="stop-color:#63B8FF"
++ offset="0.858" />
++ <stop
++ id="stop3584"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,4.2e-3,-4.2e-3,0.953,8.8966,-30.8642)"
++ r="57.328098"
++ cy="76.419899"
++ cx="41.0308"
++ id="XMLID_56_">
++ <stop
++ id="stop3589"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3591"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3593"
++ style="stop-color:#7AC3FF"
++ offset="0.7515" />
++ <stop
++ id="stop3595"
++ style="stop-color:#63B8FF"
++ offset="0.858" />
++ <stop
++ id="stop3597"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,4.2e-3,-4.2e-3,0.953,8.8966,-30.8642)"
++ r="57.159401"
++ cy="76.448196"
++ cx="41.213402"
++ id="XMLID_57_">
++ <stop
++ id="stop3602"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3604"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3606"
++ style="stop-color:#7AC3FF"
++ offset="0.7515" />
++ <stop
++ id="stop3608"
++ style="stop-color:#63B8FF"
++ offset="0.858" />
++ <stop
++ id="stop3610"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,4.2e-3,-4.2e-3,0.953,8.8966,-30.8642)"
++ r="57.252899"
++ cy="76.450203"
++ cx="41.099098"
++ id="XMLID_58_">
++ <stop
++ id="stop3615"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3617"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3619"
++ style="stop-color:#7AC3FF"
++ offset="0.7515" />
++ <stop
++ id="stop3621"
++ style="stop-color:#63B8FF"
++ offset="0.858" />
++ <stop
++ id="stop3623"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,4.2e-3,-4.2e-3,0.953,8.8966,-30.8642)"
++ r="57.6535"
++ cy="76.454102"
++ cx="40.5532"
++ id="XMLID_59_">
++ <stop
++ id="stop3628"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3630"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3632"
++ style="stop-color:#7AC3FF"
++ offset="0.7515" />
++ <stop
++ id="stop3634"
++ style="stop-color:#63B8FF"
++ offset="0.858" />
++ <stop
++ id="stop3636"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,4.2e-3,-4.2e-3,0.953,8.8966,-30.8642)"
++ r="57.271599"
++ cy="76.4375"
++ cx="41.078602"
++ id="XMLID_60_">
++ <stop
++ id="stop3641"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3643"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3645"
++ style="stop-color:#7AC3FF"
++ offset="0.7515" />
++ <stop
++ id="stop3647"
++ style="stop-color:#63B8FF"
++ offset="0.858" />
++ <stop
++ id="stop3649"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,4.2e-3,-4.2e-3,0.953,8.8966,-30.8642)"
++ r="57.2607"
++ cy="76.441399"
++ cx="41.090302"
++ id="XMLID_63_">
++ <stop
++ id="stop3676"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3678"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3680"
++ style="stop-color:#7AC3FF"
++ offset="0.7515" />
++ <stop
++ id="stop3682"
++ style="stop-color:#63B8FF"
++ offset="0.858" />
++ <stop
++ id="stop3684"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,4.2e-3,-4.2e-3,0.953,8.8966,-30.8642)"
++ r="57.117401"
++ cy="76.440399"
++ cx="41.267101"
++ id="XMLID_64_">
++ <stop
++ id="stop3689"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3691"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3693"
++ style="stop-color:#7AC3FF"
++ offset="0.7515" />
++ <stop
++ id="stop3695"
++ style="stop-color:#63B8FF"
++ offset="0.858" />
++ <stop
++ id="stop3697"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.953,4.2e-3,-4.2e-3,0.953,8.8966,-30.8642)"
++ r="57.298901"
++ cy="76.447304"
++ cx="41.043499"
++ id="XMLID_65_">
++ <stop
++ id="stop3702"
++ style="stop-color:#FFFFFF"
++ offset="0.2485" />
++ <stop
++ id="stop3704"
++ style="stop-color:#C7ECFF"
++ offset="0.5207" />
++ <stop
++ id="stop3706"
++ style="stop-color:#7AC3FF"
++ offset="0.7515" />
++ <stop
++ id="stop3708"
++ style="stop-color:#63B8FF"
++ offset="0.858" />
++ <stop
++ id="stop3710"
++ style="stop-color:#8ACAFF"
++ offset="0.9527" />
++ </radialGradient>
++ <radialGradient
++ id="XMLID_66_"
++ cx="75.122101"
++ cy="45.164101"
++ r="30.476"
++ gradientUnits="userSpaceOnUse">
++ <stop
++ offset="0"
++ style="stop-color:#FFFFFF"
++ id="stop3717" />
++ <stop
++ offset="1"
++ style="stop-color:white;stop-opacity:0;"
++ id="stop3719" />
++ </radialGradient>
++ <radialGradient
++ r="39.650002"
++ fy="-447.57755"
++ fx="1207.5059"
++ cy="-447.57755"
++ cx="1207.5059"
++ gradientTransform="matrix(5.396447e-7,3.023865,-1.258963,1.649418e-6,603.8373,-3986.888)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient17234"
++ xlink:href="#linearGradient3916"
++ inkscape:collect="always" />
++ <radialGradient
++ r="39.120682"
++ fy="-228.63419"
++ fx="1154.1207"
++ cy="-228.63419"
++ cx="1154.1207"
++ gradientTransform="matrix(1.109287,2.295961e-2,-1.645507e-2,0.795023,-129.8932,-69.87235)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient17232"
++ xlink:href="#linearGradient2334"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="-154.06639"
++ x2="1159.6357"
++ y1="-154.06639"
++ x1="1138.9358"
++ gradientTransform="matrix(1.003107,0,0,0.82776,-3.206737,-47.96503)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient17230"
++ xlink:href="#linearGradient2783"
++ inkscape:collect="always" />
++ <radialGradient
++ r="39.650002"
++ fy="-447.57748"
++ fx="1147.1147"
++ cy="-447.57748"
++ cx="1147.1147"
++ gradientTransform="matrix(5.396447e-7,3.023865,-1.258963,1.649418e-6,603.8373,-3986.888)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient17228"
++ xlink:href="#linearGradient3916"
++ inkscape:collect="always" />
++ <linearGradient
++ id="linearGradient3225">
++ <stop
++ id="stop3227"
++ offset="0"
++ style="stop-color:#ffffff;stop-opacity:1;" />
++ <stop
++ id="stop3229"
++ offset="1"
++ style="stop-color:#aeaeae;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient2257">
++ <stop
++ id="stop2259"
++ offset="0"
++ style="stop-color:#b4942a;stop-opacity:1;" />
++ <stop
++ id="stop2261"
++ offset="1"
++ style="stop-color:#e4dcc9;stop-opacity:1" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3207">
++ <stop
++ id="stop3209"
++ offset="0"
++ style="stop-color:#ffffff;stop-opacity:1;" />
++ <stop
++ id="stop3211"
++ offset="1"
++ style="stop-color:#252525;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3251">
++ <stop
++ id="stop3253"
++ offset="0"
++ style="stop-color:#000000;stop-opacity:1;" />
++ <stop
++ id="stop3255"
++ offset="1"
++ style="stop-color:#131313;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3259">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0.55035973;"
++ offset="0"
++ id="stop3261" />
++ <stop
++ style="stop-color:#000000;stop-opacity:0;"
++ offset="1"
++ id="stop3263" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3273">
++ <stop
++ id="stop3275"
++ offset="0"
++ style="stop-color:#ffffff;stop-opacity:0.55035973;" />
++ <stop
++ id="stop3277"
++ offset="1"
++ style="stop-color:#ffffff;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3303">
++ <stop
++ id="stop3305"
++ offset="0"
++ style="stop-color:#ffffff;stop-opacity:0.68345326;" />
++ <stop
++ id="stop3307"
++ offset="1"
++ style="stop-color:#ffffff;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3311">
++ <stop
++ id="stop3313"
++ offset="0"
++ style="stop-color:#2d2d2d;stop-opacity:1;" />
++ <stop
++ style="stop-color:#000000;stop-opacity:1;"
++ offset="0.5"
++ id="stop3319" />
++ <stop
++ id="stop17027"
++ offset="1"
++ style="stop-color:#000000;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3325">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop3327" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0;"
++ offset="1"
++ id="stop3329" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient2598">
++ <stop
++ id="stop2600"
++ offset="0"
++ style="stop-color:#252525;stop-opacity:1;" />
++ <stop
++ style="stop-color:#252525;stop-opacity:1;"
++ offset="0.5"
++ id="stop2606" />
++ <stop
++ id="stop2608"
++ offset="0.75"
++ style="stop-color:#252525;stop-opacity:1;" />
++ <stop
++ id="stop2602"
++ offset="1"
++ style="stop-color:#000000;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient10207">
++ <stop
++ style="stop-color:#a2a2a2;stop-opacity:1;"
++ offset="0"
++ id="stop10209" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="1"
++ id="stop10211" />
++ </linearGradient>
++ <radialGradient
++ id="XMLID_8_"
++ cx="102"
++ cy="112.3047"
++ r="139.55859"
++ gradientUnits="userSpaceOnUse">
++ <stop
++ offset="0"
++ style="stop-color:#b7b8b9;stop-opacity:1;"
++ id="stop41" />
++ <stop
++ offset="0.18851049"
++ style="stop-color:#ECECEC"
++ id="stop47" />
++ <stop
++ offset="0.25718147"
++ style="stop-color:#FAFAFA"
++ id="stop49" />
++ <stop
++ offset="0.30111277"
++ style="stop-color:#FFFFFF"
++ id="stop51" />
++ <stop
++ offset="0.5313"
++ style="stop-color:#FAFAFA"
++ id="stop53" />
++ <stop
++ offset="0.8449"
++ style="stop-color:#EBECEC"
++ id="stop55" />
++ <stop
++ offset="1"
++ style="stop-color:#E1E2E3"
++ id="stop57" />
++ </radialGradient>
++ <clipPath
++ clipPathUnits="userSpaceOnUse"
++ id="clipPath7084">
++ <path
++ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
++ d="M 72,88 L 40,120 L 32,120 L 32,80 L 72,80 L 72,88 z"
++ id="path7086" />
++ </clipPath>
++ <radialGradient
++ r="126.0234"
++ cy="651.10352"
++ cx="538.77338"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient3798"
++ xlink:href="#radialGradient2854"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="789.12207"
++ x2="538.77338"
++ y1="677.87701"
++ x1="538.77338"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8993,-752.5038)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient3796"
++ xlink:href="#linearGradient2862"
++ inkscape:collect="always" />
++ <radialGradient
++ r="121.5466"
++ cy="792.99609"
++ cx="538.77252"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)"
++ gradientUnits="userSpaceOnUse"
++ id="radialGradient3794"
++ xlink:href="#radialGradient8028"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="736.62341"
++ x2="497.81451"
++ y1="732.4082"
++ x1="497.81451"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient9091"
++ xlink:href="#XMLID_12_"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="736.55688"
++ x2="579.72852"
++ y1="732.41022"
++ x1="579.72852"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient3790"
++ xlink:href="#XMLID_11_"
++ inkscape:collect="always" />
++ <linearGradient
++ y2="674"
++ x2="538.77338"
++ y1="793"
++ x1="538.77338"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient3788"
++ xlink:href="#linearGradient9836"
++ inkscape:collect="always" />
++ <linearGradient
++ id="linearGradient8600">
++ <stop
++ id="stop8602"
++ offset="0"
++ style="stop-color:#ffffff;stop-opacity:0.83673471" />
++ <stop
++ id="stop8604"
++ offset="1"
++ style="stop-color:#c6c6c6;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient14470">
++ <stop
++ style="stop-color:#9c000f;stop-opacity:1;"
++ offset="0"
++ id="stop14472" />
++ <stop
++ style="stop-color:#9c0f0f;stop-opacity:0;"
++ offset="1"
++ id="stop14474" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient6768">
++ <stop
++ id="stop6770"
++ offset="0"
++ style="stop-color:#ffffff;stop-opacity:1" />
++ <stop
++ id="stop6772"
++ offset="1"
++ style="stop-color:#494949;stop-opacity:0.34509805;" />
++ </linearGradient>
++ <radialGradient
++ cx="265.3931"
++ cy="-6078.353"
++ r="253.01871"
++ fx="267.36481"
++ fy="-6071.0229"
++ id="radialGradient9073"
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="matrix(0.244472,0,0,-1.859374e-2,-10.10742,1.2728)">
++ <stop
++ style="stop-color:#000000;stop-opacity:1"
++ offset="0"
++ id="stop9075" />
++ <stop
++ style="stop-color:black;stop-opacity:0;"
++ offset="1"
++ id="stop9077" />
++ <a:midPointStop
++ style="stop-color:#000000"
++ offset="0" />
++ <a:midPointStop
++ style="stop-color:#000000"
++ offset="0.5" />
++ <a:midPointStop
++ style="stop-color:#FFFFFF"
++ offset="1" />
++ </radialGradient>
++ <linearGradient
++ gradientTransform="translate(-484,-674)"
++ y2="674"
++ x2="538.77338"
++ y1="793"
++ x1="538.77338"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient2914">
++ <stop
++ id="stop2916"
++ style="stop-color:#e82626;stop-opacity:1;"
++ offset="0" />
++ <stop
++ id="stop2918"
++ style="stop-color:#c83131;stop-opacity:1;"
++ offset="0.1124" />
++ <stop
++ id="stop2920"
++ style="stop-color:#a94d4d;stop-opacity:1;"
++ offset="0.37450001" />
++ <stop
++ id="stop2922"
++ style="stop-color:#bb5050;stop-opacity:1;"
++ offset="0.42309999" />
++ <stop
++ id="stop2924"
++ style="stop-color:#ce5757;stop-opacity:1;"
++ offset="0.43689999" />
++ <stop
++ id="stop2926"
++ style="stop-color:#cd6464;stop-opacity:1;"
++ offset="0.44909999" />
++ <stop
++ id="stop2928"
++ style="stop-color:#9c4e4e;stop-opacity:1;"
++ offset="0.4605" />
++ <stop
++ id="stop2930"
++ style="stop-color:#b65e5e;stop-opacity:1;"
++ offset="0.47119999" />
++ <stop
++ id="stop2932"
++ style="stop-color:#cc7a7a;stop-opacity:1;"
++ offset="0.48140001" />
++ <stop
++ id="stop2934"
++ style="stop-color:#e19f9f;stop-opacity:1;"
++ offset="0.48140001" />
++ <stop
++ id="stop2936"
++ style="stop-color:#f5caca;stop-opacity:1;"
++ offset="0.49439999" />
++ <stop
++ id="stop2938"
++ style="stop-color:#d28d8d;stop-opacity:1;"
++ offset="0.51748788" />
++ <stop
++ id="stop2940"
++ style="stop-color:#ba6e6e;stop-opacity:1;"
++ offset="0.53259999" />
++ <stop
++ id="stop2942"
++ style="stop-color:#de7c7c;stop-opacity:1;"
++ offset="0.55519998" />
++ <stop
++ id="stop2944"
++ style="stop-color:#8b3e3e;stop-opacity:1;"
++ offset="0.58454067" />
++ <stop
++ id="stop2946"
++ style="stop-color:#733131;stop-opacity:1;"
++ offset="0.60860002" />
++ <stop
++ id="stop2948"
++ style="stop-color:#6b1b1b;stop-opacity:1;"
++ offset="0.64160001" />
++ <stop
++ id="stop2951"
++ style="stop-color:#620f0f;stop-opacity:1;"
++ offset="0.69285822" />
++ <stop
++ id="stop2953"
++ style="stop-color:#c03333;stop-opacity:1;"
++ offset="0.73979998" />
++ <stop
++ id="stop2955"
++ style="stop-color:#973131;stop-opacity:1;"
++ offset="0.89889997" />
++ <stop
++ id="stop2957"
++ style="stop-color:#dda8a4;stop-opacity:1;"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient9045"
++ gradientUnits="userSpaceOnUse"
++ x1="579.72852"
++ y1="732.41022"
++ x2="579.72852"
++ y2="736.55688"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)">
++ <stop
++ offset="0"
++ style="stop-color:#094422"
++ id="stop9047" />
++ <stop
++ offset="1"
++ style="stop-color:#9ED676"
++ id="stop9049" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient9039"
++ gradientUnits="userSpaceOnUse"
++ x1="497.81451"
++ y1="732.4082"
++ x2="497.81451"
++ y2="736.62341"
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)">
++ <stop
++ offset="0"
++ style="stop-color:#094422"
++ id="stop9041" />
++ <stop
++ offset="1"
++ style="stop-color:#9ED676"
++ id="stop9043" />
++ </linearGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="translate(-484,-674)"
++ r="121.5466"
++ cy="792.99609"
++ cx="538.77252"
++ id="radialGradient2876">
++ <stop
++ id="stop2878"
++ style="stop-color:#d9d9d9;stop-opacity:1;"
++ offset="0" />
++ <stop
++ id="stop2880"
++ style="stop-color:#c7c7c7;stop-opacity:1;"
++ offset="0.0494" />
++ <stop
++ id="stop2882"
++ style="stop-color:#b9b9b9;stop-opacity:1;"
++ offset="0.1049" />
++ <stop
++ id="stop2884"
++ style="stop-color:#aeaeae;stop-opacity:1;"
++ offset="0.14321923" />
++ <stop
++ id="stop2886"
++ style="stop-color:#a9a9a9;stop-opacity:1;"
++ offset="0.2156" />
++ <stop
++ id="stop2888"
++ style="stop-color:#a6a6a6;stop-opacity:1;"
++ offset="0.26969999" />
++ <stop
++ id="stop2890"
++ style="stop-color:#676767;stop-opacity:1;"
++ offset="0.3989" />
++ <stop
++ id="stop2892"
++ style="stop-color:#676767;stop-opacity:1;"
++ offset="0.39950001" />
++ <stop
++ id="stop2894"
++ style="stop-color:#545454;stop-opacity:1;"
++ offset="0.44839999" />
++ <stop
++ id="stop2896"
++ style="stop-color:#414141;stop-opacity:1;"
++ offset="0.49559999" />
++ <stop
++ id="stop2898"
++ style="stop-color:#353535;stop-opacity:1;"
++ offset="0.53988957" />
++ <stop
++ id="stop2900"
++ style="stop-color:#313131;stop-opacity:1;"
++ offset="0.57096523" />
++ <stop
++ id="stop2902"
++ style="stop-color:#3e3e3e;stop-opacity:1;"
++ offset="0.5948" />
++ <stop
++ id="stop2904"
++ style="stop-color:#5f5f5f;stop-opacity:1;"
++ offset="0.64560002" />
++ <stop
++ id="stop2906"
++ style="stop-color:#707070;stop-opacity:1;"
++ offset="0.69319999" />
++ <stop
++ id="stop2908"
++ style="stop-color:#7b7b7b;stop-opacity:1;"
++ offset="0.73589998" />
++ <stop
++ id="stop2910"
++ style="stop-color:#7f7f7f;stop-opacity:1;"
++ offset="0.76969999" />
++ <stop
++ id="stop2912"
++ style="stop-color:#313131;stop-opacity:1;"
++ offset="1" />
++ </radialGradient>
++ <linearGradient
++ gradientTransform="translate(-484,-674)"
++ y2="789.12207"
++ x2="538.77338"
++ y1="677.87701"
++ x1="538.77338"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient2862">
++ <stop
++ id="stop2864"
++ style="stop-color:#1e7d27;stop-opacity:1;"
++ offset="0.0056" />
++ <stop
++ id="stop2866"
++ style="stop-color:#3ba42a;stop-opacity:1;"
++ offset="0.1348" />
++ <stop
++ id="stop2868"
++ style="stop-color:#b8e57f;stop-opacity:1;"
++ offset="0.4831" />
++ <stop
++ id="stop2870"
++ style="stop-color:#a9e66e;stop-opacity:1;"
++ offset="0.62989998" />
++ <stop
++ id="stop2872"
++ style="stop-color:#97e859;stop-opacity:1;"
++ offset="0.85280001" />
++ <stop
++ id="stop2874"
++ style="stop-color:#91e851;stop-opacity:1;"
++ offset="1" />
++ </linearGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="translate(-484,-674)"
++ r="126.0234"
++ cy="651.10352"
++ cx="538.77338"
++ id="radialGradient2854">
++ <stop
++ id="stop2856"
++ style="stop-color:#cceaac;stop-opacity:1;"
++ offset="0" />
++ <stop
++ id="stop2858"
++ style="stop-color:#3ba42a;stop-opacity:1;"
++ offset="0.53930002" />
++ <stop
++ id="stop2860"
++ style="stop-color:#91e851;stop-opacity:1;"
++ offset="1" />
++ </radialGradient>
++ <linearGradient
++ id="linearGradient3817">
++ <stop
++ style="stop-color:#473b3b;stop-opacity:1;"
++ offset="0"
++ id="stop3819" />
++ <stop
++ style="stop-color:black;stop-opacity:0;"
++ offset="1"
++ id="stop3821" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient8975">
++ <stop
++ id="stop8977"
++ offset="0"
++ style="stop-color:#323232;stop-opacity:1;" />
++ <stop
++ style="stop-color:#dfe1e1;stop-opacity:1;"
++ offset="0.07692308"
++ id="stop8979" />
++ <stop
++ id="stop8981"
++ offset="0.26289096"
++ style="stop-color:#b6b1b1;stop-opacity:1;" />
++ <stop
++ style="stop-color:#8d8282;stop-opacity:1;"
++ offset="0.5"
++ id="stop8983" />
++ <stop
++ id="stop8985"
++ offset="0.78201604"
++ style="stop-color:#ffffff;stop-opacity:1;" />
++ <stop
++ id="stop8987"
++ offset="0.9005897"
++ style="stop-color:#dfd9df;stop-opacity:1;" />
++ <stop
++ id="stop8989"
++ offset="1"
++ style="stop-color:#3a3a3a;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient8960">
++ <stop
++ style="stop-color:#323232;stop-opacity:1;"
++ offset="0"
++ id="stop2336" />
++ <stop
++ id="stop8963"
++ offset="0.07692308"
++ style="stop-color:#dfe1e1;stop-opacity:1;" />
++ <stop
++ id="stop8965"
++ offset="0.5"
++ style="stop-color:#e2dcdc;stop-opacity:1;" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0.78201604"
++ id="stop8967" />
++ <stop
++ style="stop-color:#dfd9df;stop-opacity:1;"
++ offset="0.9005897"
++ id="stop8969" />
++ <stop
++ style="stop-color:#3a3a3a;stop-opacity:1;"
++ offset="1"
++ id="stop2338" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient3916">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1;"
++ offset="0"
++ id="stop3926" />
++ <stop
++ id="stop3935"
++ offset="0.3598901"
++ style="stop-color:#b9abb9;stop-opacity:1;" />
++ <stop
++ style="stop-color:#dfd9df;stop-opacity:1;"
++ offset="0.71978021"
++ id="stop3928" />
++ <stop
++ style="stop-color:#3a3a3a;stop-opacity:1;"
++ offset="1"
++ id="stop3930" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient7281">
++ <stop
++ style="stop-color:#ffffff;stop-opacity:1.0000000"
++ offset="0.0000000"
++ id="stop7283" />
++ <stop
++ style="stop-color:#ffffff;stop-opacity:0.0000000"
++ offset="1.0000000"
++ id="stop7285" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4830">
++ <stop
++ style="stop-color:white;stop-opacity:1;"
++ offset="0"
++ id="stop4832" />
++ <stop
++ id="stop5064"
++ offset="0.5"
++ style="stop-color:#dedede;stop-opacity:1;" />
++ <stop
++ style="stop-color:#6f6f6f;stop-opacity:1;"
++ offset="1"
++ id="stop4834" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient2878">
++ <stop
++ style="stop-color:#005ac3;stop-opacity:1;"
++ offset="0"
++ id="stop17207" />
++ <stop
++ style="stop-color:#00c0ad;stop-opacity:1;"
++ offset="1"
++ id="stop17209" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient2902">
++ <stop
++ id="stop17202"
++ offset="0"
++ style="stop-color:#3d0085;stop-opacity:1;" />
++ <stop
++ id="stop17204"
++ offset="1"
++ style="stop-color:#000fc0;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient4787">
++ <stop
++ style="stop-color:white;stop-opacity:1;"
++ offset="0"
++ id="stop4789" />
++ <stop
++ style="stop-color:white;stop-opacity:0"
++ offset="1"
++ id="stop4791" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient5978">
++ <stop
++ id="stop5980"
++ offset="0"
++ style="stop-color:#eeeeec;stop-opacity:0.82051283;" />
++ <stop
++ id="stop12387"
++ offset="1"
++ style="stop-color:#eeeeec;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient6172">
++ <stop
++ style="stop-color:#2e3436;stop-opacity:1"
++ offset="0"
++ id="stop6174" />
++ <stop
++ style="stop-color:#2e3436;stop-opacity:0"
++ offset="1"
++ id="stop6176" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient8906">
++ <stop
++ id="stop8908"
++ offset="0"
++ style="stop-color:#2e3436;stop-opacity:0;" />
++ <stop
++ id="stop8910"
++ offset="1"
++ style="stop-color:#2e3436;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient5963">
++ <stop
++ id="stop5965"
++ offset="0"
++ style="stop-color:#eeeeec;stop-opacity:0;" />
++ <stop
++ style="stop-color:#eeeeec;stop-opacity:0;"
++ offset="0.74576271"
++ id="stop5971" />
++ <stop
++ id="stop5967"
++ offset="1"
++ style="stop-color:#eeeeec;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient6214">
++ <stop
++ style="stop-color:#eeeeec;stop-opacity:1"
++ offset="0"
++ id="stop6216" />
++ <stop
++ style="stop-color:#eeeeec;stop-opacity:0"
++ offset="1"
++ id="stop6218" />
++ </linearGradient>
++ <radialGradient
++ id="radialGradient8028"
++ cx="538.77252"
++ cy="792.99609"
++ r="121.5466"
++ gradientTransform="translate(-484,-674)"
++ gradientUnits="userSpaceOnUse">
++ <stop
++ offset="0"
++ style="stop-color:#fffab3;stop-opacity:1;"
++ id="stop8030" />
++ <stop
++ offset="0.0494"
++ style="stop-color:#dfee9f;stop-opacity:1;"
++ id="stop8032" />
++ <stop
++ offset="0.1049"
++ style="stop-color:#c3e48d;stop-opacity:1;"
++ id="stop8034" />
++ <stop
++ offset="0.14321923"
++ style="stop-color:#aedc80;stop-opacity:1;"
++ id="stop8036" />
++ <stop
++ offset="0.2156"
++ style="stop-color:#a2d879;stop-opacity:1;"
++ id="stop8038" />
++ <stop
++ offset="0.26969999"
++ style="stop-color:#9ed676;stop-opacity:1;"
++ id="stop8040" />
++ <stop
++ offset="0.3989"
++ style="stop-color:#3ba42a;stop-opacity:1;"
++ id="stop8042" />
++ <stop
++ offset="0.39950001"
++ style="stop-color:#3ba42a;stop-opacity:1;"
++ id="stop8044" />
++ <stop
++ offset="0.44839999"
++ style="stop-color:#258426;stop-opacity:1;"
++ id="stop8046" />
++ <stop
++ offset="0.49559999"
++ style="stop-color:#166d24;stop-opacity:1;"
++ id="stop8048" />
++ <stop
++ offset="0.53988957"
++ style="stop-color:#0c5f23;stop-opacity:1;"
++ id="stop8050" />
++ <stop
++ offset="0.57096523"
++ style="stop-color:#095a22;stop-opacity:1;"
++ id="stop8052" />
++ <stop
++ offset="0.5948"
++ style="stop-color:#166727;stop-opacity:1;"
++ id="stop8054" />
++ <stop
++ offset="0.64560002"
++ style="stop-color:#388b33;stop-opacity:1;"
++ id="stop8056" />
++ <stop
++ offset="0.69319999"
++ style="stop-color:#51a53c;stop-opacity:1;"
++ id="stop8058" />
++ <stop
++ offset="0.73589998"
++ style="stop-color:#61b542;stop-opacity:1;"
++ id="stop8060" />
++ <stop
++ offset="0.76969999"
++ style="stop-color:#66ba44;stop-opacity:1;"
++ id="stop8062" />
++ <stop
++ offset="1"
++ style="stop-color:#095a22;stop-opacity:1;"
++ id="stop8064" />
++ </radialGradient>
++ <linearGradient
++ id="linearGradient9836"
++ gradientUnits="userSpaceOnUse"
++ x1="538.77338"
++ y1="793"
++ x2="538.77338"
++ y2="674"
++ gradientTransform="translate(-484,-674)">
++ <stop
++ offset="0"
++ style="stop-color:#094422;stop-opacity:1;"
++ id="stop9838" />
++ <stop
++ offset="0.1124"
++ style="stop-color:#095a22;stop-opacity:1;"
++ id="stop9840" />
++ <stop
++ offset="0.37450001"
++ style="stop-color:#1e7d27;stop-opacity:1;"
++ id="stop9842" />
++ <stop
++ offset="0.42309999"
++ style="stop-color:#217f29;stop-opacity:1;"
++ id="stop9844" />
++ <stop
++ offset="0.43689999"
++ style="stop-color:#2a8531;stop-opacity:1;"
++ id="stop9846" />
++ <stop
++ offset="0.44909999"
++ style="stop-color:#3a8f3d;stop-opacity:1;"
++ id="stop8828" />
++ <stop
++ offset="0.4605"
++ style="stop-color:#519d4e;stop-opacity:1;"
++ id="stop8830" />
++ <stop
++ offset="0.47119999"
++ style="stop-color:#6eaf64;stop-opacity:1;"
++ id="stop8832" />
++ <stop
++ offset="0.48140001"
++ style="stop-color:#92c680;stop-opacity:1;"
++ id="stop9854" />
++ <stop
++ offset="0.49110001"
++ style="stop-color:#bce0a0;stop-opacity:1;"
++ id="stop9856" />
++ <stop
++ offset="0.49439999"
++ style="stop-color:#cceaac;stop-opacity:1;"
++ id="stop9858" />
++ <stop
++ offset="0.51748788"
++ style="stop-color:#a4cd90;stop-opacity:1;"
++ id="stop9860" />
++ <stop
++ offset="0.53259999"
++ style="stop-color:#609a5f;stop-opacity:1;"
++ id="stop9862" />
++ <stop
++ offset="0.55519998"
++ style="stop-color:#44864c;stop-opacity:1;"
++ id="stop9864" />
++ <stop
++ offset="0.58454067"
++ style="stop-color:#2e763c;stop-opacity:1;"
++ id="stop9866" />
++ <stop
++ offset="0.60860002"
++ style="stop-color:#1d6931;stop-opacity:1;"
++ id="stop9868" />
++ <stop
++ offset="0.64160001"
++ style="stop-color:#126028;stop-opacity:1;"
++ id="stop9870" />
++ <stop
++ offset="0.69285822"
++ style="stop-color:#0b5b23;stop-opacity:1;"
++ id="stop9872" />
++ <stop
++ offset="0.73979998"
++ style="stop-color:#095a22;stop-opacity:1;"
++ id="stop9874" />
++ <stop
++ offset="0.89889997"
++ style="stop-color:#095a22;stop-opacity:1;"
++ id="stop9876" />
++ <stop
++ offset="1"
++ style="stop-color:#9ed676;stop-opacity:1;"
++ id="stop9878" />
++ </linearGradient>
++ <radialGradient
++ id="radialGradient10859"
++ cx="538.77338"
++ cy="651.10352"
++ r="126.0234"
++ gradientTransform="translate(-484,-674)"
++ gradientUnits="userSpaceOnUse">
++ <stop
++ offset="0"
++ style="stop-color:#cbcbcb;stop-opacity:1;"
++ id="stop10861" />
++ <stop
++ offset="0.53930002"
++ style="stop-color:#676767;stop-opacity:1;"
++ id="stop10863" />
++ <stop
++ offset="1"
++ style="stop-color:white;stop-opacity:1;"
++ id="stop10865" />
++ </radialGradient>
++ <linearGradient
++ id="linearGradient10867"
++ gradientUnits="userSpaceOnUse"
++ x1="538.77338"
++ y1="677.87701"
++ x2="538.77338"
++ y2="789.12207"
++ gradientTransform="translate(-484,-674)">
++ <stop
++ offset="0.0056"
++ style="stop-color:white;stop-opacity:1;"
++ id="stop10869" />
++ <stop
++ offset="0.1348"
++ style="stop-color:#676767;stop-opacity:1;"
++ id="stop10871" />
++ <stop
++ offset="0.4831"
++ style="stop-color:#b2b2b2;stop-opacity:1;"
++ id="stop10873" />
++ <stop
++ offset="0.62989998"
++ style="stop-color:#aaa;stop-opacity:1;"
++ id="stop10875" />
++ <stop
++ offset="0.85280001"
++ style="stop-color:#c6c6c6;stop-opacity:1;"
++ id="stop10877" />
++ <stop
++ offset="1"
++ style="stop-color:#ededed;stop-opacity:1;"
++ id="stop10879" />
++ </linearGradient>
++ <linearGradient
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)"
++ y2="736.62341"
++ x2="497.81451"
++ y1="732.4082"
++ x1="497.81451"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient10881">
++ <stop
++ id="stop10883"
++ style="stop-color:#262626;stop-opacity:1;"
++ offset="0" />
++ <stop
++ id="stop10885"
++ style="stop-color:#a6a6a6;stop-opacity:1;"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient10887"
++ gradientUnits="userSpaceOnUse"
++ x1="538.77338"
++ y1="793"
++ x2="538.77338"
++ y2="674"
++ gradientTransform="translate(-484,-674)">
++ <stop
++ offset="0"
++ style="stop-color:#878787;stop-opacity:1;"
++ id="stop10889" />
++ <stop
++ offset="0.1124"
++ style="stop-color:#7c7c7c;stop-opacity:1;"
++ id="stop10891" />
++ <stop
++ offset="0.37450001"
++ style="stop-color:#7b7b7b;stop-opacity:1;"
++ id="stop10893" />
++ <stop
++ offset="0.42309999"
++ style="stop-color:#868686;stop-opacity:1;"
++ id="stop10895" />
++ <stop
++ offset="0.43689999"
++ style="stop-color:#939393;stop-opacity:1;"
++ id="stop10897" />
++ <stop
++ offset="0.44909999"
++ style="stop-color:#999;stop-opacity:1;"
++ id="stop10899" />
++ <stop
++ offset="0.4605"
++ style="stop-color:#757575;stop-opacity:1;"
++ id="stop10901" />
++ <stop
++ offset="0.47119999"
++ style="stop-color:#8a8a8a;stop-opacity:1;"
++ id="stop10903" />
++ <stop
++ offset="0.48140001"
++ style="stop-color:#a3a3a3;stop-opacity:1;"
++ id="stop10905" />
++ <stop
++ offset="0.49110001"
++ style="stop-color:silver;stop-opacity:1;"
++ id="stop10907" />
++ <stop
++ offset="0.49439999"
++ style="stop-color:#dfdfdf;stop-opacity:1;"
++ id="stop10909" />
++ <stop
++ offset="0.51748788"
++ style="stop-color:#afafaf;stop-opacity:1;"
++ id="stop10911" />
++ <stop
++ offset="0.53259999"
++ style="stop-color:#949494;stop-opacity:1;"
++ id="stop10913" />
++ <stop
++ offset="0.55519998"
++ style="stop-color:#adadad;stop-opacity:1;"
++ id="stop10915" />
++ <stop
++ offset="0.58454067"
++ style="stop-color:#656565;stop-opacity:1;"
++ id="stop10917" />
++ <stop
++ offset="0.60860002"
++ style="stop-color:#525252;stop-opacity:1;"
++ id="stop10919" />
++ <stop
++ offset="0.64160001"
++ style="stop-color:#434343;stop-opacity:1;"
++ id="stop10921" />
++ <stop
++ offset="0.69285822"
++ style="stop-color:#393939;stop-opacity:1;"
++ id="stop10923" />
++ <stop
++ offset="0.73979998"
++ style="stop-color:#797979;stop-opacity:1;"
++ id="stop10925" />
++ <stop
++ offset="0.89889997"
++ style="stop-color:#646464;stop-opacity:1;"
++ id="stop10927" />
++ <stop
++ offset="1"
++ style="stop-color:#c1c1c1;stop-opacity:1;"
++ id="stop10929" />
++ </linearGradient>
++ <radialGradient
++ id="radialGradient12701"
++ cx="538.77338"
++ cy="651.10352"
++ r="126.0234"
++ gradientTransform="translate(-484,-674)"
++ gradientUnits="userSpaceOnUse">
++ <stop
++ offset="0"
++ style="stop-color:#eaacae;stop-opacity:1;"
++ id="stop12703" />
++ <stop
++ offset="0.53930002"
++ style="stop-color:#a42a2c;stop-opacity:1;"
++ id="stop12705" />
++ <stop
++ offset="1"
++ style="stop-color:#e85651;stop-opacity:1;"
++ id="stop12707" />
++ </radialGradient>
++ <linearGradient
++ id="linearGradient12709"
++ gradientUnits="userSpaceOnUse"
++ x1="538.77338"
++ y1="677.87701"
++ x2="538.77338"
++ y2="789.12207"
++ gradientTransform="translate(-484,-674)">
++ <stop
++ offset="0.0056"
++ style="stop-color:#7d1e1f;stop-opacity:1;"
++ id="stop12711" />
++ <stop
++ offset="0.1348"
++ style="stop-color:#a42a2a;stop-opacity:1;"
++ id="stop12713" />
++ <stop
++ offset="0.4831"
++ style="stop-color:#e5837f;stop-opacity:1;"
++ id="stop12715" />
++ <stop
++ offset="0.62989998"
++ style="stop-color:#e6706e;stop-opacity:1;"
++ id="stop12717" />
++ <stop
++ offset="0.85280001"
++ style="stop-color:#e85c59;stop-opacity:1;"
++ id="stop12719" />
++ <stop
++ offset="1"
++ style="stop-color:#e85151;stop-opacity:1;"
++ id="stop12721" />
++ </linearGradient>
++ <radialGradient
++ gradientUnits="userSpaceOnUse"
++ gradientTransform="translate(-484,-674)"
++ r="121.5466"
++ cy="792.99609"
++ cx="538.77252"
++ id="radialGradient12723">
++ <stop
++ id="stop12725"
++ style="stop-color:#ffd7b3;stop-opacity:1;"
++ offset="0" />
++ <stop
++ id="stop12727"
++ style="stop-color:#eeca9f;stop-opacity:1;"
++ offset="0.0494" />
++ <stop
++ id="stop12729"
++ style="stop-color:#e4c88d;stop-opacity:1;"
++ offset="0.1049" />
++ <stop
++ id="stop12731"
++ style="stop-color:#dcb480;stop-opacity:1;"
++ offset="0.14321923" />
++ <stop
++ id="stop12733"
++ style="stop-color:#d88b79;stop-opacity:1;"
++ offset="0.2156" />
++ <stop
++ id="stop12735"
++ style="stop-color:#d68776;stop-opacity:1;"
++ offset="0.26969999" />
++ <stop
++ id="stop12737"
++ style="stop-color:#a42c2a;stop-opacity:1;"
++ offset="0.3989" />
++ <stop
++ id="stop12739"
++ style="stop-color:#a4322a;stop-opacity:1;"
++ offset="0.39950001" />
++ <stop
++ id="stop12741"
++ style="stop-color:#842525;stop-opacity:1;"
++ offset="0.44839999" />
++ <stop
++ id="stop12743"
++ style="stop-color:#6d161c;stop-opacity:1;"
++ offset="0.49559999" />
++ <stop
++ id="stop12745"
++ style="stop-color:#5f0c0d;stop-opacity:1;"
++ offset="0.53988957" />
++ <stop
++ id="stop12747"
++ style="stop-color:#5a090b;stop-opacity:1;"
++ offset="0.57096523" />
++ <stop
++ id="stop12749"
++ style="stop-color:#671619;stop-opacity:1;"
++ offset="0.5948" />
++ <stop
++ id="stop12751"
++ style="stop-color:#8b3433;stop-opacity:1;"
++ offset="0.64560002" />
++ <stop
++ id="stop12753"
++ style="stop-color:#a5403c;stop-opacity:1;"
++ offset="0.69319999" />
++ <stop
++ id="stop12755"
++ style="stop-color:#b54442;stop-opacity:1;"
++ offset="0.73589998" />
++ <stop
++ id="stop12757"
++ style="stop-color:#ba4444;stop-opacity:1;"
++ offset="0.76969999" />
++ <stop
++ id="stop12759"
++ style="stop-color:#5a0d09;stop-opacity:1;"
++ offset="1" />
++ </radialGradient>
++ <linearGradient
++ gradientTransform="matrix(1.064774,0,0,1.069314,-518.8994,-752.5037)"
++ y2="736.62341"
++ x2="497.81451"
++ y1="732.4082"
++ x1="497.81451"
++ gradientUnits="userSpaceOnUse"
++ id="linearGradient13646">
++ <stop
++ id="stop13648"
++ style="stop-color:#443509;stop-opacity:1;"
++ offset="0" />
++ <stop
++ id="stop13650"
++ style="stop-color:#d6767b;stop-opacity:1;"
++ offset="1" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient18125">
++ <stop
++ id="stop18127"
++ offset="0"
++ style="stop-color:white;stop-opacity:1;" />
++ <stop
++ id="stop18129"
++ offset="1"
++ style="stop-color:#a5a5a5;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient41382">
++ <stop
++ id="stop41384"
++ offset="0"
++ style="stop-color:#9a9a9a;stop-opacity:1;" />
++ <stop
++ id="stop41386"
++ offset="1"
++ style="stop-color:black;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient57934">
++ <stop
++ id="stop57936"
++ offset="0"
++ style="stop-color:black;stop-opacity:0;" />
++ <stop
++ style="stop-color:black;stop-opacity:0;"
++ offset="0"
++ id="stop14800" />
++ <stop
++ style="stop-color:black;stop-opacity:0.0625;"
++ offset="0.5"
++ id="stop60597" />
++ <stop
++ id="stop60599"
++ offset="0.75"
++ style="stop-color:black;stop-opacity:1;" />
++ <stop
++ id="stop57938"
++ offset="1"
++ style="stop-color:black;stop-opacity:1;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient65977">
++ <stop
++ id="stop65979"
++ offset="0"
++ style="stop-color:black;stop-opacity:1;" />
++ <stop
++ id="stop65981"
++ offset="1"
++ style="stop-color:black;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ id="linearGradient10113">
++ <stop
++ id="stop10115"
++ offset="0"
++ style="stop-color:#0b5e22;stop-opacity:1;" />
++ <stop
++ id="stop10117"
++ offset="1"
++ style="stop-color:#0b5e22;stop-opacity:0;" />
++ </linearGradient>
++ <linearGradient
++ inkscape:collect="always"
++ xlink:href="#radialGradient2854"
++ id="linearGradient14328"
++ x1="66.904495"
++ y1="1.1190796"
++ x2="66.941193"
++ y2="69.719048"
++ gradientUnits="userSpaceOnUse" />
++ <radialGradient
++ inkscape:collect="always"
++ xlink:href="#radialGradient2854"
++ id="radialGradient20149"
++ cx="64.012886"
++ cy="37.127213"
++ fx="64.012886"
++ fy="37.127213"
++ r="33.190674"
++ gradientTransform="matrix(1.6758234,6.4796419e-3,-5.1367935e-3,1.328524,-43.06523,-15.204642)"
++ gradientUnits="userSpaceOnUse" />
++ </defs>
++ <sodipodi:namedview
++ id="base"
++ pagecolor="#ffffff"
++ bordercolor="#666666"
++ borderopacity="1.0"
++ inkscape:pageopacity="1"
++ inkscape:pageshadow="2"
++ inkscape:zoom="2"
++ inkscape:cx="103.81916"
++ inkscape:cy="73.655696"
++ inkscape:current-layer="layer1"
++ showgrid="false"
++ inkscape:grid-bbox="true"
++ inkscape:document-units="px"
++ showguides="true"
++ inkscape:guide-bbox="true"
++ inkscape:window-width="1920"
++ inkscape:window-height="1127"
++ inkscape:window-x="0"
++ inkscape:window-y="0" />
++ <metadata
++ id="metadata16266">
++ <rdf:RDF>
++ <cc:Work
++ rdf:about="">
++ <dc:format>image/svg+xml</dc:format>
++ <dc:type
++ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
++ </cc:Work>
++ </rdf:RDF>
++ </metadata>
++ <g
++ id="layer1"
++ inkscape:label="Layer 1"
++ inkscape:groupmode="layer"
++ style="display:inline">
++ <g
++ id="g6322">
++ <path
++ transform="matrix(1.0624745,-4.1082025e-3,4.1082025e-3,1.0624745,-2.2399739,-4.9640677)"
++ style="opacity:0.1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:7.52953625;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
++ d="M 30.810307,39.368042 C 30.920353,21.46875 44.766574,9.1590763 64.461283,8.7429496 C 80.179492,8.4052427 97.253919,20.954393 97.190997,38.86657 C 97.128069,57.280218 78.66464,71.23206 78.011709,88.167013 C 68.932738,89.329935 58.870776,89.329935 50.037571,88.167013 C 49.280332,71.399212 30.700261,57.518069 30.810307,39.368042 z "
++ id="path6268"
++ sodipodi:nodetypes="cszccz" />
++ <path
++ sodipodi:nodetypes="cszccz"
++ id="path6266"
++ d="M 30.810307,39.368042 C 30.920353,21.46875 44.766574,9.1590763 64.461283,8.7429496 C 80.179492,8.4052427 97.253919,20.954393 97.190997,38.86657 C 97.128069,57.280218 78.66464,71.23206 78.011709,88.167013 C 68.932738,89.329935 58.870776,89.329935 50.037571,88.167013 C 49.280332,71.399212 30.700261,57.518069 30.810307,39.368042 z "
++ style="opacity:0.15;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:5.64715195;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
++ transform="matrix(1.0624745,-4.1082025e-3,4.1082025e-3,1.0624745,-2.2399739,-4.9640677)" />
++ <path
++ sodipodi:nodetypes="cszccz"
++ id="path6247"
++ d="M 30.810307,39.368042 C 30.920353,21.46875 44.766574,9.1590763 64.461283,8.7429496 C 80.179492,8.4052427 97.253919,20.954393 97.190997,38.86657 C 97.128069,57.280218 78.66464,71.23206 78.011709,88.167013 C 68.932738,89.329935 58.870776,89.329935 50.037571,88.167013 C 49.280332,71.399212 30.700261,57.518069 30.810307,39.368042 z "
++ style="opacity:0.2;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
++ transform="matrix(1.0624745,-4.1082025e-3,4.1082025e-3,1.0624745,-2.2399739,-4.9640677)" />
++ <path
++ transform="matrix(1.0624745,-4.1082025e-3,4.1082025e-3,1.0624745,-2.2399739,-4.9640677)"
++ style="opacity:0.2;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#094422;stroke-width:3.76476812;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
++ d="M 30.810307,39.368042 C 30.920353,21.46875 44.766574,9.1590763 64.461283,8.7429496 C 80.179492,8.4052427 97.253919,20.954393 97.190997,38.86657 C 97.128069,57.280218 78.66464,71.23206 78.011709,88.167013 C 68.932738,89.329935 58.870776,89.329935 50.037571,88.167013 C 49.280332,71.399212 30.700261,57.518069 30.810307,39.368042 z "
++ id="path6245"
++ sodipodi:nodetypes="cszccz" />
++ <path
++ sodipodi:nodetypes="cszccz"
++ id="path7516"
++ d="M 30.810307,39.368042 C 30.920353,21.46875 44.766574,9.1590763 64.461283,8.7429496 C 80.179492,8.4052427 97.253919,20.954393 97.190997,38.86657 C 97.128069,57.280218 78.66464,71.23206 78.011709,88.167013 C 68.932738,89.329935 58.870776,89.329935 50.037571,88.167013 C 49.280332,71.399212 30.700261,57.518069 30.810307,39.368042 z "
++ style="opacity:0.63616071;fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:#094422;stroke-width:1.88238406;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
++ transform="matrix(1.0624745,-4.1082025e-3,4.1082025e-3,1.0624745,-2.2399739,-4.9640677)" />
++ <path
++ sodipodi:nodetypes="cszccz"
++ id="path5570"
++ d="M 30.810307,39.368042 C 30.920353,21.46875 44.766574,9.1590763 64.461283,8.7429496 C 80.179492,8.4052427 97.253919,20.954393 97.190997,38.86657 C 97.128069,57.280218 78.66464,71.23206 78.011709,88.167013 C 68.932738,89.329935 58.870776,89.329935 50.037571,88.167013 C 49.280332,71.399212 30.700261,57.518069 30.810307,39.368042 z "
++ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.76199996;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
++ transform="matrix(1.0624745,-4.1082025e-3,4.1082025e-3,1.0624745,-2.2399739,-4.9640677)" />
++ <path
++ transform="matrix(1.0624745,-4.1082025e-3,4.1082025e-3,1.0624745,-2.2399739,-4.9640677)"
++ style="opacity:1;fill:url(#linearGradient14328);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1.76199996;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
++ d="M 30.810307,39.368042 C 30.920353,21.46875 44.766574,9.1590763 64.461283,8.7429496 C 80.179492,8.4052427 97.253919,20.954393 97.190997,38.86657 C 97.128069,57.280218 78.66464,71.23206 78.011709,88.167013 C 68.932738,89.329935 58.870776,89.329935 50.037571,88.167013 C 49.280332,71.399212 30.700261,57.518069 30.810307,39.368042 z "
++ id="path2420"
++ sodipodi:nodetypes="cszccz" />
++ <path
++ sodipodi:nodetypes="cszccz"
++ id="path19178"
++ d="M 30.810307,39.368042 C 30.920353,21.46875 44.766574,9.1590763 64.461283,8.7429496 C 80.179492,8.4052427 97.253919,20.954393 97.190997,38.86657 C 97.128069,57.280218 78.66464,71.23206 78.011709,88.167013 C 68.932738,89.329935 58.870776,89.329935 50.037571,88.167013 C 49.280332,71.399212 30.700261,57.518069 30.810307,39.368042 z "
++ style="opacity:0.44419643;fill:url(#radialGradient20149);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1.76199996;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
++ transform="matrix(1.0624745,-4.1082025e-3,4.1082025e-3,1.0624745,-2.2399739,-4.9640677)" />
++ </g>
++ </g>
++ <g
++ inkscape:groupmode="layer"
++ id="layer3"
++ inkscape:label="2"
++ style="display:inline">
++ <path
++ d="M 100.00004,121.22778 C 100.00445,124.66741 83.885392,127.45618 63.999996,127.45618 C 44.11462,127.45618 27.995557,124.66741 27.999964,121.22778 C 27.995557,117.78814 44.11462,114.99937 63.999996,114.99937 C 83.885392,114.99937 100.00445,117.78814 100.00004,121.22778 z "
++ style="opacity:0.46907217;fill:url(#radialGradient2262);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.07014996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter6206)"
++ id="path14022"
++ transform="matrix(1.4647909,0,0,1.0651018,-27.479332,-7.6782157)" />
++ <g
++ id="g17759"
++ transform="matrix(1.061325,0,0,1.0304261,128.78345,13.51911)">
++ <path
++ sodipodi:nodetypes="cccccccccccccccc"
++ transform="matrix(1.2665124,0,0,0.9073539,68.430144,-19.245247)"
++ id="path7551"
++ d="M -111.5,102.26826 C -111.5,102.90934 -111.49226,104.12707 -111.4829,105.46248 C -108.46291,105.46248 -108.49959,110.77941 -111.45037,110.77941 C -108.46534,110.77941 -108.47747,116.01136 -111.5,116.01136 C -108.47244,116.01136 -108.50299,121.16214 -111.5,121.16214 C -108.50374,121.16214 -108.56517,126.38442 -111.5,126.38442 C -111.5,127.97292 -111.5,127.64368 -111.5,129.25852 L -100.73461,135.04272 L -90,129.25852 L -90,126.33936 C -92.645979,126.33936 -92.701372,121.14047 -90,121.14047 C -92.665749,121.14047 -92.721888,115.9876 -90,115.9876 C -92.736353,115.9876 -92.842022,110.83473 -90,110.83473 C -92.806279,110.78239 -92.741315,105.56598 -90,105.56598 L -90,102.26826 L -111.5,102.26826 z "
++ style="fill:#b3b9c3;fill-opacity:1;fill-rule:evenodd;stroke:#b3b9c3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
++ <g
++ transform="translate(2.6943101e-2,0)"
++ id="g15521">
++ <g
++ id="g12540">
++ <path
++ transform="matrix(1.3534914,0,0,0.9488428,76.220659,-26.068059)"
++ sodipodi:nodetypes="ccccc"
++ id="path9493"
++ d="M -110,108 C -105.99399,108 -105.94337,113.00354 -110,113 L -90,113 C -93.852117,113 -93.935903,108 -90,108 L -110,108 z "
++ style="opacity:0.4948454;fill:url(#linearGradient22444);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient22446);stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
++ <path
++ style="opacity:0.4948454;fill:url(#linearGradient22448);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient22450);stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
++ d="M -110,108 C -105.99399,108 -105.94337,113.00354 -110,113 L -90,113 C -93.852117,113 -93.935903,108 -90,108 L -110,108 z "
++ id="path11499"
++ sodipodi:nodetypes="ccccc"
++ transform="matrix(1.3534914,0,0,0.9488428,76.220659,-21.345139)" />
++ <path
++ transform="matrix(1.3534914,0,0,0.9488428,76.220659,-16.622223)"
++ sodipodi:nodetypes="ccccc"
++ id="path11505"
++ d="M -110,108 C -105.99399,108 -105.94337,113.00354 -110,113 L -90,113 C -93.852117,113 -93.935903,108 -90,108 L -110,108 z "
++ style="opacity:0.4948454;fill:url(#linearGradient22452);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient22454);stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
++ <path
++ style="opacity:0.4948454;fill:url(#linearGradient22456);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient22458);stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
++ d="M -110,108 C -105.99399,108 -105.94337,113.00354 -110,113 L -90,113 C -93.852117,113 -93.935903,108 -90,108 L -110,108 z "
++ id="path11511"
++ sodipodi:nodetypes="ccccc"
++ transform="matrix(1.3534914,0,0,0.9488428,76.220659,-11.899307)" />
++ </g>
++ <g
++ id="g12546"
++ transform="translate(0.176848,0.1798467)"
++ style="opacity:1;fill:url(#linearGradient22460);fill-opacity:1;stroke:none;stroke-opacity:1">
++ <path
++ style="opacity:0.34536085;fill:url(#linearGradient22462);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
++ d="M -110,108 C -105.99399,108 -105.94337,113.00354 -110,113 L -90,113 C -93.852117,113 -93.935903,108 -90,108 L -110,108 z "
++ id="path12548"
++ sodipodi:nodetypes="ccccc"
++ transform="matrix(1.3534914,0,0,0.9488428,76.220659,-26.068059)" />
++ <path
++ transform="matrix(1.3534914,0,0,0.9488428,76.220659,-21.345139)"
++ sodipodi:nodetypes="ccccc"
++ id="path12550"
++ d="M -110,108 C -105.99399,108 -105.94337,113.00354 -110,113 L -90,113 C -93.852117,113 -93.935903,108 -90,108 L -110,108 z "
++ style="opacity:0.34536085;fill:url(#linearGradient22464);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
++ <path
++ style="opacity:0.34536085;fill:url(#linearGradient22466);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
++ d="M -110,108 C -105.99399,108 -105.94337,113.00354 -110,113 L -90,113 C -93.852117,113 -93.935903,108 -90,108 L -110,108 z "
++ id="path12552"
++ sodipodi:nodetypes="ccccc"
++ transform="matrix(1.3534914,0,0,0.9488428,76.220659,-16.622223)" />
++ <path
++ transform="matrix(1.3534914,0,0,0.9488428,76.220659,-11.899307)"
++ sodipodi:nodetypes="ccccc"
++ id="path12554"
++ d="M -110,108 C -105.99399,108 -105.94337,113.00354 -110,113 L -90,113 C -93.852117,113 -93.935903,108 -90,108 L -110,108 z "
++ style="opacity:0.34536085;fill:url(#linearGradient22468);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
++ </g>
++ </g>
++ <path
++ sodipodi:nodetypes="cccccccccccccccc"
++ transform="matrix(1.2665124,0,0,0.9073539,68.450118,-19.245247)"
++ id="path16538"
++ d="M -111.5,102.26826 C -111.5,102.90934 -111.49226,104.12707 -111.4829,105.46248 C -108.46291,105.46248 -108.49959,110.77941 -111.45037,110.77941 C -108.46534,110.77941 -108.47747,116.01136 -111.5,116.01136 C -108.47244,116.01136 -108.50299,121.16214 -111.5,121.16214 C -108.50374,121.16214 -108.56517,126.38442 -111.5,126.38442 C -111.5,127.97292 -111.5,127.64368 -111.5,129.25852 L -100.73461,135.04272 L -90,129.25852 L -90,126.33936 C -92.645979,126.33936 -92.701372,121.14047 -90,121.14047 C -92.665749,121.14047 -92.721888,115.9876 -90,115.9876 C -92.736353,115.9876 -92.842022,110.83473 -90,110.83473 C -92.806279,110.78239 -92.741315,105.56598 -90,105.56598 L -90,102.26826 L -111.5,102.26826 z "
++ style="opacity:0.27900002;fill:url(#linearGradient22470);fill-opacity:1;fill-rule:evenodd;stroke:#3e444c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
++ <path
++ style="opacity:0.27900002;fill:url(#linearGradient22472);fill-opacity:1;fill-rule:evenodd;stroke:#3e444c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
++ d="M -111.5,102.26826 C -111.5,102.90934 -111.49226,104.12707 -111.4829,105.46248 C -108.46291,105.46248 -108.49959,110.77941 -111.45037,110.77941 C -108.46534,110.77941 -108.47747,116.01136 -111.5,116.01136 C -108.47244,116.01136 -108.50299,121.16214 -111.5,121.16214 C -108.50374,121.16214 -108.56517,126.38442 -111.5,126.38442 C -111.5,127.97292 -111.5,127.64368 -111.5,129.25852 L -100.73461,135.04272 L -90,129.25852 L -90,126.33936 C -92.645979,126.33936 -92.701372,121.14047 -90,121.14047 C -92.665749,121.14047 -92.721888,115.9876 -90,115.9876 C -92.736353,115.9876 -92.842022,110.83473 -90,110.83473 C -92.806279,110.78239 -92.741315,105.56598 -90,105.56598 L -90,102.26826 L -111.5,102.26826 z "
++ id="path16528"
++ transform="matrix(1.2665124,0,0,0.9073539,68.450118,-19.245247)"
++ sodipodi:nodetypes="cccccccccccccccc" />
++ <path
++ sodipodi:nodetypes="ccccc"
++ id="path3088"
++ d="M -67.108147,100.26276 C -60.356786,99.484115 -57.794369,99.46867 -51.276955,100.32992 L -54.964039,101.68601 L -63.077029,101.79062 L -67.108147,100.26276 z "
++ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
++ <path
++ style="opacity:0.50206191;fill:url(#linearGradient22474);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient22476);stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
++ d="M -67.593502,100.1333 C -67.476999,99.766538 -67.207344,99.761197 -66.907348,99.73819 C -60.44997,98.966462 -57.541667,99.005298 -51.398173,99.817882 C -51.18615,99.847742 -50.965676,99.822224 -50.819623,100.13796 C -50.689473,100.53325 -50.952831,100.70592 -51.041353,100.76341 L -54.871903,102.19009 L -63.245551,102.25874 L -67.305944,100.70847 C -67.392713,100.68154 -67.665359,100.52722 -67.593502,100.1333 z "
++ id="path9891"
++ sodipodi:nodetypes="ccccccccc" />
++ <g
++ transform="matrix(0.8922063,0,0,0.8922063,-6.3462934,11.386857)"
++ id="g7941">
++ <path
++ sodipodi:nodetypes="ccccc"
++ id="path7939"
++ d="M -60.578669,103.5872 C -59.555937,104.02385 -58.472145,103.96753 -57.590032,103.5872 C -56.848057,103.24949 -56.61623,102.86776 -56.237448,102.49872 L -62,102.54621 C -61.578167,102.93795 -61.205727,103.27271 -60.578669,103.5872 z "
++ style="fill:#b3b9c3;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
++ transform="matrix(1.4544836,0,0,1.8734665,26.85186,-90.054482)" />
++ <path
++ style="fill:#b3b9c3;fill-opacity:1;fill-rule:evenodd;stroke:#b3b9c3;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
++ d="M -60.578669,103.5872 C -59.484703,104.0476 -58.472145,103.96753 -57.590032,103.5872 C -56.883938,103.20359 -56.602414,102.86768 -56.237448,102.49872 L -62,102.54621 C -61.66459,102.89321 -61.186985,103.31144 -60.578669,103.5872 z "
++ id="path5028"
++ sodipodi:nodetypes="ccccc" />
++ <path
++ sodipodi:nodetypes="ccccccsc"
++ id="path20590"
++ d="M -60.939064,103.9264 C -59.731279,104.72825 -57.955418,104.37292 -57.123638,103.8416 C -56.337371,103.46148 -55.618644,102.70952 -55.760454,102.31852 C -55.837553,102.12608 -55.996459,102.06998 -56.156428,102.01565 L -62.018868,102.02873 C -62.137101,102.08654 -62.299836,102.04695 -62.392195,102.26001 C -62.411571,102.15929 -62.586291,102.50467 -62.456945,102.72415 C -62.188152,103.18025 -61.430968,103.70341 -60.939064,103.9264 z "
++ style="opacity:0.51546397;fill:url(#linearGradient22478);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
++ </g>
++ <path
++ sodipodi:nodetypes="cccccccccccccccc"
++ transform="matrix(1.2665124,0,0,0.9073539,68.450118,-19.793505)"
++ id="path19617"
++ d="M -111.5,102.26826 C -111.5,102.90934 -111.49226,104.12707 -111.4829,105.46248 C -108.46291,105.46248 -108.49959,110.77941 -111.45037,110.77941 C -108.46534,110.77941 -108.47747,116.01136 -111.5,116.01136 C -108.47244,116.01136 -108.50299,121.16214 -111.5,121.16214 C -108.50374,121.16214 -108.56517,126.38442 -111.5,126.38442 C -111.5,127.97292 -111.5,127.64368 -111.5,129.25852 L -100.73461,135.04272 L -90,129.25852 L -90,126.33936 C -92.645979,126.33936 -92.701372,121.14047 -90,121.14047 C -92.665749,121.14047 -92.721888,115.9876 -90,115.9876 C -92.736353,115.9876 -92.842022,110.83473 -90,110.83473 C -92.806279,110.78239 -92.741315,105.56598 -90,105.56598 L -90,102.26826 L -111.5,102.26826 z "
++ style="opacity:0.38659794;fill:url(#linearGradient22480);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
++ </g>
++ </g>
++</svg>
+--- a/runtime/pics/oxygen/index.theme
++++ b/runtime/pics/oxygen/index.theme
+@@ -2,7 +2,7 @@
+ Name=Oxygen
+ Name[csb]=Krziseń
+ Name[kk]=Оттегі
+-Name[km]=អុកស៊ីសែន
++Name[km]=អុកស៊ីហ្សែន
+ Name[ne]=अक्सिजन
+ Name[nn]=Oksygen
+ Name[pa]=ਆਕਸੀਜਨ
+@@ -16,6 +16,7 @@
+ Comment[de]=Oxygen-Team - 2007
+ Comment[el]=Η ομάδα του Oxygen - 2007
+ Comment[es]=Equipo Oxygen - 2007
++Comment[et]=Oxygeni meeskond - 2007
+ Comment[ga]=Foireann Oxygen - 2007
+ Comment[it]=La squadra di Oxygen - 2007
+ Comment[kk]=Oxygen тобы - 2007
+--- a/runtime/renamedlgplugins/audio/renaudiodlg.desktop
++++ b/runtime/renamedlgplugins/audio/renaudiodlg.desktop
+@@ -4,6 +4,7 @@
+ Name=Audio Preview
+ Name[be]=Прагляд аўдыё
+ Name[el]=Προεπισκόπηση ήχου
++Name[et]=Heli eelvaatlus
+ Name[ga]=Réamhamharc Fuaime
+ Name[it]=Anteprima audio
+ Name[ja]=オーディオプレビュー
+--- a/runtime/renamedlgplugins/images/renimagedlg.desktop
++++ b/runtime/renamedlgplugins/images/renimagedlg.desktop
+@@ -4,6 +4,7 @@
+ Name=Image Displayer
+ Name[be]=Праглядчык відарысаў
+ Name[el]=Προβολή εικόνων
++Name[et]=Pildinäitaja
+ Name[ga]=Amharcán Íomhánna
+ Name[it]=Visore di immagini
+ Name[ja]=イメージ表示ツール
+--- a/runtime/phonon/xine/xine.desktop
++++ b/runtime/phonon/xine/xine.desktop
+@@ -19,12 +19,13 @@
+ Comment[bg]=Заден слой Phonon Xine
+ Comment[de]=Phonon Xine-Treiber
+ Comment[el]=Σύστημα υποστήριξης του Phonon Xine
++Comment[et]=Phononi Xine taustaprogramm
+ Comment[ga]=Inneall Phonon Xine
+ Comment[he]=ממשק Phonon Xine
+ Comment[it]=Backend Xine di Phonon
+ Comment[ja]=Phonon Xine バックエンド
+ Comment[kk]=Phonon Xine тетігі
+-Comment[km]=Phonon Xine កម្មវិធីខាងក្រោយ
++Comment[km]=Phonon Xine កម្មវិធីខាងក្រោយ
+ Comment[ko]=Phonon Xine 백엔드
+ Comment[nb]=Phonon Xine-motor
+ Comment[nds]=Hülpprogramm Xine för Phonon
+--- a/runtime/phonon/xine/kcm/kcm_phononxine.desktop
++++ b/runtime/phonon/xine/kcm/kcm_phononxine.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Exec=kcmshell kcm_phononxine
++Exec=kcmshell4 kcm_phononxine
+ Icon=phonon
+ Type=Service
+ ServiceTypes=KCModule
+@@ -21,6 +21,7 @@
+ Comment[bg]=Настройване на задния слой Xine
+ Comment[de]=Xine-Treiber-Einrichtung
+ Comment[el]=Ρύθμιση του συστήματος υποστήριξης Xine
++Comment[et]=Xine taustaprogrammi seadistamine
+ Comment[fa]=پیکربندی پایانه Xine
+ Comment[ga]=Cumraíocht Inneall Xine
+ Comment[he]=הגדרות ממשק Xine
+--- a/runtime/kcmshell/main.cpp
++++ b/runtime/kcmshell/main.cpp
+@@ -102,7 +102,7 @@
+ if( owner == QDBusConnection::sessionBus().baseService() )
+ return false; // We are the one and only.
+
+- kDebug(780) << "kcmshell with modules '" <<
++ kDebug(780) << "kcmshell4 with modules '" <<
+ m_serviceName << "' is already running." << endl;
+
+ QDBusInterface iface(m_serviceName, "/KCModule/dialog", "org.kde.KCMShellMultiDialog");
+--- a/runtime/kcmshell/CMakeLists.txt
++++ b/runtime/kcmshell/CMakeLists.txt
+@@ -1,16 +1,11 @@
+
+-include_directories( ${KDE4_KPARTS_INCLUDES} )
+-
+-########### next target ###############
+-
+ set(kcmshell_KDEINIT_SRCS main.cpp )
+
++kde4_add_kdeinit_executable( kcmshell4 ${kcmshell_KDEINIT_SRCS})
+
+-kde4_add_kdeinit_executable( kcmshell ${kcmshell_KDEINIT_SRCS})
+-
+-target_link_libraries(kdeinit_kcmshell ${KDE4_KUTILS_LIBS} )
++target_link_libraries(kdeinit_kcmshell4 ${KDE4_KUTILS_LIBS} )
+
+-install(TARGETS kdeinit_kcmshell DESTINATION ${LIB_INSTALL_DIR} )
++install(TARGETS kdeinit_kcmshell4 DESTINATION ${LIB_INSTALL_DIR} )
+
+-target_link_libraries( kcmshell kdeinit_kcmshell )
+-install(TARGETS kcmshell DESTINATION ${BIN_INSTALL_DIR} )
++target_link_libraries( kcmshell4 kdeinit_kcmshell4 )
++install(TARGETS kcmshell4 DESTINATION ${BIN_INSTALL_DIR} )
+--- a/runtime/khelpcenter/kcmhelpcenter.desktop
++++ b/runtime/khelpcenter/kcmhelpcenter.desktop
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Type=Application
+-Exec=kcmshell kcmhelpcenter
++Exec=kcmshell4 kcmhelpcenter
+ Icon=help
+
+ X-KDE-SubstituteUID=true
+@@ -167,7 +167,7 @@
+ Keywords[is]=khelpcenter,hjálparmiðstöð,hjálp,index,yfirlit,leit
+ Keywords[it]=khelpcenter,guida,indice,ricerca
+ Keywords[ja]=khelpcenter,ヘルプ,インデックス,検索
+-Keywords[km]=khelpcenter,ជំនួយ,លិបិក្រម,ស្វែងរក
++Keywords[km]=khelpcenter ជំនួយ លិបិក្រម ស្វែងរក
+ Keywords[ko]=khelpcenter,도움말,찾아보기,검색
+ Keywords[lt]=khelpcenter,help,index,search, pagalbos centras, pagalba, indeksas, paieška
+ Keywords[lv]=kpalīdzības centrs,palīdzība,indekss,meklēt
+--- a/runtime/khelpcenter/infotree.cpp
++++ b/runtime/khelpcenter/infotree.cpp
+@@ -136,7 +136,9 @@
+
+ QTextStream stream( &infoDirFile );
+ // Skip introduction blurb.
+- while ( !stream.atEnd() && !stream.readLine().startsWith( "* Menu:" ) );
++ while ( !stream.atEnd() && !stream.readLine().startsWith( "* Menu:" ) ) {
++ ;
++ }
+
+ while ( !stream.atEnd() ) {
+ QString s = stream.readLine();
+--- a/runtime/khelpcenter/kcmhelpcenter.h
++++ b/runtime/khelpcenter/kcmhelpcenter.h
+@@ -5,7 +5,8 @@
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+- License version 2 as published by the Free Software Foundation.
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+--- a/runtime/khelpcenter/plugins/faq.desktop
++++ b/runtime/khelpcenter/plugins/faq.desktop
+@@ -31,7 +31,7 @@
+ Name[ja]=KDE FAQ
+ Name[ka]=KDE: ძირითადი კითხვები
+ Name[kk]=KDE сұрақ пен жауаптар
+-Name[km]=សំណួរដែលសួររឿយៗរបស់ KDE
++Name[km]=សំណួរដែលសួររឿយៗរបស់ KDE
+ Name[ko]=KDE 자주 묻는 질문
+ Name[lt]=KDE D.U.K.(FAQ)
+ Name[lv]=KDE BUJ
+--- a/runtime/khelpcenter/plugins/support.desktop
++++ b/runtime/khelpcenter/plugins/support.desktop
+@@ -32,7 +32,7 @@
+ Name[ja]=KDE 支援
+ Name[ka]=KDE-ს მხარდაჭერა
+ Name[kk]=KDE-ні қолдау
+-Name[km]=គាំទ្រ KDE
++Name[km]=ការគាំទ្រ KDE
+ Name[ko]=KDE 지원
+ Name[lt]=KDE palaikymas
+ Name[lv]=KDE atbalstīšana
+--- a/runtime/khelpcenter/plugins/Tutorials/visualdict.desktop
++++ b/runtime/khelpcenter/plugins/Tutorials/visualdict.desktop
+@@ -74,7 +74,7 @@
+ Comment[el]=Οδηγός για τα γραφικά συστατικά του KDE
+ Comment[eo]=Gvidilo pri KDE-fenestraĵoj
+ Comment[es]=Guía de los objetos visuales (widgets) de KDE
+-Comment[et]=KDE elementide juhend
++Comment[et]=KDE vidinate tutvustus
+ Comment[eu]=KDEren widget-en gida
+ Comment[fa]=راهنما برای عناصر KDE
+ Comment[fi]=Ohje KDE:n työkaluihin
+--- a/runtime/khelpcenter/plugins/Tutorials/.directory
++++ b/runtime/khelpcenter/plugins/Tutorials/.directory
+@@ -7,6 +7,7 @@
+ Name[de]=Anleitungen
+ Name[el]=Εκμάθηση
+ Name[es]=Tutoriales
++Name[et]=Õppematerjalid
+ Name[fa]=خودآموزها
+ Name[ga]=Cúrsaí Teagaisc
+ Name[he]=הדרכות
+@@ -39,6 +40,7 @@
+ Comment[de]=Anleitungen und Einführungen
+ Comment[el]=Έγγραφα εκμάθησης και εισαγωγής
+ Comment[es]=Tutoriales y documentos introductorios.
++Comment[et]=Õppematerjalid ja sissejuhatused
+ Comment[fa]=خودآموز و سندهای مقدمه
+ Comment[he]=מסמכי הדרכה ומבוא.
+ Comment[it]=Esercitazioni e documenti introduttivi.
+--- a/runtime/khelpcenter/plugins/Tutorials/quickstart.desktop
++++ b/runtime/khelpcenter/plugins/Tutorials/quickstart.desktop
+@@ -79,7 +79,7 @@
+ Comment[el]=Οδηγός γρήγορου ξεκινήματος KDE.
+ Comment[eo]=konciza gvidlibro por KDE
+ Comment[es]=Guía de inicio rápido de KDE.
+-Comment[et]=Kiire sissejuhatus KDEsse
++Comment[et]=KKDE kiire sissejuhatus
+ Comment[eu]=KDEren abiatze bizkorreko gida
+ Comment[fa]=راهنمای آغاز سریع KDE.
+ Comment[fi]=KDE:n aloitusopas.
+--- a/runtime/khelpcenter/plugins/Applications/.directory
++++ b/runtime/khelpcenter/plugins/Applications/.directory
+@@ -9,6 +9,7 @@
+ Name[de]=Programmhandbücher
+ Name[el]=Εγχειρίδια εφαρμογών
+ Name[es]=Manuales de la aplicación
++Name[et]=Rakenduste käsiraamatud
+ Name[fa]=راهنماهای کاربرد
+ Name[ga]=Lámhleabhair Fheidhmchláir
+ Name[he]=ספרי הדרכה של תוכניות
+--- a/runtime/khelpcenter/plugins/Manpages/.directory
++++ b/runtime/khelpcenter/plugins/Manpages/.directory
+@@ -6,6 +6,7 @@
+ Name[de]=UNIX Hilfeseiten
+ Name[el]=Σελίδες εγχειριδίου UNIX
+ Name[es]=Páginas de manual de Unix
++Name[et]=UNIX-i manuaalileheküljed
+ Name[fa]=صفحات راهنمای یونیکس
+ Name[he]=דפי הוראות של יוניקס
+ Name[it]=Pagine di manuale UNIX
+--- a/runtime/khelpcenter/plugins/Manpages/man8.desktop
++++ b/runtime/khelpcenter/plugins/Manpages/man8.desktop
+@@ -15,7 +15,7 @@
+ Name[el]=(8) Διαχείριση συστήματος
+ Name[eo]=(8) Sistemadministrado
+ Name[es]=(8) Administración del sistema
+-Name[et]=(8) Süsteemi administreerimine
++Name[et]=(8) Süsteemi haldamine
+ Name[eu]=(8) Sist. kudeaketa
+ Name[fa]=(۸) سرپرستی سیستم
+ Name[fi]=(8) Järjestelmänhallinta
+--- a/runtime/khelpcenter/plugins/kioslaves.desktop
++++ b/runtime/khelpcenter/plugins/kioslaves.desktop
+@@ -7,7 +7,7 @@
+ Name[da]=Kioslaver
+ Name[de]=Ein-/Ausgabemodule
+ Name[eo]=Kenelservoj
+-Name[et]=KIO moodulid
++Name[et]=KIO-moodulid
+ Name[fi]=KIO-palvelut
+ Name[gl]=Escravos Kio
+ Name[he]=פרוטוקולים
+--- a/runtime/khelpcenter/htmlsearch/htmlsearch.desktop
++++ b/runtime/khelpcenter/htmlsearch/htmlsearch.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Exec=kcmshell htmlsearch
++Exec=kcmshell4 htmlsearch
+ Icon=help_index
+ Type=Service
+ ServiceTypes=KCModule
+@@ -164,7 +164,7 @@
+ Keywords[is]=Hjálp,HTML,leit,yfirlit,htdig,svæði,tungumál
+ Keywords[it]=aiuto,HTML,cerca,indice,htdig,htsearch,htmerge,scope,lingua
+ Keywords[ja]=ヘルプ,HTML,検索,インデックス,htdig,htsearch,htmerge,スコープ,言語
+-Keywords[km]=ជំនួយ,HTML,ស្វែងរក,លិបិក្រម,htdig,htsearch,htmerge,វិសាលភាព,ភាសា
++Keywords[km]=ជំនួយ HTML ស្វែងរក លិបិក្រម htdig htsearch htmerge វិសាលភាព ភាសា
+ Keywords[ko]=도움말,HTML,검색,찾아보기,htdig,htsearch,htmerge,언어
+ Keywords[lt]=Pagalba,HTML,Paieška,Sąrašas,htdig,htsearch,htmerge,Sritis,Kalba
+ Keywords[lv]=Palīdzība,HTML,Meklēt,Indekss,htdig,htsearch,htmerge,Mērķis,Valoda
+--- a/runtime/khelpcenter/kcmhelpcenter.cpp
++++ b/runtime/khelpcenter/kcmhelpcenter.cpp
+@@ -5,7 +5,8 @@
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+- License version 2 as published by the Free Software Foundation.
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+--- a/runtime/khelpcenter/navigator.cpp
++++ b/runtime/khelpcenter/navigator.cpp
+@@ -117,8 +117,6 @@
+
+ mTabWidget = new QTabWidget( this );
+ topLayout->addWidget( mTabWidget );
+- connect( mTabWidget, SIGNAL( currentChanged( QWidget * ) ),
+- SLOT( slotTabChanged( QWidget * ) ) );
+
+ setupContentsTab();
+ setupGlossaryTab();
+@@ -132,6 +130,8 @@
+ mSearchWidget->updateScopeList();
+ mSearchWidget->readConfig( KGlobal::config().data() );
+ }
++ connect( mTabWidget, SIGNAL( currentChanged( QWidget * ) ),
++ SLOT( slotTabChanged( QWidget * ) ) );
+ }
+
+ Navigator::~Navigator()
+--- a/runtime/doc/kcontrol/kcmnotify/index.docbook
++++ b/runtime/doc/kcontrol/kcmnotify/index.docbook
+@@ -46,7 +46,7 @@
+ <variablelist>
+ <varlistentry>
+ <term><guiicon>Execute a program</guiicon></term>
+-<listitem><para>If an icon is present in this column, a seperate program will be executed when this notification is performed. This can be used to execute a program to help restore data, shutdown a potentially compromised system or email another user to alert them to a problem.</para></listitem>
++<listitem><para>If an icon is present in this column, a separate program will be executed when this notification is performed. This can be used to execute a program to help restore data, shutdown a potentially compromised system or email another user to alert them to a problem.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+@@ -148,4 +148,4 @@
+ </sect2>
+ </sect1>
+
+-</article>
+\ No newline at end of file
++</article>
+--- a/runtime/ktimezoned/ktimezoned.desktop
++++ b/runtime/ktimezoned/ktimezoned.desktop
+@@ -15,6 +15,7 @@
+ Name[de]=Zeitzonen-Dienst
+ Name[el]=Δαίμονας ωρολογιακής ζώνης του KDE
+ Name[es]=Servicio de zona horaria de KDE
++Name[et]=KDE ajavööndi deemon
+ Name[fa]=شبح ناحیۀ زمان KDE
+ Name[he]=שירות איזורי הזמן של KDE
+ Name[it]=Demone dei fusi orari di KDE
+@@ -43,6 +44,7 @@
+ Comment[de]=Zeitzonen-Dienst für KDE
+ Comment[el]=Δαίμονας ωρολογιακής ζώνης για το KDE
+ Comment[es]=Servicio de zonas horarias de KDE
++Comment[et]=KDE ajavööndi deemon
+ Comment[fa]=شبح ناحیه زمان برای KDE
+ Comment[he]=שירות איזורי זמן ל־KDE
+ Comment[it]=Demone dei fusi orari per KDE
+--- a/runtime/kioslave/thumbnail/htmlthumbnail.desktop
++++ b/runtime/kioslave/thumbnail/htmlthumbnail.desktop
+@@ -16,7 +16,7 @@
+ Name[el]=Αρχεία HTML
+ Name[eo]=HTML-dosieroj
+ Name[es]=Ficheros HTML
+-Name[et]=HTML failid
++Name[et]=HTML-failid
+ Name[eu]=HTML fitxategiak
+ Name[fa]=پروندههای زنگام
+ Name[fi]=HTML-tiedostot
+--- a/runtime/kioslave/thumbnail/thumbcreator.desktop
++++ b/runtime/kioslave/thumbnail/thumbcreator.desktop
+@@ -32,7 +32,7 @@
+ Comment[ja]=サムネイルハンドラ
+ Comment[ka]=მინი-გამოსახულების დამმუშავებელი
+ Comment[kk]=Нобай өңдеуші
+-Comment[km]=កម្មវិធីដោះស្រាយរូបភាពតូចៗ
++Comment[km]=កម្មវិធីគ្រប់គ្រងរូបភាពតូចៗ
+ Comment[ko]=미리 보기 처리기
+ Comment[lt]=Miniatiūrų tvarkiklis
+ Comment[lv]=Sīktēlu apkalpotājs
+--- a/runtime/kioslave/thumbnail/CMakeLists.txt
++++ b/runtime/kioslave/thumbnail/CMakeLists.txt
+@@ -12,7 +12,7 @@
+ kde4_add_plugin(kio_thumbnail ${kio_thumbnail_PART_SRCS})
+
+
+-target_link_libraries(kio_thumbnail ${KDE4_KDE3SUPPORT_LIBS} )
++target_link_libraries(kio_thumbnail ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY} )
+
+ install(TARGETS kio_thumbnail DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+@@ -25,7 +25,7 @@
+ kde4_add_plugin(imagethumbnail ${imagethumbnail_PART_SRCS})
+
+
+-target_link_libraries(imagethumbnail ${KDE4_KDE3SUPPORT_LIBS})
++target_link_libraries(imagethumbnail ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY})
+
+ install(TARGETS imagethumbnail DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+@@ -77,7 +77,8 @@
+ kde4_add_plugin(djvuthumbnail ${djvuthumbnail_PART_SRCS})
+
+
+-target_link_libraries(djvuthumbnail ${KDE4_KDE3SUPPORT_LIBS})
++target_link_libraries(djvuthumbnail ${QT_QT3SUPPORT_LIBRARY}
++${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+
+ install(TARGETS djvuthumbnail DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+@@ -94,7 +95,7 @@
+ kde4_add_plugin(exrthumbnail ${exrthumbnail_PART_SRCS})
+
+
+- target_link_libraries(exrthumbnail ${KDE4_KDE3SUPPORT_LIBS} ${OPENEXR_LIBRARIES})
++ target_link_libraries(exrthumbnail ${KDE4_KIO_LIBS} ${OPENEXR_LIBRARIES})
+
+ install(TARGETS exrthumbnail DESTINATION ${PLUGIN_INSTALL_DIR} )
+ install( FILES exrthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+@@ -111,7 +112,8 @@
+ kde4_add_plugin(cursorthumbnail ${cursorthumbnail_PART_SRCS})
+
+
+- target_link_libraries(cursorthumbnail ${KDE4_KDE3SUPPORT_LIBS} ${X11_Xcursor_LIB})
++ target_link_libraries(cursorthumbnail ${QT_QTCORE_LIBRARY}
++${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${X11_Xcursor_LIB})
+
+ install(TARGETS cursorthumbnail DESTINATION ${PLUGIN_INSTALL_DIR} )
+ install( FILES cursorthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+--- a/runtime/kioslave/nfs/CMakeLists.txt
++++ b/runtime/kioslave/nfs/CMakeLists.txt
+@@ -11,7 +11,7 @@
+ kde4_add_plugin(kio_nfs ${kio_nfs_PART_SRCS})
+
+
+-target_link_libraries(kio_nfs ${KDE4_KDE3SUPPORT_LIBS})
++target_link_libraries(kio_nfs ${KDE4_KIO_LIBS})
+
+ install(TARGETS kio_nfs DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- a/runtime/kioslave/fish/fish.h
++++ b/runtime/kioslave/fish/fish.h
+@@ -203,6 +203,9 @@
+ void manageConnection(const QString &line);
+ /** writes to process */
+ void writeStdin(const QString &line);
++ /** Verify port **/
++ void setHostInternal(const KUrl & u);
++
+ };
+
+
+--- a/runtime/kioslave/fish/fish.cpp
++++ b/runtime/kioslave/fish/fish.cpp
+@@ -639,6 +639,14 @@
+ }
+ return buf.length();
+ }
++
++void fishProtocol::setHostInternal(const KUrl & u){
++ int port = u.port();
++ if(port <= 0 ) // no port is -1 in QUrl, but in kde3 we used 0 and the kioslaves assume that.
++ port = 0;
++ setHost(u.host(),port,u.user(),u.pass());
++}
++
+ /**
+ sets connection information for subsequent commands
+ */
+@@ -646,7 +654,6 @@
+ QString user(u);
+
+ local = (host == "localhost" && port == 0);
+- if (port <= 0) port = 0;
+ if (user.isEmpty()) user = getenv("LOGNAME");
+
+ if (host == connectionHost && port == connectionPort && user == connectionUser)
+@@ -1264,7 +1271,7 @@
+ /** get a file */
+ void fishProtocol::get(const KUrl& u){
+ myDebug( << "@@@@@@@@@ get " << u << endl);
+- setHost(u.host(),u.port(),u.user(),u.pass());
++ setHostInternal(u);
+ url = u;
+ openConnection();
+ if (!isLoggedIn) return;
+@@ -1281,7 +1288,8 @@
+ /** put a file */
+ void fishProtocol::put(const KUrl& u, int permissions, KIO::JobFlags flags) {
+ myDebug( << "@@@@@@@@@ put " << u << " " << permissions << " " << (flags & KIO::Overwrite) << " " /* << resume */ << endl);
+- setHost(u.host(),u.port(),u.user(),u.pass());
++ setHostInternal(u);
++
+ url = u;
+ openConnection();
+ if (!isLoggedIn) return;
+@@ -1408,7 +1416,7 @@
+ /** stat a file */
+ void fishProtocol::stat(const KUrl& u){
+ myDebug( << "@@@@@@@@@ stat " << u << endl);
+- setHost(u.host(),u.port(),u.user(),u.pass());
++ setHostInternal(u);
+ url = u;
+ isStat = true; // FIXME: just a workaround for konq deficiencies
+ openConnection();
+@@ -1425,7 +1433,7 @@
+ /** find mimetype for a file */
+ void fishProtocol::mimetype(const KUrl& u){
+ myDebug( << "@@@@@@@@@ mimetype " << u << endl);
+- setHost(u.host(),u.port(),u.user(),u.pass());
++ setHostInternal(u);
+ url = u;
+ openConnection();
+ if (!isLoggedIn) return;
+@@ -1441,7 +1449,7 @@
+ /** list a directory */
+ void fishProtocol::listDir(const KUrl& u){
+ myDebug( << "@@@@@@@@@ listDir " << u << endl);
+- setHost(u.host(),u.port(),u.user(),u.pass());
++ setHostInternal(u);
+ url = u;
+ openConnection();
+ if (!isLoggedIn) return;
+@@ -1457,7 +1465,7 @@
+ /** create a directory */
+ void fishProtocol::mkdir(const KUrl& u, int permissions) {
+ myDebug( << "@@@@@@@@@ mkdir " << u << " " << permissions << endl);
+- setHost(u.host(),u.port(),u.user(),u.pass());
++ setHostInternal(u);
+ url = u;
+ openConnection();
+ if (!isLoggedIn) return;
+@@ -1477,7 +1485,7 @@
+ error(ERR_UNSUPPORTED_ACTION,s.prettyUrl());
+ return;
+ }
+- setHost(s.host(),s.port(),s.user(),s.pass());
++ setHostInternal(s);
+ url = d;
+ openConnection();
+ if (!isLoggedIn) return;
+@@ -1499,7 +1507,7 @@
+ /** create a symlink */
+ void fishProtocol::symlink(const QString& target, const KUrl& u, KIO::JobFlags flags) {
+ myDebug( << "@@@@@@@@@ symlink " << target << " " << u << " " << (flags & KIO::Overwrite) << endl);
+- setHost(u.host(),u.port(),u.user(),u.pass());
++ setHostInternal(u);
+ url = u;
+ openConnection();
+ if (!isLoggedIn) return;
+@@ -1519,7 +1527,7 @@
+ /** change file permissions */
+ void fishProtocol::chmod(const KUrl& u, int permissions){
+ myDebug( << "@@@@@@@@@ chmod " << u << " " << permissions << endl);
+- setHost(u.host(),u.port(),u.user(),u.pass());
++ setHostInternal(u);
+ url = u;
+ openConnection();
+ if (!isLoggedIn) return;
+@@ -1539,7 +1547,7 @@
+ return;
+ }
+ //myDebug( << s << endl << d << endl);
+- setHost(s.host(),s.port(),s.user(),s.pass());
++ setHostInternal(s);
+ url = d;
+ openConnection();
+ if (!isLoggedIn) return;
+@@ -1562,7 +1570,7 @@
+ /** removes a file or directory */
+ void fishProtocol::del(const KUrl &u, bool isFile){
+ myDebug( << "@@@@@@@@@ del " << u << " " << isFile << endl);
+- setHost(u.host(),u.port(),u.user(),u.pass());
++ setHostInternal(u);
+ url = u;
+ openConnection();
+ if (!isLoggedIn) return;
+@@ -1590,7 +1598,7 @@
+ stream >> u;
+ stream >> command;
+ myDebug( << "@@@@@@@@@ exec " << u << " " << command << endl);
+- setHost(u.host(),u.port(),u.user(),u.pass());
++ setHostInternal(u);
+ url = u;
+ openConnection();
+ if (!isLoggedIn) return;
+--- a/runtime/kioslave/cgi/kcmcgi/kcmcgi.desktop
++++ b/runtime/kioslave/cgi/kcmcgi/kcmcgi.desktop
+@@ -3,7 +3,7 @@
+ Icon=run
+ Type=Service
+ SericeTypes=KCModule
+-Exec=kcmshell kcmcgi
++Exec=kcmshell4 kcmcgi
+
+ X-KDE-Library=kcm_cgi
+
+@@ -85,7 +85,7 @@
+ Comment[el]=Ρυθμίστε το CGI KIO slave
+ Comment[eo]=Agordu CGI-enel-sklavon
+ Comment[es]=Configuración del KIO slave de CGI
+-Comment[et]=CGI KIO mooduli seadistamine
++Comment[et]=CGI KIO-mooduli seadistamine
+ Comment[eu]=CGI KIO slave-a konfiguratu
+ Comment[fa]=پیکربندی پیرو CGI KIO
+ Comment[fi]=Muokkaa CGI-KIO-palvelun asetuksia
+@@ -162,7 +162,7 @@
+ Keywords[is]=CGI,KIO,þræll,slóðir
+ Keywords[it]=CGI,KIO,kioslave,percorsi
+ Keywords[ja]=CGI,KIO,スレーブ,パス
+-Keywords[km]=CGI,KIO,Slave,ផ្លូវ
++Keywords[km]=CGI KIO Slave ផ្លូវ
+ Keywords[ko]=CGI,KIO,슬레이브,경로
+ Keywords[lt]=CGI,KIO,Slave,Paths, keliai
+ Keywords[lv]=CGI,KIO,vergi,ceļi
+--- a/runtime/kioslave/sftp/ksshprocess.cpp
++++ b/runtime/kioslave/sftp/ksshprocess.cpp
+@@ -481,7 +481,9 @@
+ if ( ::kill(pid, signal) == 0 ) {
+ // clean up if we tried to kill the process
+ if( signal == SIGTERM || signal == SIGKILL ) {
+- while(waitpid(-1, NULL, WNOHANG) > 0);
++ while(waitpid(-1, NULL, WNOHANG) > 0) {
++ ;
++ }
+ mConnected = false;
+ mRunning = false;
+ }
+--- a/runtime/kioslave/CMakeLists.txt
++++ b/runtime/kioslave/CMakeLists.txt
+@@ -11,7 +11,6 @@
+ add_subdirectory( archive )
+ add_subdirectory( settings )
+ add_subdirectory( trash )
+-add_subdirectory( media )
+ add_subdirectory( remote )
+
+ # need kdesu
+--- a/runtime/nepomuk/coreservices/nepomuk-coreservices.desktop
++++ b/runtime/nepomuk/coreservices/nepomuk-coreservices.desktop
+@@ -8,6 +8,7 @@
+ Name[de]=Nepomuk-Basisdienste
+ Name[el]=Υπηρεσίες πυρήνα Nepomuk
+ Name[es]=Servicios básicos de Nepomuk
++Name[et]=Nepomuki tuumteenused
+ Name[fa]=خدمات هسته Nepomuk
+ Name[he]=שירותים מרכזיים של Nepomuk
+ Name[it]=Servizi del nucleo di Nepomuk
+@@ -33,6 +34,7 @@
+ Comment[de]=Die Nepomuk-Basisdienste bestehen hauptsächlich aus dem RDF-Depot
+ Comment[el]=Οι υπηρεσίες πυρήνα Nepomuk αποτελούνται κυρίως από το χώρο αποθήκευσης RDF
+ Comment[es]=Los servicios básicos de Nepomuk consisten principalmente del repositorio RDF
++Comment[et]=Nepomuki tuumteenused koosnevad peamiselt RDF-hoidlast
+ Comment[fa]=خدمات هسته Nepomuk اساساً شامل مخزن RDF
+ Comment[he]=השירותים המרכזיים של Nepomuk הכוללים בעיקר את מאגר ה־RDF
+ Comment[ja]=主に RDF リポジトリから成る Nepomuk コアサービス
+--- a/runtime/kdeprint/kdeprintfax/kdeprintfax.desktop
++++ b/runtime/kdeprint/kdeprintfax/kdeprintfax.desktop
+@@ -23,7 +23,7 @@
+ GenericName[el]=Εργαλείο φαξ
+ GenericName[eo]=Faxutilaĵo
+ GenericName[es]=Aplicación de fax
+-GenericName[et]=Faksimise utiliit
++GenericName[et]=Faksimise tööriist
+ GenericName[eu]=Fax tresna
+ GenericName[fa]=برنامۀ سودمند دورنگار
+ GenericName[fi]=Faksityökalu
+--- a/runtime/kdeprint/kdeprintfax/confsystem.cpp
++++ b/runtime/kdeprint/kdeprintfax/confsystem.cpp
+@@ -166,7 +166,7 @@
+ case MGETTY_ID: conf.writeEntry("System", "mgetty"); break;
+ case OTHER_ID: conf.writeEntry( "System", "other" ); break;
+ }
+- conf.changeGroup("Fax");
++ conf = KConfigGroup(KGlobal::config(),"Fax");
+ if ( m_device->currentIndex() != ( m_device->count()-1 ) )
+ conf.writeEntry("Device", m_device->currentIndex() == 0 ? QString("modem") : QString("ttyS%1").arg(m_device->currentIndex()-1));
+ else
+--- a/runtime/kdeprint/printmgr/printmgr.desktop
++++ b/runtime/kdeprint/printmgr/printmgr.desktop
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ OnlyShowIn=KDE;
+ Encoding=UTF-8
+-Exec=kcmshell printmgr
++Exec=kcmshell4 printmgr
+ Icon=printmgr
+ Type=Application
+ DocPath=kdeprint/index.html
+@@ -19,6 +19,7 @@
+ Name[de]=Druckerverwaltung
+ Name[el]=Διαχειριστής εκτυπώσεων
+ Name[es]=Gestor de impresión
++Name[et]=Trükkimise haldur
+ Name[fa]=مدیر چاپ
+ Name[ga]=Bainisteoir Priontála
+ Name[he]=מנהל ההדפסה
+@@ -134,7 +135,7 @@
+ Keywords[is]=prentun,prentari,prentstjórnun
+ Keywords[it]=stampa,stampante,gestione stampa
+ Keywords[ja]=印刷, プリンタ, 印刷管理
+-Keywords[km]=បោះពុម្ព,ម៉ាស៊ីនបោះពុម្ព,ការគ្រប់គ្រងបោះពុម្ព
++Keywords[km]=បោះពុម្ព ម៉ាស៊ីនបោះពុម្ព ការគ្រប់គ្រងបោះពុម្ព
+ Keywords[ko]=인쇄,프린터,인쇄 관리
+ Keywords[lt]=print,printer,printing management,spausdinti,spausdintuvas,spausdinimo tvarkymas
+ Keywords[lv]=druka,drukas iekārta,drukāšanas menedžments
+--- a/runtime/kdeprint/printmgr/printers.desktop
++++ b/runtime/kdeprint/printmgr/printers.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Exec=kcmshell printmgr
++Exec=kcmshell4 printmgr
+ Icon=printmgr
+
+ ServiceTypes=KCModule
+@@ -171,7 +171,7 @@
+ Keywords[is]=prentun,prentari,prentstjórnun
+ Keywords[it]=stampa,stampante,gestione stampa
+ Keywords[ja]=印刷, プリンタ, 印刷管理
+-Keywords[km]=បោះពុម្ព,ម៉ាស៊ីនបោះពុម្ព,ការគ្រប់គ្រងបោះពុម្ព
++Keywords[km]=បោះពុម្ព ម៉ាស៊ីនបោះពុម្ព ការគ្រប់គ្រងបោះពុម្ព
+ Keywords[ko]=인쇄,프린터,인쇄 관리
+ Keywords[lt]=print,printer,printing management,spausdinti,spausdintuvas,spausdinimo tvarkymas
+ Keywords[lv]=druka,drukas iekārta,drukāšanas menedžments
+--- a/runtime/kdeprint/descriptions/printers.cpp
++++ b/runtime/kdeprint/descriptions/printers.cpp
+@@ -3601,7 +3601,7 @@
+ // xgettext: no-c-format
+ i18n("Private Stored Job");
+ // xgettext: no-c-format
+-i18n("PrinterÕs Current Setting");
++i18n("Printer's Current Setting");
+ // xgettext: no-c-format
+ i18n("Stacker-Separator-Collator");
+ // xgettext: no-c-format
+@@ -4279,7 +4279,7 @@
+ // xgettext: no-c-format
+ i18n("Continuous-tone photographs (color or gray scale)");
+ // xgettext: no-c-format
+-i18n("Primarily solid colors ro smooth gradients (color or gray scale)");
++i18n("Primarily solid colors to smooth gradients (color or gray scale)");
+ // xgettext: no-c-format
+ i18n("Dithering Algorithm");
+ // xgettext: no-c-format
+--- a/runtime/kdeprint/kjobviewer/kjobviewer.desktop
++++ b/runtime/kdeprint/kjobviewer/kjobviewer.desktop
+@@ -51,7 +51,7 @@
+ GenericName[ja]=印刷ジョブ
+ GenericName[ka]=ბეჭდვის დავალება
+ GenericName[kk]=Басып шығару тапсырмалары
+-GenericName[km]=បោះពុម្ពការងារ
++GenericName[km]=ការងារបោះពុម្ព
+ GenericName[ko]=인쇄 작업
+ GenericName[lt]=Spausdinimo užduotys
+ GenericName[mk]=Задачи за печатење
+--- a/runtime/kdeprint/filters/poster.desktop
++++ b/runtime/kdeprint/filters/poster.desktop
+@@ -6,6 +6,7 @@
+ Comment[de]=Posterdruck
+ Comment[el]=Εκτύπωση αφισών
+ Comment[es]=Impresión de pósteres
++Comment[et]=Posteri trükkimine
+ Comment[fa]=چاپ پوستر
+ Comment[ga]=Priontáil Postaera
+ Comment[he]=הדפסת כרזות
+@@ -34,9 +35,10 @@
+ Description[bg]=Отпечатване на големи плакати на множество малки листове. За да използвате тази команда трябва да имате <b>poster</b> в <tt>ПЪТЯ</tt>. Можете да намерите кода на <a href="http://printing.kde.org/downloads">страницата KDEPrint</a>. <p><b><u>ПРЕДУПРЕЖДЕНИЕ:</u></b> Пакетът на сайта е променена версия. Оригиналът може да намерите на огледалото CTAN, но той няма да работи с KDE. <b>Трябва</b> да използвате <a href="http://printing.kde.org/downloads">този</a>.
+ Description[de]=Mit dieser Funktion können große Poster auf mehrere kleine Blätter verteilt gedruckt werden. Damit dies funktioniert, muss das Hilfsprogramm <b>poster</b> über die Umgebungsvariable <tt>PATH</tt> auffindbar sein. Den Quellcode für das Hilfsprogramm finden Sie auf der <a href="http://printing.kde.org/downloads">KDEPrint Webseite</a>.<p><b><u>Achtung:</u></b> Bei dem Paket von der KDEPrint Webseite handelt es sich um eine modifizierte Version des Originals (welches auf jedem CTAN-Spiegelserver zu finden ist). Das Original funktioniert <b>nicht</b> mit KDE; Sie <b>müssen</b> das Programm von der <a href="http://printing.kde.org/downloads">KDEPrint Webseite</a> benutzen.
+ Description[el]=Εργαλείο για εκτύπωση μεγάλων αφισών σε πολλές μικρές σελίδες. Για να χρησιμοποιήσετε αυτή την εντολή, το εκτελέσιμο <b>poster</b> πρέπει να βρίσκεται στο <tt>PATH</tt> σας. Ο πηγαίος κώδικας γι' αυτό το εργαλείο μπορεί να βρεθεί στο <a href="http://printing.kde.org/downloads">Δικτυακός τόπος του KDEPrint</a>. <p><b><u>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</u></b> Το πακέτο που βρίσκεται στο δικτυακό τόπο του KDEPrint είναι μια τροποποιημένη έκδοση του πρωτότυπου που μπορεί να βρεθεί σε οποιοδήποτε αρχειοθήκη CTAN, αλλά το αρχικό πακέτο <b>δε</b> θα δουλέψει με το KDE. <b>Πρέπει</b> να χρησιμοποιήσετε το πακέτο που βρίσκεται στο <a href="http://printing.kde.org/downloads">Δικτυακός τόπος του KDEPrint</a>.
++Description[et]=Tööriist suurte posterite trükkimiseks paljudel väikestel paberilehtedel. Selle käsu kasutamiseks peab käivitatav fail <b>poster</b> asuma otsinguteel (<tt>PATH</tt>). Tööriista lähtekoodi leiab <a href="http://printing.kde.org/downloads">KDEPrinti veebileheküljelt</a>. <p><b><u>HOIATUS:</u></b> KDEPrinti veebileheküljel pakutav pakett on originaali muudetud variant; originaali võib leida suvalisest CTAN arhiivi peeglist, kuid see <b>ei tööta</b> KDE-s. Sa <b>pead</b> kasutama paketti, mida pakub <a href="http://printing.kde.org/downloads">KDEPrinti veebilehekülg</a>.
+ Description[ja]=複数の小さい用紙を使って大きなポスターを印刷するためのユーティリティです。このコマンドを使用するには <tt>PATH</tt> に <b>poster</b> 実行ファイルが存在する必要があります。このユーティリティのソースコードは <a href="http://printing.kde.org/downloads">KDEPrint ウェブサイト</a> にあります。<p>[注意] KDEPrint ウェブサイトにあるパッケージは CTAN アーカイブミラーにあるオリジナルに変更を加えたものです。オリジナルのものは KDE では動きません。必ず <a href="http://printing.kde.org/downloads">KDEPrint ウェブサイト</a> にあるパッケージを使用してください。
+ Description[kk]=Үлкен плакаттарды кішірек парақтардан құрастырып басып шығару утилитасы. Бұл команданы қолдану үшін <b>poster</b> бағдарламасы <tt>PATH</tt> жолыңызда орындауға дайын болу керек. Бұл утилитаның бастапқы мәтіні <a href="http://printing.kde.org/downloads">KDEPrint web site</a> сайтынан алуға болады. <p><b><u>ЕСКЕРТУ:</u></b> KDEPrint веб-сайттағы десте әрбір CTAN архив айнасындағы өзгерілген нұсқасы, бірақ айнадағы нұсқасы KDE-де жұмыс <b>істемейді</b>. Дестені <b>міндетті</b>түрде <a href="http://printing.kde.org/downloads">KDEPrint web site</a> сайтынан алу керек.
+-Description[km]=ឧបករណ៍ប្រើប្រាស់ដើម្បីបោះពុម្ពប័ណ្ណប្រកាសនៅលើសន្លឹកក្រដាសតូចៗជាច្រើន ។ ដើម្បីប្រើពាក្យបញ្ជានេះ <b>ប័ណ្ណប្រកាស</b> ដែលអាចប្រតិបត្តិបានត្រូវតែអាចចូលដំណើរការបាននៅក្នុង<tt>PATH</tt> របស់អ្នក ។ កូដចំហសម្រាប់ឧបករណ៍ប្រើប្រាស់នេះអាចរកបាននៅលើ <a href="http://printing.kde.org/downloads">តំបន់បណ្ដាញ KDEPrint</a> ។ <p><b><u>ការព្រមាន ៖</u></b> កញ្ចប់រកបាននៅលើតំបន់បណ្ដាញរបស់ KDEPrint គឺជាកំណែដែលបានកែប្រែរបស់កំណែដើមដែលអាចរកបាននៅលើកញ្ចក់ប័ណ្ណសាររបស់ CTAN ប៉ុន្តែកញ្ចប់ដើមនឹង<b>មិន</b> ដំណើរការជាមួយ KDE ទេ ។ អ្នក<b>ត្រូវតែ</b> ប្រើកញ្ចប់ដែលអាចរកបាននៅលើ <a href="http://printing.kde.org/downloads">តំបន់បណ្ដាញរបស់ KDEPrint</a> ។
++Description[km]=ឧបករណ៍ប្រើប្រាស់ដើម្បីបោះពុម្ពប័ណ្ណប្រកាសនៅលើសន្លឹកក្រដាសតូចៗជាច្រើន ។ ដើម្បីប្រើពាក្យបញ្ជានេះ <b>ប័ណ្ណប្រកាស</b> ដែលអាចប្រតិបត្តិបានត្រូវតែអាចចូលដំណើរការបាននៅក្នុង<tt>PATH</tt> របស់អ្នក ។ កូដចំហសម្រាប់ឧបករណ៍ប្រើប្រាស់នេះអាចរកបាននៅលើ <a href="http://printing.kde.org/downloads">តំបន់បណ្ដាញ KDEPrint</a> ។ <p><b><u>ការព្រមាន ៖</u></b> កញ្ចប់រកបាននៅលើតំបន់បណ្ដាញរបស់ KDEPrint គឺជាកំណែដែលបានកែប្រែរបស់កំណែដើមដែលអាចរកបាននៅលើកញ្ចក់ប័ណ្ណសាររបស់ CTAN ប៉ុន្តែកញ្ចប់ដើមនឹង<b>មិន</b> ដំណើរការជាមួយ KDE ទេ ។ អ្នក<b>ត្រូវតែ</b> ប្រើកញ្ចប់ដែលអាចរកបាននៅលើ <a href="http://printing.kde.org/downloads">តំបន់បណ្ដាញរបស់ KDEPrint</a> ។
+ Description[lt]=Programėlė, skirta didelių afišų ant daugelio mažų popieriaus lapų spausdinimui. Norint naudoti šią komandą, <b>poster</b> vykdomoji byla turėtų būti Jūsų kelyje <tt>PATH</tt>. Šios programėlės išeities tekstas yra <a href="http://printing.kde.org/downloads">KDEPrint žiniatinklio srityje</a>. <p><b><u>PERSPĖJIMAS:</u></b> KDEPrint žiniatinklio srityje esantis paketas yra modifikuota originalaus paketo, randamo bet kuriame CTAN archyve, versija, tačiau originalus paketas <b>neveiks</b> su KDE. Jūs <b>turite</b> naudoti paketą iš <a href="http://printing.kde.org/downloads">KDEPrint žiniatinklio srities</a>.
+ Description[nb]=Verktøy for å skrive ut store plakater på flere små papirark. Programmet <b>poster</b> må være i søkestien (<tt>PATH</tt>). Kildekoden til dette verktøyet kan finnes på <a href="http://printing.kde.org/downloads">nettstedet KDEPrint</a>. <p><b><u>ADVARSEL:</u></b> Pakka som ligger på nettstedet til KDEPrint er en endret versjon av originalen som finnes på alle CTAN-speil, men originalen vil <b>ikke</b> virke med KDE.Du <b>må</b> bruke pakka som finnes på <a href="http://printing.kde.org/downloads">KDEPrint-nettstedet</a>.
+ Description[nds]=Warktüüch, dat groot Plakaten op en Reeg lütter Sieden druckt. Dat Programm <b>poster</b> mutt sik över Dien <tt>PATH</tt>-Variabel finnen laten, wenn Du disse Funkschoon bruken wullt. De Bornkode för dit Warktüüch steiht op de <a href="http://printing.kde.org/downloads">Druck-Nettsiet</a> vun KDE. <p><b><u>Wohrscho:</u></b> Dat Paket op de KDE-Nettsiet is en ännert Verschoon vun't Orginaal, dat sik op elkeen CTAN-Spegelserver finnen lett, man <b>nich</b> mit KDE löppt. Du <b>muttst</b> dat Paket vun KDE sien <a href="http://printing.kde.org/downloads">Druck-Nettdiet</a> bruken.
+--- a/runtime/kdeprint/filters/psbook1.desktop
++++ b/runtime/kdeprint/filters/psbook1.desktop
+@@ -9,6 +9,7 @@
+ Comment[de]=Broschüre drucken - gerade Seiten (Schritt 1)
+ Comment[el]=Εκτύπωση φυλλαδίου - Ζυγές σελίδες (βήμα 1)
+ Comment[es]=Impresión de folletos - Páginas pares (paso 1)
++Comment[et]=Brošüüri trükkimine - paarisleheküljed (1. samm)
+ Comment[fa]=چاپ جزوه - صفحات زوج )گام ۱(
+ Comment[ga]=Priontáil Phaimfléid - Leathanaigh Chothroma (céim 1)
+ Comment[ja]=小冊子の印刷 - 偶数ページ (ステップ 1)
+--- a/runtime/kdeprint/filters/psbook2.desktop
++++ b/runtime/kdeprint/filters/psbook2.desktop
+@@ -9,6 +9,7 @@
+ Comment[de]=Broschüre drucken - ungerade Seiten (Schritt 2)
+ Comment[el]=Εκτύπωση φυλλαδίου - Μονές σελίδες (βήμα 2)
+ Comment[es]=Impresión de folletos - Páginas impares (paso 2)
++Comment[et]=Brošüüri trükkimine - paaritud leheküljed (2. samm)
+ Comment[fa]=چاپ جزوه - صفحات فرد )گام ۲(
+ Comment[ga]=Priontáil Phaimfléid - Leathanaigh Chorra (céim 2)
+ Comment[ja]=小冊子の印刷 - 奇数ページ (ステップ 2)
+--- a/runtime/kdeprint/filters/psselect.desktop
++++ b/runtime/kdeprint/filters/psselect.desktop
+@@ -9,6 +9,7 @@
+ Comment[de]=Auswahl und Sortierung der Druckseiten
+ Comment[el]=Φίλτρο επιλογής/διευθέτησης σελίδων
+ Comment[es]=Filtro de selección de página y ordenación
++Comment[et]=Lehekülje valiku/järjekorra filter
+ Comment[fa]=گزینش صفحه/ترتیب پالایه
+ Comment[ga]=Scagaire chun leathanaigh a roghnú agus a chur in ord
+ Comment[ja]=ページ選択/並べ替えフィルタ
+--- a/runtime/kdeprint/filters/pdfwrite.desktop
++++ b/runtime/kdeprint/filters/pdfwrite.desktop
+@@ -12,6 +12,7 @@
+ Comment[de]=PDF-Erzeugung (erfordert Ghostscript)
+ Comment[el]=Εγγραφέας PDF (χρειάζεται το Ghostscript)
+ Comment[es]=Escritor de PDF (necesita Ghostscript)
++Comment[et]=PDF-i kirjutaja (vajab Ghostscripti)
+ Comment[fa]=نویسنده PDF )نیازمند Ghostscript(
+ Comment[ga]=Scríbhneoir PDF (Ghostscript de dhíth)
+ Comment[he]=כתבן PDF (דורש Ghostscript)
+--- a/runtime/kdeprint/filters/enscript.desktop
++++ b/runtime/kdeprint/filters/enscript.desktop
+@@ -10,6 +10,7 @@
+ Comment[de]=Enscript Text-Filter
+ Comment[el]=Φίλτρο κειμένου του enscript
+ Comment[es]=Fichero de texto enscript
++Comment[et]=Enscripti tekstifilter
+ Comment[fa]=پالایۀ متنی Enscript
+ Comment[ga]=Scagaire Téacs Enscript
+ Comment[he]=מסנן טקסט Enscript
+--- a/runtime/kdeprint/filters/imagetops.desktop
++++ b/runtime/kdeprint/filters/imagetops.desktop
+@@ -2,6 +2,7 @@
+ Name=imagetops
+ Name[ar]=الصور العلوية
+ Name[bg]=Графични файлове
++Name[km]=កំពូលរូបភាព
+ Name[ne]=उच्च छवि
+ Name[vi]=ảnh sang PS
+ Name[x-test]=xximagetopsxx
+@@ -12,13 +13,14 @@
+ Comment[de]=Umwandlung von Bildern zu PS
+ Comment[el]=Γενικό φίλτρο εικόνας σε PS
+ Comment[es]=Filtro genérico de imagen a PostScript
++Comment[et]=Üldine pilt->PS filter
+ Comment[fa]=تصویر کلی برای پالایه PS
+ Comment[ga]=Scagaire cineálach Íomhá go PS
+ Comment[he]=מסנן כללי מתמונה ל־PS
+ Comment[it]=Filtro da immagine generica a PS
+ Comment[ja]=一般的な画像を PS に変換
+ Comment[kk]=Негізгі кескін -> PS сүзгісі
+-Comment[km]=ប្រភេទរូបភាពនៃតម្រង PS
++Comment[km]=ប្រភេទរូបភាពទៅតម្រង PS
+ Comment[ko]=일반적인 그림 PS 변환 필터
+ Comment[lt]=Bendras filtras iš paveiksliukų į PS
+ Comment[nb]=Generisk filter for bilde til PS
+--- a/runtime/kdeprint/filters/psbook.desktop
++++ b/runtime/kdeprint/filters/psbook.desktop
+@@ -8,6 +8,7 @@
+ Comment[bg]=Печат на брошури
+ Comment[de]=Broschüre drucken (Verwendung: Duplex kurze Seite)
+ Comment[el]=Εκτύπωση φυλλαδίου (χρήση μαζί με εκτύπωση διπλής όψης μικρής πλευράς)
++Comment[et]=Brošüüri trükkimine (kasutamiseks väiksema külje duplekstrükkimisel)
+ Comment[fa]=چاپ جزوه )با استفاده از چاپ دوسویه جانبی کوچک(
+ Comment[ga]=Priontáil Phaimfléid (úsáid le priontáil dhéphléacsach - taobh gearr)
+ Comment[ja]=小冊子の印刷 - (短辺とじ両面印刷を使用)
+--- a/runtime/kdeprint/filters/ps2pdf.desktop
++++ b/runtime/kdeprint/filters/ps2pdf.desktop
+@@ -10,6 +10,7 @@
+ Comment[de]=Umwandlung von PostScript zu PDF
+ Comment[el]=Μετατροπέας από PostScript σε PDF
+ Comment[es]=Conversor de PostScript a PDF
++Comment[et]=PostScript->PDF teisendaja
+ Comment[fa]=مبدل پستاسکریپت به PDF
+ Comment[ga]=Tiontaire PostScript go PDF
+ Comment[he]=ממיר מ־PostScript ל־PDF
+--- a/runtime/kdeprint/filters/psresize.desktop
++++ b/runtime/kdeprint/filters/psresize.desktop
+@@ -8,6 +8,7 @@
+ Comment[de]=Skalierung des Ausdrucks auf eine andere Papiergröße
+ Comment[el]=Προσαρμογή περιεχομένου εκτύπωσης για ταίριασμα σε διαφορετικό μέγεθος χαρτιού
+ Comment[es]=Escala el contenido de la impresión para que quepa en otro tamaño de papel
++Comment[et]=Trükitava sisu skaleerimine mahutamiseks muule paberisuurusele
+ Comment[fa]=مقیاس محتوای چاپ برای تناسب با اندازه کاغذ دیگر
+ Comment[it]=Scala il contenuto per adattarlo a fogli di formato diverso
+ Comment[ja]=用紙サイズに合うように印刷内容を拡大/縮小
+--- a/runtime/kdeprint/filters/psnup.desktop
++++ b/runtime/kdeprint/filters/psnup.desktop
+@@ -7,6 +7,7 @@
+ Comment[de]=Ausdruck mehrere Seiten auf ein Blatt
+ Comment[el]=Φίλτρο πολλών σελίδων ανά φύλλο
+ Comment[es]=Filtro de varias páginas por hoja
++Comment[et]=Mitu lehekülge ühele lehele filter
+ Comment[fa]=چند صفحه در پالایه صفحه
+ Comment[it]=Filtro per stampare più pagine per foglio
+ Comment[ja]=一枚あたり複数ページ印刷フィルタ
+--- a/runtime/kdeprint/kprinter/kprinter.desktop
++++ b/runtime/kdeprint/kprinter/kprinter.desktop
+@@ -39,7 +39,7 @@
+ GenericName[el]=Εργαλείο εκτύπωσης
+ GenericName[eo]=Ilo por presado
+ GenericName[es]=Herramienta de impresión
+-GenericName[et]=Trükkimise rakendus
++GenericName[et]=Trükkimise tööriist
+ GenericName[eu]=Imprimatzeko tresna
+ GenericName[fa]=ابزار چاپ
+ GenericName[fi]=Tulostustyökalu
+--- a/runtime/knetattach/knetattach.cpp
++++ b/runtime/knetattach/knetattach.cpp
+@@ -223,7 +223,6 @@
+ idx.removeAll(name);
+ idx.prepend(name);
+ recent.writeEntry("Index", idx);
+- recent.changeGroup(name);
+ } else {
+ QString last;
+ if (!idx.isEmpty()) {
+@@ -234,7 +233,7 @@
+ _recent.deleteGroup(last);
+ recent.writeEntry("Index", idx);
+ }
+- recent.changeGroup(name);
++ recent = KConfigGroup(&_recent,name);
+ recent.writeEntry("URL", url.prettyUrl());
+ if (_type == "WebFolder" || _type == "Fish" || _type == "FTP") {
+ recent.writeEntry("Port", _port->value());
+--- a/runtime/kstyles/themes/mega.themerc
++++ b/runtime/kstyles/themes/mega.themerc
+@@ -3,6 +3,7 @@
+ Name[be]=Градыентавы стыль HighColor
+ Name[bg]=Стил MegaGradient
+ Name[el]=MegaGradient στυλ πολλών χρωμάτων
++Name[et]=MegaGradient highcolor stiil
+ Name[ja]=MegaGradient ハイカラースタイル
+ Name[kk]=МегаГрадиент түстерге бай стилі
+ Name[km]=រចនាប័ទ្មពណ៌ខ្ពស់ MegaGradient
+--- a/runtime/kstyles/themes/light-v2.themerc
++++ b/runtime/kstyles/themes/light-v2.themerc
+@@ -4,6 +4,7 @@
+ Name[bg]=Лек стил, версия 2
+ Name[de]=Light, 2. Revision
+ Name[el]=Ελαφρύ στυλ, 2η διασκευή
++Name[et]=Light stiili versioon 2
+ Name[it]=Stile Light, revisione 2
+ Name[ja]=Light スタイル、第 2 版
+ Name[kk]=Нұрлы стилі, 2-редакциясы
+@@ -26,10 +27,11 @@
+ Comment[bg]=Втора версия на лекия и елегантен стил
+ Comment[de]=Zweite Revision des einfachen und eleganten "Light"-Designs
+ Comment[el]=Δεύτερη διασκευή του απλού και κομψού στυλ 'Ελαφρύ'.
++Comment[et]=Lihtsa ja elegantse Light vidinastiili teine versioon
+ Comment[it]=Seconda revisione del semplice ed elegante stile «Light» per i widget.
+ Comment[ja]=シンプルでエレガントな Light ウィジェットスタイルの第 2 版。
+ Comment[kk]='Нұрлы' деген қарапайым және әсем стилінің 2-редакциясы.
+-Comment[km]=ការពិនិត្យឡើងវិញលើកទីពីរនៃរចនាប័ទ្មធាតុក្រាហ្វិកគំរូ និងភាពស្រស់ស្អាត 'ស្រាល' ។
++Comment[km]=ការពិនិត្យឡើងវិញលើកទីពីរនៃរចនាប័ទ្មធាតុក្រាហ្វិកសាមញ្ញ និងភាពស្រស់ស្អាត 'ស្រាល' ។
+ Comment[ko]=간단하고 우아한 가벼운 위젯 스타일의 두 번째 버전.
+ Comment[lt]=Paprasto ir elegantiško „lengvo“ valdiklio stiliaus antras variantas.
+ Comment[nb]=Annen revisjon av den enkle og elegante elementstilen «Light».
+--- a/runtime/kstyles/themes/light-v3.themerc
++++ b/runtime/kstyles/themes/light-v3.themerc
+@@ -4,6 +4,7 @@
+ Name[bg]=Лек стил, версия 3
+ Name[de]=Light, 3. Revision
+ Name[el]=Ελαφρύ στυλ, 3η διασκευή
++Name[et]=Light stiili versioon 3
+ Name[it]=Stile Light, revisione 3
+ Name[ja]=Light スタイル、第 3 版
+ Name[kk]=Нұрлы стилі, 3-редакциясы
+@@ -26,10 +27,11 @@
+ Comment[bg]=Трета версия на лекия и елегантен стил
+ Comment[de]=Dritte Revision des einfachen und eleganten "Light"-Designs
+ Comment[el]=Τρίτη διασκευή του απλού και κομψού στυλ 'Ελαφρύ'.
++Comment[et]=Lihtsa ja elegantse Light vidinastiili kolmas versioon
+ Comment[it]=Terza revisione del semplice ed elegante stile «Light» per i widget.
+ Comment[ja]=シンプルでエレガントな Light ウィジェットスタイルの第 3 版。
+ Comment[kk]='Нұрлы' деген қарапайым және әсем стилінің 3-редакциясы.
+-Comment[km]=ការពិនិត្យលើកទីបីនៃគំរូ និងរចនាប័ទ្មធាតុក្រាហ្វិកស្រស់ស្អាត 'ស្រាល' ។
++Comment[km]=ការពិនិត្យលើកទីបីនៃរចនាប័ទ្មធាតុក្រាហ្វិកសាមញ្ញ ហើយស្រស់ស្អាត 'ស្រាល' ។
+ Comment[ko]=간단하고 우아한 가벼운 위젯 스타일의 세 번째 버전.
+ Comment[lt]=Paprasto ir elegantiško „lengvo“ valdiklio stiliaus trečias variantas.
+ Comment[nb]=Tredje revisjon av den enkle og elegante elementstilen «Light».
+--- a/runtime/kstyles/themes/highcolor.themerc
++++ b/runtime/kstyles/themes/highcolor.themerc
+@@ -2,6 +2,7 @@
+ Name=HighColor Classic
+ Name[be]=Класічны стыль HighColor
+ Name[el]=Κλασικό πολλών χρωμάτων
++Name[et]=HighColor klassikaline
+ Name[it]=Classico HighColor
+ Name[ja]=ハイカラークラシック
+ Name[kk]=Классикалық БайТүстер
+@@ -21,6 +22,7 @@
+ Comment[be]=Версія класічнага стылю з вялікай колькасцю колераў
+ Comment[bg]=Класически стил с усилени цветове
+ Comment[el]=Έκδοση με πολλά χρώματα του κλασικού στυλ
++Comment[et]=Klassikalise stiili Highcolor versioon
+ Comment[it]=Versione multicolore dello stile classico
+ Comment[ja]=クラシックスタイルのハイカラーバージョン
+ Comment[kk]=Классикалық стилінің БайТүстер нұсқасы
+--- a/runtime/kstyles/themes/qtplatinum.themerc
++++ b/runtime/kstyles/themes/qtplatinum.themerc
+@@ -10,6 +10,7 @@
+ Comment[bg]=Вграден платинен стил
+ Comment[de]=Eingebautes Platinum-Design
+ Comment[el]=Ενσωματωμένο στυλ Platinum
++Comment[et]=Sisseehitatud teematu Platinumi stiil
+ Comment[it]=Stile integrato Platinum senza temi
+ Comment[ja]=ビルトイン Platinum スタイル (テーマなし)
+ Comment[kk]=Құрамындағы нақыштарсыз Platinum стилі
+--- a/runtime/kstyles/themes/qtwindows.themerc
++++ b/runtime/kstyles/themes/qtwindows.themerc
+@@ -7,6 +7,7 @@
+ Comment[bg]=Вграден стил Windows 9x style
+ Comment[de]=Eingebautes Design im Stil von Windows 9x
+ Comment[el]=Ενσωματωμένο στυλ παρόμοιο με τα Windows 9x
++Comment[et]=Sisseehitatud teematu Windows 9x stiil
+ Comment[it]=Stile integrato Windows 9x
+ Comment[ja]=ビルトイン Windows 9x スタイル (テーマなし)
+ Comment[kk]=Құрамындағы нақыштарсыз Windows 9x стилі
+--- a/runtime/kstyles/themes/qtcde.themerc
++++ b/runtime/kstyles/themes/qtcde.themerc
+@@ -7,6 +7,7 @@
+ Comment[be]=Убудаваны стыль CDE
+ Comment[bg]=Вграден CDE стил
+ Comment[el]=Ενσωματωμένο στυλ παρόμοιο με το CDE
++Comment[et]=Sisseehitatud teematu CDE stiil
+ Comment[it]=Stile integrato CDE
+ Comment[ja]=ビルトイン CDE スタイル (テーマなし)
+ Comment[kk]=Құрамындағы нақыштарсыз CDE стилі
+--- a/runtime/kstyles/themes/keramik.themerc
++++ b/runtime/kstyles/themes/keramik.themerc
+@@ -26,6 +26,7 @@
+ Comment[bg]=Стил с алфа смесване
+ Comment[de]=Ein Design mit Alphablending
+ Comment[el]=Ένα στυλ που χρησιμοποιεί ανάμιξη άλφα
++Comment[et]=Alfablendingut kasutav stiil
+ Comment[it]=Uno stile che usa l'alphablending
+ Comment[ja]=アルファブレンディングを使用したスタイル
+ Comment[kk]=Альфа-арластыруды қолданатын стилі
+--- a/runtime/kstyles/themes/qtmotif.themerc
++++ b/runtime/kstyles/themes/qtmotif.themerc
+@@ -7,6 +7,7 @@
+ Comment[bg]=Вграден стил Motif
+ Comment[de]=Eingebautes Motif-Design
+ Comment[el]=Ενσωματωμένο στυλ παρόμοιο με το Motif
++Comment[et]=Sisseehitatud teematu Motifi stiil
+ Comment[it]=Stile integrato Motif
+ Comment[ja]=ビルトイン Motif スタイル (テーマなし)
+ Comment[kk]=Құрамындағы нақыштарсыз Motif стилі
+--- a/runtime/kstyles/themes/b3.themerc
++++ b/runtime/kstyles/themes/b3.themerc
+@@ -6,10 +6,11 @@
+ Comment[bg]=B3/Модификация на B2
+ Comment[de]=B3-Variation von B2
+ Comment[el]=B3/Τροποποίηση του B2
++Comment[et]=B3/B2 modifikatsioon
+ Comment[it]=B3/Modifica di B2
+ Comment[ja]=B3 / B2 の改良版
+ Comment[kk]=B3-өзгертілген B2
+-Comment[km]=B3/ការកែប្រែ B2
++Comment[km]=B3/ការកែប្រែរបស់ B2
+ Comment[ko]=B3/B2의 수정판
+ Comment[lt]=B3 – B2 modifikacija
+ Comment[nb]=B3/endring av B2
+--- a/runtime/kstyles/themes/default.themerc
++++ b/runtime/kstyles/themes/default.themerc
+@@ -3,6 +3,7 @@
+ Name[be]=Класічны KDE
+ Name[de]=KDE-Klassik
+ Name[el]=KDE κλασικό
++Name[et]=KDE klassikaline
+ Name[ga]=KDE Clasaiceach
+ Name[it]=Classico KDE
+ Name[ja]=KDE クラシック
+@@ -25,6 +26,7 @@
+ Comment[cs]=Klasický styl KDE
+ Comment[de]=Das klassische KDE-Design
+ Comment[el]=Κλασικό στυλ του KDE
++Comment[et]=KDE klassikaline stiil
+ Comment[it]=Lo stile classico di KDE
+ Comment[ja]=クラシック KDE スタイル
+ Comment[kk]=Классикалық KDE стилі
+--- a/runtime/kstyles/themes/qtmotifplus.themerc
++++ b/runtime/kstyles/themes/qtmotifplus.themerc
+@@ -8,6 +8,7 @@
+ Comment[bg]=Вграден подобрен стил Motif
+ Comment[de]=Eingebautes erweitertes Motif-Design
+ Comment[el]=Ενσωματωμένο στυλ παρόμοιο με το Motif με βελτιώσεις
++Comment[et]=Sisseehitatud täiustatud Motifi stiil
+ Comment[it]=Stile integrato Motif migliorato
+ Comment[ja]=ビルトイン Motif スタイル 改良版
+ Comment[kk]=Құрамындағы жетілдірген Motif стилі
+--- a/runtime/kstyles/themes/qtsgi.themerc
++++ b/runtime/kstyles/themes/qtsgi.themerc
+@@ -6,6 +6,7 @@
+ Comment[bg]=Вграден стил SGI
+ Comment[de]=Eingebautes SGI-Design
+ Comment[el]=Ενσωματωμένο στυλ παρόμοιο με το SGI
++Comment[et]=Sisseehitatud SGI stiil
+ Comment[it]=Stile integrato SGI
+ Comment[ja]=ビルトイン SGI スタイル
+ Comment[kk]=Құрамындағы Platinum стилі
+--- a/runtime/kstyles/themes/beos.themerc
++++ b/runtime/kstyles/themes/beos.themerc
+@@ -9,6 +9,7 @@
+ Comment[bg]=Стил BeOS
+ Comment[de]=BeOS-ähnliches Design
+ Comment[el]=Στυλ παρόμοιο με το BeOS
++Comment[et]=Teematu BeOS-i moodi stiil
+ Comment[it]=Stile ispirato a BeOS
+ Comment[ja]=BeOS 風のスタイル (テーマなし)
+ Comment[kk]=Нақыштарсыз BeOS-секілді стиль
+--- a/runtime/kstyles/plastik/plastik.themerc
++++ b/runtime/kstyles/plastik/plastik.themerc
+@@ -34,10 +34,11 @@
+ Comment[bg]=Опростен и изчистен стил
+ Comment[de]=Einfaches und klares Design
+ Comment[el]=Ένα απλό και καθαρό στυλ
++Comment[et]=Lihtne ja puhas stiil
+ Comment[it]=Uno stile semplice e pulito
+ Comment[ja]=シンプルできれいなスタイル
+ Comment[kk]=Қарапайым және анық стиль
+-Comment[km]=គំរូ និងរចនាប័ទ្មស្អាត
++Comment[km]=រចនាប័ទ្មសាមញ្ញ ហើយស្អាត
+ Comment[ko]=간단하고 깔끔한 스타일
+ Comment[lt]=Paprastas ir švarus stilius
+ Comment[nb]=En enkel og ren stil
+--- a/runtime/kstyles/oxygen/oxygen.h
++++ b/runtime/kstyles/oxygen/oxygen.h
+@@ -81,10 +81,9 @@
+
+ virtual int styleHint(StyleHint hint, const QStyleOption * option = 0,
+ const QWidget * widget = 0, QStyleHintReturn * returnData = 0) const;
++ virtual int pixelMetric(PixelMetric m, const QStyleOption *opt, const QWidget *widget) const;
+ virtual QRect subControlRect(ComplexControl control, const QStyleOptionComplex* option,
+ SubControl subControl, const QWidget* widget) const;
+- QSize sizeFromContents ( ContentsType type, const QStyleOption * option,
+- const QSize & contentsSize, const QWidget * widget = 0 ) const;
+
+ public:
+ enum StyleOption
+@@ -136,13 +135,6 @@
+ void renderRadioButton(QPainter *p, const QRect &r, const QPalette &pal,
+ bool enabled, bool mouseOver, int radioPrimitive) const;
+
+- void renderPanel(QPainter *p,
+- const QRect &r,
+- const QPalette &pal,
+- const bool raised = true,
+- const bool sunken = true,
+- const bool focusHighlight = false) const;
+-
+ void renderDot(QPainter *p, const QPointF &point, const QColor &baseColor) const;
+
+ void renderTab(QPainter *p,
+@@ -151,10 +143,8 @@
+ bool mouseOver,
+ const bool selected,
+ const bool bottom,
+- const QStyleOptionTab::TabPosition pos /*const TabPosition pos = Middle*/,
+- const bool triangular = false,
+- const bool cornerWidget = false,
+- const bool reverseLayout = false) const;
++ const QStyleOptionTabV2 *tabOpt,
++ const bool reverseLayout) const;
+
+ bool eventFilter(QObject *, QEvent *);
+
+@@ -195,62 +185,6 @@
+ QTimer *animationTimer;
+
+ TileSet *m_holeTileSet;
+-
+- // pixmap cache.
+- enum CacheEntryType {
+- cSurface,
+- cGradientTile,
+- cAlphaDot
+- };
+- struct CacheEntry
+- {
+- CacheEntryType type;
+- int width;
+- int height;
+- QRgb c1Rgb;
+- QRgb c2Rgb;
+- bool horizontal;
+-
+- QPixmap* pixmap;
+-
+- CacheEntry(CacheEntryType t, int w, int h, QRgb c1, QRgb c2 = 0,
+- bool hor = false, QPixmap* p = 0 ):
+- type(t), width(w), height(h), c1Rgb(c1), c2Rgb(c2), horizontal(hor), pixmap(p)
+- {}
+-
+- ~CacheEntry()
+- {
+- delete pixmap;
+- }
+-
+- int key()
+- {
+- // create an int key from the properties which is used to refer to entries in the QIntCache.
+- // the result may not be 100% correct as we don't have so much space in one integer -- use
+- // == operator after find to make sure we got the right one. :)
+- return (horizontal ? 1 : 0) ^ (type<<1) ^ (width<<5) ^ (height<<10) ^ (c1Rgb<<19) ^ (c2Rgb<<22);
+- }
+-
+- bool operator == (const CacheEntry& other)
+- {
+- bool match = (type == other.type) &&
+- (width == other.width) &&
+- (height == other.height) &&
+- (c1Rgb == other.c1Rgb) &&
+- (c1Rgb == other.c1Rgb) &&
+- (horizontal == other.horizontal);
+-// if(!match) {
+-// qDebug("operator ==: CacheEntries don't match!");
+-// qDebug("width: %d\t\tother width: %d", width, other.width);
+-// qDebug("height: %d\t\tother height: %d", height, other.height);
+-// qDebug("fgRgb: %d\t\tother fgRgb: %d", fgRgb, other.fgRgb);
+-// qDebug("bgRgb: %d\t\tother bgRgb: %d", bgRgb, other.bgRgb);
+-// qDebug("surfaceFlags: %d\t\tother surfaceFlags: %d", surfaceFlags, other.surfaceFlags);
+-// }
+- return match;
+- }
+- };
+- QCache<int, CacheEntry> *pixmapCache;
+ };
+
+ Q_DECLARE_OPERATORS_FOR_FLAGS(OxygenStyle::StyleOptions)
+--- a/runtime/kstyles/oxygen/oxygen.themerc
++++ b/runtime/kstyles/oxygen/oxygen.themerc
+@@ -2,7 +2,7 @@
+ Name=Oxygen
+ Name[csb]=Krziseń
+ Name[kk]=Оттегі
+-Name[km]=អុកស៊ីសែន
++Name[km]=អុកស៊ីហ្សែន
+ Name[ne]=अक्सिजन
+ Name[nn]=Oksygen
+ Name[pa]=ਆਕਸੀਜਨ
+@@ -15,6 +15,7 @@
+ Comment[bg]=Стил за следващото поколение работни плотове
+ Comment[de]=Das KDE-Design der nächsten Generation
+ Comment[el]=Μορφή της νέας γενιάς επιφάνειας εργασίας
++Comment[et]=Uue põlvkonna töölaua stiil
+ Comment[it]=Stile per il desktop della prossima generazione
+ Comment[ja]=次世代デスクトップのスタイル
+ Comment[kk]=Келесі буын үстел стилі
+--- a/runtime/kstyles/oxygen/helper.cpp
++++ b/runtime/kstyles/oxygen/helper.cpp
+@@ -116,39 +116,29 @@
+ return *pixmap;
+ }
+
+-QPixmap OxygenStyleHelper::roundSlabFocused(const QColor &color, QColor glow, double shade, int size)
++QPixmap OxygenStyleHelper::roundSlabFocused(const QColor &color, const QColor &glowColor, double shade, int size)
+ {
+ SlabCache *cache = slabCache(color);
+- quint64 key = (quint64(glow.rgba()) << 32) | (int)(256.0 * shade) << 24 | size;
++ quint64 key = (quint64(glowColor.rgba()) << 32) | (int)(256.0 * shade) << 24 | size;
+ QPixmap *pixmap = cache->m_roundSlabCache.object(key);
+
+ if (!pixmap)
+ {
+- pixmap = new QPixmap(size*3+4, size*3+4);
++ pixmap = new QPixmap(size*3, size*3);
+ pixmap->fill(QColor(0,0,0,0));
+
+ QPainter p(pixmap);
+ p.setRenderHints(QPainter::Antialiasing);
+ p.setPen(Qt::NoPen);
+- p.setWindow(0,0,25,25);
+-
+- QPixmap slabPixmap = roundSlab(color, shade, size);
++ p.setWindow(0,0,21,21);
+
+ // slab
+- p.drawPixmap(2, 2, slabPixmap);
++ QPixmap slabPixmap = roundSlab(color, shade, size);
++ p.drawPixmap(0, 0, slabPixmap);
+
+ // glow
+- QRadialGradient rg = QRadialGradient(12.5, 12.5, 12.5, 12.5, 12.5);
+- glow.setAlpha(0);
+- rg.setColorAt(7.5/12.5 - 0.01, glow);
+- glow.setAlpha(180);
+- rg.setColorAt(7.5/12.5, glow);
+- glow.setAlpha(70);
+- rg.setColorAt(9.0/12.5, glow);
+- glow.setAlpha(0);
+- rg.setColorAt(1.0, glow);
+- p.setBrush(rg);
+- p.drawEllipse(QRectF(0, 0, 25, 25));
++ QPixmap gp = glow(glowColor, size*3, 21);
++ p.drawPixmap(0, 0, gp);
+
+ p.end();
+
+@@ -206,6 +196,44 @@
+ p.drawEllipse(QRectF(pad-fuzz, pad-fuzz, size+fuzz*2.0, size+fuzz*2.0));
+ }
+
++QPixmap OxygenStyleHelper::glow(const QColor &color, int rsize, int vsize)
++{
++ QPixmap pixmap(rsize, rsize);
++ pixmap.fill(QColor(0,0,0,0));
++
++ QPainter p(&pixmap);
++ p.setRenderHints(QPainter::Antialiasing);
++ p.setPen(Qt::NoPen);
++ p.setWindow(0,0,vsize,vsize);
++
++ QRectF r(0, 0, vsize, vsize);
++ double m = double(vsize)*0.5;
++
++ const double width = 3.0;
++ const double fuzz = 0.2;
++ double k0 = (m-width+0.5) / m;
++ QRadialGradient glowGradient(m, m, m);
++ for (int i = 0; i < 8; i++) { // inverse parabolic gradient
++ double k1 = (k0 * double(8 - i) + double(i)) * 0.125;
++ double a = 1.0 - sqrt(i * 0.125);
++ glowGradient.setColorAt(k1, alphaColor(color, a));
++ }
++ glowGradient.setColorAt(1.0, alphaColor(color, 0.0));
++
++ // glow
++ p.setBrush(glowGradient);
++ p.drawEllipse(r);
++
++ // mask
++ p.setCompositionMode(QPainter::CompositionMode_DestinationOut);
++ p.setBrush(QBrush(Qt::black));
++ p.drawEllipse(r.adjusted(width+fuzz, width+fuzz, -width-fuzz, -width-fuzz));
++
++ p.end();
++
++ return pixmap;
++}
++
+ void OxygenStyleHelper::fillSlab(QPainter &p, const QRect &rect, int size)
+ {
+ int s = int(floor(double(size)*4.0/7.0));
+@@ -250,44 +278,34 @@
+ return tileSet;
+ }
+
+-TileSet *OxygenStyleHelper::slabFocused(const QColor &color, QColor glow, double shade, int size)
++TileSet *OxygenStyleHelper::slabFocused(const QColor &color, const QColor &glowColor, double shade, int size)
+ {
+ SlabCache *cache = slabCache(color);
+- quint64 key = (quint64(glow.rgba()) << 32) | (int)(256.0 * shade) << 24 | size;
++ quint64 key = (quint64(glowColor.rgba()) << 32) | (int)(256.0 * shade) << 24 | size;
+ TileSet *tileSet = cache->m_slabCache.object(key);
+
+ if (!tileSet)
+ {
+- int s = size+2; // ### wrong, but don't care for the moment
+- QPixmap pixmap(s*2,s*2);
++ QPixmap pixmap(size*2,size*2);
+ pixmap.fill(QColor(0,0,0,0));
+
+ QPainter p(&pixmap);
+ p.setRenderHints(QPainter::Antialiasing);
+ p.setPen(Qt::NoPen);
+- p.setWindow(0,0,18,18);
++ p.setWindow(0,0,14,14);
+
+ TileSet *slabTileSet = slab(color, shade, size);
+
+ // slab
+- slabTileSet->render(QRect(2,2,14,14), &p);
++ slabTileSet->render(QRect(0,0,14,14), &p);
+
+ // glow
+- QRadialGradient rg = QRadialGradient(9.0, 9.0, 9.0, 9.0, 9.0);
+- glow.setAlpha(0);
+- rg.setColorAt(4.5/9.0 - 0.01, glow);
+- glow.setAlpha(180);
+- rg.setColorAt(4.5/9.0, glow);
+- glow.setAlpha(70);
+- rg.setColorAt(6.5/9.0, glow);
+- glow.setAlpha(0);
+- rg.setColorAt(1.0, glow);
+- p.setBrush(rg);
+- p.drawEllipse(QRectF(0, 0, 18, 18));
++ QPixmap gp = glow(glowColor, size*2, 14);
++ p.drawPixmap(0, 0, gp);
+
+ p.end();
+
+- tileSet = new TileSet(pixmap, s-1, s, 2, 1);
++ tileSet = new TileSet(pixmap, size, size, size, size, size-1, size, 2, 1);
+
+ cache->m_slabCache.insert(key, tileSet);
+ }
+--- a/runtime/kstyles/oxygen/helper.h
++++ b/runtime/kstyles/oxygen/helper.h
+@@ -43,11 +43,11 @@
+ static void fillSlab(QPainter&, const QRect&, int size = 7);
+
+ QPixmap roundSlab(const QColor&, double shade, int size = 7);
+- QPixmap roundSlabFocused(const QColor&, QColor glow, double shade, int size = 7);
++ QPixmap roundSlabFocused(const QColor&, const QColor &glowColor, double shade, int size = 7);
+
+ // TODO - need to rebase scrollbars to size=7
+ TileSet *slab(const QColor&, double shade, int size = 7);
+- TileSet *slabFocused(const QColor&, QColor glow, double shade, int size = 7);
++ TileSet *slabFocused(const QColor&, const QColor &glowColor, double shade, int size = 7);
+ TileSet *slabSunken(const QColor&, double shade, int size = 7);
+ TileSet *slabInverted(const QColor&, double shade, int size = 7);
+
+@@ -66,6 +66,7 @@
+
+ void drawInverseShadow(QPainter&, const QColor&, int pad, int size, double fuzz) const;
+ void drawSlab(QPainter&, const QColor&, double shade) const;
++ static QPixmap glow(const QColor&, int rsize, int vsize);
+
+ QCache<quint64, SlabCache> m_slabCache;
+ QCache<quint64, TileSet> m_slabSunkenCache;
+--- a/runtime/kstyles/oxygen/lib/helper.cpp
++++ b/runtime/kstyles/oxygen/lib/helper.cpp
+@@ -228,13 +228,29 @@
+
+ QLinearGradient OxygenHelper::decoGradient(const QRect &r, const QColor &color)
+ {
+- QColor light = KColorUtils::lighten(color, _contrast * 0.4);
+- QColor dark = KColorUtils::darken(color, _contrast * 0.4);
++ QColor light = KColorScheme::shade(color, KColorScheme::LightShade, _contrast * 0.7);
++ QColor dark = KColorScheme::shade(color, KColorScheme::DarkShade, _contrast * 0.7);
++ double y = KColorUtils::luma(color);
++ double yd = KColorUtils::luma(dark);
++ double yl = KColorUtils::luma(light);
+
+ QLinearGradient gradient(r.topLeft(), r.bottomLeft());
+- gradient.setColorAt(0.15, dark);
+- gradient.setColorAt(0.50, color);
+- gradient.setColorAt(0.85, light);
++ if (yd > y)
++ {
++ gradient.setColorAt(0.2, color);
++ gradient.setColorAt(0.8, dark);
++ }
++ else if (yl < y)
++ {
++ gradient.setColorAt(0.2, light);
++ gradient.setColorAt(0.8, color);
++ }
++ else
++ {
++ gradient.setColorAt(0.2, dark);
++ gradient.setColorAt(0.5, color);
++ gradient.setColorAt(0.8, light);
++ }
+
+ return gradient;
+ }
+--- a/runtime/kstyles/oxygen/oxygen.cpp
++++ b/runtime/kstyles/oxygen/oxygen.cpp
+@@ -61,6 +61,7 @@
+ #include <QtGui/QToolBar>
+ #include <QtGui/QScrollBar>
+ #include <QtGui/QGroupBox>
++#include <QtGui/QLineEdit>
+ #include <QtGui/QDockWidget>
+ #include <QStyleOptionDockWidget>
+
+@@ -101,29 +102,31 @@
+
+ setWidgetLayoutProp(WT_Generic, Generic::DefaultFrameWidth, 2);
+
++// setWidgetLayoutProp(WT_LineEdit, LineEdit::FrameWidth, 5);
++
+ // TODO: change this when double buttons are implemented
+ setWidgetLayoutProp(WT_ScrollBar, ScrollBar::DoubleBotButton, true);
+ setWidgetLayoutProp(WT_ScrollBar, ScrollBar::MinimumSliderHeight, 21);
+- setWidgetLayoutProp(WT_ScrollBar, ScrollBar::BarWidth, 14); // size*2
++ setWidgetLayoutProp(WT_ScrollBar, ScrollBar::BarWidth, 15); // size*2+1
+ setWidgetLayoutProp(WT_ScrollBar, ScrollBar::ArrowColor,QPalette::ButtonText);
+ setWidgetLayoutProp(WT_ScrollBar, ScrollBar::ActiveArrowColor,QPalette::ButtonText);
+
+- setWidgetLayoutProp(WT_PushButton, PushButton::DefaultIndicatorMargin, 1);
++ setWidgetLayoutProp(WT_PushButton, PushButton::DefaultIndicatorMargin, 0);
+ setWidgetLayoutProp(WT_PushButton, PushButton::ContentsMargin + Left, 16);
+ setWidgetLayoutProp(WT_PushButton, PushButton::ContentsMargin + Right, 16);
+- setWidgetLayoutProp(WT_PushButton, PushButton::ContentsMargin + Top, 3);
+- setWidgetLayoutProp(WT_PushButton, PushButton::ContentsMargin + Bot, 3);
+- setWidgetLayoutProp(WT_PushButton, PushButton::FocusMargin, 2);
+- setWidgetLayoutProp(WT_PushButton, PushButton::FocusMargin + Left, 1);
+- setWidgetLayoutProp(WT_PushButton, PushButton::FocusMargin + Right, 1);
+- setWidgetLayoutProp(WT_PushButton, PushButton::FocusMargin + Top, 1);
+- setWidgetLayoutProp(WT_PushButton, PushButton::FocusMargin + Bot, 1);
++ setWidgetLayoutProp(WT_PushButton, PushButton::ContentsMargin + Top, 1);
++ setWidgetLayoutProp(WT_PushButton, PushButton::ContentsMargin + Bot, 0);
++ setWidgetLayoutProp(WT_PushButton, PushButton::FocusMargin, 0);
++ setWidgetLayoutProp(WT_PushButton, PushButton::FocusMargin + Left, 0);
++ setWidgetLayoutProp(WT_PushButton, PushButton::FocusMargin + Right, 0);
++ setWidgetLayoutProp(WT_PushButton, PushButton::FocusMargin + Top, 0);
++ setWidgetLayoutProp(WT_PushButton, PushButton::FocusMargin + Bot, 0);
+ setWidgetLayoutProp(WT_PushButton, PushButton::PressedShiftHorizontal, 0);
+ setWidgetLayoutProp(WT_PushButton, PushButton::PressedShiftVertical, 0);
+
+ setWidgetLayoutProp(WT_Splitter, Splitter::Width, 6);
+
+- setWidgetLayoutProp(WT_CheckBox, CheckBox::Size, 25);
++ setWidgetLayoutProp(WT_CheckBox, CheckBox::Size, 23);
+ setWidgetLayoutProp(WT_RadioButton, RadioButton::Size, 25);
+
+ setWidgetLayoutProp(WT_DockWidget, DockWidget::TitleTextColor, QPalette::WindowText);
+@@ -142,7 +145,7 @@
+ setWidgetLayoutProp(WT_ProgressBar, ProgressBar::BusyIndicatorSize, 10);
+
+ setWidgetLayoutProp(WT_TabBar, TabBar::TabOverlap, 1);
+- setWidgetLayoutProp(WT_TabBar, TabBar::BaseOverlap, 9);
++ setWidgetLayoutProp(WT_TabBar, TabBar::BaseOverlap, 7);
+ setWidgetLayoutProp(WT_TabBar, TabBar::TabContentsMargin + Left, 8);
+ setWidgetLayoutProp(WT_TabBar, TabBar::TabContentsMargin + Right, 8);
+ setWidgetLayoutProp(WT_TabBar, TabBar::TabContentsMargin + Top, 2);
+@@ -153,17 +156,28 @@
+ setWidgetLayoutProp(WT_Slider, Slider::HandleThickness, 25);
+ setWidgetLayoutProp(WT_Slider, Slider::HandleLength, 19);
+
+- setWidgetLayoutProp(WT_SpinBox, SpinBox::FrameWidth, 2);
+- setWidgetLayoutProp(WT_SpinBox, SpinBox::ButtonWidth, 2+16+1);
++ setWidgetLayoutProp(WT_SpinBox, SpinBox::FrameWidth, 6);
++ setWidgetLayoutProp(WT_SpinBox, SpinBox::ContentsMargin + Left, 3);
++ setWidgetLayoutProp(WT_SpinBox, SpinBox::ContentsMargin + Top, -2);
++ setWidgetLayoutProp(WT_SpinBox, SpinBox::ContentsMargin + Bot, -1);
++ setWidgetLayoutProp(WT_SpinBox, SpinBox::ButtonWidth, 19);
+ setWidgetLayoutProp(WT_SpinBox, SpinBox::ButtonSpacing, 0);
+- setWidgetLayoutProp(WT_SpinBox, SpinBox::ButtonMargin+Left, 0);
+- setWidgetLayoutProp(WT_SpinBox, SpinBox::ButtonMargin+Right, 3);
+- setWidgetLayoutProp(WT_SpinBox, SpinBox::ButtonMargin+Top, 3);
+- setWidgetLayoutProp(WT_SpinBox, SpinBox::ButtonMargin+Bot, 3);
+-
++ setWidgetLayoutProp(WT_SpinBox, SpinBox::ButtonMargin+Left, 2);
++ setWidgetLayoutProp(WT_SpinBox, SpinBox::ButtonMargin+Right, 7);
++ setWidgetLayoutProp(WT_SpinBox, SpinBox::ButtonMargin+Top, 5);
++ setWidgetLayoutProp(WT_SpinBox, SpinBox::ButtonMargin+Bot, 5);
++
++ setWidgetLayoutProp(WT_ComboBox, ComboBox::FrameWidth, 6);
++ setWidgetLayoutProp(WT_ComboBox, ComboBox::ContentsMargin + Left, 3);
++ setWidgetLayoutProp(WT_ComboBox, ComboBox::ContentsMargin + Top, -1);
++ setWidgetLayoutProp(WT_ComboBox, ComboBox::ContentsMargin + Bot, -1);
+ setWidgetLayoutProp(WT_ComboBox, ComboBox::ButtonWidth, 19);
+- setWidgetLayoutProp(WT_ComboBox, ComboBox::ButtonMargin+Left, 0);
+- setWidgetLayoutProp(WT_ComboBox, ComboBox::ButtonMargin+Right, 5);
++ setWidgetLayoutProp(WT_ComboBox, ComboBox::ButtonMargin, 0);
++ setWidgetLayoutProp(WT_ComboBox, ComboBox::ButtonMargin+Left, 2);
++ setWidgetLayoutProp(WT_ComboBox, ComboBox::ButtonMargin+Right, 7);
++ setWidgetLayoutProp(WT_ComboBox, ComboBox::ButtonMargin+Top, 5);
++ setWidgetLayoutProp(WT_ComboBox, ComboBox::ButtonMargin+Bot, 5);
++ setWidgetLayoutProp(WT_ComboBox, ComboBox::FocusMargin, 0);
+
+ setWidgetLayoutProp(WT_ToolBar, ToolBar::FrameWidth, 0);
+ setWidgetLayoutProp(WT_ToolBar, ToolBar::ItemSpacing, 1);
+@@ -189,8 +203,6 @@
+ // FIXME below this line to be deleted (and can we not use QSettings? KConfig* is safe now)
+ _customOverHighlightColor = true;
+ _customFocusHighlightColor = true;
+- // setup pixmap cache...
+- pixmapCache = new QCache<int, CacheEntry>(327680);
+
+ if ( _animateProgressBar )
+ {
+@@ -231,7 +243,6 @@
+
+ OxygenStyle::~OxygenStyle()
+ {
+- delete pixmapCache;
+ }
+
+
+@@ -263,10 +274,6 @@
+ painter->drawPixmap(radialRect, tile, QRect(0, frameH, radialW, 64-frameH));
+ }
+
+- if (qobject_cast<const QGroupBox*>(widget)) {
+- //painter->fillRect(option->rect, QColor(Qt::blue));
+- }
+-
+ break;
+ }
+
+@@ -345,28 +352,43 @@
+ {
+ case ProgressBar::Groove:
+ {
+- QColor bg = enabled?pal.color(QPalette::Base):pal.color(QPalette::Background); // background
+-
+- p->setPen(bg.dark(105) );
+- p->drawLine(r.left()+2, r.top()+1, r.right()-2, r.top()+1 );
+- p->drawLine(r.left()+1, r.top()+2, r.left()+1, r.bottom()-2);
+- p->setPen(bg.light(105) );
+- p->drawLine(r.left()+2, r.bottom()-1, r.right()-2, r.bottom()-1 );
+- p->drawLine(r.right()-1, r.top()+2, r.right()-1, r.bottom()-2);
++ QColor color = pal.color(QPalette::Button);
++ QRect rect = r.adjusted(2,0,-2,0);
+
+- // fill background
+- p->fillRect(r.adjusted(2,2,-2,-2), bg );
++ TileSet *tiles1 = _helper.horizontalScrollBar(color, rect.height(), r.width());
+
++ p->save();
++ p->setClipRect(rect.adjusted(-32,0,32,0));
++ tiles1->render(rect, p, TileSet::Left | TileSet::Vertical | TileSet::Right);
++ p->restore();
+ return;
+ }
+
+ case ProgressBar::BusyIndicator:
+ {
++ QColor color = _viewHoverBrush.brush(pal).color();
++ QRect rect = r.adjusted(0,-2,0,2);
++
++ TileSet *tiles1 = _helper.horizontalScrollBar(color, rect.height(), r.width());
++
++ p->save();
++ p->setClipRect(rect.adjusted(-32,0,32,0));
++ tiles1->render(rect, p, TileSet::Left | TileSet::Vertical | TileSet::Right);
++ p->restore();
+ return;
+ }
+
+ case ProgressBar::Indicator:
+ {
++ QColor color = _viewHoverBrush.brush(pal).color();
++ QRect rect = r.adjusted(0,-2,2+r.width() / 300,2); // right pos: hackish, but neccessary...
++
++ TileSet *tiles1 = _helper.horizontalScrollBar(color, rect.height(), r.width());
++
++ p->save();
++ p->setClipRect(rect.adjusted(-32,0,32,0));
++ tiles1->render(rect, p, TileSet::Left | TileSet::Vertical | TileSet::Right);
++ p->restore();
+ return;
+ }
+ }
+@@ -710,7 +732,7 @@
+
+ case WT_TabBar:
+ {
+- const QStyleOptionTab* tabOpt = qstyleoption_cast<const QStyleOptionTab*>(opt);
++ const QStyleOptionTabV2* tabOpt = qstyleoption_cast<const QStyleOptionTabV2*>(opt);
+
+ switch (primitive)
+ {
+@@ -721,12 +743,10 @@
+
+ QStyleOptionTab::TabPosition pos = tabOpt->position;
+ bool bottom = primitive == TabBar::SouthTab;
+- bool cornerWidget = reverseLayout ?
+- (tabOpt->cornerWidgets&QStyleOptionTab::LeftCornerWidget) :
+- (tabOpt->cornerWidgets&QStyleOptionTab::RightCornerWidget);
+
+ // TODO: tab painting needs a lot of work in order to handle east and west tabs.
+- renderTab(p, r, pal, mouseOver, flags&State_Selected, bottom, pos, false, cornerWidget, reverseLayout);
++ renderTab(p, r, pal, mouseOver, flags&State_Selected, bottom, tabOpt,
++reverseLayout);
+
+ return;
+ }
+@@ -762,27 +782,27 @@
+ // Left and right widgets are placed right and left when in reverse mode
+
+ if (w+lw >0)
+- renderSlab(p, QRect(0, r.y(), r.width() - w - lw+9, 9),
++ renderSlab(p, QRect(0, r.y(), r.width() - w - lw+7, 7),
+ pal.color(QPalette::Window), NoFill, TileSet::Left | TileSet::Top);
+ else
+- renderSlab(p, QRect(0, r.y(), r.width(), 9), pal.color(QPalette::Window), NoFill,
++ renderSlab(p, QRect(0, r.y(), r.width(), 7), pal.color(QPalette::Window), NoFill,
+ TileSet::Left | TileSet::Top | TileSet::Right);
+
+ if (lw > 0)
+- renderSlab(p, QRect(r.right() - lw-9, r.y(), lw+9, 9),
++ renderSlab(p, QRect(r.right() - lw-7, r.y(), lw+7, 7),
+ pal.color(QPalette::Window), NoFill, TileSet::Top | TileSet::Right);
+ }
+ else
+ {
+ if (lw > 0)
+- renderSlab(p, QRect(0, r.y(), lw+9, 9), pal.color(QPalette::Window), NoFill,
++ renderSlab(p, QRect(0, r.y(), lw+7, 7), pal.color(QPalette::Window), NoFill,
+ TileSet::Left | TileSet::Top);
+
+ if (w+lw >0)
+- renderSlab(p, QRect(w+lw-9, r.y(), r.width() - w - lw+9, 9), pal.color(QPalette::Window), NoFill,
++ renderSlab(p, QRect(w+lw-7, r.y(), r.width() - w - lw+7, 7), pal.color(QPalette::Window), NoFill,
+ TileSet::Top | TileSet::Right);
+ else
+- renderSlab(p, QRect(0, r.y(), r.width(), 9), pal.color(QPalette::Window), NoFill,
++ renderSlab(p, QRect(0, r.y(), r.width(), 7), pal.color(QPalette::Window), NoFill,
+ TileSet::Left | TileSet::Top | TileSet::Right);
+
+ }
+@@ -797,27 +817,27 @@
+ // Left and right widgets are placed right and left when in reverse mode
+
+ if (w+lw >0)
+- renderSlab(p, QRect(0, r.bottom()-9, r.width() - w - lw + 9, 9),
++ renderSlab(p, QRect(0, r.bottom()-7, r.width() - w - lw + 7, 7),
+ pal.color(QPalette::Window), NoFill, TileSet::Left | TileSet::Bottom);
+ else
+- renderSlab(p, QRect(0, r.bottom()-9, r.width(), 9), pal.color(QPalette::Window),
++ renderSlab(p, QRect(0, r.bottom()-7, r.width(), 7), pal.color(QPalette::Window),
+ NoFill, TileSet::Left | TileSet::Bottom | TileSet::Right);
+
+ if (lw > 0)
+- renderSlab(p, QRect(r.right() - lw-9, r.bottom()-9, lw+9, 9),
++ renderSlab(p, QRect(r.right() - lw-7, r.bottom()-7, lw+7, 7),
+ pal.color(QPalette::Window), NoFill, TileSet::Bottom | TileSet::Right);
+ }
+ else
+ {
+ if (lw > 0)
+- renderSlab(p, QRect(0, r.bottom()-9, lw+9, 9),
++ renderSlab(p, QRect(0, r.bottom()-7, lw+7, 7),
+ pal.color(QPalette::Window), NoFill, TileSet::Left | TileSet::Bottom);
+
+ if (w+lw >0)
+- renderSlab(p, QRect(w+lw-9, r.bottom()-9, r.width() - w - lw+9, 9),
++ renderSlab(p, QRect(w+lw-7, r.bottom()-7, r.width() - w - lw+7, 7),
+ pal.color(QPalette::Window), NoFill, TileSet::Bottom | TileSet::Right);
+ else
+- renderSlab(p, QRect(0, r.bottom()-9, r.width(), 9), pal.color(QPalette::Window),
++ renderSlab(p, QRect(0, r.bottom()-7, r.width(), 7), pal.color(QPalette::Window),
+ NoFill, TileSet::Left | TileSet::Bottom | TileSet::Right);
+
+ }
+@@ -849,7 +869,6 @@
+ {
+ case Generic::Frame:
+ {
+- renderPanel(p, r, pal, true, flags&State_Sunken);
+ return;
+ }
+
+@@ -923,7 +942,12 @@
+ case Slider::HandleHor:
+ case Slider::HandleVert:
+ {
+- renderSlab(p, r, pal.color(QPalette::Button));
++ StyleOptions opts = (flags & State_HasFocus ? Focus : StyleOption());
++ if (const QStyleOptionSlider *slider = qstyleoption_cast<const QStyleOptionSlider *>(opt))
++ if(slider->activeSubControls & SC_SliderHandle)
++ if (mouseOver) opts |= Hover;
++
++ renderSlab(p, r, pal.color(QPalette::Button), opts);
+ return;
+ }
+
+@@ -958,8 +982,9 @@
+ {
+ case Generic::Frame:
+ {
+- p->fillRect(opt->rect.adjusted(1,1,-1,-1), inputColor );
+- renderHole(p, r, hasFocus, mouseOver);
++ QRect fr = r.adjusted(2,2,-2,-2);
++ p->fillRect(fr.adjusted(1,1,-1,-1), inputColor );
++ renderHole(p, fr, hasFocus, mouseOver);
+ return;
+ }
+ case SpinBox::EditField:
+@@ -997,16 +1022,17 @@
+ if(!editable) {
+ renderSlab(p, r, pal.color(QPalette::Button), opts);
+ } else {
++ QRect fr = r.adjusted(2,2,-2,-2);
+ // input area
+- p->fillRect(r.adjusted(1,1,-1,-1), inputColor );
++ p->fillRect(fr.adjusted(1,1,-1,-1), inputColor );
+
+ if (_inputFocusHighlight && hasFocus && enabled)
+ {
+- renderHole(p, r, true, mouseOver);
++ renderHole(p, fr, true, mouseOver);
+ }
+ else
+ {
+- renderHole(p, r);
++ renderHole(p, fr, false, mouseOver);
+ }
+ }
+
+@@ -1038,8 +1064,20 @@
+ if (const QStyleOptionHeader *header = qstyleoption_cast<const QStyleOptionHeader *>(opt)) {
+ bool isFirst = (primitive==Header::SectionHor)&&(header->position == QStyleOptionHeader::Beginning);
+
+- p->setPen(pal.color(QPalette::Button));
+- p->drawRect(QRect(isFirst?r.left()+1:r.left(), r.top()+1, isFirst?r.width()-2:r.width()-1, r.height()-2));
++ p->setPen(pal.color(QPalette::Text));
++
++ QColor color = pal.color(QPalette::Button);
++ p->fillRect(r, color);
++ if(primitive == Header::SectionHor) {
++ if(header->section != 0 || isFirst) {
++ int center = r.center().y();
++ renderDot(p, QPointF(r.right()-1, center-3), color);
++ renderDot(p, QPointF(r.right()-1, center), color);
++ renderDot(p, QPointF(r.right()-1, center+3), color);
++ }
++ }
++ else
++ p->drawLine(r.bottomLeft(),r.bottomRight());
+ }
+
+ return;
+@@ -1102,11 +1140,11 @@
+
+ if ( _inputFocusHighlight && hasFocus && !isReadOnly && isEnabled)
+ {
+- renderHole(p, r, true, mouseOver);
++ renderHole(p, r.adjusted(2,2,-2,-3), true, mouseOver);
+ }
+ else
+ {
+- renderHole(p, r, false, mouseOver);
++ renderHole(p, r.adjusted(2,2,-2,-3), false, mouseOver);
+ }
+ return;
+ }
+@@ -1122,11 +1160,11 @@
+
+ if (lineWidth > 0)
+ {
+- p->fillRect(r.adjusted(lineWidth,lineWidth,-lineWidth,-lineWidth), inputColor);
++ p->fillRect(r.adjusted(-2,-2,2,1).adjusted(lineWidth,lineWidth,-lineWidth,-lineWidth), inputColor);
+ drawPrimitive(PE_FrameLineEdit, panel, p, widget);
+ }
+ else
+- p->fillRect(r.adjusted(2,2,-2,-2), inputColor);
++ p->fillRect(r.adjusted(2,2,-2,-1), inputColor);
+ }
+ }
+ }
+@@ -1261,27 +1299,27 @@
+ switch (primitive) {
+ case Generic::ArrowUp: {
+ a.clear();
+- a << QPointF(0, -3.5) << QPointF(4.5, 3.5) << QPointF(-4.5, 3.5);
++ a << QPointF(0.5, -4) << QPointF(5, 4) << QPointF(-4, 4);
+ break;
+ }
+ case Generic::ArrowDown: {
+ a.clear();
+- a << QPointF(0, 3.5) << QPointF(4.5, -3.5) << QPointF(-4.5, -3.5);
+- break;
++ a << QPointF(0.5, 4) << QPointF(5, -4) << QPointF(-4, -4);
++ break;
+ }
+ case Generic::ArrowLeft: {
+ a.clear();
+- a << QPointF(-3.5, 0) << QPointF(3.5, -4.5) << QPointF(3.5, 4.5);
++ a << QPointF(-4, 0.5) << QPointF(4, -4) << QPointF(4, 5);
+ break;
+ }
+ case Generic::ArrowRight: {
+ a.clear();
+- a << QPointF(3.5, 0) << QPointF(-3.5, -4.5) << QPointF(-3.5, 4.5);
++ a << QPointF(4, 0.5) << QPointF(-4, -4) << QPointF(-4, 5);
+ break;
+ }
+ }
+
+- a.translate((r.x()+r.width()/2), (r.y()+r.height()/2));
++ a.translate(int(r.x()+r.width()/2), int(r.y()+r.height()/2));
+ KStyle::ColorOption* colorOpt = extractOption<KStyle::ColorOption*>(kOpt);
+ QColor arrowColor = colorOpt->color.color(pal);
+
+@@ -1304,13 +1342,8 @@
+ bool focusHighlight = flags&State_HasFocus/* && flags&State_Enabled*/;
+ if (flags & State_Sunken) {
+ renderHole(p, r, focusHighlight);
+- } else if (flags & State_Raised) {
+- renderPanel(p, r, pal, true, false, focusHighlight);
+- } else {
+- renderPanel(p, r, pal, false);
+- }
+-
+- return;
++ } else
++ break; // do the default thing
+ }
+
+ case Generic::FocusIndicator:
+@@ -1328,8 +1361,15 @@
+
+ void OxygenStyle::polish(QWidget* widget)
+ {
+- if (widget->isWindow())
+- widget->setAttribute(Qt::WA_StyledBackground);
++ switch (widget->windowFlags() & Qt::WindowType_Mask) {
++ case Qt::Window:
++ case Qt::Dialog:
++ case Qt::Popup:
++ widget->setAttribute(Qt::WA_StyledBackground);
++ case Qt::Tool: // this we exclude as it is used for dragging of icons etc
++ default:
++ break;
++ }
+
+ if (qobject_cast<const QGroupBox*>(widget))
+ widget->setAttribute(Qt::WA_StyledBackground);
+@@ -1352,6 +1392,7 @@
+ || qobject_cast<QRadioButton*>(widget)
+ || qobject_cast<QTabBar*>(widget)
+ || qobject_cast<QScrollBar*>(widget)
++ || qobject_cast<QSlider*>(widget)
+ ) {
+ widget->setAttribute(Qt::WA_Hover);
+ }
+@@ -1385,6 +1426,7 @@
+ || qobject_cast<QCheckBox*>(widget)
+ || qobject_cast<QRadioButton*>(widget)
+ || qobject_cast<QScrollBar*>(widget)
++ || qobject_cast<QSlider*>(widget)
+ ) {
+ widget->setAttribute(Qt::WA_Hover, false);
+ }
+@@ -1437,7 +1479,7 @@
+ innerGradient.setColorAt(0.0, _helper.calcLightColor(color)); //KColorUtils::shade(calcLightColor(color), shade));
+ innerGradient.setColorAt(1.0, color);
+ p->setBrush(innerGradient);
+- _helper.fillSlab(*p, r.adjusted(2,2,-2,-2));
++ _helper.fillSlab(*p, r);
+
+ p->restore();
+ }
+@@ -1454,7 +1496,7 @@
+ else
+ {
+ tile = _helper.slab(color, 0.0);
+- tile->render(r.adjusted(2,2,-2,-2), p, tiles);
++ tile->render(r, p, tiles);
+ return;
+ }
+ tile->render(r, p, tiles);
+@@ -1522,7 +1564,7 @@
+ if(mouseOver)
+ {
+ QPixmap slabPixmap = _helper.roundSlabFocused(pal.color(QPalette::Button),_viewHoverBrush.brush(QPalette::Active).color(), 0.0);
+- p->drawPixmap(x-2, y-2, slabPixmap);
++ p->drawPixmap(x, y, slabPixmap);
+ }
+ else
+ {
+@@ -1538,11 +1580,10 @@
+ const double radius = 3.0;
+ double dx = r2.width() * 0.5 - radius;
+ double dy = r2.height() * 0.5 - radius;
+- QColor fore = pal.color(QPalette::ButtonText);
+ p->save();
+ p->setRenderHints(QPainter::Antialiasing);
+ p->setPen(Qt::NoPen);
+- p->setBrush(_helper.decoGradient(r, fore));
++ p->setBrush(_helper.decoGradient(r2.adjusted(2,2,-2,-2), pal.color(QPalette::ButtonText)));
+ p->drawEllipse(QRectF(r2).adjusted(dx, dy, -dx, -dy));
+ p->restore();
+ return;
+@@ -1570,57 +1611,45 @@
+ p->setRenderHint(QPainter::Antialiasing, false);
+ }
+
+-void OxygenStyle::renderPanel(QPainter *p,
+- const QRect &r,
+- const QPalette &pal,
+- const bool raised,
+- const bool sunken,
+- const bool focusHighlight) const
+-{
+- int x, x2, y, y2, w, h;
+- r.getRect(&x,&y,&w,&h);
+- r.getCoords(&x, &y, &x2, &y2);
+-
+- if(raised) {
+- QColor dark = focusHighlight ?
+- getColor(pal,FocusHighlight).dark(130) : getColor(pal, PanelDark);
+- QColor light = focusHighlight ?
+- getColor(pal,FocusHighlight).light(130) : getColor(pal, PanelLight);
+- if (sunken) {
+- p->setPen(dark);
+- } else {
+- p->setPen(light);
+- }
+- p->drawLine(r.left()+2, r.top()+1, r.right()-2, r.top()+1);
+- p->drawLine(r.left()+1, r.top()+2, r.left()+1, r.bottom()-2);
+- if (sunken) {
+- p->setPen(light);
+- } else {
+- p->setPen(dark);
+- }
+- p->drawLine(r.left()+2, r.bottom()-1, r.right()-2, r.bottom()-1);
+- p->drawLine(r.right()-1, r.top()+2, r.right()-1, r.bottom()-2);
+- }
+-}
+-
+-
+ void OxygenStyle::renderTab(QPainter *p,
+ const QRect &r,
+ const QPalette &pal,
+ bool mouseOver,
+ const bool selected,
+ const bool bottom,
+- const QStyleOptionTab::TabPosition pos,
+- const bool triangular,
+- const bool cornerWidget,
++ const QStyleOptionTabV2 *tabOpt,
+ const bool reverseLayout) const
+ {
++ const QStyleOptionTab::TabPosition pos = tabOpt->position;
++ const bool leftCornerWidget = reverseLayout ?
++ (tabOpt->cornerWidgets&QStyleOptionTab::RightCornerWidget) :
++ (tabOpt->cornerWidgets&QStyleOptionTab::LeftCornerWidget);
++ const bool rightCornerWidget = reverseLayout ?
++ (tabOpt->cornerWidgets&QStyleOptionTab::LeftCornerWidget) :
++ (tabOpt->cornerWidgets&QStyleOptionTab::RightCornerWidget);
+ const bool isFirst = pos == QStyleOptionTab::Beginning || pos == QStyleOptionTab::OnlyOneTab/* (pos == First) || (pos == Single)*/;
+ const bool isLast = pos == QStyleOptionTab::End /*(pos == Last)*/;
+ const bool isSingle = pos == QStyleOptionTab::OnlyOneTab /*(pos == Single)*/;
++ const bool isLeftOfSelected = reverseLayout ?
++ (tabOpt->selectedPosition == QStyleOptionTab::PreviousIsSelected) :
++ (tabOpt->selectedPosition == QStyleOptionTab::NextIsSelected);
++ const bool isRightOfSelected = reverseLayout ?
++ (tabOpt->selectedPosition == QStyleOptionTab::NextIsSelected) :
++ (tabOpt->selectedPosition == QStyleOptionTab::PreviousIsSelected);
++ const bool isLeftMost = (reverseLayout ?
++ (tabOpt->position == QStyleOptionTab::End) :
++ (tabOpt->position == QStyleOptionTab::Beginning)) ||
++ tabOpt->position == QStyleOptionTab::OnlyOneTab;
++ const bool isRightMost = reverseLayout ?
++ (tabOpt->position == QStyleOptionTab::Beginning) :
++ (tabOpt->position == QStyleOptionTab::End) ||
++ tabOpt->position == QStyleOptionTab::OnlyOneTab;
++ const bool isFrameAligned = reverseLayout ?
++ (isRightMost && ! (tabOpt->cornerWidgets & QStyleOptionTab::LeftCornerWidget)) :
++ (isLeftMost && ! (tabOpt->cornerWidgets & QStyleOptionTab::LeftCornerWidget));
+
+ // the tab part of the tab - ie subtracted the fairing to the frame
+- QRect Rc = bottom ? r.adjusted(0,9,0,0) : r.adjusted(0,0,0,-9);
++ QRect Rc = bottom ? r.adjusted(0,6,0,0) : r.adjusted(0,0,0,-7);
+
+ // the area where the fairing should appear
+ const QRect Rb(r.x(), bottom?r.top():Rc.bottom()+1, r.width(), r.height()-Rc.height() );
+@@ -1628,50 +1657,83 @@
+ // FIXME - maybe going to redo tabs, also are broken ATM
+ if (selected) {
+ if(bottom)
+- renderSlab(p, Rc.adjusted(0,-9,0,0), pal.color(QPalette::Window), NoFill, TileSet::Bottom | TileSet::Left | TileSet::Right);
++ renderSlab(p, Rc.adjusted(0,-7,0,0), pal.color(QPalette::Window), NoFill, TileSet::Bottom | TileSet::Left | TileSet::Right);
+ else
+- renderSlab(p, Rc.adjusted(0,0,0,9), pal.color(QPalette::Window), NoFill, TileSet::Top | TileSet::Left | TileSet::Right);
++ renderSlab(p, Rc.adjusted(0,0,0,7), pal.color(QPalette::Window), NoFill, TileSet::Top | TileSet::Left | TileSet::Right);
+
+ // some "position specific" paintings...
+ // First draw the left connection from the panel border to the tab
+- if(isFirst && !reverseLayout && !cornerWidget) {
+- renderSlab(p, Rb.adjusted(0,-9,0,9), pal.color(QPalette::Window), NoFill, TileSet::Left);
++ if(isFirst && !reverseLayout && !leftCornerWidget) {
++ renderSlab(p, Rb.adjusted(0,-7,0,7), pal.color(QPalette::Window), NoFill, TileSet::Left);
+ } else {
+ // renderHole(p, QRect(Rb.left(), Rb.top(),4,5), false, false, TileSet::Right | TileSet::Bottom);
+ TileSet *tile = _helper.slabInverted(pal.color(QPalette::Window), 0.0);
+ if(bottom)
+- tile->render(QRect(Rb.left()-7, Rb.top()-1,16,17), p, TileSet::Right | TileSet::Top);
++ tile->render(QRect(Rb.left()-5, Rb.top()-1,12,13), p, TileSet::Right | TileSet::Top);
+ else
+- tile->render(QRect(Rb.left()-7, Rb.top()-7,16,16), p, TileSet::Right | TileSet::Bottom);
++ tile->render(QRect(Rb.left()-5, Rb.top()-5,12,12), p, TileSet::Right | TileSet::Bottom);
+ }
+
+ // Now draw the right connection from the panel border to the tab
+- if(isFirst && reverseLayout && !cornerWidget) {
+- renderSlab(p, Rb.adjusted(0,-9,0,9), pal.color(QPalette::Window), NoFill, TileSet::Right);
++ if(isFirst && reverseLayout && !rightCornerWidget) {
++ renderSlab(p, Rb.adjusted(0,-7,0,7), pal.color(QPalette::Window), NoFill, TileSet::Right);
+ } else {
+ TileSet *tile = _helper.slabInverted(pal.color(QPalette::Window), 0.0);
+ //renderHole(p, QRect(Rb.right()-3, Rb.top(),3,5), false, false, TileSet::Left | TileSet::Bottom);
+ if(bottom)
+- tile->render(QRect(Rb.right()-8, Rb.top()-1,16,17), p, TileSet::Left | TileSet::Top);
++ tile->render(QRect(Rb.right()-6, Rb.top()-1,12,13), p, TileSet::Left | TileSet::Top);
+ else
+- tile->render(QRect(Rb.right()-8, Rb.top()-7,16,16), p, TileSet::Left | TileSet::Bottom);
++ tile->render(QRect(Rb.right()-6, Rb.top()-5,12,12), p, TileSet::Left | TileSet::Bottom);
+ }
+ } else {
+ // inactive tabs
++ int x,y,w,h;
++ r.adjusted(0,4,0,0).getRect(&x, &y, &w, &h);
++ p->setPen(QColor(0,0,0, 30));
++ if (!bottom) {
++ if(isLeftMost) {
++ p->drawArc(QRectF(x+2.5, y+0.5, 9.5, 9.5),90*16, 90*16);
++ if(isFrameAligned)
++ p->drawLine(QPointF(x+2.5, y+6.3), QPointF(x+2.5, y+h-0.5));
++ else
++ p->drawLine(QPointF(x+0.5, y+6.3), QPointF(x+0.5, y+h-6.3));
++ p->drawLine(QPointF(x+8.8, y+0.5), QPointF(x+w+2.5, y+0.5));
++ if(!isLeftOfSelected)
++ p->drawLine(QPointF(x+w-0.5, y+1.5), QPointF(x+w-0.5, y+h-6.3));
++ p->fillRect(x-0.5, y+1.5, w-1 , h-5,QColor(0,0,0,10));
++ } else if(isRightMost) {
++ p->drawArc(QRectF(x+w-9.5-2.5, y+0.5, 9.5, 9.5), 0, 90*16);
++ if(isFrameAligned)
++ p->drawLine(QPointF(x+w-2.5, y+6.3), QPointF(x+w-2.5, y+h+0.5));
++ else
++ p->drawLine(QPointF(x+w-2.5, y+6.3), QPointF(x+w-2.5, y+h-6.3));
++ p->drawLine(QPointF(isRightOfSelected ? x -0.5 : x+3.5+1, y+0.5), QPointF(x+w-8.8, y+0.5));
++ p->fillRect(x-0.5, y+1.5, w-1 , h-5,QColor(0,0,0,10));
++ } else {
++ p->drawLine(QPointF(isRightOfSelected ? x -0.5 : x+3.5+1, y+0.5), QPointF(x+w+2.5, y+0.5));
++ if(!isLeftOfSelected)
++ p->drawLine(QPointF(x+w-0.5, y+1.5), QPointF(x+w-0.5, y+h-6.3));
++ p->fillRect(x-0.5, y+1.5, w-1 , h-5,QColor(0,0,0,10));
++ }
++ }
+ TileSet::Tiles posFlag = bottom?TileSet::Bottom:TileSet::Top;
+- QRect Ractual(Rb.left(), Rb.y(), Rb.width(), 8);
++ QRect Ractual(Rb.left(), Rb.y(), Rb.width(), 6);
+
+- if(isFirst && !reverseLayout && !cornerWidget)
++ if(isLeftMost && isFrameAligned)
+ posFlag |= TileSet::Left;
+ else
+- Ractual.adjust(-8,0,0,0); //9 minus one because we have 1px overlap
++ Ractual.adjust(-6,0,0,0); //7 minus one because we have 1px overlap
+
+- if(isFirst && reverseLayout && !cornerWidget)
++ if(isRightMost && isFrameAligned)
+ posFlag |= TileSet::Right;
+ else
+- Ractual.adjust(0,0,8,0); //9 minus one because we have 1px overlap
++ Ractual.adjust(0,0,6,0); //7 minus one because we have 1px overlap
++
++ if (mouseOver)
++ renderSlab(p, Ractual, pal.color(QPalette::Window), NoFill| Hover, posFlag);
++ else
++ renderSlab(p, Ractual, pal.color(QPalette::Window), NoFill, posFlag);
+
+- renderSlab(p, Ractual, pal.color(QPalette::Window), NoFill, posFlag);
+ // TODO mouseover effects
+ }
+ }
+@@ -1694,6 +1756,27 @@
+ }
+ }
+
++int OxygenStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWidget *widget) const
++{
++ switch(m) {
++ case PM_DefaultTopLevelMargin:
++ return 11;
++
++ case PM_DefaultChildMargin:
++ return 4; // qcommon is 9;
++
++ case PM_DefaultLayoutSpacing:
++ return 4; // qcommon is 6
++
++ case PM_DefaultFrameWidth:
++ if (qobject_cast<const QLineEdit*>(widget))
++ return 5;
++ //else fall through
++ default:
++ return KStyle::pixelMetric(m,opt,widget);
++ }
++}
++
+ QRect OxygenStyle::subControlRect(ComplexControl control, const QStyleOptionComplex* option,
+ SubControl subControl, const QWidget* widget) const
+ {
+@@ -1708,20 +1791,17 @@
+ return r;
+
+ case SC_GroupBoxLabel:
+- return r.adjusted(0,8,0,0);
+-
+- default:
+- break;
+- }
++ {
++ if (const QStyleOptionGroupBox *gbOpt = qstyleoption_cast<const QStyleOptionGroupBox *>(option)) {
++ QFontMetrics fontMetrics = gbOpt->fontMetrics;
++ int h = fontMetrics.height();
++ int tw = fontMetrics.size(Qt::TextShowMnemonic, gbOpt->text + QLatin1Char(' ')).width();
++ r.setHeight(h);
++ r.moveTop(8);
+
+- case CC_ComboBox:
+- switch (subControl)
+- {
+- case SC_ComboBoxEditField:
+- if (const QStyleOptionComboBox *cb = qstyleoption_cast<const QStyleOptionComboBox *>(option))
+- if(!cb->editable)
+- return KStyle::subControlRect(control, option, subControl, widget).adjusted(3,0,0,0);
+- break;
++ return alignedRect(gbOpt->direction, Qt::AlignHCenter, QSize(tw, h), r);
++ }
++ }
+
+ default:
+ break;
+@@ -1815,25 +1895,6 @@
+ }
+ }
+
+-QSize OxygenStyle::sizeFromContents ( ContentsType ct, const QStyleOption * option, const QSize & contentsSize, const QWidget * widget ) const
+-{
+- switch ( ct ) {
+- case CT_ComboBox:
+- if (const QStyleOptionComboBox *cb = qstyleoption_cast<const QStyleOptionComboBox *>(option)) {
+- int margin = cb->frame ? 6 : 0;
+- int hgt = contentsSize.height() + 2*margin - (cb->editable ? 7 : 0);
+- return QSize(contentsSize.width(), hgt);
+- }
+- else
+- return KStyle::sizeFromContents( ct, option, contentsSize, widget );
+- break;
+-
+- default:
+- return KStyle::sizeFromContents( ct, option, contentsSize, widget );
+- }
+-}
+-
+-
+ QIcon OxygenStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option,
+ const QWidget *widget) const
+ {
+@@ -1860,7 +1921,9 @@
+ lg.setColorAt(0.45, QColor(0,0,0,150));
+ lg.setColorAt(0.80, QColor(0,0,0,80));
+ painter.setPen(QPen(lg,2));
+- painter.drawLine(6,9,12,9);
++ painter.setBrush(lg);
++ QPoint points[4] = {QPoint(9, 6), QPoint(12, 9), QPoint(9, 12), QPoint(6, 9)};
++ painter.drawPolygon(points, 4);
+
+ return QIcon(pm);
+ }
+--- a/runtime/kstyles/highcontrast/highcontrast.themerc
++++ b/runtime/kstyles/highcontrast/highcontrast.themerc
+@@ -4,6 +4,7 @@
+ Name[bg]=High Contrast
+ Name[de]=Hoher Kontrast
+ Name[el]=Υψηλή αντίθεση
++Name[et]=Suur kontrast
+ Name[fa]=سایه روشن بالا
+ Name[ga]=Ardchodarsnacht
+ Name[it]=AltoContrasto
+@@ -28,10 +29,11 @@
+ Comment[bg]=Стил за работа с високо контрастни схеми
+ Comment[de]=Ein Design für Farbschemata mit hohem Kontrast
+ Comment[el]=Ένα στυλ που δουλεύει καλά με σχήματα υψηλής αντίθεσης
++Comment[et]=Stiil, mis paistab silma suure kontrastiga värviskeemide korral
+ Comment[it]=Uno stile che funziona bene con schemi di colori ad alto contrasto
+ Comment[ja]=高コントラストの色スキームにふさわしいスタイル
+ Comment[kk]=Түстер контрастығы жоғары сұлбалармен істейтін стилі
+-Comment[km]=រចនាប័ទ្មដែលដំណើរការយ៉ាងល្អជាមួយកម្រិតពណ៌ចម្រុះខ្ពស់
++Comment[km]=រចនាប័ទ្មដែលដំណើរការយ៉ាងល្អជាមួយកម្រិតពណ៌ចម្រុះខ្ពស់
+ Comment[ko]=고대비 색상 배열과 잘 어울리는 스타일
+ Comment[lt]=Stilius, kuris labai tinka didelio kontrasto spalvų schemoms
+ Comment[nb]=En stil som fungerer fint med fargeskjemaer med høy kontrast
+--- a/runtime/kstyles/web/web.themerc
++++ b/runtime/kstyles/web/web.themerc
+@@ -4,6 +4,7 @@
+ Name[bg]=Уеб стил
+ Name[de]=Web-Design
+ Name[el]=Στυλ Web
++Name[et]=Veebistiil
+ Name[fa]=سبک وب
+ Name[ga]=Stíl Ghréasáin
+ Name[it]=Stile Web
+@@ -26,6 +27,7 @@
+ Comment[be]=Стыль Сеціва
+ Comment[bg]=Стил "уеб"
+ Comment[el]=Στυλ Web
++Comment[et]=Veebividinastiil
+ Comment[fa]=سبک عنصر وب
+ Comment[it]=Stile per widget Web
+ Comment[ja]=ウェブウィジェットスタイル
+--- a/runtime/kurifilter-plugins/shorturi/kshorturifilter.desktop
++++ b/runtime/kurifilter-plugins/shorturi/kshorturifilter.desktop
+@@ -12,7 +12,7 @@
+ Name[el]=Φίλτρο σύντομων URI
+ Name[eo]=Mallonga URI-filtrilo
+ Name[es]=Filtro de URIs cortas
+-Name[et]=Lühikeste URLide filter
++Name[et]=Lühi-URL-ide filter
+ Name[eu]=URL laburren iragazkia
+ Name[fr]=Filtres d'URL courtes
+ Name[hr]=Filtar kratkih URI-a
+--- a/runtime/kurifilter-plugins/localdomain/localdomainurifilter.cpp
++++ b/runtime/kurifilter-plugins/localdomain/localdomainurifilter.cpp
+@@ -20,7 +20,7 @@
+
+ #include "localdomainurifilter.h"
+
+-#include <k3process.h>
++#include <KProcess>
+ #include <kstandarddirs.h>
+ #include <kdebug.h>
+
+@@ -80,32 +80,26 @@
+ if( helper.isEmpty())
+ return last_result = false;
+
+- m_fullname.clear();
+-
+- K3Process proc;
++ KProcess proc;
+ proc << helper << host;
+- connect( &proc, SIGNAL(receivedStdout(K3Process *, char *, int)),
+- SLOT(receiveOutput(K3Process *, char *, int)) );
+- if( !proc.start( K3Process::NotifyOnExit, K3Process::Stdout ))
++ proc.start();
++ if( !proc.waitForStarted( 1000 ) )
+ return last_result = false;
+
+ last_host = host;
+ last_time = time( (time_t *)0 );
+
+- last_result = proc.wait( 1 ) && proc.normalExit() && !proc.exitStatus();
++ last_result = proc.waitForFinished( 1000 );
++
++ QString fullname = QFile::decodeName( proc.readAllStandardOutput() );
+
+- if( !m_fullname.isEmpty() )
+- cmd.replace( 0, host.length(), m_fullname );
++ if( !fullname.isEmpty() )
++ cmd.replace( 0, host.length(), fullname );
+ }
+
+ return last_result;
+ }
+
+-void LocalDomainUriFilter::receiveOutput( K3Process *, char *buf, int )
+-{
+- m_fullname = QFile::decodeName( buf );
+-}
+-
+ void LocalDomainUriFilter::configure()
+ {
+ // nothing
+--- a/runtime/kurifilter-plugins/localdomain/CMakeLists.txt
++++ b/runtime/kurifilter-plugins/localdomain/CMakeLists.txt
+@@ -1,32 +1,22 @@
+-
+-
+-
+-########### next target ###############
+-
+ set(localdomainurifilter_PART_SRCS localdomainurifilter.cpp )
+
+-
+ kde4_add_plugin(localdomainurifilter WITH_PREFIX ${localdomainurifilter_PART_SRCS})
+
++target_link_libraries(localdomainurifilter ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
+
+-target_link_libraries(localdomainurifilter ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY})
+-
+-install(TARGETS localdomainurifilter DESTINATION ${PLUGIN_INSTALL_DIR} )
++install(TARGETS localdomainurifilter DESTINATION ${PLUGIN_INSTALL_DIR})
+
+
+ ########### next target ###############
+
+-set(klocaldomainurifilterhelper_SRCS klocaldomainurifilterhelper.c )
+-
++set(klocaldomainurifilterhelper_SRCS klocaldomainurifilterhelper.c)
+
+ kde4_add_executable(klocaldomainurifilterhelper NOGUI ${klocaldomainurifilterhelper_SRCS})
+
+-target_link_libraries(klocaldomainurifilterhelper ${KDE4_KDECORE_LIBS} )
++target_link_libraries(klocaldomainurifilterhelper ${KDE4_KDECORE_LIBS})
+
+ install(TARGETS klocaldomainurifilterhelper DESTINATION ${BIN_INSTALL_DIR})
+
+-
+ ########### install files ###############
+
+-install( FILES localdomainurifilter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+-
++install(FILES localdomainurifilter.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+--- a/runtime/kurifilter-plugins/localdomain/localdomainurifilter.h
++++ b/runtime/kurifilter-plugins/localdomain/localdomainurifilter.h
+@@ -27,8 +27,6 @@
+ #include <kurifilter.h>
+ #include <QRegExp>
+
+-class K3Process;
+-
+ /*
+ This filter takes care of hostnames in the local search domain.
+ If you're in domain domain.org which has a host intranet.domain.org
+@@ -52,11 +50,7 @@
+ mutable QString last_host;
+ mutable bool last_result;
+ mutable time_t last_time;
+- mutable QString m_fullname;
+ QRegExp m_hostPortPattern;
+-
+- private Q_SLOTS:
+- void receiveOutput( K3Process *, char *, int );
+ };
+
+ #endif
+--- a/runtime/kurifilter-plugins/fixhost/CMakeLists.txt
++++ b/runtime/kurifilter-plugins/fixhost/CMakeLists.txt
+@@ -1,18 +1,12 @@
+-
+-########### next target ###############
+-
+ set(fixhosturifilter_PART_SRCS fixhosturifilter.cpp )
+
+-
+ kde4_add_plugin(fixhosturifilter WITH_PREFIX ${fixhosturifilter_PART_SRCS})
+
++target_link_libraries(fixhosturifilter ${KDE4_KIO_LIBS})
+
+-target_link_libraries(fixhosturifilter ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY})
+-
+-install(TARGETS fixhosturifilter DESTINATION ${PLUGIN_INSTALL_DIR} )
+-
++install(TARGETS fixhosturifilter DESTINATION ${PLUGIN_INSTALL_DIR})
+
+ ########### install files ###############
+
+-install( FILES fixhosturifilter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
++install(FILES fixhosturifilter.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/bugft.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/bugft.desktop
+@@ -28,7 +28,7 @@
+ Name[ja]=KDE バグデータベース全文検索
+ Name[ka]=KDE–ს შეცდომების ძებნა სრული ტექსტით
+ Name[kk]=KDE қателер дерек қорында толық мәтінді іздеу
+-Name[km]=ការស្វែងរកអត្ថបទពេញលេញមូលដ្ឋានទិន្នន័យកំហុសរបស់ KDE
++Name[km]=ការស្វែងរកអត្ថបទពេញលេញនៃមូលដ្ឋានទិន្នន័យកំហុសរបស់ KDE
+ Name[ko]=KDE 버그 데이터베이스 전체 텍스트 검색
+ Name[lv]=KDE Kļūdu Datubāzes pilnteksta meklēšana
+ Name[mk]=База на податоци со бубачки од KDE, пребарување по цел текст
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/tvtome.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/tvtome.desktop
+@@ -17,7 +17,6 @@
+ ServiceTypes=SearchProvider
+ Query=http://www.tv.com/search.php?type=11&stype=all&qs=\\{@}&x=0&y=0
+ Query[bg]=Query=http://www.tv.com/search.php?type=11&stype=all&qs=\\{@}&x=0&y=0
+-Query[ja]=http://www.tv.com/search.php?type=11&stype=all&qs=\\\\{@}&x=0&y=0
+ Query[ne]=http://www.tv.com/search.php?type=11stype=all&qs=\\{@}&x=0&y=0
+ Query[tg]=http://www.tv.com/search.php?type=11&stype=ҳама&qs=\\{@}&x=0&y=0
+ Query[x-test]=xxhttp://www.tv.com/search.php?type=11&stype=all&qs=\\{@}&x=0&y=0xx
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/it2en.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/it2en.desktop
+@@ -29,7 +29,7 @@
+ Name[it]=Traduzione WordReference.com: dall'italiano all'inglese
+ Name[ja]=WordReference.com イタリア語-英語翻訳
+ Name[kk]=WordReference.com итальян тілінен ағылшынға аудару
+-Name[km]=ការបកប្រែ WordReference.com ៖ អ៊ីតាលីទៅអង់គ្លេស
++Name[km]=ការបកប្រែ WordReference.com ៖ ភាសាអ៊ីតាលីទៅជាអង់គ្លេស
+ Name[ko]=WordReference.com 번역: 이탈리아어에서 영어로
+ Name[lt]=WordReference.com vertimas: iš italų į anglų
+ Name[lv]=WordReference.com Tulkošana: no Itāļu uz Angļu
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/excite.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/excite.desktop
+@@ -4,6 +4,7 @@
+ Name=Excite
+ Name[csb]=Excite - szëkôrz starnów WWW
+ Name[eo]=Ekscito
++Name[km]=ជម្រុញ
+ Name[ne]=उत्तेजना
+ Name[pa]=ਐਕਸਾਟੀ
+ Name[pl]=Excite - wyszukiwarka stron WWW
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/python.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/python.desktop
+@@ -62,5 +62,7 @@
+ Name[zh_CN]=Python 参考手册
+ Name[zh_TW]=Python 參考手冊
+ Query=http://www.google.com/search?sourceid=python-search&q=\\{@}&submit=Search&q=site%3Apython.org
++Query[nb]=http://www.google.no/search?sourceid=python-search&q=\\{@}&submit=Search&q=site%3Apython.org
++Query[nl]=http://www.google.nl/search?sourceid=python-search&q=\\{@}&submit=Search&q=site%3Apython.org
+ ServiceTypes=SearchProvider
+ Type=Service
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/cia.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/cia.desktop
+@@ -9,7 +9,7 @@
+ Name[el]=Παγκόσμιο βιβλίο γεγονότων της CIA
+ Name[he]=ספר העובדות העולמי של ה־CIA
+ Name[it]=World Fact Book della CIA
+-Name[km]=សៀវភៅហេតុការណ៍ពិភពលោកពិតរបស់ CIA
++Name[km]=សៀវភៅហេតុការណ៍ពិតនៃពិភពលោក CIA
+ Name[ko]=CIA 월드 팩트 북
+ Name[nds]=CIA-Weltfaktenbook
+ Name[ne]=CIA विश्व यथार्थता पुस्तक
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/appsy.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/appsy.desktop
+@@ -29,7 +29,7 @@
+ Name[ja]=KDE アプリケーション検索
+ Name[ka]=KDE–ს პროგრამების ძებნა
+ Name[kk]=KDE қолданбаларын табу
+-Name[km]=ស្វែងរកកម្មវិធីរបស់ KDE
++Name[km]=ការស្វែងរកកម្មវិធីរបស់ KDE
+ Name[ko]=KDE 프로그램 검색
+ Name[lt]=KDE programų paieška
+ Name[lv]=KDE programmu meklēšana
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/en2de.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/en2de.desktop
+@@ -29,7 +29,7 @@
+ Name[ja]=dict.cc 英語-ドイツ語翻訳
+ Name[ka]=dict.cc თარგმნა: ინგლისურ-გერმანული
+ Name[kk]=dict.cc аудармашы: ағылшын тілінен немісшеге
+-Name[km]=ការបកប្រែ dict.cc ៖ អង់គ្លេសទៅអាល្លឺម៉ង់
++Name[km]=ការបកប្រែ dict.cc ៖ ភាសាអង់គ្លេសទៅជាអាល្លឺម៉ង់
+ Name[ko]=dict.cc 번역: 영어에서 독일어로
+ Name[lt]=dict.cc vertimas: iš anglų į vokiečių
+ Name[lv]=dict.cc Tulkošana: no Angļu uz Vācu
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/technorati.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/technorati.desktop
+@@ -11,7 +11,6 @@
+ Keys=tr,technorati
+ Query=http://technorati.com/cosmos/search.html?sourceid=kde-search&url=\\{@}
+ Query[bg]=Query=http://technorati.com/cosmos/search.html?sourceid=kde-search&url=\\{@}
+-Query[ja]=http://technorati.com/cosmos/search.html?sourceid=kde-search&url=\\\\{@}
+ Query[ne]=http://technorati.com/cosmos/search.html?sourceid=kde-searchurl=\\{@}
+ Query[x-test]=xxhttp://technorati.com/cosmos/search.html?sourceid=kde-search&url=\\{@}xx
+ Charset=utf8
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/google_movie.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/google_movie.desktop
+@@ -27,7 +27,7 @@
+ Name[it]=Google filmati
+ Name[ka]=Google ფილმები
+ Name[kk]=Google фильмдер
+-Name[km]=ភាពយន្តតាមហ្គូហ្គល
++Name[km]=ភាពយន្តតាមហ្គូហ្គល
+ Name[ko]=Google 영화
+ Name[lt]=Google filmai
+ Name[mk]=Google - филмови
+@@ -59,4 +59,6 @@
+ ServiceTypes=SearchProvider
+ Keys=ggmovie
+ Query=http://www.google.com/search?q=movie:\\{@}&ie=UTF-8&oe=UTF-8
++Query[nb]=http://www.google.no/search?q=movie:\\{@}&ie=UTF-8&oe=UTF-8
++Query[nl]=http://www.google.nl/search?q=movie:\\{@}&ie=UTF-8&oe=UTF-8
+ Charset=utf8
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/es2en.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/es2en.desktop
+@@ -29,7 +29,7 @@
+ Name[it]=Traduzione WordReference.com: dallo spagnolo all'inglese
+ Name[ja]=WordReference.com スペイン語-英語翻訳
+ Name[kk]=WordReference.com испан тілінен ағылшынға аудару
+-Name[km]=ការបកប្រែ WordReference.com ៖ អេស្ប៉ាញទៅអង់គ្លេស
++Name[km]=ការបកប្រែ WordReference.com ៖ ភាសាអេស្ប៉ាញទៅជាអង់គ្លេស
+ Name[ko]=WordReference.com 번역: 스페인어에서 영어로
+ Name[lt]=WordReference.com vertimas: iš ispanų į anglų
+ Name[lv]=WordReference.com Tulkošana: no Spāņu uz Angļu
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/wiktionary.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/wiktionary.desktop
+@@ -63,4 +63,7 @@
+ ServiceTypes=SearchProvider
+ Keys=wt,wikt
+ Query=http://en.wiktionary.org/wiki/Special:Search?search=\\{@}&go=Go
++Query[nb]=http://no.wiktionary.org/wiki/Special:Search?search=\\{@}&go=Go
++Query[nl]=http://nl.wiktionary.org/wiki/Special:Search?search=\\{@}&go=Go
++Query[sv]=http://sv.wiktionary.org/wiki/Special:Search?search=\{@}&go=Go
+ Charset=utf8
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/google_advanced.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/google_advanced.desktop
+@@ -67,6 +67,7 @@
+ Name[zh_CN]=Google 高级搜索
+ Name[zh_TW]=Google 進階搜尋
+ Query=http://www.google.com/search?as_q=\\{all,@}&num=\\{num,"10"}&btnG=Google+Search&as_epq=\\{exact,""}&as_oq=\\{any,""}&as_eq=\\{without,""}&lr=\\{lang,""}&as_ft=\\{ft,"i"}&as_filetype=\\{filetype,""}&as_qdr=\\{date,"all"}&as_occt=\\{occ,"any"}&as_dt=\\{siteop,"i"}&as_sitesearch=\\{site}&safe=\\{safe,"active"}&ie=UTF-8&oe=UTF-8
++Query[nl]=http://www.google.nl/search?as_q=\\{all,@}&num=\\{num,"10"}&btnG=Google+Search&as_epq=\\{exact,""}&as_oq=\\{any,""}&as_eq=\\{without,""}&lr=\\{lang,""}&as_ft=\\{ft,"i"}&as_filetype=\\{filetype,""}&as_qdr=\\{date,"all"}&as_occt=\\{occ,"any"}&as_dt=\\{siteop,"i"}&as_sitesearch=\\{site}&safe=\\{safe,"active"}&ie=UTF-8&oe=UTF-8
+ Charset=utf8
+ ServiceTypes=SearchProvider
+ Type=Service
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/fr2en.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/fr2en.desktop
+@@ -29,7 +29,7 @@
+ Name[it]=Traduzione WordReference.com: dal francese all'inglese
+ Name[ja]=WordReference.com フランス語-英語翻訳
+ Name[kk]=WordReference.com француз тілінен ағылшынға аудару
+-Name[km]=ការបកប្រែ WordReference.com ៖ បារាំងទៅអង់គ្លេស
++Name[km]=ការបកប្រែ WordReference.com ៖ ភាសាបារាំងទៅជាអង់គ្លេស
+ Name[ko]=WordReference.com 번역: 프랑스어에서 영어로
+ Name[lt]=WordReference.com vertimas: iš prancūzų į anglų
+ Name[lv]=WordReference.com Tulkošana: no Franču uz Angļu
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/en2es.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/en2es.desktop
+@@ -29,7 +29,7 @@
+ Name[it]=Traduzione WordReference.com: dall'inglese allo spagnolo
+ Name[ja]=WordReference.com 英語-スペイン語翻訳
+ Name[kk]=WordReference.com ағылшын тілінен испаншаға аудару
+-Name[km]=ការបកប្រែ WordReference.com ៖ អង់គ្លេសទៅអេស្ប៉ាញ
++Name[km]=ការបកប្រែ WordReference.com ៖ ភាសាអង់គ្លេសទៅជាអេស្ប៉ាញ
+ Name[ko]=WordReference.com 번역: 영어에서 스페인어로
+ Name[lt]=WordReference.com vertimas: iš anglų į ispanų
+ Name[lv]=WordReference.com Tulkošana: no Angļu uz Spāņu
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/en2it.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/en2it.desktop
+@@ -29,7 +29,7 @@
+ Name[it]=Traduzione WordReference.com: dall'inglese all'italiano
+ Name[ja]=WordReference.com 英語-イタリア語翻訳
+ Name[kk]=WordReference.com ағылшын тілінен итальяншаға аудару
+-Name[km]=ការបកប្រែ WordReference.com ៖ អង់គ្លេសទៅអ៊ីតាលី
++Name[km]=ការបកប្រែ WordReference.com ៖ ភាសាអង់គ្លេសទៅជាអ៊ីតាលី
+ Name[ko]=WordReference.com 번역: 영어에서 이탈리아어로
+ Name[lt]=WordReference.com vertimas: iš anglų į italų
+ Name[lv]=WordReference.com Tulkošana: no Angļu uz Itāļu
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/kde_websvn.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/kde_websvn.desktop
+@@ -29,7 +29,6 @@
+ Keys=websvn,kdesvn,ksvn,kvs
+ Query=http://websvn.kde.org/\\{@}
+ Query[bg]=Query=http://websvn.kde.org/\\{@}
+-Query[ja]=http://webcvs.kde.org/\\{@}
+ Query[se]=http://webcvs.kde.org/\\{@}
+ Query[x-test]=xxhttp://websvn.kde.org/\\{@}xx
+
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/de2en.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/de2en.desktop
+@@ -27,7 +27,7 @@
+ Name[it]=Traduzioni dict.cc: dal tedesco all'inglese
+ Name[ja]=dict.cc ドイツ語-英語翻訳
+ Name[kk]=dict.cc аудармашы: неміс тілінен ағылшынға
+-Name[km]=ការបកប្រែ dict.cc ៖ អាល្លឺម៉ង់ទៅជាអង់គ្លេស
++Name[km]=ការបកប្រែ dict.cc ៖ ភាសាអាល្លឺម៉ង់ទៅជាអង់គ្លេស
+ Name[ko]=dict.cc 번역: 독일어에서 영어로
+ Name[lt]=dict.cc vertimas: iš vokiečių į anglų
+ Name[lv]=dict.cc Tulkošana: no Vācu uz Angļu
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/dmoz.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/dmoz.desktop
+@@ -17,7 +17,7 @@
+ Name[he]=המדריך הפתוח
+ Name[ka]=ღია კატალოგები
+ Name[kk]=Ашық каталог
+-Name[km]=ថតបើកចំហ
++Name[km]=បើកថត
+ Name[mk]=Отворен директориум
+ Name[ne]=डाइरेक्टरी खोल्नुहोस्
+ Name[pa]=ਖੁੱਲੀ ਡਾਇਰੈਕਟਰੀ
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/en2fr.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/en2fr.desktop
+@@ -29,7 +29,7 @@
+ Name[it]=Traduzione WordReference.com: dall'inglese al francese
+ Name[ja]=WordReference.com 英語-フランス語翻訳
+ Name[kk]=WordReference.com ағылшын тілінен французшаға аудару
+-Name[km]=ការបកប្រែ WordReference.com ៖ អង់គ្លេសទៅបារាំង
++Name[km]=ការបកប្រែ WordReference.com ៖ ភាសាអង់គ្លេសទៅជាបារាំង
+ Name[ko]=WordReference.com 번역: 영어에서 프랑스어로
+ Name[lt]=WordReference.com vertimas: iš anglų į prancūzų
+ Name[lv]=WordReference.com Tulkošana: no Angļu uz Franču
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/leo.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/leo.desktop
+@@ -16,6 +16,7 @@
+ Name[hr]=LEO-Prijevod
+ Name[is]=LEO-þýðandi
+ Name[kk]=LEO-аудару
++Name[km]=LEO-បកប្រែ
+ Name[ko]=LEO-번역
+ Name[lv]=LEO-Tulkot
+ Name[mk]=LEO - превод
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/technoratitags.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/technoratitags.desktop
+@@ -51,7 +51,6 @@
+ Keys=tags,tag,technoratitags
+ Query=http://technorati.com/tag/\\{@}?sourceid=kde-search
+ Query[bg]=Query=http://technorati.com/tag/\\{@}?sourceid=kde-search
+-Query[ja]=http://technorati.com/tag/\\\\{@}?sourceid=kde-search
+ Query[tg]=http://technorati.com/tag/\\{@}?sourceid=kde-ҷустуҷӯ
+ Query[x-test]=xxhttp://technorati.com/tag/\\{@}?sourceid=kde-searchxx
+ Charset=utf8
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/cpan.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/cpan.desktop
+@@ -16,7 +16,6 @@
+ Name[gl]=CPAN - Colección de Materiais Acerca de Perl
+ Name[hr]=CPAN - Perl mreža sveobuhvatne arhive
+ Name[kk]=CPAN - Perl скрипттер архив желісі
+-Name[km]=CPAN - ដែលយល់អំពីបណ្តាញប័ណ្ណសាររបស់ Perl
+ Name[lt]=CPAN – Visapusiško Perlo Archyvo Tinklas
+ Name[lv]=CPAN - Visaptverošs Perl arhīvu tīkls
+ Name[mk]=CPAN - Обемна мрежа со Perl архиви
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/ctan.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/ctan.desktop
+@@ -15,7 +15,6 @@
+ Name[fr]=CTAN (Comprehensive TeX Archive Network)
+ Name[hr]=CTAN - TeX mreža sveobuhvatne arhive
+ Name[kk]=CTAN - TeX архив желісі
+-Name[km]=CTAN - ដែលយល់អំពីបណ្តាញប័ណ្ណសាររបស់ TeX
+ Name[lt]=CTAN – Visapusiško TeX Archyvo Tinklas
+ Name[lv]=CTAN - Visaptverošs TeX Arhīvu Tīkls
+ Name[mk]=CTAN - Обемна мрежа со TeX архиви
+--- a/runtime/kurifilter-plugins/ikws/searchproviders/wikipedia.desktop
++++ b/runtime/kurifilter-plugins/ikws/searchproviders/wikipedia.desktop
+@@ -21,7 +21,7 @@
+ Name[fi]=Wikipedia - Vapaa tietosanakirja
+ Name[fr]=Wikipedia - L'encyclopédie libre
+ Name[fy]=Wikipedia - de frije ensyklopedy
+-Name[ga]=Wikipedia - An Chiclipéid Shaor
++Name[ga]=Vicipéid - An Chiclipéid Shaor
+ Name[gl]=Wikipedia - A Enciclopédia Libre
+ Name[he]=ויקיפדיה - האנציקלופדיה החופשית
+ Name[hr]=Wikipedia - besplatna enciklopedija
+@@ -31,7 +31,7 @@
+ Name[ja]=Wikipedia - フリーな百科事典
+ Name[ka]=ვიკიპედია - ღია ენციკლოპედია
+ Name[kk]=Wikipedia - ашық энциклопедия
+-Name[km]=Wikipedia - សព្វវចនាធិប្បាយឥតគិតថ្លៃ
++Name[km]=Wikipedia - Encyclopedia ឥតគិតថ្លៃ
+ Name[ko]=위키백과 - 우리 모두의 백과사전
+ Name[lt]=Wikipedia - laisva enciklopedija
+ Name[lv]=Wikipedia - Brīvā enciklopēdija
+@@ -68,4 +68,7 @@
+ ServiceTypes=SearchProvider
+ Keys=wp
+ Query=http://en.wikipedia.org/wiki/Special:Search?search=\\{@}&go=Go
++Query[nb]=http://no.wikipedia.org/wiki/Special:Search?search=\\{@}&go=Go
++Query[nl]=http://nl.wikipedia.org/wiki/Special:Search?search=\\{@}&go=Go
++Query[sv]=http://sv.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
+ Charset=utf8
+--- a/runtime/soliduiserver/deviceserviceaction.cpp
++++ b/runtime/soliduiserver/deviceserviceaction.cpp
+@@ -19,10 +19,6 @@
+
+ #include "deviceserviceaction.h"
+
+-#include <QDir>
+-#include <QFile>
+-#include <QFileInfo>
+-#include <kstandarddirs.h>
+ #include <kdesktopfile.h>
+ #include <klocale.h>
+ #include <kmacroexpander.h>
+@@ -55,47 +51,35 @@
+
+ QString DeviceServiceAction::id() const
+ {
+- if (m_service.isEmpty()) {
++ if (m_service.name().isEmpty() && m_service.exec().isEmpty()) {
+ return QString();
+ } else {
+- return "#Service:"+m_service.m_strName+m_service.m_strExec;
++ return "#Service:"+m_service.name()+m_service.exec();
+ }
+ }
+
+-void DeviceServiceAction::setIconName(const QString &icon)
+-{
+- m_service.m_strIcon = icon;
+- DeviceAction::setIconName(icon);
+-}
+-
+-void DeviceServiceAction::setLabel(const QString &label)
+-{
+- m_service.m_strName = label;
+- DeviceAction::setLabel(label);
+-}
+-
+ void DeviceServiceAction::execute(Solid::Device &device)
+ {
+- QString exec = m_service.m_strExec;
++ QString exec = m_service.exec();
+ MacroExpander mx(device);
+
+ if (!mx.expandMacrosShellQuote(exec)) {
+- kWarning() << ", Syntax error:" << m_service.m_strExec ;
++ kWarning() << ", Syntax error:" << m_service.exec();
+ return;
+ }
+
+- KRun::runCommand(exec, QString(), m_service.m_strIcon, 0);
++ KRun::runCommand(exec, QString(), m_service.icon(), 0);
+ }
+
+-void DeviceServiceAction::setService(KDesktopFileActions::Service service)
++void DeviceServiceAction::setService(const KServiceAction& service)
+ {
+- DeviceAction::setIconName(service.m_strIcon);
+- DeviceAction::setLabel(service.m_strName);
++ DeviceAction::setIconName(service.icon());
++ DeviceAction::setLabel(service.text());
+
+ m_service = service;
+ }
+
+-KDesktopFileActions::Service DeviceServiceAction::service() const
++KServiceAction DeviceServiceAction::service() const
+ {
+ return m_service;
+ }
+--- a/runtime/soliduiserver/soliduiserver.cpp
++++ b/runtime/soliduiserver/soliduiserver.cpp
+@@ -71,10 +71,10 @@
+ foreach (QString desktop, desktopFiles) {
+ QString filePath = KStandardDirs::locate("data", "solid/actions/"+desktop);
+
+- QList<KDesktopFileActions::Service> services
++ QList<KServiceAction> services
+ = KDesktopFileActions::userDefinedServices(filePath, true);
+
+- foreach (KDesktopFileActions::Service service, services) {
++ foreach (KServiceAction service, services) {
+ DeviceServiceAction *action = new DeviceServiceAction();
+ action->setService(service);
+ actions << action;
+--- a/runtime/soliduiserver/deviceaction.h
++++ b/runtime/soliduiserver/deviceaction.h
+@@ -28,14 +28,16 @@
+ DeviceAction();
+ virtual ~DeviceAction();
+
+- virtual QString label() const;
+- virtual QString iconName() const;
+- virtual void setLabel(const QString &label);
+- virtual void setIconName(const QString &icon);
++ QString label() const;
++ QString iconName() const;
+
+ virtual QString id() const = 0;
+ virtual void execute(Solid::Device &device) = 0;
+
++protected:
++ void setLabel(const QString &label);
++ void setIconName(const QString &icon);
++
+ private:
+ QString m_label;
+ QString m_iconName;
+--- a/runtime/soliduiserver/deviceserviceaction.h
++++ b/runtime/soliduiserver/deviceserviceaction.h
+@@ -20,11 +20,11 @@
+ #ifndef DEVICESERVICEACTION_H
+ #define DEVICESERVICEACTION_H
+
+-#include <kmimetype.h>
+-#include <kdesktopfileactions.h>
++#include "deviceaction.h"
++
++#include <kserviceaction.h>
+ #include <solid/predicate.h>
+
+-#include "deviceaction.h"
+
+ class DeviceServiceAction : public DeviceAction
+ {
+@@ -33,14 +33,11 @@
+ virtual QString id() const;
+ virtual void execute(Solid::Device &device);
+
+- virtual void setIconName(const QString &icon);
+- virtual void setLabel(const QString &label);
+-
+- void setService(KDesktopFileActions::Service service);
+- KDesktopFileActions::Service service() const;
++ void setService(const KServiceAction& service);
++ KServiceAction service() const;
+
+ private:
+- KDesktopFileActions::Service m_service;
++ KServiceAction m_service;
+ };
+
+ #endif
+--- a/runtime/soliduiserver/soliduiserver.desktop
++++ b/runtime/soliduiserver/soliduiserver.desktop
+@@ -10,6 +10,7 @@
+ Name[de]=Solid-Benutzerschnittstellen-Dienst
+ Name[el]=Εξυπηρετητής γραφικού περιβάλλοντος Solid
+ Name[es]=Servidor de la interfaz de usuario de Solid
++Name[et]=Solidi kasutajaliidese server
+ Name[fa]=کارساز واسط کاربر Solid
+ Name[he]=שרת ממשק משתמש של Solid
+ Name[it]=Server per l'interfaccia utente di Solid
+@@ -33,6 +34,7 @@
+ Comment[de]=Ein Dienst für die Benutzerschnittstelle von Solid, der Hardwareerkennung
+ Comment[el]=Ένας εξυπηρετητής γραφικού περιβάλλοντος για το Solid, το σύστημα εντοπισμού υλικού
+ Comment[es]=Un servidor de interfaz de usuario para Solid, el sistema de detección de hardware
++Comment[et]=Riistvara tuvastamise süsteemi Solid kasutajaliidese server
+ Comment[fa]=کارساز واسط کاربری برای Solid، سیستم آشکارسازی سختافزار
+ Comment[he]=שרת ממשק משתמש ל־Solid, מערכת זיהוי החומרה
+ Comment[it]=Un'interfaccia utente per Solid, il sistema di rilevamento hardware
+--- a/runtime/soliduiserver/CMakeLists.txt
++++ b/runtime/soliduiserver/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ ########### next target ###############
+
+-set(kded_soliduiserver_PART_SRCS
++set(kded_soliduiserver_SRCS
+ soliduiserver.cpp
+ deviceactionsdialog.cpp
+ deviceaction.cpp
+@@ -8,9 +8,9 @@
+ deviceserviceaction.cpp
+ )
+
+-kde4_add_ui_files(kded_soliduiserver_PART_SRCS deviceactionsdialogview.ui)
++kde4_add_ui_files(kded_soliduiserver_SRCS deviceactionsdialogview.ui)
+
+-kde4_add_plugin(kded_soliduiserver ${kded_soliduiserver_PART_SRCS})
++kde4_add_plugin(kded_soliduiserver ${kded_soliduiserver_SRCS})
+
+
+ target_link_libraries(kded_soliduiserver ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIBS})
+--- a/runtime/l10n/cd/entry.desktop
++++ b/runtime/l10n/cd/entry.desktop
+@@ -13,7 +13,7 @@
+ Name[el]=Κονγκό, Δημοκρατία του
+ Name[eo]=Kongo, la Demokratia Respubliko de la
+ Name[es]=Congo, República democrática del
+-Name[et]=Kongo (DV)
++Name[et]=Kongo DV
+ Name[eu]=Kongoko Errepublika Demokratikoa
+ Name[fa]=جمهوری دموکراسیِِ کنگو
+ Name[fi]=Kongon demokraattinen tasavalta
+--- a/runtime/l10n/cz/entry.desktop
++++ b/runtime/l10n/cz/entry.desktop
+@@ -8,6 +8,7 @@
+ Name[de]=Tschechien
+ Name[el]=Δημοκρατία της Τσεχίας
+ Name[es]=República checa
++Name[et]=Tšehhi
+ Name[fa]=جمهوری چک
+ Name[ga]=Poblacht na Seice
+ Name[he]=צ'כיה
+--- a/runtime/l10n/me/entry.desktop
++++ b/runtime/l10n/me/entry.desktop
+@@ -11,7 +11,7 @@
+ Name[he]=מונטנגרו
+ Name[ja]=モンテネグロ
+ Name[kk]=Черногория
+-Name[km]=សែប៊ី និងម៉ុងតេណេហ្ក្រូ
++Name[km]=ម៉ុងតេណេហ្ក្រូ
+ Name[ko]=몬테네그로
+ Name[lt]=Juodkalnija
+ Name[ne]=मोन्टेनेग्रो
+--- a/runtime/knewstuff/CMakeLists.txt
++++ b/runtime/knewstuff/CMakeLists.txt
+@@ -1,21 +1,14 @@
+-
+-
+ include_directories( ${KDE4_KIO_INCLUDES} )
+
+-
+ set(khotnewstuff_SRCS khotnewstuff.cpp )
+
++kde4_add_executable(khotnewstuff4 ${khotnewstuff_SRCS})
+
+-kde4_add_executable(khotnewstuff ${khotnewstuff_SRCS})
+-
+-target_link_libraries(khotnewstuff ${KDE4_KNEWSTUFF2_LIBS})
++target_link_libraries(khotnewstuff4 ${KDE4_KNEWSTUFF2_LIBS})
+
+-install(TARGETS khotnewstuff DESTINATION ${BIN_INSTALL_DIR} )
++install(TARGETS khotnewstuff4 DESTINATION ${BIN_INSTALL_DIR} )
+
+ install( FILES khotnewstuffrc DESTINATION ${CONFIG_INSTALL_DIR} )
+
+ kde4_install_icons( ${ICON_INSTALL_DIR} )
+
+-
+-
+-
Deleted: branches/kde4/packages/kdebase/debian/patches/01_pull_r726655_r725907_r725662_r725652_r725648_r725642.diff
Modified: branches/kde4/packages/kdebase/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase/debian/patches/series 2007-10-18 21:18:28 UTC (rev 7540)
+++ branches/kde4/packages/kdebase/debian/patches/series 2007-10-18 21:35:03 UTC (rev 7541)
@@ -1 +1,2 @@
-01_pull_r726655_r725907_r725662_r725652_r725648_r725642.diff -p0
+01_kdebase_branch_r726783.diff
+
More information about the pkg-kde-commits
mailing list