SOURCES: kdebase-branch.diff - shading fixes

arekm Mon, 01 Aug 2005 23:07:38 -0700

Author: arekm                        Date: Tue Aug  2 06:06:57 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- shading fixes


---- Files affected:
SOURCES:
   kdebase-branch.diff (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SOURCES/kdebase-branch.diff
diff -u SOURCES/kdebase-branch.diff:1.14 SOURCES/kdebase-branch.diff:1.15
--- SOURCES/kdebase-branch.diff:1.14    Mon Apr 18 13:20:30 2005
+++ SOURCES/kdebase-branch.diff Tue Aug  2 08:06:51 2005
@@ -1,39962 +1,6202 @@
-diff -urN -x CVS kdebase.orig/admin/acinclude.m4.in 
kdebase/admin/acinclude.m4.in
---- kdebase.orig/admin/acinclude.m4.in 2005-02-09 23:21:09.000000000 +0100
-+++ kdebase/admin/acinclude.m4.in      2005-03-24 20:18:09.000000000 +0100
-@@ -1644,7 +1644,15 @@
- 
- AC_MSG_RESULT([$kde_cv_uic_plugins])
- if test "$kde_cv_uic_plugins" != yes; then
--      AC_MSG_ERROR([you need to install kdelibs first.])
-+      AC_MSG_ERROR([
-+you need to install kdelibs first.
+Index: kate/plugins/defaultproject/katedefaultproject.desktop
+===================================================================
+--- kate/plugins/defaultproject/katedefaultproject.desktop     
(.../tags/KDE/3.4.2/kdebase)    (revision 442272)
++++ kate/plugins/defaultproject/katedefaultproject.desktop     
(.../branches/KDE/3.4/kdebase)  (revision 442272)
+@@ -58,7 +58,7 @@
+ Name[tr]=ĂntanÄąmlÄą Kate Proje Eklentisi
+ Name[uk]=Đ˘Đ¸ĐżĐžĐ˛Đ¸Đš Đ˛ŃŃĐťĐžĐş ĐżŃĐžĐľĐşŃŃ Kate
+ Name[uz]=Kate Đ°Đ˝Đ´ĐžĐˇĐ° ĐťĐžĐšĐ¸ŇłĐ° ĐżĐťĐ°ĐłĐ¸Đ˝Đ¸
+-Name[zh_CN]=Kate éťčŽ¤éĄšçŽćäťś
++Name[zh_CN]=Kat éťčŽ¤éĄšçŽćäťś
+ Comment=Default Plugin for Projects
+ Comment[af]=Standaard Inprop Module vir Projekte
+ Comment[ar]=Ř§ŮŮŮŘŮ Ř§ŮŘ§ŮŘŞŘąŘ§ŘśŮ ŮŮŮŘ´Ř§ŘąŮŘš
+Index: kate/data/x-kate-project.desktop
+===================================================================
+--- kate/data/x-kate-project.desktop   (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kate/data/x-kate-project.desktop   (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -58,7 +58,7 @@
+ Comment[tr]=Kate Proje DosyasÄą
+ Comment[uk]=Đ¤Đ°ĐšĐť ĐżŃĐžĐľĐşŃŃ Kate
+ Comment[uz]=Kate ĐťĐžĐšĐ¸ŇłĐ° ŃĐ°ĐšĐťĐ¸
+-Comment[zh_CN]=Kate éĄšçŽćäťś
++Comment[zh_CN]=Kate éĄšçŽćäťś
+ 
+ [Property::X-KDE-NativeExtension]
+ Type=QString
+Index: kdepasswd/kcm/kcm_useraccount.desktop
+===================================================================
+--- kdepasswd/kcm/kcm_useraccount.desktop      (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kdepasswd/kcm/kcm_useraccount.desktop      (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -41,7 +41,7 @@
+ Name[nds]=Passwoort & Brukerkonto
+ Name[nl]=Wachtwoord en gebruikerbeheer
+ Name[nn]=Passord og brukarkonto
+-Name[pa]=ŕ¨ŕ¨Şŕ¨ŕŠŕ¨ŕ¨¤ŕ¨ž ŕ¨ŕ¨žŕ¨¤ŕ¨ž ŕ¨¤ŕŠ ŕ¨ŕ¨Şŕ¨ŕŠŕ¨ŕŠ 
ŕ¨ŕ¨žŕ¨¤ŕ¨ž
++Name[pa]=ŕ¨ŕŠŕ¨Şŕ¨¤-ŕ¨ŕŠŕ¨Ą ŕ¨ŕ¨¤ŕŠ ŕ¨ŕ¨Şŕ¨ŕŠŕ¨ŕŠ ŕ¨ŕ¨žŕ¨¤ŕ¨ž
+ Name[pl]=HasĹo i konto uĹźytkownika
+ Name[pt]=Senha e Conta do Utilizador
+ Name[pt_BR]=Senha & Conta do UsuĂĄrio
+@@ -136,7 +136,7 @@
+ Comment[nds]=Brukerinformatschonen, as t.B. Passwoort, Naam un Nettpostadress
+ Comment[nl]=Gebruikerinformatie zoals wachtwoord, naam en e-mailadres
+ Comment[nn]=Brukarinformasjon som passord, namn og e-postadresse
+-Comment[pa]=ŕ¨ŕ¨Şŕ¨ŕŠŕ¨ŕ¨¤ŕ¨ž ŕ¨ŕ¨žŕ¨Łŕ¨ŕ¨žŕ¨°ŕŠ ŕ¨ŕ¨żŕ¨ľŕŠŕ¨ 
ŕ¨ŕ¨ż ŕ¨ŕŠŕ¨Şŕ¨¤-ŕ¨ŕŠŕ¨Ą, ŕ¨¨ŕ¨žŕ¨ ŕ¨ŕ¨¤ŕŠ ŕ¨-ŕ¨ŞŕŠąŕ¨¤ŕ¨°
++Comment[pa]=ŕ¨ŕ¨Şŕ¨ŕŠŕ¨ŕŠ ŕ¨ŕ¨žŕ¨Łŕ¨ŕ¨žŕ¨°ŕŠ ŕ¨ŕ¨żŕ¨ľŕŠŕ¨ ŕ¨ŕ¨ż 
ŕ¨ŕŠŕ¨Şŕ¨¤-ŕ¨ŕŠŕ¨Ą, ŕ¨¨ŕ¨žŕ¨ ŕ¨ŕ¨¤ŕŠ ŕ¨-ŕ¨ŽŕŠŕ¨˛
+ Comment[pl]=Informacje o koncie uĹźytkownika: hasĹo, imiÄ i nazwisko, 
e-mail itd.
+ Comment[pt]=InformaĂ§Ăľes do utilizador tais como senha, nome e e-mail
+ Comment[pt_BR]=InformaĂ§Ăľes do usuĂĄrio tais como senha, nome e e-mail
+Index: kpersonalizer/kpersonalizer.desktop
+===================================================================
+--- kpersonalizer/kpersonalizer.desktop        (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kpersonalizer/kpersonalizer.desktop        (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -47,7 +47,7 @@
+ Name[nl]=KDE's Configuratie Assistent
+ Name[nn]=Vegvisar for skrivebordsoppsett
+ Name[nso]=Wizard ya Dipeakanyo tsa Desktop
+-Name[pa]=ŕ¨ľŕ¨żŕ¨šŕŠŕ¨ž ŕ¨ľŕ¨żŕ¨ľŕ¨¸ŕ¨Ľŕ¨ž ŕ¨¸ŕ¨šŕ¨žŕ¨ŕ¨
++Name[pa]=ŕ¨ľŕ¨żŕ¨šŕŠŕ¨ž ŕ¨¸ŕŠŕ¨ŕ¨żŕŠ°ŕ¨ ŕ¨¸ŕ¨šŕ¨žŕ¨ŕ¨
+ Name[pl]=Asystent ustawieĹ Ĺrodowiska
+ Name[pt]=Assistente de ConfiguraĂ§ĂŁo do Ambiente de Trabalho
+ Name[pt_BR]=Assistente de ConfiguraĂ§Ăľes para a Ărea de Trabalho
+Index: kcontrol/krdb/kcs/Windows2000.kcsrc
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/x-kcsrc
+Index: kcontrol/krdb/kcs/KDETwo.kcsrc
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/x-kcsrc
+Index: kcontrol/krdb/kcs/KDEOne.kcsrc
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/x-kcsrc
+Index: kcontrol/krdb/kcs/Windows95.kcsrc
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/x-kcsrc
+Index: kcontrol/usbview/kcmusb.desktop
+===================================================================
+--- kcontrol/usbview/kcmusb.desktop    (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kcontrol/usbview/kcmusb.desktop    (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -185,6 +185,7 @@
+ Keywords[nl]=USB,devices,viewer,control,weergaveprogramma
+ Keywords[nn]=USB,einingar,visar,kontroll
+ Keywords[nso]=USB,maano,selebeledi,taolo
++Keywords[pa]=USB,ŕ¨ŕŠ°ŕ¨¤ŕ¨°,ŕ¨Śŕ¨°ŕ¨¸ŕ¨źŕ¨,ŕ¨ŕŠ°ŕ¨ŕ¨°ŕŠŕ¨˛
+ Keywords[pl]=USB,urzÄdzenia,przeglÄdarka,sterowanie
+ Keywords[pt]=USB,dispositivos,visualizador,controlo
+ Keywords[pt_BR]=USB,dispositivos,visualizador,controle
+Index: kcontrol/taskbar/kcmtaskbar.desktop
+===================================================================
+--- kcontrol/taskbar/kcmtaskbar.desktop        (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kcontrol/taskbar/kcmtaskbar.desktop        (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -52,7 +52,7 @@
+ Name[nn]=OppgĂĽvelinje
+ Name[nso]=Bar ya Mosongwana
+ Name[oc]=Barra de tasques
+-Name[pa]=ŕ¨¸ŕŠ°ŕ¨Śŕ¨ŞŕŠąŕ¨ŕŠ
++Name[pa]=ŕ¨ŕŠ°ŕ¨Ž-ŕ¨ŞŕŠąŕ¨ŕŠ
+ Name[pl]=Pasek zadaĹ
+ Name[pt]=Barra de Tarefas
+ Name[pt_BR]=Barra de tarefas
+@@ -114,7 +114,7 @@
+ Comment[nds]=Den Programmbalken in't Paneel instellen
+ Comment[nl]=Hier kunt u de taakbalk van het paneel instellen
+ Comment[nn]=Oppsett av oppgĂĽvelinja i panelet
+-Comment[pa]=ŕ¨ŞŕŠŕ¨¨ŕ¨˛ ŕ¨¸ŕŠ°ŕ¨Śŕ¨ŞŕŠąŕ¨ŕŠ ŕ¨¸ŕŠ°ŕ¨°ŕ¨ŕ¨¨ŕ¨ž
++Comment[pa]=ŕ¨ŞŕŠŕ¨¨ŕ¨˛ ŕ¨ŕŠ°ŕ¨Ž-ŕ¨ŞŕŠąŕ¨ŕŠ ŕ¨¸ŕŠ°ŕ¨°ŕ¨ŕ¨¨ŕ¨ž
+ Comment[pl]=Konfiguracja paska zadaĹ panelu
+ Comment[pt]=ConfiguraĂ§ĂŁo da barra de tarefas do painel
+ Comment[pt_BR]=Configura a barra de tarefas
+Index: kcontrol/nics/nic.desktop
+===================================================================
+--- kcontrol/nics/nic.desktop  (.../tags/KDE/3.4.2/kdebase)    (revision 
442272)
++++ kcontrol/nics/nic.desktop  (.../branches/KDE/3.4/kdebase)  (revision 
442272)
+@@ -52,7 +52,7 @@
+ Name[nl]=Netwerkinterfaces
+ Name[nn]=Nettverksgrensesnitt
+ Name[nso]=Difahlego tsa Kgokagano
+-Name[pa]=ŕ¨¨ŕŠŕ¨ŕ¨ľŕ¨°ŕ¨ ŕ¨ŕŠ°ŕ¨ŕ¨°ŕ¨ŤŕŠŕ¨ś
++Name[pa]=ŕ¨¨ŕŠŕ¨ŕ¨ľŕ¨°ŕ¨ ŕ¨ŕŠ°ŕ¨ŕ¨°ŕ¨ŤŕŠŕ¨¸
+ Name[pl]=Interfejsy sieciowe
+ Name[pt]=Interfaces de Rede
+ Name[pt_BR]=Interfaces de Rede
+@@ -121,7 +121,7 @@
+ Comment[nl]=Netwerkinterface-informatie
+ Comment[nn]=Informasjon om nettverksgrensesnitt
+ Comment[nso]=Tshedimoso ya Difahlego tsa Kgokagano
+-Comment[pa]=ŕ¨¨ŕŠŕŠąŕ¨ŕ¨ľŕ¨°ŕ¨ ŕ¨ŕŠ°ŕ¨ŕ¨°ŕ¨ŤŕŠŕ¨¸ ŕ¨ŕ¨žŕ¨Łŕ¨ŕ¨žŕ¨°ŕŠ
++Comment[pa]=ŕ¨¨ŕŠŕ¨ŕ¨ľŕ¨°ŕ¨ ŕ¨ŕŠ°ŕ¨ŕ¨°ŕ¨ŤŕŠŕ¨¸ ŕ¨ŕ¨žŕ¨Łŕ¨ŕ¨žŕ¨°ŕŠ
+ Comment[pl]=Informacje o interfejsie sieciowym
+ Comment[pt]=InformaĂ§Ăľes sobre as interfaces de rede
+ Comment[pt_BR]=InformaĂ§Ăľes sobre rede
+Index: kcontrol/smserver/kcmsmserver.desktop
+===================================================================
+--- kcontrol/smserver/kcmsmserver.desktop      (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kcontrol/smserver/kcmsmserver.desktop      (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -55,7 +55,7 @@
+ Name[nl]=Sessiebeheer
+ Name[nn]=Ăkthandsamar
+ Name[nso]=Molaodi wa Tiragalo
+-Name[pa]=ŕ¨ŕ¨ŕ¨˛ŕ¨žŕ¨¸ ŕ¨ŞŕŠŕ¨°ŕ¨ŹŕŠ°ŕ¨§ŕ¨
++Name[pa]=ŕ¨¸ŕ¨źŕŠŕ¨¸ŕ¨źŕ¨¨ ŕ¨ŞŕŠŕ¨°ŕ¨ŹŕŠ°ŕ¨§ŕ¨
+ Name[pl]=MenedĹźer sesji
+ Name[pt]=Gestor de SessĂľes
+ Name[pt_BR]=Gerenciador de SessĂŁo
+@@ -119,7 +119,7 @@
+ Comment[nl]=Hier kunt u het sessiebeheer en de afmeld-instellingen bepalen
+ Comment[nn]=Oppsett av Ă¸kthandsamar og utlogging
+ Comment[nso]=Beakanya molaodi wa tiragalo le dipeakanyo tsa gotswa
+-Comment[pa]=ŕ¨ŕ¨Şŕ¨ŁŕŠ ŕ¨ŕ¨ŕ¨˛ŕ¨žŕ¨¸ ŕ¨ŞŕŠŕ¨°ŕ¨ŹŕŠ°ŕ¨§ŕ¨ ŕ¨¤ŕŠ 
ŕ¨˛ŕ¨žŕ¨ŕ¨ŕ¨ŕ¨ ŕ¨ľŕ¨żŕ¨ľŕ¨¸ŕ¨Ľŕ¨ž ŕ¨¸ŕŠ°ŕ¨°ŕ¨ŕ¨¨ŕ¨ž
++Comment[pa]=ŕ¨ŕ¨Şŕ¨ŁŕŠ ŕ¨¸ŕ¨źŕŠŕ¨¸ŕ¨źŕ¨¨ ŕ¨ŞŕŠŕ¨°ŕ¨ŹŕŠ°ŕ¨§ŕ¨ ŕ¨¤ŕŠ 
ŕ¨˛ŕ¨žŕ¨ŕ¨ŕ¨ŕ¨ ŕ¨¸ŕŠŕ¨ŕ¨żŕŠ°ŕ¨ ŕ¨¸ŕŠ°ŕ¨°ŕ¨ŕ¨¨ŕ¨ž
+ Comment[pl]=Konfiguracja menedĹźera sesji i ustawieĹ wylogowania
+ Comment[pt]=ConfiguraĂ§ĂŁo do gestor de sessĂľes e das opĂ§Ăľes de 
finalizaĂ§ĂŁo
+ Comment[pt_BR]=Configura o gerenciador de sessĂŁo e definiĂ§Ăľes de logout
+Index: kcontrol/konq/desktoppath.desktop
+===================================================================
+--- kcontrol/konq/desktoppath.desktop  (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kcontrol/konq/desktoppath.desktop  (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -50,7 +50,7 @@
+ Name[nl]=Paden
+ Name[nn]=Stiar
+ Name[nso]=Ditsejana
+-Name[pa]=ŕ¨°ŕ¨¸ŕ¨¤ŕŠ
++Name[pa]=ŕ¨Žŕ¨žŕ¨°ŕ¨
+ Name[pl]=ĹcieĹźki
+ Name[pt]=LocalizaĂ§Ăľes
+ Name[pt_BR]=Caminhos
+@@ -116,7 +116,7 @@
+ Comment[nl]=Hier kunt u de locatie voor het opslaan van belangrijke bestanden 
wijzigen
+ Comment[nn]=Endra plasseringa av viktige filer
+ Comment[nso]=Fetosa tulo yeo go bolokwago difaele tse bohlokwa
+-Comment[pa]=ŕŠŕ¨°ŕŠŕ¨°ŕŠ ŕ¨Ťŕ¨žŕ¨ŕ¨˛ŕ¨žŕ¨ ŕ¨¸ŕŠ°ŕ¨ŕ¨žŕ¨˛ŕ¨Ł ŕ¨˛ŕ¨ 
ŕ¨¸ŕ¨Ľŕ¨żŕ¨¤ŕŠ ŕ¨¤ŕ¨Źŕ¨ŚŕŠŕ¨˛
++Comment[pa]=ŕŠŕ¨°ŕŠŕ¨°ŕŠ ŕ¨Ťŕ¨žŕ¨ŕ¨˛ŕ¨žŕ¨ ŕ¨¸ŕŠ°ŕ¨ŕ¨žŕ¨˛ŕ¨Ł ŕ¨˛ŕ¨ 
ŕ¨ŕ¨żŕ¨ŕ¨žŕ¨Łŕ¨ž ŕ¨¤ŕ¨Źŕ¨ŚŕŠŕ¨˛
+ Comment[pl]=Miejsce przechowywania waĹźnych plikĂłw
+ Comment[pt]=Alterar as localizaĂ§Ăľes onde os ficheiros importantes estĂŁo 
guardados
+ Comment[pt_BR]=Modifica a localizaĂ§ĂŁo onde importantes arquivos devem ser 
armazenados
+@@ -190,7 +190,7 @@
+ Keywords[ven]=konqueror,mulanguli wa 
faela,ludila,desktop,malatwa,dzitsumbavhulwo,mathomo
+ Keywords[vi]=konqueror,trĂŹnh quáşŁn lĂ˝ file,ÄĆ°áťng dáşŤn,desktop,thĂšng 
rĂĄc,thĆ° máťĽc,táťą kháťi Äáťng
+ Keywords[xh]=konqueror,umphathi wefayile,umendo, 
desktop,umonakalo,abalawuli,qala ngokuzenzekelayo
+-Keywords[zh_CN]=konqueror,filemanager,paths,desktop,trash,directories,autostart,ćäťśçŽĄçĺ¨,čˇŻĺž,ćĄé˘,ĺćśçŤ,çŽĺ˝,čŞĺ¨ĺŻĺ¨
++Keywords[zh_CN]=konqueror,filemanager,paths,desktop,trash,directories,autostart,ćäťśçŽĄçĺ¨,čˇŻĺž,ćĄé˘,çŽĺ˝,čŞĺ¨ĺŻĺ¨,ĺćśçŤ
+ 
Keywords[zh_TW]=konqueror,filemanager,paths,desktop,trash,directories,autostart,ĺžćĺŽś,ćŞćĄçŽĄçç¨ĺź,čˇŻĺž,ćĄé˘,ĺĺžćĄś,çŽé,čŞĺĺĺ
+ Keywords[zu]=konqueror,imenenja yamafayela,izindlela,desktop,izibi,uhlu 
lwamafayela,ukuqala ngokuzenzekela
+ 
+Index: kcontrol/konq/webappearance.desktop
+===================================================================
+--- kcontrol/konq/webappearance.desktop        (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kcontrol/konq/webappearance.desktop        (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -52,7 +52,7 @@
+ Name[nl]=Uiterlijk
+ Name[nn]=UtsjĂĽnad
+ Name[nso]=Ponagalo
+-Name[pa]=ŕ¨Śŕ¨°ŕ¨żŕ¨ś
++Name[pa]=ŕ¨Śŕ¨żŕŠąŕ¨
+ Name[pl]=WyglÄd
+ Name[pt]=AparĂŞncia
+ Name[pt_BR]=AparĂŞncia
+Index: kcontrol/konq/filebehavior.desktop
+===================================================================
+--- kcontrol/konq/filebehavior.desktop (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kcontrol/konq/filebehavior.desktop (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -181,3 +181,4 @@
+ Keywords[sv]=konqueror,filhanterare,kfm,tips,filtips,sĂ¤rskilt fĂśnster,visa 
fĂśnster,beteende,minnesanvĂ¤ndning,hemadress,nĂ¤tverksĂĽtgĂ¤rder,fĂśrloppsdialogruta,papperskorg,ta
 bort,bekrĂ¤ftelse
+ Keywords[ta]=ŕŽŕŽžŕŽŠŕŻŕŽŕŻŕŽ°ŕŽ°ŕŻ,ŕŽŕŻŕŽŞŕŻŕŽŞŕŻ 
ŕŽŽŕŻŕŽ˛ŕŽžŕŽłŕŽ°ŕŻ,kfm,ŕŽŕŻŕŽąŕŽżŕŽŞŕŻŕŽŞŕŻŕŽŕŽłŕŻ,ŕŽŕŻŕŽŞŕŻŕŽŞŕŻ 
ŕŽŕŻŕŽąŕŽżŕŽŞŕŻŕŽŞŕŻŕŽŕŽłŕŻ,ŕŽ¤ŕŽŠŕŽż 
ŕŽŕŽžŕŽłŕŽ°ŕŽŽŕŻ,ŕŽ¨ŕŻŕŽłŕŻŕŽľŕŽŕŻŕŽ 
ŕŽŕŽžŕŽłŕŽ°ŕŽŽŕŻ,ŕŽ¨ŕŽŕŽ¤ŕŻŕŽ¤ŕŻ,ŕŽ¨ŕŽżŕŽŠŕŻŕŽľŕŻ 
ŕŽŞŕŽŻŕŽŠŕŻŕŽŞŕŽžŕŽŕŻ,ŕŽľŕŻŕŽŕŻŕŽŕŻ 
ŕŽľŕŽ˛ŕŻŕŽŞŕŻŕŽŞŕŽżŕŽŠŕŻŕŽŠŕŽ˛ŕŻ,ŕŽľŕŽ˛ŕŻŕŽŞŕŻŕŽŞŕŽżŕŽŠŕŻŕŽŠŕŽ˛ŕŻ 
ŕŽŕŻŕŽŻŕŽ˛ŕŻŕŽŞŕŽžŕŽŕŻŕŽŕŽłŕŻ, ŕŽľŕŽ´ŕŽżŕŽŽŕŻŕŽąŕŻ 
ŕŽŕŽ°ŕŻŕŽŻŕŽžŕŽŕŽ˛ŕŻ,ŕŽŕŻŕŽŞŕŻŕŽŞŕŻŕŽ¤ŕŻŕŽ¤ŕŻŕŽŕŻŕŽŕŽż, 
ŕŽ¨ŕŻŕŽŕŻŕŽŕŻ,ŕŽŕŽąŕŻŕŽ¤ŕŽżŕŽŞŕŻŕŽŞŕŽŕŻŕŽ¤ŕŻŕŽ¤ŕŽ˛ŕŻ
+ Keywords[uk]=konqueror,ĐźĐľĐ˝ĐľĐ´ĐśĐľŃ 
ŃĐ°ĐšĐťŃĐ˛,kfm,ĐżŃĐ´ĐşĐ°ĐˇĐşĐ¸,ĐżŃĐ´ĐşĐ°ĐˇĐşĐ¸ ĐżĐž 
ŃĐ°ĐšĐťĐ°Ń,ĐžĐşŃĐľĐźŃ Đ˛ŃĐşĐ˝Đ°,ŃŃĐ˛ĐžŃĐľĐ˝Đ˝Ń 
Đ˛ŃĐşĐžĐ˝,ĐżĐžĐ˛ĐľĐ´ŃĐ˝ĐşĐ°,Đ˛Đ¸ĐşĐžŃĐ¸ŃŃĐ°Đ˝Đ˝Ń 
ĐżĐ°Đź'ŃŃŃ,Đ´ĐžĐźĐ°ŃĐ˝ŃĐš URL,ŃĐžĐąĐžŃĐ° Đˇ ĐźĐľŃĐľĐśĐľŃ,Đ˛ŃĐşĐ˝Đž 
ĐżĐžŃŃŃĐżŃ,ŃĐźŃŃĐ˝Đ¸Đş,
++Keywords[zh_CN]=konqueror,filemanager,kfm,tips,file tips,separate 
window,spawn windows,behavior,behaviour,memory usage,Home URL,network 
operations,progress dialog,trash 
can,delete,confirmation,ćäťśçŽĄçĺ¨,ćç¤ş,ćäťśćç¤ş,ćĺçŞĺŁ,ć°ĺźçŞĺŁ,čĄä¸ş,ĺĺä˝żç¨,ä¸ť
 URL,ç˝çťćä˝,čżĺşŚĺŻščŻćĄ,ĺćśçŤ,ĺ é¤,çĄŽčŽ¤
+Index: kcontrol/konq/fileappearance.desktop
+===================================================================
+--- kcontrol/konq/fileappearance.desktop       (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kcontrol/konq/fileappearance.desktop       (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -52,7 +52,7 @@
+ Name[nl]=Uiterlijk
+ Name[nn]=UtsjĂĽnad
+ Name[nso]=Ponagalo
+-Name[pa]=ŕ¨Śŕ¨°ŕ¨żŕ¨ś
++Name[pa]=ŕ¨Śŕ¨żŕŠąŕ¨
+ Name[pl]=WyglÄd
+ Name[pt]=AparĂŞncia
+ Name[pt_BR]=AparĂŞncia
+Index: kcontrol/konq/filepreviews.desktop
+===================================================================
+--- kcontrol/konq/filepreviews.desktop (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kcontrol/konq/filepreviews.desktop (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -46,7 +46,7 @@
+ Name[nds]=VĂśransichten & Meta-Daten
+ Name[nl]=Voorbeelden en meta-data
+ Name[nn]=FĂ¸rehandsvising og metadata
+-Name[pa]=ŕ¨¨ŕ¨ŽŕŠŕ¨¨ŕ¨ž ŕ¨¤ŕŠ ŕ¨ŽŕŠŕ¨ŕ¨ž-ŕ¨Ąŕ¨žŕ¨ŕ¨ž
++Name[pa]=ŕ¨ŕ¨˛ŕ¨ ŕ¨ŕ¨¤ŕŠ ŕ¨ŽŕŠŕ¨ŕ¨ž-ŕ¨Ąŕ¨žŕ¨ŕ¨ž
+ Name[pl]=PodglÄdy i metadane
+ Name[pt]=AntevisĂľes e Meta Dados
+ Name[pt_BR]=PrĂŠ-visualizaĂ§Ăľes & Metadados
+Index: kcontrol/kicker/kicker_config_appearance.desktop
+===================================================================
+--- kcontrol/kicker/kicker_config_appearance.desktop   
(.../tags/KDE/3.4.2/kdebase)    (revision 442272)
++++ kcontrol/kicker/kicker_config_appearance.desktop   
(.../branches/KDE/3.4/kdebase)  (revision 442272)
+@@ -52,7 +52,7 @@
+ Name[nl]=Uiterlijk
+ Name[nn]=UtsjĂĽnad
+ Name[nso]=Ponagalo
+-Name[pa]=ŕ¨Śŕ¨°ŕ¨żŕ¨ś
++Name[pa]=ŕ¨Śŕ¨żŕŠąŕ¨
+ Name[pl]=WyglÄd
+ Name[pt]=AparĂŞncia
+ Name[pt_BR]=AparĂŞncia
+Index: kcontrol/privacy/privacy.desktop
+===================================================================
+--- kcontrol/privacy/privacy.desktop   (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kcontrol/privacy/privacy.desktop   (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -34,7 +34,7 @@
+ Comment[nds]=Privaatruum - Mit dit Moduul kannst Du dat Systeem vun de Sporen 
vun't Bruken reenmaken
+ Comment[nl]=Privacy - een configuratiemodule waarmee u ongewenste sporen die 
gebruikers achterlaten kunt wissen.
+ Comment[nn]=Personvern â ein kontrollmodul som fjernar uĂ¸nskte spor som 
brukeren etterlĂ¨t seg i systemet
+-Comment[pa]=ŕ¨¨ŕ¨żŕŠąŕ¨ŕŠ - ŕ¨ŕŠąŕ¨ ŕ¨ŕŠŕ¨ŕŠ°ŕ¨ŕ¨°ŕŠŕ¨˛ 
ŕ¨ŽŕŠŕ¨ĄŕŠŕ¨ŕ¨˛ ŕ¨šŕŠ, ŕ¨ŕŠ ŕ¨ŕ¨ż ŕ¨¸ŕ¨żŕ¨¸ŕ¨ŕ¨Ž ŕ¨¤ŕŠ 
ŕ¨ŕ¨Şŕ¨ŕŠŕ¨ŕ¨¤ŕ¨ž ŕ¨Śŕ¨ž ŕ¨Şŕ¨ŕ¨žŕ¨Ł ŕ¨¨ŕŠŕŠ° ŕ¨¸ŕ¨Žŕ¨žŕ¨Şŕ¨¤ 
ŕ¨ŕ¨°ŕ¨Śŕ¨ž ŕ¨šŕŠ
++Comment[pa]=ŕ¨°ŕ¨šŕŠąŕ¨¸ - ŕ¨ŕŠąŕ¨ ŕ¨ŕŠ-ŕ¨ŕŠ°ŕ¨ŕ¨°ŕŠŕ¨˛ 
ŕ¨ŽŕŠŕ¨ĄŕŠŕ¨ŕ¨˛ ŕ¨šŕŠ, ŕ¨ŕŠ ŕ¨ŕ¨ż ŕ¨¸ŕ¨żŕ¨¸ŕ¨ŕ¨Ž ŕ¨¤ŕŠ 
ŕ¨ŕ¨Şŕ¨ŕŠŕ¨ŕŠ ŕ¨Śŕ¨ž ŕ¨Şŕ¨ŕ¨žŕ¨Ł ŕ¨¨ŕŠŕŠ° ŕ¨¸ŕ¨Žŕ¨žŕ¨Şŕ¨¤ ŕ¨ŕ¨°ŕ¨Śŕ¨ž 
ŕ¨šŕŠ
+ Comment[pl]=Ustawienia prywatnoĹci - moduĹ, ktĂłry pozwala usunÄÄ 
niepoĹźÄdane Ĺlady pozostawiane przez uĹźytkownika w systemie
+ Comment[pt]=Privacidade - um mĂłdulo do kcontrol para limpar os registos 
indesejĂĄveis que o utilizador deixa no sistema
+ Comment[pt_BR]=Privacidade - um mĂłdulo de controle do KDE para limpar 
traĂ§os nĂŁo-desejados do usuĂĄrio no sistema
+@@ -89,6 +89,7 @@
+ Keywords[nds]=PrivaatsfĂ¤Ă¤r
+ Keywords[nl]=privacy
+ Keywords[nn]=personvern,privat
++Keywords[pa]=Privacy,privacy,ŕ¨°ŕ¨šŕŠąŕ¨¸
+ Keywords[pl]=PrywatnoĹÄ,prywatnoĹÄ,ustawienia prywatnoĹci
+ Keywords[pt]=privacidade
+ Keywords[pt_BR]=Privacidade,privacidade
+@@ -140,7 +141,7 @@
+ Name[nb]=Personvern
+ Name[nds]=Privaatruum
+ Name[nn]=Personvern
+-Name[pa]=ŕ¨¨ŕ¨żŕŠąŕ¨ŕŠŕ¨¤ŕ¨ľ
++Name[pa]=ŕ¨°ŕ¨šŕŠąŕ¨¸
+ Name[pl]=PrywatnoĹÄ
+ Name[pt]=Privacidade
+ Name[pt_BR]=Privacidade
+Index: kcontrol/kfontinst/lib/FcEngine.cpp
+===================================================================
+--- kcontrol/kfontinst/lib/FcEngine.cpp        (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kcontrol/kfontinst/lib/FcEngine.cpp        (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -833,6 +833,7 @@
+         QString name(url.fileName());
+         int     pos;
+ 
++        FcInitReinitialize();
+         itsDescriptiveName=name;
+         itsSpacing=FC_PROPORTIONAL;
+         if(-1==(pos=name.find(", ")))   // No style information...
+Index: kcontrol/screensaver/testwin.h
+===================================================================
+--- kcontrol/screensaver/testwin.h     (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kcontrol/screensaver/testwin.h     (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -1,9 +1,9 @@
+ #ifndef TESTWIN_H
+ #define TESTWIN_H
+ 
+-#include <qxembed.h>
++#include "kswidget.h"
+ 
+-class TestWin : public QXEmbed
++class TestWin : public KSWidget
+ {
+     Q_OBJECT
+ public:
+Index: kcontrol/screensaver/screensaver.desktop
+===================================================================
+--- kcontrol/screensaver/screensaver.desktop   (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kcontrol/screensaver/screensaver.desktop   (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -117,7 +117,7 @@
+ Comment[nl]=Schermbeveiliging instellen
+ Comment[nn]=Innstillingar for skjermsparar
+ Comment[nso]=Dipeakanyo tsa Seboloki sa Pontsho
+-Comment[pa]=ŕ¨ľŕ¨żŕ¨šŕ¨˛ŕŠ ŕ¨Şŕ¨°ŕ¨ŚŕŠ ŕ¨ľŕ¨żŕ¨ľŕ¨¸ŕ¨Ľŕ¨ž
++Comment[pa]=ŕ¨ľŕ¨żŕ¨šŕ¨˛ŕŠ ŕ¨Şŕ¨°ŕ¨ŚŕŠ ŕ¨¸ŕŠŕ¨ŕ¨żŕŠ°ŕ¨
+ Comment[pl]=Ustawienia wygaszacza ekranu
+ Comment[pt]=ConfiguraĂ§ĂŁo do Protector de EcrĂŁ
+ Comment[pt_BR]=ConfiguraĂ§Ăľes do Protetor de Tela
+@@ -183,6 +183,7 @@
+ Keywords[nl]=screensavers,schermbeveiliging,prioriteit,schermvergrendeling
+ Keywords[nn]=skjermsparar,prioritet
+ Keywords[nso]=diboloki tsa pontsho,Kgethokgolo
++Keywords[pa]=screensavers,Priority,ŕ¨Śŕ¨°ŕ¨ŕ¨ž
+ Keywords[pl]=wygaszacze ekranu,priorytet
+ Keywords[pt]=protectores de ecrĂŁ,prioridade
+ Keywords[pt_BR]=protetores de tela,prioridade
+Index: kcontrol/screensaver/configure.in.in
+===================================================================
+--- kcontrol/screensaver/configure.in.in       (.../tags/KDE/3.4.2/kdebase)    
(revision 0)
++++ kcontrol/screensaver/configure.in.in       (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -0,0 +1,8 @@
++AC_HAVE_GL(
++    [
++    AC_CHECK_LIB(GL,glXChooseVisual,
++        [
++        AC_DEFINE(HAVE_GLXCHOOSEVISUAL, 1, [Define if you have 
glXChooseVisual()])
++        ])
++    ],[]
++    )
+Index: kcontrol/screensaver/kssmonitor.h
+===================================================================
+--- kcontrol/screensaver/kssmonitor.h  (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kcontrol/screensaver/kssmonitor.h  (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -1,13 +1,12 @@
+ #ifndef KSSMONITOR_H
+ #define KSSMONITOR_H
+ 
+-#include <qxembed.h>
++#include "kswidget.h"
+ 
+-class KSSMonitor : public QXEmbed
++class KSSMonitor : public KSWidget
+ {
+-    Q_OBJECT
+ public:
+-    KSSMonitor( QWidget *parent ) : QXEmbed( parent ) {}
++    KSSMonitor( QWidget *parent ) : KSWidget( parent ) {}
+ 
+     // we don't want no steenking palette change
+     virtual void setPalette( const QPalette & ) {}
+Index: kcontrol/screensaver/kswidget.cpp
+===================================================================
+--- kcontrol/screensaver/kswidget.cpp  (.../tags/KDE/3.4.2/kdebase)    
(revision 0)
++++ kcontrol/screensaver/kswidget.cpp  (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -0,0 +1,40 @@
++#include <config.h>
 +
-+If you did install kdelibs, then the Qt version that is picked up by
-+this configure is not the same version you used to compile kdelibs. 
-+The Qt Plugin installed by kdelibs is *ONLY* loadable if its the 
-+same Qt version, compiled with the same compiler and the same Qt
-+configuration settings.
-+])
- fi
- fi
- ])
-@@ -3104,8 +3112,8 @@
-         fi
-         rm -f conftest.h conftest.h.gch
-     fi
--    AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test 
"$kde_gcc_supports_pch" = "yes")
-   fi
-+  AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test 
"$kde_gcc_supports_pch" = "yes")
-   if test "$CXX" = "KCC"; then
-     dnl unfortunately we currently cannot disable exception support in KCC
-     dnl because doing so is binary incompatible and Qt by default links with 
exceptions :-(
-@@ -3194,6 +3202,51 @@
-   ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
- ])
- 
-+AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
-+  [
-+    AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], 
kde_cv_val_gcc_visibility_bug,
-+      [
-+        AC_LANG_SAVE
-+        AC_LANG_CPLUSPLUS
++#include <kwin.h>
++#include "testwin.h"
 +
-+        safe_CXXFLAGS=$CXXFLAGS
-+        safe_LDFLAGS=$LDFLAGS
-+        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
-+        LDFLAGS="$LDFLAGS -shared -fPIC"
++#ifdef HAVE_GLXCHOOSEVISUAL
++#include <GL/glx.h>
++#endif
 +
-+        AC_TRY_LINK(
-+        [
-+          /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
-+          template<typename CharT>
-+          struct VisTest
-+          {
-+            inline VisTest ();
-+          };
-+          template<typename CharT>
-+          inline VisTest<CharT>::VisTest()
-+          {}
-+          extern template class VisTest<char>;  // It works if we drop that 
line
-+          int some_function( int do_something ) __attribute__ 
((visibility("default")));
-+          int some_function( int )
-+          {
-+            VisTest<char> a;
-+            return 0;
-+          }
-+        ], [/* elvis is alive */],
-+        kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
++KSWidget::KSWidget( QWidget* parent, const char* name, int f )
++    : QXEmbed( parent, name, f )
++{
++// use visual with support for double-buffering, for opengl
++// this code is duplicated in kdebase/kdesktop/lock/
++#ifdef HAVE_GLXCHOOSEVISUAL
++    Visual* visual = CopyFromParent;
++    XSetWindowAttributes attrs;
++    int flags = 0;
++    if( true /*mOpenGLVisual*/ )
++    {
++        int attribs[] = { GLX_RGBA, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, 
x11Depth(), None };
++        if( XVisualInfo* i = glXChooseVisual( x11Display(), x11Screen(), 
attribs ))
++        {
++            visual = i->visual;
++            static Colormap colormap = 0;
++            if( colormap != 0 )
++                XFreeColormap( x11Display(), colormap );
++            colormap = XCreateColormap( x11Display(), RootWindow( 
x11Display(), x11Screen()), visual, AllocNone );
++            attrs.colormap = colormap;
++            flags |= CWColormap;
++            XFree( i );
++        }
++    }
++    Window w = XCreateWindow( x11Display(), parentWidget() ? 
parentWidget()->winId() : RootWindow( x11Display(), x11Screen()),
++        x(), y(), width(), height(), 0, x11Depth(), InputOutput, visual, 
flags, &attrs );
++    create( w );
++#endif
++}
 +
-+        CXXFLAGS=$safe_CXXFLAGS
-+        LDFLAGS=$safe_LDFLAGS
-+        AC_LANG_RESTORE
-+      ]
-+    )
++#include "kswidget.moc"
+Index: kcontrol/screensaver/scrnsave.cpp
+===================================================================
+--- kcontrol/screensaver/scrnsave.cpp  (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kcontrol/screensaver/scrnsave.cpp  (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -46,10 +46,7 @@
+ 
+ #include "scrnsave.h"
+ 
+-// X11 headers
+-#undef Above
+-#undef Below
+-#undef None
++#include <fixx11h.h>
+ 
+ template class QPtrList<SaverConfig>;
+ 
+Index: kcontrol/screensaver/kswidget.h
+===================================================================
+--- kcontrol/screensaver/kswidget.h    (.../tags/KDE/3.4.2/kdebase)    
(revision 0)
++++ kcontrol/screensaver/kswidget.h    (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -0,0 +1,13 @@
++#ifndef KSWIDGET_H
++#define KSWIDGET_H
 +
-+    if test x$kde_cv_val_gcc_visibility_bug = xno; then
-+      CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-+    fi
-+  ]
-+)
++#include <qxembed.h>
 +
- AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
- [
-   if test "$GXX" = "yes"; then
-@@ -3202,7 +3255,9 @@
-     KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
-     KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
-     [
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        KDE_CHECK_VISIBILITY_GCC_BUG
++class KSWidget : public QXEmbed
++{
++    Q_OBJECT
++public:
++    KSWidget( QWidget *parent = NULL, const char* name = NULL, int flags = 0 
);
++};
 +
-         HAVE_GCC_VISIBILITY=1
-         AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", 
[define to 1 if -fvisibility is supported])
-     ])
-diff -urN -x CVS kdebase.orig/admin/am_edit kdebase/admin/am_edit
---- kdebase.orig/admin/am_edit 2004-12-17 21:18:28.000000000 +0100
-+++ kdebase/admin/am_edit      2005-04-18 10:49:33.000000000 +0200
-@@ -483,6 +483,7 @@
-             $MakefileData =~ s/$lookup/$replacement/;
-             $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
-             $replacement = "$stuff_before\$(KCXXFLAGS) 
\$(KDE_CXXFLAGS)$stuff_after";
-+            next if ($stuff_before =~ /\$\(KDE_CXXFLAGS\)/ or $stuff_after =~ 
/\$\(KDE_CXXFLAGS\)/);
-             substituteLine($lookup, $replacement);
-         } else {
-             $found = 0;
-@@ -634,7 +635,7 @@
-               if ($pre eq '' && exists($varcontent{$variable})) {
-                   my @addlist = split(/[\034\s]+/, $varcontent{$variable});
-                   push(@objlist, @addlist);
--                } elsif ($variable !~ 'OBJEXT') {
-+                } elsif ($variable !~ 'OBJEXT' && $variable !~ 
/am__objects_\d+/ ) {
-                     $ocv = 1;
-               }
-             }
-@@ -1376,8 +1377,11 @@
-               $dep_lines .= "\tif test \"\$\$ret\" = 0; then echo '#include 
\"$source.moc\"' >> $source.$cxxsuffix; else rm -f $source.$cxxsuffix ; exit 
\$\$ret ; fi\n\n";
-                 $dep_lines .= "$source.h: $sourcedir$source.ui\n";
-                 $dep_lines .= "\trm -rf $source.h;\n";
--                $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi 
-e \"s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include 
<kwizard.h>,g\" >> $source.h ;\n";
--
-+                if (!$kdeopts{"qtonly"}) {
-+                    $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) 
-pi -e \"s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include 
<kwizard.h>,g\" >> $source.h ;\n";
-+                } else {
-+                    $dep_lines .= "\t\$(UIC) -o $source.h 
$sourcedir$source.ui\n";
-+                }
-                 $dep_lines .= "$source.moc: $source.h\n";
-                 $dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n";
++#endif
+Index: kcontrol/screensaver/Makefile.am
+===================================================================
+--- kcontrol/screensaver/Makefile.am   (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kcontrol/screensaver/Makefile.am   (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -1,11 +1,12 @@
+ 
+-AM_CPPFLAGS = $(all_includes)
++AM_CPPFLAGS = $(GLINC) $(all_includes)
+ 
+ kde_module_LTLIBRARIES = kcm_screensaver.la
+ 
+-kcm_screensaver_la_SOURCES = advanceddialogimpl.ui scrnsave.cpp testwin.cpp 
saverlist.cpp saverconfig.cpp advanceddialog.cpp 
++kcm_screensaver_la_SOURCES = advanceddialogimpl.ui scrnsave.cpp testwin.cpp 
saverlist.cpp \
++        saverconfig.cpp advanceddialog.cpp kswidget.cpp
+ kcm_screensaver_la_LDFLAGS = -module -avoid-version $(all_libraries) 
-no-undefined
+-kcm_screensaver_la_LIBADD = $(LIB_KSYCOCA) $(DPMSLIB)
++kcm_screensaver_la_LIBADD = $(LIB_KSYCOCA) $(DPMSLIB) $(GLLIB)
+ METASOURCES = AUTO
+ 
+ noinst_HEADERS = scrnsave.h
+Index: kcontrol/screensaver/testwin.cpp
+===================================================================
+--- kcontrol/screensaver/testwin.cpp   (.../tags/KDE/3.4.2/kdebase)    
(revision 442272)
++++ kcontrol/screensaver/testwin.cpp   (.../branches/KDE/3.4/kdebase)  
(revision 442272)
+@@ -4,7 +4,7 @@
+ class QXEmbed;
  
-@@ -2276,7 +2280,7 @@
-            "\t        echo \"\$\$i\"; \\\n" . 
-            "\t        if ! ";
-     $t .=  $cxxsuffix eq "KKK" ?
--           "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) 
\$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " :
-+           "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) 
\$(AM_CPPFLAGS) \$(CPPFLAGS) \$(CXXFLAGS) \$(KDE_CXXFLAGS) " :
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.14&r2=1.15&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

SOURCES: kdebase-branch.diff - shading fixes

Reply via email to