diff --git a/cmake/3rdparty/matio/matio_pubconf.h.mingw.cmake b/cmake/3rdparty/matio/matio_pubconf.h.mingw.cmake
@@ -107,4 +107,4 @@
     typedef _mat_uint8_t mat_uint8_t;
 #endif
 
-#endif /* MATIO_PUBCONF_H */
+#endif /* MATIO_PUBCONF_H */
diff --git a/cmake/3rdparty/netcdf/CMakeLists.txt b/cmake/3rdparty/netcdf/CMakeLists.txt
@@ -18,7 +18,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 endif()
 
 message(STATUS)
-message(STATUS "Using netCDF soures from: ${TOP_DIR}")
+message(STATUS "Using netCDF sources from: ${TOP_DIR}")
 message(STATUS "Installing netCDF at    : ${CMAKE_INSTALL_PREFIX}")
 message(STATUS)
 

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -274,7 +274,7 @@ endif()
 
 if(WIN32)
     add_definitions(-D_WIN32_WINNT=0x0501) # Windows XP
-    # on 32 bit Windows we must explicitely enable >2GB support
+    # on 32 bit Windows we must explicitly enable >2GB support
     # maybe you have to ' 4-gigabyte tune' your Windows XP 32 bit system:
     # http://msdn.microsoft.com/en-us/library/windows/desktop/aa366778%28v=vs.85%29.aspx
     macro(large_address var flag)

diff --git a/cmake/modules/MergedFilesBuild.cmake b/cmake/modules/MergedFilesBuild.cmake
@@ -5,7 +5,7 @@ macro(merged_files_build _allinone_name _list)
 	set(_file_const ${CMAKE_CURRENT_BINARY_DIR}/${_allinone_name}_const.cpp)
 	set(_file_touched ${CMAKE_CURRENT_BINARY_DIR}/${_allinone_name}_touched.cpp)
 
-	# don't touch exisiting or non-empty file,
+	# don't touch existing or non-empty file,
 	# so a cmake re-run doesn't touch all created files
 	set(_rebuild_file_const 0)
 	if (NOT EXISTS ${_file_const})

diff --git a/docbook/kst/alternatehtml/alternate-index.html b/docbook/kst/alternatehtml/alternate-index.html
@@ -2360,7 +2360,7 @@
 The array of output scalars.  The scalars should be in the same order they are
 listed in the XML file.
 </p></dd></dl></div></li><li><p>
-The function must return <tt>0</tt> if it executed succesfully, and
+The function must return <tt>0</tt> if it executed successfully, and
 <tt>-1</tt> otherwise.
 </p></li><li><p>
 The code for the object file must handle unexpected inputs, such as empty input arrays

diff --git a/docbook/kst/creatingplugins-chapter.docbook b/docbook/kst/creatingplugins-chapter.docbook
@@ -188,7 +188,7 @@ listed in the XML file.
 
 <listitem>
 <para>
-The function must return <literal>0</literal> if it executed succesfully, and
+The function must return <literal>0</literal> if it executed successfully, and
 <literal>-1</literal> otherwise.
 </para>
 </listitem>

diff --git a/docbook/kst/plugins-chapter.docbook b/docbook/kst/plugins-chapter.docbook
@@ -13,7 +13,7 @@ with the exception of additional convenience dialog functionality accessible fro
 <para>
 By default, the built-in plugins are stored in <filename>/usr/lib/kde3/kstplugins/</filename> (this directory
 may vary, depending on where you installed &kst;). The Plugin Manager can be used to add
-and remove plugins.  It can be acccessed by selecting <guimenuitem>Plugins...</guimenuitem>
+and remove plugins.  It can be accessed by selecting <guimenuitem>Plugins...</guimenuitem>
 from the <guimenu>Settings</guimenu> menu.  A list of the currently installed plugins is displayed in the
 Plugin Manager.
 </para>

