SOURCES: kdebase-branch.diff, kdelibs-branch.diff, kdenetwork-bran...
arekm
arekm at pld-linux.org
Fri Jan 11 18:10:07 CET 2008
Author: arekm Date: Fri Jan 11 17:10:07 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdebase-branch.diff (1.67 -> 1.68) , kdelibs-branch.diff (1.69 -> 1.70) , kdenetwork-branch.diff (1.31 -> 1.32) , kdepim-branch.diff (1.53 -> 1.54)
---- Diffs:
================================================================
Index: SOURCES/kdebase-branch.diff
diff -u SOURCES/kdebase-branch.diff:1.67 SOURCES/kdebase-branch.diff:1.68
--- SOURCES/kdebase-branch.diff:1.67 Wed Jan 2 22:35:37 2008
+++ SOURCES/kdebase-branch.diff Fri Jan 11 18:09:59 2008
@@ -1,7 +1,7 @@
Index: ksmserver/legacy.cpp
===================================================================
---- ksmserver/legacy.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ ksmserver/legacy.cpp (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- ksmserver/legacy.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ ksmserver/legacy.cpp (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -272,6 +272,10 @@
for ( int i = 1; i <= count; i++ ) {
QString n = QString::number(i);
@@ -15,8 +15,8 @@
config->readEntry( QString("userId")+n ));
Index: ksmserver/server.cpp
===================================================================
---- ksmserver/server.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ ksmserver/server.cpp (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- ksmserver/server.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ ksmserver/server.cpp (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -903,12 +903,16 @@
bool KSMServer::isWM( const KSMClient* client ) const
@@ -38,8 +38,8 @@
bool KSMServer::defaultSession() const
Index: ksmserver/server.h
===================================================================
---- ksmserver/server.h (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ ksmserver/server.h (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- ksmserver/server.h (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ ksmserver/server.h (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -138,6 +138,7 @@
void executeCommand( const QStringList& command );
@@ -50,8 +50,8 @@
Index: kcontrol/krdb/krdb.cpp
===================================================================
---- kcontrol/krdb/krdb.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/krdb/krdb.cpp (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/krdb/krdb.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/krdb/krdb.cpp (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -399,6 +399,7 @@
t << " fg[NORMAL] = " << color( group.foreground() ) << endl;
t << "}" << endl;
@@ -60,10 +60,133 @@
t << "widget \"gtk-tooltips\" style \"ToolTip\"" << endl;
t << endl;
+Index: kcontrol/kcontrol/modules.cpp
+===================================================================
+--- kcontrol/kcontrol/modules.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/kcontrol/modules.cpp (.../branches/KDE/3.5/kdebase) (wersja 759908)
+@@ -48,7 +48,7 @@
+
+ ConfigModule::ConfigModule(const KService::Ptr &s)
+ : KCModuleInfo(s), _changed(false), _module(0), _embedWidget(0),
+- _rootProcess(0), _embedLayout(0), _embedFrame(0)
++ _rootProcess(0), _embedLayout(0), _embedFrame(0), _embedStack(0)
+ {
+ }
+
+@@ -97,6 +97,8 @@
+
+ delete _embedWidget;
+ _embedWidget = 0;
++ delete _embedStack;
++ _embedStack = 0;
+ delete _embedFrame;
+ _embedFrame = 0;
+ kapp->syncX();
+@@ -136,6 +138,7 @@
+ delete _rootProcess;
+ delete _embedWidget;
+ delete _embedLayout;
++ delete _embedStack;
+
+ // create an embed widget that will embed the
+ // kcmshell running as root
+@@ -149,14 +152,18 @@
+ _embedFrame->setLineWidth( 2 );
+ _embedFrame->setMidLineWidth( 2 );
+ _embedLayout->addWidget(_embedFrame,1);
+- _embedWidget = new QXEmbed(_embedFrame );
++ // cannot reparent anything else inside QXEmbed, so put the busy label separately
++ _embedStack = new QWidgetStack(_embedFrame);
++ _embedWidget = new KControlEmbed(_embedStack);
+ _module->hide();
+ _embedFrame->show();
+- QLabel *_busy = new QLabel(i18n("<big>Loading...</big>"), _embedWidget);
++ QLabel *_busy = new QLabel(i18n("<big>Loading...</big>"), _embedStack);
+ _busy->setAlignment(AlignCenter);
+ _busy->setTextFormat(RichText);
+ _busy->setGeometry(0,0, _module->width(), _module->height());
+ _busy->show();
++ _embedStack->raiseWidget(_busy);
++ connect(_embedWidget, SIGNAL( windowEmbedded(WId)), SLOT( embedded()));
+
+ // prepare the process to run the kcmshell
+ QString cmd = service()->exec().stripWhiteSpace();
+@@ -209,6 +216,8 @@
+ }
+
+ // clean up in case of failure
++ delete _embedStack;
++ _embedStack = 0;
+ delete _embedFrame;
+ _embedWidget = 0;
+ delete _embedLayout;
+@@ -239,6 +248,11 @@
+ emit childClosed();
+ }
+
++void ConfigModule::embedded()
++{
++ _embedStack->raiseWidget(_embedWidget); // put it above the busy label
++}
++
+ const KAboutData *ConfigModule::aboutData() const
+ {
+ if (!_module) return 0;
+Index: kcontrol/kcontrol/modules.h
+===================================================================
+--- kcontrol/kcontrol/modules.h (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/kcontrol/modules.h (.../branches/KDE/3.5/kdebase) (wersja 759908)
+@@ -23,6 +23,7 @@
+ #include <kcmoduleinfo.h>
+ #include <qobject.h>
+ #include <qdict.h>
++#include <qxembed.h>
+
+ template<class ConfigModule> class QPtrList;
+ class QStringList;
+@@ -33,6 +34,7 @@
+ class QXEmbed;
+ class QVBoxLayout;
+ class QVBox;
++class QWidgetStack;
+
+ class ConfigModule : public QObject, public KCModuleInfo
+ {
+@@ -62,6 +64,7 @@
+ void clientChanged(bool state);
+ void runAsRoot();
+ void rootExited(KProcess *proc);
++ void embedded();
+
+
+ signals:
+@@ -80,6 +83,7 @@
+ KProcess *_rootProcess;
+ QVBoxLayout *_embedLayout;
+ QVBox *_embedFrame;
++ QWidgetStack *_embedStack;
+
+ };
+
+@@ -119,4 +123,14 @@
+ QDict<Menu> subMenus;
+ };
+
++class KControlEmbed : public QXEmbed
++ {
++ Q_OBJECT
++ public:
++ KControlEmbed( QWidget* w ) : QXEmbed( w ) {}
++ virtual void windowChanged( WId w ) { if( w ) emit windowEmbedded( w ); }
++ signals:
++ void windowEmbedded( WId w );
++ };
++
+ #endif
Index: kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop
===================================================================
---- kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -27,7 +27,6 @@
Name[ne]=डाइरेक्टरी खोल्नुहोस्
Name[pa]=ਖੁੱਲੀ ਡਾਇਰੈਕਟਰੀ
@@ -74,8 +197,8 @@
Name[rw]= Gufungura Inkoranyamagambo
Index: kcontrol/locale/default/entry.desktop
===================================================================
---- kcontrol/locale/default/entry.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/locale/default/entry.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/locale/default/entry.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/locale/default/entry.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -14,7 +14,7 @@
Name[da]=Engelsk US
Name[de]=US-Englisch
@@ -87,8 +210,8 @@
Name[eu]=EEBBetako ingelesa
Index: kcontrol/filetypes/filetypes.desktop
===================================================================
---- kcontrol/filetypes/filetypes.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/filetypes/filetypes.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/filetypes/filetypes.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/filetypes/filetypes.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -202,7 +202,7 @@
Keywords[nds]=Dateitypen,Datei-Tohören,Mime Typen,Dateimuster,Datei,Muster
Keywords[ne]=फाइल प्रकार, फाइल संयोजन, माइम प्रकार, फाइल बाँन्की, फाइलहरू, बाँन्की
@@ -100,8 +223,8 @@
Keywords[pl]=Typy plików,skojarzenia plików,typy MIME,wzorce plików,pliki,wzorzec
Index: kcontrol/smserver/kcmsmserver.desktop
===================================================================
---- kcontrol/smserver/kcmsmserver.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/smserver/kcmsmserver.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/smserver/kcmsmserver.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/smserver/kcmsmserver.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -65,7 +65,7 @@
Name[pt]=Gestor de Sessões
Name[pt_BR]=Gerenciador de Sessão
@@ -122,8 +245,8 @@
Comment[sk]=Nastavenie správcu sedení a odhlásenia
Index: kcontrol/kded/kcmkded.desktop
===================================================================
---- kcontrol/kded/kcmkded.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/kded/kcmkded.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/kded/kcmkded.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/kded/kcmkded.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -126,7 +126,7 @@
Comment[mn]=Системийн үйлчилгээний тохируулга
Comment[ms]=Konfigurasi Servis Sistem
@@ -135,8 +258,8 @@
Comment[nl]=KDE-systeemdiensten instellen
Index: kcontrol/kicker/kicker_config_appearance.desktop
===================================================================
---- kcontrol/kicker/kicker_config_appearance.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/kicker/kicker_config_appearance.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/kicker/kicker_config_appearance.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/kicker/kicker_config_appearance.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -173,7 +173,7 @@
Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoliad,maint,awto-guddio,hunan-guddio,cuddio,botymau,animeiddiad,cefndir,themâu,storfa dewislen, storfa,cache,celc,cudd,K-Menu,nodau tudalen,dogfenni diweddar,porydd cyflym,dewislen porydd,dewislen,eiconau,teiliau,rhaglenigion,ymcychwyn,amlygu,carnau,eiconau chwyddo
Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,K-Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner
@@ -148,8 +271,8 @@
Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,K-menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase
Index: kcontrol/kicker/kicker_config_arrangement.desktop
===================================================================
---- kcontrol/kicker/kicker_config_arrangement.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/kicker/kicker_config_arrangement.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/kicker/kicker_config_arrangement.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/kicker/kicker_config_arrangement.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -156,7 +156,7 @@
Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoliad,maint,awto-guddio,hunan-guddio,cuddio,botymau,animeiddiad,cefndir,themâu,storfa dewislen, storfa,cache,celc,cudd,K-Menu,nodau tudalen,dogfenni diweddar,porydd cyflym,dewislen porydd,dewislen,eiconau,teiliau,rhaglenigion,ymcychwyn,amlygu,carnau,eiconau chwyddo
Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,K-Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner
@@ -161,8 +284,8 @@
Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,K-menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase
Index: kcontrol/kicker/kicker_config.desktop
===================================================================
---- kcontrol/kicker/kicker_config.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/kicker/kicker_config.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/kicker/kicker_config.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/kicker/kicker_config.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -167,7 +167,7 @@
Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoliad,maint,awto-guddio,hunan-guddio,cuddio,botymau,animeiddiad,cefndir,themâu,storfa dewislen, storfa,cache,celc,cudd,K-Menu,nodau tudalen,dogfenni diweddar,porydd cyflym,dewislen porydd,dewislen,eiconau,teiliau,rhaglenigion,ymcychwyn,amlygu,carnau,eiconau chwyddo
Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,K-Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner
@@ -174,8 +297,8 @@
Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,K-menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase
Index: kcontrol/kicker/panel.desktop
===================================================================
---- kcontrol/kicker/panel.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/kicker/panel.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/kicker/panel.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/kicker/panel.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -166,7 +166,7 @@
Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoliad,maint,awto-guddio,hunan-guddio,cuddio,botymau,animeiddiad,cefndir,themâu,storfa dewislen, storfa,cache,celc,cudd,K-Menu,nodau tudalen,dogfenni diweddar,porydd cyflym,dewislen porydd,dewislen,eiconau,teiliau,rhaglenigion,ymcychwyn,amlygu,carnau,eiconau chwyddo
Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,K-Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner
@@ -187,8 +310,8 @@
Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,K-menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase
Index: kcontrol/kicker/kicker_config_hiding.desktop
===================================================================
---- kcontrol/kicker/kicker_config_hiding.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/kicker/kicker_config_hiding.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/kicker/kicker_config_hiding.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/kicker/kicker_config_hiding.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -146,7 +146,7 @@
Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoliad,maint,awto-guddio,hunan-guddio,cuddio,botymau,animeiddiad,cefndir,themâu,storfa dewislen, storfa,cache,celc,cudd,K-Menu,nodau tudalen,dogfenni diweddar,porydd cyflym,dewislen porydd,dewislen,eiconau,teiliau,rhaglenigion,ymcychwyn,amlygu,carnau,eiconau chwyddo
Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,K-Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner
@@ -200,8 +323,8 @@
Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,K-menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase
Index: kcontrol/kicker/kicker_config_menus.desktop
===================================================================
---- kcontrol/kicker/kicker_config_menus.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/kicker/kicker_config_menus.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/kicker/kicker_config_menus.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/kicker/kicker_config_menus.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -143,7 +143,7 @@
Keywords[cy]=ciciwr,kicker,panel,kpanel,bar tasgau,bar cychwyn,bar lansio,lleoliad,maint,awto-guddio,hunan-guddio,cuddio,botymau,animeiddiad,cefndir,themâu,storfa dewislen, storfa,cache,celc,cudd,K-Menu,nodau tudalen,dogfenni diweddar,porydd cyflym,dewislen porydd,dewislen,eiconau,teiliau,rhaglenigion,ymcychwyn,amlygu,carnau,eiconau chwyddo
Keywords[da]=kicker,panel,kpanel,opgavelinje,startlinje,sted,størrelse,autogem,gem,knapper,animering,baggrund,temaer,menucache,cache,skjult,K-Menu,bogmærker,nylige dokumenter,hurtigsøger,søgemenu,menu,ikoner,fliser,panelprogrammer,opstart,markér,håndterer,ikoner
@@ -213,8 +336,8 @@
Keywords[et]=kicker,paneel,kpanel,tegumiriba,käivitusriba,asukoht,suurus,terminal,automaatne peitmine,peitmine,nupud,animatsioon,taust,teemad,menüü vahemälu,vahemälu,peidetud,K-menüü,järjehoidjad,viimati kasutatud dokumendid, kiirbrauser,lehitsemise menüü,menüü,ikoonid,apletid,käivitamine,esiletõstmine,piirded,ikoonide suurendamine,usaldusväärsed apletid,turvatase
Index: kcontrol/privacy/privacy.desktop
===================================================================
---- kcontrol/privacy/privacy.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/privacy/privacy.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/privacy/privacy.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/privacy/privacy.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -38,7 +38,7 @@
Comment[mk]=Приватност - kcontrol модул кој ги чисти несаканите траги кои ги остава корисникот на системот
Comment[mn]=Privacy - систем дэх хэрэглэгчийн хэрэглэхгүй охрисон хог цэвэрлэгчийн хяналтын модул
@@ -235,8 +358,8 @@
Comment[sr]=Приватност — kcontrol модул који уклања трагове активности корисника на систему
Index: kcontrol/kio/cache.cpp
===================================================================
---- kcontrol/kio/cache.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/kio/cache.cpp (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/kio/cache.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/kio/cache.cpp (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -98,8 +98,6 @@
m_dlg->cbUseCache->setChecked( true );
m_dlg->rbVerifyCache->setChecked( true );
@@ -248,8 +371,8 @@
QString KCacheConfigDialog::quickHelp() const
Index: kcontrol/kio/cache.desktop
===================================================================
---- kcontrol/kio/cache.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/kio/cache.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/kio/cache.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/kio/cache.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -172,7 +172,7 @@
Keywords[hi]=कैश,इतिहास,ब्राउज़िंग इतिहास,पोर्ट,आकार
Keywords[hr]=Cache,Pohrana,History,Povijest,Browsing History,Ports,Portovi,Size,Veličina,Povijest pretraživanja
@@ -261,8 +384,8 @@
Keywords[km]=ឃ្លាំងសម្ងាត់,ប្រវត្តិ,ប្រវត្តិការរុករក,ច្រក,ទំហំ
Index: kcontrol/kio/netpref.desktop
===================================================================
---- kcontrol/kio/netpref.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/kio/netpref.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/kio/netpref.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/kio/netpref.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -41,7 +41,7 @@
Comment[mn]=Ерөнхий сүлжээ-Тохируулга тохируулах Ж.нь.Хугацаа хэтрэлтийн хугацаа
Comment[ms]=Konfigur keutamaan rangkaian generik, seperti nilai waktu rehat
@@ -274,8 +397,8 @@
Comment[nl]=Instellen van algemene netwerkvoorkeuren, zoals tijdslimietwaarden
Index: kcontrol/clock/clock.desktop
===================================================================
---- kcontrol/clock/clock.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/clock/clock.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/clock/clock.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/clock/clock.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -56,7 +56,7 @@
Name[mn]=Огноо & Цаг
Name[ms]=Tarikh & Masa
@@ -301,8 +424,8 @@
Comment[pa]=ਮਿਤੀ ਅਤੇ ਸਮਾਂ ਸੈਟਿੰਗ
Index: kcontrol/konqhtml/appearance.cpp
===================================================================
---- kcontrol/konqhtml/appearance.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/konqhtml/appearance.cpp (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/konqhtml/appearance.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/konqhtml/appearance.cpp (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -357,6 +357,11 @@
updateGUI();
@@ -317,8 +440,8 @@
void KAppearanceOptions::defaults()
Index: kcontrol/konqhtml/khtml_fonts.desktop
===================================================================
---- kcontrol/konqhtml/khtml_fonts.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/konqhtml/khtml_fonts.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/konqhtml/khtml_fonts.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/konqhtml/khtml_fonts.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -186,7 +186,7 @@
Keywords[is]=vafri,vefur,vefurinn,vefsíður,letur,litir,kóðun,stafatafla, bendill,myndir,www,html,stafir
Keywords[it]=konqueror,kfm,browser,html,web,www,caratteri,colori,set di caratteri,charset,codifica
@@ -330,8 +453,8 @@
Keywords[mk]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding,прелистувач,веб,фонтови,знаковни множества,кодирање
Index: kcontrol/konqhtml/htmlopts.cpp
===================================================================
---- kcontrol/konqhtml/htmlopts.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/konqhtml/htmlopts.cpp (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/konqhtml/htmlopts.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/konqhtml/htmlopts.cpp (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -277,6 +277,10 @@
m_pOnlyMarkedBookmarksCheckBox->setChecked( config.readBoolEntry("FilteredToolbar", false) );
@@ -345,8 +468,8 @@
void KMiscHTMLOptions::defaults()
Index: kcontrol/style/style.desktop
===================================================================
---- kcontrol/style/style.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/style/style.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/style/style.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/style/style.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -173,7 +173,7 @@
Keywords[da]=stil,udseende,kontrol,ikoner,værktøjslinjer,tekst,fremhæv,prog,KDE-programmer
Keywords[de]=Stile,Design,Themes,Schema,Elemente,Bildschirmelemente,Icons,Bedienelemente,Schriften,Symbole,Werkzeugleisten,Text,Hervorhebungen,Knöpfe,Anwendungen,Programme,KDE-Programme
@@ -358,8 +481,8 @@
Keywords[eu]=estiloa,estiloak,itxura,widget-a,ikonoak,tresna-barrak,testua, nabarmenketa,aplikazioak,KDE aplikazioak
Index: kcontrol/konsole/kcmkonsole.desktop
===================================================================
---- kcontrol/konsole/kcmkonsole.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/konsole/kcmkonsole.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/konsole/kcmkonsole.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/konsole/kcmkonsole.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -34,7 +34,6 @@
Name[pa]=ਕੰਨਸੋਲ
Name[pl]=Konsola
@@ -370,8 +493,8 @@
Name[sl]=Konzola
Index: kcontrol/kdm/kdm-users.cpp
===================================================================
---- kcontrol/kdm/kdm-users.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/kdm/kdm-users.cpp (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/kdm/kdm-users.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/kdm/kdm-users.cpp (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -418,7 +418,8 @@
setOn(selectedUsers.find(*name) != selectedUsers.end());
(new QCheckListItem(optoutlv, *name, QCheckListItem::CheckBox))->
@@ -384,8 +507,8 @@
optoutlv->sort();
Index: kcontrol/kdm/kdm-appear.cpp
===================================================================
---- kcontrol/kdm/kdm-appear.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/kdm/kdm-appear.cpp (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/kdm/kdm-appear.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/kdm/kdm-appear.cpp (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -172,6 +172,7 @@
guicombo = new KBackedComboBox(group);
guicombo->insertItem( "", i18n("<default>") );
@@ -404,8 +527,8 @@
hglay->addWidget(label, 1, 0);
Index: kcontrol/dnssd/configdialog.ui
===================================================================
---- kcontrol/dnssd/configdialog.ui (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kcontrol/dnssd/configdialog.ui (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kcontrol/dnssd/configdialog.ui (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kcontrol/dnssd/configdialog.ui (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -289,6 +289,9 @@
<slots>
<slot>radioButton2_2_toggled(bool)</slot>
@@ -418,8 +541,8 @@
<includehint>kcmodule.h</includehint>
Index: pics/wallpapers/stelvio.jpg.desktop
===================================================================
---- pics/wallpapers/stelvio.jpg.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ pics/wallpapers/stelvio.jpg.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- pics/wallpapers/stelvio.jpg.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ pics/wallpapers/stelvio.jpg.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -12,6 +12,7 @@
Name[ru]=Национальный парк Стельвио
Name[sr]=Стелвио
@@ -430,8 +553,8 @@
ImageType=pixmap
Index: kdmlib/kgreet_classic.cpp
===================================================================
---- kdmlib/kgreet_classic.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kdmlib/kgreet_classic.cpp (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kdmlib/kgreet_classic.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kdmlib/kgreet_classic.cpp (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -213,6 +213,7 @@
curUser = user;
loginEdit->setText( user );
@@ -442,8 +565,8 @@
void // virtual
Index: kdmlib/dmctl.cpp
===================================================================
---- kdmlib/dmctl.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kdmlib/dmctl.cpp (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kdmlib/dmctl.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kdmlib/dmctl.cpp (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -65,21 +65,28 @@
if ((fd = ::socket( PF_UNIX, SOCK_STREAM, 0 )) < 0)
return;
@@ -485,8 +608,8 @@
{
Index: kdmlib/kgreet_winbind.cpp
===================================================================
---- kdmlib/kgreet_winbind.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kdmlib/kgreet_winbind.cpp (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kdmlib/kgreet_winbind.cpp (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kdmlib/kgreet_winbind.cpp (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -293,6 +293,7 @@
slotChangedDomain( dom );
loginEdit->setText( usr );
@@ -497,8 +620,8 @@
void // virtual
Index: khelpcenter/plugins/applets.desktop
===================================================================
---- khelpcenter/plugins/applets.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ khelpcenter/plugins/applets.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- khelpcenter/plugins/applets.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ khelpcenter/plugins/applets.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -14,7 +14,7 @@
Name[cy]=Llawlyfr Rhaglennig
Name[da]=Panelprogrammanualer
@@ -510,8 +633,8 @@
Name[et]=Aplettide käsiraamatud
Index: khelpcenter/plugins/Tutorials/.directory
===================================================================
---- khelpcenter/plugins/Tutorials/.directory (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ khelpcenter/plugins/Tutorials/.directory (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- khelpcenter/plugins/Tutorials/.directory (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ khelpcenter/plugins/Tutorials/.directory (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -15,7 +15,9 @@
Name[fo]=Skeið
Name[fr]=Didactitiels
@@ -550,8 +673,8 @@
Comment[sr]=Туторијали и уводни документи.
Index: khelpcenter/plugins/Applications/.directory
===================================================================
---- khelpcenter/plugins/Applications/.directory (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ khelpcenter/plugins/Applications/.directory (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- khelpcenter/plugins/Applications/.directory (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ khelpcenter/plugins/Applications/.directory (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -16,6 +16,8 @@
Name[fr]=Manuels des applications
Name[hi]=अनुप्रयोग निर्देशिका
@@ -571,8 +694,8 @@
Name[sr]=Упутства за програме
Index: khelpcenter/plugins/Manpages/.directory
===================================================================
---- khelpcenter/plugins/Manpages/.directory (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ khelpcenter/plugins/Manpages/.directory (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- khelpcenter/plugins/Manpages/.directory (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ khelpcenter/plugins/Manpages/.directory (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -15,6 +15,8 @@
Name[fr]=Pages du manuel UNIX
Name[hi]=यूनिक्स निर्देशिका पृष्ठ
@@ -592,8 +715,8 @@
Name[sr]=UNIX упутне стране
Index: doc/faq/about.docbook
===================================================================
---- doc/faq/about.docbook (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ doc/faq/about.docbook (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- doc/faq/about.docbook (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ doc/faq/about.docbook (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -18,8 +18,7 @@
<para>First, send us any errors that you may find. Also, any
suggestions that you might have, are appreciated. Better yet, send us
@@ -614,8 +737,8 @@
+
Index: klipper/klipperrc.desktop
===================================================================
---- klipper/klipperrc.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ klipper/klipperrc.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- klipper/klipperrc.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ klipper/klipperrc.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -430,7 +430,7 @@
Description[mn]=&URL илгээх
Description[ms]=Hantar &URL
@@ -663,8 +786,8 @@
URLGrabberEnabled=false
Index: kicker/menuext/kdeprint/printmenu.desktop
===================================================================
---- kicker/menuext/kdeprint/printmenu.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kicker/menuext/kdeprint/printmenu.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kicker/menuext/kdeprint/printmenu.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kicker/menuext/kdeprint/printmenu.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -36,6 +36,7 @@
Name[kk]=Басып шығару
Name[km]=ប្រព័ន្ធបោះពុម្ព
@@ -675,8 +798,8 @@
Name[lv]=Drukas Sistēma
Index: kicker/extensions/kasbar/kasbarextension.desktop
===================================================================
---- kicker/extensions/kasbar/kasbarextension.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kicker/extensions/kasbar/kasbarextension.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kicker/extensions/kasbar/kasbarextension.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kicker/extensions/kasbar/kasbarextension.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -41,7 +41,7 @@
Comment[cy]=Rhaglennig bar tasgau arall i'r panel
Comment[da]=Et alternativt opgavelinjepanelprogram.
@@ -688,8 +811,8 @@
Comment[et]=Teistsugune paneelil töötav tegumiriba aplett
Index: kicker/kicker/panel.desktop
===================================================================
---- kicker/kicker/panel.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kicker/kicker/panel.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kicker/kicker/panel.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kicker/kicker/panel.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -36,6 +36,7 @@
Name[kk]=KDE панелі
Name[km]=បន្ទះ KDE
@@ -700,8 +823,8 @@
Name[lv]=KDE Panelis
Index: kicker/applets/menu/menuapplet.desktop
===================================================================
---- kicker/applets/menu/menuapplet.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kicker/applets/menu/menuapplet.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
+--- kicker/applets/menu/menuapplet.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 759908)
++++ kicker/applets/menu/menuapplet.desktop (.../branches/KDE/3.5/kdebase) (wersja 759908)
@@ -70,7 +70,7 @@
Comment[cy]=Rhaglennig sy'n mewn-adeiladu bariau dewislen unigol
Comment[da]=Applet der indlejrer alenestående menulinjer
@@ -713,8 +836,8 @@
Comment[et]=Aplett, mis põimib endasse isseisvaid menüüribasid
Index: kicker/applets/systemtray/systemtrayapplet.desktop
===================================================================
---- kicker/applets/systemtray/systemtrayapplet.desktop (.../tags/KDE/3.5.8/kdebase) (wersja 756146)
-+++ kicker/applets/systemtray/systemtrayapplet.desktop (.../branches/KDE/3.5/kdebase) (wersja 756146)
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdebase-branch.diff?r1=1.67&r2=1.68&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdelibs-branch.diff?r1=1.69&r2=1.70&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdenetwork-branch.diff?r1=1.31&r2=1.32&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdepim-branch.diff?r1=1.53&r2=1.54&f=u
More information about the pld-cvs-commit
mailing list