SOURCES: kdebase-branch.diff - up

arekm arekm at pld-linux.org
Sun Sep 10 14:02:01 CEST 2006 

Author: arekm                        Date: Sun Sep 10 12:02:01 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up

---- Files affected:
SOURCES:
   kdebase-branch.diff (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: SOURCES/kdebase-branch.diff
diff -u SOURCES/kdebase-branch.diff:1.34 SOURCES/kdebase-branch.diff:1.35
--- SOURCES/kdebase-branch.diff:1.34	Sat Sep  9 20:42:56 2006
+++ SOURCES/kdebase-branch.diff	Sun Sep 10 14:01:56 2006
@@ -1,7 +1,7 @@
 Index: ksmserver/shutdown.cpp
 ===================================================================
---- ksmserver/shutdown.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ ksmserver/shutdown.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- ksmserver/shutdown.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ ksmserver/shutdown.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -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 582543)
-+++ ksmserver/server.h	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- ksmserver/server.h	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ ksmserver/server.h	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -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 582543)
-+++ kate/app/kateconsole.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kate/app/kateconsole.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kate/app/kateconsole.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -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 582543)
-+++ kate/app/kategrepdialog.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kate/app/kategrepdialog.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kate/app/kategrepdialog.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -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 582543)
-+++ kate/app/katemainwindow.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kate/app/katemainwindow.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kate/app/katemainwindow.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -482,8 +482,11 @@
  
    QListViewItem * item = filelist->firstChild();
@@ -117,8 +117,8 @@
  
 Index: kate/app/katemwmodonhddialog.cpp
 ===================================================================
---- kate/app/katemwmodonhddialog.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kate/app/katemwmodonhddialog.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kate/app/katemwmodonhddialog.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kate/app/katemwmodonhddialog.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -215,7 +215,7 @@
    // Start a KProcess that creates a diff
    KProcIO *p = new KProcIO();
@@ -162,8 +162,8 @@
    if ( ! p->normalExit() /*|| p->exitStatus()*/ )
 Index: kate/app/kategrepdialog.h
 ===================================================================
---- kate/app/kategrepdialog.h	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kate/app/kategrepdialog.h	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kate/app/kategrepdialog.h	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kate/app/kategrepdialog.h	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -57,6 +57,9 @@
  
  protected:
@@ -176,8 +176,8 @@
      void templateActivated(int index);
 Index: kate/app/katesession.cpp
 ===================================================================
---- kate/app/katesession.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kate/app/katesession.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kate/app/katesession.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kate/app/katesession.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -48,6 +48,11 @@
  #include <unistd.h>
  #include <time.h>
@@ -201,8 +201,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 582543)
-+++ kate/data/kateplugin.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kate/data/kateplugin.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kate/data/kateplugin.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -22,7 +22,7 @@
  Comment[es]=Plugin de Kate
  Comment[et]=Kate plugin
@@ -214,8 +214,8 @@
  Comment[fr]=Module de Kate
 Index: kate/data/kate.desktop
 ===================================================================
---- kate/data/kate.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kate/data/kate.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kate/data/kate.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kate/data/kate.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -18,7 +18,7 @@
  GenericName[es]=Editor de texto avanzado
  GenericName[et]=VĂľimas tekstiredaktor
@@ -235,8 +235,8 @@
  Name[mk]=Като
 Index: kate/data/kwrite.desktop
 ===================================================================
---- kate/data/kwrite.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kate/data/kwrite.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kate/data/kwrite.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kate/data/kwrite.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -19,7 +19,7 @@
  GenericName[es]=Editor de texto
  GenericName[et]=Tekstiredaktor
@@ -256,8 +256,8 @@
  Name[lo]=Kwrite
 Index: kdepasswd/kcm/kcm_useraccount.desktop
 ===================================================================
---- kdepasswd/kcm/kcm_useraccount.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kdepasswd/kcm/kcm_useraccount.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- 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)
 @@ -23,6 +23,7 @@
  Name[es]=ContraseĂąa y cuenta de usuario
  Name[et]=Parool ja kasutaja konto
@@ -293,8 +293,8 @@
  Comment[ru]=Сведения Đž ĐżĐžĐťŃŒĐˇĐžĐ˛Đ°Ń‚ĐľĐťĐľ, такио как ĐżĐ°Ń€ĐžĐťŃŒ, имя и e-mail
 Index: kdepasswd/kdepasswd.desktop
 ===================================================================
