SOURCES: kdebase-branch.diff - updated
arekm
arekm at pld-linux.org
Sun Jan 8 23:33:23 CET 2006
Author: arekm Date: Sun Jan 8 22:33:23 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdebase-branch.diff (1.21 -> 1.22)
---- Diffs:
================================================================
Index: SOURCES/kdebase-branch.diff
diff -u SOURCES/kdebase-branch.diff:1.21 SOURCES/kdebase-branch.diff:1.22
--- SOURCES/kdebase-branch.diff:1.21 Sat Dec 31 17:58:31 2005
+++ SOURCES/kdebase-branch.diff Sun Jan 8 23:33:18 2006
@@ -1,7 +1,7 @@
Index: ksmserver/shutdown.h
===================================================================
---- ksmserver/shutdown.h (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ ksmserver/shutdown.h (.../branches/KDE/3.5/kdebase) (revision 492936)
+--- ksmserver/shutdown.h (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ ksmserver/shutdown.h (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -1,87 +0,0 @@
-/*****************************************************************
-ksmserver - the KDE session management server
@@ -93,7 +93,7 @@
Index: ksmserver/shutdowndlg.cpp
===================================================================
--- ksmserver/shutdowndlg.cpp (.../tags/KDE/3.5.0/kdebase) (revision 0)
-+++ ksmserver/shutdowndlg.cpp (.../branches/KDE/3.5/kdebase) (revision 492936)
++++ ksmserver/shutdowndlg.cpp (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -0,0 +1,273 @@
+/*****************************************************************
+ksmserver - the KDE session management server
@@ -381,7 +381,7 @@
Index: ksmserver/startup.cpp
===================================================================
--- ksmserver/startup.cpp (.../tags/KDE/3.5.0/kdebase) (revision 0)
-+++ ksmserver/startup.cpp (.../branches/KDE/3.5/kdebase) (revision 492936)
++++ ksmserver/startup.cpp (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -0,0 +1,289 @@
+/*****************************************************************
+ksmserver - the KDE session management server
@@ -685,7 +685,7 @@
Index: ksmserver/legacy.cpp
===================================================================
--- ksmserver/legacy.cpp (.../tags/KDE/3.5.0/kdebase) (revision 0)
-+++ ksmserver/legacy.cpp (.../branches/KDE/3.5/kdebase) (revision 492936)
++++ ksmserver/legacy.cpp (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -0,0 +1,388 @@
+/*****************************************************************
+ksmserver - the KDE session management server
@@ -1087,8 +1087,8 @@
Index: ksmserver/server.cpp
===================================================================
---- ksmserver/server.cpp (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ ksmserver/server.cpp (.../branches/KDE/3.5/kdebase) (revision 492936)
+--- ksmserver/server.cpp (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ ksmserver/server.cpp (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -2,6 +2,7 @@
ksmserver - the KDE session management server
@@ -2308,7 +2308,7 @@
Index: ksmserver/shutdowndlg.h
===================================================================
--- ksmserver/shutdowndlg.h (.../tags/KDE/3.5.0/kdebase) (revision 0)
-+++ ksmserver/shutdowndlg.h (.../branches/KDE/3.5/kdebase) (revision 492936)
++++ ksmserver/shutdowndlg.h (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -0,0 +1,88 @@
+/*****************************************************************
+ksmserver - the KDE session management server
@@ -2410,8 +2410,8 @@
Index: ksmserver/shutdown.cpp
===================================================================
---- ksmserver/shutdown.cpp (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ ksmserver/shutdown.cpp (.../branches/KDE/3.5/kdebase) (revision 492936)
+--- ksmserver/shutdown.cpp (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ ksmserver/shutdown.cpp (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -2,267 +2,514 @@
ksmserver - the KDE session management server
@@ -3122,8 +3122,8 @@
+}
Index: ksmserver/server.h
===================================================================
---- ksmserver/server.h (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ ksmserver/server.h (.../branches/KDE/3.5/kdebase) (revision 492936)
+--- ksmserver/server.h (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ ksmserver/server.h (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -33,37 +33,8 @@
typedef QValueList<QCString> QCStringList;
class KSMListener;
@@ -3211,7 +3211,7 @@
Index: ksmserver/client.cpp
===================================================================
--- ksmserver/client.cpp (.../tags/KDE/3.5.0/kdebase) (revision 0)
-+++ ksmserver/client.cpp (.../branches/KDE/3.5/kdebase) (revision 492936)
++++ ksmserver/client.cpp (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -0,0 +1,190 @@
+/*****************************************************************
+ksmserver - the KDE session management server
@@ -3415,8 +3415,8 @@
Index: ksmserver/test.cpp
===================================================================
---- ksmserver/test.cpp (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ ksmserver/test.cpp (.../branches/KDE/3.5/kdebase) (revision 492936)
+--- ksmserver/test.cpp (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ ksmserver/test.cpp (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -1,4 +1,4 @@
-#include <shutdown.h>
+#include "shutdowndlg.h"
@@ -3442,7 +3442,7 @@
Index: ksmserver/client.h
===================================================================
--- ksmserver/client.h (.../tags/KDE/3.5.0/kdebase) (revision 0)
-+++ ksmserver/client.h (.../branches/KDE/3.5/kdebase) (revision 492936)
++++ ksmserver/client.h (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -0,0 +1,60 @@
+/*****************************************************************
+ksmserver - the KDE session management server
@@ -3516,8 +3516,8 @@
Index: ksmserver/Makefile.am
===================================================================
---- ksmserver/Makefile.am (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ ksmserver/Makefile.am (.../branches/KDE/3.5/kdebase) (revision 492936)
+--- ksmserver/Makefile.am (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ ksmserver/Makefile.am (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -22,11 +22,13 @@
bin_PROGRAMS =
lib_LTLIBRARIES =
@@ -3545,8 +3545,8 @@
$(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot
Index: ksmserver/server2.h
===================================================================
---- ksmserver/server2.h (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ ksmserver/server2.h (.../branches/KDE/3.5/kdebase) (revision 492936)
+--- ksmserver/server2.h (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ ksmserver/server2.h (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -12,3 +12,5 @@
#include <X11/SM/SM.h>
#include <X11/SM/SMlib.h>
@@ -3555,8 +3555,8 @@
+#include <fixx11h.h>
Index: debian/local/kdm.options.5
===================================================================
---- debian/local/kdm.options.5 (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ debian/local/kdm.options.5 (.../branches/KDE/3.5/kdebase) (revision 492936)
+--- debian/local/kdm.options.5 (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ debian/local/kdm.options.5 (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -13,8 +13,8 @@
.\"
.\" You should have received a copy of the GNU General Public License with
@@ -3568,11 +3568,331 @@
.TH kdm.options 5 "2003\-09\-18" "Debian Project"
.SH NAME
kdm.options \- configuration options for X display manager
+Index: kate/app/kateviewmanager.cpp
+===================================================================
+--- kate/app/kateviewmanager.cpp (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kate/app/kateviewmanager.cpp (.../branches/KDE/3.5/kdebase) (revision 495788)
+@@ -462,9 +462,17 @@
+ /**
+ * session config functions
+ */
++// FIXME 3.0 - make those config goups more streamlined: "objN:objN..."
++void KateViewManager::saveViewConfiguration(KConfig *config,const QString& grp)
++{
++ // Use the same group name for view configuration as usual for sessions.
++ // (When called by session manager grp is a 1-based index for the main window)
++ QString group = grp;
++ bool ok = false;
++ int n = group.toInt( &ok );
++ if ( ok )
++ group = QString( "MainWindow%1" ).arg( n-1 );
+
+-void KateViewManager::saveViewConfiguration(KConfig *config,const QString& group)
+-{
+ config->setGroup(group);
+ config->writeEntry("ViewSpaceContainers",m_viewSpaceContainerList.count());
+ config->writeEntry("Active ViewSpaceContainer", m_mainWindow->tabWidget()->currentPageIndex());
+@@ -473,8 +481,16 @@
+ }
+ }
+
+-void KateViewManager::restoreViewConfiguration (KConfig *config, const QString& group)
++void KateViewManager::restoreViewConfiguration (KConfig *config, const QString& grp)
+ {
++ // Use the same group name for view configuration as usual for sessions.
++ // (When called by session manager grp is a 1-based index for the main window)
++ QString group = grp;
++ bool ok = false;
++ int n = group.toInt( &ok );
++ if ( ok )
++ group = QString( "MainWindow%1" ).arg( n-1 );
++
+ config->setGroup(group);
+ uint tabCount=config->readNumEntry("ViewSpaceContainers",0);
+ int activeOne=config->readNumEntry("Active ViewSpaceContainer",0);
+Index: kate/app/kwritemain.cpp
+===================================================================
+--- kate/app/kwritemain.cpp (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kate/app/kwritemain.cpp (.../branches/KDE/3.5/kdebase) (revision 495788)
+@@ -173,7 +173,7 @@
+ a=KStdAction::keyBindings(this, SLOT(editKeys()), actionCollection());
+ a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
+
+- a=KStdAction::configureToolbars(this, SLOT(editToolbars()), actionCollection(), "set_configure_toolbars");
++ a=KStdAction::configureToolbars(this, SLOT(editToolbars()), actionCollection());
+ a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
+ }
+
+@@ -297,23 +297,19 @@
+
+ void KWrite::editToolbars()
+ {
++ saveMainWindowSettings( kapp->config(), "MainWindow" );
+ KEditToolbar *dlg = new KEditToolbar(guiFactory());
+-
+- if (dlg->exec())
+- {
+- KParts::GUIActivateEvent ev1( false );
+- QApplication::sendEvent( m_view, &ev1 );
+- guiFactory()->removeClient( m_view );
+- createShellGUI( false );
+- createShellGUI( true );
+- guiFactory()->addClient( m_view );
+- KParts::GUIActivateEvent ev2( true );
+- QApplication::sendEvent( m_view, &ev2 );
+- }
+-
++ connect( dlg, SIGNAL(newToolbarConfig()), this, SLOT(slotNewToolbarConfig()) );
++ dlg->exec();
+ delete dlg;
+ }
+
++void KWrite::slotNewToolbarConfig()
++{
++ applyMainWindowSettings( kapp->config(), "MainWindow" );
++}
++
++
+ void KWrite::printNow()
+ {
+ KTextEditor::printInterface(m_view->document())->print ();
+@@ -550,7 +546,7 @@
+ QString kWriteVersion = QString ("%1.%2.%3").arg(KDE::versionMajor() + 1).arg(KDE::versionMinor()).arg(KDE::versionRelease());
+
+ KAboutData aboutData ( "kwrite",
+- I18N_NOOP("KWrite"),
++ I18N_NOOP("KWrite"),
+ kWriteVersion.latin1(),
+ I18N_NOOP( "KWrite - Text Editor" ), KAboutData::License_LGPL_V2,
+ I18N_NOOP( "(c) 2000-2005 The Kate Authors" ), 0, "http://kate.kde.org" );
+@@ -713,3 +709,4 @@
+ m_chooser->writeAppSetting();
+ KDialogBase::slotOk();
+ }
++// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
+Index: kate/app/kateapp.cpp
+===================================================================
+--- kate/app/kateapp.cpp (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kate/app/kateapp.cpp (.../branches/KDE/3.5/kdebase) (revision 495788)
+@@ -161,7 +161,7 @@
+ {
+ sessionManager()->activateSession (sessionManager()->giveSession (m_args->getOption("start")), false, false);
+ }
+- else if (!m_args->isSet( "stdin" ) && (m_args->count() == 0)) // only start session if no files specified
++ else
+ {
+ // let the user choose session if possible
+ if (!sessionManager()->chooseSession ())
+Index: kate/app/katemainwindow.h
+===================================================================
+--- kate/app/katemainwindow.h (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kate/app/katemainwindow.h (.../branches/KDE/3.5/kdebase) (revision 495788)
+@@ -143,6 +143,7 @@
+
+ void slotFileQuit();
+ void slotEditToolbars();
++ void slotNewToolbarConfig();
+ void slotWindowActivated ();
+ void slotUpdateOpenWith();
+ void documentMenuAboutToShow();
+Index: kate/app/katemain.cpp
+===================================================================
+--- kate/app/katemain.cpp (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kate/app/katemain.cpp (.../branches/KDE/3.5/kdebase) (revision 495788)
+@@ -26,6 +26,7 @@
+ #include <kglobal.h>
+ #include <kconfig.h>
+ #include <kinstance.h>
++#include <kstartupinfo.h>
+ #include <dcopclient.h>
+ #include <dcopref.h>
+ #include <kdebug.h>
+@@ -137,6 +138,8 @@
+ if (!kateApp.isEmpty())
+ {
+ kdDebug () << "kate app: " << kateApp << endl;
++ // make kdeinit happy
++ client.registerAs( "kate" );
+
+ DCOPRef kRef (kateApp, "KateApplication");
+
+@@ -189,6 +192,24 @@
+ if (nav)
+ kRef.call( "setCursor", line, column );
+
++ // since the user tried to open a document, let us assume [s]he
++ // wants to see that document.
++ // ### what to do about the infamous focus stealing prevention?
++ uint mwn = kRef.call("activeMainWindowNumber");
++ QCString smwn;
++ DCOPRef wRef( kateApp, QCString( "__KateMainWindow#") + smwn.setNum(mwn) );
++ if ( wRef.call("minimized") )
++ {
++ if ( wRef.call( "maximized" ) )
++ wRef.call( "maximize" );
++ else
++ wRef.call("restore");
++ }
++ wRef.call( "raise" );
++
++ // stop startup notification
++ KStartupInfo::appStarted( );
++
+ return 0;
+ }
+ }
+@@ -198,8 +219,12 @@
+
+ // app execution should already end :)
+ if (app.shouldExit())
++ {
+ return 0;
++ }
+
+ // execute ourself ;)
+ return app.exec();
+ }
++
++// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
+Index: kate/app/kateexternaltools.cpp
+===================================================================
+--- kate/app/kateexternaltools.cpp (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kate/app/kateexternaltools.cpp (.../branches/KDE/3.5/kdebase) (revision 495788)
+@@ -308,13 +308,8 @@
+
+ void KateExternalToolsMenuAction::reload()
+ {
+-
+- uint i = 0;
+- while ( i < m_actionCollection->count() )
+- {
+- m_actionCollection->action( i++ )->setShortcut(KShortcut());
+- }
+ m_actionCollection->clear ();
++ popupMenu()->clear();
+
+ // load all the tools, and create a action for each of them
+ KConfig *config = new KConfig( "externaltools", false, false, "appdata" );
+Index: kate/app/kwritemain.h
+===================================================================
+--- kate/app/kwritemain.h (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kate/app/kwritemain.h (.../branches/KDE/3.5/kdebase) (revision 495788)
+@@ -69,6 +69,9 @@
+ void editToolbars();
+ void changeEditor();
+
++ private slots:
++ void slotNewToolbarConfig();
++
+ public slots:
+ void printNow();
+ void printDlg();
+@@ -132,3 +135,4 @@
+ };
+
+ #endif
++// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
+Index: kate/app/katemainwindow.cpp
+===================================================================
+--- kate/app/katemainwindow.cpp (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kate/app/katemainwindow.cpp (.../branches/KDE/3.5/kdebase) (revision 495788)
+@@ -177,11 +177,11 @@
+
+ readOptions();
+
+- finishRestore ();
+-
+ if (sconfig)
+ m_viewManager->restoreViewConfiguration (sconfig, sgroup);
+
++ finishRestore ();
++
+ setAcceptDrops(true);
+ }
+
+@@ -277,7 +277,7 @@
+ a=KStdAction::keyBindings(this, SLOT(editKeys()), actionCollection());
+ a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
+
+- a=KStdAction::configureToolbars(this, SLOT(slotEditToolbars()), actionCollection(), "set_configure_toolbars");
++ a=KStdAction::configureToolbars(this, SLOT(slotEditToolbars()), actionCollection());
+ a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
+
+ KAction* settingsConfigure = KStdAction::preferences(this, SLOT(slotConfigure()), actionCollection(), "settings_configure");
+@@ -384,11 +384,17 @@
+
+ void KateMainWindow::slotEditToolbars()
+ {
++ saveMainWindowSettings( KateApp::self()->config(), "MainWindow" );
+ KEditToolbar dlg( factory() );
+-
++ connect( &dlg, SIGNAL(newToolbarConfig()), this, SLOT(slotNewToolbarConfig()) );
+ dlg.exec();
+ }
+
++void KateMainWindow::slotNewToolbarConfig()
++{
++ applyMainWindowSettings( KateApp::self()->config(), "MainWindow" );
++}
++
+ void KateMainWindow::slotFileQuit()
+ {
+ KateApp::self()->shutdownKate (this);
+@@ -607,7 +613,7 @@
+ KURL::List list;
+ list.append( m_viewManager->activeView()->getDoc()->url() );
+ QString* appname = new QString( documentOpenWith->popupMenu()->text(idx) );
+-
++
+ *appname = appname->remove('&'); //Remove a possible accelerator ... otherwise the application might not get found.
+ if ( appname->compare(i18n("Other...")) == 0 ) {
+ // display "open with" dialog
+@@ -616,19 +622,19 @@
+ KRun::run(*dlg->service(), list);
+ return;
+ }
+-
++
+ 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);
+-
++
+ if (!offers.isEmpty()) {
+ KService::Ptr app = offers.first();
+ KRun::run(*app, list);
+- }
+- else
++ }
++ else
+ KMessageBox::error(this, i18n("Application '%1' not found!").arg(appname->latin1()), i18n("Application Not Found!"));
+-
+-
++
++
+ }
+
+ void KateMainWindow::pluginHelp()
Index: kate/data/kateui.rc
===================================================================
---- kate/data/kateui.rc (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ kate/data/kateui.rc (.../branches/KDE/3.5/kdebase) (revision 492936)
-@@ -85,12 +85,12 @@
+--- kate/data/kateui.rc (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kate/data/kateui.rc (.../branches/KDE/3.5/kdebase) (revision 495788)
+@@ -1,5 +1,5 @@
+ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+-<kpartgui name="kate" version="48">
++<kpartgui name="kate" version="49">
+
+ <MenuBar noMerge="1">
+ <Menu name="file"><text>&File</text>
+@@ -78,19 +78,19 @@
+ <Action name="fullscreen" />
+ <Separator />
+ <Action name="options_configure_keybinding"/>
+- <Action name="set_configure_toolbars"/>
++ <Action name="options_configure_toolbars"/>
+ <Action name="settings_configure" />
+ </Menu>
+
<Menu name="window"><text>&Window</text>
<Action name="view_new_view" />
<Separator />
@@ -3587,10 +3907,30 @@
<Action name="view_split_vert"/>
<Action name="view_split_horiz"/>
<Action name="view_close_current_space" />
+Index: kate/data/kwriteui.rc
+===================================================================
+--- kate/data/kwriteui.rc (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kate/data/kwriteui.rc (.../branches/KDE/3.5/kdebase) (revision 495788)
+@@ -1,5 +1,5 @@
+ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+-<kpartgui name="kwrite" version="14">
++<kpartgui name="kwrite" version="15">
+
+ <MenuBar>
+ <Menu name="file" noMerge="1"><text>&File</text>
+@@ -55,7 +55,7 @@
+ <Action name="set_showPath" append="show_merge"/>
+ <DefineGroup name="show_merge" />
+ <DefineGroup name="configure_merge" append="save_merge"/>
+- <Action name="set_configure_toolbars" append="configure_merge"/>
++ <Action name="options_configure_toolbars" append="configure_merge"/>
+ <Action name="settings_configure" append="configure_merge"/>
+ <Action name="settings_choose_editor" append="save_merge"/>
+ </Menu>
Index: kate/data/kateplugin.desktop
===================================================================
---- kate/data/kateplugin.desktop (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ kate/data/kateplugin.desktop (.../branches/KDE/3.5/kdebase) (revision 492936)
+--- kate/data/kateplugin.desktop (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kate/data/kateplugin.desktop (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -70,7 +70,6 @@
Comment[uk]=Đ’Ń‚ŃƒĐťĐžĐş Kate
Comment[uz]=Kate ŃƒŃ‡ŃƒĐ˝ пНагин
@@ -3601,8 +3941,8 @@
Comment[zu]=I-Plugin ye-Kate
Index: kate/data/kate.desktop
===================================================================
---- kate/data/kate.desktop (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ kate/data/kate.desktop (.../branches/KDE/3.5/kdebase) (revision 492936)
+--- kate/data/kate.desktop (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kate/data/kate.desktop (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -62,7 +62,6 @@
GenericName[uz]=КонгаКтириНган Патн таҳрирчи
GenericName[vi]=TrĂŹnh soấn văn bản tiĂŞn tiáşżn
@@ -3621,8 +3961,8 @@
X-KDE-StartupNotify=true
Index: kate/data/kwrite.desktop
===================================================================
---- kate/data/kwrite.desktop (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ kate/data/kwrite.desktop (.../branches/KDE/3.5/kdebase) (revision 492936)
+--- kate/data/kwrite.desktop (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kate/data/kwrite.desktop (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -73,7 +73,6 @@
GenericName[vi]=TrĂŹnh soấn văn bản
GenericName[wa]=Aspougneu di tecse
@@ -3665,8 +4005,8 @@
Index: kdepasswd/kcm/kcm_useraccount.desktop
===================================================================
---- kdepasswd/kcm/kcm_useraccount.desktop (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ kdepasswd/kcm/kcm_useraccount.desktop (.../branches/KDE/3.5/kdebase) (revision 492936)
+--- kdepasswd/kcm/kcm_useraccount.desktop (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kdepasswd/kcm/kcm_useraccount.desktop (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -57,16 +57,17 @@
Name[sr at Latn]=Lozinka i korisniÄki nalog
Name[sv]=LÜsenord och användarkonto
@@ -3740,8 +4080,8 @@
Comment[zh_TW]=使用č€
資訊匂密碟ă€ĺç¨ąĺ’Œé›ťĺéƒľäťś
Index: kdepasswd/kdepasswd.desktop
===================================================================
---- kdepasswd/kdepasswd.desktop (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ kdepasswd/kdepasswd.desktop (.../branches/KDE/3.5/kdebase) (revision 492936)
+--- kdepasswd/kdepasswd.desktop (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kdepasswd/kdepasswd.desktop (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -60,11 +60,11 @@
Name[sr at Latn]=Promeni lozinku
Name[sv]=Ă„ndra lĂśsenord
@@ -3757,8 +4097,8 @@
Name[zh_TW]=攚莊密碟
Index: kpersonalizer/kpersonalizer.desktop
===================================================================
---- kpersonalizer/kpersonalizer.desktop (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ kpersonalizer/kpersonalizer.desktop (.../branches/KDE/3.5/kdebase) (revision 492936)
+--- kpersonalizer/kpersonalizer.desktop (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kpersonalizer/kpersonalizer.desktop (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -12,6 +12,7 @@
Name[be]=ĐœĐ°ĐšŃŃ‚Đ°Ń€ наŃтрОКкі працОўнага cтаНа
Name[bg]=ĐĐ°ŃтрОКки на райОтнОтО ĐźŃŃŃ‚Đž
@@ -3786,8 +4126,8 @@
Name[zu]=I-Wizard yezilungiselelo ze-Desktop
Index: kfind/kfindpart.desktop
===================================================================
---- kfind/kfindpart.desktop (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ kfind/kfindpart.desktop (.../branches/KDE/3.5/kdebase) (revision 492936)
+--- kfind/kfindpart.desktop (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kfind/kfindpart.desktop (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -68,7 +68,6 @@
Name[ven]=Todani tshipida
Name[vi]=TÏm tᝍng phần
@@ -3804,8 +4144,8 @@
Index: kfind/findpart.desktop
===================================================================
---- kfind/findpart.desktop (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ kfind/findpart.desktop (.../branches/KDE/3.5/kdebase) (revision 492936)
+--- kfind/findpart.desktop (.../tags/KDE/3.5.0/kdebase) (revision 495788)
++++ kfind/findpart.desktop (.../branches/KDE/3.5/kdebase) (revision 495788)
@@ -70,7 +70,6 @@
Name[ven]=Todani tshipida
Name[vi]=TÏm tᝍng phần
@@ -3816,8 +4156,8 @@
Name[zu]=Thola Ingxenye
Index: kfind/Kfind.desktop
===================================================================
---- kfind/Kfind.desktop (.../tags/KDE/3.5.0/kdebase) (revision 492936)
-+++ kfind/Kfind.desktop (.../branches/KDE/3.5/kdebase) (revision 492936)
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.21&r2=1.22&f=u
More information about the pld-cvs-commit
mailing list