Hello community,

here is the log from the commit of package kdesdk4 for openSUSE:Factory
checked in at Thu Mar 10 11:14:57 CET 2011.



--------
--- KDE/kdesdk4/kdesdk4.changes 2011-02-17 15:22:31.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdesdk4/kdesdk4.changes        2011-03-08 
14:10:18.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Mar  8 14:10:17 CET 2011 - dmuel...@suse.de
+
+- update to 4.6.1
+  * Bugfixes over KDE 4.6.0
+  *  see http://kde.org/announcements/changelogs/changelog4_6_0to4_6_1.php for 
details
+  
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  kdesdk-4.6.0.tar.bz2

New:
----
  kdesdk-4.6.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdesdk4.spec ++++++
--- /var/tmp/diff_new_pack.SN16I2/_old  2011-03-10 10:33:48.000000000 +0100
+++ /var/tmp/diff_new_pack.SN16I2/_new  2011-03-10 10:33:48.000000000 +0100
@@ -27,8 +27,8 @@
 Group:          System/GUI/KDE
 Summary:        KDE SDK Package
 Url:            http://www.kde.org/
-Version:        4.6.0
-Release:        6
+Version:        4.6.1
+Release:        1
 BuildRequires:  db-devel flex kdebase4-workspace-devel >= %version 
libkonq-devel strigi
 BuildRequires:  hunspell-devel libkdepimlibs4-devel libqca2-devel 
oxygen-icon-theme subversion-devel
 Source0:        kdesdk-%version.tar.bz2
@@ -119,11 +119,11 @@
 
 %post
 /sbin/ldconfig
-/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+%_kde4_bindir/update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun
 /sbin/ldconfig
-/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+%_kde4_bindir/update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %clean
   rm -rf $RPM_BUILD_ROOT
@@ -203,11 +203,11 @@
 
 %post -n okteta
 /sbin/ldconfig
-/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+%_kde4_bindir/update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun -n okteta
 /sbin/ldconfig
-/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+%_kde4_bindir/update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %files -n okteta -f filelists/okteta
 %defattr(-,root,root)

++++++ kdesdk-4.6.0.tar.bz2 -> kdesdk-4.6.1.tar.bz2 ++++++
Files old/kdesdk-4.6.0/doc/cervisia/index.cache.bz2 and 
new/kdesdk-4.6.1/doc/cervisia/index.cache.bz2 differ
Files old/kdesdk-4.6.0/doc/kapptemplate/index.cache.bz2 and 
new/kdesdk-4.6.1/doc/kapptemplate/index.cache.bz2 differ
Files old/kdesdk-4.6.0/doc/kate/index.cache.bz2 and 
new/kdesdk-4.6.1/doc/kate/index.cache.bz2 differ
Files old/kdesdk-4.6.0/doc/kcachegrind/index.cache.bz2 and 
new/kdesdk-4.6.1/doc/kcachegrind/index.cache.bz2 differ
Files old/kdesdk-4.6.0/doc/kompare/index.cache.bz2 and 
new/kdesdk-4.6.1/doc/kompare/index.cache.bz2 differ
Files old/kdesdk-4.6.0/doc/okteta/index.cache.bz2 and 
new/kdesdk-4.6.1/doc/okteta/index.cache.bz2 differ
Files old/kdesdk-4.6.0/doc/scripts/kdesrc-build/index.cache.bz2 and 
new/kdesdk-4.6.1/doc/scripts/kdesrc-build/index.cache.bz2 differ
Files old/kdesdk-4.6.0/doc/umbrello/index.cache.bz2 and 
new/kdesdk-4.6.1/doc/umbrello/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdesdk-4.6.0/kate/data/kateui.rc 
new/kdesdk-4.6.1/kate/data/kateui.rc
--- old/kdesdk-4.6.0/kate/data/kateui.rc        2011-01-19 23:07:46.000000000 
+0100
+++ new/kdesdk-4.6.1/kate/data/kateui.rc        2011-02-25 22:47:43.000000000 
+0100
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kate" version="66">
+<kpartgui name="kate" version="69">
 
 <MenuBar>
   <Menu name="file" noMerge="1"><text>&amp;File</text>
@@ -46,6 +46,8 @@
   <Menu name="view"><text>&amp;View</text>
     <Action name="view_new_view" />
     <Separator />
+    <DefineGroup name="switch_document" />
+    <Separator />
     <Menu name="view-split"><text>Split View</text>
       <Action name="go_prev_split_view"/>
       <Action name="go_next_split_view"/>
@@ -99,8 +101,7 @@
   <Action name="file_new" group="file_open" />
   <Action name="file_open" group="file_open" />
   <Separator />
-  <Action name="go_back" />
-  <Action name="go_forward" />
+  <DefineGroup name="switch_document" />
   <Separator />
   <DefineGroup name="file_operations" />
   <Separator />
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdesdk-4.6.0/kate/plugins/filetree/katefiletreemodel.cpp 
new/kdesdk-4.6.1/kate/plugins/filetree/katefiletreemodel.cpp
--- old/kdesdk-4.6.0/kate/plugins/filetree/katefiletreemodel.cpp        
2011-01-19 23:07:44.000000000 +0100
+++ new/kdesdk-4.6.1/kate/plugins/filetree/katefiletreemodel.cpp        
2011-02-25 22:47:43.000000000 +0100
@@ -941,8 +941,16 @@
       continue;
     }
 
-    if(name.startsWith(path) && item->flag(ProxyItem::Dir))
+    // make sure we're actually matching against the right dir,
+    // previously the check below would match /foo/xy against /foo/x
+    // and return /foo/x rather than /foo/xy
+    // this seems a bit hackish, but is the simplest way to solve the
+    // current issue.
+    path += "/";
+
+    if(name.startsWith(path) && item->flag(ProxyItem::Dir)) {
       return (ProxyItemDir*)item;
+    }
   }
 
   return 0;
@@ -1058,7 +1066,8 @@
       m_root->addChild(new_root);
     endInsertRows();
     
-    QModelIndex new_root_index = createIndex(new_root->row(), 0, new_root);
+    // same fix as in findRootNode, try to match a full dir, instead of a 
partial path
+    base += "/";
     
     // try and merge existing roots with the new root node.
     kDebug(debugArea()) << "attempting to merge some existing roots";
