SOURCES: kdebase-branch.diff - updated

arekm arekm at pld-linux.org
Sat Jul 1 12:02:31 CEST 2006 

Author: arekm                        Date: Sat Jul  1 10:02:31 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kdebase-branch.diff (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: SOURCES/kdebase-branch.diff
diff -u SOURCES/kdebase-branch.diff:1.30 SOURCES/kdebase-branch.diff:1.31
--- SOURCES/kdebase-branch.diff:1.30	Fri Jun  9 17:17:56 2006
+++ SOURCES/kdebase-branch.diff	Sat Jul  1 12:02:25 2006
@@ -1,7 +1,7 @@
 Index: ksmserver/shutdown.cpp
 ===================================================================
---- ksmserver/shutdown.cpp	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ ksmserver/shutdown.cpp	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- ksmserver/shutdown.cpp	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ ksmserver/shutdown.cpp	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -345,7 +345,7 @@
  
  void KSMServer::cancelShutdown( KSMClient* c )
@@ -11,10 +11,37 @@
      clientInteracting = 0;
      for ( KSMClient* c = clients.first(); c; c = clients.next() ) {
          SmsShutdownCancelled( c->connection() );
+Index: kate/app/katemdi.cpp
+===================================================================
+--- kate/app/katemdi.cpp	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kate/app/katemdi.cpp	(.../branches/KDE/3.5/kdebase)	(revision 556696)
+@@ -853,7 +853,22 @@
+   m_restoreGroup = group;
+ 
+   if (!m_restoreConfig || !m_restoreConfig->hasGroup (m_restoreGroup))
++  {
++    // set sane default sizes
++    QValueList<int> hs;
++    hs << 200 << 100 << 200;
++    QValueList<int> vs;
++    vs << 150 << 100 << 200;
++
++    m_sidebars[0]->setLastSize (hs[0]);
++    m_sidebars[1]->setLastSize (hs[2]);
++    m_sidebars[2]->setLastSize (vs[0]);
++    m_sidebars[3]->setLastSize (vs[2]);
++
++    m_hSplitter->setSizes(hs);
++    m_vSplitter->setSizes(vs);
+     return;
++  }
+ 
+   // apply size once, to get sizes ready ;)
+   m_restoreConfig->setGroup (m_restoreGroup);
 Index: kate/data/kateplugin.desktop
 ===================================================================
---- kate/data/kateplugin.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kate/data/kateplugin.desktop	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kate/data/kateplugin.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kate/data/kateplugin.desktop	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -35,7 +35,7 @@
  Comment[hu]=Kate bővítőmodul
  Comment[is]=Kate Ă­forrit
@@ -24,10 +51,23 @@
  Comment[km]=áž€áž˜áŸ’áž˜ážœážˇáž’áž¸â€‹áž‡áŸ†áž“áž˝áž™ Kate
  Comment[lo]=ປູຼກອິນຂອງ Kate
  Comment[lt]=Kate priedas
+Index: kate/data/kwrite.desktop
+===================================================================
+--- kate/data/kwrite.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kate/data/kwrite.desktop	(.../branches/KDE/3.5/kdebase)	(revision 556696)
+@@ -23,7 +23,7 @@
+ GenericName[fi]=Tekstieditori
+ GenericName[fo]=Tekstritil
+ GenericName[fr]=Éditeur de texte
+-GenericName[fy]=Tekst Bewurker
++GenericName[fy]=Tekstbewurker
+ GenericName[ga]=EagarthĂłir TĂŠacs
+ GenericName[gl]=Editor de Textos
+ GenericName[he]=עורך ×˜×§×Ą×˜
 Index: kdepasswd/kcm/kcm_useraccount.desktop
 ===================================================================
---- kdepasswd/kcm/kcm_useraccount.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kdepasswd/kcm/kcm_useraccount.desktop	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kdepasswd/kcm/kcm_useraccount.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kdepasswd/kcm/kcm_useraccount.desktop	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -140,7 +140,7 @@
  Comment[hu]=A felhasznålójellemzők, pÊldåul az e-mail cím vagy a jelszó beållítåsa
  Comment[is]=Upplýsingar um notandann eins og til dÌmis póstfang, lykilorð og nafn
@@ -37,10 +77,22 @@
  Comment[km]=áž–áŸážáŸŒáž˜ážśáž“â€‹áž˘áŸ’áž“áž€â€‹áž”áŸ’ážšážžâ€‹ážŠážźáž
ជវ áž–ážśáž€áŸ’áž™â€‹ážŸáž˜áŸ’áž„ážśážáŸ‹,ឈ្មោះ áž“ážˇáž„â€‹áž˘áŸŠáž¸áž˜áŸ‚áž›
  Comment[lt]=Naudotojo informacija, tokia, kaip slaptaĹžodis, vardas ir e. paĹĄto adresas
  Comment[lv]=Lietotāja informācija kā parole, vārds un e-pasts
+Index: kdepasswd/kdepasswd.desktop
+===================================================================
+--- kdepasswd/kdepasswd.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kdepasswd/kdepasswd.desktop	(.../branches/KDE/3.5/kdebase)	(revision 556696)
+@@ -3,7 +3,6 @@
+ Exec=kdepasswd
+ Icon=password
+ Type=Application
+-NoDisplay=true
+ Categories=Qt;KDE;Settings;
+ NoDisplay=true
+ X-DCOP-ServiceType=Unique
 Index: kfind/kftabdlg.cpp
 ===================================================================
---- kfind/kftabdlg.cpp	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kfind/kftabdlg.cpp	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kfind/kftabdlg.cpp	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kfind/kftabdlg.cpp	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -183,6 +183,7 @@
      sizeUnitBox ->insertItem( i18n("Bytes") );
      sizeUnitBox ->insertItem( i18n("KB") );
@@ -121,8 +173,8 @@
    QDateTime epoch;
 Index: kfind/kquery.cpp
 ===================================================================
---- kfind/kquery.cpp	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kfind/kquery.cpp	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kfind/kquery.cpp	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kfind/kquery.cpp	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -14,7 +14,7 @@
  
  KQuery::KQuery(QObject *parent, const char * name)
@@ -178,8 +230,8 @@
  void KQuery::setTimeRange(time_t from, time_t to)
 Index: kfind/Kfind.desktop
 ===================================================================
---- kfind/Kfind.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kfind/Kfind.desktop	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kfind/Kfind.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kfind/Kfind.desktop	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -48,6 +48,7 @@
  Name[ru]=ĐŸĐžĐ¸ŃĐş фаКНОв и папОк
  Name[rw]=Gushaka Amadosiye/Ububiko
@@ -190,8 +242,8 @@
  Name[sr at Latn]=TraĹženje fajlova/fascikli
 Index: kfind/kquery.h
 ===================================================================
---- kfind/kquery.h	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kfind/kquery.h	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kfind/kquery.h	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kfind/kquery.h	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -23,7 +23,7 @@
    KQuery(QObject *parent = 0, const char * name = 0);
    ~KQuery();
@@ -215,8 +267,8 @@
    time_t m_timeTo;
 Index: kcontrol/background/background.desktop
 ===================================================================
---- kcontrol/background/background.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kcontrol/background/background.desktop	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kcontrol/background/background.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/background/background.desktop	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -116,7 +116,7 @@
  Comment[hu]=A hĂĄttĂŠrbeĂĄllĂ­tĂĄsok megvĂĄltoztatĂĄsa
  Comment[is]=Stillingar bakgrunns
@@ -235,10 +287,36 @@
  Keywords[hi]=ŕ¤ŞŕĽƒŕ¤ˇŕĽŕ¤ ŕ¤­ŕĽ‚ŕ¤Žŕ¤ż,ŕ¤ĄŕĽ‡ŕ¤¸ŕĽŕ¤•ŕ¤ŸŕĽ‰ŕ¤Ş,रंग,ŕ¤
न༇क रंग,छाि,ाञलप༇पर,ŕ¤ŹŕĽŕ¤˛ŕĽ‡ŕ¤‚ŕ¤Ąŕ¤żŕ¤‚ŕ¤—,ŕ¤ŹŕĽˆŕ¤˛ŕĽ‡ŕ¤‚ŕ¤¸,ŕ¤•ŕĽˆŕ¤ś,ŕ¤
न༇क ाञलप༇पर,ŕ¤Şŕ¤żŕ¤•ŕĽŕ¤¸ŕ¤ŽŕĽˆŕ¤Ş
  Keywords[hr]=background,desktops,colors,colours,images,wallpapers,blending,balance,cache,multiple wallpapers,pixmap,pozadina, radna povrĹĄina,boje,boja,slike,slika radne povrĹĄine,preklapanje,prozirnost,balans,pohrana,viĹĄestruke slike radne povrĹĄine
  Keywords[hu]=hĂĄttĂŠr,asztalok,szĂ­nek,kĂŠpek,tapĂŠtĂĄk,szĂ­nkeverĂŠs,egyensĂşly,gyorstĂĄr,tĂśbb tapĂŠta,pixmap
+Index: kcontrol/background/bgdefaults.h
+===================================================================
+--- kcontrol/background/bgdefaults.h	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/background/bgdefaults.h	(.../branches/KDE/3.5/kdebase)	(revision 556696)
+@@ -16,7 +16,7 @@
+ #define _defCommonDesk true
+ #define _defDock true
+ #define _defExport false
+-#define _defLimitCache true
++#define _defLimitCache false
+ #define _defCacheSize 2048
+ 
+ #define _defShm false
+Index: kcontrol/smartcard/smartcard.desktop
+===================================================================
+--- kcontrol/smartcard/smartcard.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/smartcard/smartcard.desktop	(.../branches/KDE/3.5/kdebase)	(revision 556696)
+@@ -162,7 +162,7 @@
+ Keywords[mk]=Smartcard,PKCS,SSL,reader,smart,card,паПотна картичка,читач,паПотна,картичка
+ Keywords[mn]=Smartcard,PKCS,SSL,Reader,Smart,Card,ĐŁĐ˝ŃˆĐ¸ĐłŃ‡
+ Keywords[nb]=smartkort,PKCS,SSL,leser,smart,kort
+-Keywords[nds]=Smartcard,PKCS,SSL,Leser,smart,card,Koort, Korten
++Keywords[nds]=Smartcard,PKCS,SSL,Leser,smart,card,Koort,Koorten
+ Keywords[nl]=Smartcard,PKCS,SSL,reader,smart,card,chipkaart,kaart
+ Keywords[nn]=smartkort,PKCS,SSL,lesar,smart,kort
+ Keywords[nso]=Karata ye botsana,PKCS,SSL,mmadi,botsana,karata
 Index: kcontrol/krdb/kcs/YellowOnBlue.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/YellowOnBlue.kcsrc	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kcontrol/krdb/kcs/YellowOnBlue.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kcontrol/krdb/kcs/YellowOnBlue.kcsrc	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/krdb/kcs/YellowOnBlue.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -37,6 +37,7 @@
  Name[ru]=ВысОкОкОнтрастныК МёНтыК на синоП
  Name[rw]=Umwandiko w'Umuhondo Inyuranyamigaragarire yo Hejuru
@@ -249,8 +327,8 @@
  Name[sr at Latn]=Žuta na plavoj visokog kontrasta
 Index: kcontrol/krdb/kcs/BlackOnWhite.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/BlackOnWhite.kcsrc	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kcontrol/krdb/kcs/BlackOnWhite.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kcontrol/krdb/kcs/BlackOnWhite.kcsrc	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/krdb/kcs/BlackOnWhite.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -37,6 +37,7 @@
  Name[ru]=ВысОкОкОнтрастныК чёрныК токст
  Name[rw]=Umwandiko w'Umukara Inyuranyamigaragarire yo Hejuru
@@ -261,8 +339,8 @@
  Name[sr at Latn]=Crni tekst visokog kontrasta
 Index: kcontrol/krdb/kcs/WhiteOnBlack.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/WhiteOnBlack.kcsrc	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kcontrol/krdb/kcs/WhiteOnBlack.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kcontrol/krdb/kcs/WhiteOnBlack.kcsrc	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/krdb/kcs/WhiteOnBlack.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -37,6 +37,7 @@
  Name[ru]=ВысОкОкОнтрастныК йоНыК токст
  Name[rw]=Umwandiko w'Umweru Inyuranyamigaragarire yo Hejuru
@@ -271,10 +349,23 @@
  Name[sl]=Visoko kontrastno belo besedilo
  Name[sr]=БоНи токст висОкОг кОнтраста
  Name[sr at Latn]=Beli tekst visokog kontrasta
+Index: kcontrol/krdb/krdb.cpp
+===================================================================
+--- kcontrol/krdb/krdb.cpp	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/krdb/krdb.cpp	(.../branches/KDE/3.5/kdebase)	(revision 556696)
+@@ -515,7 +515,7 @@
+             subPixel(kglobals.readEntry("XftSubPixel"));
+ 
+     contents += "Xft.antialias: ";
+-    if(QSettings().readBoolEntry("/qt/useXft"))
++    if(kglobals.readBoolEntry("XftAntialias", false))
+       contents += "1";
+     else
+       contents += "0";
 Index: kcontrol/krdb/ad/AAAXaw.ad
 ===================================================================
---- kcontrol/krdb/ad/AAAXaw.ad	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kcontrol/krdb/ad/AAAXaw.ad	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kcontrol/krdb/ad/AAAXaw.ad	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/krdb/ad/AAAXaw.ad	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -34,8 +34,3 @@
  *ShapeStyle: Rectangle
  *SmeBSB*shadowWidth: 3
@@ -284,10 +375,52 @@
 -	<Btn1Down>:	set()\n\
 -	<Btn1Up>:	notify() unset()
 -
+Index: kcontrol/usbview/usbdevices.h
+===================================================================
+--- kcontrol/usbview/usbdevices.h	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/usbview/usbdevices.h	(.../branches/KDE/3.5/kdebase)	(revision 556696)
+@@ -30,6 +30,7 @@
+   USBDevice();
+ 
+   void parseLine(QString line);
++  void parseSysDir(int bus, int parent, int level, QString line);
+ 
+   int level() { return _level; };
+   int device() { return _device; };
+@@ -42,6 +43,7 @@
+   static QPtrList<USBDevice> &devices() { return _devices; };
+   static USBDevice *find(int bus, int device);
+   static bool parse(QString fname);
++  static bool parseSys(QString fname);
+ 
+ 
+ private:
+Index: kcontrol/usbview/kcmusb.cpp
+===================================================================
+--- kcontrol/usbview/kcmusb.cpp	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/usbview/kcmusb.cpp	(.../branches/KDE/3.5/kdebase)	(revision 556696)
+@@ -117,7 +117,7 @@
+   QIntDict<QListViewItem> new_items;
+ 
+   if (!USBDevice::parse("/proc/bus/usb/devices"))
+-    USBDevice::parse("/proc/bus/usb/devices_please-use-sysfs-instead");
++    USBDevice::parseSys("/sys/bus/usb/devices");
+ 
+   int level = 0;
+   bool found = true;
 Index: kcontrol/usbview/kcmusb.desktop
 ===================================================================
---- kcontrol/usbview/kcmusb.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kcontrol/usbview/kcmusb.desktop	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kcontrol/usbview/kcmusb.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/usbview/kcmusb.desktop	(.../branches/KDE/3.5/kdebase)	(revision 556696)
+@@ -39,7 +39,7 @@
+ Name[hu]=USB-eszkĂśzĂśk
+ Name[is]=USB TĂŚki
+ Name[it]=Dispositivi USB
+-Name[ja]=USBăƒ‡ăƒă‚¤ă‚š
++Name[ja]=USB ăƒ‡ăƒă‚¤ă‚š
+ Name[km]=ឧបករណ៍ USB
+ Name[ko]=USB ěžĽěš˜
+ Name[lo]=ອຸປະກອນ USB
 @@ -112,7 +112,7 @@
  Comment[hu]=Az USB-eszkÜzÜk jellemzői
  Comment[is]=SKoĂ°a USB tĂŚkin sem eru tengd viĂ° Ăžessa tĂślvu
@@ -297,10 +430,135 @@
  Comment[km]=មឞល​ឧបករណ៍ USB ážŠáŸ‚áž›â€‹áž”ážśáž“â€‹áž—áŸ’áž‡ážśáž”áŸ‹â€‹áž˜áž€â€‹áž€ážťáŸ†áž–áŸ’áž™ážźáž‘áŸážšâ€‹áž“áŸáŸ‡
  Comment[ko]=이 이퓨터에 ě—°ę˛°ëœ USB ěžĽěš˜ëĽź ëł´ě—Źě¤ë‹ˆë‹¤
  Comment[lo]=ŕşŞŕş°ŕťŕş”ŕş‡ŕş­ŕş¸ŕş›ŕş°ŕşŕş­ŕş™ USB ŕş—ŕşľŕťˆŕť€ŕşŠŕşˇŕťˆŕş­ŕşĄŕş•ŕťŕťˆŕşŕşąŕşšŕş„ŕş­ŕşĄŕşžŕş´ŕş§ŕť€ŕş•ŕşľŕť€ŕş„ŕşˇŕťˆŕş­ŕş‡ŕş™ŕşľŕť‰
+Index: kcontrol/usbview/usbdevices.cpp
+===================================================================
+--- kcontrol/usbview/usbdevices.cpp	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/usbview/usbdevices.cpp	(.../branches/KDE/3.5/kdebase)	(revision 556696)
+@@ -16,6 +16,7 @@
+ #include <stdio.h>
+ 
+ #include <qfile.h>
++#include <qdir.h>
+ #include <qregexp.h>
+ 
+ #include <klocale.h>
+@@ -24,6 +25,8 @@
+ #include "usbdb.h"
+ #include "usbdevices.h"
+ 
++#include <math.h>
++
+ #ifdef Q_OS_FREEBSD
+ #include <sys/ioctl.h>
+ #include <sys/param.h>
+@@ -47,7 +50,67 @@
+     _db = new USBDB;
+ }
+ 
++static QString catFile(QString fname)
++{
++  char buffer[256];
++  QString result;
++  int fd = ::open(QFile::encodeName(fname), O_RDONLY);
++  if (fd<0)
++	return QString::null;
+ 
++  if (fd >= 0)
++    {
++      ssize_t count;
++      while ((count = ::read(fd, buffer, 256)) > 0)
++	result.append(QString(buffer).left(count));
++
++      ::close(fd);
++    }
++  return result.stripWhiteSpace();
++}
++
++void USBDevice::parseSysDir(int bus, int parent, int level, QString dname)
++{
++  _level = level;
++  _parent = parent;
++  _manufacturer = catFile(dname + "/manufacturer");
++  _product = catFile(dname + "/product");
++
++  _bus = bus;
++  _device = catFile(dname + "/devnum").toUInt();
++
++  if (_device == 1)
++    _product += QString(" (%1)").arg(_bus);
++
++  _vendorID = catFile(dname + "/idVendor").toUInt(0, 16);
++  _prodID = catFile(dname + "/idProduct").toUInt(0, 16);
++
++  _class = catFile(dname + "/bDeviceClass").toUInt(0, 16);
++  _sub = catFile(dname + "/bDeviceSubClass").toUInt(0, 16);
++  _maxPacketSize = catFile(dname + "/bMaxPacketSize0").toUInt();
++
++  _speed = catFile(dname + "/speed").toDouble();
++  _serial = catFile(dname + "/serial");
++  _channels = catFile(dname + "/maxchild").toUInt();
++
++  double version = catFile(dname + "/version").toDouble();
++  _verMajor = int(version);
++  _verMinor = int(10*(version - floor(version)));
++
++  QDir dir(dname);
++  dir.setNameFilter(QString("%1-*").arg(bus));
++  dir.setFilter(QDir::Dirs);
++  QStringList list = dir.entryList();
++
++  for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
++    if ((*it).contains(':'))
++      continue;
++
++    USBDevice* dev = new USBDevice();
++    dev->parseSysDir(bus, ++level, _device, dname + "/" + *it);
++  }
++}
++
+ void USBDevice::parseLine(QString line)
+ {
+   if (line.startsWith("T:"))
+@@ -230,6 +293,27 @@
+   return true;
+ }
+ 
++bool USBDevice::parseSys(QString dname)
++{
++   QDir d(dname);
++   d.setNameFilter("usb*");
++   QStringList list = d.entryList();
++
++   for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
++     USBDevice* device = new USBDevice();
++
++     int bus = 0;
++     QRegExp bus_reg("[a-z]*([0-9]+)");
++     if (bus_reg.search(*it) != -1)
++         bus = bus_reg.cap(1).toInt();
++
++
++     device->parseSysDir(bus, 0, 0, d.absPath() + "/" + *it);
++  }
++
++  return d.count();
++}
++
+ #else
+ 
+ /*
+@@ -302,6 +386,7 @@
+ }
+ 
+ 
++
+ bool USBDevice::parse(QString fname)
+ {
+ 	static bool showErrorMessage = true;
 Index: kcontrol/componentchooser/componentservices/kcm_kemail.desktop
 ===================================================================
---- kcontrol/componentchooser/componentservices/kcm_kemail.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kcontrol/componentchooser/componentservices/kcm_kemail.desktop	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kcontrol/componentchooser/componentservices/kcm_kemail.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/componentchooser/componentservices/kcm_kemail.desktop	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -30,7 +30,7 @@
  Name[hu]=Levelezőprogram
  Name[is]=PĂłstforrit
@@ -315,40 +573,40 @@
  Comment[is]=Þessi Þjónusta leyfir ÞÊr að skilgreina sjålfgefið tÜlvupóstforrit. Öll KDE forrit sem Þurfa aðgengi að tÜlvupóstforriti Ìttu að virða Þessa stillingu.
  Comment[it]= Questo servizio ti permette di configurare il tuo programma di posta elettronica preferito. Tutte le applicazioni di KDE che avranno bisogno di accedere ad un programma di posta elettronica dovranno rispettare questa impostazione.
 -Comment[ja]=ă“ăŽă‚ľăƒźăƒ“ă‚šă§ă€ă‚ăŞăŸăŽć¨™ćş–ăŽ E ăƒĄăƒźăƒŤă‚ŻăƒŠă‚¤ă‚˘ăƒłăƒˆă‚’č¨­ĺŽšă§ăăžă™ă€‚ E ăƒĄăƒźăƒŤă‚ŻăƒŠă‚¤ă‚˘ăƒłăƒˆăŤă‚˘ă‚Żă‚ťă‚šă™ă‚‹ĺż
茁ぎあるĺ
¨ăŚăŽ KDE ă‚˘ăƒ—ăƒŞă‚ąăƒźă‚ˇăƒ§ăƒłăŻ ă“ăŽč¨­ĺŽšă‚’ĺ‚ç
§ă—ぞす。
-+Comment[ja]=ă“ă“ă§ć¨™ćş–ăŽăƒĄăƒźăƒŤă‚ŻăƒŠă‚¤ă‚˘ăƒłăƒˆă‚’č¨­ĺŽšă—ăžă™ă€‚ăƒĄăƒźăƒŤă‚ŻăƒŠă‚¤ă‚˘ăƒłăƒˆă‚’ĺż
茁とするĺ
¨ăŚăŽ KDE ă‚˘ăƒ—ăƒŞă‚ąăƒźă‚ˇăƒ§ăƒłăŻă€ă“ăŽč¨­ĺŽšăŤĺž“ă„ăžă™ă€‚
++Comment[ja]=ă“ă“ă§ć¨™ćş–ăŽăƒĄăƒźăƒŤă‚ŻăƒŠă‚¤ă‚˘ăƒłăƒˆă‚’č¨­ĺŽšă—ăžă™ă€‚ăƒĄăƒźăƒŤă‚ŻăƒŠă‚¤ă‚˘ăƒłăƒˆă‚’ĺż
茁とするすずがぎ KDE ă‚˘ăƒ—ăƒŞă‚ąăƒźă‚ˇăƒ§ăƒłăŻă€ă“ăŽč¨­ĺŽšăŤĺž“ă„ăžă™ă€‚
  Comment[km]=ážŸáŸážœážśâ€‹áž“áŸáŸ‡â€‹áž˘áž“ážťáž‰áŸ’áž‰ážśážâ€‹áž˛áŸ’áž™â€‹áž˘áŸ’áž“áž€â€‹áž€áŸ†ážŽážáŸ‹â€‹ážšáž
áž“ážśážŸáž˜áŸ’áž–áŸáž“áŸ’áž’â€‹áž€áž˜áŸ’áž˜ážœážˇáž’áž¸â€‹áž˘áŸŠáž¸áž˜áŸ‚áž›â€‹áž›áŸ†áž“ážśáŸ†ážŠážžáž˜â€‹ážšáž”ážŸáŸ‹â€‹áž˘áŸ’áž“áž€Â áŸ” áž€áž˜áŸ’áž˜ážœážˇáž’áž¸ KDE áž‘ážśáŸ†áž„áž˘ážŸáŸ‹ ážŠáŸ‚áž›â€‹ážáŸ’ážšážźážœáž€ážśážšâ€‹áž
ážźáž›ážŠáŸ†ážŽážžážšáž€ážśážšâ€‹áž€áž˜áŸ’áž˜ážœážˇáž’áž¸â€‹áž˘áŸŠáž¸áž˜áŸ‚áž› áž‚áž˝ážšâ€‹ážáŸ‚â€‹áž‚áŸ„ážšáž–â€‹áž€ážśážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹áž“áŸáŸ‡Â áŸ”
  Comment[lt]=Ĺ i tarnyba leidĹžia jums nustatyti JĹŤsĹł numatytÄ
 paĹĄto klientÄ
. Visos KDE programos, kurioms reikia e. paĹĄto kliento programos, turÄ—tĹł atsiĹžvelgti ÄŻ ĹĄÄŻ nustatymÄ
.
  Comment[lv]=Šis servis ğauj Jums konfigurēt noklusējuma epasta klientu. Visas KDE aplikācijas, kurām ir nepiecieťams epasts, izmantos ťo parametru.
 Index: kcontrol/componentchooser/componentservices/kcm_browser.desktop
 ===================================================================
---- kcontrol/componentchooser/componentservices/kcm_browser.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kcontrol/componentchooser/componentservices/kcm_browser.desktop	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kcontrol/componentchooser/componentservices/kcm_browser.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/componentchooser/componentservices/kcm_browser.desktop	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -97,7 +97,7 @@
  Comment[hu]=Itt lehet beållítani, mi legyen az alapÊrtelmezett webbÜngÊsző. Az Üsszes KDE-alkalmazåsnak figyelembe kell vennie ezt az ÊrtÊket levelezÊsi funkció hasznålata esetÊn.
  Comment[is]=Þessi Þjónusta leyfir ÞÊr að skilgreina sjålfgefinn vafra. Öll KDE forrit sem gera ÞÊr kleift að smella å tengla Ìttu að virða Þessa stillingu.
  Comment[it]=Definisci il tuo browser web predefinito. Tutte le applicazioni di KDE in cui è selezionabile un collegamento dovrebbero rispettare questa impostazione.
 -Comment[ja]=ă“ă“ă§ć¨™ćş–ăŽă‚Śă‚§ăƒ–ăƒ–ăƒŠă‚Śă‚śă‚’č¨­ĺŽšă§ăăžă™ă€‚ ĺ
¨ăŚăŽKDEă‚˘ăƒ—ăƒŞă‚ąăƒźă‚ˇăƒ§ăƒłă§ăƒă‚¤ăƒ‘ăƒźăƒŞăƒłă‚Żă‚’é¸ćŠžă—ăŸĺ ´ĺˆă“ăŽč¨­ĺŽšă‚’ĺ‚ç
§ă—ぞす。
-+Comment[ja]=ă“ă“ă§ć¨™ćş–ăŽă‚Śă‚§ăƒ–ăƒ–ăƒŠă‚Śă‚śă‚’č¨­ĺŽšă—ăžă™ă€‚ ăƒă‚¤ăƒ‘ăƒźăƒŞăƒłă‚ŻăŽé¸ćŠžăŒĺŻčƒ˝ăŞĺ
¨ăŚăŽ KDE ă‚˘ăƒ—ăƒŞă‚ąăƒźă‚ˇăƒ§ăƒłăŻă€ă“ăŽč¨­ĺŽšăŤĺž“ă„ăžă™ă€‚
++Comment[ja]=ă“ă“ă§ć¨™ćş–ăŽă‚Śă‚§ăƒ–ăƒ–ăƒŠă‚Śă‚śă‚’č¨­ĺŽšă—ăžă™ă€‚ ăƒă‚¤ăƒ‘ăƒźăƒŞăƒłă‚ŻăŽé¸ćŠžăŒĺŻčƒ˝ăŞă™ăšăŚăŽ KDE ă‚˘ăƒ—ăƒŞă‚ąăƒźă‚ˇăƒ§ăƒłăŻă€ă“ăŽč¨­ĺŽšăŤĺž“ă„ăžă™ă€‚
  Comment[km]=áž“áŸ
​ទីនេះ áž˘áŸ’áž“áž€â€‹áž˘ážśáž
​កំណត់​រáž
áž“ážśážŸáž˜áŸ’áž–áŸáž“áŸ’áž’â€‹áž€áž˜áŸ’áž˜ážœážˇáž’áž¸â€‹ážšážťáž€ážšáž€â€‹áž”ážŽáŸ’ážŠážśáž‰â€‹áž›áŸ†áž“ážśáŸ†ážŠážžáž˜â€‹ážšáž”ážŸáŸ‹â€‹áž˘áŸ’áž“áž€Â áŸ” áž€áž˜áŸ’áž˜ážœážˇáž’áž¸ KDE áž‘ážśáŸ†áž„áž˘ážŸáŸ‹â€‹ážŠáŸ‚áž›â€‹áž˘áŸ’áž“áž€â€‹áž˘ážśáž
â€‹áž‡áŸ’ážšážžážŸâ€‹ážáŸ†ážŽâ€‹ážáŸ’áž–ážŸáŸ‹â€‹áž€áŸ’áž“ážťáž„ áž‚áž˝ážšâ€‹ážáŸ‚â€‹áž‚áŸ„ážšáž–â€‹áž€ážśážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹áž“áŸáŸ‡Â áŸ”
  Comment[lt]=Ĺ i tarnyba leidĹžia jums nustatyti JĹŤsĹł numatytÄ
 Ĺžiniatinklio narĹĄyklÄ™. Visos KDE programos, kuriose galima spragtelÄ—ti hipersaitus, turi atsiĹžvelgti ÄŻ ĹĄÄŻ nustatymÄ
.
  Comment[lv]=Šeit Jōs varat konfigurēt noklusējuma tčmekğa pārlōkprogrammu. Visas KDE aplikācijas, kurās Jōs varat klikťġināt uz hipersaitēm, izmantos ťo parametru.
 Index: kcontrol/componentchooser/componentservices/kcm_terminal.desktop
 ===================================================================
---- kcontrol/componentchooser/componentservices/kcm_terminal.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kcontrol/componentchooser/componentservices/kcm_terminal.desktop	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kcontrol/componentchooser/componentservices/kcm_terminal.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/componentchooser/componentservices/kcm_terminal.desktop	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -100,7 +100,7 @@
  Comment[hu]=Ez a szolgåltatås lehetővÊ teszi az alapÊrtelmezett parancsÊrtelmező előíråsåt. Az Üsszes KDE-alkalmazåsnak figyelembe kell vennie ezt az ÊrtÊket a parancsÊrtelmező elindítåsakor.
  Comment[is]=Þessi Þjónusta leyfir ÞÊr að skilgreina sjålfgefinn skjåhermi. Öll KDE forrit sem Þurfa aðgengi að skjåhermi Ìttu að virða Þessa stillingu.
  Comment[it]= Questo servizio ti permette di configurare il tuo programma di emulazione terminale preferito. Tutte le applicazioni di KDE che avranno bisogno di aprire un terminale dovranno rispettare questa impostazione.
 -Comment[ja]=ă“ăŽă‚ľăƒźăƒ“ă‚šă§ă€ă‚ăŞăŸăŽć¨™ćş–ăŽă‚żăƒźăƒŸăƒŠăƒŤă‚¨ăƒŸăƒĽăƒŹăƒźă‚żă‚’č¨­ĺŽšă§ăăžă™ă€‚ ă‚żăƒźăƒŸăƒŠăƒŤă‚¨ăƒŸăƒĽăƒŹăƒźă‚żă‚’čľˇĺ‹•ă™ă‚‹ĺ
¨ăŚăŽ KDE ă‚˘ăƒ—ăƒŞă‚ąăƒźă‚ˇăƒ§ăƒłăŻă“ăŽč¨­ĺŽš 使用しぞす。
-+Comment[ja]=ă“ă“ă§ć¨™ćş–ăŽă‚żăƒźăƒŸăƒŠăƒŤă‚¨ăƒŸăƒĽăƒŹăƒźă‚żă‚’č¨­ĺŽšă—ăžă™ă€‚ă‚żăƒźăƒŸăƒŠăƒŤă‚¨ăƒŸăƒĽăƒŹăƒźă‚żă‚’čľˇĺ‹•ă™ă‚‹ĺ
¨ăŚăŽ KDE ă‚˘ăƒ—ăƒŞă‚ąăƒźă‚ˇăƒ§ăƒłăŻă€ă“ăŽč¨­ĺŽšăŤĺž“ă„ăžă™ă€‚
++Comment[ja]=ă“ă“ă§ć¨™ćş–ăŽă‚żăƒźăƒŸăƒŠăƒŤă‚¨ăƒŸăƒĽăƒŹăƒźă‚żă‚’č¨­ĺŽšă—ăžă™ă€‚ă‚żăƒźăƒŸăƒŠăƒŤă‚¨ăƒŸăƒĽăƒŹăƒźă‚żă‚’čľˇĺ‹•ă™ă‚‹ă™ăšăŚăŽ KDE ă‚˘ăƒ—ăƒŞă‚ąăƒźă‚ˇăƒ§ăƒłăŻă€ă“ăŽč¨­ĺŽšăŤĺž“ă„ăžă™ă€‚
  Comment[km]=ážŸáŸážœážśâ€‹áž“áŸáŸ‡â€‹áž˘áž“ážťáž‰áŸ’áž‰ážśážâ€‹áž˛áŸ’áž™â€‹áž˘áŸ’áž“áž€â€‹áž€áŸ†ážŽážáŸ‹â€‹ážšáž
áž“ážśážŸáž˜áŸ’áž–áŸáž“áŸ’áž’ ážœážáŸ’ážážťâ€‹ážáŸ’ážšážśáž”áŸ‹â€‹ážážśáž˜â€‹ážŸáŸ’ážážśáž“áž¸áž™â€‹áž›áŸ†áž“ážśáŸ†ážŠážžáž˜â€‹ážšáž”ážŸáŸ‹â€‹áž˘áŸ’áž“áž€Â áŸ” áž€áž˜áŸ’áž˜ážœážˇáž’áž¸ KDE áž‘ážśáŸ†áž„áž˘ážŸáŸ‹ ដែល​ហáŸ
â€‹ážœážáŸ’ážážťâ€‹ážáŸ’ážšážśáž”áŸ‹â€‹ážážśáž˜â€‹ážŸáŸ’ážážśáž“áž¸áž™â€‹áž˜áž˝áž™ áž‚áž˝ážšâ€‹ážáŸ‚â€‹áž‚áŸ„ážšáž–â€‹áž€ážśážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹áž“áŸáŸ‡Â áŸ”
  Comment[lt]=Ĺ i tarnyba leidĹžia jumos nustatyti JĹŤsĹł numatytÄ
 paĹĄto klientÄ
. Visos KDE programos, kurios iĹĄkviečia terminalo emuliatoriaus programa, turÄ—tĹł atsiĹžvelgti ÄŻ ĹĄÄŻ nustatymÄ
.
  Comment[lv]=Šis serviss Jums ğauj uzstādčt noklusējuma termināla emulātoru. Visas KDE aplikācijas, kurām vajag termināla emulātoru, izmantos ťo parametru.
 Index: kcontrol/componentchooser/componentchooser.desktop
 ===================================================================
---- kcontrol/componentchooser/componentchooser.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kcontrol/componentchooser/componentchooser.desktop	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kcontrol/componentchooser/componentchooser.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/componentchooser/componentchooser.desktop	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -39,7 +39,7 @@
  Name[hu]=KomponensvĂĄlasztĂł
  Name[is]=Einingaval
@@ -378,8 +636,8 @@
  Keywords[hu]=komponensek,komponensvålasztó,erőforråsok,levelezőprogram,terminålemulåció
 Index: kcontrol/accessibility/accessibility.desktop
 ===================================================================
---- kcontrol/accessibility/accessibility.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kcontrol/accessibility/accessibility.desktop	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kcontrol/accessibility/accessibility.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/accessibility/accessibility.desktop	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -114,7 +114,7 @@
  Comment[hu]=A szåmítógÊp kezelÊsÊt segítő eszkÜzÜk fogyatÊkosoknak
  Comment[is]=EndurbÌtt aðgengi fyrir Þå sem Þurfa
@@ -400,8 +658,8 @@
  Keywords[hu]=hozzåfÊrÊs,segÊdeszkÜzÜk,sßket,fogyatÊkos,csengő,hallható csengetÊs,låtható csengetÊs,billentyŹzet,billentyŹk,ragadós billentyŹk,visszaugró billentyŹk,lassú billentyŹk,egÊrkezelÊs,numerikus billentyŹzet
 Index: kcontrol/taskbar/kcmtaskbar.desktop
 ===================================================================
---- kcontrol/taskbar/kcmtaskbar.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kcontrol/taskbar/kcmtaskbar.desktop	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kcontrol/taskbar/kcmtaskbar.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/taskbar/kcmtaskbar.desktop	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -108,7 +108,7 @@
  Comment[hu]=A panel feladatlistĂĄjĂĄnak beĂĄllĂ­tĂĄsai
  Comment[is]=HÊr getur Þú stillt verkefnaslå spjaldsins
@@ -413,8 +671,8 @@
  Comment[lv]=Šeit Jōs varat konfigurēt paneğa uzdevumjoslu
 Index: kcontrol/fonts/fonts.desktop
 ===================================================================
---- kcontrol/fonts/fonts.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kcontrol/fonts/fonts.desktop	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kcontrol/fonts/fonts.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/fonts/fonts.desktop	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -179,7 +179,7 @@
  Keywords[fy]=fonts,font,letters,lettertypen,lettertypes,tekenset,karakterferzamling,paniel,kicker,Konfiguraasjesintrum,styl,triembehearder,wurkbalke,menu,Finster,titel,finstertitel,desktops,buroblĂŞden
  Keywords[ga]=clĂłnna,clĂłfhoirne,clĂłmhĂŠid,stĂ­leanna,tacair charachtair,painĂŠal,kicker,painĂŠal rialaithe,deasca,Bainisteoir Comhad,BarraĂ­ UirlisĂ­,RoghchlĂĄr,Teideal Fuinneoige,Teideal
@@ -424,10 +682,39 @@
  Keywords[hi]=ŕ¤Ťŕ¤źŕĽ‰ŕ¤¨ŕĽŕ¤ŸŕĽŕ¤¸, ŕ¤Ťŕ¤źŕĽ‰ŕ¤¨ŕĽŕ¤ŸŕĽŕ¤¸ आकञर,ŕ¤śŕĽˆŕ¤˛ŕĽ€,ŕ¤•ŕĽˆŕ¤°ŕ¤¸ŕĽ‡ŕ¤Ÿ,ŕ¤•ŕĽˆŕ¤°ŕĽ‡ŕ¤•ŕĽŕ¤Ÿŕ¤° ŕ¤¸ŕĽ‡ŕ¤ŸŕĽŕ¤¸,ऍलक,किकर, ŕ¤¨ŕ¤żŕ¤Żŕ¤‚ŕ¤¤ŕĽŕ¤°ŕ¤Ł ऍलक,ŕ¤ĄŕĽ‡ŕ¤¸ŕĽŕ¤•ŕ¤ŸŕĽ‰ŕ¤Ş,ऍटञइल ŕ¤ŞŕĽŕ¤°ŕ¤Źŕ¤‚ŕ¤§ŕ¤•,ŕ¤”ŕ¤œŕ¤źŕ¤žŕ¤° ŕ¤Şŕ¤ŸŕĽŕ¤ŸŕĽ€,ŕ¤ŽŕĽ‡ŕ¤¨ŕĽŕ¤ŻŕĽ‚,ािंथ་ ŕ¤śŕĽ€ŕ¤°ŕĽŕ¤ˇŕ¤•,ŕ¤śŕĽ€ŕ¤°ŕĽŕ¤ˇŕ¤•
  Keywords[hr]=fonts,font size,styles,charsets,character sets,panel,kicker,control panel,desktops,FileManager,Toolbars,Menu,Window Title,Title,fontovi,veličina fonta,stilovi,znakovi,ploča,radna površina,alatne trake,izbornik,naslov prozora,naslov,upravljanje datotekama
  Keywords[hu]=betŹtípusok,betŹmÊret,stílusok,karakterkÊszletek,panel,Kicker,vezÊrlőkÜzpont,asztalok,fåjlkezelő,eszkÜztår,menß,ablakcím,címsor
+Index: kcontrol/fonts/fonts.cpp
+===================================================================
+--- kcontrol/fonts/fonts.cpp	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/fonts/fonts.cpp	(.../branches/KDE/3.5/kdebase)	(revision 556696)
+@@ -339,18 +339,13 @@
+   else
+     xft.setExcludeRange(0, 0);
+ 
+-  if(useSubPixel->isChecked())
+-  {
+-    KXftConfig::SubPixel::Type spType(getSubPixelType());
++  KXftConfig::SubPixel::Type spType(useSubPixel->isChecked()
++                                        ? getSubPixelType()
++                                        : KXftConfig::SubPixel::None);
+ 
+-    xft.setSubPixelType(spType);
+-    kglobals.writeEntry("XftSubPixel", KXftConfig::toStr(spType));
+-  }
+-  else
+-  {
+-    xft.setSubPixelType(KXftConfig::SubPixel::None);
+-    kglobals.writeEntry("XftSubPixel", "");
+-  }
++  xft.setSubPixelType(spType);
++  kglobals.writeEntry("XftSubPixel", KXftConfig::toStr(spType));
++  kglobals.writeEntry("XftAntialias", useAA);
+ 
+   bool mod=false;
+ #ifdef HAVE_FONTCONFIG
 Index: kcontrol/kcontrol/kinfocenter.desktop
 ===================================================================
---- kcontrol/kcontrol/kinfocenter.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kcontrol/kcontrol/kinfocenter.desktop	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kcontrol/kcontrol/kinfocenter.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/kcontrol/kinfocenter.desktop	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -22,6 +22,7 @@
  Name[pt_BR]=Centro de Informaçþes do KDE
  Name[ro]=Centrul de informaĹŁii KDE
@@ -436,7 +723,15 @@
  Name[sv]=Informationscentralen
  Name[ta]=ŕŽ•ŕŻ‡ŕŽ¤ŕŽ•ŕŽľŕŽ˛ŕŻ ŕŽŽŕŻˆŕŽŻŕŽŽŕŻ
  Name[tg]=ĐšĐœĐ°Ń€ĐşĐ°ĐˇĐ¸ иттиНООт
-@@ -71,6 +72,7 @@
+@@ -58,6 +59,7 @@
+ GenericName[ja]=ă‚¤ăƒłăƒ•ă‚Šă‚ťăƒłă‚żăƒź
+ GenericName[km]=áž˜áž‡áŸ’ážˆáž˜ážŽáŸ’ážŒáž›â€‹áž–áŸážáŸŒáž˜ážśáž“
+ GenericName[lt]=Info centras
++GenericName[mk]=Đ˜Đ˝Ń„ĐžŃ€ĐźĐ°Ń‚Đ¸Đ˛ĐľĐ˝ цонтар
+ GenericName[ms]=Pusat Maklumat
+ GenericName[nb]=KDEs informasjonssenter
+ GenericName[nds]=Infozentrum
+@@ -71,6 +73,7 @@
  GenericName[ru]=Ќонтр инфОрПации
  GenericName[rw]=Amakuru Hagati
  GenericName[se]=DiehtoguovddĂĄĹĄ
@@ -446,8 +741,8 @@
  GenericName[sr at Latn]=Informacioni centar
 Index: kcontrol/info/sound.desktop
 ===================================================================
---- kcontrol/info/sound.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 549703)
-+++ kcontrol/info/sound.desktop	(.../branches/KDE/3.5/kdebase)	(revision 549703)
+--- kcontrol/info/sound.desktop	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/info/sound.desktop	(.../branches/KDE/3.5/kdebase)	(revision 556696)
 @@ -184,7 +184,7 @@
  Keywords[fy]=lĂťd,audio,soundcard,midi,OSS,systeemynformaasje,ALSA,lĂťdskaart
  Keywords[ga]=Fuaim,CĂĄrta Fuaime,MIDI,OSS,Eolas faoin ChĂłras
@@ -457,10 +752,31 @@
  Keywords[hi]=ध्वनि,ऑथिय་,ŕ¤¸ŕ¤žŕ¤‰ŕ¤‚ŕ¤Ąŕ¤•ŕ¤žŕ¤°ŕĽŕ¤Ą,ऎिथༀ,ŕ¤“ŕ¤ŕ¤¸ŕ¤ŕ¤¸,ŕ¤¤ŕ¤‚ŕ¤¤ŕĽŕ¤° ŕ¤œŕ¤žŕ¤¨ŕ¤•ŕ¤žŕ¤°ŕĽ€
  Keywords[hr]=Sound,Audio,Soundcard,Midi,OSS,System Information,Zvuk,Podaci o sustavu,Zvučna kartica
  Keywords[hu]=hang,audiĂł,hangkĂĄrtya,MIDI,OSS,rendszerinformĂĄciĂł
+Index: kcontrol/info/main.cpp
+===================================================================
+--- kcontrol/info/main.cpp	(.../tags/KDE/3.5.3/kdebase)	(revision 556696)
++++ kcontrol/info/main.cpp	(.../branches/KDE/3.5/kdebase)	(revision 556696)
+@@ -137,6 +137,15 @@
+     return 0;
+ #endif
+   }
+-  
+ 
<<Diff was trimmed, longer than 597 lines>>

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

More information about the pld-cvs-commit mailing list