SOURCES: kdebase-branch.diff - updated

arekm arekm at pld-linux.org
Tue Aug 8 08:09:05 CEST 2006 

Author: arekm                        Date: Tue Aug  8 06:09:05 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

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

---- Diffs:

================================================================
Index: SOURCES/kdebase-branch.diff
diff -u SOURCES/kdebase-branch.diff:1.31 SOURCES/kdebase-branch.diff:1.32
--- SOURCES/kdebase-branch.diff:1.31	Sat Jul  1 12:02:25 2006
+++ SOURCES/kdebase-branch.diff	Tue Aug  8 08:09:00 2006
@@ -1,12545 +1,4771 @@
-Index: ksmserver/shutdown.cpp
-===================================================================
---- 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 )
- {
--    kdDebug( 1218 ) << "cancelShutdown: client " << c->program() << "(" << c->clientId() << ")" << endl;
-+    kdWarning( 1218 ) << "Client " << c->program() << " (" << c->clientId() << ") canceled shutdown." << endl;
-     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 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
- Comment[it]=Plugin di Kate
--Comment[ja]=Kateăƒ—ăƒŠă‚°ă‚¤ăƒł
-+Comment[ja]=Kate ăƒ—ăƒŠă‚°ă‚¤ăƒł
- 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 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
- Comment[it]=Informazioni utente come password, nome ed email
--Comment[ja]=ăƒ‘ă‚šăƒŻăƒźăƒ‰ă€ĺĺ‰ă€emailăŞăŠăŽăƒŚăƒźă‚śćƒ
ĺ ą
-+Comment[ja]=ăƒ‘ă‚šăƒŻăƒźăƒ‰ă€ĺĺ‰ă€EăƒĄăƒźăƒŤăŞăŠăŽăƒŚăƒźă‚śćƒ
ĺ ą
- 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 556696)
-+++ kfind/kftabdlg.cpp	(.../branches/KDE/3.5/kdebase)	(revision 556696)
-@@ -183,6 +183,7 @@
-     sizeUnitBox ->insertItem( i18n("Bytes") );
-     sizeUnitBox ->insertItem( i18n("KB") );
-     sizeUnitBox ->insertItem( i18n("MB") );
-+    sizeUnitBox ->insertItem( i18n("GB") );
-     sizeUnitBox ->setCurrentItem(1);
- 
-     int tmp = sizeEdit->fontMetrics().width(" 000000000 ");
-@@ -574,7 +575,8 @@
- 
- void KfindTabWidget::setQuery(KQuery *query)
- {
--	int size;
-+  KIO::filesize_t size;
-+  KIO::filesize_t sizeunit;
-   bool itemAlreadyContained(false);
-   // only start if we have valid dates
-   if (!isDateValid()) return;
-@@ -603,17 +605,25 @@
-   switch (sizeUnitBox->currentItem())
-   {
-      case 0:
--         size = 1; //one byte
--			break;
-+         sizeunit = 1; //one byte
-+         break;
-      case 2:
--         size = 1048576; //1M
--			break;
--		case 1:
--		default:
--			size=1024; //1k
--			break;
-+         sizeunit = 1048576; //1M
-+         break;
-+     case 3:
-+         sizeunit = 1073741824; //1GB
-+         break;
-+     case 1: //fall to default case
-+     default:
-+         sizeunit = 1024; //1k
-+         break;
-   }
--  size = sizeEdit->value() * size;
-+  size = sizeEdit->value() * sizeunit;
-+
-+// TODO: troeder: do we need this check since it is very unlikely-
-+// to exceed ULLONG_MAX with INT_MAX * 1024^3.-
-+// Or is there an arch where this can happen?
-+#if 0
-   if (size < 0)  // overflow
-      if (KMessageBox::warningYesNo(this, i18n("Size is too big. Set maximum size value?"), i18n("Error"),i18n("Set"),i18n("Do Not Set"))
-            == KMessageBox::Yes)
-@@ -624,21 +634,10 @@
- 		}
-      else
-         return;
-+#endif
- 
--  switch (sizeBox->currentItem())
--  {
--    case 1:
--      query->setSizeRange(size, -1);
--      break;
--    case 2:
--      query->setSizeRange(-1, size);
--      break;
--    case 3:
--      query->setSizeRange(size,size);
--      break;
--    default:
--      query->setSizeRange(-1, -1);
--  }
-+  // set range mode and size value
-+  query->setSizeRange(sizeBox->currentItem(),size,0);
- 
-   // dates
-   QDateTime epoch;
-Index: kfind/kquery.cpp
-===================================================================
---- 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)
-   : QObject(parent, name),
--    m_minsize(-1), m_maxsize(-1),
-+    m_sizemode(0), m_sizeboundary1(0), m_sizeboundary2(0),
-     m_timeFrom(0), m_timeTo(0),
-     job(0), m_insideCheckEntries(false), m_result(0)
- {
-@@ -178,10 +178,24 @@
-     if (!matched)
-       return;
- 
--    // make sure the files are in the correct range
--    if (  ( m_minsize >= 0 && (int)file->size() < m_minsize ) ||
--          ( m_maxsize >= 0 && (int)file->size() > m_maxsize ) )
--      return;
-+    switch( m_sizemode )
-+    {
-+        case 1: // "at least"
-+            if ( file->size() < m_sizeboundary1 ) return;
-+            break;
-+        case 2: // "at most"
-+            if ( file->size() > m_sizeboundary1 ) return;
-+            break;
-+        case 3: // "equal"
-+            if ( file->size() != m_sizeboundary1 ) return;
-+            break;
-+        case 4: // "between"
-+            if ( (file->size() < m_sizeboundary1) || (file->size() > m_sizeboundary2) ) return;
-+            break;
-+        case 0: // "none" -> fall to default
-+        default:
-+            break;
-+    }
- 
-     // make sure it's in the correct date range
-     // what about 0 times?
-@@ -403,10 +417,11 @@
-   m_filetype = filetype;
- }
- 
--void KQuery::setSizeRange(int min, int max)
-+void KQuery::setSizeRange(int mode, KIO::filesize_t value1, KIO::filesize_t value2)
- {
--  m_minsize = min;
--  m_maxsize = max;
-+  m_sizemode = mode;
-+  m_sizeboundary1 = value1;
-+  m_sizeboundary2 = value2;
- }
- 
- void KQuery::setTimeRange(time_t from, time_t to)
+--- kdepasswd/kcm/kcm_useraccount.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 570934)
++++ kdepasswd/kcm/kcm_useraccount.desktop	(.../branches/KDE/3.5/kdebase)	(revision 570934)
+@@ -153,7 +153,7 @@
+ Comment[nn]=Brukarinformasjon som passord, namn og e-postadresse
+ Comment[pa]=ŕ¨‰ŕ¨Şŕ¨­ŕŠ‹ŕ¨—ŕŠ€ ŕ¨œŕ¨žŕ¨Łŕ¨•ŕ¨žŕ¨°ŕŠ€ ŕ¨œŕ¨żŕ¨ľŕŠ‡ŕ¨‚ ਕਿ ŕ¨—ŕŠŕ¨Şŕ¨¤-ŕ¨•ŕŠ‹ŕ¨Ą, ਨਞਂ ŕ¨
ŕ¨¤ŕŠ‡ ŕ¨ˆ-ਪੱਤਰ
+ Comment[pl]=Informacje o koncie uşytkownika: hasło, imię i nazwisko, e-mail itd.
+-Comment[pt]=Informaçþes do utilizador tais como senha, nome e e-mail
++Comment[pt]=Informaçþes do utilizador, como a senha, o nome e o e-mail
+ Comment[pt_BR]=Informaçþes do usuårio tais como senha, nome e e-mail
+ Comment[ro]=InformaĹŁii despre utilizator, precum parola, numele ĹŸi adresa de e-mail
+ Comment[ru]=Сведения Đž ĐżĐžĐťŃŒĐˇĐžĐ˛Đ°Ń‚ĐľĐťĐľ, такио как ĐżĐ°Ń€ĐžĐťŃŒ, имя и e-mail
 Index: kfind/Kfind.desktop
 ===================================================================