@@ -1074,16 +1083,19 @@
 
         kDebug(debugArea()) << "adding" << root << "to" << new_root;
         //beginInsertRows(new_root_index, new_root->childCount(), 
new_root->childCount());
-          new_root->addChild(root);
+          // this can't use new_root->addChild directly, or it'll potentially 
miss a bunch of subdirs
+          insertItemInto(new_root, root);
         //endInsertRows();
       }
     }
 
     // add item to new root
     kDebug(debugArea()) << "adding" << item << "to" << new_root;
-    //beginInsertRows(new_root_index, new_root->childCount(), 
new_root->childCount());
+    // have to call begin/endInsertRows here, or the new item won't show up.
+    QModelIndex new_root_index = createIndex(new_root->row(), 0, new_root);
+    beginInsertRows(new_root_index, new_root->childCount(), 
new_root->childCount());
       new_root->addChild(item);
-    //endInsertRows();
+    endInsertRows();
 
   }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdesdk-4.6.0/kate/plugins/filetree/katefiletreeplugin.cpp 
new/kdesdk-4.6.1/kate/plugins/filetree/katefiletreeplugin.cpp
--- old/kdesdk-4.6.0/kate/plugins/filetree/katefiletreeplugin.cpp       
2011-01-19 23:07:44.000000000 +0100
+++ new/kdesdk-4.6.1/kate/plugins/filetree/katefiletreeplugin.cpp       
2011-02-25 22:47:43.000000000 +0100
@@ -45,7 +45,7 @@
 //END Includes
 
 K_PLUGIN_FACTORY(KateFileTreeFactory, registerPlugin<KateFileTreePlugin>();)
-K_EXPORT_PLUGIN(KateFileTreeFactory(KAboutData("katefiletreeplugin","katefiletreeplugin",ki18n("Document
 Tree"), "0.1", ki18n("Show open documents in a tree"), 
KAboutData::License_LGPL_V2)) )
+K_EXPORT_PLUGIN(KateFileTreeFactory(KAboutData("filetree","katefiletreeplugin",ki18n("Document
 Tree"), "0.1", ki18n("Show open documents in a tree"), 
KAboutData::License_LGPL_V2)) )
 
 //BEGIN KateFileTreePlugin
 KateFileTreePlugin::KateFileTreePlugin(QObject* parent, const QList<QVariant>&)
@@ -80,7 +80,7 @@
 {
   if(number != 0)
     return QString();
-  
+
   return QString(i18n("Tree View"));
 }
 
@@ -88,7 +88,7 @@
 {
   if(number != 0)
     return QString();
-    
+
   return QString(i18n("Configure Tree View"));
 }
 
@@ -96,7 +96,7 @@
 {
   if(number != 0)
     return KIcon();
-    
+
   return KIcon("view-list-tree");
 }
 
@@ -147,28 +147,28 @@
 
 //BEGIN KateFileTreePluginView
 KateFileTreePluginView::KateFileTreePluginView (Kate::MainWindow *mainWindow, 
KateFileTreePlugin *plug)
-: Kate::PluginView (mainWindow), KXMLGUIClient(), m_plug(plug)
+: Kate::PluginView (mainWindow), 
Kate::XMLGUIClient(KateFileTreeFactory::componentData()), m_plug(plug)
 {
   // init console
   kDebug(debugArea()) << "BEGIN: mw:" << mainWindow;
-  
+
   QWidget *toolview = mainWindow->createToolView 
("kate_private_plugin_katefiletreeplugin", Kate::MainWindow::Left, 
SmallIcon("document-open"), i18n("Documents"));
   m_fileTree = new KateFileTree(toolview);
   m_fileTree->setSortingEnabled(true);
-  
+
   connect(m_fileTree, SIGNAL(activateDocument(KTextEditor::Document*)),
           this, SLOT(activateDocument(KTextEditor::Document*)));
 
   connect(m_fileTree, SIGNAL(viewModeChanged(bool)), this, 
SLOT(viewModeChanged(bool)));
   connect(m_fileTree, SIGNAL(sortRoleChanged(int)), this, 
SLOT(sortRoleChanged(int)));
-  
+
   m_documentModel = new KateFileTreeModel(this);
   m_proxyModel = new KateFileTreeProxyModel(this);
   m_proxyModel->setSourceModel(m_documentModel);
   m_proxyModel->setDynamicSortFilter(true);
-  
+
   Kate::DocumentManager *dm = Kate::application()->documentManager();
-  
+
   connect(dm, SIGNAL(documentCreated(KTextEditor::Document *)),
           m_documentModel, SLOT(documentOpened(KTextEditor::Document *)));
   connect(dm, SIGNAL(documentWillBeDeleted(KTextEditor::Document *)),
@@ -178,9 +178,9 @@
           this, SLOT(documentOpened(KTextEditor::Document *)));
   connect(dm, SIGNAL(documentWillBeDeleted(KTextEditor::Document *)),
           this, SLOT(documentClosed(KTextEditor::Document *)));
-          
+
   m_fileTree->setModel(m_proxyModel);
-  
+
   m_fileTree->setDragEnabled(false);
   m_fileTree->setDragDropMode(QAbstractItemView::InternalMove);
   m_fileTree->setDropIndicatorShown(false);
@@ -188,34 +188,25 @@
   m_fileTree->setSelectionMode(QAbstractItemView::SingleSelection);
 
   connect( m_fileTree->selectionModel(), SIGNAL(currentChanged(const 
QModelIndex&, const QModelIndex&)), m_fileTree, SLOT(slotCurrentChanged(const 
QModelIndex&, const QModelIndex&)));
-  
+
   connect(mainWindow, SIGNAL(viewChanged()), this, SLOT(viewChanged()));
 
-  setComponentData( KComponentData("kate") );
-  setXMLFile(QString::fromLatin1("plugins/filetree/ui.rc"));
-  
   KAction *show_active = 
actionCollection()->addAction("filetree_show_active_document", mainWindow);
   show_active->setText(i18n("&Show Active"));
   show_active->setIcon(KIcon("folder-sync"));
   show_active->setShortcut( QKeySequence(Qt::ALT+Qt::Key_A), 
KAction::DefaultShortcut );
   connect( show_active, SIGNAL( triggered(bool) ), this, SLOT( 
showActiveDocument() ) );
 
-  KAction *prev_document = 
actionCollection()->addAction("filetree_prev_document", mainWindow);
-  prev_document->setText(i18n("&Prev Document"));
-  prev_document->setIcon(KIcon("go-previous"));
-  prev_document->setShortcut( QKeySequence(Qt::ALT+Qt::Key_Left), 
KAction::DefaultShortcut );
-  connect( prev_document, SIGNAL( triggered(bool) ), m_fileTree, SLOT( 
slotDocumentPrev() ) );
-  
-  KAction *next_document = 
actionCollection()->addAction("filetree_next_document", mainWindow);
-  next_document->setText(i18n("&Next Document"));
-  next_document->setIcon(KIcon("go-next"));
-  next_document->setShortcut( QKeySequence(Qt::ALT+Qt::Key_Right), 
KAction::DefaultShortcut );
-  connect( next_document, SIGNAL( triggered(bool) ), m_fileTree, SLOT( 
slotDocumentNext() ) );
-  
+  /**
+   * back + forward
+   */
+  actionCollection()->addAction( KStandardAction::Back, 
"filetree_prev_document", m_fileTree, SLOT( slotDocumentPrev() ) );
+  actionCollection()->addAction( KStandardAction::Forward, 
"filetree_next_document", m_fileTree, SLOT( slotDocumentNext() ) );
+
   mainWindow->guiFactory()->addClient(this);
-  
+
   m_proxyModel->setSortRole(Qt::DisplayRole);
-  
+
   m_proxyModel->sort(0, Qt::AscendingOrder);
   m_proxyModel->invalidate();
 }
@@ -243,7 +234,7 @@
   kDebug(debugArea()) << "open" << doc;
   connect(doc, SIGNAL(modifiedChanged(KTextEditor::Document*)),
           m_documentModel, SLOT(documentEdited(KTextEditor::Document*)));
-  
+
   m_proxyModel->invalidate();
 }
 
@@ -252,15 +243,15 @@
   kDebug(debugArea()) << "close" << doc;
   m_proxyModel->invalidate();
 }
