Author: arekm Date: Fri Sep 15 10:47:44 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdebase-branch.diff (1.35 -> 1.36)
---- Diffs:
================================================================
Index: SOURCES/kdebase-branch.diff
diff -u SOURCES/kdebase-branch.diff:1.35 SOURCES/kdebase-branch.diff:1.36
--- SOURCES/kdebase-branch.diff:1.35 Sun Sep 10 14:01:56 2006
+++ SOURCES/kdebase-branch.diff Fri Sep 15 12:47:39 2006
@@ -1,7 +1,7 @@
Index: ksmserver/shutdown.cpp
===================================================================
---- ksmserver/shutdown.cpp (.../tags/KDE/3.5.4/kdebase) (revision
582764)
-+++ ksmserver/shutdown.cpp (.../branches/KDE/3.5/kdebase) (revision
582764)
+--- ksmserver/shutdown.cpp (.../tags/KDE/3.5.4/kdebase) (revision
584594)
++++ ksmserver/shutdown.cpp (.../branches/KDE/3.5/kdebase) (revision
584594)
@@ -359,6 +359,16 @@
state = Idle;
}
@@ -39,8 +39,8 @@
void KSMServer::completeKilling()
Index: ksmserver/server.h
===================================================================
---- ksmserver/server.h (.../tags/KDE/3.5.4/kdebase) (revision 582764)
-+++ ksmserver/server.h (.../branches/KDE/3.5/kdebase) (revision 582764)
+--- ksmserver/server.h (.../tags/KDE/3.5.4/kdebase) (revision 584594)
++++ ksmserver/server.h (.../branches/KDE/3.5/kdebase) (revision 584594)
@@ -126,8 +126,8 @@
void discardSession();
void storeSession();
@@ -54,8 +54,8 @@
const QString& clientMachine = QString::null,
Index: kate/app/kateconsole.cpp
===================================================================
---- kate/app/kateconsole.cpp (.../tags/KDE/3.5.4/kdebase) (revision
582764)
-+++ kate/app/kateconsole.cpp (.../branches/KDE/3.5/kdebase) (revision
582764)
+--- kate/app/kateconsole.cpp (.../tags/KDE/3.5.4/kdebase) (revision
584594)
++++ kate/app/kateconsole.cpp (.../branches/KDE/3.5/kdebase) (revision
584594)
@@ -67,6 +67,8 @@
if (!m_part) return;
@@ -67,8 +67,8 @@
m_part->widget()->show();
Index: kate/app/kategrepdialog.cpp
===================================================================
---- kate/app/kategrepdialog.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kate/app/kategrepdialog.cpp (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kate/app/kategrepdialog.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kate/app/kategrepdialog.cpp (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -66,7 +66,7 @@
@@ -100,8 +100,8 @@
#include "kategrepdialog.moc"
Index: kate/app/katemainwindow.cpp
===================================================================
---- kate/app/katemainwindow.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kate/app/katemainwindow.cpp (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kate/app/katemainwindow.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kate/app/katemainwindow.cpp (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -482,8 +482,11 @@
QListViewItem * item = filelist->firstChild();
@@ -115,10 +115,47 @@
m_viewManager, SLOT (activateView (int)), 0,
((KateFileListItem *)item)->documentNumber () );
+@@ -612,18 +615,18 @@
+ {
+ KURL::List list;
+ list.append( m_viewManager->activeView()->getDoc()->url() );
+- QString* appname = new QString( documentOpenWith->popupMenu()->text(idx) );
++ QString appname = documentOpenWith->popupMenu()->text(idx);
+
+- *appname = appname->remove('&'); //Remove a possible accelerator ...
otherwise the application might not get found.
+- if ( appname->compare(i18n("Other...")) == 0 ) {
++ appname = appname.remove('&'); //Remove a possible accelerator ...
otherwise the application might not get found.
++ if ( appname.compare(i18n("Other...")) == 0 ) {
+ // display "open with" dialog
+- KOpenWithDlg* dlg = new KOpenWithDlg(list);
+- if (dlg->exec())
+- KRun::run(*dlg->service(), list);
++ KOpenWithDlg dlg(list);
++ if (dlg.exec())
++ KRun::run(*dlg.service(), list);
+ return;
+ }
+
+- QString qry = QString("((Type == 'Application') and (Name == '%1'))").arg(
appname->latin1() );
++ QString qry = QString("((Type == 'Application') and (Name == '%1'))").arg(
appname.latin1() );
+ KMimeType::Ptr mime = KMimeType::findByURL(
m_viewManager->activeView()->getDoc()->url() );
+ KTrader::OfferList offers = KTrader::self()->query(mime->name(), qry);
+
+@@ -632,9 +635,7 @@
+ KRun::run(*app, list);
+ }
+ else
+- KMessageBox::error(this, i18n("Application '%1' not
found!").arg(appname->latin1()), i18n("Application Not Found!"));
+-
+-
++ KMessageBox::error(this, i18n("Application '%1' not
found!").arg(appname.latin1()), i18n("Application Not Found!"));
+ }
+
+ void KateMainWindow::pluginHelp()
Index: kate/app/katemwmodonhddialog.cpp
===================================================================
---- kate/app/katemwmodonhddialog.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kate/app/katemwmodonhddialog.cpp (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kate/app/katemwmodonhddialog.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kate/app/katemwmodonhddialog.cpp (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -215,7 +215,7 @@
// Start a KProcess that creates a diff
KProcIO *p = new KProcIO();
@@ -162,8 +199,8 @@
if ( ! p->normalExit() /*|| p->exitStatus()*/ )
Index: kate/app/kategrepdialog.h
===================================================================
---- kate/app/kategrepdialog.h (.../tags/KDE/3.5.4/kdebase) (revision
582764)
-+++ kate/app/kategrepdialog.h (.../branches/KDE/3.5/kdebase) (revision
582764)
+--- kate/app/kategrepdialog.h (.../tags/KDE/3.5.4/kdebase) (revision
584594)
++++ kate/app/kategrepdialog.h (.../branches/KDE/3.5/kdebase) (revision
584594)
@@ -57,6 +57,9 @@
protected:
@@ -176,8 +213,8 @@
void templateActivated(int index);
Index: kate/app/katesession.cpp
===================================================================
---- kate/app/katesession.cpp (.../tags/KDE/3.5.4/kdebase) (revision
582764)
-+++ kate/app/katesession.cpp (.../branches/KDE/3.5/kdebase) (revision
582764)
+--- kate/app/katesession.cpp (.../tags/KDE/3.5.4/kdebase) (revision
584594)
++++ kate/app/katesession.cpp (.../branches/KDE/3.5/kdebase) (revision
584594)
@@ -48,6 +48,11 @@
#include <unistd.h>
#include <time.h>
@@ -201,8 +238,8 @@
void KateSessionManager::activateSession (KateSession::Ptr session, bool
closeLast, bool saveLast, bool loadNew)
Index: kate/data/kateplugin.desktop
===================================================================
---- kate/data/kateplugin.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kate/data/kateplugin.desktop (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kate/data/kateplugin.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kate/data/kateplugin.desktop (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -22,7 +22,7 @@
Comment[es]=Plugin de Kate
Comment[et]=Kate plugin
@@ -214,8 +251,8 @@
Comment[fr]=Module de Kate
Index: kate/data/kate.desktop
===================================================================
---- kate/data/kate.desktop (.../tags/KDE/3.5.4/kdebase) (revision
582764)
-+++ kate/data/kate.desktop (.../branches/KDE/3.5/kdebase) (revision
582764)
+--- kate/data/kate.desktop (.../tags/KDE/3.5.4/kdebase) (revision
584594)
++++ kate/data/kate.desktop (.../branches/KDE/3.5/kdebase) (revision
584594)
@@ -18,7 +18,7 @@
GenericName[es]=Editor de texto avanzado
GenericName[et]=VĂľimas tekstiredaktor
@@ -235,8 +272,8 @@
Name[mk]=ĐĐ°ŃĐľ
Index: kate/data/kwrite.desktop
===================================================================
---- kate/data/kwrite.desktop (.../tags/KDE/3.5.4/kdebase) (revision
582764)
-+++ kate/data/kwrite.desktop (.../branches/KDE/3.5/kdebase) (revision
582764)
+--- kate/data/kwrite.desktop (.../tags/KDE/3.5.4/kdebase) (revision
584594)
++++ kate/data/kwrite.desktop (.../branches/KDE/3.5/kdebase) (revision
584594)
@@ -19,7 +19,7 @@
GenericName[es]=Editor de texto
GenericName[et]=Tekstiredaktor
@@ -256,8 +293,8 @@
Name[lo]=Kwrite
Index: kdepasswd/kcm/kcm_useraccount.desktop
===================================================================
---- kdepasswd/kcm/kcm_useraccount.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kdepasswd/kcm/kcm_useraccount.desktop (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kdepasswd/kcm/kcm_useraccount.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kdepasswd/kcm/kcm_useraccount.desktop (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -23,6 +23,7 @@
Name[es]=ContraseĂąa y cuenta de usuario
Name[et]=Parool ja kasutaja konto
@@ -293,8 +330,8 @@
Comment[ru]=ĐĄĐ˛ĐľĐ´ĐľĐ˝Đ¸Ń Đž пОНŃСОваŃоНо, Ńакио как
паŃОНŃ, Đ¸ĐźŃ Đ¸ e-mail
Index: kdepasswd/kdepasswd.desktop
===================================================================
---- kdepasswd/kdepasswd.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kdepasswd/kdepasswd.desktop (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kdepasswd/kdepasswd.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kdepasswd/kdepasswd.desktop (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -23,6 +23,7 @@
Name[es]=Cambiar contraseĂąa
Name[et]=Parooli muutmine
@@ -305,8 +342,8 @@
Name[fy]=Wachtwurd wizigje
Index: kpersonalizer/ksysinfo.cpp
===================================================================
---- kpersonalizer/ksysinfo.cpp (.../tags/KDE/3.5.4/kdebase) (revision
582764)
-+++ kpersonalizer/ksysinfo.cpp (.../branches/KDE/3.5/kdebase) (revision
582764)
+--- kpersonalizer/ksysinfo.cpp (.../tags/KDE/3.5.4/kdebase) (revision
584594)
++++ kpersonalizer/ksysinfo.cpp (.../branches/KDE/3.5/kdebase) (revision
584594)
@@ -73,6 +73,7 @@
if (!extension.compare("RENDER"))
m_xrender=true;
@@ -317,8 +354,8 @@
Index: kpersonalizer/kpersonalizer.desktop
===================================================================
---- kpersonalizer/kpersonalizer.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kpersonalizer/kpersonalizer.desktop (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kpersonalizer/kpersonalizer.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kpersonalizer/kpersonalizer.desktop (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -24,7 +24,7 @@
Name[es]=Asistente para las preferencias del escritorio
Name[et]=TÜÜlaua seadistuste abimees
@@ -330,8 +367,8 @@
Name[fy]=KDE's Ynstellings Assistent
Index: kfind/kfindpart.desktop
===================================================================
---- kfind/kfindpart.desktop (.../tags/KDE/3.5.4/kdebase) (revision
582764)
-+++ kfind/kfindpart.desktop (.../branches/KDE/3.5/kdebase) (revision
582764)
+--- kfind/kfindpart.desktop (.../tags/KDE/3.5.4/kdebase) (revision
584594)
++++ kfind/kfindpart.desktop (.../branches/KDE/3.5/kdebase) (revision
584594)
@@ -19,7 +19,7 @@
Name[es]=Buscar parte
Name[et]=Failide otsimise komponent
@@ -343,8 +380,8 @@
Name[fy]=In diel sykje
Index: kfind/findpart.desktop
===================================================================
---- kfind/findpart.desktop (.../tags/KDE/3.5.4/kdebase) (revision
582764)
-+++ kfind/findpart.desktop (.../branches/KDE/3.5/kdebase) (revision
582764)
+--- kfind/findpart.desktop (.../tags/KDE/3.5.4/kdebase) (revision
584594)
++++ kfind/findpart.desktop (.../branches/KDE/3.5/kdebase) (revision
584594)
@@ -21,7 +21,7 @@
Name[es]=Buscar parte
Name[et]=Failide otsimise komponent
@@ -356,8 +393,8 @@
Name[fy]=In diel sykje
Index: kfind/Kfind.desktop
===================================================================
---- kfind/Kfind.desktop (.../tags/KDE/3.5.4/kdebase) (revision
582764)
-+++ kfind/Kfind.desktop (.../branches/KDE/3.5/kdebase) (revision
582764)
+--- kfind/Kfind.desktop (.../tags/KDE/3.5.4/kdebase) (revision
584594)
++++ kfind/Kfind.desktop (.../branches/KDE/3.5/kdebase) (revision
584594)
@@ -20,6 +20,7 @@
Name[es]=Buscar archivos/carpetas
Name[et]=Failide/kataloogide otsimine
@@ -377,8 +414,8 @@
Name[nl]=Bestanden/mappen zoeken
Index: kcontrol/background/background.desktop
===================================================================
---- kcontrol/background/background.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/background/background.desktop (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/background/background.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/background/background.desktop (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -29,7 +29,7 @@
Name[es]=Fondo
Name[et]=Taust
@@ -408,8 +445,8 @@
Keywords[fy]=eftergrĂťn,buroblĂŞden,kleur,kleuren,Ă´fbyldingen,behang,ferminge,
balâns,lyts Ýnthâld,meardere ôfbyldingen,pixmap,grafysk
Index: kcontrol/background/bgdialog.cpp
===================================================================
---- kcontrol/background/bgdialog.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/background/bgdialog.cpp (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/background/bgdialog.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/background/bgdialog.cpp (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -288,8 +288,9 @@
m_buttonGetNew->setEnabled( false );
}
@@ -499,8 +536,8 @@
{
Index: kcontrol/background/bgdialog.h
===================================================================
---- kcontrol/background/bgdialog.h (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/background/bgdialog.h (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/background/bgdialog.h (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/background/bgdialog.h (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -39,7 +39,7 @@
BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop = true);
~BGDialog();
@@ -512,8 +549,8 @@
Index: kcontrol/background/bgsettings.h
===================================================================
---- kcontrol/background/bgsettings.h (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/background/bgsettings.h (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/background/bgsettings.h (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/background/bgsettings.h (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -347,6 +347,7 @@
void readSettings();
@@ -524,8 +561,8 @@
bool dirty;
Index: kcontrol/background/bgadvanced.cpp
===================================================================
---- kcontrol/background/bgadvanced.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/background/bgadvanced.cpp (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/background/bgadvanced.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/background/bgadvanced.cpp (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -122,7 +122,7 @@
connect( dlg->m_cbProgram, SIGNAL(toggled(bool)),
SLOT(slotEnableProgram(bool)));
@@ -573,8 +610,8 @@
KProgramEditDialog::KProgramEditDialog(const QString &program, QWidget
*parent, char *name)
Index: kcontrol/background/bgadvanced.h
===================================================================
---- kcontrol/background/bgadvanced.h (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/background/bgadvanced.h (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/background/bgadvanced.h (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/background/bgadvanced.h (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -59,6 +59,9 @@
void makeReadOnly();
@@ -595,8 +632,8 @@
/**
Index: kcontrol/background/main.cpp
===================================================================
---- kcontrol/background/main.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/background/main.cpp (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/background/main.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/background/main.cpp (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -83,13 +83,17 @@
setAboutData( about );
}
@@ -619,9 +656,17 @@
m_base->save();
Index: kcontrol/background/bgrender.cpp
===================================================================
---- kcontrol/background/bgrender.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/background/bgrender.cpp (.../branches/KDE/3.5/kdebase)
(revision 582764)
-@@ -27,6 +27,7 @@
+--- kcontrol/background/bgrender.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/background/bgrender.cpp (.../branches/KDE/3.5/kdebase)
(revision 584594)
+@@ -18,6 +18,7 @@
+ #include <qpainter.h>
+ #include <qimage.h>
+
++#include <dcopclient.h>
+ #include <kapplication.h>
+ #include <kdebug.h>
+ #include <kstandarddirs.h>
+@@ -27,6 +28,7 @@
#include <ktempfile.h>
#include <kcursor.h>
#include <kmimetype.h>
@@ -629,52 +674,57 @@
#ifdef HAVE_LIBART
#include <ksvgiconengine.h>
-@@ -389,6 +390,44 @@
+@@ -389,6 +391,49 @@
if( wp.size() != QSize( xs, ys ))
wp = wp.smoothScale(xs, ys);
}
+
-+ KFileMetaInfo metaInfo(file);
-+ if (metaInfo.isValid() && metaInfo.item("Orientation").isValid()) {
-+ switch (metaInfo.item("Orientation").string().toInt()) {
-+ case 2:
-+ // Flipped horizontally
-+ wp = wp.mirror(true, false);
-+ break;
-+ case 3:
-+ // Rotated 180 degrees
-+ wp = KImageEffect::rotate(wp, KImageEffect::Rotate180);
-+ break;
-+ case 4:
-+ // Flipped vertically
-+ wp = wp.mirror(false, true);
-+ break;
-+ case 5:
-+ // Rotated 90 degrees & flipped horizontally
-+ wp = KImageEffect::rotate(wp,
KImageEffect::Rotate90).mirror(true, false);
-+ break;
-+ case 6:
-+ // Rotated 90 degrees
-+ wp = KImageEffect::rotate(wp, KImageEffect::Rotate90);
-+ break;
-+ case 7:
-+ // Rotated 90 degrees & flipped vertically
-+ wp = KImageEffect::rotate(wp,
KImageEffect::Rotate90).mirror(false, true);
-+ break;
-+ case 8:
-+ // Rotated 270 degrees
-+ wp = KImageEffect::rotate(wp, KImageEffect::Rotate270);
-+ break;
-+ case 1:
-+ default:
-+ // Normal or invalid orientation
-+ break;
++ // HACK: Use KFileMetaInfo only when we're attached to DCOP.
++ // KFileMetaInfo needs ksycoca and so on, but this code is
++ // used also in krootimage (which in turn is used by kdm).
++ if( kapp->dcopClient()->isAttached()) {
++ KFileMetaInfo metaInfo(file);
++ if (metaInfo.isValid() && metaInfo.item("Orientation").isValid()) {
++ switch (metaInfo.item("Orientation").string().toInt()) {
++ case 2:
++ // Flipped horizontally
++ wp = wp.mirror(true, false);
++ break;
++ case 3:
++ // Rotated 180 degrees
++ wp = KImageEffect::rotate(wp, KImageEffect::Rotate180);
++ break;
++ case 4:
++ // Flipped vertically
++ wp = wp.mirror(false, true);
++ break;
++ case 5:
++ // Rotated 90 degrees & flipped horizontally
++ wp = KImageEffect::rotate(wp,
KImageEffect::Rotate90).mirror(true, false);
++ break;
++ case 6:
++ // Rotated 90 degrees
++ wp = KImageEffect::rotate(wp, KImageEffect::Rotate90);
++ break;
++ case 7:
++ // Rotated 90 degrees & flipped vertically
++ wp = KImageEffect::rotate(wp,
KImageEffect::Rotate90).mirror(false, true);
++ break;
++ case 8:
++ // Rotated 270 degrees
++ wp = KImageEffect::rotate(wp, KImageEffect::Rotate270);
++ break;
++ case 1:
++ default:
++ // Normal or invalid orientation
++ break;
++ }
+ }
+ }
}
wp_out:
-@@ -975,8 +1014,7 @@
+@@ -975,8 +1020,7 @@
{
fp += m_renderer[i]->fingerprint();
}
@@ -686,8 +736,8 @@
Index: kcontrol/background/main.h
===================================================================
---- kcontrol/background/main.h (.../tags/KDE/3.5.4/kdebase) (revision
582764)
-+++ kcontrol/background/main.h (.../branches/KDE/3.5/kdebase) (revision
582764)
+--- kcontrol/background/main.h (.../tags/KDE/3.5.4/kdebase) (revision
584594)
++++ kcontrol/background/main.h (.../branches/KDE/3.5/kdebase) (revision
584594)
@@ -27,6 +27,7 @@
~KBackground();
@@ -698,8 +748,8 @@
Index: kcontrol/smartcard/smartcard.cpp
===================================================================
---- kcontrol/smartcard/smartcard.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/smartcard/smartcard.cpp (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/smartcard/smartcard.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/smartcard/smartcard.cpp (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -140,27 +140,7 @@
}
@@ -796,8 +846,8 @@
return i18n("<h1>smartcard</h1> This module allows you to configure KDE
support"
Index: kcontrol/smartcard/smartcard.h
===================================================================
---- kcontrol/smartcard/smartcard.h (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/smartcard/smartcard.h (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/smartcard/smartcard.h (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/smartcard/smartcard.h (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -50,6 +50,7 @@
SmartcardBase *base;
@@ -818,8 +868,8 @@
Index: kcontrol/smartcard/smartcard.desktop
===================================================================
---- kcontrol/smartcard/smartcard.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/smartcard/smartcard.desktop (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/smartcard/smartcard.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/smartcard/smartcard.desktop (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -17,7 +17,7 @@
Name[eo]=Memorkartoj
Name[et]=Kiipkaardid
@@ -848,8 +898,8 @@
Keywords[fy]=Smartcard,PKCS,SSL,reader,smart,card,chipkaart,kaart
Index: kcontrol/krdb/kcs/KeramikEmerald.kcsrc
===================================================================
---- kcontrol/krdb/kcs/KeramikEmerald.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/krdb/kcs/KeramikEmerald.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/krdb/kcs/KeramikEmerald.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/krdb/kcs/KeramikEmerald.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -13,7 +13,7 @@
Name[es]=Esmeralda cerĂĄmica
Name[et]=SĂźgavroheline Keramik
@@ -861,8 +911,8 @@
Name[fy]=Keramyk-Emerald
Index: kcontrol/krdb/kcs/MediaPeach.kcsrc
===================================================================
---- kcontrol/krdb/kcs/MediaPeach.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/krdb/kcs/MediaPeach.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/krdb/kcs/MediaPeach.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/krdb/kcs/MediaPeach.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -8,7 +8,6 @@
Name[eo]=Persiko
Name[es]=MelocotĂłn multimedia
@@ -873,8 +923,8 @@
Name[hi]=ऎŕĽŕ¤Ąŕ¤żŕ¤Żŕ¤ž पŕĽŕ¤
Index: kcontrol/krdb/kcs/BlueSlate.kcsrc
===================================================================
---- kcontrol/krdb/kcs/BlueSlate.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/krdb/kcs/BlueSlate.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/krdb/kcs/BlueSlate.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/krdb/kcs/BlueSlate.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -17,7 +17,7 @@
Name[es]=Azul pizarra
Name[et]=Sinine kivitahvel
@@ -886,8 +936,8 @@
Name[fy]=Laaiblau
Index: kcontrol/krdb/kcs/YellowOnBlue.kcsrc
===================================================================
---- kcontrol/krdb/kcs/YellowOnBlue.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/krdb/kcs/YellowOnBlue.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/krdb/kcs/YellowOnBlue.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/krdb/kcs/YellowOnBlue.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -11,6 +11,7 @@
Name[es]=Amarillo sobre azul de alto contraste
Name[et]=Väga kontrastne kollane sinisel
@@ -898,8 +948,8 @@
Name[fy]=Heech kontrast giel op blau
Index: kcontrol/krdb/kcs/PointReyesGreen.kcsrc
===================================================================
---- kcontrol/krdb/kcs/PointReyesGreen.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/krdb/kcs/PointReyesGreen.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/krdb/kcs/PointReyesGreen.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/krdb/kcs/PointReyesGreen.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -26,7 +26,7 @@
Name[es]=Verde Point Reyes
Name[et]=Point Reyes roheline
@@ -911,8 +961,8 @@
Name[he]=×ר×ק ××
Index: kcontrol/krdb/kcs/Pumpkin.kcsrc
===================================================================
---- kcontrol/krdb/kcs/Pumpkin.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/krdb/kcs/Pumpkin.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/krdb/kcs/Pumpkin.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/krdb/kcs/Pumpkin.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -19,6 +19,7 @@
Name[es]=Calabaza
Name[et]=KĂľrvits
@@ -923,8 +973,8 @@
Name[fy]=klabats
Index: kcontrol/krdb/kcs/KeramikWhite.kcsrc
===================================================================
---- kcontrol/krdb/kcs/KeramikWhite.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/krdb/kcs/KeramikWhite.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/krdb/kcs/KeramikWhite.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/krdb/kcs/KeramikWhite.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -17,7 +17,7 @@
Name[es]=Keramik blanco
Name[et]=Valge Keramik
@@ -936,8 +986,8 @@
Name[fy]=Keramyk-wit
Index: kcontrol/krdb/kcs/AtlasGreen.kcsrc
===================================================================
---- kcontrol/krdb/kcs/AtlasGreen.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/krdb/kcs/AtlasGreen.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/krdb/kcs/AtlasGreen.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/krdb/kcs/AtlasGreen.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -16,7 +16,7 @@
Name[es]=Verde atlas
Name[et]=Atlasroheline
@@ -949,8 +999,8 @@
Name[fy]=Atlasgrien
Index: kcontrol/krdb/kcs/BeOS.kcsrc
===================================================================
---- kcontrol/krdb/kcs/BeOS.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/krdb/kcs/BeOS.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/krdb/kcs/BeOS.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/krdb/kcs/BeOS.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -7,7 +7,6 @@
inactiveBackground=237,237,237
Name=BeOS
@@ -961,8 +1011,8 @@
Name[lo]=ຼະŕşŕşťŕşŕşŕş°ŕşŕş´ŕşŕşąŕşŕşŕş˛ŕş BeOS
Index: kcontrol/krdb/kcs/DigitalCDE.kcsrc
===================================================================
---- kcontrol/krdb/kcs/DigitalCDE.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/krdb/kcs/DigitalCDE.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/krdb/kcs/DigitalCDE.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/krdb/kcs/DigitalCDE.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -12,7 +12,7 @@
Name[eo]=Digital-CDE
Name[es]=CDE de Digital
@@ -974,8 +1024,8 @@
Name[hr]=Digitalni CDE
Index: kcontrol/krdb/kcs/CDE.kcsrc
===================================================================
---- kcontrol/krdb/kcs/CDE.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 582764)
-+++ kcontrol/krdb/kcs/CDE.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 582764)
+--- kcontrol/krdb/kcs/CDE.kcsrc (.../tags/KDE/3.5.4/kdebase)
(revision 584594)
++++ kcontrol/krdb/kcs/CDE.kcsrc (.../branches/KDE/3.5/kdebase)
(revision 584594)
@@ -1,7 +1,6 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.35&r2=1.36&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
