SOURCES: kdebase-branch.diff - updated
arekm
arekm at pld-linux.org
Fri Aug 26 11:34:51 CEST 2005
Author: arekm Date: Fri Aug 26 09:34:51 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdebase-branch.diff (1.16 -> 1.17)
---- Diffs:
================================================================
Index: SOURCES/kdebase-branch.diff
diff -u SOURCES/kdebase-branch.diff:1.16 SOURCES/kdebase-branch.diff:1.17
--- SOURCES/kdebase-branch.diff:1.16 Sun Aug 7 10:30:42 2005
+++ SOURCES/kdebase-branch.diff Fri Aug 26 11:34:45 2005
@@ -1,20 +1,7 @@
-Index: kate/plugins/defaultproject/katedefaultproject.desktop
-===================================================================
---- kate/plugins/defaultproject/katedefaultproject.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kate/plugins/defaultproject/katedefaultproject.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
-@@ -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 443740)
-+++ kate/data/x-kate-project.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kate/data/x-kate-project.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kate/data/x-kate-project.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -58,7 +58,7 @@
Comment[tr]=Kate Proje DosyasÄą
Comment[uk]=ФаКН ĐżŃ€ĐžĐľĐşŃ‚Ńƒ Kate
@@ -26,8 +13,17 @@
Type=QString
Index: kdepasswd/kcm/kcm_useraccount.desktop
===================================================================
---- kdepasswd/kcm/kcm_useraccount.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kdepasswd/kcm/kcm_useraccount.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kdepasswd/kcm/kcm_useraccount.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kdepasswd/kcm/kcm_useraccount.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
+@@ -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
@@ -48,8 +44,8 @@
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 443740)
-+++ kpersonalizer/kpersonalizer.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kpersonalizer/kpersonalizer.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kpersonalizer/kpersonalizer.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -47,7 +47,7 @@
Name[nl]=KDE's Configuratie Assistent
Name[nn]=Vegvisar for skrivebordsoppsett
@@ -59,6 +55,19 @@
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 453462)
++++ kcontrol/background/background.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
+@@ -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/Windows2000.kcsrc
===================================================================
Cannot display: file marked as a binary type.
@@ -75,10 +84,14 @@
===================================================================
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 443740)
-+++ kcontrol/usbview/kcmusb.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/usbview/kcmusb.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/usbview/kcmusb.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -185,6 +185,7 @@
Keywords[nl]=USB,devices,viewer,control,weergaveprogramma
Keywords[nn]=USB,einingar,visar,kontroll
@@ -89,8 +102,8 @@
Keywords[pt_BR]=USB,dispositivos,visualizador,controle
Index: kcontrol/taskbar/kcmtaskbar.desktop
===================================================================
---- kcontrol/taskbar/kcmtaskbar.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/taskbar/kcmtaskbar.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/taskbar/kcmtaskbar.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/taskbar/kcmtaskbar.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -52,7 +52,7 @@
Name[nn]=OppgĂĽvelinje
Name[nso]=Bar ya Mosongwana
@@ -109,10 +122,31 @@
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/searchwidget.cpp
+===================================================================
+--- kcontrol/kcontrol/searchwidget.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/kcontrol/searchwidget.cpp (.../branches/KDE/3.4/kdebase) (revision 453462)
+@@ -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/nics/nic.desktop
===================================================================
---- kcontrol/nics/nic.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/nics/nic.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/nics/nic.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/nics/nic.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
+@@ -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
@@ -131,10 +165,113 @@
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 453462)
++++ kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp (.../branches/KDE/3.4/kdebase) (revision 453462)
+@@ -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/wikipedia.desktop
+===================================================================
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
+@@ -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 453462)
++++ kcontrol/locale/default/entry.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
+@@ -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 453462)
++++ kcontrol/locale/language.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
+@@ -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/smserver/kcmsmserver.desktop
===================================================================
---- kcontrol/smserver/kcmsmserver.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/smserver/kcmsmserver.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/smserver/kcmsmserver.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/smserver/kcmsmserver.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -55,7 +55,7 @@
Name[nl]=Sessiebeheer
Name[nn]=Ă˜kthandsamar
@@ -153,10 +290,22 @@
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 453462)
++++ kcontrol/konq/desktop.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
+@@ -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 443740)
-+++ kcontrol/konq/desktoppath.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/konq/desktoppath.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/konq/desktoppath.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -50,7 +50,7 @@
Name[nl]=Paden
Name[nn]=Stiar
@@ -186,8 +335,8 @@
Index: kcontrol/konq/webappearance.desktop
===================================================================
---- kcontrol/konq/webappearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/konq/webappearance.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/konq/webappearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/konq/webappearance.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -52,7 +52,7 @@
Name[nl]=Uiterlijk
Name[nn]=UtsjĂĽnad
@@ -199,8 +348,8 @@
Name[pt_BR]=AparĂŞncia
Index: kcontrol/konq/filebehavior.desktop
===================================================================
---- kcontrol/konq/filebehavior.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/konq/filebehavior.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/konq/filebehavior.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/konq/filebehavior.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -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,ŕŽ•ŕŻŕŽąŕŽżŕŽŞŕŻŕŽŞŕŻŕŽ•ŕŽłŕŻ,ŕŽ•ŕŻ‹ŕŽŞŕŻŕŽŞŕŻ ŕŽ•ŕŻŕŽąŕŽżŕŽŞŕŻŕŽŞŕŻŕŽ•ŕŽłŕŻ,தனி ஹாளரமŕŻ,ŕŽ¨ŕŻ€ŕŽłŕŻŕŽľŕŽŸŕŻŕŽŸ ஹாளரமŕŻ,ŕŽ¨ŕŽŸŕŽ¤ŕŻŕŽ¤ŕŻˆ,ŕŽ¨ŕŽżŕŽŠŕŻˆŕŽľŕŻ ŕŽŞŕŽŻŕŽŠŕŻŕŽŞŕŽžŕŽŸŕŻ,ŕŽľŕŻ€ŕŽŸŕŻŕŽŸŕŻ ŕŽľŕŽ˛ŕŻˆŕŽŞŕŻŕŽŞŕŽżŕŽŠŕŻŕŽŠŕŽ˛ŕŻ,ŕŽľŕŽ˛ŕŻˆŕŽŞŕŻŕŽŞŕŽżŕŽŠŕŻŕŽŠŕŽ˛ŕŻ ŕŽšŕŻ†ŕŽŻŕŽ˛ŕŻŕŽŞŕŽžŕŽŸŕŻŕŽ•ŕŽłŕŻ, வழிமŕŻŕŽąŕŻˆ ŕŽ‰ŕŽ°ŕŻˆŕŽŻŕŽžŕŽŸŕŽ˛ŕŻ,ŕŽ•ŕŻŕŽŞŕŻŕŽŞŕŻˆŕŽ¤ŕŻŕŽ¤ŕŻŠŕŽŸŕŻŕŽŸŕŽż, ŕŽ¨ŕŻ€ŕŽ•ŕŻŕŽ•ŕŻ,ŕŽ‰ŕŽąŕŻŕŽ¤ŕŽżŕŽŞŕŻŕŽŞŕŽŸŕŻŕŽ¤ŕŻŕŽ¤ŕŽ˛ŕŻ
@@ -208,8 +357,8 @@
+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 443740)
-+++ kcontrol/konq/fileappearance.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/konq/fileappearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/konq/fileappearance.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -52,7 +52,7 @@
Name[nl]=Uiterlijk
Name[nn]=UtsjĂĽnad
@@ -221,8 +370,8 @@
Name[pt_BR]=AparĂŞncia
Index: kcontrol/konq/filepreviews.desktop
===================================================================
---- kcontrol/konq/filepreviews.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/konq/filepreviews.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/konq/filepreviews.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/konq/filepreviews.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -46,7 +46,7 @@
Name[nds]=VĂśransichten & Meta-Daten
Name[nl]=Voorbeelden en meta-data
@@ -234,8 +383,8 @@
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 443740)
-+++ kcontrol/kicker/kicker_config_appearance.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/kicker/kicker_config_appearance.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/kicker/kicker_config_appearance.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -52,7 +52,7 @@
Name[nl]=Uiterlijk
Name[nn]=UtsjĂĽnad
@@ -247,8 +396,8 @@
Name[pt_BR]=AparĂŞncia
Index: kcontrol/privacy/privacy.desktop
===================================================================
---- kcontrol/privacy/privacy.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/privacy/privacy.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/privacy/privacy.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/privacy/privacy.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -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.
@@ -275,10 +424,23 @@
Name[pl]=Prywatność
Name[pt]=Privacidade
Name[pt_BR]=Privacidade
+Index: kcontrol/kfontinst/thumbnail/FontThumbnail.cpp
+===================================================================
+--- kcontrol/kfontinst/thumbnail/FontThumbnail.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/kfontinst/thumbnail/FontThumbnail.cpp (.../branches/KDE/3.4/kdebase) (revision 453462)
+@@ -38,7 +38,7 @@
+
+ extern "C"
+ {
+- ThumbCreator *new_creator()
++ KDE_EXPORT ThumbCreator *new_creator()
+ {
+ return new KFI::CFontThumbnail;
+ }
Index: kcontrol/kfontinst/lib/FcEngine.cpp
===================================================================
---- kcontrol/kfontinst/lib/FcEngine.cpp (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/kfontinst/lib/FcEngine.cpp (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/kfontinst/lib/FcEngine.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/kfontinst/lib/FcEngine.cpp (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -833,6 +833,7 @@
QString name(url.fileName());
int pos;
@@ -289,8 +451,8 @@
if(-1==(pos=name.find(", "))) // No style information...
Index: kcontrol/screensaver/testwin.h
===================================================================
---- kcontrol/screensaver/testwin.h (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/screensaver/testwin.h (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/screensaver/testwin.h (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/screensaver/testwin.h (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -1,9 +1,9 @@
#ifndef TESTWIN_H
#define TESTWIN_H
@@ -305,8 +467,8 @@
public:
Index: kcontrol/screensaver/screensaver.desktop
===================================================================
---- kcontrol/screensaver/screensaver.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/screensaver/screensaver.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/screensaver/screensaver.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/screensaver/screensaver.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -117,7 +117,7 @@
Comment[nl]=Schermbeveiliging instellen
Comment[nn]=Innstillingar for skjermsparar
@@ -327,7 +489,7 @@
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 443740)
++++ kcontrol/screensaver/configure.in.in (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -0,0 +1,8 @@
+AC_HAVE_GL(
+ [
@@ -339,8 +501,8 @@
+ )
Index: kcontrol/screensaver/kssmonitor.h
===================================================================
---- kcontrol/screensaver/kssmonitor.h (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/screensaver/kssmonitor.h (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/screensaver/kssmonitor.h (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/screensaver/kssmonitor.h (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -1,13 +1,12 @@
#ifndef KSSMONITOR_H
#define KSSMONITOR_H
@@ -361,7 +523,7 @@
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 443740)
++++ kcontrol/screensaver/kswidget.cpp (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -0,0 +1,40 @@
+#include <config.h>
+
@@ -405,8 +567,8 @@
+#include "kswidget.moc"
Index: kcontrol/screensaver/scrnsave.cpp
===================================================================
---- kcontrol/screensaver/scrnsave.cpp (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/screensaver/scrnsave.cpp (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/screensaver/scrnsave.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/screensaver/scrnsave.cpp (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -46,10 +46,7 @@
#include "scrnsave.h"
@@ -422,7 +584,7 @@
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 443740)
++++ kcontrol/screensaver/kswidget.h (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -0,0 +1,13 @@
+#ifndef KSWIDGET_H
+#define KSWIDGET_H
@@ -439,8 +601,8 @@
+#endif
Index: kcontrol/screensaver/Makefile.am
===================================================================
---- kcontrol/screensaver/Makefile.am (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/screensaver/Makefile.am (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/screensaver/Makefile.am (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/screensaver/Makefile.am (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -1,11 +1,12 @@
-AM_CPPFLAGS = $(all_includes)
@@ -459,8 +621,8 @@
noinst_HEADERS = scrnsave.h
Index: kcontrol/screensaver/testwin.cpp
===================================================================
---- kcontrol/screensaver/testwin.cpp (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/screensaver/testwin.cpp (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/screensaver/testwin.cpp (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/screensaver/testwin.cpp (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -4,7 +4,7 @@
class QXEmbed;
@@ -472,8 +634,8 @@
KWin::setState( winId(), NET::StaysOnTop );
Index: kcontrol/kio/lanbrowser.desktop
===================================================================
---- kcontrol/kio/lanbrowser.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/kio/lanbrowser.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/kio/lanbrowser.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/kio/lanbrowser.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -49,7 +49,7 @@
Name[nl]=Lokaal netwerk
Name[nn]=Lokalt nettverk
@@ -493,8 +655,8 @@
Keywords[pt_BR]=samba,smb,windows,rede
Index: kcontrol/kio/proxy.desktop
===================================================================
---- kcontrol/kio/proxy.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/kio/proxy.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/kio/proxy.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/kio/proxy.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -40,7 +40,7 @@
Name[nb]=Mellomtjener
Name[nn]=Mellomtenar
@@ -514,8 +676,8 @@
Keywords[pt_BR]=Proxy,Servidor Proxy,Firewall,Squid,proxy
Index: kcontrol/kio/cookies.desktop
===================================================================
---- kcontrol/kio/cookies.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/kio/cookies.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/kio/cookies.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/kio/cookies.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -181,7 +181,7 @@
Keywords[ven]=Cookies,Burousini.Inithenete,WWW<Vhukwamani,Pholisi,Domaini
Keywords[vi]=Cookies,Duyᝇt,Internet,WWW,Mấng,ChĂnh sĂĄch,TĂŞn miáťn
@@ -527,8 +689,8 @@
Index: kcontrol/kio/useragent.desktop
===================================================================
---- kcontrol/kio/useragent.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/kio/useragent.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/kio/useragent.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/kio/useragent.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -50,7 +50,7 @@
Name[nl]=Browseridentificatie
Name[nn]=Nettlesaridentifikasjon
@@ -540,8 +702,8 @@
Name[pt_BR]=Identificação do Navegador
Index: kcontrol/kio/cache.desktop
===================================================================
---- kcontrol/kio/cache.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/kio/cache.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/kio/cache.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/kio/cache.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -102,7 +102,7 @@
Comment[nl]=Hier kunt u de webcache instellen
Comment[nn]=Oppsett av vevmellomlager
@@ -553,8 +715,8 @@
Comment[pt_BR]=Configura as preferĂŞncias de cache
Index: kcontrol/kio/uasproviders/mozoncurrent12.desktop
===================================================================
---- kcontrol/kio/uasproviders/mozoncurrent12.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/kio/uasproviders/mozoncurrent12.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/kio/uasproviders/mozoncurrent12.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/kio/uasproviders/mozoncurrent12.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -33,7 +33,7 @@
Name[nds]=UA-Beschrieven (Mozilla 1.2.1 op dit Systeem)
Name[nl]=GA-beschrijving (Mozilla 1.2.1 op current)
@@ -566,8 +728,8 @@
Name[pt_BR]=Descrição (Mozilla 1.2.1 no sistema atual)
Index: kcontrol/kio/uasproviders/ie45onwinnt5.desktop
===================================================================
---- kcontrol/kio/uasproviders/ie45onwinnt5.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/kio/uasproviders/ie45onwinnt5.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/kio/uasproviders/ie45onwinnt5.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/kio/uasproviders/ie45onwinnt5.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -37,7 +37,7 @@
Name[nl]=GA-beschrijving (IE 4.5 op Win 2000)
Name[nn]=Brukaragent (IE 4.5 pĂĽ Win 2000)
@@ -579,8 +741,8 @@
Name[pt_BR]=Descrição (IE 4.5 no Win 2000)
Index: kcontrol/kio/uasproviders/ie55onwinnt5.desktop
===================================================================
---- kcontrol/kio/uasproviders/ie55onwinnt5.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/kio/uasproviders/ie55onwinnt5.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/kio/uasproviders/ie55onwinnt5.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/kio/uasproviders/ie55onwinnt5.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -36,7 +36,7 @@
Name[nl]=GA-beschrijving (IE 5.5 op Win 2000)
Name[nn]=Brukaragent (IE 5.5 pĂĽ Win 2000)
@@ -592,8 +754,8 @@
Name[pt_BR]=Descrição (IE 5.5 no Win 2000)
Index: kcontrol/kio/uasproviders/nn475oncurrent.desktop
===================================================================
---- kcontrol/kio/uasproviders/nn475oncurrent.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/kio/uasproviders/nn475oncurrent.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/kio/uasproviders/nn475oncurrent.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/kio/uasproviders/nn475oncurrent.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -35,7 +35,7 @@
Name[nl]=GA-beschrijving (NN 4.76 op huidige)
Name[nn]=Brukaragent (NN 4.76 pĂĽ denne)
@@ -605,8 +767,8 @@
Name[pt_BR]=Descrição (NN 4.76 no sistema atual)
Index: kcontrol/kio/uasproviders/mozoncurrent16.desktop
===================================================================
---- kcontrol/kio/uasproviders/mozoncurrent16.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/kio/uasproviders/mozoncurrent16.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/kio/uasproviders/mozoncurrent16.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/kio/uasproviders/mozoncurrent16.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -31,7 +31,7 @@
Name[nds]=UA-Beschrieven (Mozilla 1.6 op dit Systeem)
Name[nl]=GA-beschrijving (Mozilla 1.6 op current)
@@ -618,8 +780,8 @@
Name[pt_BR]=Descrição (Mozilla 1.6 no sistema atual)
Index: kcontrol/kio/uasproviders/nn476onppc.desktop
===================================================================
---- kcontrol/kio/uasproviders/nn476onppc.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/kio/uasproviders/nn476onppc.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/kio/uasproviders/nn476onppc.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/kio/uasproviders/nn476onppc.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -36,7 +36,7 @@
Name[nl]=GA-beschrijving (NN op Mac PPC)
Name[nn]=Brukaragent (NN pĂĽ Mac PPC)
@@ -631,8 +793,8 @@
Name[pt_BR]=Descrição (NN no Mac PPC)
Index: kcontrol/kio/uasproviders/mozonwin2000.desktop
===================================================================
---- kcontrol/kio/uasproviders/mozonwin2000.desktop (.../tags/KDE/3.4.2/kdebase) (revision 443740)
-+++ kcontrol/kio/uasproviders/mozonwin2000.desktop (.../branches/KDE/3.4/kdebase) (revision 443740)
+--- kcontrol/kio/uasproviders/mozonwin2000.desktop (.../tags/KDE/3.4.2/kdebase) (revision 453462)
++++ kcontrol/kio/uasproviders/mozonwin2000.desktop (.../branches/KDE/3.4/kdebase) (revision 453462)
@@ -24,7 +24,7 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.16&r2=1.17&f=u
More information about the pld-cvs-commit
mailing list