SOURCES: kdebase-branch.diff - up from upstream

arekm arekm at pld-linux.org
Tue Dec 6 18:31:06 CET 2005


Author: arekm                        Date: Tue Dec  6 17:31:06 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up from upstream

---- Files affected:
SOURCES:
   kdebase-branch.diff (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SOURCES/kdebase-branch.diff
diff -u SOURCES/kdebase-branch.diff:1.19 SOURCES/kdebase-branch.diff:1.20
--- SOURCES/kdebase-branch.diff:1.19	Mon Sep  5 14:04:46 2005
+++ SOURCES/kdebase-branch.diff	Tue Dec  6 18:31:00 2005
@@ -1,7983 +1,35423 @@
-Index: kate/data/x-kate-project.desktop
+Index: ksmserver/shutdown.h
 ===================================================================
---- kate/data/x-kate-project.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kate/data/x-kate-project.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -55,10 +55,11 @@
- Comment[sr at Latn]=Kate-in projektni fajl
- Comment[sv]=Kate-projektfil
- Comment[ta]=Kate ŕŽ¤ŕŽżŕŽŸŕŻŕŽŸŕŽŞŕŻŕŽŞŕŽŁŕŽż ŕŽ•ŕŻ‹ŕŽŞŕŻŕŽŞŕŻ
-+Comment[tg]=ФаКНи ĐĐ°Ň›ŃˆĐ°Đ¸ Kate 
- 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 457276)
-+++ kdepasswd/kcm/kcm_useraccount.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -23,7 +23,7 @@
- Name[es]=ContraseĂąa y cuenta de usuario
- Name[et]=Parool ja kasutaja konto
- Name[eu]=Pasahitza eta erabiltzaile kontua
--Name[fi]=Salasanat & käyttäjätilit
-+Name[fi]=Salasanat ja käyttäjätilit
- Name[fr]=Compte utilisateur et mot de passe
- Name[fy]=Wachtwurd en brĂťkersbehear
- Name[ga]=Focal Faire & Cuntas ĂšsĂĄideora
-@@ -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 457276)
-+++ kpersonalizer/kpersonalizer.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -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/background/background.desktop
-===================================================================
---- kcontrol/background/background.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/background/background.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -125,7 +125,7 @@
- Comment[nso]=Fetosa dipeakanyo tsa bokamorago
- Comment[pa]=ŕ¨Şŕ¨żŕŠąŕ¨ ŕ¨­ŕŠ‚ŕ¨ŽŕŠ€ ਾਿਾਸ਼ਞ ŕ¨¤ŕ¨Źŕ¨ŚŕŠ€ŕ¨˛
- Comment[pl]=Ustawienia tła
--Comment[pt]=alterar a configuração do fundo
-+Comment[pt]=Alterar a configuração do fundo
- Comment[pt_BR]=Muda as configuraçþes do fundo da tela
- Comment[ro]=Configurează setările fundalului
- Comment[ru]=ĐĐ°ŃŃ‚Ń€ĐžĐšĐşĐ° фОна райОчогО стОНа
-Index: kcontrol/krdb/kcs/System.kcsrc
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/x-kcsrc
-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/krdb/kcs/WhiteOnBlack.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 457276)
-+++ kcontrol/usbview/kcmusb.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -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/componentchooser/componentservices/kcm_kemail.desktop
-===================================================================
---- kcontrol/componentchooser/componentservices/kcm_kemail.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/componentchooser/componentservices/kcm_kemail.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -43,7 +43,7 @@
- Name[nso]=Moreki wa E-poso
- Name[pa]=ŕ¨ˆ-ਪੱਤਰ ŕ¨•ŕ¨˛ŕ¨žŕ¨‚ŕ¨ˆŕ¨Ÿ
- Name[pl]=Program pocztowy
--Name[pt]=Cliente de Email
-+Name[pt]=Cliente de E-mail
- Name[pt_BR]=Cliente de E-mail
- Name[ro]=Client de email
- Name[ru]=КНионт ŃĐťĐľĐşŃ‚Ń€. пОчты
-@@ -106,7 +106,7 @@
- Comment[nso]=Tirelo ye ego dumelela go beakanya moreki wa gago wa e-poso wa thuso ya tshoganetso. Ditshumiso kamoka tsa KDE tseo di hlokago tsenelo go tshomiso ya moreki wa e-poso di swanetse go hlompha dipeakanyo tse.
- Comment[pa]=ŕ¨‡ŕ¨ĽŕŠ‡ ŕ¨¤ŕŠŕ¨¸ŕŠ€ŕ¨‚ ŕ¨†ŕ¨Şŕ¨ŁŕŠ‡ ŕ¨ŽŕŠ‚ŕ¨˛ ŕ¨ˆ-ਪੱਤਰ ŕ¨•ŕ¨˛ŕ¨žŕ¨‚ŕ¨‡ŕ¨Ÿ ŕ¨ŚŕŠ€ ਸੰਰਹਨਾ ਕਰ ŕ¨¸ŕ¨•ŕ¨ŚŕŠ‡ ŕ¨šŕŠ‹ŕĽ¤ŕ¨¸ŕ¨­ KDE ŕ¨•ŕ¨žŕ¨°ŕ¨œ, ŕ¨œŕ¨żŕ¨¨ŕ¨žŕ¨‚ ŕ¨¨ŕŠ‡ ŕ¨ľŕŠ€ ŕ¨ˆ-ਪੱਤਰ ŕ¨•ŕ¨˛ŕ¨žŕ¨‚ŕ¨‡ŕ¨Ÿ ਾਰਤਣਞ ŕ¨šŕŠˆ, ਇਸ ਾਿਾਸ਼ਞ ਌ਞ ਸਨ਎ਞਨ ŕ¨•ŕ¨°ŕ¨¨ŕ¨—ŕŠ‡ŕĽ¤
- Comment[pl]=Tu moĹźna wybrać domyĹ›lny program pocztowy. Wszystkie programy KDE, ktĂłre korzystajÄ
 z poczty, powinny uşywać tego ustawienia.