---- kdepasswd/kdepasswd.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kdepasswd/kdepasswd.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kdepasswd/kdepasswd.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kdepasswd/kdepasswd.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -23,6 +23,7 @@
  Name[es]=Cambiar contraseĂąa
  Name[et]=Parooli muutmine
@@ -305,8 +305,8 @@
  Name[fy]=Wachtwurd wizigje
 Index: kpersonalizer/ksysinfo.cpp
 ===================================================================
---- kpersonalizer/ksysinfo.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kpersonalizer/ksysinfo.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kpersonalizer/ksysinfo.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kpersonalizer/ksysinfo.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -73,6 +73,7 @@
  		if (!extension.compare("RENDER"))
  			m_xrender=true;
@@ -317,8 +317,8 @@
  
 Index: kpersonalizer/kpersonalizer.desktop
 ===================================================================
---- kpersonalizer/kpersonalizer.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kpersonalizer/kpersonalizer.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kpersonalizer/kpersonalizer.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kpersonalizer/kpersonalizer.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -24,7 +24,7 @@
  Name[es]=Asistente para las preferencias del escritorio
  Name[et]=TÜÜlaua seadistuste abimees
@@ -330,8 +330,8 @@
  Name[fy]=KDE's Ynstellings Assistent
 Index: kfind/kfindpart.desktop
 ===================================================================
---- kfind/kfindpart.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kfind/kfindpart.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kfind/kfindpart.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kfind/kfindpart.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -19,7 +19,7 @@
  Name[es]=Buscar parte
  Name[et]=Failide otsimise komponent
@@ -343,8 +343,8 @@
  Name[fy]=In diel sykje
 Index: kfind/findpart.desktop
 ===================================================================
---- kfind/findpart.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kfind/findpart.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kfind/findpart.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kfind/findpart.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -21,7 +21,7 @@
  Name[es]=Buscar parte
  Name[et]=Failide otsimise komponent
@@ -356,8 +356,8 @@
  Name[fy]=In diel sykje
 Index: kfind/Kfind.desktop
 ===================================================================
---- kfind/Kfind.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kfind/Kfind.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kfind/Kfind.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kfind/Kfind.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -20,6 +20,7 @@
  Name[es]=Buscar archivos/carpetas
  Name[et]=Failide/kataloogide otsimine
@@ -377,8 +377,8 @@
  Name[nl]=Bestanden/mappen zoeken
 Index: kcontrol/background/background.desktop
 ===================================================================
---- kcontrol/background/background.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/background/background.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/background/background.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/background/background.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -29,7 +29,7 @@
  Name[es]=Fondo
  Name[et]=Taust
@@ -408,8 +408,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 582543)
-+++ kcontrol/background/bgdialog.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/background/bgdialog.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/background/bgdialog.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -288,8 +288,9 @@
      m_buttonGetNew->setEnabled( false );
  }
@@ -499,8 +499,8 @@
      {
 Index: kcontrol/background/bgdialog.h
 ===================================================================
---- kcontrol/background/bgdialog.h	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/background/bgdialog.h	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/background/bgdialog.h	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/background/bgdialog.h	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -39,7 +39,7 @@
     BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop = true);
     ~BGDialog();
@@ -512,8 +512,8 @@
  
 Index: kcontrol/background/bgsettings.h
 ===================================================================
---- kcontrol/background/bgsettings.h	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/background/bgsettings.h	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/background/bgsettings.h	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/background/bgsettings.h	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -347,6 +347,7 @@
  
      void readSettings();
@@ -524,8 +524,8 @@
      bool dirty;
 Index: kcontrol/background/bgadvanced.cpp
 ===================================================================
---- kcontrol/background/bgadvanced.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/background/bgadvanced.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/background/bgadvanced.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/background/bgadvanced.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -122,7 +122,7 @@
     connect( dlg->m_cbProgram, SIGNAL(toggled(bool)),
              SLOT(slotEnableProgram(bool)));
@@ -573,8 +573,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 582543)
-+++ kcontrol/background/bgadvanced.h	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/background/bgadvanced.h	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/background/bgadvanced.h	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -59,6 +59,9 @@
  
     void makeReadOnly();