-    
+
 void KateFileTreePluginView::viewChanged()
 {
   kDebug(debugArea()) << "BEGIN!";
-  
+
   KTextEditor::View *view = mainWindow()->activeView();
   if(!view)
     return;
-  
+
   KTextEditor::Document *doc = view->document();
   QModelIndex index = m_proxyModel->docIndex(doc);
   kDebug(debugArea()) << "selected doc=" << doc << index;
@@ -270,11 +261,11 @@
 
   // update the model on which doc is active
   m_documentModel->documentActivated(doc);
-  
+
   m_fileTree->selectionModel()->setCurrentIndex(index, 
QItemSelectionModel::ClearAndSelect);
-  
+
   m_fileTree->scrollTo(index);
-  
+
   while(index != QModelIndex()) {
     m_fileTree->expand(index);
     index = index.parent();
@@ -286,7 +277,7 @@
 void KateFileTreePluginView::setListMode(bool listMode)
 {
   kDebug(debugArea()) << "BEGIN";
-  
+
   if(listMode) {
     kDebug(debugArea()) << "listMode";
     m_documentModel->setListMode(true);
@@ -351,13 +342,13 @@
     m_hasLocalPrefs = true;
   else
     m_hasLocalPrefs = false;
-  
+
   // we chain to the global settings by using them as the defaults
   //  here in the session view config loading.
   const KateFileTreePluginSettings &defaults = m_plug->settings();
-  
+
   bool listMode = g.readEntry("listMode", defaults.listMode());
-  
+
   setListMode(listMode);
 
   int sortRole = g.readEntry("sortRole", defaults.sortRole());
@@ -377,7 +368,7 @@
     g.deleteEntry("listMode");
     g.deleteEntry("sortRole");
   }
-  
+
   g.sync();
 }
 //ENDKateFileTreePluginView
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdesdk-4.6.0/kate/plugins/filetree/katefiletreeplugin.desktop 
new/kdesdk-4.6.1/kate/plugins/filetree/katefiletreeplugin.desktop
--- old/kdesdk-4.6.0/kate/plugins/filetree/katefiletreeplugin.desktop   
2011-01-19 23:07:44.000000000 +0100
+++ new/kdesdk-4.6.1/kate/plugins/filetree/katefiletreeplugin.desktop   
2011-02-25 22:47:43.000000000 +0100
@@ -13,6 +13,7 @@
 Name[es]=Árbol de archivos
 Name[et]=Failipuu
 Name[fr]=Arborescence de fichiers
+Name[ga]=Crann Comhad
 Name[it]=Albero di file
 Name[km]=មែកធាង​របស់​ពុម្ព​អក្សរ​
 Name[nb]=Fil-tre
@@ -42,6 +43,7 @@
 Comment[es]=Muestra los documentos abiertos en un árbol
 Comment[et]=Avatud dokumentide näitamine puuna
 Comment[fr]=Affiche les documents ouverts dans une arborescence
+Comment[ga]=Taispeáin na cáipéisí oscailte i gcrann
 Comment[it]=Visualizza i documenti aperti in un albero
 Comment[km]=បើក​បង្ហាញ​ឯកសារ​ក្នុង​មែក​ធាង​
 Comment[nb]=Viser de åpne dokumentene i et tre
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdesdk-4.6.0/kate/plugins/filetree/katefiletreeplugin.h 
new/kdesdk-4.6.1/kate/plugins/filetree/katefiletreeplugin.h
--- old/kdesdk-4.6.0/kate/plugins/filetree/katefiletreeplugin.h 2011-01-19 
23:07:44.000000000 +0100
+++ new/kdesdk-4.6.1/kate/plugins/filetree/katefiletreeplugin.h 2011-02-25 
22:47:43.000000000 +0100
@@ -49,7 +49,7 @@
     Kate::PluginView *createView (Kate::MainWindow *mainWindow);
 
     virtual uint configPages() const;
-    
+
     virtual QString configPageName (uint number = 0) const;
     virtual QString configPageFullName (uint number = 0) const;
     virtual KIcon configPageIcon (uint number = 0) const;
@@ -58,14 +58,14 @@
     const KateFileTreePluginSettings &settings();
 
     void applyConfig(bool shadingEnabled, QColor viewShade, QColor editShade, 
bool listMode, int sortRole, bool showFulPath);
-    
+
   private:
     QHash<Kate::MainWindow *, KateFileTreePluginView *> m_view;
     KateFileTreeConfigPage *m_confPage;
     KateFileTreePluginSettings m_settings;
 };
 
-class KateFileTreePluginView : public Kate::PluginView, public KXMLGUIClient
+class KateFileTreePluginView : public Kate::PluginView, public 
Kate::XMLGUIClient
 {
     Q_OBJECT
 
@@ -90,14 +90,14 @@
 
     bool hasLocalPrefs();
     void setHasLocalPrefs(bool);
-    
+
   private:
     KateFileTree *m_fileTree;
     KateFileTreeProxyModel *m_proxyModel;
     KateFileTreeModel *m_documentModel;
     bool m_hasLocalPrefs;
     KateFileTreePlugin *m_plug;
-    
+
   private Q_SLOTS:
     void showActiveDocument();
     void activateDocument(KTextEditor::Document *);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdesdk-4.6.0/kate/plugins/filetree/ui.rc 
new/kdesdk-4.6.1/kate/plugins/filetree/ui.rc
--- old/kdesdk-4.6.0/kate/plugins/filetree/ui.rc        2011-01-19 
23:07:44.000000000 +0100
+++ new/kdesdk-4.6.1/kate/plugins/filetree/ui.rc        2011-02-25 
22:47:43.000000000 +0100
@@ -1,16 +1,21 @@
 <!DOCTYPE kpartgui>
-<gui name="katefiletreeplugin" library="katefiletreeplugin" version="3">
+<gui name="katefiletreeplugin" library="katefiletreeplugin" version="6">
+
+ <!-- merge in view -->
 <MenuBar>
-  <Menu name="go" append="after_view">
-    <text>&amp;Go</text>
-    <Action name="filetree_prev_document"/>
-    <Action name="filetree_next_document"/>
+  <Menu name="view"><text>&amp;View</text>
+    <Action name="filetree_prev_document" group="switch_document"/>
+    <Action name="filetree_next_document" group="switch_document"/>
+    <Action name="filetree_show_active_document" group="switch_document"/>
   </Menu>
 </MenuBar>
-<ToolBar name="katefiletreeplugin">
-  <text>Kate File Tree</text>
-  <Action name="filetree_show_active_document"/>
+
+<!-- merge in main toolbar -->
+<ToolBar name="mainToolBar"><text>Main Toolbar</text>
+    <Action name="filetree_prev_document" group="switch_document"/>
+    <Action name="filetree_next_document" group="switch_document"/>
 </ToolBar>
+
 </gui>
 
 <!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdesdk-4.6.0/kate/plugins/gdbplugin/kategdbplugin.desktop 
new/kdesdk-4.6.1/kate/plugins/gdbplugin/kategdbplugin.desktop
--- old/kdesdk-4.6.0/kate/plugins/gdbplugin/kategdbplugin.desktop       
2011-01-19 23:07:45.000000000 +0100
+++ new/kdesdk-4.6.1/kate/plugins/gdbplugin/kategdbplugin.desktop       
2011-02-25 22:47:43.000000000 +0100
@@ -7,6 +7,7 @@
 Name[ast]=GDB
 Name[ca]=GDB
 Name[ca@valencia]=GDB
+Name[cs]=GDB
 Name[da]=GDB
 Name[de]=GDB
 Name[en_GB]=GDB
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdesdk-4.6.0/kate/plugins/kate-ctags/katectagsplugin.desktop 
new/kdesdk-4.6.1/kate/plugins/kate-ctags/katectagsplugin.desktop
--- old/kdesdk-4.6.0/kate/plugins/kate-ctags/katectagsplugin.desktop    
2011-01-19 23:07:41.000000000 +0100
+++ new/kdesdk-4.6.1/kate/plugins/kate-ctags/katectagsplugin.desktop    
2011-02-25 22:47:43.000000000 +0100
@@ -13,6 +13,7 @@
 Name[es]=CTags
 Name[et]=CTags
 Name[fr]=CTags
+Name[ga]=CTags
 Name[it]=CTags
 Name[km]=CTags
 Name[nb]=CTags
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdesdk-4.6.0/kate/plugins/katesql/katesql.desktop 
new/kdesdk-4.6.1/kate/plugins/katesql/katesql.desktop
--- old/kdesdk-4.6.0/kate/plugins/katesql/katesql.desktop       2011-01-19 
23:07:44.000000000 +0100
+++ new/kdesdk-4.6.1/kate/plugins/katesql/katesql.desktop       2011-02-25 
22:47:43.000000000 +0100
@@ -15,6 +15,7 @@
 Name[es]=Complemento SQL
 Name[et]=SQL-i plugin
 Name[fr]=Module externe SQL
+Name[ga]=Breiseán SQL
 Name[it]=Estensione SQL
 Name[kk]=SQL плагині
 Name[km]=កម្មវិធី​ជំនួយ​របស់​ SQL 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdesdk-4.6.0/kate/plugins/kttsd/kate_kttsd.desktop 
new/kdesdk-4.6.1/kate/plugins/kttsd/kate_kttsd.desktop
--- old/kdesdk-4.6.0/kate/plugins/kttsd/kate_kttsd.desktop      2011-01-19 
23:07:43.000000000 +0100
+++ new/kdesdk-4.6.1/kate/plugins/kttsd/kate_kttsd.desktop      2011-02-25 
22:47:43.000000000 +0100
@@ -14,6 +14,7 @@
 Name[es]=Complemento de texto hablado Jovie para KTextEditor
 Name[et]=Jovie teksti ettelugemine
 Name[fr]=Synthèse vocale Jovie
+Name[ga]=Téacs-go-Caint Jovie
 Name[it]=Pronuncia di Jovie
 Name[km]=អត្ថបទ​ត្រូវ​និយាយ​របស់​ Jovie 
 Name[nb]=Jovie tekst til tale
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdesdk-4.6.0/kate/plugins/mailfiles/katemailfilesplugin.desktop 
new/kdesdk-4.6.1/kate/plugins/mailfiles/katemailfilesplugin.desktop
--- old/kdesdk-4.6.0/kate/plugins/mailfiles/katemailfilesplugin.desktop 
2011-01-19 23:07:44.000000000 +0100
+++ new/kdesdk-4.6.1/kate/plugins/mailfiles/katemailfilesplugin.desktop 
2011-02-25 22:47:43.000000000 +0100
@@ -15,7 +15,7 @@
 Name[es]=Enviar archivos por correo
 Name[et]=Failide saatmine e-postiga
 Name[fa]=پرونده‌های نامه
-Name[fr]=Envoyer des fichiers par courrier électronique
+Name[fr]=Envoyer des fichiers par courrier
 Name[ga]=Seol comhaid
 Name[gl]=Enviar por correo os ficheiros
 Name[hu]=Levélküldő
@@ -58,7 +58,7 @@
 Comment[es]=Enviar archivos por e-mail
 Comment[et]=Failide saatmine e-postiga
 Comment[fi]=Lähetä tiedostoja sähköpostitse
-Comment[fr]=Envoie des fichiers par courriel
+Comment[fr]=Envoie des fichiers par courrier électronique
 Comment[ga]=Seol comhaid trí ríomhphost
 Comment[gl]=Envía os ficheiros por correo electrónico
 Comment[it]=Invia file per posta elettronica
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdesdk-4.6.0/lokalize/src/lokalizemainwindow.cpp 
new/kdesdk-4.6.1/lokalize/src/lokalizemainwindow.cpp
--- old/kdesdk-4.6.0/lokalize/src/lokalizemainwindow.cpp        2011-01-19 
23:08:25.000000000 +0100
+++ new/kdesdk-4.6.1/lokalize/src/lokalizemainwindow.cpp        2011-02-25 
22:47:44.000000000 +0100
@@ -611,8 +611,11 @@
     //QList<int> offsets;
     QList<int> entries;
 
-    ProjectTab *w = static_cast<ProjectTab*>(m_projectSubWindow->widget());
-    w->setLegacyUnitsCount(projectStateGroup.readEntry("UnitsCount", 0));
+    if (m_projectSubWindow)
+    {
+        ProjectTab *w = static_cast<ProjectTab*>(m_projectSubWindow->widget());
+        w->setLegacyUnitsCount(projectStateGroup.readEntry("UnitsCount", 0));
+    }
 
     entries=projectStateGroup.readEntry("Entries",entries);
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdesdk-4.6.0/lokalize/src/tm/jobs.cpp 
new/kdesdk-4.6.1/lokalize/src/tm/jobs.cpp
--- old/kdesdk-4.6.0/lokalize/src/tm/jobs.cpp   2011-01-19 23:08:25.000000000 
+0100
+++ new/kdesdk-4.6.1/lokalize/src/tm/jobs.cpp   2011-02-25 22:47:44.000000000 
+0100
@@ -804,6 +804,8 @@
         return;
     pairsCount=query.value(0).toInt();
     query.clear();
+    
+    return;//don't get info that isnt displayed, esp considering [buggy?] 
sqlite keeps it in cache forever
 
     if(!query.exec("SELECT count(*) FROM source_strings")
         || !query.next())
@@ -823,12 +825,10 @@
     , m_dbName(name)
     , m_setParams(false)
 {
-    qDebug()<<m_dbName;
 }
 
 OpenDBJob::~OpenDBJob()
 {
-    kDebug(TM_AREA)<<m_dbName;
 }
 
 void OpenDBJob::run()
@@ -852,6 +852,9 @@
     kWarning(TM_AREA) <<"db"<<m_dbName<<" opened 
"<<a.elapsed()<<m_tmConfig.targetLangCode;
 
     
getStats(db,m_stat.pairsCount,m_stat.uniqueSourcesCount,m_stat.uniqueTranslationsCount);
+    //the most basic workaround for sqlite leaking (see QTBUG-16967)
+    db.close();
+    db.open();
 }
 
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdesdk-4.6.0/okteta/core/codecs/kbinarybytecodec.cpp 
new/kdesdk-4.6.1/okteta/core/codecs/kbinarybytecodec.cpp
--- old/kdesdk-4.6.0/okteta/core/codecs/kbinarybytecodec.cpp    2011-01-19 
23:08:16.000000000 +0100
+++ new/kdesdk-4.6.1/okteta/core/codecs/kbinarybytecodec.cpp    2011-02-25 
22:47:44.000000000 +0100
@@ -37,8 +37,8 @@
 void KBinaryByteCodec::encodeShort( QString &Digits, unsigned int Pos, Byte 
Char ) const
 {
   unsigned char M = 1<<7;
-  // find first set bit
-  for( ; M>0; M>>=1 )
+  // find first set bit, at last break on LSB
+  for( ; M > 1; M >>= 1 )
     if( Char & M )
       break;
   // now set the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdesdk-4.6.0/okteta/core/codecs/kdecimalbytecodec.cpp 
new/kdesdk-4.6.1/okteta/core/codecs/kdecimalbytecodec.cpp
--- old/kdesdk-4.6.0/okteta/core/codecs/kdecimalbytecodec.cpp   2011-01-19 
23:08:16.000000000 +0100
+++ new/kdesdk-4.6.1/okteta/core/codecs/kdecimalbytecodec.cpp   2011-02-25 
22:47:44.000000000 +0100
@@ -48,10 +48,11 @@
     Digits[Pos++] = '0'+C;
     Char -= C * 100;
   }
-  if( (C = Char / 10) )
+  unsigned char C2;
+  if( (C2 = Char / 10) || C )
   {
-    Digits[Pos++] = '0'+C;
-    Char -= C * 10;
+    Digits[Pos++] = '0'+C2;
+    Char -= C2 * 10;
   }
   Digits[Pos] = '0'+Char;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdesdk-4.6.0/okteta/core/codecs/koctalbytecodec.cpp 
new/kdesdk-4.6.1/okteta/core/codecs/koctalbytecodec.cpp
--- old/kdesdk-4.6.0/okteta/core/codecs/koctalbytecodec.cpp     2011-01-19 
23:08:16.000000000 +0100
+++ new/kdesdk-4.6.1/okteta/core/codecs/koctalbytecodec.cpp     2011-02-25 
22:47:44.000000000 +0100
@@ -41,8 +41,9 @@
   unsigned char C;
   if( (C = (Char>>6)&0x07) )
     Digits[Pos++] = '0'+C;
-  if( (C = (Char>>3)&0x07) )
-    Digits[Pos++] = '0'+C;
+  unsigned char C2;
+  if( (C2 = (Char>>3)&0x07) || C )
+    Digits[Pos++] = '0'+C2;
   Digits[Pos] = '0'+((Char)&0x07);
 }
 