---- 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
- Name[se]=Oza fiillaid dahje mĂĄhpaid
-+Name[sk]=Hľadať súbory/priečinky
- Name[sl]=Najdi datoteke in mape
- Name[sr]=ТраМоњо Ń„Đ°Ń˜ĐťĐžĐ˛Đ°/фасцикНи
- Name[sr at Latn]=TraĹženje fajlova/fascikli
-Index: kfind/kquery.h
-===================================================================
---- 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();
- 
--  void setSizeRange( int min, int max );
-+  void setSizeRange( int mode, KIO::filesize_t value1, KIO::filesize_t value2 );
-   void setTimeRange( time_t from, time_t to );
-   void setRegExp( const QString &regexp, bool caseSensitive );
-   void setRecursive( bool recursive );
-@@ -65,8 +65,9 @@
-   void checkEntries();
- 
-   int m_filetype;
--  int m_minsize;
--  int m_maxsize;
-+  int m_sizemode;
-+  KIO::filesize_t m_sizeboundary1;
-+  KIO::filesize_t m_sizeboundary2;
-   KURL m_url;
-   time_t m_timeFrom;
-   time_t m_timeTo;
-Index: kcontrol/background/background.desktop
-===================================================================
---- 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
- Comment[it]=Cambia le impostazioni dello sfondo
--Comment[ja]=čƒŒć™ŻăŽč¨­ĺŽšăŽĺ¤‰ć›´
-+Comment[ja]=čƒŒć™ŻăŽč¨­ĺŽšă‚’ĺ¤‰ć›´
- Comment[km]=áž•áŸ’áž›ážśážŸáŸ‹áž”áŸ’ážážźážšáž€ážśážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹áž•áŸ’áž‘áŸƒâ€‹ážážśáž„â€‹áž€áŸ’ážšáŸ„áž™
- Comment[lo]=ŕş•ŕşąŕť‰ŕş‡ŕş„ŕťˆŕş˛ŕşžŕşˇŕť‰ŕş™ŕşŤŕşĽŕşąŕş‡
- Comment[lt]=Keisti fono parinktis
-@@ -179,7 +179,7 @@
- Keywords[fy]=eftergrÝn,buroblêden,kleur,kleuren,ôfbyldingen,behang,ferminge, balâns,lyts Ýnthâld,meardere ôfbyldingen,pixmap,grafysk
- Keywords[ga]=cĂşlra,deasca,dathanna,Ă­omhĂĄnna,cĂşlbhrait,cumasc,cothrom,taisce,cĂşlbhrait iomadĂşla,mapa picteilĂ­nĂ­
- Keywords[gl]=fondo,escritĂłrios,cores,imaxes,papeis tapiz,balance,cache,mĂşltiples papeis tapiz,mapa de pĂ­xels
--Keywords[he]=רקע,תמונות,טbackground,desktops,colors,colours,images,wallpapers,blending,balance,cache,multiple wallpapers,pixmapפטים,עירוב,איזון,מטמון,טפטים מרובים,×Ś×‘×˘×™×,×Š×•×œ×—× ×•×Ş עבודה, 
-+Keywords[he]=רקע,תמונות,background,desktops,colors,colours,images,wallpapers,blending,balance,cache,multiple,wallpapers,pixmapפטים,עירוב,איזון,מטמון,טפטים,מרובים,×Ś×‘×˘×™×,×Š×•×œ×—× ×•×Ş עבודה, 
- 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 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
- Name[se]=Alla vuostĂĄlaĹĄvuohta, fiskat alida alde
-+Name[sk]=VysokokontrastnĂĄ ĹžltĂĄ na modrej
- Name[sl]=Visoko kontrastna rumena na modrem
- Name[sr]=Đ–ŃƒŃ‚Đ° на ĐżĐťĐ°Đ˛ĐžŃ˜ висОкОг кОнтраста
- 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 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
- Name[se]=Alla vuostálasvuohta, čáhppes teaksta
-+Name[sk]=Vysokokontrastný čierny text
- Name[sl]=Visoko kontrastno črno besedilo
- Name[sr]=Ќрни токст висОкОг кОнтраста
- 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 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
- Name[se]=Alla vuostĂĄlasvuohta, vilges teaksta
-+Name[sk]=VysokokontrastnĂ˝ biely text
- 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 556696)
-+++ kcontrol/krdb/ad/AAAXaw.ad	(.../branches/KDE/3.5/kdebase)	(revision 556696)
-@@ -34,8 +34,3 @@
- *ShapeStyle: Rectangle
- *SmeBSB*shadowWidth: 3
- *Scrollbar*Cursor: left_ptr
--*Command.translations: \
--	<LeaveWindow>:	reset()\n\
--	<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 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
- Comment[it]=Mostra i dispositivi USB collegati a questo computer
--Comment[ja]=ă‚łăƒłăƒ”ăƒĽăƒźă‚żăŤćŽĽçśšă•ă‚ŒăŚă„ă‚‹USBăƒ‡ăƒă‚¤ă‚šăŽčĄ¨ç¤ş
-+Comment[ja]=ă‚łăƒłăƒ”ăƒĽăƒźă‚żăŤćŽĽçśšă•ă‚ŒăŚă„ă‚‹USBăƒ‡ăƒă‚¤ă‚šăŽćƒ
ĺ ą
- 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 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
- Name[it]=Programma di posta elettronica
--Name[ja]=E ăƒĄăƒźăƒŤă‚ŻăƒŠă‚¤ă‚˘ăƒłăƒˆ
-+Name[ja]=ăƒĄăƒźăƒŤă‚ŻăƒŠă‚¤ă‚˘ăƒłăƒˆ
- Name[km]=áž€áž˜áŸ’áž˜ážœážˇáž’áž¸â€‹áž˘áŸŠáž¸áž˜áŸ‚áž›
- Name[lo]=ŕť„ŕş„ŕťŕş­ŕş™ Alarm
- Name[lt]=E. paĹĄto klientas
-@@ -100,7 +100,7 @@
- Comment[hu]=Ez a szolgåltatås lehetővÊ teszi az alapÊrtelmezett e-mail-kliens előíråsåt. Az Üsszes KDE-alkalmazåsnak figyelembe kell vennie ezt az ÊrtÊket a levelezőprogram elindítåsakor.
- 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[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.
+--- kfind/Kfind.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 570934)
<<Diff was trimmed, longer than 597 lines>>

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

More information about the pld-cvs-commit mailing list