@@ -595,8 +595,8 @@
  /**
 Index: kcontrol/background/main.cpp
 ===================================================================
---- kcontrol/background/main.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/background/main.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/background/main.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/background/main.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -83,13 +83,17 @@
      setAboutData( about );
  }
@@ -619,8 +619,8 @@
      m_base->save();
 Index: kcontrol/background/bgrender.cpp
 ===================================================================
---- kcontrol/background/bgrender.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/background/bgrender.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- 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 @@
  #include <ktempfile.h>
  #include <kcursor.h>
@@ -686,8 +686,8 @@
  
 Index: kcontrol/background/main.h
 ===================================================================
---- kcontrol/background/main.h	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/background/main.h	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/background/main.h	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/background/main.h	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -27,6 +27,7 @@
      ~KBackground();
  
@@ -698,8 +698,8 @@
  
 Index: kcontrol/smartcard/smartcard.cpp
 ===================================================================
---- kcontrol/smartcard/smartcard.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/smartcard/smartcard.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/smartcard/smartcard.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/smartcard/smartcard.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -140,27 +140,7 @@
  
  }
@@ -796,8 +796,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 582543)
-+++ kcontrol/smartcard/smartcard.h	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/smartcard/smartcard.h	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/smartcard/smartcard.h	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -50,6 +50,7 @@
    SmartcardBase *base;
  
@@ -818,8 +818,8 @@
  
 Index: kcontrol/smartcard/smartcard.desktop
 ===================================================================
---- kcontrol/smartcard/smartcard.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/smartcard/smartcard.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/smartcard/smartcard.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/smartcard/smartcard.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -17,7 +17,7 @@
  Name[eo]=Memorkartoj
  Name[et]=Kiipkaardid
@@ -848,8 +848,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 582543)
-+++ kcontrol/krdb/kcs/KeramikEmerald.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- 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)
 @@ -13,7 +13,7 @@
  Name[es]=Esmeralda cerĂĄmica
  Name[et]=SĂźgavroheline Keramik
@@ -861,8 +861,8 @@
  Name[fy]=Keramyk-Emerald
 Index: kcontrol/krdb/kcs/MediaPeach.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/MediaPeach.kcsrc	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/krdb/kcs/MediaPeach.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- 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)
 @@ -8,7 +8,6 @@
  Name[eo]=Persiko
  Name[es]=MelocotĂłn multimedia
@@ -873,8 +873,8 @@
  Name[hi]=ऎༀथियञ पༀच
 Index: kcontrol/krdb/kcs/BlueSlate.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/BlueSlate.kcsrc	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/krdb/kcs/BlueSlate.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- 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)
 @@ -17,7 +17,7 @@
  Name[es]=Azul pizarra
  Name[et]=Sinine kivitahvel
@@ -886,8 +886,8 @@
  Name[fy]=Laaiblau
 Index: kcontrol/krdb/kcs/YellowOnBlue.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/YellowOnBlue.kcsrc	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/krdb/kcs/YellowOnBlue.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- 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)
 @@ -11,6 +11,7 @@
  Name[es]=Amarillo sobre azul de alto contraste
  Name[et]=Väga kontrastne kollane sinisel
@@ -898,8 +898,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 582543)
-+++ kcontrol/krdb/kcs/PointReyesGreen.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- 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)
 @@ -26,7 +26,7 @@
  Name[es]=Verde Point Reyes
  Name[et]=Point Reyes roheline
@@ -911,8 +911,8 @@
  Name[he]=ירוק ים
 Index: kcontrol/krdb/kcs/Pumpkin.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/Pumpkin.kcsrc	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/krdb/kcs/Pumpkin.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- 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)
 @@ -19,6 +19,7 @@
  Name[es]=Calabaza
  Name[et]=KĂľrvits
@@ -923,8 +923,8 @@
  Name[fy]=klabats
 Index: kcontrol/krdb/kcs/KeramikWhite.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/KeramikWhite.kcsrc	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/krdb/kcs/KeramikWhite.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- 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)
 @@ -17,7 +17,7 @@
  Name[es]=Keramik blanco
  Name[et]=Valge Keramik
@@ -936,8 +936,8 @@
  Name[fy]=Keramyk-wit
 Index: kcontrol/krdb/kcs/AtlasGreen.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/AtlasGreen.kcsrc	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/krdb/kcs/AtlasGreen.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- 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)
 @@ -16,7 +16,7 @@
  Name[es]=Verde atlas
  Name[et]=Atlasroheline
@@ -949,8 +949,8 @@
  Name[fy]=Atlasgrien
 Index: kcontrol/krdb/kcs/BeOS.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/BeOS.kcsrc	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/krdb/kcs/BeOS.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- 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)
 @@ -7,7 +7,6 @@
  inactiveBackground=237,237,237
  Name=BeOS
@@ -961,8 +961,8 @@
  Name[lo]=ຼະບຝບປະຕິບູດການ BeOS
 Index: kcontrol/krdb/kcs/DigitalCDE.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/DigitalCDE.kcsrc	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/krdb/kcs/DigitalCDE.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- 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)
 @@ -12,7 +12,7 @@
  Name[eo]=Digital-CDE
  Name[es]=CDE de Digital
@@ -974,8 +974,8 @@
  Name[hr]=Digitalni CDE
 Index: kcontrol/krdb/kcs/CDE.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/CDE.kcsrc	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/krdb/kcs/CDE.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- 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)
 @@ -1,7 +1,6 @@
  # KDE Config File
  [Color Scheme]
@@ -986,8 +986,8 @@
  Name[tg]=ĐœŃƒŇłĐ¸Ń‚Đ¸ графикии ĐźŃƒŃˆŃ‚Đ°Ń€Đ°Đş (CDE)
 Index: kcontrol/krdb/kcs/PaleGray.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/PaleGray.kcsrc	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/krdb/kcs/PaleGray.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/krdb/kcs/PaleGray.kcsrc	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/krdb/kcs/PaleGray.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -17,7 +17,7 @@
  Name[es]=Gris pĂĄlido
  Name[et]=Kahvatuhall
@@ -999,8 +999,8 @@
  Name[fy]=Fealgriis
 Index: kcontrol/krdb/kcs/Plastik.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/Plastik.kcsrc	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/krdb/kcs/Plastik.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/krdb/kcs/Plastik.kcsrc	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/krdb/kcs/Plastik.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -5,6 +5,7 @@
  Name[be]=ĐŸĐťŃŃŃ‚Ń‹Đş
  Name[bn]=ŕŚŞŕ§ŕŚ˛ŕŚžŕŚ¸ŕ§ŕŚŸŕŚżŕŚ•
@@ -1011,8 +1011,8 @@
  Name[hr]=Plastika
 Index: kcontrol/krdb/kcs/BlackOnWhite.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/BlackOnWhite.kcsrc	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/krdb/kcs/BlackOnWhite.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/krdb/kcs/BlackOnWhite.kcsrc	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/krdb/kcs/BlackOnWhite.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -11,6 +11,7 @@
  Name[es]=Texto negro de alto contraste
  Name[et]=Väga kontrastne must tekst
@@ -1023,8 +1023,8 @@
  Name[fy]=Heech kontrast swarte tekst
 Index: kcontrol/krdb/kcs/WhiteOnBlack.kcsrc
 ===================================================================
---- kcontrol/krdb/kcs/WhiteOnBlack.kcsrc	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/krdb/kcs/WhiteOnBlack.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/krdb/kcs/WhiteOnBlack.kcsrc	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/krdb/kcs/WhiteOnBlack.kcsrc	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -11,6 +11,7 @@
  Name[es]=Texto blanco de alto contraste
  Name[et]=Väga kontrastne valge tekst
@@ -1035,8 +1035,8 @@
  Name[fy]=Heech kontrast wite tekst
 Index: kcontrol/knotify/knotify.cpp
 ===================================================================
---- kcontrol/knotify/knotify.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/knotify/knotify.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/knotify/knotify.cpp	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/knotify/knotify.cpp	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -147,12 +147,17 @@
  void KCMKNotify::defaults()
  {
@@ -1096,8 +1096,8 @@
      m_ui->cbExternal->setChecked( useExternal );
 Index: kcontrol/knotify/knotify.h
 ===================================================================
---- kcontrol/knotify/knotify.h	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/knotify/knotify.h	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/knotify/knotify.h	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/knotify/knotify.h	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -54,6 +54,7 @@
  
      virtual void defaults();
@@ -1117,8 +1117,8 @@
  protected slots:
 Index: kcontrol/knotify/kcmnotify.desktop
 ===================================================================
---- kcontrol/knotify/kcmnotify.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/knotify/kcmnotify.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/knotify/kcmnotify.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/knotify/kcmnotify.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -27,7 +27,7 @@
  Name[es]=Notificaciones del sistema
  Name[et]=Sßsteemi märguanded
@@ -1148,8 +1148,8 @@
  Keywords[fy]=systeemlĂťden,audio,lĂťd,warskĂ´gingen,lĂťdssinjaal,oankundiging
 Index: kcontrol/usbview/kcmusb.desktop
 ===================================================================
---- kcontrol/usbview/kcmusb.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/usbview/kcmusb.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/usbview/kcmusb.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/usbview/kcmusb.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -27,7 +27,7 @@
  Name[es]=Dispositivos USB
  Name[et]=USB seadmed
@@ -1178,8 +1178,8 @@
  Keywords[fy]=USB,devices,viewer,control,werjefteprogramma
 Index: kcontrol/componentchooser/EXAMPLE.desktop
 ===================================================================
---- kcontrol/componentchooser/EXAMPLE.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/componentchooser/EXAMPLE.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/componentchooser/EXAMPLE.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/componentchooser/EXAMPLE.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -15,7 +15,7 @@
  Name[es]=Un bonito nombre de su elecciĂłn para su interfaz
  Name[et]=MĂľni kena nimi, mille sa oma liidesele valinud oled
@@ -1200,8 +1200,8 @@
  Comment[fr]=Une description utile de l'interface pour la boĂŽte d'informations en haut Ă  droite
 Index: kcontrol/componentchooser/componentservices/kcm_kemail.desktop
 ===================================================================
---- kcontrol/componentchooser/componentservices/kcm_kemail.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/componentchooser/componentservices/kcm_kemail.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/componentchooser/componentservices/kcm_kemail.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/componentchooser/componentservices/kcm_kemail.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -17,7 +17,7 @@
  Name[es]=Cliente de correo electrĂłnico
  Name[et]=E-posti klient
@@ -1222,8 +1222,8 @@
  Comment[fy]=Mei dizze tsjinst kinne jo de standert e-postprogramma ynstelle. KDE-tapassingen dy tagong ta in e-postprogramma neadich ha sille dizze ynstellings brĂťke.
 Index: kcontrol/componentchooser/componentservices/kcm_browser.desktop
 ===================================================================
---- kcontrol/componentchooser/componentservices/kcm_browser.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/componentchooser/componentservices/kcm_browser.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/componentchooser/componentservices/kcm_browser.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/componentchooser/componentservices/kcm_browser.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -87,6 +87,7 @@
  Comment[es]=Este servicio le permite configurar su navegador de Internet predeterminado. Todas las aplicaciones KDE que precisan acceso a hiperenlaces deberĂ­an reconocer esta opciĂłn.
  Comment[et]=Siin saab seadistada vaikimisi kasutatavat veebilehitsejat. KĂľik KDE rakendused, kus saab valida hĂźperlinke, peaksid siinsete seadistustega arvestama.
@@ -1243,8 +1243,8 @@
  Comment[ru]=Đ—Đ´ĐľŃŃŒ ПОМнО Đ˝Đ°ŃŃ‚Ń€ĐžĐ¸Ń‚ŃŒ вой-ĐąŃ€Đ°ŃƒĐˇĐľŃ€ пО ŃƒĐźĐžĐťŃ‡Đ°Đ˝Đ¸ŃŽ. Всо ĐżŃ€Đ¸ĐťĐžĐśĐľĐ˝Đ¸Ń KDE, в кОтОрыŃ
 ПОМнО Đ˛Ń‹ĐˇĐ˛Đ°Ń‚ŃŒ ĐłĐ¸ĐżĐľŃ€ŃŃŃ‹ĐťĐşŃƒ, ĐąŃƒĐ´ŃƒŃ‚ Đ¸ŃĐżĐžĐťŃŒĐˇĐžĐ˛Đ°Ń‚ŃŒ ŃŃ‚ĐžŃ‚ параПотр.
 Index: kcontrol/componentchooser/componentservices/kcm_terminal.desktop
 ===================================================================
---- kcontrol/componentchooser/componentservices/kcm_terminal.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/componentchooser/componentservices/kcm_terminal.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/componentchooser/componentservices/kcm_terminal.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/componentchooser/componentservices/kcm_terminal.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -16,7 +16,7 @@
  Name[es]=Emulador de terminal
  Name[et]=Terminaliemulaator
@@ -1265,8 +1265,8 @@
  Comment[fy]=Mei dizze tsjinst kinne jo de standert terminalemulator ynstelle. Alle KDE-tapassingen dy in terminalemulator oanroppe sille brĂťk meitsje fan dizze ynstelling.
 Index: kcontrol/componentchooser/componentchooser.desktop
 ===================================================================
---- kcontrol/componentchooser/componentchooser.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582543)
-+++ kcontrol/componentchooser/componentchooser.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582543)
+--- kcontrol/componentchooser/componentchooser.desktop	(.../tags/KDE/3.5.4/kdebase)	(revision 582764)
++++ kcontrol/componentchooser/componentchooser.desktop	(.../branches/KDE/3.5/kdebase)	(revision 582764)
 @@ -27,7 +27,7 @@
  Name[es]=Selector de componentes
<<Diff was trimmed, longer than 597 lines>>

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

More information about the pld-cvs-commit mailing list