@@ -69,7 +70,7 @@
   if( turnToValue(&Digit) )
   {
     unsigned char B = *Byte;
-    if( B < 64 )
+    if( B < 32 )
     {
       B <<= 3;
       B += Digit;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdesdk-4.6.0/okteta/core/codecs/koctalbytecodec.h 
new/kdesdk-4.6.1/okteta/core/codecs/koctalbytecodec.h
--- old/kdesdk-4.6.0/okteta/core/codecs/koctalbytecodec.h       2011-01-19 
23:08:16.000000000 +0100
+++ new/kdesdk-4.6.1/okteta/core/codecs/koctalbytecodec.h       2011-02-25 
22:47:44.000000000 +0100
@@ -37,7 +37,7 @@
 
   public: // ValueCodec API
     virtual unsigned int encodingWidth() const { return 3; }
-    virtual unsigned char digitsFilledLimit() const { return 64; }
+    virtual unsigned char digitsFilledLimit() const { return 32; }
 
     virtual void encode( QString &Digits, unsigned  int Pos, Byte Char ) const;
     virtual void encodeShort( QString &Digits, unsigned  int Pos, Byte Char ) 
const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdesdk-4.6.0/okteta/core/codecs/ktextcharcodec.cpp 
new/kdesdk-4.6.1/okteta/core/codecs/ktextcharcodec.cpp
--- old/kdesdk-4.6.0/okteta/core/codecs/ktextcharcodec.cpp      2011-01-19 
23:08:16.000000000 +0100
+++ new/kdesdk-4.6.1/okteta/core/codecs/ktextcharcodec.cpp      2011-02-25 
22:47:44.000000000 +0100
@@ -232,8 +232,12 @@
 
 Character KTextCharCodec::decode( Byte byte ) const
 {
+    // QTextCodecs "use this codepoint when input data cannot be represented 
in Unicode." (Qt docs)
+    static const QChar replacementChar = QChar( QChar::ReplacementCharacter );
     const QString s( mDecoder->toUnicode(reinterpret_cast<const 
char*>(&byte),1) );
-    return Character( s.at(0) );
+    const QChar qchar = s.at( 0 );
+    const bool isDecoded = (qchar != replacementChar);
+    return Character( qchar, ! isDecoded );
 }
 
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdesdk-4.6.0/okteta/gui/oktetagui.h 
new/kdesdk-4.6.1/okteta/gui/oktetagui.h
--- old/kdesdk-4.6.0/okteta/gui/oktetagui.h     2011-01-19 23:08:11.000000000 
+0100
+++ new/kdesdk-4.6.1/okteta/gui/oktetagui.h     2011-02-25 22:47:43.000000000 
+0100
@@ -23,10 +23,15 @@
 #ifndef OKTETAGUI_H
 #define OKTETAGUI_H
 
+// this
+#include "lineposition.h"
 // ColumnsView
 #include "kadds.h"
 // Okteta core
+#include "byte.h"
 #include "oktetacore.h"
+// Qt
+#include <QtCore/QChar>
 
 namespace Okteta
 {
@@ -48,8 +53,8 @@
 static const int InsertCursorWidth = 2;
 
 static const bool      DefaultShowingNonprinting = false;
-static const QChar     DefaultSubstituteChar =  (char)'.';
-static const QChar     DefaultUndefinedChar =   (char)'?';
+static const QChar     DefaultSubstituteChar =  QLatin1Char( '.' );
+static const QChar     DefaultUndefinedChar =   QChar( 
QChar::ReplacementCharacter );
 
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdesdk-4.6.0/okteta/kasten/controllers/view/bytetable/bytetableview.cpp 
new/kdesdk-4.6.1/okteta/kasten/controllers/view/bytetable/bytetableview.cpp
--- old/kdesdk-4.6.0/okteta/kasten/controllers/view/bytetable/bytetableview.cpp 
2011-01-19 23:08:14.000000000 +0100
+++ new/kdesdk-4.6.1/okteta/kasten/controllers/view/bytetable/bytetableview.cpp 
2011-02-25 22:47:43.000000000 +0100
@@ -49,6 +49,9 @@
     baseLayout->setMargin( 0 );
 
     mByteTableView = new QTreeView( this );
+    connect( KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
+             SLOT(setFixedFontByGlobalSettings()) );
+    setFixedFontByGlobalSettings(); //do this before setting model
     mByteTableView->setObjectName( QLatin1String( "ByteTable" ) );
     mByteTableView->setRootIsDecorated( false );
     mByteTableView->setItemsExpandable( false );
@@ -62,9 +65,6 @@
     mByteTableView->setModel( mTool->byteTableModel() );
     connect( mByteTableView, SIGNAL(doubleClicked( const QModelIndex& )),
              SLOT(onDoubleClicked( const QModelIndex& )) );
-    connect( KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
-             SLOT(setFixedFontByGlobalSettings()) );
-    setFixedFontByGlobalSettings();
 
     baseLayout->addWidget( mByteTableView, 10 );
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdesdk-4.6.0/okteta/kasten/controllers/view/info/infoview.cpp 
new/kdesdk-4.6.1/okteta/kasten/controllers/view/info/infoview.cpp
--- old/kdesdk-4.6.0/okteta/kasten/controllers/view/info/infoview.cpp   
2011-01-19 23:08:13.000000000 +0100
+++ new/kdesdk-4.6.1/okteta/kasten/controllers/view/info/infoview.cpp   
2011-02-25 22:47:43.000000000 +0100
@@ -80,6 +80,9 @@
     baseLayout->addLayout( topLineLayout );
 
     mStatisticTableView = new QTreeView( this );
+    connect( KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
+            SLOT(setFixedFontByGlobalSettings()) );
+    setFixedFontByGlobalSettings(); //do this before setting model
     mStatisticTableView->setObjectName( QLatin1String( "StatisticTable" ) );
     mStatisticTableView->setRootIsDecorated( false );
     mStatisticTableView->setItemsExpandable( false );
@@ -97,9 +100,6 @@
     mStatisticTableView->setModel( proxyModel );
     mStatisticTableView->sortByColumn( StatisticTableModel::CountId, 
Qt::DescendingOrder );
     connect( mTool->statisticTableModel(), SIGNAL(headerChanged()), 
SLOT(updateHeader()) );
-    connect( KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
-             SLOT(setFixedFontByGlobalSettings()) );
-    setFixedFontByGlobalSettings();
 
     baseLayout->addWidget( mStatisticTableView, 10 );
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdesdk-4.6.0/okteta/kasten/controllers/view/poddecoder/poddelegate.cpp 
new/kdesdk-4.6.1/okteta/kasten/controllers/view/poddecoder/poddelegate.cpp
--- old/kdesdk-4.6.0/okteta/kasten/controllers/view/poddecoder/poddelegate.cpp  
2011-01-19 23:08:14.000000000 +0100
+++ new/kdesdk-4.6.1/okteta/kasten/controllers/view/poddecoder/poddelegate.cpp  
2011-02-25 22:47:43.000000000 +0100
@@ -71,6 +71,9 @@
 }
 
 // make sure only editors are created which have a readOnly property
+// also beware that for subclasses of QLineEdit (all float editors) the signal
+// editingFinished() is only emitted if validator() returns 
QValidator::Acceptable
+// so onEditorDone() is not reached if QValidator::Intermediate
 QWidget* PODDelegate::createEditor( QWidget* parent, const 
QStyleOptionViewItem& option, const QModelIndex& index ) const
 {
     QWidget* result;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdesdk-4.6.0/okteta/kasten/controllers/view/poddecoder/poddelegate.h 
new/kdesdk-4.6.1/okteta/kasten/controllers/view/poddecoder/poddelegate.h
--- old/kdesdk-4.6.0/okteta/kasten/controllers/view/poddecoder/poddelegate.h    
2011-01-19 23:08:14.000000000 +0100
+++ new/kdesdk-4.6.1/okteta/kasten/controllers/view/poddecoder/poddelegate.h    
2011-02-25 22:47:43.000000000 +0100
@@ -25,6 +25,7 @@
 
 // Qt
 #include <QtGui/QStyledItemDelegate>
+#include <QtCore/QPointer>
 
 
 namespace Kasten
@@ -61,7 +62,7 @@
   protected:
     PODDecoderTool* mTool;
 
-    mutable QWidget* mEditor;
+    mutable QPointer<QWidget> mEditor;
 };
 
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdesdk-4.6.0/okteta/kasten/controllers/view/poddecoder/types/char8.h 
new/kdesdk-4.6.1/okteta/kasten/controllers/view/poddecoder/types/char8.h
--- old/kdesdk-4.6.0/okteta/kasten/controllers/view/poddecoder/types/char8.h    
2011-01-19 23:08:14.000000000 +0100
+++ new/kdesdk-4.6.1/okteta/kasten/controllers/view/poddecoder/types/char8.h    
2011-02-25 22:47:43.000000000 +0100
@@ -23,6 +23,8 @@
 #ifndef CHAR8_H
 #define CHAR8_H
 
+// Okteta gui
+#include <oktetagui.h>
 // Okteta core
 #include <character.h>
 // Qt
@@ -49,8 +51,7 @@
 
 inline QString Char8::toString() const
 {
-    static const unsigned char DefaultUndefinedChar = '?';
-    return QString( character.isUndefined() ? QChar(DefaultUndefinedChar) : 
(QChar)character );
+    return QString( character.isUndefined() ? Okteta::DefaultUndefinedChar : 
(QChar)character );
 }
 
 Q_DECLARE_METATYPE( Char8 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdesdk-4.6.0/okteta/kasten/controllers/view/stringsextract/stringsextractview.cpp
 
new/kdesdk-4.6.1/okteta/kasten/controllers/view/stringsextract/stringsextractview.cpp
--- 
old/kdesdk-4.6.0/okteta/kasten/controllers/view/stringsextract/stringsextractview.cpp
       2011-01-19 23:08:13.000000000 +0100
+++ 
new/kdesdk-4.6.1/okteta/kasten/controllers/view/stringsextract/stringsextractview.cpp
       2011-02-25 22:47:43.000000000 +0100
@@ -108,6 +108,9 @@
              mSortFilterProxyModel, SLOT(setFilterFixedString( const QString & 
)) );
 
     mContainedStringTableView = new QTreeView( this );
+    connect( KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
+            SLOT(setFixedFontByGlobalSettings()) );
+    setFixedFontByGlobalSettings(); //do this before setting model
     mContainedStringTableView->setObjectName( QLatin1String( 
"ContainedStringTable" ) );
     mContainedStringTableView->setRootIsDecorated( false );
     mContainedStringTableView->setItemsExpandable( false );
@@ -126,9 +129,6 @@
     connect( mContainedStringTableView->selectionModel(),
              SIGNAL(selectionChanged( const QItemSelection &, const 
QItemSelection & )),
              SLOT(onStringSelectionChanged()) );
-    connect( KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
-             SLOT(setFixedFontByGlobalSettings()) );
-    setFixedFontByGlobalSettings();
 
     baseLayout->addWidget( mContainedStringTableView, 10 );
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdesdk-4.6.0/okteta/kasten/controllers/view/structures/examples/test/test.desktop
 
new/kdesdk-4.6.1/okteta/kasten/controllers/view/structures/examples/test/test.desktop
--- 
old/kdesdk-4.6.0/okteta/kasten/controllers/view/structures/examples/test/test.desktop
       2011-01-19 23:08:13.000000000 +0100
+++ 
new/kdesdk-4.6.1/okteta/kasten/controllers/view/structures/examples/test/test.desktop
       2011-02-25 22:47:43.000000000 +0100
@@ -7,6 +7,7 @@
 Name=Simple test
 Name[ca]=Prova simple
 Name[ca@valencia]=Prova simple
+Name[cs]=Jednoduchý test
 Name[da]=Enkel test
 Name[de]=Einfacher Test
 Name[en_GB]=Simple test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdesdk-4.6.0/okteta/kasten/controllers/view/structures/examples/test_2/test_2.desktop
 
new/kdesdk-4.6.1/okteta/kasten/controllers/view/structures/examples/test_2/test_2.desktop
--- 
old/kdesdk-4.6.0/okteta/kasten/controllers/view/structures/examples/test_2/test_2.desktop
   2011-01-19 23:08:13.000000000 +0100
+++ 
new/kdesdk-4.6.1/okteta/kasten/controllers/view/structures/examples/test_2/test_2.desktop
   2011-02-25 22:47:43.000000000 +0100
@@ -7,6 +7,7 @@
 Name=Another simple test
 Name[ca]=Una altra prova senzilla
 Name[ca@valencia]=Una altra prova senzilla
+Name[cs]=Další jednoduchý test
 Name[da]=En anden enkel test
 Name[de]=Ein weiterer einfacher Test
 Name[en_GB]=Another simple test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kdesdk-4.6.0/okteta/libs/kasten/core/io/filesystem/abstractfilesystemexportjob_p.cpp
 
new/kdesdk-4.6.1/okteta/libs/kasten/core/io/filesystem/abstractfilesystemexportjob_p.cpp
--- 
old/kdesdk-4.6.0/okteta/libs/kasten/core/io/filesystem/abstractfilesystemexportjob_p.cpp
    2011-01-19 23:08:17.000000000 +0100
+++ 
new/kdesdk-4.6.1/okteta/libs/kasten/core/io/filesystem/abstractfilesystemexportjob_p.cpp
    2011-02-25 22:47:44.000000000 +0100
@@ -55,8 +55,7 @@
     else
     {
         q->setError( KJob::KilledJobError );
-        q->setErrorText( mFile ? mFile->errorString() : 
KIO::NetAccess::lastErrorString() );
-        delete mFile;
+        q->setErrorText( mFile->errorString() );
 
         q->completeExport( false );
     }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdesdk-4.6.0/okteta/program/about.cpp 
new/kdesdk-4.6.1/okteta/program/about.cpp
--- old/kdesdk-4.6.0/okteta/program/about.cpp   2011-01-19 23:08:15.000000000 
+0100
+++ new/kdesdk-4.6.1/okteta/program/about.cpp   2011-02-25 22:47:43.000000000 
+0100
@@ -1,7 +1,7 @@
 /*
     This file is part of the Okteta program, part of the KDE project.
 
-    Copyright 2006-2010 Friedrich W. H. Kossebau <kosse...@kde.org>
+    Copyright 2006-2011 Friedrich W. H. Kossebau <kosse...@kde.org>
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -28,7 +28,7 @@
 
 // Program
 static const char ProgramId[] =          "okteta";
-static const char ProgramVersion[] =     "0.6.0";
+static const char ProgramVersion[] =     "0.6.1";
 static const char ProgramHomepage[] =    
"http://utils.kde.org/projects/okteta";;
 // Author
 static const char FWHKEmailAddress[] =   "kosse...@kde.org";
@@ -40,7 +40,7 @@
               ki18n("Okteta"), ProgramVersion, // name
               ki18n("KDE byte editor"), // description
               KAboutData::License_GPL_V2,
-              ki18n("Copyright 2006-2010 Friedrich W. H. Kossebau"), 
//copyright
+              ki18n("Copyright 2006-2011 Friedrich W. H. Kossebau"), 
//copyright
               ki18n("Edit the raw data of files"), // comment
               ProgramHomepage )
 {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdesdk-4.6.0/okteta/program/okteta.desktop 
new/kdesdk-4.6.1/okteta/program/okteta.desktop
--- old/kdesdk-4.6.0/okteta/program/okteta.desktop      2011-01-19 
23:08:15.000000000 +0100
+++ new/kdesdk-4.6.1/okteta/program/okteta.desktop      2011-02-25 
22:47:43.000000000 +0100
@@ -3,12 +3,14 @@
 Name[ast]=Okteta
 Name[ca]=Okteta
 Name[ca@valencia]=Okteta
+Name[cs]=Okteta
 Name[da]=Okteta
 Name[de]=Okteta
 Name[en_GB]=Okteta
 Name[es]=Okteta
 Name[et]=Okteta
 Name[fr]=Okteta
+Name[ga]=Okteta
 Name[it]=Okteta
 Name[km]=Okteta
 Name[nb]=Okteta
@@ -38,6 +40,7 @@
 GenericName[es]=Editor hexadecimal
 GenericName[et]=Binaarfailide redaktor
 GenericName[fr]=Éditeur hexadécimal
+GenericName[ga]=Eagarthóir Heics
 GenericName[it]=Editor esadecimale
 GenericName[km]=កម្មវិធី​កែសម្រួល​របស់​ Hex ​
 GenericName[nb]=Hex-redigerer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kdesdk-4.6.0/scripts/extractrc 
new/kdesdk-4.6.1/scripts/extractrc
--- old/kdesdk-4.6.0/scripts/extractrc  2011-01-19 23:07:51.000000000 +0100
+++ new/kdesdk-4.6.1/scripts/extractrc  2011-02-25 22:47:43.000000000 +0100
@@ -82,6 +82,7 @@
     [["widget", "class", "KFontComboBox"], ["item", "", ""], ["property", "", 
""]],
     [["widget", "class", "KPushButton"], ["attribute", "name", "buttonGroup"]],
     [["widget", "class", "QRadioButton"], ["attribute", "name", 
"buttonGroup"]],
+    [["widget", "class", "QToolButton"], ["attribute", "name", "buttonGroup"]],
     [["widget", "class", "KTimeZoneWidget"], ["property", "name", "text"]],
 ];
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to