diff --git a/old_tests/dirfile_replay/replay.c b/old_tests/dirfile_replay/replay.c
@@ -95,7 +95,7 @@ int main(int argc, char *argv[]) {
   }
 
 
-  printf("%d frames availible\n", N_frames);
+  printf("%d frames available\n", N_frames);
 
   first_field = P->first_field.field;
 

diff --git a/src/datasources/ascii/asciidatareader.cpp b/src/datasources/ascii/asciidatareader.cpp
@@ -259,7 +259,7 @@ int AsciiDataReader::readField(const AsciiFileData& buf, int col, double *v, con
   if (_config._columnType == AsciiSourceConfig::Fixed) {
     //MeasureTime t("AsciiSource::readField: same width for all columns");
     const LexicalCast& lexc = LexicalCast::instance();
-    // buf[0] points to some row start, _rowIndex[i] is absolute, so we have to substract buf.begin().
+    // buf[0] points to some row start, _rowIndex[i] is absolute, so we have to subtract buf.begin().
     const char*const col_start = &buf.checkedData()[0] + _config._columnWidth * (col - 1) - buf.begin();
     for (int i = 0; i < n; ++i) {
       v[i] = lexc.toDouble(col_start + _rowIndex[i + s] );

diff --git a/src/datasources/ascii/asciifilebuffer.cpp b/src/datasources/ascii/asciifilebuffer.cpp
@@ -127,7 +127,7 @@ const QVector<AsciiFileData> AsciiFileBuffer::splitFile(qint64 chunkSize, const
     chunks << chunk;
     pos = rowIndex[nextRow];
   }
-  //qDebug() << "File splitted into " << chunks.size() << " chunks:"; AsciiFileData::logData(chunks);
+  //qDebug() << "File split into " << chunks.size() << " chunks:"; AsciiFileData::logData(chunks);
   return chunks;
 }
 

diff --git a/src/datasources/ascii/kstdata_ascii.desktop b/src/datasources/ascii/kstdata_ascii.desktop
@@ -5,6 +5,7 @@ X-KDE-ModuleType=Plugin
 X-KDE-Library=ascii
 X-Kst-Plugin-Author=The University of Toronto
 Name=ASCII File Reader
+Name[ca]=Lector de fitxers ASCII
 Name[de]=ASCII-Dateileser
 Name[fr]=Lecteur de fichier ASCII
 Name[nl]=Lezer voor ASCII-bestand
@@ -15,6 +16,7 @@ Name[sv]=ASCII-filläsare
 Name[uk]=Засіб читання файлів ASCII
 Name[x-test]=xxASCII File Readerxx
 Comment=Implements support for reading ASCII files into Kst.
+Comment[ca]=Implementació que permet llegir fitxers ASCII en el Kst.
 Comment[de]=Unterstützung für das Einlesen von ASCII-Dateien in Kst
 Comment[fr]=Implémente la prise en charge de la lecture de fichiers ASCII dans Kst.
 Comment[nl]=Implementeert ondersteuning voor het lezen van ASCII-bestanden in Kst.

diff --git a/src/datasources/dirfilesource/kstdata_dirfilesource.desktop b/src/datasources/dirfilesource/kstdata_dirfilesource.desktop
@@ -5,6 +5,7 @@ X-KDE-ModuleType=Plugin
 X-KDE-Library=dirfilesource
 X-Kst-Plugin-Author=The University of Toronto
 Name=DirFile Reader
+Name[ca]=Lector de DirFile
 Name[de]=DirFile-Leser
 Name[fr]=Lecteur DirFile
 Name[nl]=Lezer van DirFile-bestand
@@ -15,6 +16,7 @@ Name[sv]=DirFile-läsare
 Name[uk]=Засіб читання DirFile
 Name[x-test]=xxDirFile Readerxx
 Comment=Plugin to read the dirfile format.
+Comment[ca]=Connector per llegir el format DirFile.
 Comment[de]=Modul zum Lesen des DirFile-Formats
 Comment[fr]=Module pour lire le format dirfile.
 Comment[nl]=Plugin voor het lezen van het dirfile-formaat.

diff --git a/src/datasources/dmc/dmcdata.cpp b/src/datasources/dmc/dmcdata.cpp
@@ -48,7 +48,7 @@ bool validDatabase(const QString& db) {
 #warning "Kst2 port use PIOQuitDB()"
     //rtc = PIOQuitDB();
     if(rtc != 0) { 
-      // closing failed, dont care
+      // closing failed, do not care
     }
     return true;
   }

diff --git a/src/datasources/dmc/dmcsource.h b/src/datasources/dmc/dmcsource.h
@@ -22,7 +22,6 @@
 #include "dmcdata.h"
 #include "dmcobj.h"
 
-#include "datasource.h"
 #include "dataplugin.h"
 
 

diff --git a/src/datasources/dmc/kstdata_dmc.desktop b/src/datasources/dmc/kstdata_dmc.desktop
@@ -5,6 +5,7 @@ X-KDE-ModuleType=Plugin
 X-KDE-Library=dmc
 X-Kst-Plugin-Author=The University of Toronto
 Name=PLANCK DMC Plugin
+Name[ca]=Connector DMC de PLANCK
 Name[de]=PLANCK-DMC-Modul
 Name[fr]=Module PLANCK DMC
 Name[nl]=Plug-in voor PLANCK DMC
@@ -14,6 +15,7 @@ Name[sv]=PLANCK DMC-insticksprogram
 Name[uk]=Додаток PLANCK DMC
 Name[x-test]=xxPLANCK DMC Pluginxx
 Comment=Plugin to read PLANCK DMC data.
+Comment[ca]=Connector per llegir dades DMC de PLANCK.
 Comment[de]=Modul zum Lesen von PLANCK-DMC-Daten
 Comment[fr]=Module pour lire les données PLANCK DMC.
 Comment[nl]=Plugin voor het lezen van PLANCK DMC-gegevens.

diff --git a/src/datasources/fitsimage/kstdata_fitsimage.desktop b/src/datasources/fitsimage/kstdata_fitsimage.desktop
@@ -5,6 +5,7 @@ X-KDE-ModuleType=Plugin
 X-KDE-Library=fitsimage
 X-Kst-Plugin-Author=The University of Toronto
 Name=fitsimage
+Name[ca]=Imatge FITS
 Name[de]=Fitsimage
 Name[fr]=fitsimage
 Name[nl]=fitsimage
@@ -15,6 +16,7 @@ Name[sv]=FITS-bild
 Name[uk]=fitsimage
 Name[x-test]=xxfitsimagexx
 Comment=Plugin to read a FITS image.
+Comment[ca]=Connector per llegir una imatge FITS.
 Comment[de]=Modul zum Lesen von FITS-Bildern
 Comment[fr]=Module pour lire une image FITS.
 Comment[nl]=Plugin voor het lezen van FITS-afbeelding.

diff --git a/src/datasources/healpix/kstdata_healpix.desktop b/src/datasources/healpix/kstdata_healpix.desktop
@@ -5,6 +5,7 @@ X-KDE-ModuleType=Plugin
 X-KDE-Library=healpix
 X-Kst-Plugin-Author=The University of Toronto
 Name=Healpix File Reader
+Name[ca]=Lector de fitxers Healpix
 Name[de]=Healpix-Dateileser
 Name[fr]=Lecteur de fichier Healpix
 Name[nl]=Lezer voor Healpix-bestand
@@ -14,6 +15,7 @@ Name[sv]=Healpix-filläsare
 Name[uk]=Засіб читання файлів Healpix
 Name[x-test]=xxHealpix File Readerxx
 Comment=Plugin to read Healpix FITS files.
+Comment[ca]=Connector per llegir fitxers Healpix FITS.
 Comment[de]=Modul zum Lesen von Healpix FITS-Bildern
 Comment[fr]=Module pour lire une des fichiers Healpix FITS.
 Comment[nl]=Plugin voor het lezen van Healpix FITS-bestanden.

diff --git a/src/datasources/lfiio/kstdata_lfiio.desktop b/src/datasources/lfiio/kstdata_lfiio.desktop
@@ -5,6 +5,7 @@ X-KDE-ModuleType=Plugin
 X-KDE-Library=lfiio
 X-Kst-Plugin-Author=The University of Toronto
 Name=LFIIO Reader
+Name[ca]=Lector LFIIO
 Name[de]=LFIIO-Betrachter
 Name[fr]=Lecteur LFIIO
 Name[nl]=Lezer voor LFIIO
@@ -14,6 +15,7 @@ Name[sv]=LFIIO-läsare
 Name[uk]=Засіб читання LFIIO
 Name[x-test]=xxLFIIO Readerxx
 Comment=Implements support for reading FITS files into Kst.
+Comment[ca]=Implementació que permet llegir fitxers FITS en el Kst.
 Comment[de]=Unterstützung für das Einlesen von FITS-Dateien in Kst
 Comment[fr]=Implémente la prise en charge de la lecture de fichiers FITS dans Kst.
 Comment[nl]=Implementeert ondersteuning voor het lezen van FITS-bestanden in Kst.

diff --git a/src/datasources/matlab/kstdata_matlab.desktop b/src/datasources/matlab/kstdata_matlab.desktop
@@ -5,6 +5,8 @@ X-KDE-ModuleType=Plugin
 X-KDE-Library=matlabio
 X-Kst-Plugin-Author=Nicolas Brisset
 Name=Matlab's .mat reader
+Name[ca]=Lector de .mat de Matlab
+Name[de]=Matlab-Dateileser-Modul
 Name[fr]=Lecteur de *.mat de Matlab
 Name[nl]=Lezer voor .mat van Matlab
 Name[pt]=Leitor de .mat do Matlab
@@ -13,6 +15,7 @@ Name[sv]=Matlabs .mat-läsare
 Name[uk]=Засіб читання файлів .mat Matlab
 Name[x-test]=xxMatlab's .mat readerxx
 Comment=Matlab file reader plugin for Kst
+Comment[ca]=Connector de lector de fitxers Matlab pel Kst
 Comment[de]=Matlab-Dateileser-Modul für Kst
 Comment[fr]=Module de lecture de fichiers Matlab pour Kst
 Comment[nl]=Plug-in van lezer voor Matlab voor Kst

diff --git a/src/datasources/netcdf/kstdata_netcdf.desktop b/src/datasources/netcdf/kstdata_netcdf.desktop
@@ -5,6 +5,7 @@ X-KDE-ModuleType=Plugin
 X-KDE-Library=netcdf
 X-Kst-Plugin-Author=Nicolas Brisset
 Name=netCDF File Reader
+Name[ca]=Lector de fitxers netCDF
 Name[de]=netCDF-Dateileser
 Name[fr]=Lecteur de fichier netCDF
 Name[nl]=Lezer voor netCDF-bestand
@@ -14,6 +15,7 @@ Name[sv]=netCDF-filläsare
 Name[uk]=Засіб читання файлів netCDF
 Name[x-test]=xxnetCDF File Readerxx
 Comment=Implements support for reading netCDF files into Kst.
+Comment[ca]=Implementació que permet llegir fitxers netCDF en el Kst.
 Comment[de]=Unterstützung für das Einlesen von netCDF-Dateien in Kst
 Comment[fr]=Implémente la prise en charge de la lecture de fichiers netCDF dans Kst.
 Comment[nl]=Implementeert ondersteuning voor het lezen van netCDF-bestanden in Kst.

diff --git a/src/datasources/planckIDEF/kstdata_planckIDEF.desktop b/src/datasources/planckIDEF/kstdata_planckIDEF.desktop
@@ -5,8 +5,10 @@ X-KDE-ModuleType=Plugin
 X-KDE-Library=planckIDEF
 X-Kst-Plugin-Author=The University of Toronto
 Name=Planck IDIS DMC Exchange Format Reader
+Name[ca]=Lector de format d'intercanvi IDIS DMC de Planck
 Name[de]=Planck-IDIS-DMC-Austauschformatleser
 Name[fr]=Lecteur de format Planck IDIS DMC Exchange
+Name[nl]=Lezer voor Planck IDIS DMC uitwisselingsformaat
 Name[pt]=Leitor do Formato de Intercâmbio do IDIS DMC do Planck
 Name[pt_BR]=Leitor do formato de intercâmbio do IDIS DMC do Planck
 Name[sv]=Läsare av Planck IDIS DMC-utbytesformat

diff --git a/src/datasources/planckIDEF/planckIDEFconfig.ui b/src/datasources/planckIDEF/planckIDEFconfig.ui
@@ -9,9 +9,6 @@
     <height>82</height>
    </rect>
   </property>
-  <property name="windowTitle" >
-   <string>PlanckIDEFConfig</string>
-  </property>
   <layout class="QGridLayout" >
    <item row="1" column="0" >
     <spacer name="spacer1" >

diff --git a/src/datasources/qimagesource/kstdata_qimagesource.desktop b/src/datasources/qimagesource/kstdata_qimagesource.desktop
@@ -5,17 +5,21 @@ X-KDE-ModuleType=Plugin
 X-KDE-Library=qimagesource
 X-Kst-Plugin-Author=The University of Toronto
 Name=qimagesource
+Name[ca]=Font QImage
 Name[de]=QImagesource
 Name[fr]=qimagesource
+Name[nl]=qimagesource
 Name[pt]=Fonte QImage
 Name[pt_BR]=Fonte QImage
 Name[sk]=qimagesource
 Name[sv]=qimage-källa
 Name[uk]=qimagesource
 Name[x-test]=xxqimagesourcexx
 Comment=Plugin to read a qimage compatible image.
+Comment[ca]=Connector per llegir una imatge compatible amb QImage.
 Comment[de]=Modul zum Lesen von QImage-kompatiblen Bildern
 Comment[fr]=Module pour lire une image compatible qimage.
+Comment[nl]=Plug-in voor het lezen van afbeelding compatibel met gimage.
 Comment[pt]=Um 'plugin' para ler uma imagem compatível com a QImage.
 Comment[pt_BR]=Plugin para ler uma imagem compatível com a QImage.
 Comment[sv]=Insticksprogram för att läsa en qimage-kompatibel bild.

diff --git a/src/datasources/sampledatasource/kstdata_sampledatasource.desktop b/src/datasources/sampledatasource/kstdata_sampledatasource.desktop
@@ -5,16 +5,20 @@ X-KDE-ModuleType=Plugin
 X-KDE-Library=sampledatasource
 X-Kst-Plugin-Author=The University of Toronto
 Name=File Reader Template
+Name[ca]=Plantilla de lector de fitxer
 Name[de]=Vorlage für Dateileser
 Name[fr]=Modèle de lecteur de fichier
+Name[nl]=Sjabloon voor bestandslezer
 Name[pt]=Modelo de Leitor de Ficheiros
 Name[pt_BR]=Modelo de leitor de arquivos
 Name[sv]=Mall för filläsare
 Name[uk]=Шаблон засобу для читання файлів
 Name[x-test]=xxFile Reader Templatexx
 Comment=Code template for a file reader plugin.
+Comment[ca]=Plantilla de codi per un connector de lector de fitxer.
 Comment[de]=Quelltext-Vorlage für Dateileser-Module
 Comment[fr]=Modèle de code pour un module de lecture de fichiers.
+Comment[nl]=Sjabloon voor code voor plug-in voor bestandslezer.
 Comment[pt]=Um modelo de código para um 'plugin' de leitura de ficheiros.
 Comment[pt_BR]=Modelo de código para um plugin de leitura de arquivos.
 Comment[sv]=Kodmall för ett insticksprogram för filläsning.

diff --git a/src/datasources/sourcelist/kstdata_sourcelist.desktop b/src/datasources/sourcelist/kstdata_sourcelist.desktop
@@ -5,8 +5,10 @@ X-KDE-ModuleType=Plugin
 X-KDE-Library=sourcelist
 X-Kst-Plugin-Author=C. Barth Netterfield
 Name=Data Source List
+Name[ca]=Llista de fonts de les dades
 Name[de]=Datenquellenliste
 Name[fr]=Liste de sources de données
+Name[nl]=Lijst met gegevensbronnen
 Name[pt]=Lista de Fontes de Dados
 Name[pt_BR]=Lista de fontes de dados
 Name[sv]=Lista över datakällor

diff --git a/src/kst/kst2.desktop b/src/kst/kst2.desktop
@@ -2,10 +2,11 @@
 Type=Application
 Exec=kst2
 Icon=kst
-DocPath=kst2/index.html
+X-DocPath=kst2/index.html
 MimeType=application/x-kst;
 Categories=Qt;KDE;Education;Science;
 Name=Kst2
+Name[ca]=Kst2
 Name[cs]=Kst2
 Name[de]=Kst2
 Name[fr]=Kst2
@@ -17,6 +18,7 @@ Name[sv]=Kst2
 Name[uk]=Kst2
 Name[x-test]=xxKst2xx
 GenericName=Data Viewer
+GenericName[ca]=Visor de dades
 GenericName[cs]=Prohlížeč dat
 GenericName[de]=Daten-Betrachter
 GenericName[fr]=Afficheur de données

diff --git a/src/kst/x-kst2.desktop b/src/kst/x-kst2.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Type=MimeType
 Name=Kst2
+Name[ca]=Kst2
 Name[cs]=Kst2
 Name[de]=Kst2
 Name[fr]=Kst2
@@ -15,6 +16,7 @@ Icon=kst
 DefaultApp=kst2
 Patterns=*.kst;*.KST;
 Comment=Kst Session File
+Comment[ca]=Fitxer de sessió del Kst
 Comment[cs]=Soubor sezení Kst
 Comment[de]=Kst-Sitzungsdatei
 Comment[fr]=Fichier de s session Kst

diff --git a/src/libkst/datasource.cpp b/src/libkst/datasource.cpp
@@ -249,6 +249,9 @@ void DataSource::checkUpdate() {
 
 
 void DataSource::deleteDependents() {
+  foreach (const PrimitivePtr &p, slavePrimitives) {
+    store()->removeObject(p);
+  }
 }
 
 
@@ -583,14 +586,18 @@ ValidateDataSourceThread::ValidateDataSourceThread(const QString& file, const in
   _requestID(requestID) {
 }
 
-
+static QMutex _mutex;
 void ValidateDataSourceThread::run() {
+
   QFileInfo info(_file);
   if (!info.exists()) {
     emit dataSourceInvalid(_requestID);
     return;
   }
 
+  // FIXME validSource(_file) is not thread safe, so wait
+  // if there is another one running
+  QMutexLocker locker(&_mutex);
   if (!DataSourcePluginManager::validSource(_file)) {
     emit dataSourceInvalid(_requestID);
     return;

diff --git a/src/libkst/datasource.h b/src/libkst/datasource.h
@@ -217,6 +217,8 @@ class KSTCORE_EXPORT DataSource : public Object
     */
     virtual ObjectList<Object> autoCurves(ObjectStore&) { return ObjectList<Object>(); }
 
+    PrimitiveList slavePrimitives;
+
 
   public Q_SLOTS:
     virtual void checkUpdate();
@@ -274,6 +276,7 @@ class KSTCORE_EXPORT DataSource : public Object
     QFileSystemWatcher *_watcher;
 
     QColor _color;
+
     // NOTE: You must bump the version key if you add new member variables
     //       or change or add virtual functions.
 };