rev 3002 - trunk/packages/kdebase/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Fri Jan 27 19:12:28 UTC 2006
Author: chrsmrtn
Date: 2006-01-27 19:12:27 +0000 (Fri, 27 Jan 2006)
New Revision: 3002
Added:
trunk/packages/kdebase/debian/patches/01_kdebase_branch_r502695.diff
Log:
kdebase branch pull.
Added: trunk/packages/kdebase/debian/patches/01_kdebase_branch_r502695.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/01_kdebase_branch_r502695.diff 2006-01-27 19:12:05 UTC (rev 3001)
+++ trunk/packages/kdebase/debian/patches/01_kdebase_branch_r502695.diff 2006-01-27 19:12:27 UTC (rev 3002)
@@ -0,0 +1,911 @@
+#DPATCHLEVEL=0
+--- ksmserver/legacy.cpp (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ ksmserver/legacy.cpp (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -34,6 +34,10 @@
+ #include <config.h>
+ #endif
+
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#endif
++
+ #include "server.h"
+
+ #include <unistd.h>
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/cia.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/cia.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -13,6 +13,7 @@
+ Name[it]=World Fact Book della CIA
+ Name[km]=សៀវភៅការពិតនៃពិភពលោករបស់ CIA
+ Name[lt]=CŽV pasaulio faktų knyga
++Name[ms]=Buku Fakta Dunia CIA
+ Name[pa]=CIA ਸੰਸਾਰ ਜਾਣਕਾਰੀ ਕਿਤਾਬ
+ Name[pl]=Światowe wydarzenia CIA (CIA World Factbook)
+ Name[pt_BR]=CIA World Fact Book
+--- kcontrol/ebrowsing/ebrowsing.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kcontrol/ebrowsing/ebrowsing.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -27,7 +27,7 @@
+ Name[eo]=TTT Klavokombinoj
+ Name[es]=Accesos rápidos para web
+ Name[et]=Veebi kiirkorraldused
+-Name[eu]=Web lasterbideak
++Name[eu]=Web laster-bideak
+ Name[fa]=میانبرهای وب
+ Name[fi]=WWW-pikavalinnat
+ Name[fr]=Raccourcis Web
+@@ -166,7 +166,7 @@
+ Keywords[eo]=progresintoj,TTT,krozado,WWW,Interreto,filtrilo,reto,serĉiloj,mallongigoj
+ Keywords[es]=Navegación Mejorada,Navegación,WWW,Internet,Palabras clave de Internet,Filtros de Internet,Red,Motores de búsqueda,Accesos directos
+ Keywords[et]=Täiustatud lehitsemine,lehitsemine,WWW,internet,interneti võtmesõnad,interneti filtrid,võrk,otsingumootorid,kiirkorraldused
+-Keywords[eu]=Arakatze hobetua,Arakatzea,WWW,Internet,Interneteko hitz gakoak, Interneteko irakazkiak,Sarea,Bilaketa motorea,Lasterbideak
++Keywords[eu]=Arakatze hobetua,Arakatzea,WWW,Internet,Interneteko hitz gakoak, Interneteko irakazkiak,Sarea,Bilaketa motorea,Laster-bideak
+ Keywords[fa]=Enhanced Browsing,Browsing,WWW,Internet,Internet Keywords,Internet Filters,Network,Search Engines,Shortcuts,مرور پیشرفته
+ Keywords[fi]=Edistynyt selailu,selailu,WWW,Internet,Internet-hakusanat,Internet suodattimet,Verkko,Hakukoneet,Pikavalinnat
+ Keywords[fr]=navigation avancée,navigation,www,web,internet,mots-clés internet,filtres internet,réseau,moteurs de recherche,raccourcis
+--- kcontrol/locale/localemon.cpp (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kcontrol/locale/localemon.cpp (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -165,13 +165,13 @@
+ if (i != m_locale->fracDigits())
+ config->writeEntry("FracDigits", m_locale->fracDigits(), true, true);
+
+- b = ent.readNumEntry("PositivePrefixCurrencySymbol", true);
++ b = ent.readBoolEntry("PositivePrefixCurrencySymbol", true);
+ config->deleteEntry("PositivePrefixCurrencySymbol", false, true);
+ if (b != m_locale->positivePrefixCurrencySymbol())
+ config->writeEntry("PositivePrefixCurrencySymbol",
+ m_locale->positivePrefixCurrencySymbol(), true, true);
+
+- b = ent.readNumEntry("NegativePrefixCurrencySymbol", true);
++ b = ent.readBoolEntry("NegativePrefixCurrencySymbol", true);
+ config->deleteEntry("NegativePrefixCurrencySymbol", false, true);
+ if (b != m_locale->negativePrefixCurrencySymbol())
+ config->writeEntry("NegativePrefixCurrencySymbol",
+--- kcontrol/locale/localetime.cpp (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kcontrol/locale/localetime.cpp (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -289,7 +289,7 @@
+ if ( m_locale->nounDeclension() )
+ {
+ bool b;
+- b = ent.readNumEntry("DateMonthNamePossessive", false);
++ b = ent.readBoolEntry("DateMonthNamePossessive", false);
+ config->deleteEntry("DateMonthNamePossessive", false, true);
+ if (b != m_locale->dateMonthNamePossessive())
+ config->writeEntry("DateMonthNamePossessive",
+--- kcontrol/access/eventsrc (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kcontrol/access/eventsrc (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -24,6 +24,7 @@
+ Comment[ja]=KDE アクセシビリティツール
+ Comment[km]=ឧបករណ៍មធ្យោបាយងាយស្រួល KDE
+ Comment[mk]=Алатка за пристапливост во KDE
++Comment[ms]=Alatan Kebolehcapaian KDE
+ Comment[nb]=Tilgjengelighetsverktøy for KDE
+ Comment[nds]=KDE-Warktüüch för Behinnerte
+ Comment[nl]=KDE Toegankelijkheid
+@@ -34,6 +35,7 @@
+ Comment[pt_BR]=Ferramenta de Acessibilidade do KDE
+ Comment[ru]=Специальные возможности KDE
+ Comment[se]=KDE reaidu álkkibut geavaheami várás
++Comment[sl]=Orodje za dostopnost KDE
+ Comment[sr]=KDE алатка за приступачност
+ Comment[sr at Latn]=KDE alatka za pristupačnost
+ Comment[sv]=Handikappverktyg för KDE
+@@ -107,7 +109,7 @@
+ Comment[pl]=Klawisz modyfikujący (np. Shift lub Ctrl) zmienił stan i jest teraz włączony
+ Comment[pt]=Uma tecla modificadora (p.ex., o Shift ou o Ctrl) mudou o seu estado e ficou activa
+ Comment[pt_BR]=Uma tecla modificadora (p.ex., o Shift ou o Ctrl) mudou o seu estado e ficou activa
+-Comment[sl]=Spremenilna tipka (npr. Shift ali Control) je spremenila svoje stanje in je sedaj omogočena
++Comment[sl]=Spremenilna tipka (npr. Shift ali Ctrl) je spremenila svoje stanje in je sedaj omogočena
+ Comment[sr]=Модификаторски тастер (нпр. Shift или Control) је променио стање и сада је активан
+ Comment[sr at Latn]=Modifikatorski taster (npr. Shift ili Control) je promenio stanje i sada je aktivan
+ Comment[sv]=En väljartangent (t.ex. Skift eller Ctrl) har ändrat tillstånd och är nu aktiv
+@@ -177,7 +179,7 @@
+ Comment[pl]=Klawisz modyfikujący (np. Shift lub Ctrl) zmienił stan i jest teraz wyłączony
+ Comment[pt]=Uma tecla modificadora (p.ex., o Shift ou o Ctrl) mudou o seu estado e ficou inactiva
+ Comment[pt_BR]=Uma tecla modificadora (p.ex., o Shift ou o Ctrl) mudou o seu estado e ficou inactiva
+-Comment[sl]=Spremenilna tipka (npr. Shift ali Control) je spremenila svoje stanje in je sedaj oneomogočena
++Comment[sl]=Spremenilna tipka (npr. Shift ali Ctrl) je spremenila svoje stanje in je sedaj oneomogočena
+ Comment[sr]=Модификаторски тастер (нпр. Shift или Control) је променио стање и више није активан
+ Comment[sr at Latn]=Modifikatorski taster (npr. Shift ili Control) je promenio stanje i više nije aktivan
+ Comment[sv]=En väljartangent (t.ex. Skift eller Ctrl) har ändrat tillstånd och är nu inaktiv
+@@ -247,7 +249,7 @@
+ Comment[pl]=Klawisz modyfikujący (np. Shift lub Ctrl) został zablokowany i będzie włączony przy następnych naciśnięciach klawiszy
+ Comment[pt]=Uma tecla modificadora (p.ex., o Shift ou o Ctrl) ficou bloqueada e está agora activa para todas as sequências de teclas seguintes
+ Comment[pt_BR]=Uma tecla modificadora (p.ex., o Shift ou o Ctrl) ficou bloqueada e está agora activa para todas as sequências de teclas seguintes
+-Comment[sl]=Spremenilna tipka (npr. Shift ali Control) je zaklenjena in je sedaj omogočena za vse tipkanje v nadaljnje
++Comment[sl]=Spremenilna tipka (npr. Shift ali Ctrl) je zaklenjena in je sedaj omogočena za vse tipkanje v nadaljnje
+ Comment[sr]=Модификаторски тастер (нпр. Shift или Control) је закључан и сада је активан за све наредне притиске тастера
+ Comment[sr at Latn]=Modifikatorski taster (npr. Shift ili Control) je zaključan i sada je aktivan za sve naredne pritiske tastera
+ Comment[sv]=En väljartangent (t.ex. Skift eller Ctrl) har låsts och är nu aktiv för alla följande tangentnertryckningar
+@@ -317,7 +319,7 @@
+ Comment[pl]=Klawisz blokujący (np. Caps Lock lub Num Lock) zmienił stan i jest teraz wyłączony
+ Comment[pt]=Uma tecla de bloqueio (p.ex., o Caps Lock ou o Num Lock) mudou o seu estado e ficou activa
+ Comment[pt_BR]=Uma tecla de bloqueio (p.ex., o Caps Lock ou o Num Lock) mudou o seu estado e ficou activa
+-Comment[sl]=Zaklenilna tipka (npr Caps Lock ali Num Lock) je spremenila svoje stanje in je sedaj omogočena
++Comment[sl]=Zaklenilna tipka (npr. Caps Lock ali Num Lock) je spremenila svoje stanje in je sedaj omogočena
+ Comment[sr]=Тастер за закључавање (нпр. Caps Lock или Num Lock) је променио стање и сада је активан
+ Comment[sr at Latn]=Taster za zaključavanje (npr. Caps Lock ili Num Lock) je promenio stanje i sada je aktivan
+ Comment[sv]=En låstangent (t.ex. Caps Lock eller Num Lock) har ändrat tillstånd och är nu aktiv
+@@ -387,7 +389,7 @@
+ Comment[pl]=Klawisz blokujący (np. Caps Lock lub Num Lock) zmienił stan i jest teraz wyłączony
+ Comment[pt]=Uma tecla de bloqueio (p.ex., o Caps Lock ou o Num Lock) mudou o seu estado e ficou inactiva
+ Comment[pt_BR]=Uma tecla de bloqueio (p.ex., o Caps Lock ou o Num Lock) mudou o seu estado e ficou inactiva
+-Comment[sl]=Zaklenilna tipka (npr Caps Lock ali Num Lock) je spremenila svoje stanje in je sedaj onemogočena
++Comment[sl]=Zaklenilna tipka (npr. Caps Lock ali Num Lock) je spremenila svoje stanje in je sedaj onemogočena
+ Comment[sr]=Тастер за закључавање (нпр. Caps Lock или Num Lock) је променио стање и више није активан
+ Comment[sr at Latn]=Taster za zaključavanje (npr. Caps Lock ili Num Lock) je promenio stanje i više nije aktivan
+ Comment[sv]=En låstangent (t.ex. Caps Lock eller Num Lock) har ändrat tillstånd och är nu inaktiv
+@@ -407,7 +409,7 @@
+ Name[el]=Τα κολλημένα πλήκτρα ενεργοποιήθηκαν ή απενεργοποιήθηκαν
+ Name[es]=Se han activado o desactivado las teclas pegajosas
+ Name[et]=Kleepuvad klahvid on keelatud või lubatud
+-Name[eu]=Tekla itsakorrak gaitu edo ezgaitu dira
++Name[eu]=Tekla itsakorrak gaitu edo desgaitu dira
+ Name[fi]=Tahmeat näppäimet on otettu käyttöön tai poistettu käytöstä
+ Name[fr]=L'automaintien des touches a été activé ou désactivé
+ Name[fy]=Plakkende toetsen binne aktivearre of deaktivearre
+@@ -444,7 +446,7 @@
+ Comment[el]=Τα κολλημένα πλήκτρα ενεργοποιήθηκαν ή απενεργοποιήθηκαν
+ Comment[es]=Se han activado o desactivado las teclas pegajosas
+ Comment[et]=Kleepuvad klahvid on keelatud või lubatud
+-Comment[eu]=Tekla itsakorrak gaitu edo ezgaitu dira
++Comment[eu]=Tekla itsakorrak gaitu edo desgaitu dira
+ Comment[fi]=Tahmeat näppäimet on otettu käyttöön tai poistettu käytöstä
+ Comment[fr]=L'automaintien des touches a été activé ou désactivé
+ Comment[fy]=Plakkende toetsen binne aktivearre of deaktivearre
+@@ -486,7 +488,7 @@
+ Name[el]=Τα αργά πλήκτρα ενεργοποιήθηκαν ή απενεργοποιήθηκαν
+ Name[es]=Se han activado o desactivado las teclas lentas
+ Name[et]=Aeglased klahvid on keelatud või lubatud
+-Name[eu]=Tekla motelak gaitu edo ezgaitu dira
++Name[eu]=Tekla motelak gaitu edo desgaitu dira
+ Name[fi]=Hitaat näppäimet on otettu käyttöön tai poistettu käytöstä
+ Name[fr]=Les touches lentes ont été activées ou désactivées
+ Name[fy]=Trage toetsen binne aktivearre of ûntaktivearre
+@@ -523,7 +525,7 @@
+ Comment[el]=Τα αργά πλήκτρα ενεργοποιήθηκαν ή απενεργοποιήθηκαν
+ Comment[es]=Se han activado o desactivado las teclas pegajosas
+ Comment[et]=Aeglased klahvid on keelatud või lubatud
+-Comment[eu]=Tekla motelak gaitu edo ezgaitu dira
++Comment[eu]=Tekla motelak gaitu edo desgaitu dira
+ Comment[fi]=Hitaat näppäimet on otettu käyttöön tai poistettu käytöstä
+ Comment[fr]=Les touches lentes ont été activées ou désactivées
+ Comment[fy]=Trage toetsen binne aktivearre of ûntaktivearre
+@@ -564,6 +566,7 @@
+ Name[el]=Τα πλήκτρα αναπήδησης ενεργοποιήθηκαν ή απενεργοποιήθηκαν
+ Name[es]=Se han activado o desactivado las teclas de rebote
+ Name[et]=Põrkavad klahvid on keelatud või lubatud
++Name[eu]=Errebotatze-teklak gaitu edo desgaitu dira
+ Name[fi]=Kimpoavat näppäimet on otettu käyttöön tai poistettu käytöstä
+ Name[fr]=Les touches non répétées ont été activées ou désactivées
+ Name[fy]=Stuiterjende toetsen binne aktivearre of ûntaktivearre
+@@ -600,6 +603,7 @@
+ Comment[el]=Τα πλήκτρα αναπήδησης ενεργοποιήθηκαν ή απενεργοποιήθηκαν
+ Comment[es]=Se han activado o desactivado las teclas de rebote
+ Comment[et]=Põrkavad klahvid on keelatud või lubatud
++Comment[eu]=Errebotatze-teklak gaitu edo desgaitu dira
+ Comment[fi]=Kimpoavat näppäimet on otettu käyttöön tai poistettu käytöstä
+ Comment[fr]=Les touches non répétées ont été activées ou désactivées
+ Comment[fy]=Stuiterjende toetsen binne aktivearre of ûntaktivearre
+@@ -641,7 +645,7 @@
+ Name[el]=Τα πλήκτρα ποντικιού ενεργοποιήθηκαν ή απενεργοποιήθηκαν
+ Name[es]=Se han activado o desactivado las teclas de ratón
+ Name[et]=Hiire klahvid on keelatud või lubatud
+-Name[eu]=Saguaren teklak gaitu edo ezgaitu egin dira
++Name[eu]=Saguaren teklak gaitu edo desgaitu egin dira
+ Name[fi]=Hiiren näppäimet on otettu käyttöön tai poistettu käytöstä
+ Name[fr]=Les touches gérant la souris ont été activées ou désactivées
+ Name[fy]=Mûstoetsen binne aktivearre of ûntaktivearre
+@@ -679,7 +683,7 @@
+ Comment[el]=Τα πλήκτρα ποντικιού ενεργοποιήθηκαν ή απενεργοποιήθηκαν
+ Comment[es]==Se han activado o desactivado las teclas de ratón
+ Comment[et]=Hiire klahvid on keelatud või lubatud
+-Comment[eu]=Saguaren teklak gaitu edo ezgaitu egin dira
++Comment[eu]=Saguaren teklak gaitu edo desgaitu egin dira
+ Comment[fi]=Hiiren näppäimet on otettu käyttöön tai poistettu käytöstä
+ Comment[fr]=Les touches gérant la souris ont été activées ou désactivées
+ Comment[fy]=Mûstoetsen binne aktivearre of ûntaktivearre
+--- kcontrol/kio/smbrodlg.cpp (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kcontrol/kio/smbrodlg.cpp (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -60,7 +60,7 @@
+ layout->addWidget(m_workgroupLe,3,1);
+
+ m_showHiddenShares=new QCheckBox(i18n("Show hidden shares"),this);
+- layout->addMultiCellWidget(m_showHiddenShares,4,4,0,1);*/
++ layout->addMultiCellWidget(m_showHiddenShares,4,4,0,1);
+
+ m_encodingList = new KComboBox( false, this );
+ QStringList _strList = KGlobal::charsets()->availableEncodingNames();
+@@ -69,6 +69,7 @@
+ label = new QLabel( m_encodingList, i18n( "MS Windows encoding:" ), this );
+ layout->addWidget( label, 3, 0 );
+ layout->addWidget( m_encodingList, 3, 1 );
++ */
+
+ layout->addWidget(new QWidget(this),4,0);
+
+@@ -76,7 +77,7 @@
+ connect(m_userLe, SIGNAL(textChanged(const QString&)), this, SLOT(changed()));
+ connect(m_passwordLe, SIGNAL(textChanged(const QString&)), this, SLOT(changed()));
+ // connect(m_workgroupLe, SIGNAL(textChanged(const QString&)), this, SLOT(changed()));
+- connect( m_encodingList, SIGNAL( activated( const QString & ) ), this , SLOT( changed() ) );
++// connect( m_encodingList, SIGNAL( activated( const QString & ) ), this , SLOT( changed() ) );
+
+ layout->setRowStretch(4, 1);
+
+@@ -98,9 +99,9 @@
+ // m_workgroupLe->setText(cfg->readEntry("Workgroup"));
+ // m_showHiddenShares->setChecked(cfg->readBoolEntry("ShowHiddenShares",false));
+
+- QStringList _strList = KGlobal::charsets()->availableEncodingNames();
+- QString m_encoding = QTextCodec::codecForLocale()->name();
+- m_encodingList->setCurrentItem( _strList.findIndex( cfg->readEntry( "Encoding", m_encoding.lower() ) ) );
++// QStringList _strList = KGlobal::charsets()->availableEncodingNames();
++// QString m_encoding = QTextCodec::codecForLocale()->name();
++// m_encodingList->setCurrentItem( _strList.findIndex( cfg->readEntry( "Encoding", m_encoding.lower() ) ) );
+
+ // unscramble
+ QString scrambled = cfg->readEntry( "Password" );
+@@ -129,7 +130,7 @@
+ cfg->writeEntry( "User", m_userLe->text());
+ // cfg->writeEntry( "Workgroup", m_workgroupLe->text());
+ // cfg->writeEntry( "ShowHiddenShares", m_showHiddenShares->isChecked());
+- cfg->writeEntry( "Encoding", m_encodingList->currentText() );
++// cfg->writeEntry( "Encoding", m_encodingList->currentText() );
+
+ //taken from Nicola Brodu's smb ioslave
+ //it's not really secure, but at
+--- kcontrol/kio/smbrodlg.h (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kcontrol/kio/smbrodlg.h (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -49,7 +49,7 @@
+ QLineEdit *m_passwordLe;
+ // QLineEdit *m_workgroupLe; //currently unused, Alex
+ // QCheckBox *m_showHiddenShares; //currently unused, Alex
+- KComboBox *m_encodingList;
++// KComboBox *m_encodingList; //currently unused
+ };
+
+ #endif
+--- kcontrol/colors/colors.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kcontrol/colors/colors.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -174,7 +174,7 @@
+ Keywords[ca]=colors,esquema,contrast,colors d'estri,esquema de color
+ Keywords[cs]=Barvy,Schéma,Kontrast,Barevná schémata
+ Keywords[cy]=lliwiau,cynlluniau,cyferbyniad,lliwiau celfigion,Cynllun Lliw
+-Keywords[da]=farver,sammensætning,kontrast,Kontrolfarver,Farvesammensætning
++Keywords[da]=farver,system,kontrast,Kontrolfarver,Farvesammensætning
+ Keywords[de]=Farben,Schema,Kontrast,Farbschema,Elemente
+ Keywords[el]=χρώματα,χρώματα,θέμα,αντίθεση,Χρώματα γραφικού συστατικού,Θέμα χρωμάτων
+ Keywords[en_GB]=colours,scheme,contrast,Widget colours,Colour Scheme
+--- kcontrol/keys/unix3.kksrc (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kcontrol/keys/unix3.kksrc (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -7,7 +7,7 @@
+ Name[ca]=Esquema UNIX
+ Name[cs]=Unixové schéma
+ Name[cy]=Cynllun UNIX
+-Name[da]=UNIX-farvesammensætning
++Name[da]=UNIX-system
+ Name[de]=UNIX-Design
+ Name[el]=UNIX Μορφή
+ Name[eo]=Uniksa aranĝo
+--- kcontrol/keys/keys.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kcontrol/keys/keys.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -27,7 +27,7 @@
+ Name[eo]=Klavkombinoj
+ Name[es]=Accesos rápidos de teclado
+ Name[et]=Kiirklahvid
+-Name[eu]=Teklatu bidezko lasterbideak
++Name[eu]=Teklatu bidezko laster-bideak
+ Name[fa]=میانبرهای صفحه کلید
+ Name[fi]=Näppäimistön pikavalinnat
+ Name[fr]=Raccourcis clavier
+@@ -164,13 +164,13 @@
+ Keywords[ca]=Tecles,lligams de tecles globals,Esquema de tecla,Lligams de tecles,dreceres,dreceres d'aplicació
+ Keywords[cs]=Klávesy,Globální klávesové zkratky,Schéma kláves,Klávesové zkratky,Zkratky,Aplikační zkratky,Vazby,Klávesové vazby
+ Keywords[cy]=Bysell,Rhwymiadau bysell eang,Cynllun bysell,Llwybrau byr,Llwybrau byr y rhaglen
+-Keywords[da]=Taster,Globale tastebindinger,Tasteskema,Tastebindinger,genveje,programgenveje
++Keywords[da]=Taster,Globale tastebindinger,Tastesystem,Tastebindinger,genveje,programgenveje
+ Keywords[de]=Tasten,Tastenzuordnung,Tastenkürzel,Kurzbefehle,Tastenschema,Tastaturlayout
+ Keywords[el]=Πλήκτρα,Καθολικοί συνδυασμοί πλήκτρων,Θέμα πλήκτρων,Συνδυασμοί πλήκτρων,συντομεύσεις,συντομεύσεις εφαρμογών
+ Keywords[eo]=klavoj,malloka,signifoj,asocioj,kombinoj,klavkombinoj
+ Keywords[es]=Teclas,Asociaciones de teclas globales,Esquema de teclas,Asociaciones de teclas,accesos directos,accesos directos de aplicaciones
+ Keywords[et]=klahvid,globaalsed kiirklahvid,klahviskeem,kiirklahvid,klahvide seosed,rakenduste kiirklahvid
+-Keywords[eu]=Teklak,tekla elkarketa globalak,teklen eskema,tekla elkarketak lasterbideak,aplikazio lasterbideak
++Keywords[eu]=Teklak,tekla elkarketa globalak,teklen eskema,tekla elkarketak laster-bideak,aplikazio laster-bideak
+ Keywords[fi]=Näppäimet,Yleiset näppäinsidokset,Näppäinteema,Näppäinsidokset,pikavalinnat,sovellusten pikavalinnat
+ Keywords[fr]=touches,raccourcis globaux,modèle de raccourcis,raccourcis clavier,clavier,raccourcis d'applications,applications,raccourcis communs
+ Keywords[fy]=keys,toetsen,toetsyndielingen,toetsbiningen,key bindings,fluchtoetsen,globaal
+--- kcontrol/keys/win3.kksrc (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kcontrol/keys/win3.kksrc (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -7,7 +7,7 @@
+ Name[ca]=Esquema Windows (sense la tecla Win)
+ Name[cs]=Schéma Windows (bez klávesy Win)
+ Name[cy]=Cynllun Windows (Heb Allwedd Win)
+-Name[da]=Windows schema (uden Win-tast)
++Name[da]=Windows-system (uden Win-tast)
+ Name[de]=Windows-Design (ohne Windows-Taste)
+ Name[el]=Μορφή Windows (Δίχως Win Πλήκτρο)
+ Name[eo]=Vindoza aranĝo (sen Vindozoklavo)
+--- kcontrol/keys/win4.kksrc (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kcontrol/keys/win4.kksrc (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -7,7 +7,7 @@
+ Name[ca]=Esquema Windows (amb la tecla Win)
+ Name[cs]=Schéma Windows (s klávesou Win)
+ Name[cy]=Cynllun Windows (Gyda'r Allwedd Win)
+-Name[da]=Windows schema (med Win-tast)
++Name[da]=Windows-system (med Win-tast)
+ Name[de]=Windows-Design (mit Windows-Taste)
+ Name[el]=Μορφή Windows (Με Win Πλήκτρο)
+ Name[eo]=Vindoza aranĝo (kun Vindozoklavo)
+--- kcontrol/keys/mac4.kksrc (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kcontrol/keys/mac4.kksrc (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -7,7 +7,7 @@
+ Name[ca]=Esquema Mac
+ Name[cs]=Mac schéma
+ Name[cy]=Cynllun Mac
+-Name[da]=Mac-farvesammensætning
++Name[da]=Mac-system
+ Name[de]=Mac-Design
+ Name[el]=Μορφή Mac
+ Name[eo]=Makintoŝa aranĝo
+--- kicker/applets/launcher/quicklauncher.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kicker/applets/launcher/quicklauncher.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -57,7 +57,7 @@
+ Name[rw]=Mutangiza Yihuta
+ Name[se]=Jođánisálggaheaddji
+ Name[sk]=Rýchly spúšťač
+-Name[sl]=Hitri zaganjalnik
++Name[sl]=Priročno izstrelišče
+ Name[sr]=Брзи покретач
+ Name[sr at Latn]=Brzi pokretač
+ Name[sv]=Snabbstartare
+--- kioslave/media/medianotifier/medianotifier.cpp (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/medianotifier/medianotifier.cpp (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -22,6 +22,7 @@
+ #include <qfile.h>
+ #include <qfileinfo.h>
+
++#include <kapplication.h>
+ #include <kglobal.h>
+ #include <kdebug.h>
+ #include <klocale.h>
+@@ -54,6 +55,12 @@
+ kdDebug() << "MediaNotifier::onMediumChange( " << name << ", "
+ << allowNotification << ")" << endl;
+
++// Update user activity timestamp, otherwise the notification dialog will be shown
++// in the background due to focus stealing prevention. Entering a new media can
++// be seen as a kind of user activity after all. It'd be better to update the timestamp
++// as soon as the media is entered, but it apparently takes some time to get here.
++ kapp->updateUserTimestamp();
++
+ KURL url( "system:/media/"+name );
+
+ KIO::SimpleJob *job = KIO::stat( url, false );
+--- kioslave/media/services/media_mount.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/services/media_mount.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -22,7 +22,7 @@
+ Name[eo]=Kroĉo
+ Name[es]=Montar
+ Name[et]=Ühenda
+-Name[eu]=Montatu
++Name[eu]=Muntatu
+ Name[fa]=سوارکردن
+ Name[fi]=Liitä
+ Name[fr]=Monter
+--- kioslave/media/services/media_unmount.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/services/media_unmount.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -22,7 +22,7 @@
+ Name[eo]=Malkroĉo
+ Name[es]=Desmontar
+ Name[et]=Lahuta
+-Name[eu]=Desmontatu
++Name[eu]=Desmuntatu
+ Name[fa]=پیاده کردن
+ Name[fi]=Irrota
+ Name[fr]=Démonter (enlever de l'arborescence Linux)
+--- kioslave/media/mounthelper/kio_media_mounthelper.cpp (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mounthelper/kio_media_mounthelper.cpp (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -30,6 +30,7 @@
+ #include <kdebug.h>
+ #include <kglobal.h>
+ #include <kprocess.h>
++#include <kstartupinfo.h>
+
+ #include "kio_media_mounthelper.h"
+
+@@ -204,8 +205,9 @@
+ if (KCmdLineArgs::parsedArgs()->count()==0) KCmdLineArgs::usage();
+ KApplication *app = new MountHelper();
+
++ KStartupInfo::appStarted();
+ app->dcopClient()->attach();
+ app->exec();
+ }
+-
++
+ #include "kio_media_mounthelper.moc"
+--- kioslave/media/mimetypes/floppy_unmounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/floppy_unmounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Malkroĉita Disketingo
+ Comment[es]=Disquete desmontado
+ Comment[et]=Lahutatud flopi
+-Comment[eu]=Diskete desmontatua
++Comment[eu]=Diskete desmuntatua
+ Comment[fa]=فلاپی پیاده شده
+ Comment[fi]=Irrotettu levyke
+ Comment[fr]=Disquette non montée
+--- kioslave/media/mimetypes/removable_mounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/removable_mounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -17,7 +17,7 @@
+ Comment[eo]=Kroĉita forigebla konservejo
+ Comment[es]=Recurso extraíble montado
+ Comment[et]=Ühendatud eemaldatav andmekandja
+-Comment[eu]=Baliabide mugikorra montatua
++Comment[eu]=Baliabide mugikorra muntatua
+ Comment[fi]=Liitetty irrotettava resurssi
+ Comment[fr]=Média amovible monté
+ Comment[fy]=Oankeppele ferwiderber medium
+--- kioslave/media/mimetypes/dvd_mounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/dvd_mounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Kroĉita DVD
+ Comment[es]=DVD montado
+ Comment[et]=Ühendatud DVD
+-Comment[eu]=DVD montatua
++Comment[eu]=DVD muntatua
+ Comment[fa]=DVD سوار شده
+ Comment[fi]=Liitetty DVD-levy
+ Comment[fr]=DVD-ROM monté(s)
+--- kioslave/media/mimetypes/removable_unmounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/removable_unmounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -17,7 +17,7 @@
+ Comment[eo]=Malkroĉita forigebla konservejo
+ Comment[es]=Recurso extraíble desmontado
+ Comment[et]=Lahutatud eemaldatav andmekandja
+-Comment[eu]=Baliabide mugikorra desmontatua
++Comment[eu]=Baliabide mugikorra desmuntatua
+ Comment[fi]=Irrotettu irrotettava resurssi
+ Comment[fr]=Média amovible non monté
+ Comment[fy]=Ofkeppele ferwiderber medium
+--- kioslave/media/mimetypes/dvd_unmounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/dvd_unmounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Malkroĉita DVD
+ Comment[es]=DVD desmontado
+ Comment[et]=Lahutatud DVD
+-Comment[eu]=DVD desmontatua
++Comment[eu]=DVD desmuntatua
+ Comment[fa]=DVD پیاده شده
+ Comment[fi]=Irrotettu DVD-levy
+ Comment[fr]=DVD-ROM non monté(s)
+--- kioslave/media/mimetypes/smb_mounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/smb_mounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Kroĉita Sambo-disko
+ Comment[es]=Recurso de Samba montado (Red de Microsoft)
+ Comment[et]=Ühendatud Samba (Microsoft Network) ressurss
+-Comment[eu]=Samba (Microsoft sarea) partekaketa montatua
++Comment[eu]=Samba (Microsoft sarea) partekaketa muntatua
+ Comment[fa]=اشتراک سامبای ویندوز سوار شده
+ Comment[fi]=Liitetty Samba-jako (Microsoft-verkko)
+ Comment[fr]=Partage Samba (réseau Microsoft) monté
+--- kioslave/media/mimetypes/cdwriter_mounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/cdwriter_mounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Kroĉita CDRW
+ Comment[es]=Escritor de CDs montado
+ Comment[et]=Ühendatud CD kirjutaja
+-Comment[eu]=CD erretzaile montatua
++Comment[eu]=CD erretzaile muntatua
+ Comment[fa]=CD Writer سوار شده
+ Comment[fi]=Liitetty CD-kirjoitin
+ Comment[fr]=Graveur de CD monté
+--- kioslave/media/mimetypes/smb_unmounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/smb_unmounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Malkroĉita Sambo-disko
+ Comment[es]=Recurso de Samba desmontado (Red de Microsoft)
+ Comment[et]=Lahutatud Samba (Microsoft Network) ressurss
+-Comment[eu]=Samba (Microsoft sarea) partekaketa desmontatua
++Comment[eu]=Samba (Microsoft sarea) partekaketa desmuntatua
+ Comment[fa]=اشتراک سامبای ویندوز پیاده شده
+ Comment[fi]=Irrotettu Samba-jako (Microsoft-verkko)
+ Comment[fr]=Partage Samba (réseau Microsoft) non monté
+--- kioslave/media/mimetypes/cdwriter_unmounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/cdwriter_unmounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Malkroĉita CDRW
+ Comment[es]=Escritor de CDs desmontado
+ Comment[et]=Lahutatud CD kirjutaja
+-Comment[eu]=CD erretzaile desmontatua
++Comment[eu]=CD erretzaile desmuntatua
+ Comment[fa]=CD Writer پیاده شده
+ Comment[fi]=Irrotettu CD-kirjoitin
+ Comment[fr]=Graveur de CD non monté
+--- kioslave/media/mimetypes/nfs_mounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/nfs_mounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -17,7 +17,7 @@
+ Comment[eo]=Kroĉita NFS-disko
+ Comment[es]=Recurso NFS montado
+ Comment[et]=Ühendatud NFS ressurss
+-Comment[eu]=NFS baliabide montatua
++Comment[eu]=NFS baliabide muntatua
+ Comment[fi]=Liitetty NFS-jako
+ Comment[fr]=Ressource NFS montée
+ Comment[fy]=Oankeppele NFS-boarne
+--- kioslave/media/mimetypes/nfs_unmounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/nfs_unmounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -17,7 +17,7 @@
+ Comment[eo]=Malkroĉita NFS-disko
+ Comment[es]=Recurso NFS desmontado
+ Comment[et]=Lahutatud NFS ressurss
+-Comment[eu]=NFS baliabide desmontatua
++Comment[eu]=NFS baliabide desmuntatua
+ Comment[fi]=Irrotettu NFS-jako
+ Comment[fr]=Ressource NFS non montée
+ Comment[fy]=Oankeppele NFS-boarne
+--- kioslave/media/mimetypes/floppy5_mounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/floppy5_mounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Kroĉita 5¼"-Disketingo
+ Comment[es]=Disquete 5¼" montado
+ Comment[et]=Ühendatud 5¼" flopi
+-Comment[eu]=5¼"ko diskete montatua
++Comment[eu]=5¼"ko diskete muntatua
+ Comment[fa]=فلاپی 5¼"سوار شده
+ Comment[fi]=Liitetty 5¼"-levyke
+ Comment[fr]=Disquette 5¼" montée
+--- kioslave/media/mimetypes/hdd_mounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/hdd_mounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -17,7 +17,7 @@
+ Comment[eo]=Kroĉita subdisko
+ Comment[es]=Volumen de disco duro montado
+ Comment[et]=Ühendatud kõvaketta partitsioon
+-Comment[eu]=Diska gogorraren zatiketa montatua
++Comment[eu]=Diska gogorraren zatiketa muntatua
+ Comment[fi]=Liitetty kiintoleyosio
+ Comment[fr]=Partition de disque dur montée
+ Comment[fy]=Oankeppele Fêsteskiif folume
+--- kioslave/media/mimetypes/floppy5_unmounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/floppy5_unmounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Malkroĉita 5¼"-Disketingo
+ Comment[es]=Disquete 5¼" desmontado
+ Comment[et]=Lahutatud 5¼" flopi
+-Comment[eu]=5¼"ko diskete desmontatua
++Comment[eu]=5¼"ko diskete desmuntatua
+ Comment[fa]=فلاپی 5¼" پیاده شده
+ Comment[fi]=Irrotettu 5¼"-levyke
+ Comment[fr]=Disquette 5¼" non montée
+--- kioslave/media/mimetypes/hdd_unmounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/hdd_unmounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -17,7 +17,7 @@
+ Comment[eo]=Malkroĉita subdisko
+ Comment[es]=Volumen de disco duro desmontado
+ Comment[et]=Lahutatud kõvaketta partitsioon
+-Comment[eu]=Diska gogorraren zatiketa desmontatua
++Comment[eu]=Diska gogorraren zatiketa desmuntatua
+ Comment[fi]=Irrotettu kiintolevyosio
+ Comment[fr]=Partition de disque dur non montée
+ Comment[fy]=Ofkeppele Fêsteskiif folume
+--- kioslave/media/mimetypes/zip_mounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/zip_mounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Kroĉita ZIP-disko
+ Comment[es]=Disco Zip montado
+ Comment[et]=Ühendatud Zip-ketas
+-Comment[eu]=Zip diska montatua
++Comment[eu]=Zip diska muntatua
+ Comment[fa]=دیسک زیپ سوار شده
+ Comment[fi]=Liitetty Zip-levy
+ Comment[fr]=Disque Zip monté
+--- kioslave/media/mimetypes/cdrom_mounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/cdrom_mounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Kroĉita CDROM
+ Comment[es]=CD-ROM montado
+ Comment[et]=Ühendatud CD-ROM
+-Comment[eu]=CD-ROM montatua
++Comment[eu]=CD-ROM muntatua
+ Comment[fa]=CD سوار شده
+ Comment[fi]=Liitetty CD-ROM
+ Comment[fr]=CD-ROM monté
+--- kioslave/media/mimetypes/zip_unmounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/zip_unmounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Malkroĉita ZIP-disko
+ Comment[es]=Disco Zip desmontado
+ Comment[et]=Lahutatud Zip-ketas
+-Comment[eu]=Zip diska desmontatua
++Comment[eu]=Zip diska desmuntatua
+ Comment[fa]= دیسک زیپ پیاده شده
+ Comment[fi]=Irrotettu Zip-levy
+ Comment[fr]=Disque Zip non monté
+--- kioslave/media/mimetypes/cdrom_unmounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/cdrom_unmounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Malkroĉita CDROM
+ Comment[es]=CD-ROM desmontado
+ Comment[et]=Lahutatud CD-ROM
+-Comment[eu]=CD-ROM desmontatua
++Comment[eu]=CD-ROM desmuntatua
+ Comment[fa]= CD پیاده شده
+ Comment[fi]=Irrotettu CD-ROM
+ Comment[fr]=CD-ROM non monté
+--- kioslave/media/mimetypes/floppy_mounted.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kioslave/media/mimetypes/floppy_mounted.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -20,7 +20,7 @@
+ Comment[eo]=Kroĉita Disketingo
+ Comment[es]=Disquete montado
+ Comment[et]=Ühendatud flopi
+-Comment[eu]=Diskete montatua
++Comment[eu]=Diskete muntatua
+ Comment[fa]=فلاپی سوار شده
+ Comment[fi]=Liitetty levyke
+ Comment[fr]=Disquette montée
+--- kappfinder/apps/Graphics/GPhoto.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kappfinder/apps/Graphics/GPhoto.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -25,7 +25,7 @@
+ GenericName[bn]=ডিজিটাল ক্যমেরা প্রোগ্রাম
+ GenericName[bs]=Program za digitalne kamere
+ GenericName[ca]=Programa per a cambres digitals
+-GenericName[cs]=Program pro digiťáky
++GenericName[cs]=Program pro digitální fotoaparáty
+ GenericName[cy]=Rhaglen Camera Digidol
+ GenericName[da]=Digitalt kameraprogram
+ GenericName[de]=Programm für Digitalkameras
+--- kappfinder/apps/System/citrix_ica.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kappfinder/apps/System/citrix_ica.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -134,7 +134,7 @@
+ GenericName[zh_CN]=WTS 客户端程序
+ GenericName[zh_TW]=WTS 客戶端程式
+ GenericName[zu]=Umxhasi we-WTS
+-Exec=wfcmgr %f
++Exec=wfica %f
+ Icon=terminal
+ MimeType=application/x-ica
+ Path=
+--- kappfinder/apps/Games/Arcade/alephone.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kappfinder/apps/Games/Arcade/alephone.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -83,7 +83,7 @@
+ Comment[eo]=Libera versio de "Marathon Infinity for SDL", kiu ne uzas OpenGL
+ Comment[es]=Una versión open source de Marathon Infinity para SDL que tiene desactivado Open GL.
+ Comment[et]=SDL Marathon Infinity vabavaraversioon (Open GL'ta)
+-Comment[eu]=Open GLa ezgaitua duen, eta SDLrako den Marathon Infinity kode irekidun bertsio bat
++Comment[eu]=Open GLa desgaituta duen, eta SDLrako den Marathon Infinity kode irekidun bertsio bat
+ Comment[fa]=ویرایشی با متن باز از ماراتون اینفینیتی برای SDL بدون Open GL
+ Comment[fi]=Avoimen lähdekoodin versio Marathon Infinity -pelistä SDL-kirjastolla ilman Open GL -tukea
+ Comment[fr]=Une version open source de Marathon Infinity pour SDL qui a OpenGL désactivé
+--- kdesktop/lock/lockprocess.cc (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kdesktop/lock/lockprocess.cc (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -506,6 +506,7 @@
+ {
+ gVRoot = children[i];
+ gVRootData = *newRoot;
++ XFree ((char*) newRoot);
+ break;
+ }
+ }
+--- kdesktop/kdesktopSetAsBackground.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kdesktop/kdesktopSetAsBackground.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -33,7 +33,7 @@
+ X-KDE-Submenu[pt_BR]=Configurar como Plano de fundo
+ X-KDE-Submenu[ru]=Сделать фоновым рисунком
+ X-KDE-Submenu[se]=Geavat duogášgovvan
+-X-KDE-Submenu[sl]=Nastavi za ozadje
++X-KDE-Submenu[sl]=Nastavi kot ozadje
+ X-KDE-Submenu[sr]=Постави као позадину
+ X-KDE-Submenu[sr at Latn]=Postavi kao pozadinu
+ X-KDE-Submenu[sv]=Använd som bakgrund
+--- kdesktop/bgmanager.cc (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kdesktop/bgmanager.cc (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -116,10 +116,13 @@
+ int format;
+ unsigned long length, after;
+ unsigned char* data_root;
+- XGetWindowProperty( qt_xdisplay(), qt_xrootwin(), prop_root, 0L, 1L, False, AnyPropertyType,
+- &type, &format, &length, &after, &data_root);
+- if (type == XA_PIXMAP)
+- pm = *((Pixmap*)data_root);
++ if( XGetWindowProperty( qt_xdisplay(), qt_xrootwin(), prop_root, 0L, 1L, False, AnyPropertyType,
++ &type, &format, &length, &after, &data_root) == Success && data_root != NULL )
++ {
++ if (type == XA_PIXMAP)
++ pm = *((Pixmap*)data_root);
++ XFree( data_root );
++ }
+ // only if it's our pixmap
+ if( pm == m_xrootpmap )
+ XDeleteProperty(qt_xdisplay(), qt_xrootwin(), prop_root);
+--- applnk/kde-utilities-accessibility.directory (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ applnk/kde-utilities-accessibility.directory (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -112,6 +112,7 @@
+ Comment[pt]=Acessibilidade
+ Comment[pt_BR]=Acessibilidade
+ Comment[ru]=Специальные возможности
++Comment[sl]=Dostopnost
+ Comment[sr]=Приступачност
+ Comment[sr at Latn]=Pristupačnost
+ Comment[sv]=Handikappstöd
+--- kwin/tabbox.cpp (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kwin/tabbox.cpp (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -526,7 +526,7 @@
+ {
+ KConfig * c(KGlobal::config());
+ c->setGroup("TabBox");
+- options_traverse_all = c->readNumEntry("TraverseAll", false );
++ options_traverse_all = c->readBoolEntry("TraverseAll", false );
+ }
+
+ /*!
+@@ -551,7 +551,7 @@
+ {
+ KConfig * c(KGlobal::config());
+ c->setGroup("TabBox");
+- bool delay = c->readNumEntry("ShowDelay", true);
++ bool delay = c->readBoolEntry("ShowDelay", true);
+
+ if (!delay)
+ {
+@@ -931,7 +931,7 @@
+ bool options_traverse_all;
+ {
+ KConfigGroupSaver saver( KGlobal::config(), "TabBox" );
+- options_traverse_all = KGlobal::config()->readNumEntry("TraverseAll", false );
++ options_traverse_all = KGlobal::config()->readBoolEntry("TraverseAll", false );
+ }
+
+ Client* firstClient = 0;
+--- kwin/kcmkwin/kwindecoration/kwindecoration.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kwin/kcmkwin/kwindecoration/kwindecoration.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -95,7 +95,7 @@
+ Comment[eo]=Agordu la fenestrajn titolojn
+ Comment[es]=Configuración deel aspecto y comportamiento de los títulos de las ventanas
+ Comment[et]=Akna tiitliribade välimuse ja tunnetuse seadistamine
+-Comment[eu]=Konfiguratu lehioaren izenburuen itxura
++Comment[eu]=Konfiguratu leihoaren izenburuen itxura
+ Comment[fa]=تنظیم نما و حس عنوان پنجره
+ Comment[fi]=Muokkaa ikkunoiden kehysten ulkonäköä
+ Comment[fr]=Configuration de l'apparence du titre des fenêtres
+--- kwin/kcmkwin/kwinoptions/windows.cpp (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kwin/kcmkwin/kwinoptions/windows.cpp (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -666,7 +666,7 @@
+ setShadeHover(config->readBoolEntry(KWIN_SHADEHOVER, false));
+ setShadeHoverInterval(config->readNumEntry(KWIN_SHADEHOVER_INTERVAL, 250));
+
+- setElectricBorders(config->readNumEntry(KWM_ELECTRIC_BORDER, false));
++ setElectricBorders(config->readBoolEntry(KWM_ELECTRIC_BORDER, false));
+ setElectricBorderDelay(config->readNumEntry(KWM_ELECTRIC_BORDER_DELAY, 150));
+
+ // setFocusStealing( config->readNumEntry(KWIN_FOCUS_STEALING, 2 ));
+--- kwin/manage.cpp (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kwin/manage.cpp (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -23,6 +23,7 @@
+
+ #include "notifications.h"
+ #include "rules.h"
++#include "group.h"
+
+ extern Time qt_x_time;
+
+@@ -422,7 +423,9 @@
+ // - keep it?
+ XLowerWindow( qt_xdisplay(), frameId());
+
++ // set initial user time directly
+ user_time = readUserTimeMapTimestamp( asn_valid ? &asn_id : NULL, asn_valid ? &asn_data : NULL, session );
++ group()->updateUserTime( user_time ); // and do what Client::updateUserTime() does
+
+ if( isTopMenu()) // they're shown in Workspace::addClient() if their mainwindow
+ hideClient( true ); // is the active one
+--- kwin/activation.cpp (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kwin/activation.cpp (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -637,6 +637,7 @@
+ && ( user_time == CurrentTime
+ || timestampCompare( time, user_time ) > 0 )) // time > user_time
+ user_time = time;
++ group()->updateUserTime( user_time );
+ }
+
+ Time Client::readUserCreationTime() const
+--- kwin/client.cpp (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kwin/client.cpp (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -1009,11 +1009,8 @@
+ {
+ if( !isCloseable())
+ return;
+- // Update user time, needed for whole group, because the window may create a confirming dialog,
+- // and this window's user time wouldn't apply to it
+- // This is needed even for apps without support for user timestamp (e.g. nedit), so updating
+- // user timestamp in apps on WM_DELETE_WINDOW is not an option (and I'm not sure if it would be right)
+- group()->updateUserTime();
++ // Update user time, because the window may create a confirming dialog.
++ updateUserTime();
+ if ( Pdeletewindow )
+ {
+ Notify::raise( Notify::Close );
+@@ -2017,6 +2014,7 @@
+ opacity_ = *reinterpret_cast< long* >( data );
+ custom_opacity = true;
+ // setOpacity(opacity_ < 0xFFFFFFFF, opacity_);
++ XFree ((char*)data);
+ return TRUE;
+ }
+ return FALSE;
+--- kwin/popupinfo.cpp (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kwin/popupinfo.cpp (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -118,7 +118,7 @@
+ {
+ KConfig * c(KGlobal::config());
+ c->setGroup("PopupInfo");
+- m_show = c->readNumEntry("ShowPopup", false );
++ m_show = c->readBoolEntry("ShowPopup", false );
+ m_delayTime = c->readNumEntry("PopupHideDelay", 350 );
+ }
+
+--- konsole/konsole/konsole.cpp (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ konsole/konsole/konsole.cpp (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -3194,8 +3194,10 @@
+ // parameter saved in konsolerc.
+ if ( lines < 0 ) lines = m_histSize;
+
+- if ( enable )
++ if ( enable && lines > 0 )
+ se->setHistory( HistoryTypeBuffer( lines ) );
++ else if ( enable ) // Unlimited buffer
++ se->setHistory(HistoryTypeFile());
+ else
+ se->setHistory( HistoryTypeNone() );
+ }
+--- kdm/kfrontend/sessions/w9wm.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kdm/kfrontend/sessions/w9wm.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -21,7 +21,7 @@
+ Comment[eo]=Fenestroadministrilo devenigita de 9FA, plibonigita per virtualaj ekranoj kaj klaviara uzo
+ Comment[es]=Un administrador de ventanas basado en 9WM, mejorado con ventanas virtuales y accesos rápidos de teclado
+ Comment[et]=Aknahaldur, mille aluseks on 9WM ja mida on täiendatud virtuaalsete ekraanide ja kiirklahvide võimalusega
+-Comment[eu]=9WM-n oinarritutako leiho kudeatzailea, pantaila birtual eta teklatuko lasterbideez hobetua
++Comment[eu]=9WM-n oinarritutako leiho kudeatzailea, pantaila birtual eta teklatuko laster-bideez hobetua
+ Comment[fi]=9WM:ään pohjautuva ikkunaohjelma, jossa tuki virtuaalityöpöydille ja näppäimistöyhdistelmille
+ Comment[fr]=Un gestionnaire de fenêtres basé sur 9WM, avec en plus la gestion des bureaux virtuels et des raccourcis clavier
+ Comment[fy]=In finstersmanager basearrre op 9WM. útbreid mei firtuele buroblêden en fluchtoetsen
+--- kdm/kfrontend/sessions/vtwm.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kdm/kfrontend/sessions/vtwm.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -12,6 +12,7 @@
+ Comment[bn]=ভার্চুয়াল ট্যাব উইণ্ডো ম্যানেজার, ভার্চুয়াল স্ক্রীণ ইত্যাদি দ্বারা বর্ধিত
+ Comment[bs]=Virtual Tab Window Manager. TWM proširen virtuelnim ekranima itd.
+ Comment[ca]=El Virtual Tab Window Manager. TWM millorat per a pantalles virtuals, etc.
++Comment[cs]=The Virtual Tab Window Manager. TWM vylepšené o virtuální obrazovky aj.
+ Comment[cy]=Y Trefnydd Ffenestri Tab Rhith. TWM wedi'i wella gan sgriniau rhith, ayyb.
+ Comment[da]=Virtual Tab Window Manager. TWM udvidet med virtuelle skærme osv.
+ Comment[de]=Der Virtual-Tab-Fenstermanager, eine Erweiterung von TWM mit virtuellen Arbeitsflächen usw.
+--- kdm/kfrontend/sessions/lwm.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ kdm/kfrontend/sessions/lwm.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -13,6 +13,7 @@
+ Comment[bn]=দি লাইটওয়েট উইণ্ডো ম্যানেজার
+ Comment[bs]=Lightweight Window Manager. Ne-podesivi, potpuno osnovni window manager
+ Comment[ca]=El gestor de finestres Lightweight. Un no configurable, pelat gestor de finestres
++Comment[cs]=The Lightweight Window Manager. Prostý a nekonfigurovatelný správce oken
+ Comment[cy]=Y Trefnydd Ffenestri Ysgafn. Trefnydd ffenestri noeth, na ellir ffurfweddu
+ Comment[da]=Lightweight Window Manager, en ikke-indstillelig, minimal vindueshåndtering
+ Comment[de]=Lightweight Window Manager -- reiner Fenstermanager ohne Einstellmöglichkeiten
+--- ksysguard/gui/ksysguardapplet.desktop (.../tags/KDE/3.5.1/kdebase) (revision 502695)
++++ ksysguard/gui/ksysguardapplet.desktop (.../branches/KDE/3.5/kdebase) (revision 502695)
+@@ -6,7 +6,7 @@
+ Name[bg]=Системен монитор
+ Name[bn]=সিস্টেম প্রহরী
+ Name[br]=Gward Reizhiad
+-Name[ca]=Guardià del sistema
++Name[ca]=Vigilant del sistema
+ Name[cs]=Strážce systému
+ Name[da]=Systemvagt
+ Name[de]=Systemüberwachung
+@@ -48,7 +48,7 @@
+ Comment=An advanced system monitor which swallows KDE system guard displays
+ Comment[af]='n Gevorderde stelsel monitor wat KDE se stelsel wag skerms insluit
+ Comment[bg]=Системен монитор, който следи за състоянието на системата
+-Comment[ca]=Un monitor del sistema avançat que inclou pantalles del guardià del sistema KDE
++Comment[ca]=Un monitor del sistema avançat que inclou pantalles del vigilant del sistema KDE
+ Comment[cs]=Pokročilý monitor systému, který pohlcuje displeje strážce KDE
+ Comment[da]=En avanceret systemovervåger som svælger skærme fra KDE's systemovervågning
+ Comment[de]=Erweiterte Systemüberwachung für die Kontrollleiste
More information about the pkg-kde-commits
mailing list