--Comment[pt]=Este serviço permite-lhe configurar o seu cliente de email por omissão.  Todas as aplicaçþes do KDE que necessitem do acesso a um cliente de email devem respeitar esta configuração.
-+Comment[pt]=Este serviço permite-lhe configurar o seu cliente de e-mail por omissão.  Todas as aplicaçþes do KDE que necessitem do acesso a um cliente de e-mail devem respeitar esta configuração.
- Comment[pt_BR]=Este serviço permite a você configurar o seu cliente de e-mail padrão. Todas os aplicativos do KDE que precisarem acessar um cliente de e-mail devem seguir esta configuração.
- Comment[ro]=Acest serviciu vă permite să configuraĹŁi clientul de email implicit. Toate aplicaĹŁiile KDE care au nevoie de o aplicaĹŁie client de email ar trebui să onoreze această setare.
- Comment[ru]=Đ­Ń‚Đ° ŃĐťŃƒĐśĐąĐ° ĐżĐžĐˇĐ˛ĐžĐťŃĐľŃ‚ ваП Đ˝Đ°ŃŃ‚Ń€ĐžĐ¸Ń‚ŃŒ пОчтОвыК кНионт пО ŃƒĐźĐžĐťŃ‡Đ°Đ˝Đ¸ŃŽ. Всо ĐżŃ€Đ¸ĐťĐžĐśĐľĐ˝Đ¸Ń KDE, кОтОрыП Đ˝ŃƒĐśĐľĐ˝ пОчтОвыК кНионт, ĐąŃƒĐ´ŃƒŃ‚ Đ¸ŃĐżĐžĐťŃŒĐˇĐžĐ˛Đ°Ń‚ŃŒ ŃŃ‚ĐžŃ‚ параПотр.
-Index: kcontrol/componentchooser/componentchooser.desktop
-===================================================================
---- kcontrol/componentchooser/componentchooser.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/componentchooser/componentchooser.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -174,7 +174,7 @@
- Keywords[nn]=komponentar,komponentveljar,ressursar,e-postprogram,terminalemulator
- Keywords[nso]=diripana,mokgethi wa seripana,didiriswa, moreki wa e-poso, moekisi wa terminal
- Keywords[pl]=komponenty,składniki,wybór komponentu,zasoby,program pocztowy,emulator terminala
--Keywords[pt]=componentes,selector de componentes,recursos,client de email,emulador de terminal
-+Keywords[pt]=componentes,selector de componentes,recursos,cliente de e-mail,emulador de terminal
- Keywords[pt_BR]=componentes,seletor de componentes,recursos,cliente de e-mail, emulador de terminal
- Keywords[ro]=componente,selector componentă,resurse,client de email,emulator de terminal
- Keywords[se]=oasit,oassevĂĄlljejeaddji,resurssat,e-boasta progrĂĄmma,terminĂĄlemulĂĄhtor
-Index: kcontrol/accessibility/accessibility.desktop
-===================================================================
---- kcontrol/accessibility/accessibility.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/accessibility/accessibility.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -156,7 +156,7 @@
- Keywords[cy]=mynediad,hygyrchedd,byddar,cloch,cloch clywadwy,cloch gweladwy,bysellfwrdd,allweddell,bysell,bysell gludog,bysell sponcio,bysell araf,llywio llygoden,pad rhif
- Keywords[da]=adgang,tilgÌngelighed,døv,handicappet,klokke,hørbar klokke,synlig klokke,Tastatur,taster,klÌbrige taster,bounce-taster,langsomme taster,musenavigering,numerisk tastatur
- Keywords[de]=Behinderung,Maussteuerung,Signale,Tastatur,Tasten,Taubheit,Verlangsamte Tasten,Zahlenblock,Zugang,Zugangshilfen
--Keywords[el]=Ď€ĎĎŒĎƒÎ˛ÎąĎƒÎˇ,Ď€ĎÎżĎƒÎšĎ„ĎŒĎ„ÎˇĎ„Îą,ÎşĎ‰Ď†ĎŒĎ‚,impaired,κοĎ
δούνι,ικοĎ
ĎƒĎ„ÎŽ ÎľÎšÎ´ÎżĎ€ÎżÎŻÎˇĎƒÎˇ,οριτΎ ÎľÎšÎ´ÎżĎ€ÎżÎŻÎˇĎƒÎˇ,Î ÎťÎˇÎşĎ„ĎÎżÎťĎŒÎłÎšÎż,πΝΎκτρι,sticky keys,bounce keys,ιργΏ πΝΎκτρι,Ď€ÎťÎżÎŽÎłÎˇĎƒÎˇ Ď€ÎżÎ˝Ď„ÎšÎşÎšÎżĎ,ÎąĎÎšÎ¸ÎźÎˇĎ„ÎšÎşĎŒ Ď€ÎťÎˇÎşĎ„ĎÎżÎťĎŒÎłÎšÎż
-+Keywords[el]=Ď€ĎĎŒĎƒÎ˛ÎąĎƒÎˇ,Ď€ĎÎżĎƒÎšĎ„ĎŒĎ„ÎˇĎ„Îą,ÎşĎ‰Ď†ĎŒĎ‚,impaired,κοĎ
δούνι,ικοĎ
ĎƒĎ„ÎŽ ÎľÎšÎ´ÎżĎ€ÎżÎŻÎˇĎƒÎˇ,οριτΎ ÎľÎšÎ´ÎżĎ€ÎżÎŻÎˇĎƒÎˇ,Î ÎťÎˇÎşĎ„ĎÎżÎťĎŒÎłÎšÎż,πΝΎκτρι,κοΝΝΡΟένι πΝΎκτρι,πΝΎκτρι ÎąÎ˝ÎąĎ€ÎŽÎ´ÎˇĎƒÎˇĎ‚,ιργΏ πΝΎκτρι,Ď€ÎťÎżÎŽÎłÎˇĎƒÎˇ Ď€ÎżÎ˝Ď„ÎšÎşÎšÎżĎ,ÎąĎÎšÎ¸ÎźÎˇĎ„ÎšÎşĎŒ Ď€ÎťÎˇÎşĎ„ĎÎżÎťĎŒÎłÎšÎż
- Keywords[eo]=aliro,handikapito,malhelpito,pepo,videbla pepo,klavaro,klavoj,klavfikso, musnavigado,nombroklavaro
- Keywords[es]=acceso,accesibilidad,sordo,disminuido,timbre,timbre audible,timbre visible,Teclado,teclas,teclas pegajosas,teclas de golpe,teclas lentas,navegaciĂłn del ratĂłn,teclado numĂŠrico
- Keywords[et]=juurdepääs,kurt,puue,puudega,signaal,kuuldav signaal,visuaalne signaal,klaviatuur,klahvid,kleepuvad klahvid,pþrkavad klahvid,aeglased klahvid,hiire liigutamine,numbriklaviatuur
-Index: kcontrol/taskbar/kcmtaskbar.desktop
-===================================================================
---- kcontrol/taskbar/kcmtaskbar.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/taskbar/kcmtaskbar.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -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/kcontrol/kinfocenter.desktop
-===================================================================
---- kcontrol/kcontrol/kinfocenter.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/kcontrol/kinfocenter.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -21,6 +21,7 @@
- Name[ro]=Centrul de informaĹŁii KDE
- Name[sv]=Informationscentralen
- Name[ta]=ŕŽ•ŕŻ‡ŕŽ¤ŕŽ•ŕŽľŕŽ˛ŕŻ ŕŽŽŕŻˆŕŽŻŕŽŽŕŻ
-+Name[tg]=ĐœĐ°Ń€ĐşĐ°ĐˇĐ¸ иттиНООт
- GenericName=Info Center
- GenericName[af]=Inligting Sentrum
- GenericName[bg]=Đ˜Đ˝Ń„ĐžŃ€ĐźĐ°Ń†Đ¸ĐžĐ˝ĐľĐ˝ цонтър
-Index: kcontrol/kcontrol/searchwidget.cpp
-===================================================================
---- kcontrol/kcontrol/searchwidget.cpp	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/kcontrol/searchwidget.cpp	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -124,6 +124,7 @@
- 
-       // get the modules keyword list
-       QStringList kw = module->keywords();
-+      kw << module->moduleName();
- 
-       // loop through the keyword list to populate _keywords
-       for(QStringList::ConstIterator it = kw.begin(); it != kw.end(); ++it)
-Index: kcontrol/info/opengl.cpp
-===================================================================
---- kcontrol/info/opengl.cpp	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/info/opengl.cpp	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -17,7 +17,7 @@
-  *   You should have received a copy of the GNU General Public License     *
-  *   along with this program; if not, write to the                         *
-  *   Free Software Foundation, Inc.,                                       *
-- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-+ *   51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.             *
-  ***************************************************************************/
- 
- #if defined(INFO_OPENGL_AVAILABLE)
-@@ -235,6 +235,9 @@
-       GL_COMPRESSED_TEXTURE_FORMATS
- */
- 
-+  if (!glExtensions)
-+	return;
-+
-   struct token_name {
-       GLuint type;  // count and flags, !!! count must be <=2 for now
-       GLenum token;
-@@ -429,12 +432,12 @@
- 	for (cur_token = groups[i].group; cur_token->type; cur_token++) {
- 
-    		bool tfloat = cur_token->type & KCMGL_FLOAT;
--   		bool tprog = cur_token->type & KCMGL_PROG;
- 		int count = KCMGL_COUNT_MASK(cur_token->type);
- 		GLint max[2]={0,0};
-    		GLfloat fmax[2]={0.0,0.0};
- 
- #if defined(PFNGLGETPROGRAMIVARBPROC) && defined(GL_ARB_vertex_program)
-+   		bool tprog = cur_token->type & KCMGL_PROG;
- 		if (tprog && kcm_glGetProgramivARB)
- 			kcm_glGetProgramivARB(groups[i].type, cur_token->token, max);
- 		else
-Index: kcontrol/info/opengl.desktop
-===================================================================
---- kcontrol/info/opengl.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/info/opengl.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -61,6 +61,7 @@
- Comment[sr at Latn]=Informacije o OpenGL-u
- Comment[sv]=Information om OpenGL
- Comment[ta]=ŕŽ“ŕŽŞŕŽŠŕŻ ŕŽœŕŽżŕŽŽŕŽ˛ŕŻ ŕŽ¤ŕŽ•ŕŽľŕŽ˛ŕŻ
-+Comment[tg]=майар дар йОраи OpenGL
- Comment[tr]=OpenGL Bilgisi
- Comment[uk]=Đ†Đ˝Ń„ĐžŃ€ĐźĐ°Ń†Ń–Ń прО OpenGL
- Comment[zh_CN]=OpenGL 俥息
-Index: kcontrol/nics/nic.desktop
-===================================================================
---- kcontrol/nics/nic.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/nics/nic.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -30,7 +30,7 @@
- Name[et]=VĂľrguliidesed
- Name[eu]=Sare interfazeak
- Name[fa]=ŮˆŘ§ŘłŘˇâ€ŒŮ‡Ř§ŰŒ شبڊه
--Name[fi]=Verkkoliittymät
-+Name[fi]=Verkkoliitynnät
- Name[fr]=Interfaces rĂŠseau
- Name[fy]=Netwurkynterfaces
- Name[ga]=ComhĂŠadain LĂ­onra
-@@ -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/ebrowsing/plugins/shorturi/kshorturifilter.cpp
-===================================================================
---- kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -216,6 +216,7 @@
-   QString path;
-   QString ref;
-   QString query;
-+  QString nameFilter;
- 
-   if (KURL::isRelativeURL(cmd) && QDir::isRelativePath(cmd)) {
-      path = cmd;
-@@ -228,7 +229,8 @@
-       // but not for "/tmp/a#b", if "a#b" is an existing file,
-       // or for "/tmp/a?b" (#58990)
-       if ( ( url.hasRef() || !url.query().isEmpty() ) // avoid the calling exists() when not needed
--           && QFile::exists(url.path()) )
-+           && QFile::exists(url.path())
-+           && !url.path().endsWith(QFL1("/")) ) // /tmp/?foo is a namefilter, not a query
-       {
-         path = url.path();
-         ref = url.ref();
-@@ -338,6 +340,24 @@
-   if( isLocalFullPath && !exists )
-   {
-     exists = ( stat( QFile::encodeName(path).data() , &buff ) == 0 );
-+    if ( !exists ) {
-+      // Support for name filter (/foo/*.txt), see also KonqMainWindow::detectNameFilter
-+      // If the app using this filter doesn't support it, well, it'll simply error out itself
-+      int lastSlash = path.findRev( '/' );
-+      if ( lastSlash > -1 && path.find( ' ', lastSlash ) == -1 ) // no space after last slash, otherwise it's more likely command-line arguments
-+      {
-+        QString fileName = path.mid( lastSlash + 1 );
-+        QString testPath = path.left( lastSlash + 1 );
-+        if ( ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 )
-+           && stat( QFile::encodeName(testPath).data(), &buff ) == 0 )
-+        {
-+          nameFilter = fileName;
-+          kdDebug() << "Setting nameFilter to " << nameFilter << endl;
-+          path = testPath;
-+          exists = true;
-+        }
-+      }
-+    }
-   }
- 
-   //kdDebug() << "path =" << path << " isLocalFullPath=" << isLocalFullPath << " exists=" << exists << endl;
-@@ -370,7 +390,9 @@
-     // Open "uri" as file:/xxx if it is a non-executable local resource.
-     if( isDir || S_ISREG( buff.st_mode ) )
-     {
--      //kdDebug() << "Abs path as local file" << endl;
-+      //kdDebug() << "Abs path as local file or directory" << endl;
-+      if ( !nameFilter.isEmpty() )
-+        u.setFileName( nameFilter );
-       setFilteredURI( data, u );
-       setURIType( data, ( isDir ) ? KURIFilterData::LOCAL_DIR : KURIFilterData::LOCAL_FILE );
-       return true;
-Index: kcontrol/ebrowsing/plugins/ikws/searchproviders/it2en.desktop
-===================================================================
---- kcontrol/ebrowsing/plugins/ikws/searchproviders/it2en.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/ebrowsing/plugins/ikws/searchproviders/it2en.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -48,6 +48,7 @@
- Name[sr at Latn]=Prevod na WordReference.com: sa italijanskog na engleski
- Name[sv]=Wordreference.com Üversättning: italienska till engelska
- Name[ta]=WordReference.com ŕŽŽŕŻŠŕŽ´ŕŽżŕŽŞŕŻ†ŕŽŻŕŽ°ŕŻŕŽŞŕŻŕŽŞŕŻ: ŕŽ‡ŕŽ¤ŕŻŕŽ¤ŕŽžŕŽ˛ŕŽżŕŽŻ ம௩ழியில் ŕŽ‡ŕŽ°ŕŻŕŽ¨ŕŻŕŽ¤ŕŻ ŕŽ†ŕŽ™ŕŻŕŽ•ŕŽżŕŽ˛ŕŽ¤ŕŻŕŽ¤ŕŻŕŽ•ŕŻŕŽ•ŕŻ
-+Name[tg]=WordReference.com Đ˘Đ°Ń€ŇˇŃƒĐźĐ°: Đ¸Ń‚Đ°ĐťĐ¸ŃĐłÓŁ йа ангНисӣ
- Name[tr]=WordReference.com Çevirisi: İtalyancadan İngilizceye
- Name[uk]=WordReference.com: порокНад С Ń–Ń‚Đ°ĐťŃ–ĐšŃŃŒĐşĐžŃ— на Đ°Đ˝ĐłĐťŃ–ĐšŃŃŒĐşŃƒ
- Name[uz]=WordReference.com тарМиПа: Đ˜Ń‚Đ°ĐťŃĐ˝Ń‡Đ°Đ´Đ°Đ˝ Đ˜Đ˝ĐłĐťĐ¸ĐˇŃ‡Đ°ĐłĐ°
-Index: kcontrol/ebrowsing/plugins/ikws/searchproviders/en2de.desktop
-===================================================================
---- kcontrol/ebrowsing/plugins/ikws/searchproviders/en2de.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/ebrowsing/plugins/ikws/searchproviders/en2de.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -41,6 +41,7 @@
- Name[sr at Latn]=Prevod na dict.cc: sa engleskog na nemački
- Name[sv]=dict.cc Üversättning: engelska till tyska
- Name[ta]=dict.cc Translation  ŕŽŽŕŻŠŕŽ´ŕŽżŕŽŞŕŻ†ŕŽŻŕŽ°ŕŻŕŽŞŕŻŕŽŞŕŻ: ŕŽ†ŕŽ™ŕŻŕŽ•ŕŽżŕŽ˛ŕŽ¤ŕŻŕŽ¤ŕŽżŕŽ˛ŕŻ ŕŽ‡ŕŽ°ŕŻŕŽ¨ŕŻŕŽ¤ŕŻ ŕŽœŕŻ†ŕŽ°ŕŻŕŽŽŕŽŠŕŻ ŕŽŽŕŻŠŕŽ´ŕŽżŕŽ•ŕŻŕŽ•ŕŻ
-+Name[tg]=WordReference.com Đ˘Đ°Ń€ŇˇŃƒĐźĐ°: ангНисӣ йа ноПисӣ
- Name[tr]=dict.cc Çevirisi: İngilizceden Almancaya
- Name[uk]=dict.cc: порокНад С Đ°Đ˝ĐłĐťŃ–ĐšŃŃŒĐşĐžŃ— на Đ˝Ń–ĐźĐľŃ†ŃŒĐşŃƒ
- Query=http://www.dict.cc/?s=\\{@}
-Index: kcontrol/ebrowsing/plugins/ikws/searchproviders/es2en.desktop
-===================================================================
---- kcontrol/ebrowsing/plugins/ikws/searchproviders/es2en.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/ebrowsing/plugins/ikws/searchproviders/es2en.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -48,6 +48,7 @@
- Name[sr at Latn]=Prevod na WordReference.com: sa ĹĄpanskog na engleski
- Name[sv]=Wordreference.com Üversättning: spanska till engelska
- Name[ta]=WordReference.com ŕŽŽŕŻŠŕŽ´ŕŽżŕŽŞŕŻ†ŕŽŻŕŽ°ŕŻŕŽŞŕŻŕŽŞŕŻ: ஸ்பானிஷ் ம௩ழியில் ŕŽ‡ŕŽ°ŕŻŕŽ¨ŕŻŕŽ¤ŕŻ ŕŽ†ŕŽ™ŕŻŕŽ•ŕŽżŕŽ˛ŕŽ¤ŕŻŕŽ¤ŕŻŕŽ•ŕŻŕŽ•ŕŻ
-+Name[tg]=WordReference.com Đ˘Đ°Ń€ŇˇŃƒĐźĐ°: испанӣ йа ангНисӣ
- Name[tr]=WordReference.com Çevirisi: İspanyolcadan İngilizceye
- Name[uk]=WordReference.com: порокНад С Ń–ŃĐżĐ°Đ˝ŃŃŒĐşĐžŃ— на Đ°Đ˝ĐłĐťŃ–ĐšŃŃŒĐşŃƒ
- Name[uz]=WordReference.com тарМиПа: Đ˜ŃĐżĐ°Đ˝Ń‡Đ°Đ´Đ°Đ˝ Đ˜Đ˝ĐłĐťĐ¸ĐˇŃ‡Đ°ĐłĐ°
-Index: kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2en.desktop
-===================================================================
---- kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2en.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2en.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -48,6 +48,7 @@
- Name[sr at Latn]=Prevod na WordReference.com: sa francuskog na engleski
- Name[sv]=Wordreference.com Üversättning: franska till engelska
- Name[ta]=WordReference.com ŕŽŽŕŻŠŕŽ´ŕŽżŕŽŞŕŻ†ŕŽŻŕŽ°ŕŻŕŽŞŕŻŕŽŞŕŻ: ŕŽŞŕŽżŕŽ°ŕŻ†ŕŽŠŕŻŕŽšŕŻ ம௩ழியில் ŕŽ‡ŕŽ°ŕŻŕŽ¨ŕŻŕŽ¤ŕŻ ŕŽ†ŕŽ™ŕŻŕŽ•ŕŽżŕŽ˛ŕŽ¤ŕŻŕŽ¤ŕŻŕŽ•ŕŻŕŽ•ŕŻ
-+Name[tg]=WordReference.com Đ˘Đ°Ń€ŇˇŃƒĐźĐ°: франсавӣ йа ангНисӣ
- Name[tr]=WordReference.com Çevirisi: FransĹzcadan İngilizceye
- Name[uk]=WordReference.com: порокНад С Ń„Ń€Đ°Đ˝Ń†ŃƒĐˇŃŒĐşĐžŃ— на Đ°Đ˝ĐłĐťŃ–ĐšŃŃŒĐşŃƒ
- Name[uz]=WordReference.com тарМиПа: Đ¤Ń€Đ°Đ˝Ń†ŃƒĐˇŃ‡Đ°Đ´Đ°Đ˝ Đ˜Đ˝ĐłĐťĐ¸ĐˇŃ‡Đ°ĐłĐ°
-Index: kcontrol/ebrowsing/plugins/ikws/searchproviders/en2es.desktop
-===================================================================
---- kcontrol/ebrowsing/plugins/ikws/searchproviders/en2es.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/ebrowsing/plugins/ikws/searchproviders/en2es.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -48,6 +48,7 @@
- Name[sr at Latn]=Prevod na WordReference.com: sa engleskog na ĹĄpanski
- Name[sv]=Wordreference.com Üversättning: engelska till spanska
- Name[ta]=WordReference.com ŕŽŽŕŻŠŕŽ´ŕŽżŕŽŞŕŻ†ŕŽŻŕŽ°ŕŻŕŽŞŕŻŕŽŞŕŻ: ŕŽ†ŕŽ™ŕŻŕŽ•ŕŽżŕŽ˛ŕŽ¤ŕŻŕŽ¤ŕŽżŕŽ˛ŕŻ ŕŽ‡ŕŽ°ŕŻŕŽ¨ŕŻŕŽ¤ŕŻ ஸ்பானிஷ் ŕŽŽŕŻŠŕŽ´ŕŽżŕŽ•ŕŻŕŽ•ŕŻ
-+Name[tg]=WordReference.com Đ˘Đ°Ń€ŇˇŃƒĐźĐ°: ангНисӣ йа испанӣ
- Name[tr]=WordReference.com Çevirisi: İngilizceden İspanyolcaya
- Name[uk]=WordReference.com: порокНад С Đ°Đ˝ĐłĐťŃ–ĐšŃŃŒĐşĐžŃ— на Ń–ŃĐżĐ°Đ˝ŃŃŒĐşŃƒ
- Name[uz]=WordReference.com тарМиПа: Đ˜Đ˝ĐłĐťĐ¸ĐˇŃ‡Đ°Đ´Đ°Đ˝ Đ˜ŃĐżĐ°Đ˝Ń‡Đ°ĐłĐ°
-Index: kcontrol/ebrowsing/plugins/ikws/searchproviders/en2it.desktop
-===================================================================
---- kcontrol/ebrowsing/plugins/ikws/searchproviders/en2it.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/ebrowsing/plugins/ikws/searchproviders/en2it.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -48,6 +48,7 @@
- Name[sr at Latn]=Prevod na WordReference.com: sa engleskog na italijanski
- Name[sv]=Wordreference.com Üversättning: engelska till italienska
- Name[ta]=WordReference.com ŕŽŽŕŻŠŕŽ´ŕŽżŕŽŞŕŻ†ŕŽŻŕŽ°ŕŻŕŽŞŕŻŕŽŞŕŻ: ŕŽ†ŕŽ™ŕŻŕŽ•ŕŽżŕŽ˛ŕŽ¤ŕŻŕŽ¤ŕŽżŕŽ˛ŕŻ ŕŽ‡ŕŽ°ŕŻŕŽ¨ŕŻŕŽ¤ŕŻ ŕŽ‡ŕŽ¤ŕŻŕŽ¤ŕŽžŕŽ˛ŕŽżŕŽŻ ŕŽŽŕŻŠŕŽ´ŕŽżŕŽ•ŕŻŕŽ•ŕŻ
-+Name[tg]=WordReference.com Đ˘Đ°Ń€ŇˇŃƒĐźĐ°: ангНисӣ йа Đ¸Ń‚Đ°ĐťĐ¸ŃĐłÓŁ
- Name[tr]=WordReference.com Çevirisi: İngilizceden İtalyancaya
- Name[uk]=WordReference.com: порокНад С Đ°Đ˝ĐłĐťŃ–ĐšŃŃŒĐşĐžŃ— на Ń–Ń‚Đ°ĐťŃ–ĐšŃŃŒĐşŃƒ
- Name[uz]=WordReference.com тарМиПа: Đ˜Đ˝ĐłĐťĐ¸ĐˇŃ‡Đ°Đ´Đ°Đ˝ Đ˜Ń‚Đ°ĐťŃĐ˝Ń‡Đ°ĐłĐ°
-Index: kcontrol/ebrowsing/plugins/ikws/searchproviders/de2en.desktop
-===================================================================
---- kcontrol/ebrowsing/plugins/ikws/searchproviders/de2en.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/ebrowsing/plugins/ikws/searchproviders/de2en.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -40,6 +40,7 @@
- Name[sr at Latn]=Prevod na dict.cc: sa nemačkog na engleski
- Name[sv]=dict.cc Üversättning: tyska till engelska
- Name[ta]=dict.cc Translation ŕŽŽŕŻŠŕŽ´ŕŽżŕŽŞŕŻŕŽŞŕŻ†ŕŽŻŕŽ°ŕŻŕŽŞŕŻŕŽŞŕŻ: ŕŽœŕŻ†ŕŽ°ŕŻŕŽŽŕŽŠŕŻ ம௩ழியில் ŕŽ‡ŕŽ°ŕŻŕŽ¨ŕŻŕŽ¤ŕŻ ŕŽ†ŕŽ™ŕŻŕŽ•ŕŽżŕŽ˛ŕŽ¤ŕŻŕŽ¤ŕŻŕŽ•ŕŻŕŽ•ŕŻ
-+Name[tg]=WordReference.com Đ˘Đ°Ń€ŇˇŃƒĐźĐ°: ноПиси йа ангНисӣ
- Name[tr]=dict.cc Çevirisi: Almancadan İngilizceye
- Name[uk]=dict.cc: порокНад С Đ˝Ń–ĐźĐľŃ†ŃŒĐşĐžŃ— на Đ°Đ˝ĐłĐťŃ–ĐšŃŃŒĐşŃƒ
- Query=http://www.dict.cc/?s=\\{@}
-Index: kcontrol/ebrowsing/plugins/ikws/searchproviders/en2fr.desktop
-===================================================================
---- kcontrol/ebrowsing/plugins/ikws/searchproviders/en2fr.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/ebrowsing/plugins/ikws/searchproviders/en2fr.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -48,6 +48,7 @@
- Name[sr at Latn]=Prevod na WordReference.com: sa engleskog na francuski
- Name[sv]=Wordreference.com Üversättning: engelska till franska
- Name[ta]=WordReference.com ŕŽŽŕŻŠŕŽ´ŕŽżŕŽŞŕŻ†ŕŽŻŕŽ°ŕŻŕŽŞŕŻŕŽŞŕŻ: ŕŽ†ŕŽ™ŕŻŕŽ•ŕŽżŕŽ˛ŕŽ¤ŕŻŕŽ¤ŕŽżŕŽ˛ŕŻ ŕŽ‡ŕŽ°ŕŻŕŽ¨ŕŻŕŽ¤ŕŻ ŕŽŞŕŻŕŽ°ŕŻ†ŕŽŠŕŻŕŽšŕŻ ŕŽŽŕŻŠŕŽ´ŕŽżŕŽ•ŕŻŕŽ•ŕŻ
-+Name[tg]=WordReference.com Đ˘Đ°Ń€ŇˇŃƒĐźĐ°: ангНисӣ йа франсавӣ
- Name[tr]=WordReference.com Çevirisi: İngilizceden FransĹzcaya
- Name[uk]=WordReference.com: порокНад С Đ°Đ˝ĐłĐťŃ–ĐšŃŃŒĐşĐžŃ— на Ń„Ń€Đ°Đ˝Ń†ŃƒĐˇŃŒĐşŃƒ
- Name[uz]=WordReference.com тарМиПа: Đ˜Đ˝ĐłĐťĐ¸ĐˇŃ‡Đ°Đ´Đ°Đ˝ Đ¤Ń€Đ°Đ˝Ń†ŃƒĐˇŃ‡Đ°ĐłĐ°
-Index: kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop
-===================================================================
---- kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -55,7 +55,7 @@
- Name[uz]=Wikipedia - Đ‘ĐľĐżŃƒĐť ŃĐ˝Ń†Đ¸ĐşĐťĐžĐżĐľĐ´Đ¸Ń
- Name[vi]=Wikipedia -Báť™ tᝍ Ä‘iáťƒn bĂĄch khoa máť
n phĂ­
- Name[wa]=Wikipedia - Li libe eciclopedeye
--Name[zh_CN]=Wikipedia - ĺ
č´šçš„癞科ĺ
¨äšŚ
-+Name[zh_CN]=çť´ĺŸşç™žç§‘ - ĺ
č´šçš„癞科ĺ
¨äšŚ
- Name[zh_TW]=Wikipedia - ĺ
č˛ťçš„ Encyclopedia
- ServiceTypes=SearchProvider
- Keys=wp
-@@ -66,4 +66,5 @@
- Query[it]=http://it.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
- Query[nb]=http://no.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
- Query[pa]=http://en.wikipedia.org/wiki/Special:Search?search=\{@}&go=ŕ¨œŕ¨žŕ¨“
-+Query[zh_CN]=http://zh.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
- Charset=utf8
-Index: kcontrol/locale/default/entry.desktop
-===================================================================
---- kcontrol/locale/default/entry.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/locale/default/entry.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -16,7 +16,7 @@
- Name[es]=InglĂŠs de EEUU
- Name[et]=Inglise (US)
- Name[eu]=EEBBetako ingelesa
--Name[fi]=US-englanti
-+Name[fi]=Yhdysvaltain englanti
- Name[fr]=Anglais US
- Name[fy]=VS Ingelsk
- Name[gl]=InglĂŠs de EEUU
-Index: kcontrol/locale/language.desktop
-===================================================================
---- kcontrol/locale/language.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/locale/language.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -30,7 +30,7 @@
- Name[et]=Riik/regioon ja keel
- Name[eu]=Herrialdea eta hizkuntza
- Name[fa]=ÚŠŘ´ŮˆŘą/زبان Ůˆ Ů
نءقه
--Name[fi]=Maa/alue ja kieli
-+Name[fi]=Maa tai alue ja kieli
- Name[fr]=Pays & langue
- Name[fy]=Lân/regio en taal
- Name[ga]=TĂ­r/RĂŠigiĂşn agus Teanga
-Index: kcontrol/access/kcmaccess.desktop
-===================================================================
---- kcontrol/access/kcmaccess.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/access/kcmaccess.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -157,7 +157,7 @@
- Keywords[cy]=mynediad,hygyrchedd,byddar,cloch,cloch clywadwy,cloch gweladwy,bysellfwrdd,allweddell,bysell,bysell gludog,bysell sponcio,bysell araf,llywio llygoden,pad rhif
- Keywords[da]=adgang,tilgÌngelighed,døv,handicappet,klokke,hørbar klokke,synlig klokke,Tastatur,taster,klÌbrige taster,bounce-taster,langsomme taster,musenavigering,numerisk tastatur
- Keywords[de]=Behinderung,Maussteuerung,Signale,Tastatur,Tasten,Taubheit,Verlangsamte Tasten,Zahlenblock,Zugang,Zugangshilfen
--Keywords[el]=Ď€ĎĎŒĎƒÎ˛ÎąĎƒÎˇ,Ď€ĎÎżĎƒÎšĎ„ĎŒĎ„ÎˇĎ„Îą,ÎşĎ‰Ď†ĎŒĎ‚,impaired,κοĎ
δούνι,ικοĎ
ĎƒĎ„ÎŽ ÎľÎšÎ´ÎżĎ€ÎżÎŻÎˇĎƒÎˇ,οριτΎ ÎľÎšÎ´ÎżĎ€ÎżÎŻÎˇĎƒÎˇ,Î ÎťÎˇÎşĎ„ĎÎżÎťĎŒÎłÎšÎż,πΝΎκτρι,sticky keys,bounce keys,ιργΏ πΝΎκτρι,Ď€ÎťÎżÎŽÎłÎˇĎƒÎˇ Ď€ÎżÎ˝Ď„ÎšÎşÎšÎżĎ,ÎąĎÎšÎ¸ÎźÎˇĎ„ÎšÎşĎŒ Ď€ÎťÎˇÎşĎ„ĎÎżÎťĎŒÎłÎšÎż
-+Keywords[el]=Ď€ĎĎŒĎƒÎ˛ÎąĎƒÎˇ,Ď€ĎÎżĎƒÎšĎ„ĎŒĎ„ÎˇĎ„Îą,ÎşĎ‰Ď†ĎŒĎ‚,impaired,κοĎ
δούνι,ικοĎ
ĎƒĎ„ÎŽ ÎľÎšÎ´ÎżĎ€ÎżÎŻÎˇĎƒÎˇ,οριτΎ ÎľÎšÎ´ÎżĎ€ÎżÎŻÎˇĎƒÎˇ,Î ÎťÎˇÎşĎ„ĎÎżÎťĎŒÎłÎšÎż,πΝΎκτρι,κοΝΝΡΟένι πΝΎκτρι,πΝΎκτρι ÎąÎ˝ÎąĎ€ÎŽÎ´ÎˇĎƒÎˇĎ‚,ιργΏ πΝΎκτρι,Ď€ÎťÎżÎŽÎłÎˇĎƒÎˇ Ď€ÎżÎ˝Ď„ÎšÎşÎšÎżĎ,ÎąĎÎšÎ¸ÎźÎˇĎ„ÎšÎşĎŒ Ď€ÎťÎˇÎşĎ„ĎÎżÎťĎŒÎłÎšÎż
- Keywords[eo]=aliro,handikapito,malhelpito,pepo,videbla pepo,klavaro,klavoj,klavfikso, musnavigado,nombroklavaro
- Keywords[es]=acceso,accesibilidad,sordo,disminuido,timbre,timbre audible,timbre visible,Teclado,teclas,teclas pegajosas,teclas de golpe,teclas lentas,navegaciĂłn del ratĂłn,teclado numĂŠrico
- Keywords[et]=juurdepääs,kurt,puue,puudega,signaal,kuuldav signaal,visuaalne signaal,klaviatuur,klahvid,kleepuvad klahvid,pþrkavad klahvid,aeglased klahvid,hiire liigutamine,numbriklaviatuur
-Index: kcontrol/smserver/kcmsmserver.desktop
-===================================================================
---- kcontrol/smserver/kcmsmserver.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/smserver/kcmsmserver.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -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/desktop.desktop
-===================================================================
---- kcontrol/konq/desktop.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/konq/desktop.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -16,6 +16,7 @@
- Name[az]=Masa ĂœstlÉ™ri
- Name[bg]=РайОтни пНОтОво
- Name[bn]=ŕŚŕŚ•ŕŚžŕŚ§ŕŚżŕŚ• ŕŚĄŕ§‡ŕŚ¸ŕ§ŕŚ•ŕŚŸŕŚŞ
-+Name[br]=Lies burev
- Name[bs]=ViĹĄestruki desktopi
- Name[ca]=MĂşltiples escriptoris
- Name[cs]=VirtuĂĄlnĂ­ plochy
-Index: kcontrol/konq/desktoppath.desktop
-===================================================================
---- kcontrol/konq/desktoppath.desktop	(.../tags/KDE/3.4.2/kdebase)	(revision 457276)
-+++ kcontrol/konq/desktoppath.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -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 457276)
-+++ kcontrol/konq/webappearance.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -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 457276)
-+++ kcontrol/konq/filebehavior.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -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 457276)
-+++ kcontrol/konq/fileappearance.desktop	(.../branches/KDE/3.4/kdebase)	(revision 457276)
-@@ -52,7 +52,7 @@
- Name[nl]=Uiterlijk
- Name[nn]=UtsjĂĽnad
<<Diff was trimmed, longer than 597 lines>>

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




More information about the pld-cvs-commit mailing list