SOURCES: kde4-kdebase-branch.diff, kde4-kdebase-runtime-branch.diff, kde4-k...

arekm arekm at pld-linux.org
Sun Apr 19 18:52:44 CEST 2009 

Author: arekm                        Date: Sun Apr 19 16:52:44 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kde4-kdebase-branch.diff (1.9 -> 1.10) , kde4-kdebase-runtime-branch.diff (1.10 -> 1.11) , kde4-kdebase-workspace-branch.diff (1.10 -> 1.11) , kde4-kdelibs-branch.diff (1.11 -> 1.12) , kde4-kdenetwork-branch.diff (1.1 -> 1.2) , kde4-kdepim-branch.diff (1.8 -> 1.9) , kde4-kdepimlibs-branch.diff (1.11 -> 1.12) , kde4-kdesdk-branch.diff (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/kde4-kdebase-branch.diff
diff -u SOURCES/kde4-kdebase-branch.diff:1.9 SOURCES/kde4-kdebase-branch.diff:1.10
--- SOURCES/kde4-kdebase-branch.diff:1.9	Sun Apr 12 23:01:42 2009
+++ SOURCES/kde4-kdebase-branch.diff	Sun Apr 19 18:52:35 2009
@@ -1,7 +1,7 @@
 Index: apps/konqueror/src/konqmainwindow.cpp
 ===================================================================
---- apps/konqueror/src/konqmainwindow.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ apps/konqueror/src/konqmainwindow.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- apps/konqueror/src/konqmainwindow.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/konqueror/src/konqmainwindow.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
 @@ -1174,10 +1174,12 @@
          if ( windowArgs.lowerWindow() || (QApplication::keyboardModifiers() & Qt::ShiftModifier))
             newtabsinfront = !newtabsinfront;
@@ -48,8 +48,8 @@
      //          << "frame names:" << view->frameNames();
 Index: apps/konqueror/src/konqtabs.cpp
 ===================================================================
---- apps/konqueror/src/konqtabs.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ apps/konqueror/src/konqtabs.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- apps/konqueror/src/konqtabs.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/konqueror/src/konqtabs.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
 @@ -266,7 +266,9 @@
  void KonqFrameTabs::setTitle( const QString &title , QWidget* sender)
  {
@@ -61,10 +61,35 @@
  }
  
  void KonqFrameTabs::setTabIcon( const KUrl &url, QWidget* sender )
+Index: apps/konqueror/settings/kio/lanbrowser.desktop
+===================================================================
+--- apps/konqueror/settings/kio/lanbrowser.desktop	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/konqueror/settings/kio/lanbrowser.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
+@@ -139,7 +139,7 @@
+ Comment[pl]=Konfiguracja przeglądania sieci lokalnej (współdzielone pliki i drukarki)
+ Comment[pt]=Configurar a navegação na rede local para as pastas e impressoras partilhadas
+ Comment[pt_BR]=Configurar a rede local navegando por pastas compartilhadas e impressoras
+-Comment[ro]=Configurează răsfoirea rețelei locale pentru dosare și imprimante pertajate
++Comment[ro]=Configurează răsfoirea rețelei locale pentru dosare și imprimante partajate
+ Comment[ru]=Настройка обзора общих папок и принтеров в локальной сети
+ Comment[sk]=Konfigurácia prehliadania zdieľaných priečinkov a tlačiarní v lokálnej sieti
+ Comment[sl]=Nastavitev brskanja po mapah in tiskalnikih, ki so v souporabi v krajevnem omrežju
+Index: apps/konqueror/settings/konqhtml/khtml_appearance.desktop
+===================================================================
+--- apps/konqueror/settings/konqhtml/khtml_appearance.desktop	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/konqueror/settings/konqhtml/khtml_appearance.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
+@@ -96,6 +96,7 @@
+ 
+ 
+ Comment=Configure how to display web pages
++Comment[bg]=Настройване как да се показват уеб страниците
+ Comment[ca]=Configura com visualitzar les pàgines web
+ Comment[cs]=Nastavit zobrazení webových stránek
+ Comment[da]=Indstil hvordan netsider skal vises
 Index: apps/kfind/kfwin.cpp
 ===================================================================
---- apps/kfind/kfwin.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ apps/kfind/kfwin.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- apps/kfind/kfwin.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/kfind/kfwin.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
 @@ -80,7 +80,7 @@
    setText(5, matchingLine);
  
@@ -76,8 +101,8 @@
  KfFileLVI::~KfFileLVI()
 Index: apps/kfind/kquery.cpp
 ===================================================================
---- apps/kfind/kquery.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ apps/kfind/kquery.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- apps/kfind/kquery.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/kfind/kquery.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
 @@ -79,11 +79,9 @@
    if(m_useLocate) //use "locate" instead of the internal search method
    {
@@ -103,8 +128,8 @@
  
 Index: apps/kfind/kfinddlg.cpp
 ===================================================================
---- apps/kfind/kfinddlg.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ apps/kfind/kfinddlg.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- apps/kfind/kfinddlg.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/kfind/kfinddlg.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
 @@ -74,7 +74,9 @@
  
    connect(win ,SIGNAL(resultSelected(bool)),
@@ -132,8 +157,8 @@
  void KfindDlg::setProgressMsg(const QString &msg)
 Index: apps/kfind/kfinddlg.h
 ===================================================================
---- apps/kfind/kfinddlg.h	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ apps/kfind/kfinddlg.h	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- apps/kfind/kfinddlg.h	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/kfind/kfinddlg.h	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
 @@ -34,7 +34,6 @@
    void setProgressMsg(const QString &);
  
@@ -153,8 +178,8 @@
    void resultSelected(bool);
 Index: apps/dolphin/src/columnviewsettingspage.h
 ===================================================================
---- apps/dolphin/src/columnviewsettingspage.h	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ apps/dolphin/src/columnviewsettingspage.h	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- apps/dolphin/src/columnviewsettingspage.h	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/dolphin/src/columnviewsettingspage.h	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
 @@ -53,6 +53,12 @@
      void loadSettings();
  
@@ -168,10 +193,87 @@
      IconSizeGroupBox* m_iconSizeGroupBox;
      DolphinFontRequester* m_fontRequester;
      KComboBox* m_textWidthBox;
+Index: apps/dolphin/src/dolphinview.cpp
+===================================================================
+--- apps/dolphin/src/dolphinview.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/dolphin/src/dolphinview.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
+@@ -1095,18 +1095,20 @@
+ 
+ void DolphinView::restoreCurrentItem()
+ {
+-    const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_currentItemUrl);
+-    if (dirIndex.isValid()) {
+-        const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+-        QAbstractItemView* view = itemView();
+-        const bool clearSelection = !hasSelection();
+-        view->setCurrentIndex(proxyIndex);
+-        if (clearSelection) {
+-            view->clearSelection();
++    if (!m_currentItemUrl.isEmpty()) {
++        const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_currentItemUrl);
++        if (dirIndex.isValid()) {
++            const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
++            QAbstractItemView* view = itemView();
++            const bool clearSelection = !hasSelection();
++            view->setCurrentIndex(proxyIndex);
++            if (clearSelection) {
++                view->clearSelection();
++            }
+         }
++        m_currentItemUrl.clear();
+     }
+ }
+-
+ void DolphinView::enterDir(const QModelIndex& index, QAbstractItemView* view)
+ {
+     // Deleting a view that is the root of a drag operation is not allowed, otherwise
+Index: apps/dolphin/src/dolphinpart.cpp
+===================================================================
+--- apps/dolphin/src/dolphinpart.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/dolphin/src/dolphinpart.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
+@@ -331,10 +331,7 @@
+ {
+     // TODO: Check issue N176832 for the missing QAIV signal; task 177399 - maybe this code
+     // should be moved into DolphinPart::slotItemTriggered()
+-    KFileItem item(S_IFDIR, (mode_t)-1, url);
+-    KParts::OpenUrlArguments args;
+-    args.setMimeType(item.mimetype());
+-    emit m_extension->createNewWindow(url, args);
++    emit m_extension->createNewWindow(url);
+ }
+ 
+ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
+Index: apps/dolphin/src/dolphinpart.desktop
+===================================================================
+--- apps/dolphin/src/dolphinpart.desktop	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/dolphin/src/dolphinpart.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
+@@ -178,7 +178,7 @@
+ Name[ar]=تفاصيل
+ Name[as]=বিৱৰণ
+ Name[be at latin]=Detali
+-Name[bg]=Подробности
++Name[bg]=Подробно
+ Name[bn]=বিস্তারিত
+ Name[bn_IN]=বিবরণ
+ Name[ca]=Detalls
+Index: apps/dolphin/src/infosidebarpage.cpp
+===================================================================
+--- apps/dolphin/src/infosidebarpage.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/dolphin/src/infosidebarpage.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
+@@ -541,7 +541,8 @@
+     m_nameLabel->setFont(font);
+     m_nameLabel->setAlignment(Qt::AlignHCenter);
+     m_nameLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+-
++    m_nameLabel->setMaximumWidth(KIconLoader::SizeEnormous);
++    
+     // preview
+     m_preview = new PixmapViewer(this);
+     m_preview->setMinimumWidth(KIconLoader::SizeEnormous + KIconLoader::SizeMedium);
 Index: apps/dolphin/src/columnviewsettingspage.cpp
 ===================================================================
---- apps/dolphin/src/columnviewsettingspage.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ apps/dolphin/src/columnviewsettingspage.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- apps/dolphin/src/columnviewsettingspage.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/dolphin/src/columnviewsettingspage.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
 @@ -113,9 +113,8 @@
      settings->setItalicFont(font.italic());
      settings->setFontWeight(font.weight());
@@ -196,8 +298,8 @@
  #include "columnviewsettingspage.moc"
 Index: apps/dolphin/src/dolphinmodel.cpp
 ===================================================================
---- apps/dolphin/src/dolphinmodel.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ apps/dolphin/src/dolphinmodel.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- apps/dolphin/src/dolphinmodel.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/dolphin/src/dolphinmodel.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
 @@ -248,7 +248,8 @@
                  Q_ASSERT(false);
              }
@@ -210,8 +312,8 @@
                  } else if (daysDistance <= 7) {
 Index: apps/dolphin/src/dolphincolumnwidget.cpp
 ===================================================================
---- apps/dolphin/src/dolphincolumnwidget.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ apps/dolphin/src/dolphincolumnwidget.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- apps/dolphin/src/dolphincolumnwidget.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/dolphin/src/dolphincolumnwidget.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
 @@ -517,6 +517,8 @@
  void DolphinColumnWidget::deactivate()
  {
@@ -223,8 +325,8 @@
      // does not forward the single vs. doubleclick to it yet (KDE 4.1?). Hence it is
 Index: apps/lib/konq/konq_menuactions.cpp
 ===================================================================
---- apps/lib/konq/konq_menuactions.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ apps/lib/konq/konq_menuactions.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- apps/lib/konq/konq_menuactions.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/lib/konq/konq_menuactions.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
 @@ -185,7 +185,7 @@
      const KFileItemList items = d->m_info.items();
      const KFileItem firstItem = items.first();
@@ -256,8 +358,8 @@
              const KConfigGroup cfg = desktopFile.desktopGroup();
 Index: apps/kinfocenter/pci/kcm_pci.cpp
 ===================================================================
---- apps/kinfocenter/pci/kcm_pci.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ apps/kinfocenter/pci/kcm_pci.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- apps/kinfocenter/pci/kcm_pci.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/kinfocenter/pci/kcm_pci.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
 @@ -80,6 +80,11 @@
  void KCMPci::load() {
  	kDebug() << "Loading PCI information..." << endl;
@@ -272,8 +374,8 @@
  QString KCMPci::quickHelp() const {
 Index: apps/kinfocenter/base/info_fbsd.cpp
 ===================================================================
---- apps/kinfocenter/base/info_fbsd.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ apps/kinfocenter/base/info_fbsd.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- apps/kinfocenter/base/info_fbsd.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/kinfocenter/base/info_fbsd.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
 @@ -89,7 +89,7 @@
  		new QTreeWidgetItem(tree, list);
  
@@ -285,8 +387,8 @@
  	return true;
 Index: apps/plasma/applets/folderview/proxymodel.cpp
 ===================================================================
---- apps/plasma/applets/folderview/proxymodel.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ apps/plasma/applets/folderview/proxymodel.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- apps/plasma/applets/folderview/proxymodel.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/plasma/applets/folderview/proxymodel.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
 @@ -25,7 +25,7 @@
  
  
@@ -298,8 +400,8 @@
  }
 Index: apps/plasma/applets/folderview/dialog.h
 ===================================================================
---- apps/plasma/applets/folderview/dialog.h	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ apps/plasma/applets/folderview/dialog.h	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- apps/plasma/applets/folderview/dialog.h	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/plasma/applets/folderview/dialog.h	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
 @@ -35,14 +35,14 @@
  class Dialog : public QWidget
  {
@@ -319,8 +421,8 @@
  
 Index: apps/plasma/applets/folderview/dialog.cpp
 ===================================================================
---- apps/plasma/applets/folderview/dialog.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ apps/plasma/applets/folderview/dialog.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- apps/plasma/applets/folderview/dialog.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956243)
++++ apps/plasma/applets/folderview/dialog.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956243)
 @@ -36,12 +36,12 @@
  #endif
  
@@ -362,6 +464,8 @@
 ===================================================================
 Index: runtime/kcontrol/locale/localetime.cpp
 ===================================================================
+Index: runtime/phonon/kcm/xine/kcm_phononxine.desktop
+===================================================================
 Index: runtime/platforms/win/kwinstartmenu/winstartmenu.desktop
 ===================================================================
 Index: runtime/kioslave/info/info.cc
@@ -376,10 +480,20 @@
 ===================================================================
 Index: runtime/kurifilter-plugins/ikws/searchproviders/technoratitags.desktop
 ===================================================================
+Index: workspace/kcontrol/randr/krandrtray.desktop
+===================================================================
+Index: workspace/kcontrol/randr/randr.desktop
+===================================================================
 Index: workspace/kcontrol/keys/keys.desktop
 ===================================================================
+Index: workspace/solid/kcm/kcm_solid.desktop
+===================================================================
+Index: workspace/powerdevil/daemon/PollSystemLoader.cpp
+===================================================================
 Index: workspace/powerdevil/daemon/PowerDevilDaemon.cpp
 ===================================================================
+Index: workspace/powerdevil/daemon/PollSystemLoader.h
+===================================================================
 Index: workspace/powerdevil/daemon/PowerDevilDaemon.h
 ===================================================================
 Index: workspace/powerdevil/kcmodule/PowerDevilKCM.cpp
@@ -394,6 +508,8 @@
 ===================================================================
 Index: workspace/libs/kephal/xrandr12/randrcrtc.cpp
 ===================================================================
+Index: workspace/libs/taskmanager/task.cpp
+===================================================================
 Index: workspace/kscreensaver/libkscreensaver/kscreensaver.h
 ===================================================================
 Index: workspace/kscreensaver/libkscreensaver/kscreensaver.cpp
@@ -406,6 +522,8 @@
 ===================================================================
 Index: workspace/kwin/effects/magiclamp.h
 ===================================================================
+Index: workspace/kwin/effects/desktopgrid.desktop
+===================================================================
 Index: workspace/kwin/main.cpp
 ===================================================================
 Index: workspace/kdm/kfrontend/sessions/icewm.desktop
@@ -416,13 +534,23 @@
 ===================================================================
 Index: workspace/plasma/shells/desktop/panelview.cpp
 ===================================================================
+Index: workspace/plasma/runners/locations/locationrunner.cpp
+===================================================================
+Index: workspace/plasma/tools/desktopthemedetails/desktopthemedetails.desktop
+===================================================================
 Index: workspace/plasma/applets/calendar/calendar.h
 ===================================================================
 Index: workspace/plasma/applets/calendar/calendar.cpp
 ===================================================================
+Index: workspace/plasma/applets/system-monitor/net.cpp
+===================================================================
 Index: workspace/plasma/applets/battery/battery.cpp
 ===================================================================
+Index: workspace/plasma/applets/kickoff/ui/launcher.cpp
+===================================================================
 Index: workspace/plasma/scriptengines/webkit/plasma-packagestructure-dashboard.desktop
 ===================================================================
 Index: workspace/plasma/scriptengines/webkit/plasma-scriptengine-applet-dashboard.desktop
+===================================================================
+Index: workspace/plasma/scriptengines/javascript/tests/script-digital-clock/metadata.desktop
 ===================================================================

================================================================
Index: SOURCES/kde4-kdebase-runtime-branch.diff
diff -u SOURCES/kde4-kdebase-runtime-branch.diff:1.10 SOURCES/kde4-kdebase-runtime-branch.diff:1.11
--- SOURCES/kde4-kdebase-runtime-branch.diff:1.10	Sun Apr 12 23:01:43 2009
+++ SOURCES/kde4-kdebase-runtime-branch.diff	Sun Apr 19 18:52:36 2009
@@ -1,5 +1,5 @@
---- runtime/knotify/notifybyktts.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ runtime/knotify/notifybyktts.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- runtime/knotify/notifybyktts.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ runtime/knotify/notifybyktts.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
 @@ -17,16 +17,18 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  
@@ -65,8 +65,8 @@
  	kspeech.call(QDBus::NoBlock, "say", say, 0);
  
  	finished(id);
---- runtime/knotify/notifybyktts.h	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ runtime/knotify/notifybyktts.h	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- runtime/knotify/notifybyktts.h	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ runtime/knotify/notifybyktts.h	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
 @@ -29,15 +29,17 @@
  #include <QDBusInterface>
  
@@ -94,8 +94,8 @@
  };
  
  #endif
---- runtime/knotify/notifybyexecute.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ runtime/knotify/notifybyexecute.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- runtime/knotify/notifybyexecute.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ runtime/knotify/notifybyexecute.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
 @@ -21,7 +21,7 @@
  #include "notifybyexecute.h"
  
@@ -118,8 +118,8 @@
  	}
  	
  	finish( id );
---- runtime/knotify/notifybypopup.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ runtime/knotify/notifybypopup.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- runtime/knotify/notifybypopup.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ runtime/knotify/notifybypopup.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
 @@ -51,7 +51,7 @@
  	m_dbusServiceExists = interface && interface->isServiceRegistered(dbusServiceName);
  
@@ -129,8 +129,8 @@
  
  	// to catch register/unregister events from service in runtime
  	connect(interface, SIGNAL(serviceOwnerChanged(const QString&, const QString&, const QString&)),
---- runtime/kcontrol/locale/localetime.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ runtime/kcontrol/locale/localetime.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- runtime/kcontrol/locale/localetime.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ runtime/kcontrol/locale/localetime.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
 @@ -285,7 +285,11 @@
      connect (m_comboWeekDayOfPray, SIGNAL(activated(int)),
               this, SLOT(slotWeekDayOfPrayChanged(int)));
@@ -144,8 +144,18 @@
  
      updateWeekDayNames();
  }
---- runtime/platforms/win/kwinstartmenu/winstartmenu.desktop	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ runtime/platforms/win/kwinstartmenu/winstartmenu.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- runtime/phonon/kcm/xine/kcm_phononxine.desktop	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ runtime/phonon/kcm/xine/kcm_phononxine.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
+@@ -32,6 +32,7 @@
+ Comment[af]=Xine Backend konfigurasie
+ Comment[be]=Настаўленне унутранага карыстання Xine
+ Comment[be at latin]=Настаўленне унутранага карыстання Xine
++Comment[bg]=Настройване Xine
+ Comment[bn]=জাইন ব্যাক-এন্ড কনফিগারেশন
+ Comment[bn_IN]=Xine ব্যাক-এন্ডের কনফিগারেশন
+ Comment[ca]=Configuració del dorsal del Xine
+--- runtime/platforms/win/kwinstartmenu/winstartmenu.desktop	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ runtime/platforms/win/kwinstartmenu/winstartmenu.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
 @@ -3,6 +3,7 @@
  Name=KDED Windows Start Menu Module
  Name[ar]=قائمة K نمط وندوز
@@ -154,8 +164,8 @@
  Name[bn_IN]=KDED Windows Start Menu মডিউল
  Name[ca]=Mòdul del menú d'inici del Windows del KDED
  Name[cs]=Modul KDED pro startovní nabídku
---- runtime/kioslave/info/info.cc	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ runtime/kioslave/info/info.cc	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- runtime/kioslave/info/info.cc	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ runtime/kioslave/info/info.cc	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
 @@ -38,7 +38,7 @@
  	} else {
  		QString missing =m_infoScript.isNull() ?  "kio_info/kde-info2html" : "kio_info/kde-info2html.conf";
@@ -165,14 +175,14 @@
  	}
  	error( KIO::ERR_CANNOT_LAUNCH_PROCESS, errorStr );
  	exit();
---- runtime/kioslave/info/Messages.sh	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ runtime/kioslave/info/Messages.sh	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- runtime/kioslave/info/Messages.sh	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ runtime/kioslave/info/Messages.sh	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
 @@ -1,2 +1,2 @@
  #! /usr/bin/env bash
 -$XGETTEXT *.cpp -o $podir/kio_info.pot
 +$XGETTEXT *.cc -o $podir/kio_info.pot
---- runtime/kstyles/themes/qtwindows.themerc	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ runtime/kstyles/themes/qtwindows.themerc	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- runtime/kstyles/themes/qtwindows.themerc	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ runtime/kstyles/themes/qtwindows.themerc	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
 @@ -18,7 +18,7 @@
  Comment[ar]=أسلوب مدمجة نمط مايكروسوفت وندوز 9x
  Comment[be]=Убудаваны стыль Windows 9x
@@ -182,8 +192,8 @@
  Comment[ca]=Estil integrat Windows 9x sense temes
  Comment[cs]=Zabudovaný styl Windows 9x bez motivu
  Comment[csb]=Wbùdowóny sztél szlachùjący za Windows 9x
---- runtime/kstyles/oxygen/oxygen.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ runtime/kstyles/oxygen/oxygen.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- runtime/kstyles/oxygen/oxygen.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ runtime/kstyles/oxygen/oxygen.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
 @@ -3021,6 +3021,9 @@
          case PM_DefaultLayoutSpacing:
              return 4; // qcommon is 6
@@ -194,8 +204,8 @@
          case PM_DefaultFrameWidth:
              if (qobject_cast<const QLineEdit*>(widget))
                  return 4;
---- runtime/kstyles/oxygen/CMakeLists.txt	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ runtime/kstyles/oxygen/CMakeLists.txt	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- runtime/kstyles/oxygen/CMakeLists.txt	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ runtime/kstyles/oxygen/CMakeLists.txt	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
 @@ -15,7 +15,7 @@
  
  kde4_add_plugin(oxygen ${oxygen_PART_SRCS})
@@ -205,8 +215,8 @@
  
  install(TARGETS oxygen  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles/ )
  
---- runtime/kurifilter-plugins/ikws/searchproviders/technoratitags.desktop	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ runtime/kurifilter-plugins/ikws/searchproviders/technoratitags.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- runtime/kurifilter-plugins/ikws/searchproviders/technoratitags.desktop	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ runtime/kurifilter-plugins/ikws/searchproviders/technoratitags.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
 @@ -34,6 +34,7 @@
  Name[kn]=ಟೆಕ್ನೋರೆಟಿ ತಲೆಚೀಟಿಗಳು (ಟಾಗ್ಸ್)
  Name[ko]=Technorati 태그

================================================================
Index: SOURCES/kde4-kdebase-workspace-branch.diff
diff -u SOURCES/kde4-kdebase-workspace-branch.diff:1.10 SOURCES/kde4-kdebase-workspace-branch.diff:1.11
--- SOURCES/kde4-kdebase-workspace-branch.diff:1.10	Sun Apr 12 23:01:43 2009
+++ SOURCES/kde4-kdebase-workspace-branch.diff	Sun Apr 19 18:52:36 2009
@@ -1,5 +1,36 @@
---- workspace/kcontrol/keys/keys.desktop	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ workspace/kcontrol/keys/keys.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- workspace/kcontrol/randr/krandrtray.desktop	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ workspace/kcontrol/randr/krandrtray.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
+@@ -20,7 +20,7 @@
+ GenericName[ar]=إعادة تحجيم ودوران الشاشة
+ GenericName[be]=Змена памераў экрана і перагортванне
+ GenericName[be at latin]=Aplet dla źmieny pamieraŭ i pavarotu ekrana
+-GenericName[bg]=Размер и ротация на екрана
++GenericName[bg]=Големина и завъртане на екрана
+ GenericName[bn]=পর্দা মাপবদল ও আবর্তন
+ GenericName[bn_IN]=পর্দা মাপবদল ও আবর্তন
+ GenericName[br]=Adventañ ha treiñ ar skramm
+--- workspace/kcontrol/randr/randr.desktop	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ workspace/kcontrol/randr/randr.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
+@@ -16,7 +16,7 @@
+ Name[ar]=الحجم والاتجاه
+ Name[be]=Памеры і арыентацыя
+ Name[be at latin]=Pamiery j pavarot
+-Name[bg]=Размер и завъртане на екрана
++Name[bg]=Големина и завъртане на екрана
+ Name[bn]=আকৃতি এবং দিশা
+ Name[bn_IN]=মাপ ও দিশা
+ Name[br]=Ment ha reteradur
+@@ -97,7 +97,7 @@
+ Comment[ar]=غيّر حجم العرض وأدِره
+ Comment[be]=Змяняе памеры і перагортвае ваш экран
+ Comment[be at latin]=Źmianieńnie pamieraŭ i pavarot ekrana
+-Comment[bg]=Настройване на размера и завъртането на екрана
++Comment[bg]=Настройване на големината и завъртането на екрана
+ Comment[bn]=আপনার ডিসপ্লের আকৃতি এবং দিশা পরিবর্তন করুন
+ Comment[bn_IN]=আপনার ডিসপ্লের আকৃতি এবং দিশা পরিবর্তন করুন
+ Comment[br]=Adventañ ha treiñ ho skramm
+--- workspace/kcontrol/keys/keys.desktop	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ workspace/kcontrol/keys/keys.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
 @@ -60,7 +60,7 @@
  Name[pt]=Atalhos Globais do Teclado
  Name[pt_BR]=Atalhos de teclado globais
@@ -9,8 +40,47 @@
  Name[si]=ගෝලීය යතුරුපුවරු කෙටිමං
  Name[sk]=Globálne klávesové skratky
  Name[sl]=Globalne tipkovnične bližnjice
---- workspace/powerdevil/daemon/PowerDevilDaemon.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
-+++ workspace/powerdevil/daemon/PowerDevilDaemon.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+--- workspace/solid/kcm/kcm_solid.desktop	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ workspace/solid/kcm/kcm_solid.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
+@@ -12,6 +12,7 @@
+ Name[ar]=العتاد
+ Name[be]=Прылады
+ Name[be at latin]=Aparatura
++Name[bg]=Хардуер
+ Name[bn]=হার্ডওয়্যার
+ Name[bn_IN]=হার্ডওয়্যার
+ Name[br]=Periantel
+--- workspace/powerdevil/daemon/PollSystemLoader.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ workspace/powerdevil/daemon/PollSystemLoader.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
+@@ -58,20 +58,21 @@
+     tpl->deleteLater();
+ }
+ 
+-QMap<AbstractSystemPoller::PollingType, QString> PollSystemLoader::getAvailableSystems()
++QHash<AbstractSystemPoller::PollingType, QString> PollSystemLoader::getAvailableSystems()
+ {
+     // Cached
+     return m_availableSystems;
+ }
+ 
+-QMap<int, QString> PollSystemLoader::getAvailableSystemsAsInt()
++QHash<int, QString> PollSystemLoader::getAvailableSystemsAsInt()
+ {
+     // Cached
+ 
+-    QMap<int, QString> retlist;
++    QHash<int, QString> retlist;
+ 
+-    foreach(const AbstractSystemPoller::PollingType &ent, m_availableSystems.keys()) {
+-        retlist[(int) ent] = m_availableSystems[ent];
++    QHash<AbstractSystemPoller::PollingType, QString>::const_iterator i;
++    for (i = m_availableSystems.constBegin(); i != m_availableSystems.constEnd(); ++i) {
++        retlist[(int) i.key()] = i.value();
+     }
+ 
+     return retlist;
+--- workspace/powerdevil/daemon/PowerDevilDaemon.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 956244)
++++ workspace/powerdevil/daemon/PowerDevilDaemon.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 956244)
 @@ -63,8 +63,7 @@
  #include <X11/Xatom.h>
  #include <X11/Xutil.h>
@@ -61,6 +131,15 @@
       *  just in case.
       *
       *   d->kscreenSaverIface = new OrgKdeScreensaverInterface("org.freedesktop.ScreenSaver", "/ScreenSaver",
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdebase-branch.diff?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdebase-runtime-branch.diff?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdebase-workspace-branch.diff?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdelibs-branch.diff?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdenetwork-branch.diff?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdepim-branch.diff?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdepimlibs-branch.diff?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdesdk-branch.diff?r1=1.2&r2=1.3&f=u

More information about the pld-cvs-commit mailing list